From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/unpackage/dist/dev/mp-weixin/common/main.js | 121 ++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 11 deletions(-)
diff --git a/mini-program/unpackage/dist/dev/mp-weixin/common/main.js b/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
index dac1f33..cb80cc6 100644
--- a/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
@@ -132,12 +132,13 @@
var _default = {
computed: _objectSpread({}, (0, _vuex.mapState)(['userInfo', 'token'])),
onLaunch: function () {
- var _onLaunch = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+ var _onLaunch = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(options) {
var that, res;
return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
+ // this.dealRecShopUserBiz(options)
// 鐧诲綍
that = this;
if (this.token) {
@@ -197,7 +198,7 @@
}
}, _callee);
}));
- function success(_x) {
+ function success(_x2) {
return _success.apply(this, arguments);
}
return success;
@@ -229,27 +230,125 @@
}
}, _callee2, this);
}));
- function onLaunch() {
+ function onLaunch(_x) {
return _onLaunch.apply(this, arguments);
}
return onLaunch;
}(),
- onShow: function onShow() {
- console.log('App Show');
- },
+ onShow: function () {
+ var _onShow = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(options) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
+ while (1) {
+ switch (_context3.prev = _context3.next) {
+ case 0:
+ this.dealRecShopUserBiz(options);
+ case 1:
+ case "end":
+ return _context3.stop();
+ }
+ }
+ }, _callee3, this);
+ }));
+ function onShow(_x3) {
+ return _onShow.apply(this, arguments);
+ }
+ return onShow;
+ }(),
onHide: function onHide() {
console.log('App Hide');
},
methods: {
- checkLocationAuth: function checkLocationAuth() {
+ dealRecShopUserBiz: function dealRecShopUserBiz(options) {
var _this = this;
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+ var s, shopId, e, ts, res;
+ return _regenerator.default.wrap(function _callee4$(_context4) {
+ while (1) {
+ switch (_context4.prev = _context4.next) {
+ case 0:
+ console.error("鍚姩鍙傛暟", options);
+ if (!(options.query && options.query.userId)) {
+ _context4.next = 5;
+ break;
+ }
+ if (!(!_this.userInfo || !_this.userInfo.id)) {
+ _context4.next = 5;
+ break;
+ }
+ _context4.next = 5;
+ return _this.$store.commit('setRecUserId', options.query.userId);
+ case 5:
+ if (!(options.query && options.query.scene && options.query.scene.length)) {
+ _context4.next = 33;
+ break;
+ }
+ if (!(options.query.scene.indexOf("sid_") >= 0)) {
+ _context4.next = 33;
+ break;
+ }
+ s = options.query.scene.indexOf("sid_") + 4;
+ shopId = '';
+ e = options.query.scene.length;
+ ts = options.query.scene.slice(s, e);
+ e = ts.length;
+ if (ts.indexOf("&") > 0) {
+ e = ts.indexOf("&");
+ }
+ if (e > 0) {
+ shopId = ts.slice(0, e);
+ }
+ if (!shopId) {
+ _context4.next = 33;
+ break;
+ }
+ if (!(_this.userInfo && _this.userInfo.id)) {
+ _context4.next = 31;
+ break;
+ }
+ _context4.prev = 16;
+ _context4.next = 19;
+ return _this.$u.api.bindShopInfo({
+ code: code
+ });
+ case 19:
+ res = _context4.sent;
+ if (!(res.code != 200)) {
+ _context4.next = 23;
+ break;
+ }
+ _context4.next = 23;
+ return _this.$store.commit('setRecShopId', shopId);
+ case 23:
+ _context4.next = 29;
+ break;
+ case 25:
+ _context4.prev = 25;
+ _context4.t0 = _context4["catch"](16);
+ _context4.next = 29;
+ return _this.$store.commit('setRecShopId', shopId);
+ case 29:
+ _context4.next = 33;
+ break;
+ case 31:
+ _context4.next = 33;
+ return _this.$store.commit('setRecShopId', shopId);
+ case 33:
+ case "end":
+ return _context4.stop();
+ }
+ }
+ }, _callee4, null, [[16, 25]]);
+ }))();
+ },
+ checkLocationAuth: function checkLocationAuth() {
+ var _this2 = this;
uni.getSetting({
success: function success(res) {
if (!res.authSetting['scope.userLocation']) {
uni.authorize({
scope: 'scope.userLocation',
success: function success() {
- _this.positioning();
+ _this2.positioning();
},
fail: function fail() {
uni.showModal({
@@ -258,16 +357,16 @@
confirmText: '鍘昏缃�',
success: function success(res) {
if (res.confirm) {
- _this.goToAppSetting();
+ _this2.goToAppSetting();
} else {
- _this.$isResolve();
+ _this2.$isResolve();
}
}
});
}
});
} else {
- _this.positioning();
+ _this2.positioning();
}
}
});
--
Gitblit v1.9.3