From 1e6a4364d6e2636522aa4e1f679fb3b8f8997046 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 15:07:49 +0800
Subject: [PATCH] 合并
---
mini-program/unpackage/dist/dev/mp-weixin/common/main.js | 142 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 130 insertions(+), 12 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 7f5252f..0ee4c89 100644
--- a/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["common/main"],{0:function(e,t,n){"use strict";(function(e,t){var r=n(4),o=r(n(11));n(26);var c=r(n(27)),i=r(n(25)),a=r(n(38)),u=r(n(160));n(161);var s=r(n(162)),f=r(n(163)),d=r(n(164));function l(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 p(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?l(Object(n),!0).forEach((function(t){(0,o.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}e.__webpack_require_UNI_MP_PLUGIN__=n,i.default.config.productionTip=!1,c.default.mpType="app",i.default.prototype.$store=u.default,i.default.prototype.$baseUrl="http://192.168.0.7/dmmall_web_api/",i.default.prototype.$onLaunched=new Promise((function(e){i.default.prototype.$isResolve=e})),i.default.use(a.default),u.default.dispatch("getHeight"),i.default.mixin(s.default);var h=new i.default(p({store:u.default},c.default));i.default.use(f.default,h),i.default.use(d.default,h),t(h).$mount()}).call(this,n(1)["default"],n(2)["createApp"])},27:function(e,t,n){"use strict";n.r(t);var r=n(28);for(var o in r)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(o);n(35);var c,i,a,u,s=n(37),f=Object(s["default"])(r["default"],c,i,!1,null,null,null,!1,a,u);f.options.__file="App.vue",t["default"]=f.exports},28:function(e,t,n){"use strict";n.r(t);var r=n(29),o=n.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);t["default"]=o.a},29: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(30)),c=r(n(32)),i=r(n(11)),a=n(33);function u(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?u(Object(n),!0).forEach((function(t){(0,i.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):u(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var f=n(34),d={computed:s({},(0,a.mapState)(["userInfo","token"])),onLaunch:function(){var t=(0,c.default)(o.default.mark((function t(n){var r,i;return o.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:if(r=this,this.token){t.next=5;break}e.login({provider:"weixin",success:function(){var e=(0,c.default)(o.default.mark((function e(t){var n,c;return o.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return n=t.code,e.next=3,r.$u.api.wxLogin({code:n});case 3:if(c=e.sent,200!==c.code){e.next=18;break}if(!c.data.openid){e.next=8;break}return e.next=8,r.$store.commit("setOpenId",c.data.openid);case 8:if(!c.data.token){e.next=11;break}return e.next=11,r.$store.commit("setToken",c.data.token);case 11:if(!c.data.member){e.next=16;break}return e.next=14,r.$store.commit("setUserInfo",c.data.member);case 14:return e.next=16,r.$store.commit("setOpenId",c.data.member.openId);case 16:return e.next=18,r.checkLocationAuth();case 18:case"end":return e.stop()}}),e)})));function t(t){return e.apply(this,arguments)}return t}()}),t.next=15;break;case 5:return t.next=7,r.$u.api.getUserInfo();case 7:if(i=t.sent,200!==i.code){t.next=13;break}return t.next=11,r.$store.commit("setUserInfo",i.data);case 11:return t.next=13,r.$store.commit("setOpenId",i.data.openId);case 13:return t.next=15,r.checkLocationAuth();case 15:case"end":return t.stop()}}),t,this)})));function n(e){return t.apply(this,arguments)}return n}(),onShow:function(){var e=(0,c.default)(o.default.mark((function e(t){return o.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:this.dealRecShopUserBiz(t),this.getBackgroundImg();case 2:case"end":return e.stop()}}),e,this)})));function t(t){return e.apply(this,arguments)}return t}(),onHide:function(){console.log("App Hide")},methods:{getBackgroundImg:function(){this.$u.api.getPlatformAboutUs({}).then((function(t){if(200===t.code){var n={shopIntegralBg:t.data.shopIntegralBg,userInviteBg:t.data.userInviteBg,userShareBg:t.data.userShareBg,centerInviteBg:t.data.centerInviteBg};e.setStorageSync("backgroundImage",n)}}))},dealRecShopUserBiz:function(e){var t=this;return(0,c.default)(o.default.mark((function n(){var r,c,i,a,u;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:if(!e.query||!e.query.userId){n.next=4;break}if(t.userInfo&&t.userInfo.id){n.next=4;break}return n.next=4,t.$store.commit("setRecUserId",e.query.userId);case 4:if(!(e.query&&e.query.scene&&e.query.scene.length)){n.next=32;break}if(!(e.query.scene.indexOf("sid_")>=0)){n.next=32;break}if(r=e.query.scene.indexOf("sid_")+4,c="",i=e.query.scene.length,a=e.query.scene.slice(r,i),i=a.length,a.indexOf("&")>0&&(i=a.indexOf("&")),i>0&&(c=a.slice(0,i)),!c){n.next=32;break}if(!t.userInfo||!t.userInfo.id){n.next=30;break}return n.prev=15,n.next=18,t.$u.api.bindShopInfo({code:code});case 18:if(u=n.sent,200==u.code){n.next=22;break}return n.next=22,t.$store.commit("setRecShopId",c);case 22:n.next=28;break;case 24:return n.prev=24,n.t0=n["catch"](15),n.next=28,t.$store.commit("setRecShopId",c);case 28:n.next=32;break;case 30:return n.next=32,t.$store.commit("setRecShopId",c);case 32:case"end":return n.stop()}}),n,null,[[15,24]])})))()},checkLocationAuth:function(){var t=this;e.getSetting({success:function(n){n.authSetting["scope.userLocation"]?t.positioning():e.authorize({scope:"scope.userLocation",success:function(){t.positioning()},fail:function(){e.showModal({title:"鎻愮ず",content:"闇�瑕佽幏鍙栨偍鐨勪綅缃俊鎭紝璇峰湪璁剧疆涓紑鍚綅缃潈闄�",confirmText:"鍘昏缃�",success:function(e){e.confirm?t.goToAppSetting():t.$isResolve()}})}})}})},goToAppSetting:function(){var t=this;e.openSetting({success:function(e){e.authSetting["scope.userLocation"]&&t.positioning(),t.$isResolve()}})},positioning:function(){var t=this;e.getLocation({type:"gcj02",highAccuracyExpireTime:3e3,isHighAccuracy:!0,success:function(e){var n={latitude:e.latitude,longitude:e.longitude},r=new f({key:"HEIBZ-QJLLM-SZ36X-6ZBHI-S6Y2J-S6FND"});console.log(n),r.reverseGeocoder({locParam:n,success:function(e){console.log(e,"==================鑾峰彇鍦板潃"),t.$store.commit("setPosition",e.result),t.$isResolve()},fail:function(e){console.error("鑾峰彇浣嶇疆澶辫触===========",e),t.$isResolve()}})}})}}};t.default=d}).call(this,n(2)["default"])},35:function(e,t,n){"use strict";n.r(t);var r=n(36),o=n.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(c);t["default"]=o.a},36:function(e,t,n){}},[[0,"common/runtime","common/vendor"]]]);
+=======
(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["common/main"],{
/***/ 0:
@@ -28,7 +31,9 @@
_vue.default.config.productionTip = false;
_App.default.mpType = 'app';
_vue.default.prototype.$store = _index.default;
-_vue.default.prototype.$baseUrl = 'http://192.168.1.17:12015/';
+_vue.default.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/';
+// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
+
_vue.default.prototype.$onLaunched = new Promise(function (resolve) {
_vue.default.prototype.$isResolve = resolve;
});
@@ -132,12 +137,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 +203,7 @@
}
}, _callee);
}));
- function success(_x) {
+ function success(_x2) {
return _success.apply(this, arguments);
}
return success;
@@ -229,27 +235,138 @@
}
}, _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);
+ this.getBackgroundImg();
+ case 2:
+ 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() {
+ getBackgroundImg: function getBackgroundImg() {
+ this.$u.api.getPlatformAboutUs({}).then(function (res) {
+ if (res.code === 200) {
+ var obj = {
+ shopIntegralBg: res.data.shopIntegralBg,
+ userInviteBg: res.data.userInviteBg,
+ userShareBg: res.data.userShareBg,
+ centerInviteBg: res.data.centerInviteBg
+ };
+ uni.setStorageSync('backgroundImage', obj);
+ }
+ });
+ },
+ 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:
+ if (!(options.query && options.query.userId)) {
+ _context4.next = 4;
+ break;
+ }
+ if (!(!_this.userInfo || !_this.userInfo.id)) {
+ _context4.next = 4;
+ break;
+ }
+ _context4.next = 4;
+ return _this.$store.commit('setRecUserId', options.query.userId);
+ case 4:
+ if (!(options.query && options.query.scene && options.query.scene.length)) {
+ _context4.next = 32;
+ break;
+ }
+ if (!(options.query.scene.indexOf("sid_") >= 0)) {
+ _context4.next = 32;
+ 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 = 32;
+ break;
+ }
+ if (!(_this.userInfo && _this.userInfo.id)) {
+ _context4.next = 30;
+ break;
+ }
+ _context4.prev = 15;
+ _context4.next = 18;
+ return _this.$u.api.bindShopInfo({
+ code: code
+ });
+ case 18:
+ res = _context4.sent;
+ if (!(res.code != 200)) {
+ _context4.next = 22;
+ break;
+ }
+ _context4.next = 22;
+ return _this.$store.commit('setRecShopId', shopId);
+ case 22:
+ _context4.next = 28;
+ break;
+ case 24:
+ _context4.prev = 24;
+ _context4.t0 = _context4["catch"](15);
+ _context4.next = 28;
+ return _this.$store.commit('setRecShopId', shopId);
+ case 28:
+ _context4.next = 32;
+ break;
+ case 30:
+ _context4.next = 32;
+ return _this.$store.commit('setRecShopId', shopId);
+ case 32:
+ case "end":
+ return _context4.stop();
+ }
+ }
+ }, _callee4, null, [[15, 24]]);
+ }))();
+ },
+ 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 +375,16 @@
confirmText: '鍘昏缃�',
success: function success(res) {
if (res.confirm) {
- _this.goToAppSetting();
+ _this2.goToAppSetting();
} else {
- _this.$isResolve();
+ _this2.$isResolve();
}
}
});
}
});
} else {
- _this.positioning();
+ _this2.positioning();
}
}
});
@@ -351,4 +468,5 @@
/***/ })
},[[0,"common/runtime","common/vendor"]]]);
+>>>>>>> 8fd09daba5c89106b4a9aacd8d5ef9354afc93be
//# sourceMappingURL=../../.sourcemap/mp-weixin/common/main.js.map
\ No newline at end of file
--
Gitblit v1.9.3