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

.env.production

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

src/components/AllselloutInfo.vue

@@ -205,14 +205,8 @@ export default {
                 }
             });
         },
-        userIds() {
-            this.$http.get('/store/get/' + this.storeId).then(res => {
-                this.userId = res.userId;
-                console.log(this.userId);
-            });
-        },
         Buyers() {
-            this.navigateTo('/pages/chat?toUserId=' + this.userId + '&toName=' + this.userNickName);
+            this.navigateTo('/pages/chat?toUserId=' + this.all.userId + '&toName=' + this.userNickName);
         },
         cancel() {
             wx.showModal({
@@ -255,20 +249,13 @@ export default {
         applydetails() {
             this.navigateTo('/pages/Applydetails?id=' + this.id);
         },
-        orderRefund() {
-            this.$http.post('orderRefundApply/applySuccess', { orderId: this.id }).then(res => {
-                console.log(res);
-                // this.tradeId = res.store.id;
-                this.tradeId = res.tradeId;
-            });
-        },
         refund() {
             wx.showModal({
                 title: '提示',
                 content: '确定同意退款？',
                 success: res => {
                     if (res.confirm) {
-                        this.$http.post('orderRefundApply/audit', { id: this.tradeId }).then(res => {
+                        this.$http.post('orderRefundApply/audit', { orderId: this.id }).then(res => {
                             console.log(res);
                             wx.showToast({
                                 icon: 'none',
@@ -292,12 +279,6 @@ export default {
             //     console.log(res);
             // });
         }
-    },
-    created() {
-        this.userIds();
-        if (this.status == 'REFUND' || this.status == 'REFUNDED') {
-            this.orderRefund();
-        }
     }
 };
 </script>

src/components/ProductInfo.vue

@@ -93,6 +93,7 @@ export default {
     },
     methods: {
         manage() {
+            console.log(this.info.liveNow);
             this.navigateTo('/pages/store/productEdit?id=' + this.info.cardCaseId + '&name=' + this.info.caseName);
         },
         detail() {

src/pages/allselldetails.vue

@@ -327,7 +327,6 @@ export default {
                 .then(res => {
                     this.hideLoading();
                     this.status = res;
-                    console.log(this.status);
                     this.cardBoxListLength = this.status.cardBoxList.length;
                     this.user = res.user;
                     this.addressList = res.address;
@@ -335,7 +334,6 @@ export default {
                     this.store = res.store;
                     this.Boxes = res.cardBoxList;
                     this.orderInfoId = res.id;
-                    console.log(this.orderInfoId);
                     this.postage = res.cardCase.postage;
                     this.cardCaseInfo = res.cardCase.collection;
                     if (this.status.orderStatus === 'CREATED') {
@@ -446,19 +444,13 @@ export default {
                 }
             });
         },
-        orderRefund() {
-            this.$http.post('orderRefundApply/applySuccess', { orderId: this.orderInfoId }).then(res => {
-                console.log(res);
-                this.tradeId = res.tradeId;
-            });
-        },
         refund() {
             wx.showModal({
                 title: '提示',
                 content: '确定同意退款？',
                 success: res => {
                     if (res.confirm) {
-                        this.$http.post('orderRefundApply/audit', { id: this.tradeId }).then(res => {
+                        this.$http.post('orderRefundApply/audit', { orderId: this.orderInfoId }).then(res => {
                             console.log(res);
                             wx.showToast({
                                 icon: 'none',
@@ -525,11 +517,6 @@ export default {
     },
     created() {
         this.getFn();
-        setTimeout(() => {
-            if (this.status.orderStatus == 'REFUND' || this.status.orderStatus === 'REFUNDED') {
-                this.orderRefund();
-            }
-        }, 1000);
     }
 };
 </script>

src/pages/details.vue

@@ -144,7 +144,7 @@ export default {
                     console.log(res);
                     this.detailsList = res.groupBoxMap;
                     this.cardCaseInfo = res.cardCaseInfo || {};
-                    this.banners = res.cardCaseInfo.image.split(',');
+                    this.banners = res.cardCaseInfo.images;
                     return this.$http.get('/store/get/' + res.cardCaseInfo.storeId);
                 })
                 .then(res => {

src/pages/minePublish.vue

@@ -29,40 +29,19 @@
                                 <van-button
                                     type="primary"
                                     size="small"
-                                    v-if="isMine"
                                     @click.stop="live(item.cardCaseId, item.caseName)"
                                     >管理拼箱</van-button
                                 >
                             </div>
                         </div>
                     </div>
-                    <div class="live" v-if="!isMine && info.liveNow">
+                    <div class="live" v-if="!isMine && item.liveNow">
                         <img
                             src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/icon_kapai_zhibo@3x.png"
                             alt=""
                         />
                         <span>直播</span>
                     </div>
-                    <!-- <van-button
-                        type="primary"
-                        v-if="isMineShop"
-                        :style="{ top: isFixed ? '20%' : '50%' }"
-                        @click="startLive"
-                        class="live-btn"
-                    >
-                        <img src="/native/svgs/icon_kapai_zhibo.svg" alt="" />
-                        <span v-if="!isFixed">{{ storeInfo.liveNow ? '正在直播中' : '开启直播' }}</span>
-                    </van-button>
-                    <van-button
-                        type="primary"
-                        v-else-if="storeInfo.liveNow"
-                        :style="{ top: isFixed ? '20%' : '50%' }"
-                        @click="goInLive(storeInfo.roomId)"
-                        class="live-btn"
-                    >
-                        <img src="/native/svgs/icon_kapai_zhibo.svg" alt="" />
-                        <span v-if="!isFixed">{{ storeInfo.liveNow ? '看直播' : '' }}</span>
-                    </van-button> -->
                 </div>
             </div>
         </div>
@@ -91,7 +70,7 @@ export default {
             list: [],
             sotrId: [],
             empty: false,
-            isMineShop: false,
+            isMine: false,
             offsetTop: 0,
             endTimeLists: []
         };
@@ -173,7 +152,6 @@ export default {
             this.showLoading();
             return this.$http.post('/store/findStoreCases', data).then(res => {
                 this.list = res.caseInfo;
-                console.log(this.list);
                 this.list.forEach(item => {
                     item.endTime = dayjs(item.endTime, 'YYYY-MM-DD HH:mm:ss').diff(dayjs());
                 });

src/pages/orderdetails.vue

@@ -432,6 +432,13 @@ export default {
             // }
         },
         pay() {
+            if (this.allTime == 0) {
+                wx.showToast({
+                    icon: 'none',
+                    title: '订单已取消，请重新购买'
+                });
+                return;
+            }
             wx.showLoading({
                 title: '加载中'
             });

src/pages/walletdetails.vue

@@ -38,7 +38,7 @@
                 </div>
             </div>
             <van-button type="primary" size="small" :disabled="notWithdrawal" @click="Withdrawal(notWithdrawal)"
-                >申请退款</van-button
+                >申请提现</van-button
             >
         </div>
     </div>