From 17ab8beefa0262c50d68e410aa831f787687908d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E7=BE=A4?= <1986070059@qq.com> Date: Wed, 22 Jul 2026 17:18:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/header.vue | 8 +- pages/login_package/login/login.vue | 347 +++++++++++------- pages/mine/mine.vue | 6 +- .../order_submit/order_submit.vue | 20 +- .../other_package/productInfo/productInfo.vue | 27 +- pages/rwa_package/shop/fen-shop.vue | 8 +- 6 files changed, 237 insertions(+), 179 deletions(-) diff --git a/components/header.vue b/components/header.vue index 2dfbc77..dc1c2e3 100644 --- a/components/header.vue +++ b/components/header.vue @@ -46,16 +46,10 @@ methods: { leftJump() { const leftPath = this.leftPath; - if(!leftPath){ - return; - } const leftPathType = this.leftPathType; if(leftPathType === "navigateTo"){ - // uni.navigateTo({ - // url:leftPath, - // }) uni.navigateBack(); - }else if(leftPathType === "switchTab"){ + }else if(leftPathType === "switchTab" && leftPath){ uni.switchTab({ url: leftPath, }); diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue index 0505da0..04d9ea4 100644 --- a/pages/login_package/login/login.vue +++ b/pages/login_package/login/login.vue @@ -79,6 +79,18 @@ + + + + + 温馨提示 + 请您阅读并同意《服务协议》与《隐私政策》 + + 取消 + 同意并登录 + + + @@ -109,106 +121,97 @@ const hyyAlipay = uni.requireNativePlugin("Hyy-Alipay"); // #endif - export default { - onLaunch: function() { - console.log("App Launch"); - const res = uni.getSystemInfoSync(); - uni.setStorageSync("platform", res.platform); - // #ifdef APP-PLUS - // 获取应用版本信息 - plus.runtime.getProperty(plus.runtime.appid, function(inf) { - console.log("版本信息", inf.versionCode); - uni.setStorageSync("version-1", inf.version); // 大版本号 - uni.setStorageSync("versionCode", inf.versionCode); // 小版本号 - }); - let uuid = plus.device.uuid; - // #endif - }, - components: { - InputCodeComm, - }, - - data() { - return { - form: { - name: null, - password: null, - code: null, - }, - inputCss: { - height: "80rpx", - background: "#F3F3F3FF", - "border-radius": "30rpx", - border: "0rpx", - "padding-left": "16px", - }, - loginWay: "password", - isShow: false, // 是否显示 - isPolicy: false, // 是否同意 - countdown: false, // 清空倒计时 - loading: false, - }; - }, - methods: { - onBack(){ - console.log('onBack',) - uni.switchTab({ - url:'/pages/home/home' - }) +export default { + onLaunch: function () { + console.log("App Launch"); + const res = uni.getSystemInfoSync(); + uni.setStorageSync("platform", res.platform); + // #ifdef APP-PLUS + // 获取应用版本信息 + plus.runtime.getProperty(plus.runtime.appid, function (inf) { + console.log("版本信息", inf.versionCode); + uni.setStorageSync("version-1", inf.version); // 大版本号 + uni.setStorageSync("versionCode", inf.versionCode); // 小版本号 + }); + let uuid = plus.device.uuid; + // #endif + }, + components: { + InputCodeComm, + }, + + data() { + return { + form: { + name: null, + password: null, + code: null, }, - aa() { - const nativiPlugin = uni.requireNativePlugin('WITTestUniPlugin'); - console.log("隐藏原生tabbar", nativiPlugin) - nativiPlugin.testAsyncFunc({}, - (ret) => { - uni.showToast({ - title: '调用异步方法 ' + ret, - icon: "none" - }) - console.log(ret); - }); + inputCss: { + height: "80rpx", + background: "#F3F3F3FF", + "border-radius": "30rpx", + border: "0rpx", + "padding-left": "16px", }, - jumpHome() { - // const sysPlatform = getCurrentSysPlatform(); - // if(sysPlatform === "android"){ - // uni.switchTab({ - // url: '/pages/message/message', - // }) - // }else{ - uni.switchTab({ - url: "/pages/home/home", + loginWay: "password", + isShow: false, + isPolicy: false, + countdown: false, + loading: false, + showPolicyModal: false, + }; + }, + methods: { + onBack() { + console.log('onBack',) + uni.switchTab({ + url: '/pages/home/home' + }) + }, + aa() { + const nativiPlugin = uni.requireNativePlugin('WITTestUniPlugin'); + console.log("隐藏原生tabbar", nativiPlugin) + nativiPlugin.testAsyncFunc({}, + (ret) => { + uni.showToast({ + title: '调用异步方法 ' + ret, + icon: "none" + }) + console.log(ret); }); - // } - }, - async loginFun(val = {}) { - const then = this; - const form = this.form; - const params = {}; - if (!this.isPolicy) { - uni.showModal({ - title: '温馨提示', - content: '请您阅读并同意《服务协议》与《隐私政策》', - confirmText: "同意并登录", - success: (res) => { - if (res.confirm) { - this.isPolicy = true; - this.loginFun(val); - } - } - }); - return; - } - let response = val; - if (this.loginWay === "password") { - params.mobile = form.name; - params.password = CryptoJS.MD5(form.password).toString(); - response = await loginbypw(params); - } - if (this.loginWay === "code") { - params.mobile = form.name; - params.smsCode = form.code; - response = await loginbysms(params); - } + }, + jumpHome() { + // const sysPlatform = getCurrentSysPlatform(); + // if(sysPlatform === "android"){ + // uni.switchTab({ + // url: '/pages/message/message', + // }) + // }else{ + uni.switchTab({ + url: "/pages/home/home", + }); + // } + }, + async loginFun(val = {}) { + const then = this; + const form = this.form; + const params = {}; + if (!this.isPolicy) { + this.showPolicyModal = true; + return; + } + let response = val; + if (this.loginWay === "password") { + params.mobile = form.name; + params.password = CryptoJS.MD5(form.password).toString(); + response = await loginbypw(params); + } + if (this.loginWay === "code") { + params.mobile = form.name; + params.smsCode = form.code; + response = await loginbysms(params); + } const data = response.data; setStorageFun(TOKEN_NAME, data.token); @@ -419,48 +422,53 @@ return; } - hyyAlipay.openAuthScheme({ - appId: "2021005183625053", // 支付宝分配给开发者的应用 ID - scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置 - }, - (res) => { - console.log("支付宝回调", res); - alipayLogin({ - isValid: false, - token: res.auth_code, - }).then((response) => { - console.log("支付宝登录接口返回:", response, !response.data.userId); - if (response && response.bizcode === 100) { - if (response.data.userId) { - // 登录 - this.loginWay = "alipay"; - this.loginFun(response); - } else { - // 去微信注册 - uni.navigateTo({ - url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=2`, - }); - } + hyyAlipay.openAuthScheme({ + appId: "2021005183625053", // 支付宝分配给开发者的应用 ID + scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置 + }, + (res) => { + console.log("支付宝回调", res); + alipayLogin({ + isValid: false, + token: res.auth_code, + }).then((response) => { + console.log("支付宝登录接口返回:", response, !response.data.userId); + if (response && response.bizcode === 100) { + if (response.data.userId) { + // 登录 + this.loginWay = "alipay"; + this.loginFun(response); } else { - this.$refs.uToastRef.show({ - type: "error", - message: response.msg || "微信登录失败", + // 去微信注册 + uni.navigateTo({ + url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=2`, }); } - }); - } - ); - }, + } else { + this.$refs.uToastRef.show({ + type: "error", + message: response.msg || "微信登录失败", + }); + } + }); + } + ); }, - computed: { - isIOS() { - // #ifdef APP-PLUS - return uni.getSystemInfoSync().platform === "ios"; - // #endif - return false; - }, + handlePolicyConfirm() { + this.showPolicyModal = false; + this.isPolicy = true; + this.loginFun(); }, - }; + }, + computed: { + isIOS() { + // #ifdef APP-PLUS + return uni.getSystemInfoSync().platform === "ios"; + // #endif + return false; + }, + }, +}; \ No newline at end of file diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 6448714..f352c55 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -11,7 +11,7 @@ {{ currentUserData.nickname || '信任桥用户' }} - {{ currentUserData.agentName }} @@ -680,8 +680,8 @@ export default { } &.level-grade { - background: rgba(122, 53, 246, 0.1); - color: #7a35f6; + background: rgba(248,185,75,0.15); + color: #613700; } } diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue index f7ea10b..4fb3c89 100644 --- a/pages/order_package/order_submit/order_submit.vue +++ b/pages/order_package/order_submit/order_submit.vue @@ -1,6 +1,6 @@