Merge branch 'dev' of http://git.2weisou.com/liumin/NewZkgj into dev

pages/center/Piabodata/Customerportrait/Receivedetailabout.vue

@@ -405,7 +405,7 @@
 				<viwe class="tian-view-t1"></viwe>
 				<viwe class="tian-view-t2">常错词：</viwe>
 				<viwe class="tian-view-t3">
-					<input type="text" v-model="thewrongword" class="tian-input" placeholder="请输入" />
+					<input type="text" v-model="thewrongword" :disabled="isNum" class="tian-input" placeholder="请输入" />
 				</viwe>
 			</view>
 			<view class="tian-view">
@@ -506,7 +506,8 @@
 				textItself: '',
 				argtextindex1: 0,
 				argtextindex2: 0,
-				isSw: false,
+				isSw: false,
+				isNum: false,
 				info: null, // 详细信息
 			};
 		},
@@ -755,43 +756,62 @@
 			},
 			//确认加入常错词
 			Confirmtheexit() {
-				if (this.thewrongword) {
-					if (this.reswrongword) {
-						let parames = {
-							customerId: this.customerId,
-							cupid: this.luyinList[this.csdFileindex].id,
-							wrongWord: this.thewrongword, //错误词
-							correctWord: this.reswrongword, //正确词
-							translateHtmlContent: this.messagelisy,
-
-						}
-						this.isshow2 = false;
-						let sas = this.textItself.replace(this.thewrongword, this.reswrongword)
-						this.dialogList[this.argtextindex1].message[this.argtextindex2].onebest = sas;
-						this.dialogList.forEach(res => {
-							res.message.forEach(asd => {
-								asd.isshow = false;
-							})
-						})
-						this.$u.post("/corpus/addCorrectWord", parames).then(data => {
-							this.thewrongword = "";
-							this.reswrongword = "";
+				if(this.reswrongword.length>8 || this.thewrongword.length>8){
+					this.$refs.uToast.show({
+						title: '正确词错误词不能超过8个字',
+						type: 'warning',
+					})
+				}else{
+					let reg = /^[0-9]+$/
+					if (reg.test(this.thewrongword)) {
+						this.$refs.uToast.show({
+							title: '错误词不能为纯数字',
+							type: 'warning',
 						})
-					} else {
-						uni.showToast({
-							title: '正确值不能为空',
-							duration: 2000
-						});
-						return
+					}else{
+						if (this.thewrongword) {
+							if (this.reswrongword) {
+								let parames = {
+									customerId: this.customerId,
+									cupid: this.luyinList[this.csdFileindex].id,
+									wrongWord: this.thewrongword, //错误词
+									correctWord: this.reswrongword, //正确词
+									translateHtmlContent: this.messagelisy,
+						
+								}
+								this.isshow2 = false;
+						
+						
+								let sas = this.textItself.replace(this.thewrongword, this.reswrongword)
+								this.dialogList[this.argtextindex1].message[this.argtextindex2].onebest = sas
+						
+								this.dialogList.forEach(res => {
+									res.message.forEach(asd => {
+										asd.isshow = false;
+									})
+								})
+								this.$u.post("/corpus/addCorrectWord", parames).then(data => {
+									this.thewrongword = "";
+									this.reswrongword = "";
+								})
+							} else {
+								uni.showToast({
+									title: '正确值不能为空',
+									duration: 2000
+								});
+								return
+							}
+						} else {
+							uni.showToast({
+								title: '错误词不能为空',
+								duration: 2000
+							});
+							return
+						}
 					}
-				} else {
-					uni.showToast({
-						title: '错误词不能为空',
-						duration: 2000
-					});
-					return
 				}
 			},
+			
 			//取消加入常错词
 			Cancelout() {
 				this.isshow2 = false;
@@ -803,8 +823,13 @@
 			},
 			//加入长错词
 			Oftenthewrongword() {
+				this.isNum = false;
 				this.reswrongword = "";
 				this.isshow2 = true;
+				let reg = /^[0-9]+$/
+				if (reg.test(this.thewrongword)) {
+					this.isNum = true
+				}
 			},
 			//长按对话
 			changanxiaoguo(item, index, i) {

pages/mine/details2.vue

@@ -1566,7 +1566,7 @@
 									wrongWord: this.thewrongword, //错误词
 									correctWord: this.reswrongword, //正确词
 									translateHtmlContent: this.messagelisy,
-					
+									id:uni.getStorageSync('buildingID').id
 								}
 								this.isshow2 = false;
 					
@@ -1742,10 +1742,10 @@
 			},
 			// 获取评分
 			getRatelist() {
-				if (this.ratelist.length == 0) {
-					uni.showLoading({
-						title: '加载中'
-					});
+				// if (this.ratelist.length == 0) {
+				// 	uni.showLoading({
+				// 		title: '加载中'
+				// 	});
 					this.$u.get("/customer/findzkMByCusId", {
 						cusId: this.customerId
 					}).then(res => {
@@ -1813,7 +1813,7 @@
 							uni.hideLoading();
 						}, 1000);
 					})
-				}
+				// }
 			},
 
 			//--------------------------------- 获取转义后的对话结果

pages/mine/registerForm.vue

@@ -88,11 +88,16 @@
 				<text class="books" @click="openModel">《{{tit}}》</text>
 			</view>
 		</view>
-		<u-modal v-model="modelShow" :title="tit" width="720rpx" :mask-close-able="true" :show-confirm-button="false">
-			<view class="slot-content" style="padding:0 20rpx;">
+		<u-modal class="aaa" v-model="modelShow" :title="tit" width="720rpx" :mask-close-able="true" :show-confirm-button="false">
+			<view class="bbb">
 				<u-icon class="close" @click="readOk" name="close-circle" color="#CCCCCC" size="60"></u-icon>
+			</view>
+			
+			<view class="slot-content" style="padding:0 20rpx;height: 800rpx;overflow-y: auto;">
 				<view class="cont">
-					<rich-text :nodes="content"></rich-text>
+					<scroll-view style="height: 800rpx;" scroll-y="true">
+						<rich-text :nodes="content"></rich-text>
+					</scroll-view>
 				</view>
 			</view>
 		</u-modal>
@@ -298,17 +303,15 @@
 </script>
 <style lang="scss" scoped>
 	/deep/ .u-model-title{
-		padding-top: 0 !important;
+		padding-top: 0px !important;
+		padding:48rpx 0 24rpx !important;
 	}
-	.slot-content{
+	.aaa{
 		position: relative;
-		.close{
+		.bbb{
 			position: absolute;
-			top: 0;
-			right: 0;
-		}
-		.cont{
-			padding: 80rpx 0;
+			top: 8rpx;
+			right: 8rpx;
 		}
 	}
 	.cented-box {