diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue index d44ccdc..dad9471 100644 --- a/my/hongbao/youhuijuanList.vue +++ b/my/hongbao/youhuijuanList.vue @@ -131,6 +131,10 @@ uni.navigateTo({//返回项目订单 url:'/my/order/payModifyMs' }) + }else if(this.content=='拼团'){ + uni.navigateTo({//返回项目订单 + url:'/my/order/payModifyPt' + }) } }, diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue index 36457fe..7c52523 100644 --- a/my/order/payModifyMs.vue +++ b/my/order/payModifyMs.vue @@ -3,7 +3,7 @@ - {{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}} + 服务项目 + + + + + 服务项目 + + + + + + + + {{orderXm.title}} + + + + + + + + + {{orderXm.price}} + + + + + + + + + + + + + + + + 优惠劵 + + + + + + + 平台优惠劵 + + + + -¥{{couponDataList}} + + 选择优惠劵 + + + + + 去支付 + + + + + + + + + + + \ No newline at end of file diff --git a/my/order/paydingMs.vue b/my/order/paydingMs.vue index bb123a3..75f8487 100644 --- a/my/order/paydingMs.vue +++ b/my/order/paydingMs.vue @@ -7,7 +7,7 @@ - {{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}} + 服务项目 费用明细 - {{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':'疗程'}}价格 - ¥{{order.sumMoney}} + 项目价格 + ¥{{order.ordersPackageList[0].price}} - {{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':'疗程'}}数量 + 项目数量 {{order.ordersPackageList[0].num}} diff --git a/my/order/paydingPt.vue b/my/order/paydingPt.vue new file mode 100644 index 0000000..488433f --- /dev/null +++ b/my/order/paydingPt.vue @@ -0,0 +1,1646 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index cf2ce78..b6f7613 100644 --- a/pages.json +++ b/pages.json @@ -53,6 +53,28 @@ } } }, + { + "path": "pages/my/pinTuanOderDrtail", + "style": { + "navigationBarTitleText": "拼团详情", + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/pTuanOderDrtail", + "style": { + "navigationBarTitleText": "拼团订单详情", + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/my/myMsOderDrtail", "style": { @@ -111,7 +133,18 @@ { "path": "pages/my/newTeaml", "style": { - "navigationBarTitleText": "团购", + "navigationBarTitleText": "团购列表", + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/newTeamlDetail", + "style": { + "navigationBarTitleText": "团购详情", "enablePullDownRefresh": true, "navigationStyle": "custom", "app-plus": { @@ -651,6 +684,24 @@ "titleNView": false } } + },{ + "path": "order/payModifyPt", + "style": { + "navigationBarTitleText": "拼团订单", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false + } + } + },{ + "path": "order/paydingPt", + "style": { + "navigationBarTitleText": "拼团订单", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false + } + } },{ "path": "order/payModifyMs", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index ddd627b..c7c9802 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -89,7 +89,7 @@ 充值赠送 - + 超值拼团 diff --git a/pages/my/index.vue b/pages/my/index.vue index dde769d..072cb73 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -100,7 +100,7 @@ 服务疗程 - + 新人拼团 @@ -606,6 +606,11 @@ }) } }, + tuangou(){ + uni.navigateTo({ + url:'/pages/my/newTeaml?text='+'my' + }) + }, miaoshao(){ uni.navigateTo({ url:'/pages/my/newseckill?text='+'my' diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue index a923a16..3a6f48a 100644 --- a/pages/my/miaoShaOderDrtail.vue +++ b/pages/my/miaoShaOderDrtail.vue @@ -21,10 +21,10 @@ {{mainData.price}} - /套 + /次 - ¥{{mainData.oldPrice}}/套 + ¥{{mainData.oldPrice}}/次 @@ -57,7 +57,7 @@ - 套餐详情 + 项目详情 @@ -73,7 +73,7 @@ - {{item.price}} + {{item.packagePrice}} ¥{{item.oldPrice}} diff --git a/pages/my/myMsOderDrtail.vue b/pages/my/myMsOderDrtail.vue index edebcea..d7f28f2 100644 --- a/pages/my/myMsOderDrtail.vue +++ b/pages/my/myMsOderDrtail.vue @@ -25,9 +25,9 @@ {{getList.title}} - + {{getList.sales}} @@ -39,7 +39,7 @@ - {{getList.price}} + {{getList.packagePrice}} ¥{{getList.oldPrice}} diff --git a/pages/my/newTeaml.vue b/pages/my/newTeaml.vue index 5ad8b22..3bae922 100644 --- a/pages/my/newTeaml.vue +++ b/pages/my/newTeaml.vue @@ -1,1495 +1,562 @@ +