From 2dd758aab20df625dd806bd68747a7b612caebfb Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Mon, 24 Aug 2020 15:53:22 +0800
Subject: [PATCH] 修改等级卡样式，让它可以显示6个字符

---
 components/goods_list/goods_list.wxss |  6 +++---
 pages/goods/goodsInfo/goodsInfo.wxml  |  4 ++--
 pages/goods/goodsInfo/goodsInfo.wxss  |  4 ++--
 pages/justTest/justTest.wxml          | 29 +----------------------------
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
index 0c7f8dc..a8352bd 100644
--- a/components/goods_list/goods_list.wxss
+++ b/components/goods_list/goods_list.wxss
@@ -173,8 +173,8 @@
   align-items: center;
   border-radius: 26rpx;
   font-size: 19rpx;
-  line-height: 25rpx;
-  max-width: 110rpx;
+  line-height: 1em;
+  /* max-width: 110rpx; */
   background: #333;
   color: #fff;
   justify-content: center;
@@ -184,7 +184,7 @@
 .card_bg image {
   width: 19rpx;
   height: 19rpx;
-  margin-right: 1rpx;
+  margin-right: 8rpx;
 }
 
 .card_bg .card_name {
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index fcd8e8e..6485a4b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -282,7 +282,7 @@
             <view wx:if="{{!card_field }}">
 			   <view class="beauty-makeup-frame flex ai-center">
 				   <view class="left flex ai-center">
-					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
+					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
 							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 							<view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
 					   </view>
@@ -302,7 +302,7 @@
 			<view wx:elif="{{is_near_date && data[card_field]>0}}">
 				    <view class="beauty-makeup-frame flex ai-center">
 				 				   <view class="left flex ai-center">
-				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
+				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
 				 							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 				 							<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
 				 					   </view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 65c49f1..babf652 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2547,8 +2547,8 @@ border-radius: 55rpx;
 
 }
 .grade-card-frame .card-name{
-	margin-left: 5rpx;
-  max-width: 120rpx;
+	margin-left: 8rpx;
+  /* max-width: 120rpx; */
 }
 .card-effect{
   margin-left: 15rpx;
diff --git a/pages/justTest/justTest.wxml b/pages/justTest/justTest.wxml
index 92569ea..de66879 100644
--- a/pages/justTest/justTest.wxml
+++ b/pages/justTest/justTest.wxml
@@ -15,32 +15,5 @@
 
 
 
-
-<view class="box">
-    <image class="img" src="{{photoUrl}}" bindtap='onPreviewImage'></image>
-    <view class="btn">
-      <button bindtap="onSaveToPhone"  class="btn button-hover">
-        保存图片到手机1
-      </button>
-      <!-- <button wx:else bind:tap="showModal"  class="btn button-hover" >            
-        保存图片到手机2
-      </button> -->
-      <!-- 我们不使用点击按钮即打开设置页面的方式，而是使用上面那种先显示提示框让用户点确定按钮后再打开设置页面 -->
-      <!-- <button wx:else bind:opensetting="onOpenSetting" open-type="openSetting"  class="btn button-hover" >  
-        保存二维码到手机
-      </button> -->
-    </view>
-</view>
-
-<button bindtap="saveImage">savepics</button>
-
-
-
-<!-- 直播组件 - -->
-<!-- <subscribe room-id="1"></subscribe> -->
-
-<open-data type="userAvatarUrl"></open-data>
-<open-data type="userNickName"></open-data>
-
-
+<button bindtap="showac"></button>
 
--
libgit2 0.21.4