修改

src/components/AllorderInfo.vue

@@ -192,7 +192,7 @@ export default {
         //     });
         // },
         sales() {
-            console.log(this.all.storeUserId);
+            // console.log(this.all.storeUserId);
             let userId = this.$store.state.userInfo.id;
             if (userId == this.all.storeUserId) {
                 this.toast('此商品是你店铺所有');
@@ -403,7 +403,7 @@ export default {
         }
     },
     created() {
-        console.log(this.all);
+        // console.log(this.all);
         this.rufundApply();
         // this.userIds();
     }

src/components/AllselloutInfo.vue

@@ -31,7 +31,7 @@
                 <p>退款原因：</p>
                 <span>多拍/错拍/不想要</span>
             </div>
-            <!-- <div class="message" v-if="status == 'bbb'">
+            <!-- <div class="message" v-if="status == 'group'">
                 <p>退款原因：</p>
                 <span>拼箱失败未成团</span>
             </div> -->
@@ -41,7 +41,7 @@
                     <span>实付款</span>
                     <span class="num">¥{{ all.total }}</span>
                 </div>
-                <!-- <div class="box-num" v-if="status == 'bbb'">
+                <!-- <div class="box-num" v-if="status == 'group'">
                     <span>退款成功</span>
                     <span class="num">¥{{ all.total }}</span>
                 </div> -->
@@ -61,7 +61,7 @@
                 <div v-if="status == 'REFUND'" @click="Buyers" class="box-but">联系买家</div>
                 <div v-if="status == 'REFUND'" @click="refund" class="box-but2">同意退款</div>
                 <div v-if="status == 'REFUNDED'" @click="deletes" class="box-but">删除订单</div>
-                <!-- <div v-if="status == 'bbb'" @click="deletes" class="box-but">删除订单</div> -->
+                <!-- <div v-if="status == 'group'" @click="deletes" class="box-but">删除订单</div> -->
             </div>
         </div>
         <van-popup :show="show" custom-style="background:transparent;border-radius: 12px 12px 0 0;" use-slot>
@@ -178,7 +178,7 @@ export default {
             if (this.status === 'REFUNDED') {
                 return '退款成功';
             }
-            // if (this.status === 'bbb') {
+            // if (this.status === 'group') {
             //     return '系统自动退款';
             // }
             return '';
@@ -239,7 +239,7 @@ export default {
             // console.log(this.all);
             let userId = this.$store.state.userInfo.id;
             if (userId == this.all.userId) {
-                console.log('===');
+                // console.log('===');
                 this.toast('此商品是你店铺所有');
             } else {
                 this.navigateTo('/pages/chat?toUserId=' + this.all.userId + '&toName=' + this.userNickName);

src/components/ProductInfo.vue

@@ -33,6 +33,10 @@
             <img src="/native/svgs/icon_kapai_zhibo.svg" alt="" />
             <span>直播</span>
         </div>
+        <!-- <div class="live" v-else>
+            <img src="/native/svgs/icon_kapai_zhibo.svg" alt="" />
+            <span>未直播</span>
+        </div> -->
     </div>
 </template>
 

src/pages/minePublish.vue

@@ -35,13 +35,20 @@
                             </div>
                         </div>
                     </div>
-                    <div class="live" v-if="!isMine && item.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>
+                    <!-- <div class="live" v-else>
+                        <img
+                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/icon_kapai_zhibo@3x.png"
+                            alt=""
+                        />
+                        <span>未直播</span>
+                    </div> -->
                 </div>
             </div>
         </div>

src/pages/store/apply.vue

@@ -61,6 +61,10 @@
                 <img-uploader ref="idNoImage" v-model="form.idNoImage"></img-uploader>
             </van-cell>
 
+            <van-cell title="身份证照片（反面照）">
+                <img-uploader ref="idNoBackImage" v-model="form.idNoBackImage"></img-uploader>
+            </van-cell>
+
             <van-cell title="营业执照" :border="false">
                 <img-uploader ref="licenseImage" v-model="form.licenseImage"></img-uploader>
             </van-cell>
@@ -85,6 +89,7 @@ export default {
                 email: '',
                 idNo: '',
                 idNoImage: '',
+                idNoBackImage: '',
                 licenseImage: '',
                 wxUsername: ''
             },
@@ -94,6 +99,7 @@ export default {
                 email: '',
                 idNo: '',
                 idNoImage: '',
+                idNoBackImage: '',
                 licenseImage: '',
                 wxUsername: ''
             }
@@ -107,6 +113,7 @@ export default {
                 !!this.form.email &&
                 !!this.form.idNo &&
                 !!this.form.idNoImage &&
+                !!this.form.idNoBackImage &&
                 !!this.form.licenseImage
             );
         }
@@ -138,6 +145,11 @@ export default {
                 return;
             }
 
+            if (!this.form.idNoBackImage) {
+                this.toast('请上传身份证照片（反面照）');
+                return;
+            }
+
             if (!this.form.licenseImage) {
                 this.toast('请上传营业执照');
                 return;
@@ -169,6 +181,7 @@ export default {
                         this.form2 = res.content[0];
                         this.form = res.content[0];
                         this.$refs.idNoImage.setFile(res.content[0].idNoImage);
+                        this.$refs.idNoBackImage.setFile(res.content[0].idNoBackImage);
                         this.$refs.licenseImage.setFile(res.content[0].licenseImage);
                     }
                 });

src/pages/store/productEdit.vue

@@ -93,17 +93,18 @@
             </div>
             <div class="box" v-if="showId">
                 <div class="top2">
-                    <span>选择卡包</span>
-                    <div class="right">
+                    <span>已售/总数</span>
+                    <!-- <div class="right">
                         <div class="tool-item">
                             出售中
                         </div>
                         <div class="tool-item used">
                             下架
                         </div>
-                    </div>
+                    </div> -->
                 </div>
-                <div class="content">
+                <div style="margin-top:10px">{{ soldStatus }}</div>
+                <!-- <div class="content">
                     <div class="card" v-for="(card, index) in form.groupDTOS" :key="index">
                         <div class="card-title">第{{ index + 1 }}组</div>
                         <div class="card-list">
@@ -120,7 +121,7 @@
                             </div>
                         </div>
                     </div>
-                </div>
+                </div> -->
             </div>
             <div class="label">卡牌详情描述</div>
             <van-field
@@ -180,6 +181,7 @@ export default {
                 groupDTOS: []
             },
             name: '',
+            soldStatus: '',
             show: false,
             switchs: false,
             closeFlag: false,
@@ -304,13 +306,14 @@ export default {
         cancel() {
             this.show = false;
         },
-        canChoose(info) {
-            return info.sold;
-        },
+        // canChoose(info) {
+        //     return info.sold;
+        // },
         cartBox() {
             console.log(this.form.caseStatus);
             this.$http.get('/cardCase/getCardCase', { id: this.$mp.query.id }).then(res => {
                 console.log(res);
+                this.soldStatus = res.soldStatus;
                 this.showId = res.id;
                 this.form = {
                     boxPrice: res.boxPrice,
@@ -387,8 +390,8 @@ export default {
                     console.log(res);
                     this.hideLoading();
                     this.form.special = params.special;
-                    this.form.groupDTOS = res;
-                    console.log(this.form.groupDTOS);
+                    // this.form.groupDTOS = res;
+                    // console.log(this.form.groupDTOS);
                 })
                 .catch(e => {
                     this.hideLoading();
@@ -566,8 +569,8 @@ export default {
             margin-bottom: 10px;
         }
         .box {
-            max-height: 70vh;
-            min-height: 50vh;
+            // max-height: 70vh;
+            // min-height: 50vh;
             padding-right: 20px;
             .flex-col();
             padding-bottom: 6px;

src/pages/wallet.vue

@@ -29,6 +29,9 @@
                 <van-dropdown-menu>
                     <van-dropdown-item @change="record" :value="time" :options="option1" />
                 </van-dropdown-menu>
+                <van-dropdown-menu>
+                    <van-dropdown-item @change="names" :value="times" :options="option2" />
+                </van-dropdown-menu>
                 <div class="flex1"></div>
                 <span class="text"> 收入 ¥{{ count }} </span>
                 <span class="text"> 提现 ¥{{ TXCount }} </span>
@@ -62,6 +65,10 @@ export default {
         return {
             moneyInfo: {},
             time: 0,
+            times: 'user',
+            dateList: [],
+            list: [],
+            nameList: '',
             option1: [
                 { text: '2021-05', value: 0 },
                 { text: '2021-06', value: 1 },
@@ -72,13 +79,28 @@ export default {
                 { text: '2021-11', value: 6 },
                 { text: '2021-12', value: 7 }
             ],
+            nameOptions: [
+                { label: '用户', value: 'user' },
+                { label: '商家', value: 'store' },
+                { label: '用户商家', value: 'all' }
+            ],
             empty: false,
             recordList: {},
             count: 0,
             TXCount: 0
         };
     },
-    computed: {},
+    computed: {
+        option2() {
+            let list = [...this.nameOptions];
+            return list.map(item => {
+                return {
+                    text: item.label,
+                    value: item.value
+                };
+            });
+        }
+    },
     methods: {
         loginMethods() {
             this.$http.get('/memberInfo/findByUser').then(res => {
@@ -91,20 +113,26 @@ export default {
                 query: {}
             });
         },
-        // Withdrawal() {
-        //     this.navigateTo('/pages/walletdetails');
-        // },
         record(e) {
             this.time = e.detail;
-            let targetData = this.option1.find(item => {
+            let timeList = this.option1.find(item => {
                 return item.value == this.time;
             });
-            this.initApi(targetData.text);
+            this.dateList = timeList.text;
+            this.initApi(this.dateList, this.nameList);
+        },
+        names(e) {
+            this.times = e.detail;
+            this.nameList = this.times;
+            this.initApi(this.dateList, this.nameList);
         },
-        initApi(params) {
+        // Withdrawal() {
+        //     this.navigateTo('/pages/walletdetails');
+        // },
+        initApi(params, name) {
             this.showLoading();
             this.$http
-                .get('/transactionRecord/showMyTransactionRecords', { yearMonth: params })
+                .get('/transactionRecord/showMyTransactionRecords', { yearMonth: params, type: name })
                 .then(res => {
                     this.hideLoading();
                     this.recordList = res;
@@ -142,7 +170,10 @@ export default {
         }
     },
     onShow() {
-        this.initApi(this.option1[0].text);
+        this.record({
+            detail: 0
+        });
+        this.initApi(this.option1[0].text, this.option2[0].value);
     }
 };
 </script>
@@ -187,7 +218,7 @@ export default {
     }
 }
 /deep/ .van-dropdown-menu {
-    width: 110px;
+    width: 90px;
     border-radius: 4px;
     overflow: hidden;
 

src/store/index.js

@@ -30,6 +30,7 @@ export default new Vuex.Store({
     actions: {
         getUserInfo(context) {
             return http.http.get('/user/my').then(res => {
+                // console.log(res);
                 if (res.sex || res.nickname.indexOf('用户') === -1) {
                     context.commit('setUserInfo', res);
                 } else {