panhui 4 лет назад
Родитель
Сommit
19000ff12d

+ 13 - 12
src/components/AllorderInfo.vue

@@ -29,26 +29,26 @@
             </div>
             <div class="box-bor"></div>
             <div class="box-butm">
-                <div v-if="this.status == 'CREATED'" @click="cancel" class="box-but">取消订单</div>
-                <div v-if="this.status == 'CREATED'" @click="pay" class="box-but2">立即支付</div>
-                <div v-if="this.status == 'PAYED'" @click="Apply" class="box-but">申请退款</div>
-                <div v-if="this.status == 'PAYED'" @click="remind" class="box-but3">提醒发货</div>
-                <div v-if="this.status == 'SEND'" @click="logistics" class="box-but">查看物流</div>
-                <div v-if="this.status == 'SEND'" @click="comfrim" class="box-but2">确认收货</div>
-                <div v-if="this.status == 'COMPETED'" @click="sales" 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="status == 'CREATED'" @click="cancel" class="box-but">取消订单</div>
+                <div v-if="status == 'CREATED'" @click="pay" class="box-but2">立即支付</div>
+                <div v-if="status == 'PAYED'" @click="Apply" class="box-but">申请退款</div>
+                <div v-if="status == 'PAYED'" @click="remind" class="box-but3">提醒发货</div>
+                <div v-if="status == 'SEND'" @click="logistics" class="box-but">查看物流</div>
+                <div v-if="status == 'SEND'" @click="comfrim" class="box-but2">确认收货</div>
+                <div v-if="status == 'COMPETED'" @click="sales" 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="again" class="box-but3">重新购买</div>
             </div>
         </div>
         <van-popup :show="show" custom-style="background:transparent;border-radius: 12px 12px 0 0;" use-slot>
             <div class="popup-con">
                 <div class="popup-top">快递详情</div>
                 <div>
-                    <span>物流快递:{{ this.logisTics.expName }}</span>
+                    <span>物流快递:{{ logisTics.expName }}</span>
                 </div>
                 <div>
-                    <span>物流单号:{{ this.logisTics.number }}</span>
+                    <span>物流单号:{{ logisTics.number }}</span>
                     <span class="dialog-cv" @click="logisticCopy">复制</span>
                 </div>
             </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 => {

+ 37 - 26
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">
@@ -43,10 +42,10 @@
                 <div v-if="this.status == 'PAYED'" @click="deliver" class="box-but3">立即发货</div>
                 <div v-if="this.status == 'SEND'" @click="logistics" class="box-but">查看物流</div>
                 <div v-if="this.status == 'SEND'" @click="Buyers" class="box-but3">联系买家</div>
-                <!-- <div v-if="this.status == 'COMPETED'" @click="sales" class="box-but">申请售后</div>
+                <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>
@@ -108,13 +107,13 @@ export default {
                 return '买家待支付';
             }
             if (this.status === 'CANCELED') {
-                return '已取消';
+                return '交易关闭';
             }
             if (this.status === 'PAYED') {
                 return '待发货';
             }
             if (this.status === 'COMPETED') {
-                return '已完成';
+                return '交易成功';
             }
             if (this.status === 'SEND') {
                 return '买家待收货';
@@ -157,7 +156,7 @@ export default {
             this.$emit('allsellout');
         },
         allorder() {
-            // this.navigateTo('/pages/orderdetails?id=' + this.id);
+            this.navigateTo('/pages/allselldetails?id=' + this.id);
         },
         sales() {
             wx.showToast({
@@ -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;

+ 1 - 0
src/main.js

@@ -42,6 +42,7 @@ export default {
             'pages/chat',
             'pages/allorder',
             'pages/allsellout',
+            'pages/allselldetails',
             'pages/follow',
             'pages/setting',
             'pages/wallet',

+ 86 - 16
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>

+ 817 - 0
src/pages/allselldetails.vue

@@ -0,0 +1,817 @@
+<config>
+{
+    "navigationBarBackgroundColor": "#ff6c00",
+    "navigationBarTextStyle": "black",
+    "backgroundTextStyle":"light"
+}
+</config>
+<template>
+    <div class="container">
+        <div class="box-top">
+            <p>{{ this.status.label }}</p>
+            <h3>{{ this.status.name }}</h3>
+        </div>
+        <div class="box-adderss">
+            <div
+                v-if="
+                    this.status.orderStatus !== 'CREATED' &&
+                        this.status.orderStatus !== 'PAYED' &&
+                        this.status.orderStatus !== 'CANCELED'
+                "
+            >
+                <div class="box-adderss-con" @click="logistics">
+                    <img src="../static/imgs/dingdan_icon_wuliu@3x.png" alt="" />
+                    <div class="box-con-top">
+                        <p>{{ this.stepsShow.status }}</p>
+                        <p class="box-adderss-span">{{ this.stepsShow.time }}</p>
+                    </div>
+                    <div class="box-adderss-right">></div>
+                </div>
+                <div class="box-border"></div>
+            </div>
+            <div class="box-adderss-con">
+                <img src="../static/imgs/dingdan_icon_dizhi@3x.png" alt="" />
+                <div class="box-con-top">
+                    <span>{{ this.addressList.name }}</span>
+                    <span class="box-con-span">{{ this.addressList.phone }}</span>
+                    <p>
+                        {{ addressList.province }} {{ addressList.city }} {{ addressList.district }}
+                        {{ addressList.detail }}
+                    </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>{{ this.store.storeName }}</p>
+            </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">
+                <div class="box-con-Cards">
+                    <img :src="cardCaseInfo.images[0]" alt="" />
+                    <div class="box-con-right">
+                        <p class="box-con-tit">{{ cardCaseInfo.name }}</p>
+                        <div class="box-con-today">
+                            <p>卡盒选号: {{ item.groupCode + item.boxCode }}</p>
+                        </div>
+                        <div class="box-con-money">
+                            <div class="box-con-num">
+                                <p>¥{{ item.boxPrice }}</p>
+                            </div>
+                            <p>×1</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="box-border-but"></div>
+        <div class="box-buttom">
+            <div class="box-buttom-con">
+                <p>商品价格</p>
+                <p class="box-buttom-p">¥{{ total }}</p>
+            </div>
+        </div>
+        <div class="box-buttom">
+            <div class="box-buttom-con">
+                <p>邮费</p>
+                <p class="box-buttom-p">¥10</p>
+            </div>
+        </div>
+        <div class="box-buttom">
+            <div class="box-buttom-con">
+                <p>实际支付</p>
+                <p class="box-buttom-p3">¥{{ total }}</p>
+            </div>
+        </div>
+        <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-border-but"></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>
+        <div class="box-footer">
+            <div class="box-footer-con">
+                <p>创建时间</p>
+                <p class="box-footer-p">{{ status.createdAt }}</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 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-left2" @click="Buyers">
+                    <img src="/native/imgs/btn_04@3x.png" alt="" />
+                    <span>联系买家</span>
+                </div>
+                <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>
+                </div>
+                <!-- 已发货 -->
+                <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-left" @click="Buyers">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <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-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-left" @click="Buyers">
+                    <img src="/native/imgs/btn_01@3x.png" alt="" />
+                    <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="Buyers">
+                    <img src="/native/imgs/btn_01@4x.png" alt="" />
+                    <span class="box-btn-sp">联系买家</span>
+                </div>
+            </div>
+        </div>
+        <van-popup :show="show" custom-style="background:transparent;border-radius: 12px 12px 0 0;" use-slot>
+            <div class="popup-con">
+                <div class="popup-top">快递详情</div>
+                <div>
+                    <span>物流快递:{{ this.logisTics.expName }}</span>
+                </div>
+                <div>
+                    <span>物流单号:{{ this.logisTics.number }}</span>
+                    <span class="dialog-cv" @click="logisticCopy">复制</span>
+                </div>
+            </div>
+            <van-steps :steps="stepsList" direction="vertical">
+                <div>{{ stepsList.text }}</div>
+                <div>{{ stepsList.desc }}</div>
+            </van-steps>
+            <img
+                @click="logisticShow"
+                style="height:40px;width:40px;margin-left:150px;margin-top:30px"
+                src="../static/imgs/icon_tanchuang_close@3x.png"
+                alt=""
+            />
+        </van-popup>
+    </div>
+</template>
+
+<script>
+export default {
+    name: '',
+    data() {
+        return {
+            show: false,
+            Boxes: [],
+            cardCaseInfo: {},
+            total: '',
+            addressList: [],
+            name: '',
+            orderInfoId: '',
+            records: [],
+            status: [],
+            logisTics: [],
+            stepsList: [],
+            stepsShow: [],
+            store: []
+        };
+    },
+    methods: {
+        logisticShow() {
+            this.show = false;
+        },
+        getFn() {
+            this.showLoading();
+            this.$http
+                .get('/orderInfo/get/' + this.$mp.query.id)
+                .then(res => {
+                    this.hideLoading();
+                    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;
+                    if (this.status.orderStatus === 'CREATED') {
+                        this.status.label = '买家待支付';
+                        this.status.name = '未支付将自动取消订单';
+                    }
+                    if (this.status.orderStatus === 'CANCELED') {
+                        this.status.label = '交易关闭';
+                        this.status.name = '很遗憾,订单已取消';
+                    }
+                    if (this.status.orderStatus === 'PAYED') {
+                        this.status.label = '待发货';
+                        this.status.name = '订单支付成功,处理发货';
+                    }
+                    if (this.status.orderStatus === 'COMPETED') {
+                        this.status.label = '交易成功';
+                        this.status.name = '交易已完成';
+                    }
+                    if (this.status.orderStatus === 'SEND') {
+                        this.status.label = '已发货';
+                        this.status.name = '等待买家签收';
+                    }
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showToast({
+                        icon: 'none',
+                        title: '请返回首页操作'
+                    });
+                });
+            // setTimeout(() => {
+            //     if (this.status.orderStatus == 'COMPETED' || this.status.orderStatus == 'SEND') {
+            // console.log(this.status.orderStatus);
+            this.$http.get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id }).then(res => {
+                this.hideLoading();
+                this.logisTics = res.logistic.result;
+                let steps = [];
+                res.logistic.result.list.forEach(item => {
+                    let newStep = {
+                        desc: item.status,
+                        text: item.time
+                    };
+                    steps.push(newStep);
+                });
+                this.stepsList = steps;
+                this.stepsShow = res.logistic.result.list[0];
+            });
+            //     }
+            // }, 1000);
+        },
+        deliver() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        Buyers() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        logistics() {
+            this.showLoading();
+            // 查看物流
+            this.$http
+                .get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id })
+                .then(res => {
+                    this.hideLoading();
+                    this.logisTics = res.logistic.result;
+                    let steps = [];
+                    res.logistic.result.list.forEach(item => {
+                        let newStep = {
+                            desc: item.status,
+                            text: item.time
+                        };
+                        steps.push(newStep);
+                    });
+                    this.stepsList = steps;
+                    this.show = true;
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showToast({
+                        title: '暂无物流信息',
+                        icon: 'none'
+                    });
+                });
+        },
+        sales() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        seller() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        Apply() {
+            wx.showToast({
+                title: '敬请开放',
+                icon: 'none'
+            });
+        },
+        cancel() {
+            wx.showModal({
+                title: '提示',
+                content: '确定取消订单?',
+                success: res => {
+                    if (res.confirm) {
+                        this.$http
+                            .post('/orderInfo/cancel', { orderInfoId: this.$mp.query.id })
+                            .then(res => {
+                                wx.showToast({
+                                    icon: 'none',
+                                    title: '订单已取消'
+                                });
+                                setTimeout(() => {
+                                    this.getFn();
+                                }, 1000);
+                            })
+                            .catch(() => {});
+                    }
+                }
+            });
+        },
+        deletes() {
+            wx.showModal({
+                title: '提示',
+                content: '确定删除订单?',
+                success: res => {
+                    if (res.confirm) {
+                        this.$http
+                            .post('orderInfo/delete', { orderInfoId: this.$mp.query.id })
+                            .then(res => {
+                                wx.showToast({
+                                    icon: 'none',
+                                    title: '订单已删除'
+                                });
+                                setTimeout(() => {
+                                    this.navigateTo('/pages/allsellout');
+                                }, 1000);
+                            })
+                            .catch(() => {});
+                    }
+                }
+            });
+        },
+        orderCopy() {
+            wx.setClipboardData({
+                data: this.status.transactionId + '',
+                success(res) {
+                    wx.getClipboardData({
+                        success(res) {
+                            wx.showToast({
+                                title: '订单单号复制成功'
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        logisticCopy() {
+            wx.setClipboardData({
+                data: this.logisTics.number + '',
+                success(res) {
+                    wx.getClipboardData({
+                        success(res) {
+                            wx.showToast({
+                                title: '物流单号复制成功'
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    },
+    created() {
+        this.getFn();
+    }
+};
+</script>
+<style lang="less" scoped>
+.container {
+    /deep/ .van-step__circle-container {
+        height: 0;
+    }
+    /deep/ .van-steps {
+        height: 307px;
+        width: 334px;
+        overflow: auto !important;
+        border-radius: 0 0 12px 12px;
+    }
+    padding-bottom: 140px;
+    padding: 102px 0 140px 0;
+    .box-top {
+        height: 102px;
+        background: #ff6c00;
+        position: fixed;
+        width: 100%;
+        top: 0;
+        p {
+            height: 34px;
+            font-size: 24px;
+            font-weight: bold;
+            color: #ffffff;
+            line-height: 34px;
+            padding: 11px 0 0 20px;
+        }
+        h3 {
+            height: 24px;
+            font-size: 14px;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 24px;
+            margin: 8px 0 0 20px;
+        }
+    }
+    .box-adderss {
+        margin: 21px 20px;
+        .box-adderss-con {
+            display: flex;
+            img {
+                width: 22px;
+                height: 22px;
+                margin-right: 7px;
+            }
+            .box-adderss-right {
+                font-weight: bold;
+                width: 6px;
+                height: 11px;
+                margin: 15px 0 0 0;
+            }
+            .box-con-top {
+                span {
+                    font-size: 14px;
+                    font-weight: bold;
+                    color: #000000;
+                    line-height: 24px;
+                }
+                p {
+                    font-size: 14px;
+                    font-weight: bold;
+                    color: #000000;
+                    line-height: 24px;
+                    width: 300px;
+                }
+                .box-adderss-span {
+                    font-size: 13px;
+                    font-weight: 400;
+                    color: #c8c9cc;
+                    line-height: 24px;
+                }
+                .box-con-span {
+                    margin-left: 10px;
+                }
+            }
+        }
+    }
+    .box-border {
+        height: 1px;
+        background: #f5f7fa;
+        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;
+        background: #f5f7fa;
+        margin: 20px 20px 27px;
+    }
+    .box-bg {
+        height: 5px;
+        background: #f5f7fa;
+    }
+    .box-tit {
+        .flex();
+        justify-content: space-between;
+        margin: 20px 20px 0 20px;
+        div {
+            .flex();
+            img {
+                width: 17px;
+                height: 17px;
+            }
+            p {
+                height: 22px;
+                font-size: 14px;
+                font-weight: bold;
+                color: #000000;
+                line-height: 22px;
+                margin-left: 2px;
+            }
+        }
+        .box-tit-seller {
+            height: 22px;
+            font-size: 14px;
+            font-weight: 400;
+            color: #ff6c00;
+            line-height: 22px;
+        }
+    }
+    .box-con {
+        height: 90px;
+        background: #ffffff;
+        border-radius: 12px;
+        .box-con-Cards {
+            margin: 16px 0 20px 20px;
+            display: flex;
+            img {
+                width: 62px;
+                height: 90px;
+                border-radius: 6px;
+            }
+            .box-con-right {
+                width: 75%;
+                margin-left: 8px;
+                .box-con-tit {
+                    height: 24px;
+                    font-size: 16px;
+                    font-weight: bold;
+                    color: #000000;
+                    line-height: 24px;
+                }
+            }
+            .box-con-today {
+                .flex();
+                height: 30px;
+                margin: 4px 0 8px 0;
+                background: #f5f7fa;
+                border-radius: 6px;
+                width: 142px;
+                p {
+                    height: 24px;
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #303133;
+                    line-height: 24px;
+                }
+            }
+            .box-con-money {
+                .flex();
+                justify-content: space-between;
+                .box-con-num {
+                    .flex();
+                    img {
+                        width: 16px;
+                        height: 16px;
+                    }
+                    p {
+                        height: 22px;
+                        font-size: 14px;
+                        font-weight: normal;
+                        color: #c8c9cc;
+                        line-height: 22px;
+                    }
+                }
+                p {
+                    height: 24px;
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #c8c9cc;
+                    line-height: 24px;
+                }
+            }
+        }
+    }
+    .box-buttom {
+        margin: 0 20px 35px;
+        .box-buttom-con {
+            .flex();
+            justify-content: space-between;
+            p {
+                height: 20px;
+                font-size: 14px;
+                font-weight: bold;
+                color: #000000;
+                line-height: 20px;
+            }
+            .box-buttom-p {
+                height: 22px;
+                font-size: 16px;
+                font-weight: bold;
+                color: #000000;
+                line-height: 22px;
+            }
+            .box-buttom-p3 {
+                height: 22px;
+                font-size: 16px;
+                font-weight: bold;
+                color: #f42202;
+                line-height: 22px;
+            }
+            .box-buttom-p2 {
+                height: 22px;
+                font-size: 13px;
+                font-weight: bold;
+                color: #c8c9cc;
+            }
+        }
+    }
+    .box-footer {
+        margin: 0 20px 15px;
+        .box-footer-con {
+            .flex();
+            justify-content: space-between;
+            .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 {
+                height: 24px;
+                font-size: 13px;
+                font-weight: 400;
+                color: #939599;
+                line-height: 24px;
+            }
+            .box-footer-p {
+                height: 22px;
+                font-size: 13px;
+                font-weight: 400;
+                color: #000000;
+                line-height: 22px;
+            }
+        }
+    }
+    .box-footer-nav {
+        padding-bottom: 40px;
+        position: fixed;
+        bottom: 0;
+        width: 100%;
+        background: #ffffff;
+        .box-tit2 {
+            height: 44px;
+            background: #ff6c00;
+            opacity: 0.26;
+            p {
+                text-align: center;
+                font-size: 13px;
+                font-weight: 400;
+                color: #000000;
+                line-height: 44px;
+            }
+        }
+        .box-btn {
+            display: flex;
+            justify-content: space-between;
+            margin: 6px 20px 0 20px;
+            .box-btn-left {
+                width: 163px;
+                font-size: 16px;
+                font-weight: 400;
+                color: #ffffff;
+                line-height: 48px;
+                z-index: 1;
+                img {
+                    padding-bottom: 40px;
+                    position: absolute;
+                    width: 163px;
+                    height: 48px;
+                    z-index: -1;
+                }
+                span {
+                    padding-left: 49px;
+                }
+            }
+            .box-btn-left2 {
+                width: 163px;
+                font-size: 16px;
+                font-weight: 400;
+                color: #c8c9cc;
+                line-height: 48px;
+                img {
+                    padding-bottom: 40px;
+                    position: absolute;
+                    width: 163px;
+                    height: 48px;
+                    z-index: -1;
+                }
+                span {
+                    padding-left: 49px;
+                }
+            }
+            .box-btn-right {
+                width: 163px;
+                font-size: 16px;
+                font-weight: 400;
+                color: #ffffff;
+                text-align: center;
+                line-height: 48px;
+                padding-right: 25px;
+                img {
+                    padding-bottom: 40px;
+                    position: absolute;
+                    width: 163px;
+                    height: 48px;
+                    z-index: -1;
+                }
+                span {
+                    padding-left: 49px;
+                }
+                .box-btn-sp {
+                    color: #ff6c00;
+                }
+            }
+        }
+    }
+    .popup-con {
+        padding: 12px 0 20px 9px;
+        background: #ffffff;
+        .popup-top {
+            height: 22px;
+            font-size: 16px;
+            font-weight: bold;
+            color: #000000;
+            line-height: 22px;
+            text-align: center;
+            padding: 50px 0 15px 0;
+        }
+        span {
+            height: 20px;
+            font-size: 14px;
+            font-weight: 400;
+            color: #1a1a1a;
+            line-height: 20px;
+        }
+        .dialog-cv {
+            width: 40px;
+            height: 20px;
+            border-radius: 2px;
+            border: 1px solid #c8c9cc;
+            font-size: 12px;
+            font-weight: 400;
+            color: #c8c9cc;
+            line-height: 20px;
+            text-align: center;
+            margin-left: 8px;
+        }
+    }
+    .steps-con {
+        display: flex;
+        .steps-time {
+            width: 37px;
+            height: 34px;
+            font-size: 12px;
+            font-weight: 500;
+            color: #1a1a1a;
+            line-height: 17px;
+            margin: 10px 0 22px 11px;
+        }
+    }
+}
+</style>

+ 17 - 10
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">
@@ -53,6 +53,7 @@
                 </div>
             </div>
         </div>
+        <div class="box-border-but"></div>
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>商品价格</p>
@@ -102,6 +103,7 @@ export default {
             caseId: 0,
             boxIds: [],
             Boxes: [],
+            store: [],
             cardCaseInfo: {},
             total: '',
             message: ''
@@ -137,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);
@@ -161,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;
                 })
@@ -313,19 +317,19 @@ export default {
         }
     }
     .box-con {
-        height: 160px;
+        height: 90px;
         background: #ffffff;
         border-radius: 12px;
         .box-con-Cards {
             margin: 16px 0 20px 20px;
             display: flex;
             img {
-                width: 90px;
-                height: 130px;
+                width: 62px;
+                height: 90px;
                 border-radius: 6px;
             }
             .box-con-right {
-                width: 237px;
+                width: 75%;
                 margin-left: 8px;
                 .box-con-tit {
                     height: 24px;
@@ -333,7 +337,6 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
-                    margin: 5px 0 10px 0;
                 }
             }
             .box-con-today {
@@ -341,6 +344,7 @@ export default {
                 height: 30px;
                 background: #f5f7fa;
                 border-radius: 6px;
+                margin: 4px 0 8px 0;
                 width: 142px;
                 p {
                     height: 24px;
@@ -353,10 +357,8 @@ export default {
             .box-con-money {
                 .flex();
                 justify-content: space-between;
-                margin-top: 28px;
                 .box-con-num {
-                    display: flex;
-                    align-items: center;
+                    .flex();
                     img {
                         width: 16px;
                         height: 16px;
@@ -379,8 +381,13 @@ export default {
             }
         }
     }
+    .box-border-but {
+        height: 1px;
+        background: #f5f7fa;
+        margin: 20px 20px 27px;
+    }
     .box-buttom {
-        margin: 35px 20px;
+        margin: 0 20px 35px;
         .box-buttom-con {
             .flex();
             justify-content: space-between;

+ 1 - 17
src/pages/mine.vue

@@ -48,6 +48,7 @@
                 height="86"
                 src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/info_img_renzhengdianjia1.png"
                 fit="contain"
+                @click="wait"
             />
         </div>
 
@@ -162,24 +163,7 @@ export default {
                 .catch(() => {
                     this.navigateTo('/pages/store/review');
                 });
-        },
-        loginMethods() {
-            this.$nextTick(() => {
-                if (this.isLogin) {
-                    var authStatus = wx.getStorageSync('authStatus');
-                    this.$store.dispatch('getUserStore').then(res => {
-                        console.log(authStatus);
-                        if (authStatus !== res.id + '_PASS') {
-                            this.$refs.reviewPass.show = true;
-                            wx.setStorageSync('authStatus', res.id + '_PASS');
-                        }
-                    });
-                }
-            });
         }
-    },
-    onShow() {
-        this.loginMethods();
     }
 };
 </script>

+ 12 - 15
src/pages/orderdetails.vue

@@ -236,14 +236,10 @@ export default {
             minters: 0,
             seconds: 0,
             allTime: 5 * 60 - 1,
-            closeTime: ''
+            closeTime: '',
+            store: {}
         };
     },
-    computed: {
-        store() {
-            return this.status.store || {};
-        }
-    },
     methods: {
         logisticShow() {
             this.show = false;
@@ -307,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;
@@ -633,8 +630,9 @@ export default {
     .box-border-but {
         height: 1px;
         background: #f5f7fa;
-        margin: 0 20px;
+        margin: 20px 20px 27px;
     }
+
     .box-bg {
         height: 5px;
         background: #f5f7fa;
@@ -667,19 +665,19 @@ export default {
         }
     }
     .box-con {
-        height: 160px;
+        height: 90px;
         background: #ffffff;
         border-radius: 12px;
         .box-con-Cards {
             margin: 16px 0 20px 20px;
             display: flex;
             img {
-                width: 90px;
-                height: 130px;
+                width: 62px;
+                height: 90px;
                 border-radius: 6px;
             }
             .box-con-right {
-                width: 237px;
+                width: 75%;
                 margin-left: 8px;
                 .box-con-tit {
                     height: 24px;
@@ -687,7 +685,6 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
-                    margin: 5px 0 10px 0;
                 }
             }
             .box-con-today {
@@ -696,6 +693,7 @@ export default {
                 background: #f5f7fa;
                 border-radius: 6px;
                 width: 142px;
+                margin: 4px 0 8px 0;
                 p {
                     height: 24px;
                     font-size: 14px;
@@ -707,7 +705,6 @@ export default {
             .box-con-money {
                 .flex();
                 justify-content: space-between;
-                margin-top: 28px;
                 .box-con-num {
                     .flex();
                     img {
@@ -733,7 +730,7 @@ export default {
         }
     }
     .box-buttom {
-        margin: 35px 20px;
+        margin: 0 20px 35px;
         .box-buttom-con {
             .flex();
             justify-content: space-between;
@@ -767,7 +764,7 @@ export default {
         }
     }
     .box-footer {
-        margin: 15px 20px;
+        margin: 0 20px 15px;
         .box-footer-con {
             .flex();
             justify-content: space-between;