个人认证

src/main/nine-space/src/views/account/Verified.vue

@@ -168,9 +168,19 @@ export default {
                     let form = { ...this.form };
                     form.userId = this.userInfo.id;
                     form.status = 'PENDING';
+                    let userInfo = {
+                        ...this.userInfo
+                    };
+                    userInfo.authorities = [
+                        ...userInfo.authorities,
+                        {
+                            name: 'ROLE_PERSONAL',
+                            description: '个人机构'
+                        }
+                    ];
                     this.$http
                         .post('/identityAuth/apply', {
-                            ...form
+                            userInfo
                         })
                         .then(() => {
                             this.$router.replace('/Waiting');

src/main/nine-space/src/views/asset/GiveSearch.vue

@@ -6,7 +6,7 @@
             <van-search
                 ref="top"
                 shape="round"
-                v-model="search"
+                v-model="phone"
                 placeholder="请输入"
                 show-action
                 autofocus
@@ -55,11 +55,11 @@ export default {
         return {
             list: [],
             empty: false,
-            search: '',
+            phone: '',
             stiky: null,
             type: '',
             minterId: '',
-            url: '/asset/all'
+            url: '/user/all'
         };
     },
     computed: {
@@ -68,26 +68,27 @@ export default {
         }
     },
     mounted() {
-        if (this.$route.query.type) {
-            this.type = this.$route.query.type;
-        }
-        if (this.$route.query.minterId) {
-            this.minterId = this.$route.query.minterId;
-        }
+        // if (this.$route.query.type) {
+        //     this.type = this.$route.query.type;
+        // }
+        // if (this.$route.query.minterId) {
+        //     this.minterId = this.$route.query.minterId;
+        // }
     },
     methods: {
         beforeData() {
             return {
-                query: {
-                    onShelf: true,
-                    type: this.type,
-                    minterId: this.minterId,
-                    del: false
-                },
-                search: this.search
+                // query: {
+                //     onShelf: true,
+                //     type: this.type,
+                //     minterId: this.minterId,
+                //     del: false
+                // },
+                search: this.phone
             };
         },
         getSearch(search) {
+            console.log(search);
             this.search = search;
             this.getData(true);
         }

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

@@ -88,7 +88,7 @@
                                 <i class="font_family icon-icon-gongkaizhanshi"></i>
                                 <span>{{ info.publicShow ? '取消展示' : '公开展示' }}</span>
                             </div>
-                            <div class="btn-item">
+                            <div class="btn-item" @click="show = true">
                                 <i class="font_family icon-icon-zengsong"></i>
                                 <span>赠送好友</span>
                             </div>
@@ -169,7 +169,7 @@
             </collection-info>
         </div>
 
-        <send></send>
+        <send :show="show"></send>
     </div>
 </template>
 <script>
@@ -185,7 +185,7 @@ export default {
     mixins: [asset, product],
     data() {
         return {
-            showMore: false,
+            show: false,
             showMore1: false,
             showMore2: false,
             tableData: [],

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

@@ -63,10 +63,16 @@
 </template>
 
 <script>
+import { boolean } from 'mathjs';
 export default {
+    props: {
+        show: {
+            type: boolean,
+            default: false
+        }
+    },
     data() {
         return {
-            show: false,
             payMethods: 'ALIPAY',
             payList: [
                 {
@@ -78,18 +84,21 @@ export default {
                     icon: require('../assets/weixin.png'),
                     name: '微信',
                     type: 'WEIXIN'
-                },
-                {
-                    icon: require('../assets/dcep.png'),
-                    name: 'DCEP支付',
-                    type: 'DCEP'
                 }
+                // {
+                //     icon: require('../assets/dcep.png'),
+                //     name: 'DCEP支付',
+                //     type: 'DCEP'
+                // }
             ],
             loading: false,
             orderInfo: {},
             phone: ''
         };
     },
+    // mounted() {
+    //     this.init();
+    // },
     methods: {
         submit() {
             if (this.payMethods === 'DCEP') {

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

@@ -240,21 +240,26 @@ export default {
             }
         },
         Auths() {
-            if (this.type) {
-                if (this.type.name == 'ROLE_INSTITUTION') {
-                    this.$nextTick(() => {
-                        // if (this.institutionInfo.status == 'PASS') {
-                        this.$router.push('/enterpriseauthentication');
-                        // }
-                    });
-                } else if (this.type.name == 'ROLE_PERSONAL') {
-                    this.$nextTick(() => {
-                        // if (this.institutionInfo.status == 'PASS') {
-                        this.$router.push('/userauthentication');
-                        // }
-                    });
-                }
-            } else {
+            // if (this.type) {
+            //     if (this.type.name == 'ROLE_INSTITUTION') {
+            //         this.$nextTick(() => {
+            //             // if (this.institutionInfo.status == 'PASS') {
+            //             this.$router.push('/enterpriseauthentication');
+            //             // }
+            //         });
+            //     } else if (this.type.name == 'ROLE_PERSONAL') {
+            //         this.$nextTick(() => {
+            //             if (this.userInfo.authStatus == 'PENDING') {
+            //                 this.$router.push('/userauthentication');
+            //             }
+            //         });
+            //     }
+            // } else {
+            //     this.$router.push('/authentication');
+            // }
+            if (this.userInfo.authStatus === 'PENDING') {
+                this.$router.push('/userauthentication');
+            } else if (this.userInfo.authStatus === 'NOT_AUTH') {
                 this.$router.push('/authentication');
             }
             // ROLE_INSTITUTION 企业

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

@@ -9,12 +9,12 @@
                 <div class="text2">个人通过实名认证后，绑定相对应银 行卡即可进行交易售卖</div>
                 <el-button @click="all('/userauthentication')">个人认证</el-button>
             </div>
-            <div class="box1">
+            <!-- <div class="box1">
                 <img class="img" src="../../assets/user/renzheng-icon-qiye@3x.png" alt="" />
                 <div class="text1">企业认证</div>
                 <div class="text2">企业通过营业执照认证后，并签署 相应合同即可进行售卖，冰箱周部 分定制化服务</div>
                 <el-button @click="all('/enterpriseauthentication')">企业认证</el-button>
-            </div>
+            </div> -->
         </div>
     </div>
 </template>

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

@@ -16,7 +16,7 @@
                         <el-input
                             style="width: 300px"
                             placeholder="请输入您的真实姓名"
-                            v-model="sizeForm.nickname"
+                            v-model="sizeForm.realName"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="手机号码" prop="phone">
@@ -30,19 +30,19 @@
                     <el-form-item label="电子邮箱" prop="email">
                         <el-input style="width: 300px" placeholder="请输入邮箱" v-model="sizeForm.email"></el-input>
                     </el-form-item>
-                    <el-form-item label="身份证号" prop="documentNumber">
+                    <el-form-item label="身份证号" prop="idNo">
                         <el-input
                             style="width: 300px"
                             placeholder="请输入18位身份证号"
-                            v-model="sizeForm.documentNumber"
+                            v-model="sizeForm.idNo"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="本人身份证 (正面图)" prop="photoFront">
-                        <single-upload class="upload" v-model="sizeForm.photoFront"></single-upload>
+                    <el-form-item label="本人身份证 (正面图)" prop="idFront">
+                        <single-upload class="upload" v-model="sizeForm.idFront"></single-upload>
                     </el-form-item>
                     <div class="description">{{ explain }}</div>
-                    <el-form-item label="本人身份证 (反面图)" prop="photoBackside">
-                        <single-upload class="upload" v-model="sizeForm.photoBackside"></single-upload>
+                    <el-form-item label="本人身份证 (反面图)" prop="idBack">
+                        <single-upload class="upload" v-model="sizeForm.idBack"></single-upload>
                     </el-form-item>
                     <div class="description">{{ explain }}</div>
                 </el-form>
@@ -62,21 +62,22 @@ export default {
         return {
             labelPosition: 'right',
             sizeForm: {
-                nickname: '',
-                documentNumber: '',
-                photoFront: '',
-                photoBackside: '',
+                realName: '',
+                idNo: '',
+                idFront: '',
+                idBack: '',
                 phone: '',
-                email: ''
+                email: '',
+                status
             },
             typeFl: {},
             registerRule: {
-                documentNumber: { required: true, message: '请输入您的身份证号', trigger: 'blur' },
-                nickname: { required: true, message: '请输入您的真实姓名', trigger: 'blur' },
+                idNo: { required: true, message: '请输入您的身份证号', trigger: 'blur' },
+                realName: { required: true, message: '请输入您的真实姓名', trigger: 'blur' },
                 phone: { required: true, message: '请输入您的联系方式', trigger: 'blur' },
                 email: { type: 'email', required: true, message: '请输入您的邮箱', trigger: 'blur' },
-                photoFront: { required: true, message: '请添加您的身份证（正面）', trigger: 'blur' },
-                photoBackside: { required: true, message: '请添加您的身份证（反面）', trigger: 'blur' }
+                idFront: { required: true, message: '请添加您的身份证（正面）', trigger: 'blur' },
+                idBack: { required: true, message: '请添加您的身份证（反面）', trigger: 'blur' }
             }
         };
     },
@@ -110,9 +111,7 @@ export default {
         //         .catch(e => {
         //             console.log(e);
         //         });
-        (this.sizeForm.nickname = this.userInfo.nickname),
-            (this.sizeForm.phone = this.userInfo.phone),
-            (this.sizeForm.email = this.userInfo.email);
+        (this.sizeForm.phone = this.userInfo.phone), (this.sizeForm.email = this.userInfo.email);
     },
     methods: {
         Jump() {
@@ -132,45 +131,31 @@ export default {
             });
         },
         preservation() {
-            let data = { ...this.sizeForm };
-            delete data.nickname;
-            delete data.phone;
-            delete data.email;
-            data.userId = this.userInfo.id;
-            this.saving = true;
+            let form = { ...this.sizeForm };
+            delete form.phone;
+            delete form.email;
+            form.userId = this.userInfo.id;
+            form.status = 'PENDING';
             let userInfo = {
                 ...this.userInfo,
-                nickname: this.sizeForm.nickname,
                 phone: this.sizeForm.phone,
-                avatar: this.sizeForm.avatar,
                 email: this.sizeForm.email
             };
             userInfo.authorities = [
                 ...userInfo.authorities,
                 {
-                    name: 'ROLE_PERSONAL'
+                    name: 'ROLE_PERSONAL',
+                    description: '个人机构'
                 }
             ];
-            console.log(userInfo);
-            // this.$http
-            //     .post('user/save', userInfo, {
-            //         body: 'json'
-            //     })
-            //     .then(res => {
-            //         this.sizeForm.avatar = res.avatar;
-            //         this.$store.dispatch('getUserInfo');
-            //         return this.$http.post('/personal/save', data, { body: 'json' }).then(res => {
-            //             console.log(res);
-            //             this.sizeForm = res;
-            //             this.saving = false;
-            //             this.$store.dispatch('getUserInfo');
-            //         });
-            //     })
-            //     .catch(e => {
-            //         console.log(e);
-            //         this.saving = false;
-            //         this.$message.error(e.error);
-            //     });
+            // console.log(userInfo);
+            this.$http
+                .post('/identityAuth/apply', {
+                    userInfo
+                })
+                .then(() => {
+                    this.$store.dispatch('getUserInfo');
+                });
         }
     }
 };