521

src/components/AllorderInfo.vue

@@ -3,8 +3,8 @@
         <div class="box-con2">
             <div class="box-tit">
                 <div>
-                    <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
-                    <p>光之城卡牌</p>
+                    <img :src="all.logo" alt="" />
+                    <p>{{ all.storeName }}</p>
                 </div>
                 <span>{{ name }}</span>
             </div>
@@ -350,7 +350,7 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 22px;
-                    margin-left: 2px;
+                    margin-left: 9px;
                 }
             }
             span {

src/pages/confirmorder.vue

@@ -31,8 +31,8 @@
         </div>
         <img src="../static/imgs/img_dizhitiao@3x.png" alt="" />
         <div class="box-tit">
-            <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
-            <p>光之城卡牌</p>
+            <img :src="store.logo" alt="" />
+            <p>{{ store.storeName }}</p>
         </div>
         <div v-for="(item, index) in Boxes" :key="index.id">
             <div class="box-con">
@@ -105,7 +105,8 @@ export default {
             Boxes: [],
             cardCaseInfo: {},
             total: '',
-            message: ''
+            message: '',
+            store: {}
         };
     },
     computed: {
@@ -162,6 +163,7 @@ export default {
                 .then(res => {
                     this.hideLoading();
                     this.total = res.total;
+                    this.store = res.store;
                     this.Boxes = res.selectedBoxes;
                     this.cardCaseInfo = res.selectedCase.collection;
                 })
@@ -310,7 +312,7 @@ export default {
             font-weight: bold;
             color: #000000;
             line-height: 22px;
-            margin-left: 2px;
+            margin-left: 9px;
         }
     }
     .box-con {

src/pages/details.vue

@@ -13,7 +13,7 @@
         </swiper>
         <div class="box-tit">{{ cardCaseInfo.caseName }}</div>
 
-        <div class="box-live">
+        <div class="box-live" @click="wait">
             <img src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/icon_kapai_zhibo@3x.png" alt="" />
             <p>直播未开始</p>
         </div>
@@ -138,9 +138,7 @@ export default {
                     return this.$http.get('/store/get/' + res.cardCaseInfo.storeId);
                 })
                 .then(res => {
-                    console.log(res);
                     this.storeInfo = res;
-                    console.log(this.cardCaseInfo.userId);
                 })
                 .catch(e => {
                     this.hideLoading();

src/pages/orderdetails.vue

@@ -48,8 +48,8 @@
         <div class="box-bg"></div>
         <div class="box-tit">
             <div>
-                <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
-                <p>光之城卡牌</p>
+                <img :src="store.logo" alt="" />
+                <p>{{ store.storeName }}</p>
             </div>
             <div class="box-tit-seller" @click="seller">联系卖家</div>
         </div>
@@ -215,7 +215,9 @@
 </template>
 
 <script>
+import store from '../mixins/store';
 export default {
+    mixins: [store],
     name: '',
     data() {
         return {
@@ -235,8 +237,9 @@ export default {
             caseId: '',
             minters: 0,
             seconds: 0,
-            allTime: 5 * 60 - 1,
-            closeTime: ''
+            allTime: 5 * 60,
+            closeTime: '',
+            store: {}
         };
     },
     methods: {
@@ -302,6 +305,7 @@ export default {
                     this.hideLoading();
                     this.caseId = res.caseId;
                     this.status = res;
+                    this.store = res.store;
                     this.addressList = res.address;
                     this.total = res.total;
                     this.Boxes = res.cardBoxList;
@@ -651,7 +655,7 @@ export default {
                 font-weight: bold;
                 color: #000000;
                 line-height: 22px;
-                margin-left: 2px;
+                margin-left: 9px;
             }
         }
         .box-tit-seller {