Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/pc-space/src/components/ConsignmentInfo.vue

@@ -106,7 +106,7 @@ export default {
                     userId: this.userInfo.id
                 })
                 .then(res => {
-                    console.log(res);
+                    // console.log(res);
                     this.sets = res.set;
                 });
         },

src/main/pc-space/src/components/PageHeader.vue

@@ -23,11 +23,8 @@
                                 >{{ userInfo.nickname }}
                             </el-dropdown-item>
                             <div class="border"></div>
-                            <el-dropdown-item
-                                v-if="userInfo.authStatus != 'SUCCESS'"
-                                command="supply"
-                                style="word-break: keep-all"
-                                >去认证
+                            <el-dropdown-item command="supply" style="word-break: keep-all"
+                                >{{ Status }}
                             </el-dropdown-item>
                             <el-dropdown-item command="edit" style="word-break: keep-all">编辑资料 </el-dropdown-item>
                             <div class="border"></div>
@@ -99,6 +96,15 @@ export default {
         ...mapState(['userInfo']),
         avatarBox() {
             return this.userInfo.avatar;
+        },
+        Status() {
+            if (this.userInfo.authStatus === 'NOT_AUTH') {
+                return '去认证';
+            } else if (this.userInfo.authStatus === 'PENDING' || this.userInfo.authStatus === 'FAIL') {
+                return '认证中';
+            } else {
+                return '个人已认证';
+            }
         }
     },
     mounted() {
@@ -133,7 +139,7 @@ export default {
                 )
                 .then(res => {
                     this.lists = res.content[0].org;
-                    console.log(this.lists);
+                    // console.log(this.lists);
                 });
         },
         Login() {
@@ -224,7 +230,6 @@ export default {
         },
         parseQuery(query) {
             const res = {};
-            console.log(query);
             query = query.trim().replace(/^(\?|#|&)/, '');
 
             if (!query) {

src/main/pc-space/src/mixins/common.js

@@ -74,7 +74,7 @@ export default {
             return (arg1 * m + arg2 * m) / m;
         },
         updateFile(e, size = 2000) {
-            console.log(e);
+            // console.log(e);
             const formData = new FormData();
             formData.append('file', e, e.name);
             formData.append('compress', true);

src/main/pc-space/src/mixins/pageableTable.js

@@ -67,7 +67,7 @@ export default {
                     body: 'json'
                 })
                 .then(res => {
-                    console.log(res);
+                    // console.log(res);
                     this.fetchingData = false;
                     if (this.setList) {
                         this.setList(res.content);

src/main/pc-space/src/mixins/product.js

@@ -53,7 +53,7 @@ export default {
     },
     methods: {
         changeImgs(list = []) {
-            console.log(list);
+            // console.log(list);
             return list.map(item => {
                 if (item.type === 'video/mp4') {
                     return item.thumb;
@@ -72,7 +72,6 @@ export default {
             if (!this.isAppointment) {
                 return;
             }
-            console.log(222);
             var x = dayjs(startTime);
             var y = dayjs();
             let d = dayjs.duration(x.diff(y));
@@ -82,7 +81,7 @@ export default {
                 str += day + '天 ';
             }
             this.startTime = str + dayjs.duration(x.diff(y)).format('HH:mm:ss');
-            console.log(this.startTime);
+            // console.log(this.startTime);
             setTimeout(() => {
                 this.getTime(startTime);
             }, 1000);

src/main/pc-space/src/store/index.js

@@ -35,7 +35,7 @@ export default new Vuex.Store({
         getUserInfo(context) {
             return http.http.get('/user/my').then(res => {
                 context.commit('updateUserInfo', res);
-                console.log(res);
+                // console.log(res);
             });
         }
     }

src/main/pc-space/src/views/AssetDetail.vue

@@ -467,7 +467,8 @@ export default {
             init2: [],
             list2: [],
             opened: '',
-            lists: ''
+            lists: '',
+            ipcList: []
         };
     },
     computed: {
@@ -489,6 +490,13 @@ export default {
             return list.map(item => {
                 return this.getImg(this.changeImgs(item.pic));
             });
+        },
+        ipcFlag() {
+            if (this.ipcList.length > 0) {
+                return true;
+            } else {
+                return false;
+            }
         }
     },
     mounted() {
@@ -499,6 +507,9 @@ export default {
         if (this.userInfo.authStatus !== 'NOT_AUTH') {
             this.add();
         }
+        if (this.isLogin) {
+            this.BackCard();
+        }
     },
     watch: {
         $route() {
@@ -687,8 +698,14 @@ export default {
                     }
                 });
         },
+        BackCard() {
+            this.$http.get('user/myBankCard').then(res => {
+                this.ipcList = res;
+                // console.log(res);
+            });
+        },
         Consignment() {
-            if (this.userInfo.authStatus === 'SUCCESS') {
+            if (this.userInfo.authStatus === 'SUCCESS' && this.ipcFlag) {
                 if (!this.info.consignment) {
                     this.$refs.refFn.isShow = true;
                 } else {
@@ -741,11 +758,19 @@ export default {
                 }).then(() => {
                     this.$router.push('/authentication');
                 });
+            } else if (!this.ipcFlag) {
+                this.$confirm('未绑定银行卡不可寄售，是否认证', '认证', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    customClass: 'myClass',
+                    center: true
+                }).then(() => {
+                    this.$router.push('/addipc');
+                });
             }
         },
         changeShow() {
             if (!this.info.publicShow) {
-                // console.log(this.info);
                 this.$confirm('藏品将公开展示，无报价', '公开展示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
@@ -797,7 +822,6 @@ export default {
                 .then(res => {
                     // console.log(res);
                     this.lists = res.content[0].org;
-                    // console.log(this.lists);
                 });
         },
         send() {
@@ -813,7 +837,6 @@ export default {
                 }).then(() => {
                     this.add();
                     this.$nextTick(() => {
-                        // console.log(this.lists);
                         setTimeout(() => {
                             if (this.userInfo.authStatus !== 'NOT_AUTH' && this.lists == false) {
                                 this.add();

src/main/pc-space/src/views/Casting.vue

@@ -130,7 +130,7 @@ export default {
         },
         setList(list) {
             this.list = list;
-            console.log(this.list);
+            // console.log(this.list);
         }
     }
 };

src/main/pc-space/src/views/My.vue

@@ -134,7 +134,6 @@ export default {
                 });
         },
         beforeGetData() {
-            console.log(222);
             if (this.select === '1') {
                 return {
                     search: this.search,

src/main/pc-space/src/views/Send.vue

@@ -194,7 +194,7 @@ export default {
                     userId: this.userInfo.id
                 })
                 .then(res => {
-                    console.log(res);
+                    // console.log(res);
                     this.sets = res.set;
                 });
         },

src/main/pc-space/src/views/user/AccountData.vue

@@ -579,21 +579,53 @@ export default {
     }
     .userContent {
         padding: 0 16px;
+        // position: relative;
         .borderUser {
             height: 1px;
             background: #494a4d;
             border-radius: 1px;
             margin: 17px 0 26px 0;
         }
-        .borderUser:after {
-            // content: '';
-            // display: block;
-            // width: 100px;
-            // border-left: 4px solid transparent;
-            // border-right: 4px solid transparent;
-            // border-top: 1px solid #343c99;
-            // position: absolute;
-        }
+        // &::after {
+        //     content: '';
+        //     position: absolute;
+        //     left: 0;
+        //     right: 0;
+        //     bottom: 0;
+        //     background-color: #494a4d;
+        //     height: 1px;
+        //     z-index: 1;
+        // }
+        // .borderUser {
+        //     position: absolute;
+        //     bottom: 0px;
+        //     width: 10px;
+        //     height: 6px;
+        //     z-index: 2;
+        //     transition: left ease-in-out 0.3s;
+        //     &::before {
+        //         content: '';
+        //         background-color: #494a4d;
+        //         width: 8px;
+        //         left: -2px;
+        //         height: 1px;
+        //         position: absolute;
+        //         bottom: 0;
+        //         transform-origin: 0px 0px;
+        //         transform: rotate(-30deg);
+        //     }
+        //     &::after {
+        //         content: '';
+        //         background-color: #494a4d;
+        //         width: 8px;
+        //         right: -2px;
+        //         height: 1px;
+        //         position: absolute;
+        //         bottom: 0;
+        //         transform-origin: 8px 0px;
+        //         transform: rotate(30deg);
+        //     }
+        // }
         .boxFollow {
             .flex();
             justify-content: space-between;
@@ -656,12 +688,10 @@ export default {
                                 background-color: transparent;
                                 min-width: 76px;
                                 height: 28px;
-
                                 &.prim {
                                     .line(@radius: 28px);
                                     border: 0;
                                     text-align: center;
-
                                     /deep/span {
                                         color: @prim;
                                         position: relative;
@@ -747,7 +777,6 @@ export default {
             background: linear-gradient(90deg, #37b074 0%, #52c174 100%);
             border-radius: 8px;
             margin-left: 33px;
-
             .ipc-top {
                 padding: 16px 16px 2px 16px;
                 display: flex;
@@ -755,23 +784,20 @@ export default {
                 justify-content: space-between;
                 .ipc-text {
                     font-size: @menuFont2;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
+                    font-weight: normal;
                     color: #ffffff;
                     line-height: 24px;
                 }
                 .ipc-text2 {
                     font-size: @menuFont2;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
+                    font-weight: normal;
                     color: #ffffff;
                     line-height: 24px;
                 }
             }
             .ipc-text1 {
                 font-size: 10px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
+                font-weight: normal;
                 color: #ffffff;
                 line-height: 10px;
                 padding-left: 16px;

src/main/pc-space/src/views/user/Addipc.vue

@@ -72,7 +72,7 @@
                 </el-form>
                 <div class="btn">
                     <el-button type="primary" @click="ipcSend">确认</el-button>
-                    <div class="btn2" @click="all('/accountdata')">返回</div>
+                    <div class="btn2" @click="jump">返回</div>
                 </div>
             </div>
         </div>
@@ -107,6 +107,9 @@ export default {
                 this.sendMsg(this.userInfo.phone);
             }
         },
+        jump() {
+            this.$router.go(-1);
+        },
         ipcSend() {
             this.$refs.form.validate(valid => {
                 if (valid) {