diff --git a/src/api/index.js b/src/api/index.js
index a190c86..b3e1835 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -3,3 +3,4 @@ import server from './server';
// 公共
export const login = params => server.post({ url: '/Admino/AdminUser/login', ...params }); // 登录
export const stadiumFind = params => server.post({ url: '/stadium/find', ...params }); // 登录
+export const stadiumBookList = params => server.post({ url: '/stadium/book/list', ...params }); // 订场列表
diff --git a/src/pages.json b/src/pages.json
index 86449b8..d7b8c81 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -20,7 +20,10 @@
{
"path": "pages/detail",
"style": {
- "navigationBarTitleText": "订单详情"
+ "navigationBarTitleText": "订单详情",
+ "componentPlaceholder": {
+ "venue-info-async": "view"
+ }
}
}
]
@@ -29,6 +32,12 @@
"root": "subpackage/groupon",
"pages": [
{
+ "path": "pages/site_select",
+ "style": {
+ "navigationBarTitleText": "选择场次"
+ }
+ },
+ {
"path": "pages/exchange_success",
"style": {
"navigationBarTitleText": "兑换成功"
diff --git a/src/pages/tem.vue b/src/pages/tem.vue
deleted file mode 100644
index ab8b525..0000000
--- a/src/pages/tem.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/subpackage/groupon/pages/confirm_order/venue.vue b/src/subpackage/groupon/pages/confirm_order/venue.vue
index 4b4189a..40c9c6a 100644
--- a/src/subpackage/groupon/pages/confirm_order/venue.vue
+++ b/src/subpackage/groupon/pages/confirm_order/venue.vue
@@ -20,6 +20,13 @@ onLoad(() => {
+
+
+
+ 团购券 (已选1张)
+ 团购券抵扣6小时,-¥600.00
+
+
团购券信息:
@@ -59,6 +66,32 @@ onLoad(() => {
}
.venue-confirm{
padding: 24upx;
+ .vc-groupon-show{
+ @include ctf;
+ .tti-icon{
+ margin-right: 16upx;
+ flex-shrink: 0;
+ width: 40upx;
+ height: 40upx;
+ background: skyblue;
+ }
+ .tti-right{
+ flex-grow: 1;
+ @include ctf(space-between);
+ .tr-txt{
+ @include flcw(28upx, 40upx, #333, 500);
+ @include tHide;
+ .tt-orange{
+ @include flcw(24upx, 34upx, #FF873D);
+ }
+ }
+ .tr-price{
+ max-width: 60%;
+ @include flcw(24upx, 34upx, #FF873D);
+ @include tHide;
+ }
+ }
+ }
.vc-groupon{
.vc-title{
margin-bottom: 24upx;
diff --git a/src/subpackage/groupon/pages/site_select.vue b/src/subpackage/groupon/pages/site_select.vue
new file mode 100644
index 0000000..ad4f0b5
--- /dev/null
+++ b/src/subpackage/groupon/pages/site_select.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+ 今天
+ 6月10日
+
+
+
+
+
+
+ {{ e || '-'}}
+
+
+
+ {{ e?.name ?? '-' }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/order/components/detail/venue.vue b/src/subpackage/order/components/detail/venue.vue
deleted file mode 100644
index 0ab3e6f..0000000
--- a/src/subpackage/order/components/detail/venue.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- 场次信息
- 羽毛球
- 2019年05月17日(周五)
-
- 预定场次:
-
-
- {{ e.name || '几号馆' }} {{ e.time || '时间段' }}
-
-
-
-
- 具体场次:
-
- {{ 'venue_name' }} {{ 'duration' }} ({{ 0 }}元)
-
-
-
- {{ isShowSpecificTime ? '收起' : '查看具体场次' }}
-
-
-
- 小计(共{{0}}场)
- ¥{{ 0}}
-
-
-
-
-
diff --git a/src/subpackage/order/pages/detail.vue b/src/subpackage/order/pages/detail.vue
index bdbad55..3c7f0da 100644
--- a/src/subpackage/order/pages/detail.vue
+++ b/src/subpackage/order/pages/detail.vue
@@ -2,10 +2,10 @@
import { onLoad } from '@dcloudio/uni-app';
import { reactive, ref } from "vue";
import textLine from "../components/detail/text_line.vue";
-import detailVenueInfo from "../components/detail/venue.vue";
import detailGoods from "../components/detail/goods.vue";
import detailVerify from "../components/detail/verify.vue";
import detailContact from "../components/detail/contact.vue";
+import venueInfoAsync from "@/subpackage/groupon/components/venue_info.vue";
onLoad(() => {
});
@@ -23,6 +23,14 @@ onLoad(() => {
订单编号:123456789012
创建时间:2019-06-06 12:00:06
+
+
+
+
+ 场次信息
+
+
+
产品信息
羽毛球
@@ -52,10 +60,7 @@ onLoad(() => {
-
-
-
-
+
@@ -190,6 +195,16 @@ onLoad(() => {
}
}
}
+ .od-venue-info{
+ padding: 30upx;
+ .od-title{
+ &::after{
+ content: '';
+ display: block;
+ height: 20upx;
+ }
+ }
+ }
.od-fixed{
position: fixed;
left: 0;