From 6ec8d1ea2c3bd503c68fa827aaeb747678f35894 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Fri, 17 Oct 2025 09:55:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=A7=E9=97=B8=E8=9F=B9=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E5=AD=A3=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 19 + static/js/request.js | 8 +- subPackages/activity/dzxConSeason.vue | 455 +++++++++++++++ subPackages/activity/dzxConSeasonNH.vue | 310 ++++++++++ subPackages/activity/dzxConSeasonPrize.vue | 650 +++++++++++++++++++++ subPackages/order/orderDetail.vue | 16 +- 6 files changed, 1453 insertions(+), 5 deletions(-) create mode 100644 subPackages/activity/dzxConSeason.vue create mode 100644 subPackages/activity/dzxConSeasonNH.vue create mode 100644 subPackages/activity/dzxConSeasonPrize.vue diff --git a/pages.json b/pages.json index fc7fa14..4705ad1 100644 --- a/pages.json +++ b/pages.json @@ -374,6 +374,25 @@ "navigationBarTitleText" : "绿色有机标准认证" } }, + { + "path": "activity/dzxConSeason", + "style": { + "navigationBarTitleText" : "" + } + }, + { + "path": "activity/dzxConSeasonNH", + "style": { + "navigationBarTitleText" : "" + } + }, + { + "path": "activity/dzxConSeasonPrize", + "style": { + "navigationBarTitleText" : "" + } + }, + { "path": "activity/prizeInQun", "style": { diff --git a/static/js/request.js b/static/js/request.js index 39bf379..cfb2213 100644 --- a/static/js/request.js +++ b/static/js/request.js @@ -3,10 +3,10 @@ import store from '@/store'; // 定义 API URL // const DEV_API_URL = 'https://api.cloud.sz-trip.com'; -// const DEV_API_URL = 'https://api.sutenong.com' -// const PROD_API_URL = 'https://api.sutenong.com'; -const DEV_API_URL = 'https://swsz.api.js-dyyj.com'; -const PROD_API_URL = 'https://swsz.api.js-dyyj.com'; +const DEV_API_URL = 'https://api.sutenong.com' +const PROD_API_URL = 'https://api.sutenong.com'; +// const DEV_API_URL = 'https://swsz.api.js-dyyj.com'; +// const PROD_API_URL = 'https://swsz.api.js-dyyj.com'; const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL; // 获取token diff --git a/subPackages/activity/dzxConSeason.vue b/subPackages/activity/dzxConSeason.vue new file mode 100644 index 0000000..d717bd1 --- /dev/null +++ b/subPackages/activity/dzxConSeason.vue @@ -0,0 +1,455 @@ + + + + + \ No newline at end of file diff --git a/subPackages/activity/dzxConSeasonNH.vue b/subPackages/activity/dzxConSeasonNH.vue new file mode 100644 index 0000000..a906ca6 --- /dev/null +++ b/subPackages/activity/dzxConSeasonNH.vue @@ -0,0 +1,310 @@ + + + + + \ No newline at end of file diff --git a/subPackages/activity/dzxConSeasonPrize.vue b/subPackages/activity/dzxConSeasonPrize.vue new file mode 100644 index 0000000..a8b8dc2 --- /dev/null +++ b/subPackages/activity/dzxConSeasonPrize.vue @@ -0,0 +1,650 @@ + + + + + \ No newline at end of file diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue index b21a2bf..a0ee866 100644 --- a/subPackages/order/orderDetail.vue +++ b/subPackages/order/orderDetail.vue @@ -123,7 +123,10 @@ {{item.consignee_info.address}} - 快递查询 + + 快递查询 + 确认收货 + @@ -677,6 +680,17 @@ }) }, + confirmDelivery (item) { + let _this = this + this.Post({ + order_id: item.order_id, + },"/api/order/confirm_post").then(function (res) { + if (res) { + _this.getDetail(); + } + }) + }, + // 去评价 goComment (item) { if (item) { From 90c0412f58d2b6639d0bbcdfc39dc86efb948fb0 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Fri, 17 Oct 2025 15:06:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/user.vue | 13 +++++++------ subPackages/order/orderCoupon.vue | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pages/user/user.vue b/pages/user/user.vue index 219cdf3..757c9b1 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -571,7 +571,7 @@ .top-image{ width: 100%; height: 453.43rpx; - background-image: url("https://static.ticket.sz-trip.com/uploads/20251011/a1f6b25761ddebba529d822db1d54497.png"); + background-image: url("https://static.ticket.sz-trip.com/uploads/20251017/c379eef9b7d2ea51575f4f427db0370f.png"); background-size: 100% 100%; padding-top: 215rpx; padding-right: 26rpx; @@ -582,7 +582,7 @@ } .main-content{ width: 750rpx; - background: linear-gradient( 180deg, #FFFFFF 0%, #F1F2F4 100%); + background: linear-gradient( 180deg, #FFFFFF 100rpx, #F5F5F5 200rpx); border-radius: 43rpx 43rpx 0rpx 0rpx; position: relative; margin-top: -50rpx; @@ -728,7 +728,7 @@ background: #FFFFFF; border-radius: 21rpx 21rpx 21rpx 21rpx; margin: 20rpx auto 0; - padding: 27rpx 0; + padding: 27rpx 0 1rpx; font-weight: 500; font-size: 32rpx; color: #1C1C1C; @@ -1056,11 +1056,12 @@ background-size: 100% 100%; width: 239.33rpx; height: 52rpx; - font-weight: 500; - font-size: 29rpx; - color: #212A0D; text-align: center; line-height: 52rpx; + font-family: Alibaba PuHuiTi, Alibaba PuHuiTi; + font-weight: 500; + font-size: 36rpx; + color: #3D3D3D; } // .type-item.active{ // font-weight: 500; diff --git a/subPackages/order/orderCoupon.vue b/subPackages/order/orderCoupon.vue index 1870428..284235c 100644 --- a/subPackages/order/orderCoupon.vue +++ b/subPackages/order/orderCoupon.vue @@ -20,7 +20,7 @@ {{item.activity.name}} - + {{item.get_date.slice(0,10)}}-{{item.end_time.slice(0,10)}}可用 From af7953b78f5a3b8cf699d8177a14cb111da586aa Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Mon, 20 Oct 2025 09:47:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subPackages/techan/order.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue index 62fdaf8..bb7dc93 100644 --- a/subPackages/techan/order.vue +++ b/subPackages/techan/order.vue @@ -414,7 +414,11 @@ export default { tempList[i].postDiscount = x.discount_price }) this.$forceUpdate() + }).finally(()=>{ + this.$forceUpdate() }) + } else { + this.$forceUpdate() } },