From 7a4b8764b68e0dbaeb90e292a8a4bd47cb379e68 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 17:26:02 +0800
Subject: [PATCH] 小程序端和PC端bug修复
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js
index 7947846..fec8f9d 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js
@@ -101,7 +101,7 @@
try {
components = {
uIcon: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 467))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 475))
},
}
} catch (e) {
@@ -198,7 +198,7 @@
try {
console.log(this.userType, "============================================");
this.$u.api.shopSilentLogin({}).then(function (res) {
- if (res.code === 200) {
+ if (res.code === 200 && res.data) {
_this.$store.commit('setUserType', 1);
_this.$store.commit('setShopToken', res.data.token);
// 鑾峰彇闂ㄥ簵淇℃伅
@@ -214,6 +214,8 @@
// }, 1000)
});
}
+
+ uni.hideLoading();
});
} catch (e) {
uni.hideLoading();
@@ -232,18 +234,8 @@
while (1) {
switch (_context.prev = _context.next) {
case 0:
- if (_this2.agreed) {
- _context.next = 3;
- break;
- }
- uni.showToast({
- title: '璇峰厛闃呰骞跺悓鎰忓崗璁�',
- icon: 'none'
- });
- return _context.abrupt("return");
- case 3:
if (_this2.form.telephone) {
- _context.next = 6;
+ _context.next = 3;
break;
}
uni.showToast({
@@ -251,13 +243,23 @@
icon: 'none'
});
return _context.abrupt("return");
- case 6:
+ case 3:
if (_this2.form.password) {
- _context.next = 9;
+ _context.next = 6;
break;
}
uni.showToast({
title: '璇疯緭鍏ュ瘑鐮�',
+ icon: 'none'
+ });
+ return _context.abrupt("return");
+ case 6:
+ if (_this2.agreed) {
+ _context.next = 9;
+ break;
+ }
+ uni.showToast({
+ title: '璇峰厛闃呰骞跺悓鎰忓崗璁�',
icon: 'none'
});
return _context.abrupt("return");
@@ -325,14 +327,9 @@
}, _callee, null, [[10, 29]]);
}))();
},
- goToService: function goToService() {
+ goToService: function goToService(type) {
uni.navigateTo({
- url: '/pages/rich-text/rich-text?type=userAgreement'
- });
- },
- goToPrivacy: function goToPrivacy() {
- uni.navigateTo({
- url: '/pages/rich-text/rich-text?type=privacyPolicy'
+ url: '/pages/rich-text/rich-text?type=' + type
});
}
}
--
Gitblit v1.9.3