Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

README.md

@@ -21,7 +21,7 @@ vue-baidu-map参考[安装命令](npm install vue-baidu-map --save)
 icon名称参考[vant-ui-icom](https://vant-contrib.gitee.io/vant/#/zh-CN/icon)的文档
 
 uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
-
+## [运营平台：http://b2bcnapi.sailuntire.com/allsteel/test/#/login](http://b2bcnapi.sailuntire.com/allsteel/test/#/login)
 ## [官方文档：https://www.uviewui.com](https://www.uviewui.com)
 
 ### [点击加群交流反馈：1084514613](https://jq.qq.com/?_wv=1027&k=uyZUkSlo)

pages/home/index.vue

@@ -117,13 +117,13 @@
 			system() {
 				uni.getSystemInfo({
 					success: res => {
-						console.log(res.platform);
+						// console.log(res.platform);
 					},
 					complete: err => {
 						if (err.platform == 'android') {
 							this.onLaunch_s()
 						} else if (err.platform == 'ios') {
-							console.log("暂无数据")
+							// console.log("暂无数据")
 							this.iosstartup()
 						}
 					}
@@ -137,14 +137,14 @@
 							osType: 1
 						}
 					}).then(res => {
-						console.log(res)
-						console.log(res.data.code)
-						console.log(res.data.forceVersion) //最低版本
-						console.log(res.data.msg) //更新文案
-						console.log(res.data.version) //最新版本
+						// console.log(res)
+						// console.log(res.data.code)
+						// console.log(res.data.forceVersion) //最低版本
+						// console.log(res.data.msg) //更新文案
+						// console.log(res.data.version) //最新版本
 
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-							console.log(wgtinfo);
+							// console.log(wgtinfo);
 							console.log(wgtinfo.version); //版本号
 							if (wgtinfo.version == res.data.version) {
 								this.show_s = true
@@ -153,9 +153,9 @@
 								// 	title: '已是最新版本',
 								// 	position: "bottom"
 								// })
-								console.log("已是最新版本")
+								// console.log("已是最新版本")
 							} else if (wgtinfo.version != res.data.forceVersion) {
-								console.log("强制版本更新"+res)
+								// console.log("强制版本更新"+res)
 								res.data.msg = res.data.msg.replace(/\\n/g,"\n")
 								uni.showModal({
 									title: "发现新版本",
@@ -164,7 +164,7 @@
 									confirmText: "立即去AppStore更新",
 									success: function(res) {
 										if (res.confirm) {
-											console.log('用户点击确定');
+											// console.log('用户点击确定');
 											let appleId = 1518555723
 											plus.runtime.launchApplication({
 												action: `itms-apps://itunes.apple.com/cn/app/id${appleId}?mt=8`
@@ -305,7 +305,7 @@
 				})
 			},
 			inInlineshop() {
-				this.$u.toast('线下订货暂不开放');
+				this.$u.toast('线上订货暂不开放');
 				// this.$u.route({
 				// 	url: 'pages/home/inline-shop/inline_shop',
 				// })

pages/login/register_2.vue

@@ -188,7 +188,7 @@
 				dataUrl: "",
 				codeLoading: false,
 				modelshow: false,
-				modelcontent: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照？",
+				modelcontent: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照。",
 				lonlatData:'',
 				bd09:false
 			};
@@ -244,7 +244,7 @@
 			if (this.SystemInfo.platform == 'ios') {
 				uni.showModal({
 					title: "温馨提示",
-					content: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照？",
+					content: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照。",
 					confirmText: "确认",
 					showCancel: false
 				})

pages/login/register_3.vue

@@ -157,11 +157,11 @@
 				this.formData = data.formData
 				this.dataUrl = data.dataUrl
 			})
+			this.getAllbrandlist()
 		},
 		mounted() {
 			this.getAgentArea()
 			this.getTasknum()
-			this.getAllbrandlist()
 		},
 		methods: {
 			getAgentArea() {
@@ -196,6 +196,7 @@
 									taskNum: "",
 									disabledGroup: false,
 									checked: false,
+									seriesCode: ""
 								})
 							}
 							return res;
@@ -285,9 +286,15 @@
 				if (item.checked == true) {
 					this.checkedAgentlist.filter(e => (e.brand === item.brand && e.agent_id != item.agent_id)).forEach(e => e.disabledGroup =
 						false)
+					this.checkedAgentlist.filter(e => (e.seriesCode === item.seriesCode && e.agent_id != item.agent_id)).forEach(e =>
+						e.disabledGroup =
+						false)
 				} else {
 					this.checkedAgentlist.filter(e => (e.brand === item.brand && e.agent_id != item.agent_id)).forEach(e => e.disabledGroup =
 						true)
+					this.checkedAgentlist.filter(e => (e.seriesCode === item.seriesCode && e.agent_id != item.agent_id)).forEach(e =>
+						e.disabledGroup =
+						true)
 				}
 			},
 			clickitem(item, e) {
@@ -301,7 +308,15 @@
 			getCooperation() {
 				if (this.cooperations != null) {
 					this.form.cooperation = this.cooperations.toString();
+					this.allbrandList.map(item => {
+						this.agentList.map(e => {
+							if (e.brand == item.brandCode) {
+								e.seriesCode = item.seriesCode
+							}
+						})
+					})
 					this.checkedAgentlist = this.agentList.filter(item => this.cooperations.indexOf(item.brand) > -1)
+					console.log(this.checkedAgentlist)
 					this.checkedBrandlist = this.checkedAgentlist.reduce((res, item, index, array) => {
 						res.push(item.brand)
 						return res;
@@ -322,7 +337,7 @@
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						this.brandAgentLvQueryList = this.checkedAgentlist.filter(item => (item.disabledGroup != true))
-						let checkenLength = this.checkedAgentlist.filter(item => (item.checked == false&&item.disabledGroup==false))
+						let checkenLength = this.checkedAgentlist.filter(item => (item.checked == false && item.disabledGroup == false))
 						if (!this.brandAgentLvQueryList.length) return this.$u.toast('未正确选择经销商，请正确选择');
 						if (checkenLength.length != 0) return this.$u.toast('请选择' + checkenLength[0].brand + "品牌签约任务");
 						if (!this.protocol) return this.$u.toast('请阅读并同意用户协议和隐私协议');
@@ -376,7 +391,7 @@
 							this.$u.route({
 								url: 'pages/login/index',
 							})
-							uni.$emit('loginphone',this.formData.phone)
+							uni.$emit('loginphone', this.formData.phone)
 						}, 2000)
 					}
 					if (res.data.code == 500) {