tijiao

env/cl.js

@@ -1,5 +1,5 @@
 const ENV_PATH = {
-	baseUrl: 'http://192.168.31.160:9999', // 长龙
+	baseUrl: 'http://192.168.31.161:9999', // 长龙
 }
 
 module.exports = ENV_PATH

env/sh.js

@@ -1,5 +1,5 @@
 const ENV_PATH = {
-	baseUrl: 'http://192.168.31.85:9999', // 胜浩
+	baseUrl: 'http://192.168.31.86:9999', // 胜浩
 }
 
 module.exports = ENV_PATH

pages/center/consumer/edit.vue

@@ -97,7 +97,7 @@
 			<view class="conmsg-msg">
 				<view v-for="(item,index) in allList" :key="index">
 					<view class="">
-						<view class="conmsg-msg-lab" style="border: none;">
+						<view class="conmsg-msg-lab" :class="{mustSe: item.level == 1 && item.mustSelected == 0 }" style="border: none;">
 							<view class="conmsg-msg-lab-1">
 								{{item.name}}
 							</view>
@@ -179,15 +179,14 @@
 				userInfo: {}, // 用户信息
 			}
 		},
-		computed: {
-		},
-		
+		computed: {},
+
 		onLoad(e) {
 			const {
 				dataCode
 			} = uni.getStorageSync("weapp_session_userInfo_data");
 			this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
-			
+
 			this.dataCode = dataCode
 			console.log(this.userInfo.showPhoneStatus)
 			// 先调用借口查询数据
@@ -200,7 +199,7 @@
 				// 获取置业需求
 				this.getListByType()
 			},
-			
+
 			Edittag(item, item1, index, i) {
 				if (this.allList[index].children[i].selected == 0) {
 					this.allList[index].children[i].selected = 1;
@@ -237,7 +236,7 @@
 						if (this.userInfo.showPhoneStatus == 1) {
 							this.showPhone = this.form.phone
 							this.form.phone = this.form.phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
-						} 
+						}
 						// 给客户等级赋值
 						let idx = this.levellist.findIndex(item => item.value == res.level)
 						if (idx != -1) {
@@ -248,7 +247,7 @@
 						}
 					})
 			},
-			
+
 			// 字典表接口
 			getListByType() {
 				this.$u.get("/matchKeywords/findPersonalMatchData", {
@@ -260,11 +259,11 @@
 							item1.children.map(item => {
 								if (item.isInterval == 0) {
 									item.label = item.name + item.unit + '-' + item.endName + item
-									.unit;
+										.unit;
 								} else {
 									item.label = item.name
 								}
-							 item.value = item.id;
+								item.value = item.id;
 							})
 						})
 						// console.log(res)
@@ -290,7 +289,7 @@
 				// 	})
 				// 	return
 				// }
-				
+
 				// if(!(/^1[3456789]\d{9}$/.test(this.form.phone))){
 				// 			uni.showToast({
 				// 			    title: "请检查手机号码格式",
@@ -313,14 +312,28 @@
 				// 	})
 				// 	return;
 				// }
-
-				this.allList.map(item => {
-					item.children.map(item1 => {
-						if (item1.selected == 0) {
-							str.push(item1.keywordsId)
+				try {
+					this.allList.forEach(item => {
+						if (item.mustSelected == 0) {
+							if (item.children.findIndex(item => item.selected == 0) == -1) {
+								throw new Error(item.name)
+							}
 						}
+						item.children.map(item1 => {
+							if (item1.selected == 0) {
+								str.push(item1.keywordsId)
+							}
+						})
 					})
-				})
+				} catch (e) {
+					console.log(e)
+					uni.showToast({
+						title: `${e.message}为必选项~`,
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				str = str.join(',')
 				param = this.form
 				// 如果是禁用状态就传入明文手机号，如果没禁用则不用更改
@@ -378,6 +391,7 @@
 			padding: 0 30rpx;
 
 			.conmsg-msg-lab {
+				position: relative;
 				width: 100%;
 				height: 102rpx;
 				display: flex;
@@ -388,6 +402,15 @@
 				display: flex;
 				align-items: center;
 
+				&.mustSe::before {
+					content: '*';
+					color: red;
+					position: absolute;
+					left: -10rpx;
+					right: -10rpx;
+					z-index: 10;
+				}
+				
 				.conmsg-msg-lab-1 {
 					flex-shrink: 0;
 					display: flex;
@@ -402,7 +425,7 @@
 					margin-left: 44rpx;
 					flex-grow: 1;
 					display: flex;
-					
+
 					input {
 						flex-grow: 1;
 					}

pages/mine/calibration.vue

@@ -5,7 +5,7 @@
 			<view class="conmsg-msg">
 				<view v-for="(item,index) in allList" :key="index">
 					<view class="">
-						<view class="conmsg-msg-lab" style="border: none;">
+						<view class="conmsg-msg-lab" :class="{mustSe: item.level == 1 && item.mustSelected == 0 }" style="border: none;">
 							<view class="conmsg-msg-lab-1">
 								{{item.name}}
 							</view>
@@ -82,14 +82,28 @@
 					projectId: uni.getStorageSync("buildingID").id
 				}
 				let str = []
-				this.allList.map(item => {
-					item.children.map(item1 => {
-						if (item1.selected == 0) {
-							str.push(item1.keywordsId)
+				try {
+					this.allList.forEach(item => {
+						if (item.mustSelected == 0) {
+							if (item.children.findIndex(item => item.selected == 0) == -1) {
+								throw new Error(item.name)
+							}
 						}
+						item.children.map(item1 => {
+							if (item1.selected == 0) {
+								str.push(item1.keywordsId)
+							}
+						})
 					})
-				})
-				
+				} catch (e) {
+					console.log(e)
+					uni.showToast({
+						title: `${e.message}为必选项~`,
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				str = str.join(',')
 				param.keywordIds = str	
 				this.$u.post("matchKeywords/updateManualCalibration", param).then(res => {
@@ -144,6 +158,7 @@
 			padding: 0 30rpx;
 
 			.conmsg-msg-lab {
+				position: relative;
 				height: 102rpx;
 				display: flex;
 				font-size: 30rpx;
@@ -151,7 +166,16 @@
 				color: #333333;
 				border-bottom: 1px solid #E0E0E0;
 				line-height: 102rpx;
-
+				
+				&.mustSe::before {
+					content: '*';
+					color: red;
+					position: absolute;
+					left: -10rpx;
+					right: -10rpx;
+					z-index: 10;
+				}
+				
 				.conmsg-msg-lab-1 {
 					display: flex;
 					min-width: 136rpx;

pages/mine/details2.vue

@@ -145,7 +145,7 @@
 				</view>
 				<view class="more-btn">
 					
-					<view class="btn-item" @click.stop="showTemplate = !showTemplate; Thetapeidisshow=false">
+					<view v-if="permissions.xgxjyw" class="btn-item" @click.stop="showTemplate = !showTemplate; Thetapeidisshow=false">
 <!-- 						<image class="icon" v-if="userlistobj.validInvalidName"
 							src="https://static.quhouse.com/868b0eba0f7c44eca63e3b4fa782f14d.png" mode=""></image>
 						<image class="icon" v-else src="https://static.quhouse.com/480e572bf43c48558ad9febe5426f439.png"
@@ -153,7 +153,7 @@
 						更换销讲业务
 					</view>
 					
-					<view class="btn-item" @click.stop="alllogo">
+					<view class="btn-item" v-if="permissions.bjyx" @click.stop="alllogo">
 						<image class="icon" v-if="userlistobj.validInvalidName"
 							src="https://static.quhouse.com/868b0eba0f7c44eca63e3b4fa782f14d.png" mode=""></image>
 						<image class="icon" v-else src="https://static.quhouse.com/480e572bf43c48558ad9febe5426f439.png"