Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

operatingCompany/pages/shop/shopIndex/index.vue

@@ -106,7 +106,7 @@
 						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
 						<view class="type" v-if="item.State == 1">待提交</view>
 						<view class="type" v-if="item.State == 2">待作业</view>
-						<view class="type" v-if="item.State == 3">待点评</view>
+						<view class="type" v-if="item.State == 3">待运营经理点评</view>
 						<view class="type" v-if="item.State == 4">待回复</view>
 						<view class="type" v-if="item.State == 5">已完成</view>
 
@@ -550,7 +550,7 @@
 		font-size: 28rpx;
 		color: #3C3C3C;
 		font-weight: bold;
-		width: 500rpx;
+		width: 60%;
 	}
 
 	.type {

operatingCompany/pages/shop/shopIndex/reviewsContent.vue

@@ -46,8 +46,21 @@
 				this.userEvaStar=e.value
 			},
 			submit(){
+				if(this.userEvaStar <= 4){
+					if(this.userEvaContent.length <= 10){
+						uni.showToast({
+						    title: '请填写十字以上的评价内容',
+							icon:'none',
+						    duration: 2000,
+						});
+						return
+					}
+				}
 				
-				uni.showLoading({ });
+				
+				uni.showLoading({
+					title:'上传中'
+				});
 				
 				this.$http('accompany/SuperCheckSheet/userEva', {
 					sheetID:this.sheetID,