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/pages/mine/mine.js | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.js b/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.js
index e80eb88..76a28bb 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.js
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/mine"],{173:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(30);r(n(25));var o=r(n(174));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},174:function(e,t,n){"use strict";n.r(t);var r=n(175),o=n(177);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(179);var i,u=n(41),c=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"dcbcfe34",null,!1,r["components"],i);c.options.__file="pages/mine/mine.vue",t["default"]=c.exports},175:function(e,t,n){"use strict";n.r(t);var r=n(176);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},176:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return i})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={uIcon:function(){return Promise.all([n.e("common/vendor"),n.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(n.bind(null,367))},authLogin:function(){return n.e("components/auth-login/auth-login").then(n.bind(null,383))},customTabbar:function(){return n.e("components/custom-tabbar/custom-tabbar").then(n.bind(null,376))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 鎺掓煡缁勪欢鍚嶇О鎷煎啓鏄惁姝ｇ‘"),console.error("2. 鎺掓煡缁勪欢鏄惁绗﹀悎 easycom 瑙勮寖锛屾枃妗ｏ細https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 鑻ョ粍浠朵笉绗﹀悎 easycom 瑙勮寖锛岄渶鎵嬪姩寮曞叆锛屽苟鍦� components 涓敞鍐岃缁勪欢")}var o=function(){var e=this,t=e.$createElement,n=(e._self._c,e.__map(e.menuList,(function(t,n){var r=e.__get_orig(t),o=["闂ㄥ簵鍏ラ┗","闂ㄥ簵淇℃伅"].includes(t.label);return{$orig:r,g0:o}})));e._isMounted||(e.e0=function(t){e.showAuthLogin=!1}),e.$mp.data=Object.assign({},{$root:{l0:n}})},a=!1,i=[];o._withStripped=!0},177:function(e,t,n){"use strict";n.r(t);var r=n(178),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},178:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(34)),a=r(n(36)),i=r(n(11)),u=n(37);function c(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?c(Object(n),!0).forEach((function(t){(0,i.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var l=function(){n.e("components/custom-tabbar/custom-tabbar").then(function(){return resolve(n(376))}.bind(null,n)).catch(n.oe)},d={components:{CustomTabbar:l},computed:s({},(0,u.mapState)(["navHeight","statusbarHeight","openid","userInfo","token"])),data:function(){return{showAuthLogin:!1,agreeChecked:!0,userName:"",orderMenus:[{label:"寰呮敮浠�",url:"/static/icon/mine_ic_daifukuan@2x.png",badge:0},{label:"寰呮敹璐�",url:"/static/icon/mine_ic_daishouhuo@2x.png",badge:0},{label:"閫�娆�/鍞悗",url:"/static/icon/mine_ic_tuikuan@2x.png",badge:0}],menuList:[{label:"闂ㄥ簵鍏ラ┗"},{label:"鎴戠殑闂ㄥ簵"},{label:"瑙勮寖椤荤煡"},{label:"鍦ㄧ嚎瀹㈡湇"},{label:"鍏充簬鎴戜滑"}]}},onShow:function(){var e=this;return(0,a.default)(o.default.mark((function t(){return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,e.$onLaunched;case 2:e.token&&e.getOrderNum(),e.userInfo?3===e.userInfo.shopAuditStatus&&(e.menuList[0].label="闂ㄥ簵淇℃伅"):e.orderMenus=[{label:"寰呮敮浠�",url:"/static/icon/mine_ic_daifukuan@2x.png",badge:0},{label:"寰呮敹璐�",url:"/static/icon/mine_ic_daishouhuo@2x.png",badge:0},{label:"閫�娆�/鍞悗",url:"/static/icon/mine_ic_tuikuan@2x.png",badge:0}];case 4:case"end":return t.stop()}}),t)})))()},methods:{handleProfileClick:function(){this.token||(this.showAuthLogin=!0)},toAllOrders:function(){e.navigateTo({url:"/pages/orders/orders"})},handleMenuClick:function(t){var n={"闂ㄥ簵鍏ラ┗":"/pages/store-apply/store-apply","鎴戠殑闂ㄥ簵":"/shop/pages/login/login","瑙勮寖椤荤煡":"/pages/rich-text/rich-text?type=serverIntroduce","鍏充簬鎴戜滑":"/pages/rich-text/rich-text?type=about"};["闂ㄥ簵鍏ラ┗","闂ㄥ簵淇℃伅"].includes(t.label)&&[0,1,2,3].includes(this.userInfo.shopAuditStatus)?e.navigateTo({url:"/pages/details-entry/details-entry"}):n[t.label]&&e.navigateTo({url:n[t.label]})},toOrderDetail:function(t){e.navigateTo({url:"/pages/orders/orders?status="+t})},toSetting:function(){e.navigateTo({url:"/pages/settings/settings"})},goService:function(){e.navigateTo({url:"/pages/rich-text/rich-text?type=userAgreement"})},goPrivacy:function(){e.navigateTo({url:"/pages/rich-text/rich-text?type=privacyPolicy"})},getOrderNum:function(){var e=this;this.$u.api.getMemberInfo({}).then((function(t){200===t.code&&(e.$store.commit("setUserInfo",t.data),e.orderMenus.forEach((function(e){"寰呮敮浠�"===e.label?e.badge=t.data.waitPayCount:"寰呮敹璐�"===e.label?e.badge=t.data.waitReceiveCount:"閫�娆�/鍞悗"===e.label&&(e.badge=t.data.refundingCount)})))}))}}};t.default=d}).call(this,n(2)["default"])},179:function(e,t,n){"use strict";n.r(t);var r=n(180),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},180:function(e,t,n){}},[[173,"common/runtime","common/vendor"]]]);
-=======
(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/mine/mine"],{
/***/ 173:
@@ -104,13 +101,13 @@
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 */ 334))
+ 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))
},
authLogin: function () {
- return __webpack_require__.e(/*! import() | components/auth-login/auth-login */ "components/auth-login/auth-login").then(__webpack_require__.bind(null, /*! @/components/auth-login/auth-login.vue */ 520))
+ return __webpack_require__.e(/*! import() | components/auth-login/auth-login */ "components/auth-login/auth-login").then(__webpack_require__.bind(null, /*! @/components/auth-login/auth-login.vue */ 484))
},
customTabbar: function () {
- return __webpack_require__.e(/*! import() | components/custom-tabbar/custom-tabbar */ "components/custom-tabbar/custom-tabbar").then(__webpack_require__.bind(null, /*! @/components/custom-tabbar/custom-tabbar.vue */ 295))
+ return __webpack_require__.e(/*! import() | components/custom-tabbar/custom-tabbar */ "components/custom-tabbar/custom-tabbar").then(__webpack_require__.bind(null, /*! @/components/custom-tabbar/custom-tabbar.vue */ 187))
},
}
} catch (e) {
@@ -203,7 +200,7 @@
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
var CustomTabbar = function CustomTabbar() {
__webpack_require__.e(/*! require.ensure | components/custom-tabbar/custom-tabbar */ "components/custom-tabbar/custom-tabbar").then((function () {
- return resolve(__webpack_require__(/*! @/components/custom-tabbar/custom-tabbar.vue */ 295));
+ return resolve(__webpack_require__(/*! @/components/custom-tabbar/custom-tabbar.vue */ 187));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
};
var _default = {
@@ -219,22 +216,27 @@
orderMenus: [{
label: '寰呮敮浠�',
url: '/static/icon/mine_ic_daifukuan@2x.png',
- badge: 0
+ badge: 0,
+ status: 0
}, {
label: '寰呮敹璐�',
url: '/static/icon/mine_ic_daishouhuo@2x.png',
- badge: 0
+ badge: 0,
+ status: 3
}, {
label: '閫�娆�/鍞悗',
url: '/static/icon/mine_ic_tuikuan@2x.png',
- badge: 0
+ badge: 0,
+ status: 5
}],
menuList: [{
label: '闂ㄥ簵鍏ラ┗'
}, {
label: '鎴戠殑闂ㄥ簵'
}, {
- label: '瑙勮寖椤荤煡'
+ label: '鐢ㄦ埛鏈嶅姟鍗忚'
+ }, {
+ label: '鐢ㄦ埛闅愮鏀跨瓥'
}, {
label: '鍦ㄧ嚎瀹㈡湇'
}, {
@@ -290,16 +292,17 @@
this.showAuthLogin = true;
},
toAllOrders: function toAllOrders() {
- uni.navigateTo({
- url: '/pages/orders/orders'
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
});
},
handleMenuClick: function handleMenuClick(item) {
var urlMap = {
'闂ㄥ簵鍏ラ┗': '/pages/store-apply/store-apply',
'鎴戠殑闂ㄥ簵': '/shop/pages/login/login',
- '瑙勮寖椤荤煡': '/pages/rich-text/rich-text?type=serverIntroduce',
- '鍏充簬鎴戜滑': '/pages/rich-text/rich-text?type=about'
+ '鐢ㄦ埛鏈嶅姟鍗忚': '/pages/rich-text/rich-text?type=0',
+ '鐢ㄦ埛闅愮鏀跨瓥': '/pages/rich-text/rich-text?type=1',
+ '鍏充簬鎴戜滑': '/pages/rich-text/rich-text?type=5'
};
if (['闂ㄥ簵鍏ラ┗', '闂ㄥ簵淇℃伅'].includes(item.label) && [0, 1, 2, 3].includes(this.userInfo.shopAuditStatus)) {
uni.navigateTo({
@@ -307,15 +310,16 @@
});
return;
}
- if (urlMap[item.label]) {
+ if (item.label !== '鍦ㄧ嚎瀹㈡湇' && urlMap[item.label]) {
uni.navigateTo({
url: urlMap[item.label]
});
}
},
toOrderDetail: function toOrderDetail(label) {
- uni.navigateTo({
- url: '/pages/orders/orders?status=' + label
+ uni.setStorageSync("orderStatus", label === 0 ? -2 : label);
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
});
},
toSetting: function toSetting() {
@@ -387,5 +391,4 @@
/***/ })
},[[173,"common/runtime","common/vendor"]]]);
->>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/mine/mine.js.map
\ No newline at end of file
--
Gitblit v1.9.3