.

src/components/AllorderInfo.vue

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

src/components/AllselloutInfo.vue

@@ -45,7 +45,7 @@
                 <div v-if="status == 'COMPETED'" @click="Buyers" class="box-but">联系买家</div>
                 <div v-if="status == 'COMPETED'" @click="logistics" class="box-but3">查看物流</div>
                 <div v-if="status == 'CANCELED'" @click="deletes" class="box-but">删除订单</div>
-                <div v-if="status == 'CANCELED'" @click="Buyers" class="box-but3">联系买家</div>
+                <div v-if="status == 'CANCELED'" @click="again" class="box-but3">联系买家</div>
             </div>
         </div>
         <van-popup :show="show" custom-style="background:transparent;border-radius: 12px 12px 0 0;" use-slot>

src/pages/allselldetails.vue

@@ -86,7 +86,7 @@
                 <p class="box-buttom-p">¥10</p>
             </div>
         </div>
-        <div class="box-buttom">
+        <div v-if="status.orderStatus !== 'CREATED'" class="box-buttom">
             <div class="box-buttom-con">
                 <p>实际支付</p>
                 <p class="box-buttom-p3">¥{{ total }}</p>
@@ -114,36 +114,36 @@
                 <p>创建时间</p>
                 <p class="box-footer-p">{{ status.createdAt }}</p>
             </div>
-        </div>
-        <div v-if="status.orderStatus !== 'CREATED'" class="box-footer">
-            <div class="box-footer-con">
-                <p>付款时间</p>
-                <p class="box-footer-p">{{ status.paidTime }}</p>
+            <div v-if="status.orderStatus !== 'CREATED'" class="box-footer">
+                <div class="box-footer-con">
+                    <p>付款时间</p>
+                    <p class="box-footer-p">{{ status.paidTime }}</p>
+                </div>
             </div>
-        </div>
-        <div v-if="status.orderStatus !== 'CREATED'" class="box-footer">
-            <div class="box-footer-con">
-                <p>成交时间</p>
-                <p class="box-footer-p">{{ status.paidTime }}</p>
+            <div v-if="status.orderStatus !== 'CREATED'" class="box-footer">
+                <div class="box-footer-con">
+                    <p>成交时间</p>
+                    <p class="box-footer-p">{{ status.paidTime }}</p>
+                </div>
             </div>
         </div>
         <div class="box-footer-nav">
             <div class="box-btn">
-                <!-- 交易成功 -->
-                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-left2" @click="Buyers">
+                <!-- 已完成 -->
+                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-left" @click="deletes">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>联系买家</span>
                 </div>
-                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-right" @click="logistics">
+                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-right" @click="sales">
                     <img src="/native/imgs/btn_01@4x.png" alt="" />
                     <span class="box-btn-sp">查看物流</span>
                 </div>
                 <!-- 已发货 -->
-                <div v-if="status.orderStatus === 'SEND'" class="box-btn-left2" @click="logistics">
+                <div v-if="status.orderStatus === 'SEND'" class="box-btn-left" @click="logistics">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>查看物流</span>
                 </div>
-                <div v-if="status.orderStatus === 'SEND'" class="box-btn-left" @click="Buyers">
+                <div v-if="status.orderStatus === 'SEND'" class="box-btn-right" @click="comfrim">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
                     <span>联系买家</span>
                 </div>
@@ -152,16 +152,16 @@
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>取消订单</span>
                 </div>
-                <div v-if="status.orderStatus === 'PAYED'" class="box-btn-left" @click="deliver">
+                <div v-if="status.orderStatus === 'PAYED'" class="box-btn-right" @click="comfrim">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
                     <span>立即发货</span>
                 </div>
-                <!-- 买家待支付 -->
+                <!-- 待支付 -->
                 <div v-if="status.orderStatus === 'CREATED'" class="box-btn-left2" @click="cancel">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>取消订单</span>
                 </div>
-                <div v-if="status.orderStatus === 'CREATED'" class="box-btn-left" @click="Buyers">
+                <div v-if="status.orderStatus === 'CREATED'" class="box-btn-right" @click="pay">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
                     <span>联系买家</span>
                 </div>
@@ -170,9 +170,9 @@
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>删除订单</span>
                 </div>
-                <div v-if="status.orderStatus === 'CANCELED'" class="box-btn-right" @click="Buyers">
-                    <img src="/native/imgs/btn_01@4x.png" alt="" />
-                    <span class="box-btn-sp">联系买家</span>
+                <div v-if="status.orderStatus === 'CANCELED'" class="box-btn-right" @click="again">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <span>重新购买</span>
                 </div>
             </div>
         </div>

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>{{ this.store.storeName }}</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">
@@ -313,7 +313,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>
@@ -54,11 +54,9 @@
         </div>
         <h3>拼箱详情</h3>
         <div class="box-details">
-            1盒6包 1包5张 种类：全80种，UR8种，SR10种，R8种，N44种<br />
-            其中1种有HR版本，UR卡有UTR版本，UR卡和SR卡有SER版本和PSER版本<br />
-            本卡包是1105初回生产限定版的盒内特典包（1盒1包） UR卡8种盒SR卡10种都与1105收录相同，而PSER卡1种是旧卡复刻<br />
+            {{ cardCaseInfo.description }}
         </div>
-        <img class="container-img" src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/3.jpeg" alt="" />
+        <!-- <img class="container-img" src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/3.jpeg" alt="" /> -->
         <h3>拼箱规则</h3>
         <div class="box-details">
             1.拼箱是一种类似拼团的玩法，用户选号后支付，当箱中的全部号码都被购买完毕，才算拼箱成功。如果在有限时间内拼箱没有成团，系统会把钱退回给买家<br />

src/pages/orderdetails.vue

@@ -48,7 +48,7 @@
         <div class="box-bg"></div>
         <div class="box-tit" @click="navigateTo('/pages/store/homePage?id=' + store.id)">
             <div>
-                <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
+                <img :src="store.logo" alt="" />
                 <p>{{ store.storeName }}</p>
             </div>
             <div class="box-tit-seller" @click.stop="wait">联系卖家</div>
@@ -215,7 +215,9 @@
 </template>
 
 <script>
+import store from '../mixins/store';
 export default {
+    mixins: [store],
     name: '',
     data() {
         return {
@@ -653,7 +655,7 @@ export default {
                 font-weight: bold;
                 color: #000000;
                 line-height: 22px;
-                margin-left: 2px;
+                margin-left: 9px;
             }
         }
         .box-tit-seller {

src/pages/receiving.vue

@@ -37,7 +37,6 @@
                 :value="form.detail"
                 @input="form.detail = $event.detail"
                 placeholder="请填写您的详细地址"
-                :border="false"
                 label="详细地址"
                 type="textarea"
             />