Merge branch 'dev' of http://git.izouma.com/panhui/card-wechat into dev

src/components/AllselloutInfo.vue

@@ -271,13 +271,13 @@ export default {
         },
         deliver() {
             console.log(this.all);
-            wx.showToast({
-                title: '敬请开放',
-                icon: 'none'
-            });
-            // this.$http.post('orderInfo/send', { logisticNo: 'SF1102671764014', type: '', remark: '' }).then(res => {
-            //     console.log(res);
+            // wx.showToast({
+            //     title: '敬请开放',
+            //     icon: 'none'
             // });
+            this.$http.post('orderInfo/send', { logisticNo: 'SF1102671764014', type: '', remark: '' }).then(res => {
+                console.log(res);
+            });
         }
     }
 };

src/pages/Applydetails.vue

@@ -208,6 +208,7 @@ export default {
                 img {
                     width: 17px;
                     height: 17px;
+                    border-radius: 50%;
                 }
                 p {
                     font-size: 14px;

src/pages/allselldetails.vue

@@ -188,7 +188,7 @@
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>取消订单</span>
                 </div>
-                <div v-if="status.orderStatus === 'PAYED'" class="box-btn-right" @click="comfrim">
+                <div v-if="status.orderStatus === 'PAYED'" class="box-btn-right" @click="deliver">
                     <img src="/native/imgs/btn_01@3x.png" alt="" />
                     <span>立即发货</span>
                 </div>
@@ -206,6 +206,10 @@
                     <img src="/native/imgs/btn_04@3x.png" alt="" />
                     <span>删除订单</span>
                 </div>
+                <div v-if="status.orderStatus === 'CANCELED'" class="box-btn-left2" @click="deliver">
+                    <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>
@@ -234,6 +238,23 @@
                 alt=""
             />
         </van-popup>
+        <van-dialog
+            use-slot
+            :show="showdialog"
+            show-cancel-button
+            custom-style="width:260px;height:270px;"
+            :message-Align="center"
+            confirm-button-open-type="getUserInfo"
+        >
+            <van-sticky :offset-top="0">
+                <div class="time-box">
+                    <van-dropdown-menu>
+                        <van-dropdown-item @change="change" :value="time" :options="option1" />
+                    </van-dropdown-menu>
+                </div>
+            </van-sticky>
+            <!-- <div class="box"></div> -->
+        </van-dialog>
     </div>
 </template>
 
@@ -243,10 +264,12 @@ export default {
     data() {
         return {
             show: false,
+            showdialog: false,
             Boxes: [],
             cardCaseInfo: {},
             total: '',
             tradeId: '',
+            time: 0,
             addressList: [],
             name: '',
             orderInfoId: '',
@@ -255,6 +278,13 @@ export default {
             logisTics: [],
             stepsList: [],
             stepsShow: [],
+            logisticsOptions: [
+                { label: '顺丰', value: 'SFEXPRESS' },
+                { label: '申通', value: 'STO' },
+                { label: '韵达', value: 'YUNDA' },
+                { label: '京东', value: 'JD' },
+                { label: '中通', value: 'ZTO' }
+            ],
             store: {},
             postage: {},
             user: {},
@@ -265,6 +295,17 @@ export default {
             cardBoxListLength: 0
         };
     },
+    computed: {
+        option1() {
+            let list = [...this.typeOptions];
+            return list.map(item => {
+                return {
+                    text: item.label,
+                    value: item.value
+                };
+            });
+        }
+    },
     methods: {
         logisticShow() {
             this.show = false;
@@ -450,20 +491,33 @@ export default {
                 content: '确定同意退款？',
                 success: res => {
                     if (res.confirm) {
-                        this.$http.post('orderRefundApply/audit', { orderId: this.orderInfoId }).then(res => {
-                            console.log(res);
-                            wx.showToast({
-                                icon: 'none',
-                                title: '退款成功'
-                            });
-                            setTimeout(() => {
-                                this.getFn();
-                            }, 1000);
-                        });
+                        this.$http
+                            .post('orderRefundApply/audit', { orderId: this.orderInfoId })
+                            .then(res => {
+                                console.log(res);
+                                wx.showToast({
+                                    icon: 'none',
+                                    title: '退款成功'
+                                });
+                                setTimeout(() => {
+                                    this.getFn();
+                                }, 1000);
+                            })
+                            .catch(() => {});
                     }
                 }
             });
         },
+        deliver() {
+            this.showdialog = true;
+            // let value = this.logisticsOptions.map(item => {
+            //     return item.value;
+            // });
+            console.log(this.typeList);
+            // this.$http.post('orderInfo/send', { logisticNo: 'SF1102671764014', type: value, remark: '' }).then(res => {
+            //     console.log(res);
+            // });
+        },
         deletes() {
             wx.showModal({
                 title: '提示',
@@ -525,6 +579,14 @@ export default {
     /deep/ .van-step__circle-container {
         height: 0;
     }
+    /deep/ .van-dropdown-item {
+        .van-cell {
+            .van-cell__title {
+                width: 200px;
+                max-width: 200px;
+            }
+        }
+    }
     /deep/ .van-steps {
         height: 307px;
         width: 334px;
@@ -634,6 +696,7 @@ export default {
             img {
                 width: 17px;
                 height: 17px;
+                border-radius: 50%;
             }
             p {
                 height: 22px;

src/pages/confirmorder.vue

@@ -310,6 +310,7 @@ export default {
         img {
             width: 17px;
             height: 17px;
+            border-radius: 50%;
         }
         p {
             height: 22px;

src/pages/minePublish.vue

@@ -80,7 +80,7 @@ export default {
         dropCaseStatusList() {
             let list = [...this.caseStatusList];
             list = list.filter(item => {
-                return this.isMineShop || item.value !== 'UNDO';
+                return this.isMine || item.value !== 'UNDO';
             });
             return [...list];
         }
@@ -108,22 +108,22 @@ export default {
             });
         },
         getStore() {
-            // console.log(this.userStoreInfo);
+            console.log(this.userStoreInfo);
             if (this.userStoreInfo) {
                 if (this.userStoreInfo.id.toString() === this.$mp.options.id || !this.$mp.options.id) {
-                    this.isMineShop = true;
+                    this.isMine = true;
                     return this.$store.dispatch('getUserStore');
                 } else {
-                    this.isMineShop = false;
+                    this.isMine = false;
                     return this.getStoreById(this.$mp.options.id);
                 }
             } else {
                 return this.$store.dispatch('getUserStore').then(res => {
                     if (res.id.toString() === this.$mp.options.id || !this.$mp.options.id) {
-                        this.isMineShop = true;
+                        this.isMine = true;
                         return Promise.resolve(res);
                     } else {
-                        this.isMineShop = false;
+                        this.isMine = false;
                         return this.getStoreById(this.$mp.options.id);
                     }
                 });

src/pages/orderdetails.vue

@@ -654,6 +654,7 @@ export default {
             img {
                 width: 17px;
                 height: 17px;
+                border-radius: 50%;
             }
             p {
                 height: 22px;

src/pages/walletdetails.vue

@@ -81,13 +81,13 @@ export default {
                 });
                 return;
             }
-            if (!this.form.boxPrice) {
-                wx.showToast({
-                    icon: 'none',
-                    title: '请输入金额'
-                });
-                return;
-            }
+            // if (!this.form.boxPrice) {
+            //     wx.showToast({
+            //         icon: 'none',
+            //         title: '请输入金额'
+            //     });
+            //     return;
+            // }
             this.showLoading();
             let userId = this.$store.state.userInfo.id;
             this.$http

src/pages/walletreview.vue

@@ -7,7 +7,7 @@
 </config>
 <template>
     <div class="review">
-        <van-image width="100%" :src="img" fit="widthFix" />
+        <van-image :src="img" fit="widthFix" />
         <div class="content">
             <div class="text1">{{ title }}</div>
             <div class="text2">{{ desc }}</div>
@@ -32,44 +32,45 @@ export default {
         },
         img() {
             const imgs = [
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/shenqing_yitongguo.png',
-                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/shenqing_yitongguo@3x.png'
+                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-05-31-12-33-35bZnlCSEk.png',
+                'https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-05-31-12-34-56CFIoxiyB.png'
             ];
-            return imgs[this.status === 'CREATED' ? 0 : 1];
+            return imgs[this.status === 'PASS' ? 0 : 1];
         },
         title() {
             const list = ['提交成功', '审核已通过'];
-            return list[this.status === 'CREATED' ? 0 : 1];
+            return list[this.status === 'PASS' ? 0 : 1];
         },
         desc() {
             const list = [
                 '您已成功申请提现服务，待审核成功后钱款将在72小时内提现到您的账户，请注意查收',
                 '您已申请的提现服务已通过审核，钱款将在72小时内提现到您的账户，请注意查收'
             ];
-            return list[this.status === 'CREATED' ? 0 : 1];
+            return list[this.status === 'PASS' ? 0 : 1];
         }
     },
     methods: {
-        // loginMethods() {
-        //     this.$http
-        //         .postJson('/storeAuthentication/all', {
-        //             query: { userId: this.$store.state.userInfo.id, del: false }
-        //         })
-        //         .then(res => {
-        //             console.log(res);
-        //             // if (!res.empty) {
-        //             //     this.authentication = res.content[0];
-        //             //     if (res.content[0].status === 'PASS') {
-        //             //         this.navigateBack();
-        //             //     }
-        //             // }
-        //         });
-        // }
+        loginMethods() {
+            this.$http
+                .postJson('/storeAuthentication/all', {
+                    query: { userId: this.$store.state.userInfo.id, del: false }
+                })
+                .then(res => {
+                    this.authentication = res.content[0];
+                    console.log(res);
+                });
+        }
     }
 };
 </script>
 
 <style lang="less" scoped>
+/deep/ .van-image {
+    width: 103px;
+    height: 78px;
+    margin-left: 34%;
+    margin-bottom: 20px;
+}
 .review {
     .flex-col();
     padding: 22px 26px 100px;