From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js b/small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js
index a932019..b5c87bd 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -101,7 +101,10 @@
try {
components = {
uIcon: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 498))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 505))
+ },
+ authLogin: function () {
+ return __webpack_require__.e(/*! import() | components/auth-login/auth-login */ "components/auth-login/auth-login").then(__webpack_require__.bind(null, /*! @/components/auth-login/auth-login.vue */ 498))
},
customTabbar: function () {
return __webpack_require__.e(/*! import() | components/custom-tabbar/custom-tabbar */ "components/custom-tabbar/custom-tabbar").then(__webpack_require__.bind(null, /*! @/components/custom-tabbar/custom-tabbar.vue */ 186))
@@ -129,6 +132,11 @@
var _h = _vm.$createElement
var _c = _vm._self._c || _h
var g0 = _vm.pointList.length
+ if (!_vm._isMounted) {
+ _vm.e0 = function ($event) {
+ _vm.showLogin = false
+ }
+ }
_vm.$mp.data = Object.assign(
{},
{
@@ -193,7 +201,7 @@
components: {
CustomTabbar: CustomTabbar
},
- computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight', 'address', 'latitude', 'cityId', 'longitude'])), {}, {
+ computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight', 'address', 'latitude', 'cityId', 'longitude', 'token'])), {}, {
currentAddress: function currentAddress() {
return this.address && this.address !== '瀹氫綅涓�' ? this.address : '鑾峰彇瀹氫綅';
}
@@ -202,7 +210,9 @@
return {
bannerList: [],
pointList: [],
- ingOrder: null
+ ingOrder: null,
+ showLogin: false,
+ pendingNavigate: null
};
},
onLoad: function onLoad() {
@@ -235,6 +245,16 @@
onShow: function onShow() {
this.ingOrder = null;
this.getIngorder();
+ },
+ watch: {
+ token: function token(newToken) {
+ if (newToken && this.pendingNavigate) {
+ var fn = this.pendingNavigate;
+ this.pendingNavigate = null;
+ this.showLogin = false;
+ fn();
+ }
+ }
},
methods: {
jumpBannerDetail: function jumpBannerDetail(item) {
@@ -281,12 +301,28 @@
}))();
},
jumpOrderList: function jumpOrderList(status) {
+ var _this3 = this;
+ if (!this.token) {
+ this.pendingNavigate = function () {
+ return _this3.jumpOrderList(status);
+ };
+ this.showLogin = true;
+ return;
+ }
uni.setStorageSync("orderStatus", status);
uni.switchTab({
url: '/pages/itinerary/itinerary'
});
},
jumpxiadan: function jumpxiadan() {
+ var _this4 = this;
+ if (!this.token) {
+ this.pendingNavigate = function () {
+ return _this4.jumpxiadan();
+ };
+ this.showLogin = true;
+ return;
+ }
if (!this.cityId) return uni.showToast({
title: '褰撳墠鍩庡競鏆傛湭寮�閫�',
icon: 'none'
@@ -296,7 +332,7 @@
});
},
getBannerList: function getBannerList() {
- var _this3 = this;
+ var _this5 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
var res;
return _regenerator.default.wrap(function _callee3$(_context3) {
@@ -304,13 +340,13 @@
switch (_context3.prev = _context3.next) {
case 0:
_context3.next = 2;
- return _this3.$u.api.getBannerList({
+ return _this5.$u.api.getBannerList({
position: 0
});
case 2:
res = _context3.sent;
if (res.code === 200) {
- _this3.bannerList = res.data || [];
+ _this5.bannerList = res.data || [];
}
case 4:
case "end":
@@ -321,7 +357,7 @@
}))();
},
getNearbyShopList: function getNearbyShopList() {
- var _this4 = this;
+ var _this6 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
var res;
return _regenerator.default.wrap(function _callee4$(_context4) {
@@ -329,20 +365,20 @@
switch (_context4.prev = _context4.next) {
case 0:
_context4.next = 2;
- return _this4.$u.api.getNearbyShopList({
+ return _this6.$u.api.getNearbyShopList({
capacity: 5,
page: 1,
model: {
- latitude: _this4.latitude,
- longitude: _this4.longitude,
- cityId: _this4.cityId,
+ latitude: _this6.latitude,
+ longitude: _this6.longitude,
+ cityId: _this6.cityId,
sortType: 1
}
});
case 2:
res = _context4.sent;
if (res.code === 200) {
- _this4.pointList = res.data.records || [];
+ _this6.pointList = res.data.records || [];
}
case 4:
case "end":
@@ -421,7 +457,6 @@
that.$store.commit('setPosition', locParam);
that.$store.commit('clearCityId');
that.pointList = [];
- that.getNearbyShopList();
}
case 10:
case "end":
--
Gitblit v1.9.3