From b51e4e6ee7f14bde6b4f04f81164fd1ab96159cf Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 9 Apr 2020 17:22:00 +0800
Subject: [PATCH] no message

---
 components/tag/index.wxss         |  2 +-
 pages/mall/order-info/index.wxml  |  2 +-
 pages/mall/order-info/index.wxss  |  2 +-
 pages/mall/search-list/index.js   |  4 ++--
 pages/mall/search-list/index.wxml |  4 ++--
 pages/mall/shops/index.wxml       | 10 +++++-----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/tag/index.wxss b/components/tag/index.wxss
index 1a12a1d..f15e2ac 100644
--- a/components/tag/index.wxss
+++ b/components/tag/index.wxss
@@ -20,7 +20,7 @@
   font-size: 26rpx;
   transition: all .3s cubic-bezier(.215,.61,.355,1);
   opacity: 1;
-  margin-right: 16rpx;
+  margin-right: 24rpx;
   cursor: pointer;
   white-space: nowrap
 }
diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml
index e1bb716..3855cab 100644
--- a/pages/mall/order-info/index.wxml
+++ b/pages/mall/order-info/index.wxml
@@ -13,7 +13,7 @@
 	<view class="bg-white flex flex-justify" style="padding:8rpx 32rpx 0rpx 32rpx">
 		<view class="flex flex-center">
 			<view class="detail-price">￥{{orderInfo.price}}</view>
-			<view class="text-gray" style="font-size:12px;margin-left:48rpx">库存{{orderInfo.stockNumber}}件</view>
+			<view class="text-gray" style="font-size:12px;margin-left:48rpx">库存：{{orderInfo.stockNumbe + orderInfo.unit}}</view>
 		</view>
 		<view class="flex flex-center">
 			<view class="text-gray" style="font-size:12px;margin-right:24rpx">{{orderInfo.viewNum}}  浏览</view>
diff --git a/pages/mall/order-info/index.wxss b/pages/mall/order-info/index.wxss
index f599e63..4292b90 100644
--- a/pages/mall/order-info/index.wxss
+++ b/pages/mall/order-info/index.wxss
@@ -8,7 +8,7 @@
 }
 
 .detail-price {
-  font-size: 14px;
+  font-size: 16px;
   font-family: DINAlternate-Bold, DINAlternate;
   font-weight: bold;
   color: rgba(255, 66, 43, 1);
diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js
index af530bb..e752958 100644
--- a/pages/mall/search-list/index.js
+++ b/pages/mall/search-list/index.js
@@ -116,7 +116,7 @@ Page({
         var num = this.data.form.pageNum
         var finished = this.data.form.pageNum >= result.data.pages
         var strList = this.data.rearchStringList
-        if(strList.indexOf(this.data.form.name) < 0){
+        if(!util.isEmpty(this.data.form.name) && strList.indexOf(this.data.form.name) < 0){
           strList.splice(0, 0, this.data.form.name)
         }
         this.setData({
@@ -128,7 +128,7 @@ Page({
         })
       } else {
         var strList = this.data.rearchStringList
-        if(strList.indexOf(this.data.form.name) < 0){
+        if(!util.isEmpty(this.data.form.name) && strList.indexOf(this.data.form.name) < 0){
           strList.splice(0, 0, this.data.form.name)
         }
         this.setData({ 
diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml
index 39dde90..47848cd 100644
--- a/pages/mall/search-list/index.wxml
+++ b/pages/mall/search-list/index.wxml
@@ -7,7 +7,7 @@
 <view class="cu-bar bg-white search fixed" style="top:{{CustomBar}}px;">
 	<view class="search-form" style="border-radius: 12rpx">
 		<text class="cuIcon-search" style="font-size: 12px"></text>
-		<input value="{{form.name}}" focus="{{focus}}" placeholder="输入搜索的关键词" confirm-type="search" bindinput="bindSearch" bindfocus="bindFocus"></input>
+		<input value="{{form.name}}" focus="{{focus}}" placeholder="请输入要搜索的商品" confirm-type="search" bindinput="bindSearch" bindfocus="bindFocus"></input>
 		<text class="cuIcon-roundclose" hidden="{{form.name.length === 0}}" style="font-size: 17px" catchtouchstart="clearInput"></text>
 	</view>
 	<view class="action">
@@ -32,7 +32,7 @@
 		<image class="img-empty" src="/assets/image/list_empty.png"></image>
 		<view class="text-empty">暂无数据</view>
 	</view>
-	<scroll-view scroll-y style="height:{{height - 100}}rpx;padding: 0rpx 24rpx" wx:else bindscrolltolower="fetchTaskList">
+	<scroll-view scroll-y style="height: 100%;padding: 0rpx 24rpx" wx:else bindscrolltolower="fetchTaskList">
 		<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{taskList}}" wx:key="pageIndex">
 			<view class="flex content" wx:for="{{pageItem}}" wx:key="index" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
 				<wux-image width="{{120}}" height="{{120}}" wux-class="page-icon" src="{{item.litimgUrl}}" mode="{{aspectFill}}">
diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml
index f5d3c86..e423987 100644
--- a/pages/mall/shops/index.wxml
+++ b/pages/mall/shops/index.wxml
@@ -8,7 +8,7 @@
 	<view class="load-spinner text-gray" />
 	<view class="text-empty" style="margin-top:48rpx">加载中...</view>
 </view>
-<view class="flex list-empty" wx:if="{{!taskList.length && !cheapList.length}}" style="height:{{height}}rpx">
+<view class="flex list-empty" wx:elif="{{!taskList.length && !cheapList.length}}" style="height:{{height}}rpx">
 	<image class="img-empty" src="/assets/image/list_empty.png"></image>
 	<view class="text-empty">暂无数据</view>
 </view>
@@ -16,10 +16,10 @@
 	<view class="cu-bar bg-white search fixed" style="top:{{CustomBar}}px;">
 		<view class="search-form" style="border-radius: 12rpx" bindtap="searchList">
 			<text class="cuIcon-search"></text>
-			<input type="text" disabled="true" placeholder="输入搜索的关键词" confirm-type="search"></input>
+			<input type="text" disabled="true" placeholder="请输入要搜索的商品" confirm-type="search"></input>
 		</view>
 	</view>
-	<scroll-view scroll-y style="height:{{height - 100}}rpx;margin-top: 100rpx;padding: 0rpx 24rpx" bindscrolltolower="fetchTaskList">
+	<scroll-view scroll-y style="height:100%;margin-top: 100rpx;padding: 0rpx 24rpx" bindscrolltolower="fetchTaskList">
 		<image src="https://image.weilanwl.com/img/4x3-1.jpg" class="swiper-image" mode="aspectFill" lazy-load="{{true}}" style="margin-top:24rpx"></image>
 		<view wx:if="{{cheapList.length}}">
 			<view class="flex nav-li">
@@ -41,7 +41,7 @@
 					<view class="page-num" style="height:100rpx">{{item.summary}}</view>
 					<view class="flex flex-justify" style="align-items:flex-end">
 						<view class="page-price">￥{{item.price}}</view>
-						<view class="page-stock" style="margin-bottom:6rpx">库存：{{item.stockNumber}}件</view>
+						<view class="page-stock" style="margin-bottom:6rpx">库存：{{item.stockNumber}}{{item.unit}}</view>
 						<button class="cu-btn bg-red round shadow-blur page-btn">立即抢购</button>
 					</view>
 				</view>
@@ -69,7 +69,7 @@
 					<view class="page-num" style="height:100rpx">{{item.summary}}</view>
 					<view class="flex flex-justify" style="align-items:flex-end">
 						<view class="page-price">￥{{item.price}}</view>
-						<view class="page-stock" style="margin-bottom:6rpx">库存:{{item.stockNumber}}件</view>
+						<view class="page-stock" style="margin-bottom:6rpx">库存:{{item.stockNumber}}{{item.unit}}</view>
 						<button class="cu-btn bg-red round shadow-blur page-btn">立即抢购</button>
 					</view>
 				</view>