卖家

src/components/AllorderInfo.vue

@@ -4,7 +4,7 @@
             <div class="box-tit">
                 <div>
                     <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
-                    <p>光之城卡牌</p>
+                    <p>{{ this.all.storeName }}</p>
                 </div>
                 <span>{{ this.name }}</span>
             </div>
@@ -273,6 +273,7 @@ export default {
                 title: '敬请开放',
                 icon: 'none'
             });
+            console.log(this.all);
         },
         remind() {
             this.$http.post('orderInfo/remindMy', { orderInfoId: this.id, remark: '' }).then(res => {

src/components/AllselloutInfo.vue

@@ -3,11 +3,7 @@
         <div class="box-con2">
             <div class="box-tit">
                 <div>
-                    <img
-                        style="width:20px;height:20px;border-radius:50%;"
-                        src="../static/imgs/img_touxiang.jpg"
-                        alt=""
-                    />
+                    <img style="width:20px;height:20px;border-radius:50%;" :src="all.image" alt="" />
                     <p>就爱吃馒头</p>
                 </div>
                 <span>{{ this.name }}</span>
@@ -29,11 +25,14 @@
             </div>
             <div class="message">
                 <p>买家留言：</p>
-                <span>尽快发货，谢谢</span>
+                <span>{{ this.all.remark }}</span>
             </div>
-            <div class="box-num">
-                <span>实际支付</span>
-                <span class="num">¥{{ all.total }}</span>
+            <div class="time">
+                <p>订单时间: {{ this.all.createTime }}</p>
+                <div class="box-num">
+                    <span>实付款</span>
+                    <span class="num">¥{{ all.total }}</span>
+                </div>
             </div>
             <div class="box-bor"></div>
             <div class="box-butm">
@@ -46,7 +45,7 @@
                 <div v-if="this.status == 'COMPETED'" @click="Buyers" class="box-but">联系买家</div>
                 <div v-if="this.status == 'COMPETED'" @click="logistics" class="box-but3">查看物流</div>
                 <div v-if="this.status == 'CANCELED'" @click="deletes" class="box-but">删除订单</div>
-                <div v-if="this.status == 'CANCELED'" @click="again" class="box-but3">联系买家</div>
+                <div v-if="this.status == 'CANCELED'" @click="Buyers" class="box-but3">联系买家</div>
             </div>
         </div>
         <van-popup :show="show" custom-style="background:transparent;border-radius: 12px 12px 0 0;" use-slot>
@@ -225,6 +224,7 @@ export default {
         },
 
         deliver() {
+            console.log(this.all);
             wx.showToast({
                 title: '敬请开放',
                 icon: 'none'
@@ -366,19 +366,29 @@ export default {
                 }
             }
         }
-        .box-num {
-            padding-top: 20px;
-            text-align: right;
-            span {
-                font-size: 14px;
-                font-weight: bold;
-                color: #000000;
+        .time {
+            .flex();
+            justify-content: space-between;
+            margin-top: 5px;
+            p {
+                font-size: 13px;
+                font-weight: 400;
+                color: #c8c9cc;
+                line-height: 26px;
             }
-            .num {
-                font-size: 16px;
-                font-weight: bold;
-                color: #f42202;
-                padding-left: 10px;
+            .box-num {
+                height: 26px;
+                span {
+                    font-size: 14px;
+                    font-weight: bold;
+                    color: #000000;
+                }
+                .num {
+                    font-size: 16px;
+                    font-weight: bold;
+                    color: #f42202;
+                    padding-left: 10px;
+                }
             }
         }
         .box-bor {
@@ -428,6 +438,7 @@ export default {
         }
         .message {
             .flex();
+            margin-top: 16px;
             p {
                 font-size: 13px;
                 font-weight: 400;

src/pages/Applydetails.vue

@@ -27,25 +27,45 @@
                 </div>
                 <div class="box-tit-seller">联系卖家</div>
             </div>
-            <div>
-                <div class="box-con">
-                    <div class="box-con-Cards">
-                        <img src="../native/imgs/marker.png" alt="" />
-                        <div class="box-con-right">
-                            <p class="box-con-tit">1105皇权破晓</p>
-                            <div class="box-con-today">
-                                <p>卡盒选号:卡包02—A</p>
-                            </div>
-                            <div class="box-con-money">
-                                <div class="box-con-num">
-                                    <p>¥320</p>
-                                </div>
-                                <p>×1</p>
+            <div class="box-con">
+                <div class="box-con-Cards">
+                    <img src="../native/imgs/marker.png" alt="" />
+                    <div class="box-con-right">
+                        <p class="box-con-tit">1105皇权破晓</p>
+                        <div class="box-con-today">
+                            <p>卡盒选号:卡包02—A</p>
+                        </div>
+                        <div class="box-con-money">
+                            <div class="box-con-num">
+                                <p>¥320</p>
                             </div>
+                            <p>×1</p>
                         </div>
                     </div>
                 </div>
             </div>
+            <div class="border"></div>
+            <div class="box-buttom">
+                <div class="box-buttom-con">
+                    <p>退款原因</p>
+                    <span>多拍/错拍/不想要</span>
+                </div>
+            </div>
+            <div class="box-buttom">
+                <div class="box-buttom-con">
+                    <p>申请时间</p>
+                    <span>2021-05-20 07:52:36</span>
+                </div>
+            </div>
+            <div class="box-buttom">
+                <div class="box-buttom-con">
+                    <p>订单编号</p>
+                    <div class="box-footer-cr">
+                        <span @click="orderCopy">复制</span>
+                        <p class="box-footer-p">2019052035464</p>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -124,7 +144,6 @@ export default {
             }
         }
         .box-con {
-            height: 160px;
             background: #ffffff;
             border-radius: 12px;
             .box-con-Cards {
@@ -150,6 +169,7 @@ export default {
                     background: #f5f7fa;
                     border-radius: 6px;
                     width: 142px;
+                    margin: 4px 0 11px 0;
                     p {
                         font-size: 14px;
                         font-weight: 400;
@@ -159,7 +179,6 @@ export default {
                 .box-con-money {
                     .flex();
                     justify-content: space-between;
-                    margin-top: 28px;
                     .box-con-num {
                         .flex();
                         img {
@@ -180,6 +199,57 @@ export default {
                 }
             }
         }
+        .border {
+            margin: 20px 0 14px 0;
+            height: 1px;
+            background: #f5f7fa;
+        }
+        .box-buttom {
+            margin-bottom: 16px;
+            .box-buttom-con {
+                .flex();
+                justify-content: space-between;
+                p {
+                    font-size: 13px;
+                    font-weight: 400;
+                    color: #939599;
+                    line-height: 24px;
+                }
+                span {
+                    font-size: 13px;
+                    font-weight: 400;
+                    color: #000000;
+                    line-height: 22px;
+                }
+                .box-footer-cr {
+                    display: flex;
+                    span {
+                        width: 38px;
+                        height: 18px;
+                        border-radius: 2px;
+                        border: 2px solid #c8c9cc;
+                        font-size: 12px;
+                        font-weight: 400;
+                        color: #c8c9cc;
+                        line-height: 18px;
+                        text-align: center;
+                        margin-right: 3px;
+                    }
+                }
+                p {
+                    font-size: 13px;
+                    font-weight: 400;
+                    color: #939599;
+                    line-height: 24px;
+                }
+                .box-footer-p {
+                    font-size: 13px;
+                    font-weight: 400;
+                    color: #000000;
+                    line-height: 22px;
+                }
+            }
+        }
     }
 }
 </style>

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>
+                <p>{{ this.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,101 +86,93 @@
                 <p class="box-buttom-p">¥10</p>
             </div>
         </div>
-        <div v-if="this.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="this.status.orderStatus !== 'CREATED'" class="box-buttom">
             <div class="box-buttom-con">
                 <p>支付方式</p>
                 <p class="box-buttom-p">微信支付</p>
             </div>
         </div>
-        <!-- <div class="box-buttom">
-            <div class="box-buttom-con">
-                <p>订单留言</p>
-                <div class="box-buttom-p2">{{ status.remark }}</div>
-            </div>
-        </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="this.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="this.status.orderStatus !== 'CREATED'" class="box-footer">
+            <div class="box-footer-con">
+                <p>付款时间</p>
+                <p class="box-footer-p">{{ status.paidTime }}</p>
             </div>
-            <div v-if="this.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="this.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-nav">
             <div class="box-btn">
-                <!-- 已完成 -->
-                <div v-if="this.status.orderStatus === 'COMPETED'" class="box-btn-left" @click="deletes">
+                <!-- 交易成功 -->
+                <div v-if="this.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="this.status.orderStatus === 'COMPETED'" class="box-btn-right" @click="sales">
+                <div v-if="this.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="this.status.orderStatus === 'SEND'" class="box-btn-left" @click="logistics">
+                <div v-if="this.status.orderStatus === 'SEND'" class="box-btn-left2" @click="logistics">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>查看物流</span>
                 </div>
-                <div v-if="this.status.orderStatus === 'SEND'" class="box-btn-right" @click="comfrim">
+                <div v-if="this.status.orderStatus === 'SEND'" class="box-btn-left" @click="Buyers">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
-                    <span>确认收货</span>
+                    <span>联系买家</span>
                 </div>
                 <!-- 待发货 -->
                 <div v-if="this.status.orderStatus === 'PAYED'" class="box-btn-left2" @click="cancel">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>取消订单</span>
                 </div>
-                <div v-if="this.status.orderStatus === 'PAYED'" class="box-btn-right" @click="comfrim">
+                <div v-if="this.status.orderStatus === 'PAYED'" class="box-btn-left" @click="deliver">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
                     <span>立即发货</span>
                 </div>
-                <!-- 待支付 -->
+                <!-- 买家待支付 -->
                 <div v-if="this.status.orderStatus === 'CREATED'" class="box-btn-left2" @click="cancel">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>取消订单</span>
                 </div>
-                <div v-if="this.status.orderStatus === 'CREATED'" class="box-btn-right" @click="pay">
+                <div v-if="this.status.orderStatus === 'CREATED'" class="box-btn-left" @click="Buyers">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
-                    <span>立即支付</span>
+                    <span>联系买家</span>
                 </div>
                 <!-- 已取消 -->
                 <div v-if="this.status.orderStatus === 'CANCELED'" class="box-btn-left2" @click="deletes">
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>删除订单</span>
                 </div>
-                <div v-if="this.status.orderStatus === 'CANCELED'" class="box-btn-right" @click="again">
-                    <img src="/native/imgs/btn_01@3x.png" alt="" />
-                    <span>重新购买</span>
+                <div v-if="this.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>
@@ -215,14 +212,13 @@ export default {
             total: '',
             addressList: [],
             name: '',
-            showTimeTab: false,
             orderInfoId: '',
             records: [],
             status: [],
             logisTics: [],
             stepsList: [],
             stepsShow: [],
-            caseId: ''
+            store: []
         };
     },
     methods: {
@@ -235,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;
@@ -253,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 => {
@@ -293,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();
@@ -323,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: '敬请开放',
@@ -363,7 +343,6 @@ export default {
                 icon: 'none'
             });
         },
-        pay() {},
         cancel() {
             wx.showModal({
                 title: '提示',
@@ -522,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;
@@ -721,7 +714,7 @@ export default {
                 width: 163px;
                 font-size: 16px;
                 font-weight: 400;
-                color: #c8c9cc;
+                color: #ffffff;
                 line-height: 48px;
                 z-index: 1;
                 img {

src/pages/confirmorder.vue

@@ -32,7 +32,7 @@
         <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>
+            <p>{{ this.store.storeName }}</p>
         </div>
         <div v-for="(item, index) in Boxes" :key="index.id">
             <div class="box-con">
@@ -103,6 +103,7 @@ export default {
             caseId: 0,
             boxIds: [],
             Boxes: [],
+            store: [],
             cardCaseInfo: {},
             total: '',
             message: ''
@@ -138,6 +139,7 @@ export default {
                     userAddressId: this.userAddressId
                 })
                 .then(res => {
+                    console.log(res);
                     this.hideLoading();
                     this.id = res.id;
                     this.navigateTo('/pages/orderdetails?id=' + this.id);
@@ -162,6 +164,7 @@ export default {
                 .then(res => {
                     this.hideLoading();
                     this.total = res.total;
+                    this.store = res.store;
                     this.Boxes = res.selectedBoxes;
                     this.cardCaseInfo = res.selectedCase.collection;
                 })

src/pages/orderdetails.vue

@@ -49,7 +49,7 @@
         <div class="box-tit">
             <div>
                 <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
-                <p>光之城卡牌</p>
+                <p>{{ this.store.storeName }}</p>
             </div>
             <div class="box-tit-seller" @click="seller">联系卖家</div>
         </div>
@@ -236,7 +236,8 @@ export default {
             minters: 0,
             seconds: 0,
             allTime: 5 * 60 - 1,
-            closeTime: ''
+            closeTime: '',
+            store: []
         };
     },
     methods: {
@@ -302,6 +303,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;