526

src/pages/Apply.vue

@@ -143,7 +143,9 @@ export default {
                     wx.showToast({
                         title: '提交成功'
                     });
-                    this.navigateTo('/pages/Applydetails?id=' + this.orderInfoId);
+                    setTimeout(() => {
+                        this.navigateTo('/pages/Applydetails?id=' + this.orderInfoId);
+                    }, 1000);
                 })
                 .catch(e => {
                     this.hideLoading();

src/pages/allselldetails.vue

@@ -40,14 +40,19 @@
                     </p>
                 </div>
             </div>
+            <div class="box-border"></div>
+            <div class="message">
+                <p>买家留言：</p>
+                <span>{{ status.remark }}</span>
+            </div>
         </div>
         <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 class="box-tit-seller" @click="seller">共{{ status.length }}件商品</div>
         </div>
         <div v-for="(item, index) in Boxes" :key="index.id">
             <div class="box-con">
@@ -81,13 +86,13 @@
                 <p class="box-buttom-p">¥10</p>
             </div>
         </div>
-        <div v-if="status.orderStatus !== 'CREATED'" class="box-buttom">
+        <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>实际支付</p>
                 <p class="box-buttom-p3">¥{{ total }}</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-p">微信支付</p>
@@ -95,54 +100,52 @@
         </div>
         <div class="box-border-but"></div>
         <!-- 下单时间 -->
-        <div v-if="showTimeTab">
-            <div class="box-footer">
-                <div class="box-footer-con">
-                    <p>订单编号</p>
-                    <div class="box-footer-cr">
-                        <span @click="orderCopy">复制</span>
-                        <p class="box-footer-p">{{ status.transactionId }}</p>
-                    </div>
+        <div class="box-footer">
+            <div class="box-footer-con">
+                <p>订单编号</p>
+                <div class="box-footer-cr">
+                    <span @click="orderCopy">复制</span>
+                    <p class="box-footer-p">{{ status.transactionId }}</p>
                 </div>
             </div>
-            <div class="box-footer">
-                <div class="box-footer-con">
-                    <p>创建时间</p>
-                    <p class="box-footer-p">{{ status.createdAt }}</p>
-                </div>
+        </div>
+        <div class="box-footer">
+            <div class="box-footer-con">
+                <p>创建时间</p>
+                <p class="box-footer-p">{{ status.createdAt }}</p>
             </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>
+        </div>
+        <div v-if="status.orderStatus !== 'CREATED' && status.orderStatus !== 'CANCELED'" class="box-footer">
+            <div class="box-footer-con">
+                <p>付款时间</p>
+                <p class="box-footer-p">{{ status.paidTime }}</p>
             </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>
+        </div>
+        <div class="box-footer">
+            <div class="box-footer-con">
+                <p>成交时间</p>
+                <p class="box-footer-p">{{ status.paidTime }}</p>
             </div>
         </div>
         <div class="box-footer-nav">
             <div class="box-btn">
                 <!-- 已完成 -->
-                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-left" @click="deletes">
+                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-left2" @click="Buyers">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
-                    <span>删除订单</span>
+                    <span>联系买家</span>
                 </div>
-                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-right" @click="sales">
+                <div v-if="status.orderStatus === 'COMPETED'" class="box-btn-right" @click="logistics">
                     <img src="/native/imgs/btn_01@4x.png" alt="" />
-                    <span class="box-btn-sp">申请售后</span>
+                    <span class="box-btn-sp">查看物流</span>
                 </div>
                 <!-- 已发货 -->
                 <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-right" @click="comfrim">
+                <div v-if="status.orderStatus === 'SEND'" class="box-btn-right" @click="Buyers">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
-                    <span>确认收货</span>
+                    <span>联系买家</span>
                 </div>
                 <!-- 待发货 -->
                 <div v-if="status.orderStatus === 'PAYED'" class="box-btn-left2" @click="cancel">
@@ -158,18 +161,18 @@
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>取消订单</span>
                 </div>
-                <div v-if="status.orderStatus === 'CREATED'" class="box-btn-right" @click="pay">
+                <div v-if="status.orderStatus === 'CREATED'" class="box-btn-right" @click="Buyers">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
-                    <span>立即支付</span>
+                    <span>联系买家</span>
                 </div>
                 <!-- 已取消 -->
                 <div v-if="status.orderStatus === 'CANCELED'" class="box-btn-left2" @click="deletes">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>删除订单</span>
                 </div>
-                <div v-if="status.orderStatus === 'CANCELED'" class="box-btn-right" @click="again">
-                    <img src="/native/imgs/btn_01@3x.png" alt="" />
-                    <span>重新购买</span>
+                <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>
             </div>
         </div>
@@ -209,14 +212,13 @@ export default {
             total: '',
             addressList: [],
             name: '',
-            showTimeTab: false,
             orderInfoId: '',
             records: [],
             status: [],
             logisTics: [],
             stepsList: [],
             stepsShow: [],
-            caseId: ''
+            store: []
         };
     },
     methods: {
@@ -229,10 +231,10 @@ export default {
                 .get('/orderInfo/get/' + this.$mp.query.id)
                 .then(res => {
                     this.hideLoading();
-                    this.caseId = res.caseId;
                     this.status = res;
                     this.addressList = res.address;
                     this.total = res.total;
+                    this.store = res.store;
                     this.Boxes = res.cardBoxList;
                     this.orderInfoId = res.id;
                     this.cardCaseInfo = res.cardCase.collection;
@@ -247,17 +249,14 @@ export default {
                     if (this.status.orderStatus === 'PAYED') {
                         this.status.label = '待发货';
                         this.status.name = '订单支付成功，处理发货';
-                        this.showTimeTab = true;
                     }
                     if (this.status.orderStatus === 'COMPETED') {
                         this.status.label = '交易成功';
                         this.status.name = '交易已完成';
-                        this.showTimeTab = true;
                     }
                     if (this.status.orderStatus === 'SEND') {
                         this.status.label = '已发货';
                         this.status.name = '等待买家签收';
-                        this.showTimeTab = true;
                     }
                 })
                 .catch(e => {
@@ -287,8 +286,17 @@ export default {
             //     }
             // }, 1000);
         },
-        again() {
-            this.navigateTo('/pages/details?id=' + this.caseId);
+        deliver() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        Buyers() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
         },
         logistics() {
             this.showLoading();
@@ -317,28 +325,6 @@ export default {
                     });
                 });
         },
-        comfrim() {
-            wx.showModal({
-                title: '提示',
-                content: '确定收货？',
-                success: res => {
-                    if (res.confirm) {
-                        this.$http
-                            .post('/orderInfo/finish', { orderInfoId: this.$mp.query.id })
-                            .then(res => {
-                                wx.showToast({
-                                    icon: 'none',
-                                    title: '收货成功'
-                                });
-                                setTimeout(() => {
-                                    this.getFn();
-                                }, 1000);
-                            })
-                            .catch(() => {});
-                    }
-                }
-            });
-        },
         sales() {
             wx.showToast({
                 title: '敬请开放',
@@ -357,7 +343,6 @@ export default {
                 icon: 'none'
             });
         },
-        pay() {},
         cancel() {
             wx.showModal({
                 title: '提示',
@@ -516,7 +501,21 @@ export default {
     .box-border {
         height: 1px;
         background: #f5f7fa;
-        margin: 22px 20px;
+        margin: 22px 0;
+    }
+    .message {
+        .flex();
+        p {
+            font-size: 13px;
+            font-weight: 400;
+            color: #ff6c00;
+            margin-left: 28px;
+        }
+        span {
+            font-size: 13px;
+            font-weight: 400;
+            color: #303133;
+        }
     }
     .box-border-but {
         height: 1px;
@@ -543,7 +542,7 @@ export default {
                 font-weight: bold;
                 color: #000000;
                 line-height: 22px;
-                margin-left: 2px;
+                margin-left: 9px;
             }
         }
         .box-tit-seller {
@@ -715,7 +714,7 @@ export default {
                 width: 163px;
                 font-size: 16px;
                 font-weight: 400;
-                color: #c8c9cc;
+                color: #ffffff;
                 line-height: 48px;
                 z-index: 1;
                 img {