Merge remote-tracking branch 'origin/master'

doum

10 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

@@ -18,8 +18,9 @@
var _uviewUi = _interopRequireDefault(__webpack_require__(/*! uview-ui */ 38));
var _index = _interopRequireDefault(__webpack_require__(/*! ./store/index.js */ 160));
__webpack_require__(/*! ./uni.promisify.adaptor */ 161);
var _httpApi = _interopRequireDefault(__webpack_require__(/*! @/utils/http.api.js */ 162));
var _httpInterceptor = _interopRequireDefault(__webpack_require__(/*! @/utils/http.interceptor.js */ 163));
var _shareMixin = _interopRequireDefault(__webpack_require__(/*! @/utils/shareMixin */ 162));
var _httpApi = _interopRequireDefault(__webpack_require__(/*! @/utils/http.api.js */ 163));
var _httpInterceptor = _interopRequireDefault(__webpack_require__(/*! @/utils/http.interceptor.js */ 164));
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; }
// @ts-ignore
@@ -27,12 +28,13 @@
_vue.default.config.productionTip = false;
_App.default.mpType = 'app';
_vue.default.prototype.$store = _index.default;
_vue.default.prototype.$baseUrl = 'http://192.168.1.37:12015/';
_vue.default.prototype.$baseUrl = 'http://192.168.1.17:12015/';
_vue.default.prototype.$onLaunched = new Promise(function (resolve) {
  _vue.default.prototype.$isResolve = resolve;
});
_vue.default.use(_uviewUi.default);
_index.default.dispatch('getHeight');
_vue.default.mixin(_shareMixin.default);
var app = new _vue.default(_objectSpread({
  store: _index.default
}, _App.default));
@@ -130,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) {
@@ -184,7 +187,7 @@
                            return that.$store.commit('setUserInfo', res.data.member);
                          case 14:
                            _context.next = 16;
                            return that.$store.commit('setOpenId', res.data.member.openid);
                            return that.$store.commit('setOpenId', res.data.member.openId);
                          case 16:
                            _context.next = 18;
                            return that.checkLocationAuth();
@@ -195,7 +198,7 @@
                      }
                    }, _callee);
                  }));
                  function success(_x) {
                  function success(_x2) {
                    return _success.apply(this, arguments);
                  }
                  return success;
@@ -227,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({
@@ -256,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();
          }
        }
      });
@@ -294,13 +395,14 @@
            longitude: addr.longitude
          };
          var qqmapsdk = new QQMapWX({
            key: 'FJKBZ-W5BW3-QGV3M-OEJKT-3H5K7-7FFPM'
            key: 'HEIBZ-QJLLM-SZ36X-6ZBHI-S6Y2J-S6FND'
          });
          console.log(locParam);
          qqmapsdk.reverseGeocoder({
            locParam: locParam,
            success: function success(res) {
              console.log(res, '==================获取地址');
              that.$store.commit('setPosition', res);
              that.$store.commit('setPosition', res.result);
              that.$isResolve();
            },
            fail: function fail(err) {