Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/register/index.js

@@ -45,4 +45,12 @@ export function base64Upload(data) {
     data: data
   })
 }
+//注册
+export function realtimeBackList(data) {
+  return request({
+    url: '/open/villageAffairs/public/realtimeBackList',
+    method: 'post',
+    data: data
+  })
+}
 

src/views/register/companyRegister.vue

@@ -150,6 +150,11 @@ export default {
       });
     },
     afterReadKHZM(file) {
+      this.$toast.loading({
+        message: "上传中...",
+        forbidClick: true,
+        duration: 0,
+      });
       // 此时可以自行将文件上传至服务器
       let params1 = new FormData();
       params1.append("file", file.content);
@@ -177,10 +182,8 @@ export default {
   }
 }
 .submit{
-  position: absolute;
-  bottom: 5%;
   width: 90%;
-  left: 5%;
+  margin: 2vh auto 0;
   p{
     text-align: center;
     margin-bottom: 0.2rem;

src/views/register/userRegister.vue

@@ -49,6 +49,97 @@
           <van-uploader :after-read="afterReadYHK" :before-delete="deleteFileYHK" v-model="fileListYHK" multiple :max-count="1" />
         </template>
       </van-field>
+
+
+      <van-divider>银行信息</van-divider>
+      <van-field v-model="form.bankCardName" label="开户姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.bankCardNum" label="开户账号" placeholder="请输入开户账号" required :rules="[{ required:true }]"/>
+
+      <van-field
+        v-model="accountType"
+        is-link
+        readonly
+        required
+        :rules="[{ required:true }]"
+        label="账户类型"
+        placeholder="请选择账户类型"
+        @click="showAccountType = true"
+      />
+      <van-popup v-model:show="showAccountType" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictLabel"
+          :columns="accountTypeOption"
+          @confirm="onConfirmAccountType"
+          @cancel="showAccountType = false"
+        />
+      </van-popup>
+
+      <van-field
+        v-model="bankType"
+        is-link
+        readonly
+        required
+        :rules="[{ required:true }]"
+        label="所属银行"
+        placeholder="请选择所属银行"
+        @click="showBankType = true"
+      />
+      <van-popup v-model:show="showBankType" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictLabel"
+          :columns="bankTypeOption"
+          @confirm="onConfirmBankType"
+          @cancel="showArea = false"
+        />
+      </van-popup>
+
+      <van-field
+        v-model="sheng"
+        is-link
+        readonly
+        label="开户省市"
+        placeholder="请选择开户省市"
+        @click="showSheng = true"
+      />
+      <van-popup v-model:show="showSheng" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="label"
+          :columns="shengOption"
+          @confirm="onConfirmSheng"
+          @cancel="showSheng = false"
+        />
+      </van-popup>
+
+      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词"/>
+      <van-field
+        v-model="form.bankAddress"
+        label="开户银行"
+        placeholder="请输入开户银行"
+        required
+        :rules="[{ required:true }]"
+        readonly
+        @click="showBankAddress = true"
+      >
+        <template #button>
+          <van-button size="small" type="primary" native-type="button" @click="searchBankAddress">点击检索</van-button>
+        </template>
+      </van-field>
+      <van-popup v-model:show="showBankAddress" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="bankDeposit"
+          :columns="bankAddressOption"
+          @confirm="onConfirmBankAddress"
+          @cancel="showBankAddress = false"
+        />
+      </van-popup>
+
+
+      <van-field v-model="form.payeePaymentLines" label="联行号" placeholder="请输入开户银行" required :rules="[{ required:true }]"/>
+
       <div class="submit">
 <!--        <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>-->
         <van-button round block type="info" color="#007E72" native-type="submit">立即注册</van-button>
@@ -59,8 +150,8 @@
 
 <script>
 import { getCodeImg } from "@/api/login";
-import { userRegister,base64Upload } from "@/api/register/index";
-import {deleteUserImg} from "@/api/user";
+import { userRegister,base64Upload,realtimeBackList } from "@/api/register/index";
+import {deleteUserImg, options, realtimeList} from "@/api/user";
 export default {
   name: "userRegister",
   data() {
@@ -80,14 +171,43 @@ export default {
         economicType:1,
         idCardPic :'',
         accountOpenCert:'',
+        bankCardName:'',
+        bankCardNum:'',
+        bankAddress:'',
       },
       codeUrl:'',
       fileListSFZ:[],
-      fileListYHK:[]
+      fileListYHK:[],
+      hcAreaInfoFieldName: {
+        text: "label",
+        value: "value",
+        children: "children",
+      },
+      bankTypeOption:[],
+      sheng:'',
+      shi:'',
+      bankType:'',
+      accountType:'',
+      bankDeposit:'',
+      showBankType:false,
+      showSheng :false,
+      shengOption:options,
+      showShi :false,
+      shiOption:[],
+      showBankAddress :false,
+      accountTypeOption:[],
+      showAccountType :false,
+      bankAddressOption:[],
     };
   },
   created() {
     this.getCode()
+    this.getDicts("bank_type_all").then(response => {
+      this.bankTypeOption = response.data;
+    });
+    this.getDicts("bank_account_type").then(response => {
+      this.accountTypeOption = response.data;
+    });
     this.height = document.body.clientHeight
   },
   methods: {
@@ -145,6 +265,11 @@ export default {
     },
     afterReadSFZ(file) {
       // 此时可以自行将文件上传至服务器
+      this.$toast.loading({
+        message: "上传中...",
+        forbidClick: true,
+        duration: 0,
+      });
       let params1 = new FormData();
       params1.append("file", file.content);
       base64Upload(params1).then((r1) => {
@@ -152,7 +277,12 @@ export default {
       })
     },
     afterReadYHK(file) {
-      // 此时可以自行将文件上传至服务器
+      // 此时可以自行将文件上传至服务器.
+      this.$toast.loading({
+        message: "上传中...",
+        forbidClick: true,
+        duration: 0,
+      });
       let params1 = new FormData();
       params1.append("file", file.content);
       base64Upload(params1).then((r1) => {
@@ -173,6 +303,45 @@ export default {
         this.form.accountOpenCert = '';
       }
     },
+    searchBankAddress(){
+      let data = {
+        sheng:this.form.sheng,
+        shi:this.form.shi,
+        bankType:this.form.bankType,
+        bankDeposit:this.form.bankDeposit,
+      }
+      realtimeBackList(data).then(response => {
+        console.log(response)
+        this.bankAddressOption = response.data;
+      });
+    },
+
+    onConfirmBankType(value){
+      this.showBankType = false;
+      this.form.bankAddress = '';
+      this.form.payeePaymentLines = '';
+      this.bankType = value.dictLabel;
+      this.form.bankType = value.dictValue;
+    },
+    onConfirmSheng(value){
+      console.log(value)
+      this.showSheng = false;
+      this.form.sheng = value[0];
+      this.form.shi = value[1];
+      this.sheng = value.join('/');
+    },
+    onConfirmBankAddress(value){
+      console.log(value)
+      this.form.bankAddress = value.bankDeposit;
+      this.form.payeePaymentLines = value.payeePaymentLines;
+      this.showBankAddress = false;
+    },
+    onConfirmAccountType(value){
+      console.log(value)
+      this.form.accountType = value.dictValue;
+      this.accountType = value.dictLabel;
+      this.showAccountType = false;
+    },
   },
 };
 </script>
@@ -185,10 +354,9 @@ export default {
   }
 }
 .submit{
-  position: absolute;
-  bottom: 5%;
   width: 90%;
-  left: 5%;
+  margin: 2vh auto 0;
+  padding-bottom: 5vh;
   p{
     text-align: center;
     margin-bottom: 0.2rem;

src/views/user/accountSetting/passWordInformation/index.vue

@@ -19,8 +19,9 @@
 </template>
 
 <script>
-import { passWordUpdate } from "@/api/user/index";
+  import {getMember, passWordUpdate} from "@/api/user/index";
 import {Dialog} from "vant";
+  import {getInfo} from "@/api/login";
   export default {
     name: "bankInformation",
     data() {
@@ -41,6 +42,13 @@ import {Dialog} from "vant";
       this.getInfo();
     },
     methods: {
+      getInfo(){
+        getInfo().then(response => {
+          getMember(response.user.userId).then(response => {
+            this.form.id = response.data.id;
+          });
+        });
+      },
       submitBank(){
         passWordUpdate(this.form.oldPassWord, this.form.newPassWord).then(response => {
           if (response.code == 200){