From d2e0df9f3a5b180f88e19fa63dd638eb92ec625e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 22:03:45 +0800
Subject: [PATCH] 支付宝支付ddd
---
small-program/unpackage/dist/dev/mp-weixin/common/main.js | 64 +++++++++----------------------
1 files changed, 19 insertions(+), 45 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/common/main.js b/small-program/unpackage/dist/dev/mp-weixin/common/main.js
index 388a19e..c29984c 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/common/main.js
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["common/main"],{0:function(e,t,n){"use strict";(function(e,t){var o=n(4),r=o(n(11));n(30);var i=o(n(31)),c=o(n(25));n(42);var a=o(n(43)),s=o(n(44)),u=o(n(162)),f=o(n(163));function d(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function l(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?d(Object(n),!0).forEach((function(t){(0,r.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):d(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}e.__webpack_require_UNI_MP_PLUGIN__=n,c.default.use(s.default),c.default.config.productionTip=!1,i.default.mpType="app",c.default.prototype.$store=a.default,a.default.dispatch("getHeight"),c.default.prototype.$onLaunched=new Promise((function(e){c.default.prototype.$isResolve=e})),c.default.prototype.$baseUrl="http://192.168.1.4:10011";var p=new c.default(l({store:a.default},i.default));c.default.use(u.default,p),c.default.use(f.default,p),t(p).$mount()}).call(this,n(1)["default"],n(2)["createApp"])},31:function(e,t,n){"use strict";n.r(t);var o=n(32);for(var r in o)["default"].indexOf(r)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(r);n(39);var i,c,a,s,u=n(41),f=Object(u["default"])(o["default"],i,c,!1,null,null,null,!1,a,s);f.options.__file="App.vue",t["default"]=f.exports},32:function(e,t,n){"use strict";n.r(t);var o=n(33),r=n.n(o);for(var i in o)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(i);t["default"]=r.a},33:function(e,t,n){"use strict";(function(e){var o=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=o(n(34)),i=o(n(36)),c=o(n(11)),a=n(37);function s(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}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=n(38),d={computed:u({},(0,a.mapState)(["userInfo","token"])),onLaunch:function(){var t=(0,i.default)(r.default.mark((function t(){var n,o;return r.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:if(n=this,this.token){t.next=5;break}e.login({provider:"weixin",success:function(){var e=(0,i.default)(r.default.mark((function e(t){var o,i;return r.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return o=t.code,e.next=3,n.$u.api.wxLogin({code:o});case 3:if(i=e.sent,!i||200!==i.code){e.next=19;break}if(console.log(i,"==================鐧诲綍鎴愬姛"),!i.data.openid){e.next=9;break}return e.next=9,n.$store.commit("setOpenid",i.data.openid);case 9:if(!i.data.token){e.next=12;break}return e.next=12,n.$store.commit("setToken",i.data.token);case 12:if(!i.data.member){e.next=17;break}return e.next=15,n.$store.commit("setUserInfo",i.data.member);case 15:return e.next=17,n.$store.commit("setOpenid",i.data.member.openId);case 17:return e.next=19,n.checkLocationAuth();case 19: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,n.$u.api.getMemberInfo({});case 7:if(o=t.sent,200!==o.code){t.next=13;break}return t.next=11,n.$store.commit("setUserInfo",o.data);case 11:return t.next=13,n.$store.commit("setOpenid",o.data.openid);case 13:return t.next=15,n.checkLocationAuth();case 15:case"end":return t.stop()}}),t,this)})));function n(){return t.apply(this,arguments)}return n}(),onShow:function(){},onHide:function(){console.log("App Hide")},methods:{positioning:function(){var t=this;e.getLocation({type:"gcj02",highAccuracyExpireTime:3e3,isHighAccuracy:!0,success:function(n){var o={latitude:n.latitude,longitude:n.longitude};e.setStorageSync("address",o);var c=new f.AMapWX({key:"e4d46c87adf151dca20060317592b1b6"});c.getRegeo({location:n.longitude+","+n.latitude,success:function(){var e=(0,i.default)(r.default.mark((function e(n){var i,c,a;return r.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return console.log(n,"==================鑾峰彇鍦板潃"),i=n[0],o.province=i.province,o.city=i.regeocodeData.addressComponent.city,c=i.name||"鍦板潃鑾峰彇澶辫触",o.address=c,e.next=8,t.$u.api.getCityByName({cityName:o.city});case 8:a=e.sent,200===a.code&&(o.cityId=a.data.id),t.$store.commit("setPosition",o),t.$isResolve();case 12:case"end":return e.stop()}}),e)})));function n(t){return e.apply(this,arguments)}return n}(),fail:function(e){console.error("鑾峰彇浣嶇疆澶辫触===========",e),t.$store.commit("setPosition",o),t.$isResolve()}})}})},goToAppSetting:function(){var t=this;e.openSetting({success:function(e){e.authSetting["scope.userLocation"]&&t.positioning(),t.$isResolve()}})},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()}})}})}})},getLocaltionBiz:function(){var t=this;e.getLocation({type:"wgs84",success:function(n){var o={latitude:n.latitude,longitude:n.longitude};e.setStorageSync("address",o);var r=new f.AMapWX({key:"f2e6c0bfcac14c27b4f0d6d0d5b9d7d"});r.getRegeo({location:n.longitude+","+n.latitude,success:function(e){console.log(e,"==================鑾峰彇鍦板潃");var n=e[0];o.province=n.province,o.city=n.city,o.area=n.district,o.street=n.street;var r=n.name||"鍦板潃鑾峰彇澶辫触";o.address=r,t.$store.commit("setPosition",o),t.$isResolve()},fail:function(e){console.error("鑾峰彇浣嶇疆澶辫触===========",e),t.$store.commit("setPosition",o),t.$isResolve()}}),t.$isResolve()},fail:function(e){console.error("鑾峰彇浣嶇疆澶辫触",e),t.$isResolve()}})}}};t.default=d}).call(this,n(2)["default"])},39:function(e,t,n){"use strict";n.r(t);var o=n(40),r=n.n(o);for(var i in o)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(i);t["default"]=r.a},40:function(e,t,n){}},[[0,"common/runtime","common/vendor"]]]);
-=======
(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["common/main"],{
/***/ 0:
@@ -28,6 +25,12 @@
// @ts-ignore
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
_vue.default.use(_uviewUi.default);
+var AuthLogin = function AuthLogin() {
+ __webpack_require__.e(/*! require.ensure | components/auth-login/auth-login */ "components/auth-login/auth-login").then((function () {
+ return resolve(__webpack_require__(/*! @/components/auth-login/auth-login.vue */ 507));
+ }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+};
+_vue.default.component('auth-login', AuthLogin);
_vue.default.config.productionTip = false;
_App.default.mpType = 'app';
_vue.default.prototype.$store = _index.default;
@@ -35,9 +38,10 @@
_vue.default.prototype.$onLaunched = new Promise(function (resolve) {
_vue.default.prototype.$isResolve = resolve;
});
-_vue.default.prototype.$baseUrl = 'http://192.168.1.4:10011';
-// Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.4:10011'
+_vue.default.prototype.$baseUrl = 'https://llfc.lmpro.cn/nyx_web/';
+_vue.default.prototype.$gaodeMapKey = 'e4d46c87adf151dca20060317592b1b6';
var app = new _vue.default(_objectSpread({
store: _index.default
}, _App.default));
@@ -131,7 +135,6 @@
var _vuex = __webpack_require__(/*! vuex */ 37);
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
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 QQMapWX = require('@/utils/qqmap-wx-jssdk.js')
var amapFile = __webpack_require__(/*! @/utils/amap-wx.130.js */ 38);
var _default = {
computed: _objectSpread({}, (0, _vuex.mapState)(['userInfo', 'token'])),
@@ -223,7 +226,7 @@
return that.$store.commit('setUserInfo', res.data);
case 11:
_context2.next = 13;
- return that.$store.commit('setOpenid', res.data.openId);
+ return that.$store.commit('setOpenid', res.data.openid);
case 13:
_context2.next = 15;
return that.checkLocationAuth();
@@ -258,10 +261,8 @@
latitude: addr.latitude,
longitude: addr.longitude
};
- uni.setStorageSync('address', locParam);
- var address = null;
var myAmapFun = new amapFile.AMapWX({
- key: 'e4d46c87adf151dca20060317592b1b6'
+ key: that.$gaodeMapKey
});
myAmapFun.getRegeo({
location: addr.longitude + ',' + addr.latitude,
@@ -272,11 +273,11 @@
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
- console.log(data, '==================鑾峰彇鍦板潃');
info = data[0];
+ console.log(info, '==================鑾峰彇鍦板潃');
locParam.province = info.province;
locParam.city = info.regeocodeData.addressComponent.city;
- ta = info.name || '鍦板潃鑾峰彇澶辫触';
+ ta = info.desc || '鍦板潃鑾峰彇澶辫触';
locParam.address = ta;
_context3.next = 8;
return that.$u.api.getCityByName({
@@ -284,12 +285,15 @@
});
case 8:
resCity = _context3.sent;
- if (resCity.code === 200) {
+ if (resCity.code === 200 && resCity.data) {
locParam.cityId = resCity.data.id;
+ that.$store.commit('setPosition', locParam);
+ } else {
+ that.$store.commit('setPosition', locParam);
+ that.$store.commit('clearCityId');
}
- that.$store.commit('setPosition', locParam);
that.$isResolve();
- case 12:
+ case 11:
case "end":
return _context3.stop();
}
@@ -307,35 +311,6 @@
that.$isResolve();
}
});
-
- // const qqmapsdk = new QQMapWX({
- // key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE'
- // });
- // qqmapsdk.reverseGeocoder({
- // locParam,
- // success: async function(res) {
- // console.log(res, '==================鑾峰彇鍦板潃');
- // let info = res.result;
- // locParam.province = info.address_component.province;
- // locParam.city = info.address_component.city;
- // locParam.area = info.address_component.district;
- // locParam.street = info.address_component.street;
- // var ta = info.address || '鍦板潃鑾峰彇澶辫触' ;
- // if(info.formatted_addresses && info.formatted_addresses.recommend){
- // ta =info.formatted_addresses.recommend
- // }
- // locParam.address =ta
- // const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
- // if (resCity.code === 200) {
- // locParam.cityId = resCity.data.id
- // }
- // that.$store.commit('setPosition',locParam)
- // that.$isResolve()
- // },
- // fail: (err) => {
- // that.$isResolve()
- // }
- // });
}
});
},
@@ -460,5 +435,4 @@
/***/ })
},[[0,"common/runtime","common/vendor"]]]);
->>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
//# sourceMappingURL=../../.sourcemap/mp-weixin/common/main.js.map
\ No newline at end of file
--
Gitblit v1.9.3