From 2991e889d53c3999d2510e6955b80f8bc582d55e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 8 Jan 2021 18:07:38 +0800
Subject: [PATCH] 测试的bug修复

---
 packageA/pages/quan_list/quan_list.wxml |  2 +-
 packageA/pages/quan_pro/quan_pro.wxml   | 14 +++++++++-----
 pages/user/order_list/order_list.wxml   |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index 02b5e62..73ad493 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -18,7 +18,7 @@
         <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative">
               <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
 
-              <view style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view>
+              <view class="ellipsis-1" style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view>
               <view style="margin-top: 5rpx" wx:else>所有门店通用</view>
               <view wx:if="{{item.endtype==0}}">有效期              
                  <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index 234985d..1a84485 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -8,16 +8,20 @@
         <image style="width: 100%; height: 450rpx" src="{{iurl}}/miniapp/images/coupon_img/q_detail_bg.png"></image>
         <view class="q_content">
             <view class="upper flex jc_sb co-w">
-                <view class="left fs30">
+                <view class="left fs30" style="width: 440rpx;">
                      <view>
                          <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image>
                          {{q_data.name}}
                      </view>
-                     <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view>                     
-                             <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text>
-                             <text wx:else>仅限{{q_data.useobjectname}}使用</text>
-                             <text>{{q_data.coupon_remark}}</text>
+                     <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx">
+						     <view class="t_circle"></view>    							
+							 <view>	  
+                                <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text>
+                                <text wx:else>仅限{{q_data.useobjectname}}使用</text>
+							 </view>	
+                           
                      </view>
+					 <view class="ellipsis-3" style="margin-top: 20rpx;">{{q_data.coupon_remark}}</view>
                 </view>
                 <view class="right" style="margin-right: 80rpx;">
                     <view class="f40 t-c" style="margin-top: 100rpx"><text class="fs26">￥</text>{{filters.toFix(q_data.money,2)}}</view>
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 566f867..c7aab13 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -222,7 +222,7 @@
 						</view>
 						<view class="subitem">
 							<view class="key">单价</view>
-							<view class="val">￥{{i.Price}}({{i.PosPrice}})</view>
+							<view class="val">￥{{i.Price}}(<text style="text-decoration: line-through;">{{i.PosPrice}}</text>)</view>
 						</view>
 						<view class="subitem">
 							<view class="key">金额</view>
--
libgit2 0.21.4