From fe39f704d12350558912201b8dcc023fb731898b Mon Sep 17 00:00:00 2001 From: fox <1466778434@qq.com> Date: Sat, 8 Mar 2025 10:03:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2(?= =?UTF-8?q?=E6=9A=82=E5=AD=98);?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/model/login.js | 4 +- config.js | 2 +- manifest.json | 5 +- pages/index/index.vue | 7 + pages_order/auth/agreementModal.vue | 99 +++++++++++++++ pages_order/auth/wxLogin.vue | 218 +++++++++++++++++-------------- pages_order/auth/wxUserInfo.vue | 247 +++++++++++++++++++++++------------- pages_order/static/auth/caution.png | Bin 0 -> 1387 bytes pages_order/static/auth/logo.png | Bin 0 -> 63461 bytes store/store.js | 4 + uni.scss | 7 + 11 files changed, 404 insertions(+), 189 deletions(-) create mode 100644 pages_order/auth/agreementModal.vue create mode 100644 pages_order/static/auth/caution.png create mode 100644 pages_order/static/auth/logo.png diff --git a/api/model/login.js b/api/model/login.js index c818a04..ffaa447 100644 --- a/api/model/login.js +++ b/api/model/login.js @@ -5,14 +5,14 @@ const api = { // 微信登录接口 wxLogin: { - url: '/login_common/appletLogin', + url: '/login/login', method: 'GET', limit : 500, showLoading : true, }, // 获取绑定手机号码 bindPhone: { - url: '/login_common/bindPhone', + url: '/login/bindPhone', method: 'GET', auth: true, }, diff --git a/config.js b/config.js index 8ece511..139623a 100644 --- a/config.js +++ b/config.js @@ -15,7 +15,7 @@ const config = { baseUrl: 'http://h5.xzaiyp.top/jewelry-admin', }, prod: { - baseUrl: 'https://jewelry-admin.hhlm1688.com/jewelry-admin', + baseUrl: 'http://augcl.natapp1.cc/massage-admin/massage', } } diff --git a/manifest.json b/manifest.json index dc7e3c5..5fddb89 100644 --- a/manifest.json +++ b/manifest.json @@ -52,9 +52,10 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx28679cb649907e7e", + "appid" : "wx77ba4c7131677a74", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "minified" : true }, "usingComponents" : true, "permission" : {}, diff --git a/pages/index/index.vue b/pages/index/index.vue index 2708143..f98e0b8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -144,6 +144,13 @@ } }, onShow() { + // 临时改一下 + if (!uni.getStorageSync('token')) { + uni.navigateTo({ + url: '/pages_order/auth/wxLogin' + }) + } + this.getBanner() this.getRiceNoticeList() this.getRiceIconList() diff --git a/pages_order/auth/agreementModal.vue b/pages_order/auth/agreementModal.vue new file mode 100644 index 0000000..81d273c --- /dev/null +++ b/pages_order/auth/agreementModal.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index b6e80c7..832f246 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -1,139 +1,144 @@ diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index fa13612..9f866b3 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -1,62 +1,73 @@