1.改bug

operatingCompany/pages/AccountSet/AccountSet.vue

@@ -53,7 +53,9 @@
 			},
 			logOut() {
 				uni.clearStorageSync();
-				uni.navigateBack({
+				uni.navigateTo({
+					url:'../logIn/logIn'
+				})({
 					
 				})
 			},

operatingCompany/pages/entryReport/historyReport.vue

@@ -79,8 +79,7 @@
 
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
-		<!-- 无数据空白页 -->
-		
+		<!-- 无数据空白页 -->
 		<nodata v-if="shopData.length==0"></nodata>
 
 		<timeChose ref="timepop" @returnDate="returnDate" :isShow="timeShow"></timeChose>

operatingCompany/pages/shop/shopIndex/editcomplete.vue

@@ -73,13 +73,16 @@
 				this.userEvaStar=e.value
 			},
 			submit(){
-				if(this.userEvaContent.length<10){
-					uni.showToast({
-					    title: '请填写十字以上的评价内容',
-						icon:'none',
-					    duration: 2000,
-					})
-					return false;
+				
+				if(this.userEvaStar <= 4){
+					if(this.userEvaContent.length <= 10){
+						uni.showToast({
+						    title: '请填写十字以上的评价内容',
+							icon:'none',
+						    duration: 2000,
+						});
+						return
+					}
 				}
 				uni.showLoading({ });
 				

operatingCompany/pages/shop/shopIndex/index.vue

@@ -51,7 +51,7 @@
 			<!-- 待点评 -->
 			<view class="reviewsBg">
 				<view class="left">
-					<image src="../../../static/img/icon_team.png" class="icon"></image>
+					<image src="../../../static/img/icon_team@2x.png" class="icon"></image>
 					<view class="leftTitle">运营陪伴记录</view>
 				</view>
 
@@ -398,7 +398,7 @@
 
 	.topView {
 		width: 100%;
-		height: 580rpx;
+		height: 575rpx;
 		background-color: #353847;
 		padding-top: 20rpx;
 		/* position: fixed; */

operatingCompany/pages/team/myTeam.vue

@@ -24,7 +24,7 @@
 				<view class="team" @click="goRouter(item)">
 					<!-- 第一行 -->
 					<view class="customer">
-						<view class="name">{{item.name + item.AccountName}}</view>
+						<view class="name">{{item.name}}  {{item.AccountName}}</view>
 						<view class="shopCount" style="color: #FF4F00;">管理门店：{{item.shopCount}}
 							<image src="../../static/img/icon_arrow_go.png"
 								style="width: 12rpx; height: 22rpx; margin-left: 5rpx;"></image>