From 3efcd04c6eb3fe4a36bdf6b2701d4d8e17f1af7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 23 May 2023 10:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/CommodityDetails/CommodityDetails.vue | 12 ++---
 pages/ProjectDetails/ProjectDetails.vue     |  5 +-
 pages/integral/integral.vue                 |  5 +-
 pages/nursestation/nursestation.vue         | 53 ++++++++-------------
 4 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 2915e92..6e23d85 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -2,11 +2,8 @@
 	<view class="app">
 		<u-swiper :list="info" height="750" style='background-size: 100%;'></u-swiper>
 		<view class="Commodity common">
-			<view class="name" v-if="goodsDetailslist.goodsName">
-				{{goodsDetailslist.goodsName}}
-			</view>
-			<view class="name" v-else>
-				暂无
+			<view class="name">
+				{{goodsDetailslist.goodsName || '暂无'}}
 			</view>
 			<view class="price">
 				￥{{goodsPrice}}
@@ -63,10 +60,7 @@
 						<image :src="updata.img" mode=""></image>
 					</view>
 					<view class="title" v-if="goodsDetailslist.goodsName">
-						{{goodsDetailslist.goodsName}}
-					</view>
-					<view class="title" v-else>
-						暂无
+						{{goodsDetailslist.goodsName||'暂无'}}
 					</view>
 					<view class="prices">
 						<span class="price">
diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue
index 4424c05..d104584 100644
--- a/pages/ProjectDetails/ProjectDetails.vue
+++ b/pages/ProjectDetails/ProjectDetails.vue
@@ -17,9 +17,8 @@
 		</swiper>
 		<!-- <u-swiper v-if="lbinfo" :list="lbinfo" height="350" style='background-size: 100%;' mode='none'></u-swiper> -->
 		<view class="item">
-			<view class="text" v-if='list.nurseItemName'>{{list.nurseItemName}}
-			</view>
-			<view class="text" v-else>暂无
+			<view class="text" v-if='list.nurseItemName'>
+				{{list.nurseItemName||'暂无'}}
 			</view>
 			<!-- <view class="pingfen">
 			<u-rate :count="5" value="2"></u-rate>
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index d1fd8b3..ccc85e7 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -106,10 +106,7 @@
 						<image :src="goodsitem.goodsPictureUrl" mode=""></image>
 					</view>
 					<view class="title" v-if="goodsitem.goodsName">
-						{{goodsitem.goodsName}}
-					</view>
-					<view class="title" v-else>
-						暂无
+						{{goodsitem.goodsName||'暂无'}}
 					</view>
 					<view class="prices">
 						<span class="price">
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index f0d3d17..8db441b 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -30,58 +30,43 @@
 		<!-- <u-swiper v-if="lbinfo" :list="lbinfo" height="450" style='background-size: 100%;' mode='none'></u-swiper> -->
 		<view class="content">
 			<view class="righttext">
-				<view class="title" v-if="list.nurseStationName">
-					{{list.nurseStationName}}
-				</view>
-				<view class="title" v-else>
-					暂无
+				<view class="title">
+					{{list.nurseStationName||'暂无'}}
 				</view>
 				<view class="time">
-					<view class="text" v-if="list.businessStatus">
-						{{list.businessStatus}}
+					<view class="text">
+						{{list.businessStatus||' '}}
 					</view>
-					<view class="timeday" v-if="list.openingHoursDescribe">
-						{{list.openingHoursDescribe}}
+					<view class="timeday">
+						{{list.openingHoursDescribe||' '}}
 					</view>
-					<view class="texttime">
-						<view class="" v-if="list.morningOpenStartTime">
+					<view class="texttime" v-show="list.morningOpenStartTime">
+						<view class="">
 							上午：{{list.morningOpenStartTime}}-{{list.morningOpenEndTime}}
 						</view>
-						<view class="" v-if="list.afternoonOpenStartTime">
+						<view class="">
 							下午：{{list.afternoonOpenStartTime}}-{{list.afternoonOpenEndTime}}
 						</view>
 					</view>
 				</view>
-				<view class="configuration" v-if="nurseStationLabelList">
+				<view class="configuration" v-show="nurseStationLabelList">
 					<view class="text" v-for="(item,index) in nurseStationLabelList" :key="index">
 						{{item.labelDescription}}
 					</view>
 				</view>
-				<view class="address" v-if="list.address" @tap="goMap">
+				<view class="address" v-show="list.address" @tap="goMap">
 					<image src="../../static/locatinsmall.png" mode=""></image>
 					<view class="text">
-						{{list.address}}
+						{{list.address||'暂无'}}
 					</view>
-					<view class="distance" v-if="list.distance">
+					<view class="distance" v-show="list.distance">
 						{{list.distance}}KM
 					</view>
 				</view>
-				<view class="address" v-else>
-					<image src="../../static/locatinsmall.png" mode=""></image>
-					<view class="text">
-						暂无
-					</view>
-				</view>
-				<view class="address" v-if="list.dutyPhone" style="margin: 20rpx 0 0 33rpx;" @tap='gophone'>
+				<view class="address" v-show="list.dutyPhone" style="margin: 20rpx 0 0 33rpx;" @tap='gophone'>
 					<image src="../../static/phone.png" mode=""></image>
 					<view class="text">
-						{{list.dutyPhone}}
-					</view>
-				</view>
-				<view class="address" v-else style="margin: 20rpx 0 0 33rpx">
-					<image src="../../static/phone.png" mode=""></image>
-					<view class="text">
-						暂无
+						{{list.dutyPhone||'暂无'}}
 					</view>
 				</view>
 			</view>
@@ -94,7 +79,7 @@
 				</view>
 				<u-tabs v-if="choicetab==false" :list="tabList" :current="classifycurrent" @change="change">
 				</u-tabs>
-				<view class="" v-if="servelist.length>0&&choicetab==false" style="margin:0">
+				<view class="" v-show="servelist.length>0&&choicetab==false" style="margin:0">
 					<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'
 						@click.stop='goProjectDetails(item)'>
 						<image :src="item.itemPictureUrl"></image>
@@ -112,10 +97,10 @@
 						<view class="price">￥{{item.nurseItemPrice==null?'0':item.nurseItemPrice}}</view>
 					</view>
 				</view>
-				<view class="noorder" v-if='servelist.length==0&&choicetab==false'>
+				<view class="noorder" v-show='servelist.length==0&&choicetab==false'>
 					<u-empty mode="list" icon-size='220' text='暂无服务项目'></u-empty>
 				</view>
-				<view class="" v-if="productlist.length>0&&choicetab">
+				<view class="" v-show="productlist.length>0&&choicetab">
 					<view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index">
 						<image :src="item.goodsPictureUrl"></image>
 						<view class="product">{{item.goodsName}}</view>
@@ -126,7 +111,7 @@
 						<view class="price">￥{{item.goodsPrice==null?'0':item.goodsPrice}}</view>
 					</view>
 				</view>
-				<view class="noorder" v-if="productlist.length==0&&choicetab">
+				<view class="noorder" v-show="productlist.length==0&&choicetab">
 					<u-empty mode="list" icon-size='220' text='暂无产品'></u-empty>
 				</view>
 			</view>