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

* 'master' of http://47.98.226.240:3000/twt/operatingCompany:
  bug修改
  bug

operatingCompany/pages/entryReport/entered.vue

@@ -501,7 +501,7 @@
 		width: 28rpx;
 		height: 28rpx;
 		position: absolute;
-		bottom: 60rpx;
+		top: 70rpx;
 		right: 40rpx;
 	}
 	.klineName{

operatingCompany/pages/reportManage/reportDetail.vue

@@ -22,17 +22,17 @@
 			  <image src="../../static/img/report_icon_daizuoye@2x.png" mode="" class="topContImg2"></image>
 			  <view class="topContTxt">待作业</view>
 		  </view>
-		  <view class="topCont" v-if="info.state==3&&loginType==1">
+		  <view class="topCont" v-if="info.state==3&&loginType==2">
 			  <image src="../../static/img/report_icon_dianping@2x.png" mode="" class="topContImg3"></image>
 			  <view class="topContTxt">待运营经理点评</view>
 		  </view>
-		  <view class="topCont" v-if="info.state==3&&loginType==2">
+		  <view class="topCont" v-if="info.state==3&&loginType==1">
 		  			  <image src="../../static/img/report_icon_dianping@2x.png" mode="" class="topContImg3"></image>
 		  			  <view class="topContTxt">待点评</view>
 		  </view>
 		  <view class="topCont" v-if="info.state==4">
 			  <image src="../../static/img/report_icon_daihuifu@2x.png" mode="" class="topContImg4"></image>
-			  <view class="topContTxt">待回复</view>
+			  <view class="topContTxt">待店长回复</view>
 		  </view>
 		  <view class="topCont" v-if="info.state==5">
 			  <image src="../../static/img/report_icon_yiwancheng@2x.png" mode="" class="topContImg5"></image>
@@ -99,7 +99,7 @@
 							</view>
 							<view class="itemImgBox" v-if="v.keyType==3">
 								<view  v-for="(itemiMg,i) in v.itemValue.split(',')">
-									<image :src="itemiMg" mode="" class="itemIMg"></image>
+									<image :src="itemiMg" @click="previewImage(itemiMg)" mode="" class="itemIMg"></image>
 								</view>
 								
 							</view>
@@ -117,8 +117,8 @@
 						<view class="suggestLineBottomTxt">预计完成日期:{{item.orderFinishTime.slice(0,item.orderFinishTime.length-8)}}</view>
 						<view class="suggestLineBottomTxt">负责人:{{item.managerName}}</view>
 					</view>
-					<image src="../../static/img/report_weixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==0"></image>
-					<image src="../../static/img/_report_yixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==1"></image>
+					<image src="../../static/img/report_weixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==0&&info.state!=1"></image>
+					<image src="../../static/img/_report_yixiugai@2x.png" mode="" class="exeStateImg" v-if="item.exeState==1&&info.state!=1"></image>
 				    <!-- 作业情况-->
 					<view v-if="item.exeState==1">
 						<view class="remarksLineTxt1">
@@ -154,13 +154,13 @@
 						<view v-if="info.shopEvaOpName">{{info.shopEvaOpName}}</view>
 					</view>
 					<!-- 店主回复 -->
-					<view class="shopEvaReplyBox" v-if="shopEvaReplyContent">
+					<view class="shopEvaReplyBox" v-if="info.shopEvaReplyContent">
 						<view class="shopEvaReplyContent">{{info.shopEvaReplyContent}}</view>
 						<view class="shopEvaReplyTime">{{info.shopEvaReplyTime}}</view>
 					</view>
 				</view>
 				
-				<view class="remarksLine" v-if="lookShow">
+				<view class="remarksLine" v-if="lookShow&&info.userEvaContent">
 					<view class="remarksLineTop">
 						<view class="remarksLineTopTitle">对运营经理的服务评价</view>
 						<view class="remarksLineTopXxbox">
@@ -172,8 +172,8 @@
 					</view>
 					<view class="remarksLineTxt2">{{info.userEvaContent}}</view>
 					<view class="timeBox">
-						<view>{{info.userEvaTime}}</view>
-						<view>{{info.userEvaOpName}}</view>
+						<view v-if="info.userEvaTime">{{info.userEvaTime}}</view>
+						<view v-if="info.userEvaOpName">{{info.userEvaOpName}}</view>
 					</view>
 				</view>
 				
@@ -189,7 +189,6 @@
 		   <button open-type="share">
 			   <view class="shoreDz" @click="shareDz">发送给店长</view>
 		   </button>
-	   		
 	   </view>
 	   <view class="bottom"  v-if="info.state==3&&loginType==1" @click="goremarks">
 	   		<view class="shoreDz">点评</view>
@@ -671,6 +670,7 @@
 	.sectionList{
 		background: #FFFFFF;
 		border-radius: 10rpx;
+		margin-bottom: 20rpx;
 	}
 	.checkName{
 		padding: 30rpx 20rpx;
@@ -747,7 +747,7 @@
 	.ckItemLIne{
 		border: 1px solid #B98B5D;
 		border-radius: 4rpx;
-		padding: 5rpx 10rpx;
+		padding: 2rpx 10rpx;
 		margin-left: 20rpx;
 	}
 	.ckImemBox{
@@ -766,7 +766,8 @@
 		width: 150rpx;
 		height: 150rpx;
 		margin-right: 20rpx;
-		
+		border-radius: 5rpx;
+		margin-top: 10rpx;
 	}
 	.itemImgBox{
 		display: flex;
@@ -825,6 +826,7 @@
 	.remarksLine{
 		background: #FFFFFF;
 		margin-top: 20rpx;
+		padding-bottom: 10rpx;
 	}
 	.remarksLineTop{
 		display: flex;
@@ -837,7 +839,7 @@
 	.remarksLineTxt1{
 		font-size: 28rpx;
 		color: #444444;
-		padding: 28rpx 20rpx;
+		padding: 20rpx 20rpx;
 	}
 	.remarksLineTxt2{
 		font-size: 26rpx;
@@ -848,7 +850,7 @@
 	  display: flex;
 	  justify-content: space-between;
 	  font-size: 26rpx;
-	 padding:10rpx 20rpx;
+	 padding:0rpx 20rpx 20rpx 20rpx;
 	  color: #999999;
 	}
 	.shopEvaReplyBox{

operatingCompany/uni_modules/uni-rate/components/uni-rate/uni-rate.vue

@@ -3,7 +3,7 @@
 		<view
 		    ref="uni-rate"
 		    class="uni-rate"
-			style="margin-left: 10px;"
+			style="margin-left: 5px;"
 		>
 		    <!-- :style="{ 'margin-right': marginNumber + 'px' }"-->
 			<view
@@ -122,7 +122,7 @@
 			margin: {
 				// 星星的间距
 				type: [Number, String],
-				default: 10
+				default: 5
 			},
 			disabled: {
 				// 是否可点击