528

.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=https://zhuoka.izouma.com
+VUE_APP_BASE_URL=http://192.168.50.212:8080

src/components/AllorderInfo.vue

@@ -104,9 +104,6 @@ export default {
         storeId() {
             return this.all.storeId || 0;
         },
-        userNickName() {
-            return this.all.userNickName || '';
-        },
         storeName() {
             return this.all.storeName || '';
         },
@@ -446,6 +443,7 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
+                    overflow: hidden;
                 }
             }
             .box-con-today {

src/components/AllselloutInfo.vue

@@ -93,7 +93,8 @@ export default {
         return {
             show: false,
             stepsList: [],
-            logisTics: []
+            logisTics: [],
+            userId: ''
         };
     },
     computed: {
@@ -109,6 +110,9 @@ export default {
         caseId() {
             return this.all.caseId || 0;
         },
+        userNickName() {
+            return this.all.userNickName || '';
+        },
         name() {
             if (this.all.status === 'CREATED') {
                 return '买家待支付';
@@ -171,12 +175,6 @@ export default {
         allorder() {
             this.navigateTo('/pages/allselldetails?id=' + this.id);
         },
-        sales() {
-            wx.showToast({
-                title: '敬请开放',
-                icon: 'none'
-            });
-        },
         logisticCopy() {
             wx.setClipboardData({
                 data: this.logisTics.number + '',
@@ -191,13 +189,14 @@ export default {
                 }
             });
         },
-        Buyers() {
-            console.log(this.all);
-            wx.showToast({
-                title: '敬请开放',
-                icon: 'none'
+        userIds() {
+            this.$http.get('/store/get/' + this.storeId).then(res => {
+                this.userId = res.userId;
             });
         },
+        Buyers() {
+            this.navigateTo('/pages/chat?toUserId=' + this.userId + '&toName=' + this.userNickName);
+        },
         cancel() {
             wx.showModal({
                 title: '提示',
@@ -339,6 +338,7 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
+                    overflow: hidden;
                 }
             }
             .box-con-today {

src/components/CardCase.vue

@@ -5,7 +5,7 @@
                 <div class="text1" v-if="chooseIds.length > 0">
                     已选<span>{{ chooseIds.length }}</span
                     >包，共<span>{{ money }}</span
-                    >元，邮费10}元
+                    >元，邮费{{ chooseIds.postage || 10 }}元
                 </div>
                 <div v-else>请选择卡包</div>
             </div>
@@ -45,7 +45,9 @@
                 </div>
 
                 <div class="bottom">
-                    <span class="text">已选{{ nowChoose.length }}包，共{{ money }}元，邮费10元</span>
+                    <span class="text"
+                        >已选{{ nowChoose.length }}包，共{{ money }}元，邮费{{ nowChoose.postage || 10 }}元</span
+                    >
                     <van-button size="medium" @click="submit" class="submit" :radius="0" type="primary"
                         >确认购买</van-button
                     >
@@ -140,7 +142,7 @@ export default {
             this.nowChoose = list;
         },
         submit() {
-            // console.log(this.cardCaseInfo);
+            console.log(this.cardCaseInfo);
             // console.log(this.cardList);
             if (this.nowChoose.length === 0) {
                 this.toast('请选择卡牌');

src/pages/Applydetails.vue

@@ -38,7 +38,7 @@
                     <img :src="store.logo" alt="" />
                     <p>{{ store.storeName }}</p>
                 </div>
-                <div class="box-tit-seller">联系卖家</div>
+                <div class="box-tit-seller" @click="sales">联系卖家</div>
             </div>
             <div v-for="(item, index) in Boxes" :key="index.id">
                 <div class="box-con">
@@ -125,6 +125,9 @@ export default {
                     }
                 });
         },
+        sales() {
+            this.navigateTo('/pages/chat?toUserId=' + this.store.userId + '&toName=' + this.store.storeName);
+        },
         orderCopy() {
             wx.setClipboardData({
                 data: this.ApplydetailList.transactionId + '',
@@ -227,6 +230,7 @@ export default {
                     margin-left: 8px;
                     .box-con-tit {
                         font-size: 16px;
+                        overflow: hidden;
                         font-weight: bold;
                         color: #000000;
                         margin: 5px 0 10px 0;

src/pages/allselldetails.vue

@@ -54,7 +54,7 @@
                 <img :src="store.logo" alt="" />
                 <p>{{ store.storeName }}</p>
             </div>
-            <div class="box-tit-seller">共{{ status.cardBoxList.length }}件商品</div>
+            <!-- <div class="box-tit-seller">共{{ status.cardBoxList.length }}件商品</div> -->
         </div>
         <div class="box-tit2" v-if="status.orderStatus == 'REFUND' || status.orderStatus == 'REFUNDED'">
             <div>
@@ -246,7 +246,8 @@ export default {
             logisTics: [],
             stepsList: [],
             stepsShow: [],
-            store: []
+            store: {},
+            user: {}
         };
     },
     methods: {
@@ -259,8 +260,8 @@ export default {
                 .get('/orderInfo/get/' + this.$mp.query.id)
                 .then(res => {
                     this.hideLoading();
-                    console.log(res);
                     this.status = res;
+                    this.user = res.user;
                     this.addressList = res.address;
                     this.total = res.total;
                     this.store = res.store;
@@ -324,10 +325,7 @@ export default {
             // }, 1000);
         },
         Buyers() {
-            wx.showToast({
-                title: '敬请开放',
-                icon: 'none'
-            });
+            this.navigateTo('/pages/chat?toUserId=' + this.store.userId + '&toName=' + this.user.nickname);
         },
         logistics() {
             this.showLoading();

src/pages/confirmorder.vue

@@ -337,6 +337,7 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
+                    overflow: hidden;
                 }
             }
             .box-con-today {
@@ -449,6 +450,7 @@ export default {
                 margin: 7px 0 0 5px;
             }
             p {
+                font-family: 'OSP';
                 height: 22px;
                 font-size: 24px;
                 font-weight: normal;

src/pages/minePublish.vue

@@ -13,7 +13,7 @@
                         <div class="text1">{{ item.caseName }}</div>
                         <div class="text2">
                             <span>距结束</span>
-                            <van-count-down class="val" :time="time" format="DD 天 HH:mm:ss" />
+                            <van-count-down class="val" :time="item.endTime" format="DD 天 HH:mm:ss" />
                         </div>
                         <div class="text2">
                             <span>已拼箱</span>
@@ -69,7 +69,7 @@ export default {
             empty: false,
             isMineShop: false,
             offsetTop: 0,
-            endTimeList: []
+            endTimeLists: []
         };
     },
     computed: {
@@ -80,15 +80,6 @@ export default {
                 return this.isMineShop || item.value !== 'UNDO';
             });
             return [...list];
-        },
-        time() {
-            if (this.endTimeList) {
-                let date = dayjs(this.endTimeList, 'YYYY-MM-DD HH:mm:ss');
-
-                return date.diff(dayjs());
-            } else {
-                return 0;
-            }
         }
     },
     onShow() {
@@ -158,8 +149,9 @@ export default {
             this.showLoading();
             return this.$http.post('/store/findStoreCases', data).then(res => {
                 this.list = res.caseInfo;
-                // this.endTimeList = res.caseInfo[0].endTime;
-                // console.log(this.endTimeList);
+                this.list.forEach(item => {
+                    item.endTime = dayjs(item.endTime, 'YYYY-MM-DD HH:mm:ss').diff(dayjs());
+                });
                 if (res.caseInfo.length == 0) {
                     this.empty = true;
                 }

src/pages/orderdetails.vue

@@ -676,6 +676,7 @@ export default {
                     font-weight: bold;
                     color: #000000;
                     line-height: 24px;
+                    overflow: hidden;
                 }
             }
             .box-con-today {

src/pages/store/productEdit.vue

@@ -390,6 +390,7 @@ export default {
                     this.imagesList.push({ ...file, url: res });
                     this.images = [...this.imagesList];
                     this.imageUrls.push(res);
+                    console.log(this.images);
                 })
                 .catch(e => {
                     this.hideLoading();
@@ -401,7 +402,8 @@ export default {
         },
         deleteImg(info) {
             // console.log(info);
-            // this.images.splice(this.imagesList, 1);
+            console.log(info);
+            this.images.splice(0, 1);
         },
         submit() {
             if (!this.name) {

src/pages/wallet.vue

@@ -91,24 +91,25 @@ export default {
             });
         },
         Withdrawal() {
-            // this.showLoading();
-            // let userId = this.$store.state.userInfo.id;
-            // this.$http
-            //     .post('/memberInfo/newWithDraw', { userId, money: this.moneyInfo.money })
-            //     .then(res => {
-            //         this.hideLoading();
-            //         console.log(res);
-            //         wx.showToast({
-            //             title: '提现成功'
-            //         });
-            //     })
-            //     .catch(e => {
-            //         this.hideLoading();
-            //         wx.showToast({
-            //             icon: 'none',
-            //             title: e.error
-            //         });
-            //     });
+            this.showLoading();
+            let userId = this.$store.state.userInfo.id;
+            this.$http
+                .post('/memberInfo/newWithDraw', { userId, money: this.moneyInfo.money })
+                .then(res => {
+                    this.hideLoading();
+                    // console.log(res);
+                    wx.showToast({
+                        title: '提现审核中，72小时内通过',
+                        duration: 4000
+                    });
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showToast({
+                        icon: 'none',
+                        title: e.error
+                    });
+                });
         },
         record(e) {
             this.time = e.detail;