diff --git a/pages.json b/pages.json
index 67d2aeb..16f2f6b 100644
--- a/pages.json
+++ b/pages.json
@@ -406,6 +406,25 @@
"navigationBarTitleText" : "绿色有机标准认证"
}
},
+ {
+ "path": "activity/dzxConSeason",
+ "style": {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path": "activity/dzxConSeasonNH",
+ "style": {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path": "activity/dzxConSeasonPrize",
+ "style": {
+ "navigationBarTitleText" : ""
+ }
+ },
+
{
"path": "activity/prizeInQun",
"style": {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 81fd15b..4bac0fe 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/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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 活动规则
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+ {{item.title}}
+
+
+
+ {{item.price/100}}
+ {{item.market_price/100}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+ 活动 细则
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{item.price/100}}
+ {{item.market_price/100}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+ 活动 规则
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{item.price/100}}
+ {{item.market_price/100}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.prize_name}}
+ 抽奖时间:{{item.create_time}}
+
+
+
+
+
+
+
+
+
+ 联系客服
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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)}}可用
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
index c1ee56e..c0cb138 100644
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@@ -123,7 +123,10 @@
{{item.consignee_info.address}}
- 快递查询
+
+ 快递查询
+ 确认收货
+
@@ -771,6 +774,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) {
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 38cc9e8..ce8778f 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -550,7 +550,11 @@ export default {
tempList[i].postDiscount = x.discount_price
})
this.$forceUpdate()
+ }).finally(()=>{
+ this.$forceUpdate()
})
+ } else {
+ this.$forceUpdate()
}
},