xuqiang 4 лет назад
Родитель
Сommit
97bda32470

BIN
src/main/pc-space/src/assets/user/icon-shibai@3x.png


+ 8 - 5
src/main/pc-space/src/components/ConsignmentInfo.vue

@@ -8,11 +8,12 @@
         @close="closeDialog"
     >
         <div class="content">
+            <div class="border1 border2"></div>
             <div class="title">寄售说明</div>
             <div class="name" v-for="(item, index) in list" :key="index">
                 <span>{{ item.title }}</span>
             </div>
-            <div class="border"></div>
+            <div class="border1"></div>
             <div class="title">寄售价格</div>
             <div class="price">
                 <el-form :model="form" :rules="rules" ref="numberValidateForm" label-width="85px" class="demo-ruleForm">
@@ -182,17 +183,17 @@ input::-webkit-inner-spin-button {
     border-radius: 4px;
     font-size: 13px;
     margin-right: 20px;
+    border: 0;
 }
 .content {
+    margin-top: 0;
     .title {
         font-size: 16px;
         font-weight: 400;
         color: #000000;
         line-height: 24px;
-        padding-left: 20px;
     }
     .name {
-        padding-left: 20px;
         span {
             font-size: 14px;
             font-weight: 400;
@@ -206,14 +207,16 @@ input::-webkit-inner-spin-button {
         font-weight: 400;
         color: #939599;
         line-height: 24px;
-        margin-right: 20px;
         cursor: pointer;
     }
     .border1 {
         height: 1px;
         background: #f5f7fa;
         border-radius: 1px;
-        margin: 30px 20px;
+        margin: 30px 0px;
+        &.border2 {
+            margin-top: 0;
+        }
     }
     .sub-btn {
         padding-top: 62px;

+ 48 - 16
src/main/pc-space/src/views/Send.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog center title="赠送" :visible.sync="show" width="680px">
+    <el-dialog center title="赠送" :visible.sync="show" width="680px" :before-close="handleClose">
         <div class="page" v-loading="loading">
             <div class="top-tips">通过手机号码检索用户信息,<span>赠送后该加密作品将会被转移</span></div>
             <div class="user">
@@ -115,6 +115,7 @@ export default {
             payMethods: 'WEIXIN',
             show: false,
             info: [],
+            payTimeout: undefined,
             checked: true,
             id: 103,
             idOrder: 0,
@@ -172,6 +173,12 @@ export default {
         }
     },
     methods: {
+        handleClose() {
+            this.show = false;
+            if (this.payTimeout) {
+                clearInterval(this.payTimeout);
+            }
+        },
         init() {
             this.status = 'Unpaid';
         },
@@ -223,19 +230,30 @@ export default {
                 }, 1000);
             }
         },
-        // payWatch() {
-        //     //监控支付状态
-        //     this.payTimeout = setInterval(() => {
-        //         this.$http.get('/order/gift/get/' + this.idOrder).then(res => {
-        //             console.log(res);
-        //             if (res.status === 'FINISH') {
-        //                 clearInterval(this.payTimeout);
-        //                 // this.status = res.status;
-        //                 this.show = false;
-        //             }
-        //         });
-        //     }, 1000);
-        // },
+        init2() {
+            this.$confirm('赠送成功,加密作品将会被转移', '赠送成功', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                customClass: 'myClass',
+                center: true
+            }).then(() => {});
+        },
+        payWatch() {
+            //监控支付状态
+            this.payTimeout = setInterval(() => {
+                this.$http.get('/asset/get/' + this.$route.query.id).then(res => {
+                    console.log(res);
+                    if (res.status === 'GIFTED') {
+                        clearInterval(this.payTimeout);
+                        // this.status = res.status;
+                        this.show = false;
+                        setTimeout(() => {
+                            this.init2();
+                        }, 1000);
+                    }
+                });
+            }, 1000);
+        },
         submit() {
             // if (this.payMethods === 'DCEP') {
             //     this.wait();
@@ -254,7 +272,7 @@ export default {
                             this.initTime(res.id, res.createdAt);
                             this.status = res.status;
                             this.idOrder = res.id;
-                            // this.payWatch();
+                            this.payWatch();
                             // console.log(res);
                         })
                         .catch(e => {
@@ -300,7 +318,21 @@ export default {
     }
 };
 </script>
-
+<style lang="less">
+.myClass {
+    width: 340px;
+    .el-button {
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        border-radius: 4px;
+        border: 0;
+    }
+    .el-button:nth-last-child(2) {
+        background: #c4c7cc;
+        color: #ffffff;
+        font-size: 13px;
+    }
+}
+</style>
 <style lang="less" scoped>
 /deep/ .el-checkbox__inner {
     // width: 24px;

+ 17 - 4
src/main/pc-space/src/views/user/EnterpriseAuthentication.vue

@@ -12,15 +12,28 @@
                     userInfo.authStatus === 'SUCCESS'
                 "
             >
-                <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
+                <img
+                    class="text1"
+                    v-if="userInfo.authStatus !== 'FAIL'"
+                    src="../../assets/user/icon-xiugaichengg@3x (1).png"
+                    alt=""
+                />
+                <img
+                    class="text1"
+                    v-if="userInfo.authStatus === 'FAIL'"
+                    src="../../assets/user/icon-shibai@3x.png"
+                    alt=""
+                />
                 <div class="text2" v-if="userInfo.authStatus === 'PENDING'">已提交企业认证</div>
-                <div class="text2" v-if="userInfo.authStatus === 'FAIL'">认证失败</div>
-                <div class="text2" v-if="userInfo.authStatus === 'SUCCESS'">认证成功</div>
+                <div class="text2" v-if="userInfo.authStatus === 'FAIL'">企业认证失败</div>
+                <div class="text2" v-if="userInfo.authStatus === 'SUCCESS'">企业认证成功</div>
                 <div class="text3" v-if="userInfo.authStatus === 'PENDING'">
                     等待后台审核信息,预计1-3个工作日内完成
                 </div>
                 <div class="text3" v-if="userInfo.authStatus === 'SUCCESS'">账户实名认证后不能修改</div>
-                <div class="text3" v-if="userInfo.authStatus === 'FAIL'">信息填写有误</div>
+                <div class="text3" v-if="userInfo.authStatus === 'FAIL'">
+                    很遗憾,您的资料审核失败,请检查您填写的资料是否正确以及上传照片是否清晰
+                </div>
                 <div class="botn" v-if="userInfo.authStatus !== 'FAIL'" @click="all('accountdata')">返回</div>
                 <div class="botn" v-if="userInfo.authStatus === 'FAIL'" @click="Jump2">重新认证</div>
             </div>

+ 17 - 4
src/main/pc-space/src/views/user/UserAuthentication.vue

@@ -12,15 +12,28 @@
                     userInfo.authStatus === 'SUCCESS'
                 "
             >
-                <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
+                <img
+                    class="text1"
+                    v-if="userInfo.authStatus !== 'FAIL'"
+                    src="../../assets/user/icon-xiugaichengg@3x (1).png"
+                    alt=""
+                />
+                <img
+                    class="text1"
+                    v-if="userInfo.authStatus === 'FAIL'"
+                    src="../../assets/user/icon-shibai@3x.png"
+                    alt=""
+                />
                 <div class="text2" v-if="userInfo.authStatus === 'PENDING'">已提交个人认证</div>
-                <div class="text2" v-if="userInfo.authStatus === 'FAIL'">认证失败</div>
-                <div class="text2" v-if="userInfo.authStatus === 'SUCCESS'">认证成功</div>
+                <div class="text2" v-if="userInfo.authStatus === 'FAIL'">个人认证失败</div>
+                <div class="text2" v-if="userInfo.authStatus === 'SUCCESS'">个人认证成功</div>
                 <div class="text3" v-if="userInfo.authStatus === 'PENDING'">
                     等待后台审核信息,预计1-3个工作日内完成
                 </div>
                 <div class="text3" v-if="userInfo.authStatus === 'SUCCESS'">账户实名认证后不能修改</div>
-                <div class="text3" v-if="userInfo.authStatus === 'FAIL'">信息填写有误</div>
+                <div class="text3" v-if="userInfo.authStatus === 'FAIL'">
+                    很遗憾,您的资料审核失败,请检查您填写的资料是否正确以及上传照片是否清晰
+                </div>
                 <div class="botn" v-if="userInfo.authStatus !== 'FAIL'" @click="all('accountdata')">返回</div>
                 <div class="botn" v-if="userInfo.authStatus === 'FAIL'" @click="Jump2">重新认证</div>
             </div>