Merge branch 'devRs' into dev

src/assets/js/utils/data-dictionary.js

@@ -262,6 +262,33 @@ export default {
       text: '丧偶'
     }
   ],
+  //入司婚姻状况
+  rsmarriage: [
+    {
+      id: 5,
+      text: '结婚'
+    },
+    {
+      id: 6,
+      text: '单身'
+    },
+    {
+      id: 7,
+      text: '离婚'
+    },
+    {
+      id: 8,
+      text: '丧偶'
+    },
+    {
+      id: 9,
+      text: '分居'
+    },
+    {
+      id: 10,
+      text: '其他'
+    }
+  ],
   //文化程度
   degree: [
     {
@@ -1078,6 +1105,23 @@ export default {
       text: '无党派人士'
     }
   ],
+  //入司政治面貌
+  rspoliticsStatus: [
+    { id: '01', text: '中共党员' },
+    { id: '02', text: '中共预备党员' },
+    { id: '04', text: '民革党员' },
+    { id: '05', text: '民盟盟员' },
+    { id: '06', text: '民建会员' },
+    { id: '07', text: '民进会员' },
+    { id: '08', text: '农工党党员' },
+    { id: '09', text: '致公党党员' },
+    { id: '10', text: '九三学社社员' },
+    { id: '11', text: '台盟盟员' },
+    { id: '12', text: '无党派人士' },
+    { id: '13', text: '群众' },
+    { id: '15', text: '工商' },
+    { id: '99', text: '其他党派' }
+  ],
   rsIdType: [
     {
       id: 1,
@@ -1156,15 +1200,58 @@ export default {
   ],
   //入司文化程度
   rsdegree: [
-    { id: '1', text: '初中' },
-    { id: '2', text: '中专' },
-    { id: '3', text: '中技' },
-    { id: '4', text: '高中' },
-    { id: '5', text: '大专' },
-    { id: '6', text: '本科' },
-    { id: '7', text: '硕士' },
-    { id: '8', text: '博士' },
-    { id: '9', text: '博士后' }
+    {
+      id: 2,
+      text: '硕士'
+    },
+    {
+      id: 3,
+      text: '本科'
+    },
+    {
+      id: 4,
+      text: '大专'
+    },
+    {
+      id: 5,
+      text: '高中'
+    },
+    {
+      id: 6,
+      text: '初中'
+    },
+    {
+      id: 7,
+      text: '中专'
+    },
+    {
+      id: 8,
+      text: '小学'
+    },
+    {
+      id: 12,
+      text: '其他'
+    },
+    {
+      id: 13,
+      text: '文盲'
+    },
+    {
+      id: 14,
+      text: '中技'
+    },
+    {
+      id: 12,
+      text: '其他'
+    },
+    {
+      id: 10,
+      text: '博士'
+    },
+    {
+      id: 11,
+      text: '博士后'
+    }
   ],
   rsRankAgent: [
     { id: 'TRM', text: '见习风险管理师' },

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -65,7 +65,7 @@
         @click="toSelect('3')"
       /> -->
       <van-field
-        :value="userInfo.marriage | idToText('marriage')"
+        :value="userInfo.marriage | idToText('rsmarriage')"
         label="婚姻状况"
         name="婚姻状况"
         v-validate="'required'"
@@ -76,7 +76,7 @@
         required
       />
       <van-field
-        :value="userInfo.political | idToText('politicsStatus')"
+        :value="userInfo.political | idToText('rspoliticsStatus')"
         label="政治面貌"
         name="政治面貌"
         v-validate="'required'"
@@ -375,7 +375,7 @@ export default {
   mounted() {
     // 筛选按钮的点击事件
     // window.appCallBack = this.appCallBack
-    window.appCallBack = appCallBack(this, '1')
+    window.appCallBack = appCallBack
     this.agentAll()
     // // 获取银行卡
     // this.getBankList()
@@ -594,6 +594,17 @@ export default {
         }
       })
     },
+    appCallBack() {
+      // 筛选按钮的点击事件
+      this.$jump({
+        flag: 'navigation',
+        extra: {
+          title: '入司基本信息',
+          hiddenRight: '1'
+        }
+      })
+      this.isScan = false
+    },
     //获取银行卡扫描信息
     getBankCardInfo(data) {
       this.userInfo.bankCode = data.name
@@ -606,32 +617,6 @@ export default {
         }
       })
       this.isScan = false
-    },
-
-    //校验身高
-    checkStature(val) {
-      console.log(val)
-      if (val.trim().length == 0) {
-        return this.$toast('身高不能为空')
-      }
-
-      let res = /^[0-9]{0,3}([.]{1}[0-9]{1})?$/.test(val) && val < 300 && val > 10
-      if (!res) {
-        this.userInfo.stature = ''
-        return this.$toast('身高输入有误')
-      }
-    },
-    //校验体重
-    checkAvoirdupois(val) {
-      if (val.trim().length == 0) {
-        return this.$toast('体重不能为空')
-      }
-
-      let res = /^[0-9]+([.]{1}[0-9]{1})?$/.test(val) && val > 0.1
-      if (!res) {
-        this.userInfo.avoirdupois = ''
-        return this.$toast('体重输入有误')
-      }
     }
   },
   beforeDestroy() {

src/views/ebiz/agentEenter/AgentEenterBasicSuccess.vue

@@ -24,18 +24,19 @@ export default {
   components: {
     [Cell.name]: Cell,
     [CellGroup.name]: CellGroup
+  },
+   mounted() {
+    document.body.style.backgroundColor = '#fff'
   },
   methods: {
     goBack() {
       this.$jump({
-        flag: 'h5',
-        extra: {
-          refresh: '1',
-          index: '-1'
-        },
+        flag: 'goBack',
+        // extra: {
+        //   refresh: '1',
+        //   index: '-1'
+        // },
         routerInfo: {
-          type: 2,
-          index: -1,
           path: '/agentEenter/EntryProcess'
         }
       })

src/views/ebiz/agentEenter/js/methods.js

@@ -164,9 +164,9 @@ export function toSelect(that, pickerType, valueKey, type) {
   } else if (pickerType == '3') {
     that.columns = DataDictionary.rshealthCondition
   } else if (pickerType == '4') {
-    that.columns = DataDictionary.marriage
+    that.columns = DataDictionary.rsmarriage
   } else if (pickerType == '5') {
-    that.columns = DataDictionary.politicsStatus
+    that.columns = DataDictionary.rspoliticsStatus
   } else if (pickerType == '6') {
     // console.log(that.colums)
     that.columns = DataDictionary.rsdegree

src/views/ebiz/agentEenter/share/ShareInfo.vue

@@ -275,6 +275,8 @@ export default {
             } else {
               self.save()
             }
+          } else {
+            self.save()
           }
         } else {
           this.$toast(this.$validator.errors.all()[0])
@@ -295,10 +297,18 @@ export default {
           // ebizReferrerDto: this.recommender
         }
         console.log(data)
+         let that = this
+        that.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
         agentInfowxSubmit(data)
           .then(res => {
             // console.log(res)
             if (res.result == '0') {
+              that.$toast.clear()
               this.$jump({
                 flag: 'h5',
                 extra: {

src/views/ebiz/agentEenter/share/ShareInfoSuccess.vue

@@ -3,11 +3,17 @@
     <div class="payResult-header flex justify-content-fs align-items-c p30 box-sizing-bb w100h100r bg-white flex-direction-colunm">
       <img :src="srcSuccess" class="payResult-img mb15  pt30" />
       <h3 class="mb10">填写成功</h3>
-      <p class="pt60">我们将会在1-3个工作日内进行资料审核，审核通过后可再次登录APP完成后续入司流程</p>
+      <p class="pt60">请扫描下方二维码下载【金掌桂】APP，使用您所预留的手机号码进行登录，完成后续自助入司操作。</p>
 
-      <div class="flex w250 pt20 justify-content-s">
-        <img src="@/assets/images/share_left.png" class="share-img" alt="" />
-        <img src="@/assets/images/share_right.png" class="share-img" alt="" />
+      <div class="flex w315 pt30 justify-content-a">
+        <div class="border-text w130 pv10 flex flex-direction-colunm justify-content-c align-items-c">
+          <img src="@/assets/images/share_left.png" class="share-img" alt />
+          <span class="pt5">IOS</span>
+        </div>
+        <div class="border-text w130 pv10 flex flex-direction-colunm justify-content-c align-items-c" >
+          <img src="@/assets/images/share_right.png" class="share-img" alt />
+          <span class="pt5">Android</span>
+        </div>
       </div>
       <!-- <van-button type="danger" class="bottom-btn" @click="goBack" v-no-more-click="1000">返回</van-button> -->
     </div>
@@ -31,18 +37,20 @@ export default {
     [CellGroup.name]: CellGroup
   },
   methods: {
-    goBack() {
-      this.$jump({
-        flag: 'goBack',
-        extra: {
-          refresh: '1',
-          index: '-2',
-          forbidSwipeBack:'1'
-        }
-      })
-    }
+    // goBack() {
+    //   this.$jump({
+    //     flag: 'goBack',
+    //     extra: {
+    //       refresh: '1',
+    //       index: '-2',
+    //       forbidSwipeBack:'1'
+    //     }
+    //   })
+    // }
+  },
+  mounted() {
+    document.body.style.backgroundColor = '#fff'
   },
-  mounted() {},
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
     next()
@@ -64,4 +72,7 @@ export default {
     }
   }
 }
+.border-text {
+  border:1px solid #CCCCCC;
+}
 </style>