From b7d451c91ec40bee70f23b1e2cf6a8797643faef Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 25 四月 2026 15:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js |    2 +-
 1 files changed, 1 insertions(+), 1 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 ccea117..28a9991 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
@@ -1,2 +1,2 @@
-require('../../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["shop/pages/login/login"],{329:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(30);r(n(25));var o=r(n(330));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},330:function(e,t,n){"use strict";n.r(t);var r=n(331),o=n(333);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(335);var c,i=n(41),s=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"f97317a6",null,!1,r["components"],c);s.options.__file="shop/pages/login/login.vue",t["default"]=s.exports},331:function(e,t,n){"use strict";n.r(t);var r=n(332);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"]}))},332:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),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,396))}}}catch(i){if(-1===i.message.indexOf("Cannot find module")||-1===i.message.indexOf(".vue"))throw i;console.error(i.message),console.error("1. 鎺掓煡缁勪欢鍚嶇О鎷煎啓鏄惁姝g‘"),console.error("2. 鎺掓煡缁勪欢鏄惁绗﹀悎 easycom 瑙勮寖锛屾枃妗o細https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 鑻ョ粍浠朵笉绗﹀悎 easycom 瑙勮寖锛岄渶鎵嬪姩寮曞叆锛屽苟鍦� components 涓敞鍐岃缁勪欢")}var o=function(){var e=this,t=e.$createElement;e._self._c;e._isMounted||(e.e0=function(t){e.agreed=!e.agreed})},a=!1,c=[];o._withStripped=!0},333:function(e,t,n){"use strict";n.r(t);var r=n(334),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},334: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)),c=r(n(11)),i=n(37);function s(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 u(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?s(Object(n),!0).forEach((function(t){(0,c.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):s(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var f={computed:u({},(0,i.mapState)(["openid","userInfo"])),data:function(){return{agreed:!1,form:{telephone:"",password:""}}},onLoad:function(){var t=this;this.userInfo.bindShopId&&this.$u.api.shopSilentLogin({}).then(function(){var n=(0,a.default)(o.default.mark((function n(r){var a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:if(200!==r.code){n.next=8;break}return t.$store.commit("setUserType",1),t.$store.commit("setShopToken",r.data.token),n.next=5,t.$u.api.getShopInfo({});case 5:a=n.sent,200===a.code&&t.$store.commit("setShopInfo",a.data),setTimeout((function(){e.reLaunch({url:"/shop/pages/store-home/store-home"})}),1e3);case 8:case"end":return n.stop()}}),n)})));return function(e){return n.apply(this,arguments)}}())},methods:{handleLogin:function(){var t=this;return(0,a.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:if(t.agreed){n.next=3;break}return e.showToast({title:"璇峰厛闃呰骞跺悓鎰忓崗璁�",icon:"none"}),n.abrupt("return");case 3:if(t.form.telephone){n.next=6;break}return e.showToast({title:"璇疯緭鍏ヨ处鍙�",icon:"none"}),n.abrupt("return");case 6:if(t.form.password){n.next=9;break}return e.showToast({title:"璇疯緭鍏ュ瘑鐮�",icon:"none"}),n.abrupt("return");case 9:return e.showLoading({title:"鐧诲綍涓�...",mask:!0}),n.prev=10,n.next=13,t.$u.api.shopLogin({openid:t.openid,password:t.form.password,telephone:t.form.telephone});case 13:if(r=n.sent,e.hideLoading(),200!==r.code){n.next=26;break}return t.$store.commit("setUserType",1),t.$store.commit("setShopToken",r.data.token),n.next=20,t.$u.api.getShopInfo({});case 20:a=n.sent,200===a.code&&t.$store.commit("setShopInfo",a.data),e.showToast({title:"鐧诲綍鎴愬姛",icon:"success"}),setTimeout((function(){e.reLaunch({url:"/shop/pages/store-home/store-home"})}),1500),n.next=27;break;case 26:e.showToast({title:r.msg||"鐧诲綍澶辫触",icon:"none"});case 27:n.next=33;break;case 29:n.prev=29,n.t0=n["catch"](10),e.hideLoading(),e.showToast({title:"鐧诲綍澶辫触",icon:"none"});case 33:case"end":return n.stop()}}),n,null,[[10,29]])})))()},goToService:function(){e.navigateTo({url:"/pages/rich-text/rich-text?type=userAgreement"})},goToPrivacy:function(){e.navigateTo({url:"/pages/rich-text/rich-text?type=privacyPolicy"})}}};t.default=f}).call(this,n(2)["default"])},335:function(e,t,n){"use strict";n.r(t);var r=n(336),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},336:function(e,t,n){}},[[329,"common/runtime","common/vendor"]]]);
+require('../../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["shop/pages/login/login"],{336:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(30);r(n(25));var o=r(n(337));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},337:function(e,t,n){"use strict";n.r(t);var r=n(338),o=n(340);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(342);var c,i=n(41),s=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"f97317a6",null,!1,r["components"],c);s.options.__file="shop/pages/login/login.vue",t["default"]=s.exports},338:function(e,t,n){"use strict";n.r(t);var r=n(339);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"]}))},339:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),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,423))}}}catch(i){if(-1===i.message.indexOf("Cannot find module")||-1===i.message.indexOf(".vue"))throw i;console.error(i.message),console.error("1. 鎺掓煡缁勪欢鍚嶇О鎷煎啓鏄惁姝g‘"),console.error("2. 鎺掓煡缁勪欢鏄惁绗﹀悎 easycom 瑙勮寖锛屾枃妗o細https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 鑻ョ粍浠朵笉绗﹀悎 easycom 瑙勮寖锛岄渶鎵嬪姩寮曞叆锛屽苟鍦� components 涓敞鍐岃缁勪欢")}var o=function(){var e=this,t=e.$createElement;e._self._c;e._isMounted||(e.e0=function(t){e.agreed=!e.agreed})},a=!1,c=[];o._withStripped=!0},340:function(e,t,n){"use strict";n.r(t);var r=n(341),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},341: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)),c=r(n(11)),i=n(37);function s(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 u(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?s(Object(n),!0).forEach((function(t){(0,c.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):s(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var f={computed:u({},(0,i.mapState)(["openid","userInfo"])),data:function(){return{agreed:!1,form:{telephone:"",password:""}}},onLoad:function(){var t=this;this.userInfo.bindShopId&&this.$u.api.shopSilentLogin({}).then(function(){var n=(0,a.default)(o.default.mark((function n(r){var a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:if(200!==r.code){n.next=8;break}return t.$store.commit("setUserType",1),t.$store.commit("setShopToken",r.data.token),n.next=5,t.$u.api.getShopInfo({});case 5:a=n.sent,200===a.code&&t.$store.commit("setShopInfo",a.data),setTimeout((function(){e.reLaunch({url:"/shop/pages/store-home/store-home"})}),1e3);case 8:case"end":return n.stop()}}),n)})));return function(e){return n.apply(this,arguments)}}())},methods:{handleLogin:function(){var t=this;return(0,a.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:if(t.agreed){n.next=3;break}return e.showToast({title:"璇峰厛闃呰骞跺悓鎰忓崗璁�",icon:"none"}),n.abrupt("return");case 3:if(t.form.telephone){n.next=6;break}return e.showToast({title:"璇疯緭鍏ヨ处鍙�",icon:"none"}),n.abrupt("return");case 6:if(t.form.password){n.next=9;break}return e.showToast({title:"璇疯緭鍏ュ瘑鐮�",icon:"none"}),n.abrupt("return");case 9:return e.showLoading({title:"鐧诲綍涓�...",mask:!0}),n.prev=10,n.next=13,t.$u.api.shopLogin({openid:t.openid,password:t.form.password,telephone:t.form.telephone});case 13:if(r=n.sent,e.hideLoading(),200!==r.code){n.next=26;break}return t.$store.commit("setUserType",1),t.$store.commit("setShopToken",r.data.token),n.next=20,t.$u.api.getShopInfo({});case 20:a=n.sent,200===a.code&&t.$store.commit("setShopInfo",a.data),e.showToast({title:"鐧诲綍鎴愬姛",icon:"success"}),setTimeout((function(){e.reLaunch({url:"/shop/pages/store-home/store-home"})}),1500),n.next=27;break;case 26:e.showToast({title:r.msg||"鐧诲綍澶辫触",icon:"none"});case 27:n.next=33;break;case 29:n.prev=29,n.t0=n["catch"](10),e.hideLoading(),e.showToast({title:"鐧诲綍澶辫触",icon:"none"});case 33:case"end":return n.stop()}}),n,null,[[10,29]])})))()},goToService:function(){e.navigateTo({url:"/pages/rich-text/rich-text?type=userAgreement"})},goToPrivacy:function(){e.navigateTo({url:"/pages/rich-text/rich-text?type=privacyPolicy"})}}};t.default=f}).call(this,n(2)["default"])},342:function(e,t,n){"use strict";n.r(t);var r=n(343),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},343:function(e,t,n){}},[[336,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/shop/pages/login/login.js.map
\ No newline at end of file

--
Gitblit v1.9.3