zhangdan 4 年之前
父節點
當前提交
fc768fb8a7
共有 3 個文件被更改,包括 16 次插入14 次删除
  1. 1 1
      src/components/OrderCard.vue
  2. 7 5
      src/pages/bundleDetail/index.vue
  3. 8 8
      src/pages/orderDetail/index.vue

+ 1 - 1
src/components/OrderCard.vue

@@ -26,7 +26,7 @@
             <!-- <van-button class="btn" size="small" type="danger" :disabled="payLoading" :loading="payLoading" @click="toPay()">立即支付</van-button> -->
           </div>
           <div class="btn-control" v-else>
-            <van-button class="btn" size="small" v-if="options.freeChoiceFlag==0" @click="toDetail()">查看详情</van-button>
+            <van-button class="btn" size="small"  @click="toDetail()">查看详情</van-button>
           </div>
         </div>
       </div>

+ 7 - 5
src/pages/bundleDetail/index.vue

@@ -177,7 +177,8 @@ export default {
       console.error(err);
     });
   },
-  onLoad(){
+  onLoad(options){
+    console.log(options.id,'options.id','jiecan')
     wx.getLocation({
      type: 'wgs84',
      success:(res=> {
@@ -254,13 +255,14 @@ export default {
     }
     .detail-allstore{
       display: inline-block;
-      padding :2px 4px;
+      padding :2px 6px;
       margin-left :5px;
       align-items: center;
       border-radius:8px;
-      border :1px solid #BBBEC4;
-      color :#BBBEC4;
-      font-size: 0.6em
+      // border :1px solid #BBBEC4;
+      background-color :#f81;
+      color :#fff;
+      font-size: 0.8em
       text-align :center
     }
   }

+ 8 - 8
src/pages/orderDetail/index.vue

@@ -5,7 +5,7 @@
         <h3 class="title">{{getTitle}}</h3>
         <span class="desc" v-if="orderBundle.orderFlag == 'CAEL' || orderBundle.orderFlag == 'SYCA' ">取消原因: {{getPayStatusFun}}</span>
       </div>
-      <div class="content" @click="toDetail">
+      <div class="content">
         <div class="product-img" >
           <img v-if="bundle.icon2" class="img" :src="bundle.icon2" alt="">
           <div v-else class="center-con">
@@ -147,13 +147,13 @@ export default {
   },
   methods: {
     // 套餐查看详情
-    toDetail(){
-      if(this.bundleType==0){
-        wx.navigateTo({
-          url: `/pages/bundleDetail/main?id=${this.$mp.query.id}`
-        })
-      }
-    },
+    // toDetail(){
+    //   if(this.bundleType==0){
+    //     wx.navigateTo({
+    //       url: `/pages/bundleDetail/main?id=${this.$mp.query.id}`
+    //     })
+    //   }
+    // },
     // 核销订阅消息
     subscribeMessage(e){
       console.log(e)