diff --git a/components/cart/CardList.vue b/components/cart/CardList.vue index 8731d31..fd2e62b 100644 --- a/components/cart/CardList.vue +++ b/components/cart/CardList.vue @@ -15,7 +15,7 @@ {{item.startTime}} {{item.address}} - 总计¥{{item.price}} + 总计¥{{item.payPrice}} diff --git a/pages.json b/pages.json index 288b178..2867f13 100644 --- a/pages.json +++ b/pages.json @@ -53,6 +53,13 @@ "navigationBarTextStyle": "white" } }, + { + "path": "payOrder", + "style": { + "navigationStyle": "custom" , + "navigationBarTextStyle": "white" + } + }, { "path": "orderDetails", "style": { diff --git a/pages_login/loginAndRegisterAndForgetPassword.vue b/pages_login/loginAndRegisterAndForgetPassword.vue deleted file mode 100644 index 73a4c93..0000000 --- a/pages_login/loginAndRegisterAndForgetPassword.vue +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pages_my/qiandao-list.vue b/pages_my/qiandao-list.vue index db00904..855c5d9 100644 --- a/pages_my/qiandao-list.vue +++ b/pages_my/qiandao-list.vue @@ -11,10 +11,10 @@ {{item.name}} {{item.phone}} - {{item.type}}X{{item.num}} + {{typeList[item.typeprice].name}}X{{item.num}} - + @@ -44,6 +44,20 @@ detail : { activityInfo : {}, }, + typeList:[ + { + name:'早鸟票', + price:168 + }, + { + name:'单人票', + price:198.01 + }, + { + name:'尊享票', + price:268 + } + ], } }, onPageScroll(e) { @@ -55,6 +69,7 @@ }, onLoad({id}) { this.queryParams.recruitId = id + this.queryParams.pageSize = 20 this.getActivityInfo() }, methods:{ diff --git a/static/image/center/user-icon-1.png b/pages_my/static/user-icon-1.png similarity index 100% rename from static/image/center/user-icon-1.png rename to pages_my/static/user-icon-1.png diff --git a/static/image/center/user-icon-2.png b/pages_my/static/user-icon-2.png similarity index 100% rename from static/image/center/user-icon-2.png rename to pages_my/static/user-icon-2.png diff --git a/static/image/center/user-icon-3.png b/pages_my/static/user-icon-3.png similarity index 100% rename from static/image/center/user-icon-3.png rename to pages_my/static/user-icon-3.png diff --git a/static/image/center/user-icon-4.png b/pages_my/static/user-icon-4.png similarity index 100% rename from static/image/center/user-icon-4.png rename to pages_my/static/user-icon-4.png diff --git a/static/image/center/user-icon-5.png b/pages_my/static/user-icon-5.png similarity index 100% rename from static/image/center/user-icon-5.png rename to pages_my/static/user-icon-5.png diff --git a/pages_my/user-info.vue b/pages_my/user-info.vue index c599b6a..9ec98c4 100644 --- a/pages_my/user-info.vue +++ b/pages_my/user-info.vue @@ -33,7 +33,7 @@ - + 国籍 @@ -42,7 +42,7 @@ - + 学历 @@ -51,7 +51,7 @@ - + 行业 @@ -60,7 +60,7 @@ - + 电话 @@ -69,7 +69,7 @@ - + 性别 diff --git a/pages_order/huodong-detail.vue b/pages_order/huodong-detail.vue index 0bfcc23..51deee1 100644 --- a/pages_order/huodong-detail.vue +++ b/pages_order/huodong-detail.vue @@ -5,7 +5,7 @@ - + {{activityDetails.title}} 开始时间：{{activityDetails.startTime}} @@ -160,8 +160,8 @@ }, computed:{ imageArr() { - return this.activityDetails - && this.activityDetails.image.split(',') + return this.activityDetails.image + && this.activityDetails.image.split(',')[0] } }, onShareAppMessage(res) { diff --git a/pages_order/payOrder.vue b/pages_order/payOrder.vue index 75b7794..58fcc20 100644 --- a/pages_order/payOrder.vue +++ b/pages_order/payOrder.vue @@ -18,17 +18,31 @@ {{dataInfo.startTime}} {{dataInfo.address}} - 总计¥{{dataInfo.payPrice}} + 价格¥{{dataInfo.payPrice}} 订单信息 - - - - + + + + + + + + + + @@ -69,7 +83,21 @@ customStyle:{ color:'#FF5858' }, - num : 0, + num : 1, + typeList:[ + { + name:'早鸟票', + price:168 + }, + { + name:'单人票', + price:198.01 + }, + { + name:'尊享票', + price:268 + } + ], } }, onLoad(e) { diff --git a/static/image/center/11.svg b/static/image/center/11.svg deleted file mode 100644 index 99950a8..0000000 --- a/static/image/center/11.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file