diff --git a/components/diy_searchbox/diy_searchbox.js b/components/diy_searchbox/diy_searchbox.js
index ef93b4c..73443ef 100644
--- a/components/diy_searchbox/diy_searchbox.js
+++ b/components/diy_searchbox/diy_searchbox.js
@@ -17,7 +17,7 @@ Component({
     someData: {},
 	first:1,
 	inputShowed:1,
-	inputval:'在店铺内搜索',
+	inputval:'请输入商品关键字',
 	keyword:'',
 	
 	searchRecord: [],
diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml
index e5c506b..2fe1238 100644
--- a/components/diy_searchbox/diy_searchbox.wxml
+++ b/components/diy_searchbox/diy_searchbox.wxml
@@ -6,7 +6,7 @@
 		<view bindtap='click_sear'  class="s1_gk_a1" wx:if="{{first}}">
 		   <view class='s_ge'>
 			   <image src='{{imghost}}/miniapp/images/search.png'></image>
-		    	<text>在店铺内搜索</text>
+		    	<text>请输入商品关键字</text>
 		   </view>
 		</view>
 		<!-- 响应搜索事件 -->
@@ -39,7 +39,7 @@
 	    <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
 	        <navigator wx:if="{{first}}" bindtap='click_sear' class="s1_gk_a2 flex" style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}}'>
 	           <text class="iconfont icon-search" style="font-size: 40rpx;"></text>
-	           <text>在店铺内搜索</text>
+	           <text>请输入商品关键字</text>
 	        </navigator>
 			<view wx:else class="s1_gk_a2" style='color:{{object.word_color?object.word_color:"#fff"}}'>
 					<!-- <view class="pr"> -->
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index bd3461c..b094f55 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -16,7 +16,7 @@
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays &&  item.validDays!='0'?item.validDays:'不限'}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
@@ -40,7 +40,7 @@
 					<view class="flex fdc space-bt f1 pdl20">
 						<view>
 							<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-							<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:'不限'}}</view>
+							<view class="fs24 c7b">有效天数：{{item.validDays  && item.validDays!='0'?item.validDays:'不限'}}</view>
 						</view>
 						<view class="flex space-bt ali-c">
 							<view class="price">{{item.money}}</view>
@@ -73,7 +73,7 @@
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays && item.validDays!='0'?item.validDays:'不限'}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 0f69613..ef023cf 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -131,11 +131,11 @@
 					<view class="search-img left">
 						<image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
 					</view>
-					<input bindfocus="goseach" class="search-cont" placeholder="搜索店铺商品" type="text"></input>
+					<input bindfocus="goseach" class="search-cont" placeholder="输入商品关键字" type="text"></input>
 				</view> -->
       <!-- 搜索框 -->
       <view class="search-container f1">
-        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>输入商品关键字</view>
       </view>
       <view class="pdl30" bindtap="getScancode">
         <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
@@ -398,7 +398,7 @@
 
       <!-- 搜索框 -->
       <view class="search-container f1">
-        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>请输入商品关键字</view>
       </view>
       <view class="pdl30" bindtap="getScancode">
         <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 7f9447e..46542dd 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -21,7 +21,7 @@
 	<view class="pd20 flex ai-center jc_sb search_fixed">
 		<!-- 搜索框 -->
 		<view class="search-box f1">
-			<view hover-class="none" data-url="/pages/goods/search/search?ladder_id={{ladder_id}}" bindtap="go_url"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+			<view hover-class="none" data-url="/pages/goods/search/search?ladder_id={{ladder_id}}" bindtap="go_url"><text class="iconfont icon-sousuo pdr10"></text>请输入商品关键字</view>
 		</view>
 		<!-- 单列/双列 显示切换 -->
 		<text class="iconfont {{isToggle ? 'icon-fenlie':'icon-fenxiang'}} pdl30 fs36" bindtap="bindToggleDisplay"></text>