。

src/main/pc-space/src/plugins/http.js

@@ -4,9 +4,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'https://nfttest.9space.vip/';
+        // baseUrl = 'https://nfttest.9space.vip/';
         // baseUrl = 'http://192.168.50.190:8080';
-        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':

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

@@ -45,6 +45,9 @@
         </div>
         <div class="userContent" v-if="active === '关注' || active === '粉丝'">
             <div class="borderUser"></div>
+            <!-- <el-divider content-position="right">
+                <img src="../../assets/copy_icon.png" alt="" />
+            </el-divider> -->
             <el-empty v-if="empty" description="还没有用户哦～"></el-empty>
             <div v-for="item in list" :key="item.id">
                 <div class="boxFollow">
@@ -175,16 +178,16 @@
                 </div>
                 <div class="text4" @click="Auths">{{ Status }}</div>
             </div>
-            <!-- <div class="box">
+            <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <img class="icon" src="../../assets/user/icon-renzheng@3x.png" alt="" />
+                        <img class="icon" src="../../assets/user/icon_yinhangka@3x.png" alt="" />
                     </div>
                     <div class="text2">银行卡</div>
                     <div class="text3">已添加银行卡信息</div>
                 </div>
                 <div class="text4" @click="ipcFn">查看</div>
-            </div> -->
+            </div>
         </div>
     </div>
 </template>
@@ -236,10 +239,51 @@ export default {
         setTimeout(() => {
             this.add();
         }, 1000);
+        this.$http
+            .get('user/myBankCard', {
+                userId: this.userInfo.id
+            })
+            .then(res => {
+                console.log(res);
+            });
     },
     methods: {
         ipcFn() {
-            this.$router.push('/Addipc');
+            if (this.userInfo.authStatus === 'SUCCESS') {
+                this.$router.push('/Addipc');
+            } else if (this.userInfo.authStatus === 'PENDING' || this.userInfo.authStatus === 'FAIL') {
+                this.$confirm('用户认证中，是否查看认证状态', '实名认证', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    customClass: 'myClass',
+                    center: true
+                }).then(() => {
+                    this.add();
+                    this.$nextTick(() => {
+                        setTimeout(() => {
+                            if (this.userInfo.authStatus !== 'NOT_AUTH' && this.lists == false) {
+                                this.add();
+                                this.$router.push('/userauthentication');
+                            }
+                        }, 1000);
+                        setTimeout(() => {
+                            if (this.userInfo.authStatus !== 'NOT_AUTH' && this.lists == true) {
+                                this.add();
+                                this.$router.push('/enterpriseauthentication');
+                            }
+                        }, 1000);
+                    });
+                });
+            } else if (this.userInfo.authStatus === 'NOT_AUTH') {
+                this.$confirm('您的账户还未实名认证，认证后可进行添加银行卡', '实名认证', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    customClass: 'myClass',
+                    center: true
+                }).then(() => {
+                    this.$router.push('/authentication');
+                });
+            }
         },
         add() {
             this.$http
@@ -281,7 +325,7 @@ export default {
             if (e === '关注') {
                 this.$http.get('/user/myFollows').then(res => {
                     this.list = res;
-                    console.log(res);
+                    // console.log(res);
                     this.$store.dispatch('getUserInfo');
                     if (this.list.length === 0) {
                         this.empty = true;
@@ -328,8 +372,6 @@ export default {
                     }, 1000);
                 });
             }
-            // ROLE_INSTITUTION 企业
-            // ROLE_PERSONAL 个人
         },
         username() {
             this.value = this.userInfo.nickname;
@@ -429,7 +471,9 @@ export default {
         padding-top: 200px;
         margin: 0 auto;
     }
-
+    /deep/ .el-divider__text.is-right {
+        right: 307px;
+    }
     /deep/ .el-empty__description {
         color: #ccc;
         margin-top: 10px;

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

@@ -15,24 +15,37 @@
                     ref="form"
                     :rules="rules"
                 >
-                    <el-form-item label="开户行" prop="password">
-                        <el-input
-                            style="width: 300px"
-                            type="password"
-                            v-model="ruleForm.password"
-                            placeholder="请输入新密码，8-16位字母数字组合"
-                            autocomplete="off"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="卡号" prop="ipc">
+                    <!-- <el-form-item label="开户行" prop="bankNo">
+                        <el-select style="width: 300px" class="select" v-model="ruleForm.bankNo" placeholder="请选择">
+                            <el-option
+                                v-for="item in sortList"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item> -->
+                    <el-form-item label="卡号" prop="bankNo">
                         <el-input
                             style="width: 300px"
                             type="number"
-                            v-model="ruleForm.ipc"
-                            placeholder="请输入银行预留手机号"
+                            v-model="ruleForm.bankNo"
+                            placeholder="请输入*某某 银行卡号"
                             autocomplete="off"
                         ></el-input>
                     </el-form-item>
+                    <!-- <el-form-item label="所在地区" prop="address">
+                        <el-select style="width: 300px" class="select" v-model="ruleForm.address" placeholder="请选择">
+                            <el-option
+                                v-for="item in sortList"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item> -->
                     <el-form-item
                         prop="phone"
                         label="银行预留手机号"
@@ -42,12 +55,7 @@
                             trigger: 'blur'
                         }"
                     >
-                        <el-input
-                            style="width: 300px"
-                            :disabled="true"
-                            v-model="ruleForm.phone"
-                            placeholder="请输入手机号"
-                        ></el-input>
+                        <el-input style="width: 300px" v-model="ruleForm.phone" placeholder="请输入手机号"></el-input>
                     </el-form-item>
                     <el-form-item prop="code" label="验证码">
                         <el-form-item prop="code" :rules="{ required: true, message: '请输入', trigger: 'blur' }">
@@ -80,26 +88,9 @@ export default {
     data() {
         return {
             labelPosition: 'right',
-            ruleForm: {
-                password: '',
-                phone: ''
-            },
+            ruleForm: {},
             time: 0,
-            rules: {
-                checkPass: [
-                    {
-                        validator: (rule, value, callback) => {
-                            if (value !== this.ruleForm.password) {
-                                callback(new Error('两次密码输入不一致'));
-                            } else {
-                                callback();
-                            }
-                        },
-                        trigger: 'blur'
-                    },
-                    { required: true, message: '请再次输入密码', trigger: 'blur' }
-                ]
-            }
+            rules: {}
         };
     },
     computed: {
@@ -119,7 +110,23 @@ export default {
         ipcSend() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    console.log('银行卡');
+                    this.$http
+                        .post('/user/addBankCard', {
+                            userId: this.userInfo.id,
+                            bankNo: this.ruleForm.bankNo,
+                            phone: this.ruleForm.phone,
+                            code: this.ruleForm.code
+                        })
+                        .then(res => {
+                            // console.log(res);
+                            this.$message.success('添加成功');
+                            setTimeout(() => {
+                                this.$router.go(-1);
+                            }, 1000);
+                        })
+                        .catch(e => {
+                            this.$message.error(e.error);
+                        });
                 }
             });
         }

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

@@ -115,6 +115,7 @@ export default {
         return {
             loading: true,
             labelPosition: 'right',
+            IDPattern: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/,
             sizeForm: {
                 realName: '',
                 orgLicenseExpire: '',
@@ -152,7 +153,7 @@ export default {
                         }
                     }
                 ],
-                idNo: { required: true, min: 18, max: 18, message: '请输入18位身份证号', trigger: 'blur' },
+                idNo: { pattern: this.IDPattern, message: '请输入您的身份证号', trigger: 'blur' },
                 realName: { required: true, message: '请输入', trigger: 'blur' },
                 orgName: { required: true, message: '请输入企业名称', trigger: 'blur' },
                 idFront: { required: true, message: '请添加您的法人身份证（正面）', trigger: 'blur' },

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

@@ -88,6 +88,8 @@ export default {
     data() {
         return {
             labelPosition: 'right',
+            IDPattern: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/,
+            phonePattern: /^[1][3,4,5,7,8,9][0-9]{9}$/,
             sizeForm: {
                 realName: '',
                 idNo: '',
@@ -99,9 +101,9 @@ export default {
             },
             typeFl: {},
             registerRule: {
-                idNo: { required: true, min: 18, max: 18, message: '请输入您的身份证号', trigger: 'blur' },
+                idNo: { pattern: this.IDPattern, message: '请输入您的身份证号', trigger: 'blur' },
                 realName: { required: true, message: '请输入您的真实姓名', trigger: 'blur' },
-                phone: { required: true, message: '请输入您的联系方式', trigger: 'blur' },
+                phone: { pattern: this.phonePattern, message: '请输入您的联系方式', trigger: 'blur' },
                 email: { type: 'email', required: true, message: '请输入您的邮箱', trigger: 'blur' },
                 idFront: { required: true, message: '请添加您的身份证（正面）', trigger: 'blur' },
                 idBack: { required: true, message: '请添加您的身份证（反面）', trigger: 'blur' }