From e994ee44405a381e07cd624c01d61613bd1b43fe Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 9 Apr 2020 16:17:47 +0800
Subject: [PATCH] Image

---
 components/image/index.wxss       |  7 +++++++
 pages/mall/order-offer/index.json |  3 ++-
 pages/mall/order-offer/index.wxml | 10 ++++++----
 pages/mall/order-offer/index.wxss |  1 -
 pages/mall/shops/index.json       |  1 +
 pages/mall/shops/index.wxml       | 16 +++++++++++-----
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/components/image/index.wxss b/components/image/index.wxss
index 026bb82..6772dfe 100644
--- a/components/image/index.wxss
+++ b/components/image/index.wxss
@@ -8,6 +8,13 @@
 .wux-image--rounded {
   border-radius: 8rpx
 }
+.wux-image--page {
+  border-top-left-radius: 12rpx;
+	border-bottom-left-radius: 12rpx;
+}
+.wux-image--offer {
+  border-radius: 12rpx
+}
 .wux-image--circle {
   border-radius: 50%
 }
diff --git a/pages/mall/order-offer/index.json b/pages/mall/order-offer/index.json
index 7059070..df7728b 100644
--- a/pages/mall/order-offer/index.json
+++ b/pages/mall/order-offer/index.json
@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "wux-dialog": "/components/dialog/index",
-    "wux-button": "/components/button/index"
+    "wux-button": "/components/button/index",
+    "wux-image": "/components/image/index"
   }
 }
\ No newline at end of file
diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml
index 0344f35..59cec9c 100644
--- a/pages/mall/order-offer/index.wxml
+++ b/pages/mall/order-offer/index.wxml
@@ -19,7 +19,7 @@
 	</view>
 	<view wx:else class="header-box flex flex-justify" style="padding:32rpx" bindtap="chooseAddress">
 		<view class="flex flex-center">
-		  <image style="width:30rpx;height:30rpx" src="/assets/image/icon_address.png"></image>
+			<image style="width:30rpx;height:30rpx" src="/assets/image/icon_address.png"></image>
 			<view style="margin-left:18rpx">地址收货选择</view>
 		</view>
 		<text class="cuIcon-right text-gray" style="font-size:18px"></text>
@@ -27,13 +27,15 @@
 
 	<view class="margin-top header-box" style="padding:32rpx">
 		<view class="flex content">
-			<image class="page-icon" src="{{form.litimgUrl}}" lazy-load="{{true}}" mode="aspectFill"></image>
+			<wux-image shape="offer" width="{{60}}" height="{{60}}" src="{{form.litimgUrl}}">
+				<text class="icon--refresher" slot="loading"></text>
+			</wux-image>
 			<view style="flex:1;margin-left:24rpx">
 				<view class="page-name">{{form.name}}</view>
-				<view class="page-num" style="height:100rpx">{{form.summary}}</view>
+				<view class="page-num" style="height:60rpx">{{form.summary}}</view>
 			</view>
 		</view>
-		<view class="flex flex-justify" style="height:60rpx">
+		<view class="flex flex-justify" style="height:60rpx;margin-top:12rpx">
 			<view class="offer-label">商品单价</view>
 			<view class="offer-val">￥{{form.unitPrice}}</view>
 		</view>
diff --git a/pages/mall/order-offer/index.wxss b/pages/mall/order-offer/index.wxss
index 75ba20a..922f454 100644
--- a/pages/mall/order-offer/index.wxss
+++ b/pages/mall/order-offer/index.wxss
@@ -35,7 +35,6 @@
 .page-icon {
   height: 120rpx;
   width: 120rpx;
-  border-radius: 12rpx;
 }
 
 .page-name {
diff --git a/pages/mall/shops/index.json b/pages/mall/shops/index.json
index 5d9b2c2..9a47422 100644
--- a/pages/mall/shops/index.json
+++ b/pages/mall/shops/index.json
@@ -3,6 +3,7 @@
     "refresh-view": "/components/refresh-view/index",
     "wux-button": "/components/button/index",
     "wux-tab": "/components/tab/index",
+    "wux-image": "/components/image/index",
     "wux-divider": "/components/divider/index"
   }
 }
\ No newline at end of file
diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml
index 2014cbb..28d8f53 100644
--- a/pages/mall/shops/index.wxml
+++ b/pages/mall/shops/index.wxml
@@ -29,11 +29,14 @@
 				<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="{{'https://goss.veer.com/creative/vcg/veer/800water/veer-305105618.jpg'}}" lazy-load="{{true}}" mode="aspectFill"></image>
-				<view style="flex:1;padding:16rpx">
+				<!-- <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>
+				<view style="flex:1;padding:16rpx 20rpx">
 					<view class="flex flex-justify">
 						<view class="page-name">{{item.name}}</view>
-						<view class="page-num">{{item.viewNum}}  浏览</view>
+						<view class="page-num">{{item.viewNum}} 浏览</view>
 					</view>
 					<view class="page-num" style="height:100rpx">{{item.summary}}</view>
 					<view class="flex flex-justify" style="align-items:flex-end">
@@ -54,8 +57,11 @@
 		</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="{{'https://goss.veer.com/creative/vcg/veer/800water/veer-305105618.jpg'}}" lazy-load="{{true}}" mode="aspectFill"></image>
-				<view style="flex:1;padding:16rpx">
+				<!-- <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>
+				<view style="flex:1;padding:16rpx 20rpx">
 					<view class="flex flex-justify">
 						<view class="page-name">{{item.name}}</view>
 						<view class="page-num">已拼{{item.soldNum}}件</view>