From 62696b0e92921ee2a7219499f1c9a8e1b8021fc2 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 9 Apr 2020 17:01:14 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/button/index.wxss      |  5 +++--
 pages/mall/order-info/index.wxml  | 13 ++++++++-----
 pages/mall/search-list/index.js   |  2 +-
 pages/mall/search-list/index.wxml |  5 +++--
 pages/mall/shops/index.wxml       | 14 +++++++-------
 pages/mall/shops/index.wxss       |  1 +
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/components/button/index.wxss b/components/button/index.wxss
index 9378f28..3625172 100644
--- a/components/button/index.wxss
+++ b/components/button/index.wxss
@@ -14,7 +14,7 @@
   min-width: 104rpx;
   min-height: 88rpx!important;
   border: none;
-  border-radius: 8rpx;
+  border-radius: 12rpx;
   vertical-align: middle;
   text-align: center;
   text-overflow: ellipsis;
@@ -344,7 +344,8 @@
 .wux-button--stable.wux-button--outline {
   border-color: #b2b2b2!important;
   background-color: transparent!important;
-  color: #b2b2b2!important
+  color: #b2b2b2!important;
+  padding:2rpx 24rpx 0rpx 24rpx;
 }
 .wux-button--stable.wux-button--clear.wux-button--hover {
   background-color: rgba(0,0,0,0)!important;
diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml
index 1ea2a01..e1bb716 100644
--- a/pages/mall/order-info/index.wxml
+++ b/pages/mall/order-info/index.wxml
@@ -7,7 +7,7 @@
 <view wx:if="{{orderInfo}}">
 	<swiper class="screen-swiper round-dot" style="min-height:400rpx" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
 		<swiper-item wx:for="{{orderInfo.imgList}}" wx:key="index" bindtap="viewImage" data-url="{{orderInfo.imgList[index]}}">
-			<image src="{{item}}}" mode='aspectFill'></image>
+			<image src="{{item}}" mode='aspectFill'></image>
 		</swiper-item>
 	</swiper>
 	<view class="bg-white flex flex-justify" style="padding:8rpx 32rpx 0rpx 32rpx">
@@ -35,10 +35,13 @@
 			</view>
 		</view>
 	</view>
-
-	<view class="bg-white flex flex-justify" style="height:100rpx;border-top:1px solid #D0D0D0;padding: 0rpx 32rpx">
+  
+	<view class="bg-white">
+		<view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view>
+	</view>
+	<view class="bg-white flex flex-justify" style="height:100rpx;;padding: 0rpx 32rpx">
 		<view class="text-gray" style="font-size:14px">购买数量</view>
-		<wux-input-number default-value="{{form.number}}" disabled="{{false}}" color="stable" slot="footer" min="{{1}}" max="{{10}}" bind:change="onNumChange" />
+		<wux-input-number default-value="{{form.number}}" disabled="{{false}}" color="stable" min="{{1}}" max="{{orderInfo.stockNumber}}" bind:change="onNumChange" />
 	</view>
 
 	<view class="bg-white" style="padding:32rpx;margin-top:32rpx">
@@ -46,7 +49,7 @@
 		<view class="text-gray" style="font-size:14px;margin-top:32rpx">{{orderInfo.summary}}</view>
 	</view>
 	<view class="bg-white">
-		<view style="height:1px;width:100%;background-color:#D0D0D0;margin-left:32rpx"></view>
+		<view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view>
 	</view>
 	<view class="bg-white" style="padding:32rpx;">
 		<view class="text-black" style="font-size:16px">送货说明</view>
diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js
index e7ab9b5..af530bb 100644
--- a/pages/mall/search-list/index.js
+++ b/pages/mall/search-list/index.js
@@ -30,7 +30,7 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      height: app.globalData.fragmentHeight - 100,
+      height: app.globalData.fragmentHeight,
       CustomBar: app.globalData.CustomBar,
     })
     var that = this
diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml
index 57bbade..39dde90 100644
--- a/pages/mall/search-list/index.wxml
+++ b/pages/mall/search-list/index.wxml
@@ -5,13 +5,14 @@
 </cu-custom>
 
 <view class="cu-bar bg-white search fixed" style="top:{{CustomBar}}px;">
-	<view class="search-form round">
+	<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>
 		<text class="cuIcon-roundclose" hidden="{{form.name.length === 0}}" style="font-size: 17px" catchtouchstart="clearInput"></text>
 	</view>
 	<view class="action">
-		<button class="cu-btn bg-gradual-green shadow-blur round" bindtap="startSearch">搜索</button>
+	  <wux-button outline type="stable" size="small" bind:click="startSearch">搜索</wux-button>
+		<!-- <button class="cu-btn line-black round" bindtap="startSearch">搜索</button> -->
 	</view>
 </view>
 
diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml
index 28d8f53..f5d3c86 100644
--- a/pages/mall/shops/index.wxml
+++ b/pages/mall/shops/index.wxml
@@ -14,7 +14,7 @@
 </view>
 <view wx:else>
 	<view class="cu-bar bg-white search fixed" style="top:{{CustomBar}}px;">
-		<view class="search-form round" bindtap="searchList">
+		<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>
 		</view>
@@ -29,10 +29,10 @@
 				<view class="nav-title">限时限量 售完即止</view>
 			</view>
 			<view class="flex content" wx:for="{{cheapList}}" wx:key="index" data-index="{{index}}" bindtap="lookCheapItem">
-				<!-- <image class="page-icon" src="{{item.litimgUrl}}" lazy-load="{{true}}" mode="aspectFill"></image> -->
-				<wux-image width="{{120}}" height="{{120}}" wux-class="page-icon" src="{{item.litimgUrl}}" mode="{{aspectFill}}">
+				<image class="page-icon" src="{{item.litimgUrl}}" lazy-load="{{true}}" mode="aspectFill"></image>
+				<!-- <wux-image width="{{119}}" height="{{119}}" wux-class="page-icon" src="{{item.litimgUrl}}" mode="{{aspectFill}}">
 					<text class="icon--refresher" slot="loading"></text>
-				</wux-image>
+				</wux-image> -->
 				<view style="flex:1;padding:16rpx 20rpx">
 					<view class="flex flex-justify">
 						<view class="page-name">{{item.name}}</view>
@@ -57,10 +57,10 @@
 		</view>
 		<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="lookGroupItem">
-				<!-- <image class="page-icon" src="{{item.litimgUrl}}" lazy-load="{{true}}" mode="aspectFill"></image> -->
-				<wux-image width="{{120}}" height="{{120}}" wux-class="page-icon" src="{{item.litimgUrl}}" mode="{{aspectFill}}">
+				<image class="page-icon" src="{{item.litimgUrl}}" lazy-load="{{true}}" mode="aspectFill"></image>
+				<!-- <wux-image width="{{120}}" height="{{120}}" wux-class="page-icon" src="{{item.litimgUrl}}" mode="{{aspectFill}}">
 				  <text class="icon--refresher" slot="loading"></text>
-				</wux-image>
+				</wux-image> -->
 				<view style="flex:1;padding:16rpx 20rpx">
 					<view class="flex flex-justify">
 						<view class="page-name">{{item.name}}</view>
diff --git a/pages/mall/shops/index.wxss b/pages/mall/shops/index.wxss
index 5fc1a13..ffcf4b6 100644
--- a/pages/mall/shops/index.wxss
+++ b/pages/mall/shops/index.wxss
@@ -76,6 +76,7 @@
 }
 
 .content {
+	margin-top: 24rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 6px;
 }