diff --git a/api/product.js b/api/product.js
index 36a19dc..a04c643 100644
--- a/api/product.js
+++ b/api/product.js
@@ -164,3 +164,19 @@ export function getShareImg(id) {
export function getLatestExperienceCoupon() {
return request.get('/experienceCoupon/latest', {}, {login: true})
}
+
+export function getExperienceCouponList() {
+ return request.get('/experienceCoupon/list', {}, {login: true})
+}
+
+export function getExperienceCouponItems(params) {
+ return request.get('/experienceCoupon/items', params, {login: true})
+}
+
+export function createExperienceCouponOrder(data) {
+ return request.post('/experienceCoupon/order/create', data, {login: true})
+}
+
+export function getExperienceCouponOrderDetail(orderId) {
+ return request.get(`/experienceCoupon/order/detail/${orderId}`, {}, {login: true})
+}
diff --git a/assets/css/base.less b/assets/css/base.less
index d917846..d9940a9 100644
--- a/assets/css/base.less
+++ b/assets/css/base.less
@@ -295,4 +295,8 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
font-style: normal;
font-size: 28rpx;
color: #C2C5CC;
+}
+
+.bg-color-hui {
+ background-color: #999 !important;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index f161a1c..30a243b 100644
--- a/pages.json
+++ b/pages.json
@@ -744,6 +744,13 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
},
+ {
+ "path": "views/experienceCouponOrderDetail",
+ "style": {
+ "navigationBarTitleText": "订单核销",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
{
"path": "views/experienceProjectDetail",
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 564f79f..48a459a 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -51,7 +51,24 @@
class="item"
>
+
+
+ {{ order.merName || order.storeName }}
+
+
+
+
@@ -74,7 +91,16 @@
{{ order.merCityName }}
-
+
+
+ 订单号:{{ order.orderId }}
+
+ {{ ['待使用', '已完成', '已过期'][order.experienceOrderStatus] }}
+
+
+
+
+
+
+
+
+
+ {{ order.experienceOrderInfo.themeName }}
+
+
+ 有效期至{{ order.experienceOrderInfo.endTime }}
+
+
+
+ 距该地{{ order.distance || order.experienceOrderInfo.distance }}
+
+
+
+
-
+
{{ order.createTime }}
@@ -208,7 +253,7 @@
入住时间: {{ order.travelGroupOrderInfo.orderStartDate }}
-
+
等待商家确认时间,剩余
@@ -216,7 +261,27 @@
+ 联系商家
+ 去使用
+ 删除订单
+
+
-
+
{{ Number(order.status) === 0 ? '待支付' : getGiftTips(order.giftCardInfo) }}
@@ -366,6 +431,7 @@