Merge remote-tracking branch 'origin/master'

doum

2026-04-21 3539d67072a5fd179bd44385ebefce0d1a6e8cb4

 small-program/unpackage/dist/dev/mp-weixin/common/main.js

@@ -128,7 +128,8 @@
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 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'])),
  onLaunch: function () {
@@ -160,36 +161,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 +220,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,56 +255,60 @@
            latitude: addr.latitude,
            longitude: addr.longitude
          };
          var qqmapsdk = new QQMapWX({
            key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE'
          uni.setStorageSync('address', locParam);
          var address = null;
          var myAmapFun = new amapFile.AMapWX({
            key: 'e4d46c87adf151dca20060317592b1b6'
          });
          qqmapsdk.reverseGeocoder({
            locParam: locParam,
            success: function () {
              var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(res) {
                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;
                        }
                        locParam.address = ta;
                        _context3.next = 11;
                        return that.$u.api.getCityByName({
                          cityName: locParam.city
                        });
                      case 11:
                        resCity = _context3.sent;
                        if (resCity.code === 200) {
                          locParam.cityId = resCity.data.id;
                        }
                        that.$store.commit('setPosition', locParam);
                        that.$isResolve();
                      case 15:
                      case "end":
                        return _context3.stop();
                    }
                  }
                }, _callee3);
              }));
              function success(_x2) {
                return _success2.apply(this, arguments);
              }
              return success;
            }(),
          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();
            },
            fail: function fail(err) {
              console.error('获取位置失败===========', err);
              that.$store.commit('setPosition', locParam);
              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()
          //    }
          // });
        }
      });
    },
@@ -358,23 +365,19 @@
          };
          uni.setStorageSync('address', locParam);
          var address = null;
          var qqmapsdk = new QQMapWX({
            key: 'WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE' //腾讯地图申请的key（后续需要公司提供，个人开发者额度有限）
          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();