From d0c1422b337ae6b5a01df51f989ef71b20cfe10e Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 11 May 2020 10:06:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[FIX]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E3=80=91=E5=85=A5=E5=8F=B8=E7=94=B3=E8=AF=B7=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E5=BD=B1=E5=83=8F=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=BD=B1=E5=83=8F=E5=90=8D=E7=A7=B0=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agentEenter/AgentEenterBasicImage.vue | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue b/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue index d30c9bf81..e53273579 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue @@ -4,12 +4,12 @@
- 销售人员相关证件上传 + 销售人员相关附件
- +
- - - *近期免冠照片1张(半身、免冠、正面、白底、彩色,jpg格式,大小10-25K像素210*370或相同宽高比例) - -
- -
- + - +
+ + + + *近期免冠照片1张(免冠、正面、白底彩色、JPG格式、大小30-40k像素210*370) + +
+ +
+
From bd44e8e2de4e5f5e6f2dbd0e59d5acb170e92259 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 11 May 2020 13:13:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[IMP]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96=E3=80=91=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/share/ShareInfo.vue | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/src/views/ebiz/agentEenter/share/ShareInfo.vue b/src/views/ebiz/agentEenter/share/ShareInfo.vue index 5bad87db6..42f28cfba 100644 --- a/src/views/ebiz/agentEenter/share/ShareInfo.vue +++ b/src/views/ebiz/agentEenter/share/ShareInfo.vue @@ -21,7 +21,7 @@ /> - + + + + {{ codeDisabled ? `${countDown}s后重新获取` : '发送验证码' }} + + 提交信息 @@ -67,6 +63,8 @@ import { idToData } from '@/assets/js/utils/verification' import { weixinShare } from '@/assets/js/utils/wxShare.js' import axios from 'axios' import index from '@/config/index' +import { getAuthCode } from '@/api/ebiz/sale/sale' + export default { name: 'insuredInfo', components: { @@ -119,7 +117,10 @@ export default { }, areaList: areaList, token: '', - wxShareDesc: '' + wxShareDesc: '', + codeDisabled: false, //获取验证码按钮是否禁用 + countDown: 60, //获取短信验证码倒计时 + sessionId: '' //后台返回的 id } }, mounted() { @@ -262,7 +263,8 @@ export default { // mobile: '18978145583' // }, entryType: 'SHARE_ADD', - ebizEnterCustomerDto: this.userInfo + ebizEnterCustomerDto: this.userInfo, + smsCodeDTO: { smsId: this.sessionId, code: this.userInfo.authCode } // ebizReferrerDto: this.recommender } console.log(data) @@ -319,6 +321,39 @@ export default { return } this.userInfo.sex = idToData(val).sex + }, + + //获取验证码 + getCode() { + if (this.userInfo.mobile == '') { + return this.$toast('请填写手机号') + } + this.codeDisabled = true + //倒计时 + this.timeId = setInterval(() => { + this.countDown-- + if (this.countDown <= 0) { + window.clearInterval(this.timeId) + this.codeDisabled = false + this.countDown = 60 + } + }, 1000) + let data = { + operateType: 'appntInfoEntry', + type: 'H5', + operateCode: this.userInfo.mobile, + system: 'agentApp', + operateCodeType: '0' + } + //获取验证码 + getAuthCode(data).then(res => { + console.log(res) + if (res.result == 0) { + this.sessionId = res.sessionId + } else { + this.$toast(res.resultMessage) + } + }) } } } From c93dc420286d831887318c4066146e3385bd7dbe Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 11 May 2020 13:16:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[NEW]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96=E3=80=91=E5=AE=B6?= =?UTF-8?q?=E5=BA=AD=E5=85=B3=E7=B3=BB=E5=A2=9E=E5=8A=A0=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E2=80=9C=E6=97=A0=E2=80=9D=EF=BC=8C=E5=9B=A0=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=94=B9=E4=B8=8D=E4=BA=86=EF=BC=8C=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E5=85=A5=E5=8F=B8=E5=AE=B6=E5=BA=AD=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E2=80=9C=E6=97=A0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 1 + .../agentEenter/AgentEenterBasicFamily.vue | 96 ++++++++++--------- 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 95eef0020..7a1b18ad4 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -1455,6 +1455,7 @@ export default { { id: 'AD', text: '营业总监' } ], relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }], + // relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }, { id: '3', text: '无' }], guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }], classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }], //入司国籍/地区 diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue index 0faa47357..881c90d7c 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue @@ -18,52 +18,54 @@ @click="toSelect('1', i)" required /> - - - - - - +
+ + + + + + +
-
+ 新增
+
+ 新增
上一步 @@ -214,6 +216,10 @@ export default { this.popupShow = false if (this.pickerType == '1') { this.userInfo[this.enterIndex].relationType = value.id + if (value.id == '3') { + //如果家庭关系选择无,则页面其他信息不需要填不需要显示 + this.userInfo[0].sex = '' + } // this.$forceUpdate() } if (this.pickerType == '2') { From 0c4b01687ba72fc9dff2c886ef0417c3fda65a92 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 11 May 2020 13:17:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[FIX]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96=E3=80=91=E9=85=8D?= =?UTF-8?q?=E7=BD=AEmock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/agentEenter.js | 6 ++++++ src/config/urlMap.js | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/config/agentEenter.js diff --git a/src/config/agentEenter.js b/src/config/agentEenter.js new file mode 100644 index 000000000..f9deda779 --- /dev/null +++ b/src/config/agentEenter.js @@ -0,0 +1,6 @@ +//自助入司 +let mockBaseUrl = 'http://mock-api.com/LwnaDLg1.mock' +export default { + // 查询签署协议信息 + '/agent/agreement/query': mockBaseUrl + '/agent/agreement/query' +} diff --git a/src/config/urlMap.js b/src/config/urlMap.js index f656fc0cb..390399493 100644 --- a/src/config/urlMap.js +++ b/src/config/urlMap.js @@ -13,6 +13,7 @@ import common from './common' import survey from './survey' import manpower from './manpower' import cardList from './cardList' +import agentEenter from './agentEenter' const mockBaseUrl = 'http://rap2api.taobao.org/app/mock' let baseObj = { @@ -20,6 +21,6 @@ let baseObj = { '/user/info': mockBaseUrl + '/223948/info', '/user/logout': mockBaseUrl + '/223948/logout' } -Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, cardList, survey, manpower) +Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, cardList, survey, agentEenter, manpower) export default baseObj From 2930de9f0bc43bb4b222db3935c775ebff08954f Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Mon, 11 May 2020 13:19:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[IMP]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?= =?UTF-8?q?=E5=8F=B8=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96=E3=80=91=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E7=AD=BE=E7=BD=B2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=B7=B2=E7=AD=BE=E7=BD=B2=E5=8D=8F=E8=AE=AE=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E7=AD=BE=E7=BD=B2=E5=8D=8F=E8=AE=AE=E6=97=B6?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E5=B7=B2=E7=AD=BE=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/agentEenter/HealthNotice.vue | 15 +- src/views/ebiz/agentEenter/SignContract.vue | 11 +- src/views/ebiz/agentEenter/js/methods.js | 685 +++++++++++--------- 3 files changed, 414 insertions(+), 297 deletions(-) diff --git a/src/views/ebiz/agentEenter/HealthNotice.vue b/src/views/ebiz/agentEenter/HealthNotice.vue index a31b263cc..93bd0c6f6 100644 --- a/src/views/ebiz/agentEenter/HealthNotice.vue +++ b/src/views/ebiz/agentEenter/HealthNotice.vue @@ -12,7 +12,9 @@
本人签字: - {{ appntSign.signState == '0' ? '签名' : '已签名' }} + {{ + appntSign.signState == '0' ? '签名' : '已签名' + }}
下一步
@@ -22,6 +24,7 @@