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 | 117 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 61 insertions(+), 56 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 e0eb091..c29984c 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/common/main.js
@@ -25,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;
@@ -32,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));
@@ -128,7 +135,7 @@
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 = __webpack_require__(/*! @/utils/qqmap-wx-jssdk.js */ 38);
+var amapFile = __webpack_require__(/*! @/utils/amap-wx.130.js */ 38);
var _default = {
computed: _objectSpread({}, (0, _vuex.mapState)(['userInfo', 'token'])),
onLaunch: function () {
@@ -160,36 +167,38 @@
case 3:
res = _context.sent;
if (!(res && res.code === 200)) {
- _context.next = 18;
+ _context.next = 19;
break;
}
+ console.log(res, '==================鐧诲綍鎴愬姛');
+ // 鍒ゆ柇鏈夋棤openid
if (!res.data.openid) {
- _context.next = 8;
+ _context.next = 9;
break;
}
- _context.next = 8;
- return that.$store.commit('setOpenId', res.data.openid);
- case 8:
+ _context.next = 9;
+ return that.$store.commit('setOpenid', res.data.openid);
+ case 9:
if (!res.data.token) {
- _context.next = 11;
+ _context.next = 12;
break;
}
- _context.next = 11;
+ _context.next = 12;
return that.$store.commit('setToken', res.data.token);
- case 11:
+ case 12:
if (!res.data.member) {
- _context.next = 16;
+ _context.next = 17;
break;
}
- _context.next = 14;
+ _context.next = 15;
return that.$store.commit('setUserInfo', res.data.member);
- case 14:
- _context.next = 16;
- return that.$store.commit('setOpenId', res.data.member.openId);
- case 16:
- _context.next = 18;
+ case 15:
+ _context.next = 17;
+ return that.$store.commit('setOpenid', res.data.member.openId);
+ case 17:
+ _context.next = 19;
return that.checkLocationAuth();
- case 18:
+ case 19:
case "end":
return _context.stop();
}
@@ -217,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();
@@ -252,41 +261,39 @@
latitude: addr.latitude,
longitude: addr.longitude
};
- var qqmapsdk = new QQMapWX({
- key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE'
+ var myAmapFun = new amapFile.AMapWX({
+ key: that.$gaodeMapKey
});
- qqmapsdk.reverseGeocoder({
- locParam: locParam,
+ myAmapFun.getRegeo({
+ location: addr.longitude + ',' + addr.latitude,
success: function () {
- var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(res) {
+ var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
var info, ta, resCity;
return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
- console.log(res, '==================鑾峰彇鍦板潃');
- 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;
- ta = info.address || '鍦板潃鑾峰彇澶辫触';
- if (info.formatted_addresses && info.formatted_addresses.recommend) {
- ta = info.formatted_addresses.recommend;
- }
+ info = data[0];
+ console.log(info, '==================鑾峰彇鍦板潃');
+ locParam.province = info.province;
+ locParam.city = info.regeocodeData.addressComponent.city;
+ ta = info.desc || '鍦板潃鑾峰彇澶辫触';
locParam.address = ta;
- _context3.next = 11;
+ _context3.next = 8;
return that.$u.api.getCityByName({
cityName: locParam.city
});
- case 11:
+ 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 15:
+ case 11:
case "end":
return _context3.stop();
}
@@ -299,6 +306,8 @@
return success;
}(),
fail: function fail(err) {
+ console.error('鑾峰彇浣嶇疆澶辫触===========', err);
+ that.$store.commit('setPosition', locParam);
that.$isResolve();
}
});
@@ -358,23 +367,19 @@
};
uni.setStorageSync('address', locParam);
var address = null;
- var qqmapsdk = new QQMapWX({
- key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE' //鑵捐鍦板浘鐢宠鐨刱ey锛堝悗缁渶瑕佸叕鍙告彁渚涳紝涓汉寮�鍙戣�呴搴︽湁闄愶級
+ var myAmapFun = new amapFile.AMapWX({
+ key: 'f2e6c0bfcac14c27b4f0d6d0d5b9d7d'
});
- // 鑵捐鍦板浘閫嗗湴鐞嗙紪鐮�
- qqmapsdk.reverseGeocoder({
- locParam: locParam,
- success: function success(res) {
- console.log(res, '==================鑾峰彇鍦板潃');
- var 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;
- }
+ myAmapFun.getRegeo({
+ location: addr.longitude + ',' + addr.latitude,
+ success: function success(data) {
+ console.log(data, '==================鑾峰彇鍦板潃');
+ var info = data[0];
+ locParam.province = info.province;
+ locParam.city = info.city;
+ locParam.area = info.district;
+ locParam.street = info.street;
+ var ta = info.name || '鍦板潃鑾峰彇澶辫触';
locParam.address = ta;
that.$store.commit('setPosition', locParam);
that.$isResolve();
--
Gitblit v1.9.3