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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 活动规则
+
+
+
+
+
+
+ {{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/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) {