chenrui 4 rokov pred
rodič
commit
1808e3f5a6

+ 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">

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 5 - 1
unpackage/dist/dev/app-plus/app-service.js


+ 11 - 20
unpackage/dist/dev/app-plus/app-view.js

@@ -18992,23 +18992,14 @@ var render = function() {
                   }),
                   1
                 ),
-                _vm._$g("10-" + $30, "i")
-                  ? _c(
-                      "v-uni-view",
-                      {
-                        staticClass: _vm._$g("10-" + $30, "sc"),
-                        attrs: { _i: "10-" + $30 }
-                      },
-                      [_vm._v("评论:" + _vm._$g("10-" + $30, "t0-0"))]
-                    )
-                  : _c(
-                      "v-uni-view",
-                      {
-                        staticClass: _vm._$g("11-" + $30, "sc"),
-                        attrs: { _i: "11-" + $30 }
-                      },
-                      [_vm._v("评论:--")]
-                    )
+                _c(
+                  "v-uni-view",
+                  {
+                    staticClass: _vm._$g("10-" + $30, "sc"),
+                    attrs: { _i: "10-" + $30 }
+                  },
+                  [_vm._v("评论:" + _vm._$g("10-" + $30, "t0-0"))]
+                )
               ],
               1
             )
@@ -19016,14 +19007,14 @@ var render = function() {
           1
         )
       }),
-      _vm._$g(12, "i")
+      _vm._$g(11, "i")
         ? _c(
             "v-uni-view",
             {
               staticStyle: { width: "100%", "padding-top": "10vh" },
-              attrs: { _i: 12 }
+              attrs: { _i: 11 }
             },
-            [_c("u-empty", { attrs: { _i: 13 } })],
+            [_c("u-empty", { attrs: { _i: 12 } })],
             1
           )
         : _vm._e()

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov