From 5d8cf4605f393c93cf1556c4d715f391f4158990 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Mon, 7 Jul 2025 20:02:40 +0800 Subject: [PATCH] update --- App.vue | 30 ++- pages/index/index.vue | 4 +- pages/myAddress/newAdd/index.vue | 127 ++------- pages/newMap/index/index.vue | 8 +- pages/order/buyOrder/index.vue | 5 +- pages/order/foodOrder/index.vue | 5 +- pages/otherFunPage/goPublicPage/index.vue | 14 +- pages/payfor/index.vue | 19 +- pages/reservationOrder/index.vue | 5 +- pages/serviceDetail/index.vue | 7 +- pages/serviceList/index.vue | 9 +- pages/shopMallPage/index/index.vue | 4 +- pages/shopMallPage/shopCar/index.vue | 3 + pages/shopMallPage/shopType/index.vue | 4 +- pages/shopPages/settlement/index.vue | 9 +- pages/shopPages/settlementFood/index.vue | 7 +- pages/shopPages/shop/index.vue | 13 +- pages/shopPages/shopDetail/index.vue | 160 ++++++----- pages/useConfig/userInfo.vue | 2 +- pages/user/index.vue | 4 +- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/components/card.js.map | 2 +- .../components/currentService.js.map | 2 +- .../mp-weixin/components/keyboard.js.map | 2 +- .../mp-weixin/components/noData.js.map | 2 +- .../mp-weixin/components/shopTabbar.js.map | 2 +- .../mp-weixin/components/tabbar.js.map | 2 +- .../mp-weixin/pages/allFunPage/index.js.map | 2 +- .../mp-weixin/pages/bindCar/index.js.map | 2 +- .../pages/evaluateList/addEvaluate.js.map | 2 +- .../evaluateList/components/orderItem.js.map | 2 +- .../mp-weixin/pages/evaluateList/index.js.map | 2 +- .../pages/highwayHeadlines/detail.js.map | 2 +- .../pages/highwayHeadlines/index.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../pages/myAddress/address/index.js.map | 2 +- .../pages/myAddress/newAdd/index.js.map | 2 +- .../mp-weixin/pages/newEvaluate/index.js.map | 2 +- .../mp-weixin/pages/newMap/index/index.js.map | 2 +- .../mp-weixin/pages/noDataPage/index.js.map | 2 +- .../buyOrder/components/orderItem.js.map | 2 +- .../pages/order/buyOrder/index.js.map | 2 +- .../foodOrder/components/orderItem.js.map | 2 +- .../pages/order/foodOrder/index.js.map | 2 +- .../pages/order/orderFoodDetail/index.js.map | 2 +- .../pages/order/orderdetail/index.js.map | 2 +- .../pages/otherFunPage/finance/index.js.map | 2 +- .../otherFunPage/goPublicPage/index.js.map | 2 +- .../pages/otherFunPage/insurance/index.js.map | 2 +- .../mp-weixin/pages/payfor/index.js.map | 2 +- .../mp-weixin/pages/register/index.js.map | 2 +- .../pages/reservationOrder/index.js.map | 2 +- .../pages/serviceDetail/index.js.map | 2 +- .../mp-weixin/pages/serviceList/index.js.map | 2 +- .../pages/shopMallPage/index/index.js.map | 2 +- .../pages/shopMallPage/shopCar/index.js.map | 2 +- .../pages/shopMallPage/shopType/index.js.map | 2 +- .../pages/shopMallPage/user/index.js.map | 2 +- .../components/commodityItem.js.map | 2 +- .../components/loading/index.js.map | 2 +- .../settlement/components/orderInfo.js.map | 2 +- .../settlement/components/orderStatus.js.map | 2 +- .../settlement/components/receiveGoods.js.map | 2 +- .../pages/shopPages/settlement/index.js.map | 2 +- .../shopPages/settlementFood/index.js.map | 2 +- .../shop/components/merchantEvaluation.js.map | 2 +- .../pages/shopPages/shop/index.js.map | 2 +- .../pages/shopPages/shopDetail/index.js.map | 2 +- .../pages/shopPages/shopList/index.js.map | 2 +- .../components/merchantEvaluation.js.map | 2 +- .../mp-weixin/pages/storeDetail/index.js.map | 2 +- .../mp-weixin/pages/user/index.js.map | 2 +- .../components/l-dragSort/l-dragSort.js.map | 2 +- .../components/uni-icons/uni-icons.js.map | 2 +- .../components/uni-popup/uni-popup.js.map | 2 +- .../components/uni-rate/uni-rate.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/main.js | 22 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 56 +++- .../dist/dev/mp-weixin/components/card.js | 28 +- .../mp-weixin/components/currentService.js | 28 +- .../mp-weixin/components/currentService.json | 4 +- .../dist/dev/mp-weixin/components/keyboard.js | 28 +- .../dist/dev/mp-weixin/components/noData.js | 28 +- .../dev/mp-weixin/pages/allFunPage/index.js | 32 +-- .../dist/dev/mp-weixin/pages/bindCar/index.js | 2 +- .../evaluateList/components/orderItem.js | 28 +- .../dev/mp-weixin/pages/evaluateList/index.js | 4 +- .../mp-weixin/pages/highwayHeadlines/index.js | 2 +- .../dist/dev/mp-weixin/pages/index/index.js | 4 +- .../mp-weixin/pages/myAddress/newAdd/index.js | 6 +- .../dev/mp-weixin/pages/newMap/index/index.js | 8 +- .../order/buyOrder/components/orderItem.js | 28 +- .../mp-weixin/pages/order/buyOrder/index.js | 42 +-- .../order/foodOrder/components/orderItem.js | 28 +- .../mp-weixin/pages/order/foodOrder/index.js | 43 +-- .../pages/otherFunPage/goPublicPage/index.js | 9 +- .../dist/dev/mp-weixin/pages/payfor/index.js | 9 + .../dev/mp-weixin/pages/payfor/index.wxml | 2 +- .../dev/mp-weixin/pages/payfor/index.wxss | 5 + .../dev/mp-weixin/pages/register/index.js | 32 +-- .../mp-weixin/pages/reservationOrder/index.js | 9 +- .../mp-weixin/pages/serviceDetail/index.js | 37 +-- .../dev/mp-weixin/pages/serviceList/index.js | 7 +- .../pages/shopMallPage/index/index.js | 36 +-- .../pages/shopMallPage/shopCar/index.js | 37 +-- .../pages/shopMallPage/shopType/index.js | 38 +-- .../pages/shopMallPage/user/index.js | 32 +-- .../settlement/components/commodityItem.js | 28 +- .../settlement/components/loading/index.js | 28 +- .../settlement/components/orderInfo.js | 28 +- .../settlement/components/orderStatus.js | 28 +- .../settlement/components/receiveGoods.js | 28 +- .../pages/shopPages/settlement/index.js | 25 +- .../pages/shopPages/settlementFood/index.js | 3 + .../shop/components/merchantEvaluation.js | 30 +-- .../mp-weixin/pages/shopPages/shop/index.js | 76 ++++-- .../pages/shopPages/shopDetail/index.js | 250 ++++++++++-------- .../pages/shopPages/shopList/index.js | 2 +- .../components/merchantEvaluation.js | 30 +-- .../dev/mp-weixin/pages/storeDetail/index.js | 4 +- .../dist/dev/mp-weixin/pages/user/index.js | 4 +- .../components/uni-icons/uni-icons.js | 30 +-- .../components/uni-popup/uni-popup.js | 2 +- .../uni-rate/components/uni-rate/uni-rate.js | 2 +- .../uni-transition/uni-transition.js | 22 +- utils/api.js | 4 + utils/index.js | 55 ++-- 128 files changed, 1048 insertions(+), 858 deletions(-) diff --git a/App.vue b/App.vue index 5ab066a1..773637be 100644 --- a/App.vue +++ b/App.vue @@ -17,7 +17,7 @@ export default { onLaunch: function (options) { console.log("onLaunch", options); this.setVisitChannels(options.scene); - + this.handleGetUserInfo(); let _this = this; uni.getSystemInfo({ success: (res) => { @@ -28,7 +28,7 @@ export default { _this.globalData.hh = hh; }, }); - this.globalData.initReady = this.login().then(() => {}); + this.globalData.initReady = this.login().then(() => { }); // this.globalData.recommendCode = "1"; // this.globalData.recommendId = "2"; @@ -50,8 +50,8 @@ export default { } }); }, - onShow: function () {}, - onHide: function () {}, + onShow: function () { }, + onHide: function () { }, onUnload: function () { this.globalData.recommendCode = null; this.globalData.recommendId = null; @@ -61,6 +61,24 @@ export default { setArea: "setHomeServer", setVisitChannels: "setVisitChannels", }), + handleGetUserInfo() { + wx.request({ + url: "https://qifu-api.baidubce.com/ip/local/geo/v1/district", + success(response) { + const data = response.data; + // 处理数据 + let obj = { + ...data.data, + ip: data.ip, + }; + console.log("obj", obj); + uni.setStorageSync("userInfo", obj); + }, + fail(error) { + // 处理错误 + }, + }); + }, login() { let _this = this; return new Promise((resolve, reject) => { @@ -136,14 +154,14 @@ export default { _this.user.InviteCode = _data.Data.InviteCode || ""; _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || ""; _this.user.NICK_NAME = _data.Data.NICK_NAME || ""; - + _this.user.MEMBERSHIP_MOBILEPHONE = _data.Data.MEMBERSHIP_MOBILEPHONE || ""; // _this.setUser(user); _this.$store.commit("setUser", user); console.log("_this.globalData"); - + } else { // _this.setUser({}); _this.$store.commit("setUser", user); diff --git a/pages/index/index.vue b/pages/index/index.vue index 80af0867..4af9aa93 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -617,7 +617,9 @@ export default { // this.handleAes() - this.$utils.addUserBehaviorNew(); + this.$utils.addUserBehaviorNew({ + behaviorRecordDesc: "进入了首页" + }); }, async onShow() { let currentService = uni.getStorageSync("currentService"); diff --git a/pages/myAddress/newAdd/index.vue b/pages/myAddress/newAdd/index.vue index 87cce696..469e2961 100644 --- a/pages/myAddress/newAdd/index.vue +++ b/pages/myAddress/newAdd/index.vue @@ -4,32 +4,15 @@
收货人
- +
- - - + + + {{ item.name }} @@ -37,42 +20,23 @@
手机号
- +
收货地址 - + {{ saveMsg.address || "请选择收货地址" }} - + -
+
街道地址
- + {{ streetList[streetIndex] && streetList[streetIndex].region_name ? streetList[streetIndex].region_name @@ -85,25 +49,15 @@
详细地址
- +
标签
- {{ u.name }} + {{ u.name }}
@@ -111,13 +65,7 @@

设为默认地址

每次购物时会优先选定该地址,方便您轻松购物

- +