فهرست منبع

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

lilei 4 سال پیش
والد
کامیت
31845f6eed

+ 1 - 1
pages/organization/organization.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		<!-- 门店列表 -->
-		<view class="list-con">
+		<view class="list-con" :style="{'padding-top': organizationNowList && organizationNowList.length > 0 ? '0upx' : '88upx' }">
 			<view class="list-tit">门店列表</view>
 			<!-- 列表数据 -->
 			<view class="listData-con">

+ 1 - 1
pages/shopTourDetails/shopTourDetails.vue

@@ -11,7 +11,7 @@
 					<view class="item-tit">{{item.assessTargetName}}</view>
 					<view class="item-main">
 						<view class="item-state">状态:
-							<text :class="item.result == 'PASS' ? 'green' : item.result == 'NOT_PASS' ? 'red' : item.result == 'NOT_WORK' ? 'yellow' : ''">{{item.resultDictValue}}</text>
+							<text :class="item.result == 'PASS' ? 'green' : item.result == 'NOT_PASS' ? 'red' : item.result == 'NOT_WORK' ? 'yellow' : ''">{{item.resultDictValue ? item.resultDictValue : '--'}}</text>
 						</view>
 						<text v-if="item.comments || item.taskTargetPhotoList" class="item-btn" @click="getComments(item)">查看评论</text>
 					</view>

+ 2 - 3
pages/spotCheckDetails/spotCheckDetails.vue

@@ -7,7 +7,7 @@
 						{{item.assessTargetName}}
 					</view>
 				</view>
-				<text :class="['header-r', item.result == 'PASS' ? 'green' : item.result == 'NOT_PASS' ? 'red' : item.result == 'NOT_WORK' ? 'yellow' : '']">{{item.resultDictValue}}</text>
+				<text :class="['header-r', item.result == 'PASS' ? 'green' : item.result == 'NOT_PASS' ? 'red' : item.result == 'NOT_WORK' ? 'yellow' : '']">{{item.resultDictValue ? item.resultDictValue : '状态:--'}}</text>
 			</view>
 			<view class="comment-con">
 				<u-row gutter="16" class="pic-con">
@@ -15,8 +15,7 @@
 						<u-image class="pic" width="100%" height="150upx" :src="pic.photoPath" @click="clickPic(index, ind)"></u-image>
 					</u-col>
 				</u-row>
-				<view class="comment-main" v-if="item.comments">评论:{{item.comments}}</view>
-				<view class="comment-main" v-else>评论:--</view>
+				<view class="comment-main">评论:{{item.comments ? item.comments : '--'}}</view>
 			</view>
 		</view>
 		<view style="width: 100%;padding-top: 10vh;" v-if="list.length == 0">