diff --git a/common/uni.css b/common/uni.css
index a875397..57e52fa 100644
--- a/common/uni.css
+++ b/common/uni.css
@@ -26,6 +26,9 @@ progress, checkbox-group{
form {
width: 100%;
}
+.uni-con-width{
+ width: 100%;
+}
.uni-flex {
display: flex;
flex-direction: row;
@@ -39,6 +42,9 @@ form {
.uni-column {
flex-direction: column;
}
+.uni-space-between{
+ justify-content: space-between;
+}
.uni-link{
color:#576B95;
font-size:26rpx;
diff --git a/pages.json b/pages.json
index f6bb8b2..4f0a67a 100644
--- a/pages.json
+++ b/pages.json
@@ -13,12 +13,14 @@
},
"pages": [
// pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+
{
- "path": "pages/businessCard/buyCard",
+ "path": "pages/businessCard/provideCard",
"style": {
- "navigationBarTitleText": "商户卡券购买"
+ "navigationBarTitleText": "发放卡券"
}
},
+
{
"path": "pages/businessCard/businessCard",
"style": {
@@ -26,6 +28,19 @@
}
},
{
+ "path": "pages/businessCard/cardDetail",
+ "style": {
+ "navigationBarTitleText": "卡券申领明细"
+ }
+ },
+ {
+ "path": "pages/businessCard/buyCard",
+ "style": {
+ "navigationBarTitleText": "商户卡券购买"
+ }
+ },
+
+ {
"path": "pages/parkRecordList/recordDetail",
"style": {
"navigationBarTitleText": "订单详情"
diff --git a/pages/businessCard/businessCard.vue b/pages/businessCard/businessCard.vue
index 328ce31..01dcbc5 100644
--- a/pages/businessCard/businessCard.vue
+++ b/pages/businessCard/businessCard.vue
@@ -23,10 +23,16 @@
购买
-
+
- 购买
+ 发放
+
+
+
+ 打印
+
+
diff --git a/pages/businessCard/cardDetail.vue b/pages/businessCard/cardDetail.vue
new file mode 100644
index 0000000..4c1d3a4
--- /dev/null
+++ b/pages/businessCard/cardDetail.vue
@@ -0,0 +1,302 @@
+
+
+ 共18张券被领取,合计金额100.00元,其中已使用16张
+
+
+
+
+
+ 所有类型
+
+
+
+ {{array[index]}}
+
+
+
+
+
+
+
+
+ 所有状态
+
+
+
+ {{arrayWay[indexWay]}}
+
+
+
+
+
+
+
+
+
+ 开始时间
+
+
+
+ {{benginDate}}
+
+
+
+
+
+
+
+
+ 结束时间
+
+
+
+ {{overDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+ JE000100011
+
+
+ 京A123456
+
+
+
+
+ 领取时间
+ 2020-11-01 01:01:01
+
+
+ 已使用
+
+
+
+
+ 使用时间
+ 2020-11-01 01:01:01
+
+
+ 5元/张
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ JE000100011
+
+
+ 京A123456
+
+
+
+
+ 领取时间
+ 2020-11-01 01:01:01
+
+
+ 已失效
+
+
+
+
+ 失效时间
+ 2020-11-01 01:01:01
+
+
+ 5元/张
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ JE000100011
+
+
+ 京A123456
+
+
+
+
+ 领取时间
+ 2020-11-01 01:01:01
+
+
+ 未使用
+
+
+
+
+ 有效截止
+ 2020-11-01 01:01:01
+
+
+ 5元/张
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/businessCard/provideCard.vue b/pages/businessCard/provideCard.vue
new file mode 100644
index 0000000..81f11f1
--- /dev/null
+++ b/pages/businessCard/provideCard.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+