From 7ec1bb7cb403cfb9fb86d8016e822f0b7a0fd769 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Fri, 16 Apr 2021 16:41:09 +0800
Subject: [PATCH] 上下架商品样式修改

---
 packageA/pages/distribution/goods/goods.wxml | 22 +++++++++++-----------
 packageA/pages/distribution/goods/goods.wxss | 11 +++++++++--
 packageA/pages/distribution/shop/shop.wxss   |  2 ++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index 40f9a57..f1fdcbd 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -111,9 +111,9 @@
 							          <view class="flex xc-wc ai-center">
 							            <!-- <view class="fs24">￥</view> -->
 							            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
-							            <view class="card_bg ellipsis-1">
-							              <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}"></image>
-							              <text class="card_name">{{card_name}}</text>
+							            <view class="card_bg">
+							              <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></image>
+							              <text class="card_name ellipsis-1">{{card_name}}</text>
 							            </view>
 							          </view>
 							        </view>
@@ -162,9 +162,9 @@
 																	<view class="price flex ai-center">
 																	  <!-- <view class="fs22">￥</view> -->
 																	  <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-																	  <view class="card_bg ellipsis-1">
-																	    <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></ image>
-																			<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+																	  <view class="card_bg">
+																	    <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></ image>
+																			<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
 																		</view>
 																	</view>
 							        </view>
@@ -252,9 +252,9 @@
 							          <view class="flex xc-wc ai-center">
 							            <!-- <view class="fs24">￥</view> -->
 							            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
-							            <view class="card_bg ellipsis-1">
+							            <view class="card_bg">
 							              <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></image>
-							              <text class="card_name">{{card_name}}</text>
+							              <text class="card_name ellipsis-1">{{card_name}}</text>
 							            </view>
 							          </view>
 							        </view>
@@ -303,9 +303,9 @@
 													<view class="price flex ai-center">
 														<!-- <view class="fs22">￥</view> -->
 														<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-														<view class="card_bg ellipsis-1">
-															<image src="{{url + 'miniapp/images/plus/dj_icon.png'}}"></ image>
-															<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+														<view class="card_bg">
+															<image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></ image>
+															<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
 														</view>
 													</view>
 							        </view>
diff --git a/packageA/pages/distribution/goods/goods.wxss b/packageA/pages/distribution/goods/goods.wxss
index d13808e..13f9536 100644
--- a/packageA/pages/distribution/goods/goods.wxss
+++ b/packageA/pages/distribution/goods/goods.wxss
@@ -337,10 +337,10 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
 .card_bg {
 	box-sizing: border-box;
   padding: 2rpx 10rpx;
-  /* height: 28rpx; */
+  height: 28rpx;
   border-radius: 26rpx;
   font-size: 20rpx;
-  /* line-height: 28rpx; */
+  line-height: 28rpx;
 	max-width: 200rpx;
   background: #333;
   color: #fff;
@@ -351,5 +351,12 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
 	top: -4rpx; */
 }
 
+.card_bg image {
+  width: 19rpx;
+  height: 19rpx;
+  margin-right: 8rpx;
+}
+
+
 
 
diff --git a/packageA/pages/distribution/shop/shop.wxss b/packageA/pages/distribution/shop/shop.wxss
index 945bd77..6842380 100644
--- a/packageA/pages/distribution/shop/shop.wxss
+++ b/packageA/pages/distribution/shop/shop.wxss
@@ -618,3 +618,5 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
 
 
 
+
+
--
libgit2 0.21.4