diff --git a/src/pages.json b/src/pages.json
index 5c67efa..e9e2f8e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -42,6 +42,12 @@
"venue-info-async": "view"
}
}
+ },
+ {
+ "path": "pages/enter_code",
+ "style": {
+ "navigationBarTitleText": "查看入场码"
+ }
}
]
},
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index 71200b1..ba512e9 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -8,7 +8,7 @@ const tab = reactive({
list: [ {name: '全部'}, {name: '已核销'}, {name: '已退款'}, ],
idx: 0
});
-const loadPage = 1;
+let loadPage = 1;
const orderLs = ref([]);
onLoad(() => {
@@ -57,7 +57,7 @@ function getOrderLs({
已核销
- 订单信息:s羽毛球订场200元代金券【欧轩客服】
+ 订单信息:羽毛球订场200元代金券【欧轩客服】
订单编号:{{ e.order_no ?? '-' }}
diff --git a/src/subpackage/order/components/detail/verify.vue b/src/subpackage/order/components/detail/verify.vue
index 8cf1d1a..ee70cbc 100644
--- a/src/subpackage/order/components/detail/verify.vue
+++ b/src/subpackage/order/components/detail/verify.vue
@@ -2,25 +2,49 @@
import { onLoad } from '@dcloudio/uni-app';
import { reactive, ref } from "vue";
import textLine from "./text_line.vue";
+import { routeTo } from '@/utils/polish';
+const props = defineProps({
+ orderInfo: {
+ type: Object,
+ default: () => ({})
+ },
+})
onLoad(() => {
});
+
+// 预约,场次/场时订单状态
+function zh_status(status){
+ if(status == undefined || status == '' || status == null)return '-'
+ if(status == -1)return '已失效';
+ if(status == 8)return '使用中'; // 20210521 新增状态
+ return ['未支付','待使用','已使用','已失效','已退款'][status] || '';
+}
+
+function isCodeActive(status){
+ if(status == 8 || status == 1)return true;
+ return false;
+}
+
+function toCode(e){
+ routeTo(`/subpackage/order/pages/enter_code?code_id=${e?.id}`);
+}
验证信息
- 2020-12-25(周五)
+ {{ orderInfo?.date ?? '' }}
-
- 待使用
+
+ {{ zh_status(e.status) }}
- 验证码 12234 45455
- 查看个人入场码
+ 验证码 {{ e?.verify_code ?? '-' }}
+ 查看二维码
-
+
分享给好友领取入场码
diff --git a/src/subpackage/order/pages/detail.vue b/src/subpackage/order/pages/detail.vue
index 1587fee..9e41754 100644
--- a/src/subpackage/order/pages/detail.vue
+++ b/src/subpackage/order/pages/detail.vue
@@ -15,7 +15,8 @@ onLoad(options => {
orderGet({
data: {
brand_id: options?.brand_id ?? '',
- order_no: options?.order_no ?? ''
+ order_no: options?.order_no ?? '',
+ from_platform: 'weixin'
}
})
.then(res=>{
@@ -42,6 +43,11 @@ function navClick(){
address: _oInfo.venue_addr
})
}
+// 次卡规格整形
+function zh_selectedSpacs(specsArr){
+ if(!Array.isArray(specsArr))return ''
+ return specsArr.join('+') || '';
+}
@@ -56,14 +62,25 @@ function navClick(){
订单编号:{{ orderInfo?.order_no ?? '-' }}
创建时间:{{ orderInfo?.success_time ?? '-' }}
+
-
-
+
+
+
+
+
+ 产品信息
+ {{ orderInfo?.project ?? '-' }}
+ {{ orderInfo?.number ?? '' }}
+ {{ zh_selectedSpacs(orderInfo?.spec) }}
+
+ 小计
+ ¥{{ orderInfo?.amount || '0' }}
+
+
-
- 产品信息
- 羽毛球
- 1
- llasd
-
- 小计
- ¥300
-
+
+
+
+ 点击二维码可放大查看
+
+
+
+
金额小计
- ¥{{ orderInfo?.amount ?? '0' }}
+ ¥{{ orderInfo?.amount || '0' }}
团购券抵扣
- ¥{{ orderInfo?.douyin_coupon_deduct_amount ?? '0' }}
+ ¥{{ orderInfo?.douyin_coupon_deduct_amount || '0' }}
- 合计支付:¥{{ orderInfo?.pay_amount ?? '0' }}
+ 合计支付:¥{{ orderInfo?.pay_amount || '0' }}
-
-
-
-
-
-
-
- 点击二维码可放大查看
-
支付信息
diff --git a/src/subpackage/order/pages/enter_code.vue b/src/subpackage/order/pages/enter_code.vue
new file mode 100644
index 0000000..c80146f
--- /dev/null
+++ b/src/subpackage/order/pages/enter_code.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+ {{ codeInfo?.stadium_name ?? '-' }}
+
+
+
+ 点击二维码可放大查看
+
+
+
+
+
+
+
+
+ 验证码:{{ codeInfo?.verify_code ?? '' }}
+ 复制
+
+
+
+
+
+
\ No newline at end of file