qukaidi 4 years ago
parent
commit
84a41e73a3
3 changed files with 82 additions and 81 deletions
  1. 2 2
      pages/login/register.vue
  2. 2 1
      pages/login/register_2.vue
  3. 78 78
      pages/login/register_3.vue

+ 2 - 2
pages/login/register.vue

@@ -33,7 +33,7 @@
 		</view>
 		<view style="margin: 30rpx;">
 			<!-- <u-button type="primary" @click="nextStep" v-if="showLicense&&showStore">下一步</u-button> -->
-			<u-button type="primary" @click="nextStep">下一步</u-button>
+						<u-button type="primary" @click="nextStep">下一步</u-button>
 		</view>
 	</view>
 </template>
@@ -90,7 +90,7 @@
 							})
 						}
 					}).catch(err => {
-						console.log(err)
+						this.$u.toast('识别失败');
 					}).finally(() => {})
 				}
 			},

+ 2 - 1
pages/login/register_2.vue

@@ -139,6 +139,7 @@
 		},
 		created() {
 			uni.$on('licenseData', (data) => {
+				console.log(data)
 				this.form.store = data.company.words
 				this.form.company = data.company.words
 				this.form.name = data.person.words
@@ -194,7 +195,7 @@
 			nextStep() {
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-						uni.$emit("formData", this.form)
+						uni.$emit("formData",this.form)
 						this.$u.route({
 							url: 'pages/login/register_3',
 						})

+ 78 - 78
pages/login/register_3.vue

@@ -81,17 +81,12 @@
 						<view style="margin-right: 10rpx;">
 							<u-icon name="order" size="36"></u-icon>
 						</view>
-						<u-radio-group v-model="item.taskNum" @change="radioGroupChange">
-							<u-radio v-for="(i, index) in item.tasknameList" :key="index" :name="i.task" :disabled="i.taskdisabled">
+						<u-radio-group v-model="item.taskNum">
+							<u-radio v-for="(i, index) in tasknameList" :key="index" :name="i.task" :disabled="i.taskdisabled">
 								{{i.task}}
 							</u-radio>
 						</u-radio-group>
-						<!-- <u-input placeholder="点击选择签约任务" :disabled="true" @click="item.taskShow = true" v-model="form.tasklist"></u-input>
-						<view class="" slot="right">
-							<u-icon name="arrow-right" color="#666666" size="36"></u-icon>
-						</view> -->
 					</u-form-item>
-					<!-- <u-select v-model="item.taskShow" :list="item.taskList" value-name="numTask" label-name="signLv" @confirm="getTaskconfirm"></u-select> -->
 				</view>
 
 			</u-card>
@@ -125,71 +120,79 @@
 					cooperation: '',
 					protocol: false,
 				},
-				form2: {},
-				formData: [],
-				dataUrl: [],
+				formData: '',
+				dataUrl: '',
 				agentList: [], //经销商信息
 				checkedAgentlist: [],
 				taskList: [],
-				tasknameList: []
+				tasknameList: [],
+				brandAgentLvQueryList: []
 			}
 		},
 		created() {
-			uni.$on('formData', (data) => {
-				this.formData = data
-			})
-			uni.$on('dataUrl', (data) => {
-				this.dataUrl = data
-			})
+			
+			
+		},
+		mounted() {
 			this.getAgentArea()
 			this.getTasknum()
+			// uni.$on('dataUrl', (data) => {
+			// 	this.dataUrl = data
+			// })
 		},
 		methods: {
 			getAgentArea() {
-				request({
-					url: '/sailun/appStoreBasicInfo/getAgentArea',
-					method: 'post',
-					data: {
-						// "area": this.formData.district,
-						// "city": this.formData.city,
-						// "province": this.formData.province,
-						"area": "市北区",
-						"city": "青岛市",
-						"province": "山东省",
-						"spart": "10",
-						"vkorg": "8100",
-						"vtweg": "10"
-					},
-				}).then(res => {
-					if (res.data.code == 0) {
-						this.agentList = res.data.Data.data
-						console.log(this.agentList)
-						this.agentList = this.agentList.reduce((res, item, index, array) => {
-							for (let i = 0; i < array[index].brandList.length; i++) {
-								res.push({
-									brand: array[index].brandList[i],
-									brandCode: array[index].brandList[i],
-									name: item.name,
-									kunnr: item.kunnr,
-									agent_id: item.kunnr,
-									tasknameList:this.tasknameList,
-									taskNum:"",
-									checked: false,
-									disabled: false,
-								})
-							}
-							return res;
-						}, []);
-						console.log(this.agentList)
-					}
-					if (res.data.code == 500) {
-						this.$u.toast(res.data.msg);
-					}
-				}).catch(err => {
-					console.log(err)
-				}).finally(() => {
-
+				uni.$on('formData', (data) => {
+					this.formData = data
+					console.log(this.formData)
+					let that=this
+					
 				})
+			request({
+				url: '/sailun/appStoreBasicInfo/getAgentArea',
+				method: 'post',
+				data: {
+					"province": "山东省",
+					"city": "青岛市",
+					"area": "市北区",
+					// "area":this.formData.district,
+					// "city":this.formData.city,
+					// "province":this.formData.province,
+					"spart": "10",
+					"vkorg": "8100",
+					"vtweg": "10"
+				}
+			}).then(res => {
+				console.log(res.data.code)
+				if (res.data.code == 0) {
+					this.agentList = res.data.Data.data
+					this.agentList = this.agentList.reduce((res, item, index, array) => {
+						console.log("11111")
+						for (let i = 0; i < array[index].brandList.length; i++) {
+							res.push({
+								brand: array[index].brandList[i],
+								brandCode: array[index].brandList[i],
+								name: item.name,
+								kunnr: item.kunnr,
+								agent_id: item.kunnr,
+								taskNum: "",
+								checked: false,
+								disabled: false,
+							})
+						}
+						return res;
+					}, []);
+					
+				}
+				if (res.data.code == 500) {
+					this.$u.toast(res.data.msg);
+				}
+				return this.agentList
+			}).catch(err => {
+				console.log(err)
+			}).finally(() => {
+			
+			})
 			},
 			getTasknum() {
 				request({
@@ -206,7 +209,6 @@
 							})
 							return res;
 						}, []);
-						console.log(this.taskList)
 					}
 					if (res.data.code == 500) {
 						this.$u.toast(res.data.msg);
@@ -220,9 +222,6 @@
 			checkboxGroupChange(e) {
 				this.cooperations = e
 			},
-			radioGroupChange(e) {
-				console.log(e);
-			},
 			getCooperation() {
 				if (this.cooperations != null) {
 					this.form.cooperation = this.cooperations.toString();
@@ -234,24 +233,25 @@
 
 			},
 			getTaskconfirm(e) {
-				console.log(e)
 				this.form.tasklist = e[0].label;
-				console.log(this.form.tasklist)
 			},
 			submit() {
-				// console.log(this.)
+				this.brandAgentLvQueryList = this.checkedAgentlist.reduce((res, item) => {
+					res.push({
+						agent_id: item.agent_id,
+						brand: item.brand,
+						brandCode: item.brandCode,
+						kunnr: item.kunnr,
+						lvCount: parseInt(item.taskNum.substring(2)).toString(),
+						showLv: item.taskNum,
+						spart: "10",
+						vkorg: "8100",
+						vtweg: "10"
+					})
+					return res;
+				}, []);
 				// let data = {
-				// 	"brandAgentLvQueryList": [{
-				// 		"agent_id": "string",
-				// 		"brand": "string",
-				// 		"brandCode": "string",
-				// 		"kunnr": "string",
-				// 		"lvCount": "string",
-				// 		"showLv": "string",
-				// 		"spart": "string",
-				// 		"vkorg": "string",
-				// 		"vtweg": "string"
-				// 	}],
+				// 	"brandAgentLvQueryList":this.brandAgentLvQueryList,
 				// 	"city": "string",
 				// 	"contactName": "string",
 				// 	"district": "string",