优化

前端开发-罗建龙
1 parent 303eff71
Showing 5 changed files with 30 additions and 30 deletions
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsList/goodsList.wxml
@@ -375,13 +375,13 @@ Page({
           "storeId": a.stoid, //商家ID
           "userId": d.user_id, //用户ID
         }
-        // if (th.orderSn) {
-        //   url='/api/weshop/marketing/my/giftbag/detail/get'
-        //   data.orderSn=th.orderSn
-        // }else{
-        //   data.giftBagId=th.getGiftID
-        // }
-        data.giftBagId=th.getGiftID
+        if (th.orderSn) {
+          url='/api/weshop/marketing/my/giftbag/detail/get'
+          data.orderSn=th.orderSn
+        }else{
+          data.giftBagId=th.getGiftID
+        }
+        // data.giftBagId=th.getGiftID
         getApp().request.get(url, {
             isShowLoading: true,
             data:data,
@@ -19,7 +19,7 @@
     </view>
-		<view class="top_time data-v-3a5b7e36" wx:if="{{!flag}}">
+		<view class="top_time data-v-3a5b7e36" wx:if="{{false && !flag}}">
 		  <block wx:if="{{isBuy==1 && giftTitle && isStart!=1}}" >
 		     <text class="data-v-3a5b7e36">
 		        {{"活动开始时间："+giftStart}}
@@ -33,7 +33,7 @@
 		    </text>
 		  </block>
 		</view>
-    <view class="top_time data-v-3a5b7e36" wx:if="{{flag == 1 && iswarelbtype}}">
+    <view class="top_time data-v-3a5b7e36" wx:if="{{false && flag == 1 && iswarelbtype}}">
 			<text class="data-v-3a5b7e36" wx:if="{{exchangeType == 1}}">
 			   {{"兑换时间：领取后"+exchangeDay+"天内兑换"}}
 			</text>
@@ -190,7 +190,7 @@
 		  </block>
 		</block>
-		<block wx:if="{{isBuy==0}}">
+		<block wx:if="{{false && isBuy==0}}">
 		  <view class="foot_button data-v-3a5b7e36">
 		    <block wx:if="{{is_lb!=1}}">
 		      <view class="foot_button_buy data-v-3a5b7e36 overdue">
@@ -23,7 +23,7 @@
   </view>
   <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
     <view class="content_box">
-      <view class="content_box_ware" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=1&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.order_sn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}">
+      <view class="content_box_ware" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
           <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
@@ -93,7 +93,7 @@
         </view>
       </view>
-      <view class="content_box_button" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=1&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.order_sn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}">
+      <view class="content_box_button" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}">
         <button>立即使用</button>
       </view>
     </view>
@@ -608,7 +608,7 @@
                             <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                             <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>
                           </view>
-                          <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view>
+                          <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb mgl10 fs24 no_line_c">{{item.market_price}}</view>
                         </view>
                         <view class="comment">
@@ -639,7 +639,7 @@
                                 </view>
                               </view>
                               <view class="comment flex jc_sb">
-                                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24">{{item.market_price}}</view>
+                                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 no_line_c">{{item.market_price}}</view>
                                 <view class="fs22 pdt10 t-r">
                                   <span>评论{{item.comment_count}}</span>
                                   <span class="pdl30">已售{{item.sales_sum}}</span>
@@ -649,7 +649,7 @@
                             <block wx:else>
                               <view class="flex ai-center">
                                 <view class="price rmb">{{item.shop_price}}</view>
-                                <view wx:if="{{is_retail_price}}"  class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+                                <view wx:if="{{is_retail_price}}"  class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view>
                               </view>
                               <view class="comment">
@@ -665,7 +665,7 @@
                             <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
                               <view class="flex ai-center">
                                 <view class="price rmb">{{item.shop_price}}</view>
-                                <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view>
+                                <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb fs24 mgl10 no_line_c">{{item.market_price}}</view>
                               </view>
                               <view class="comment">
                                 <view class="flex ai-center">
@@ -687,7 +687,7 @@
                             <block wx:else>
                               <view class="flex ai-center">
                                  <view class="price rmb">{{item.shop_price}}</view>
-                                 <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+                                 <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view>
                               </view>
                               <!-- <view class="price">￥{{item.shop_price}}</view> -->
                               <view class="comment">
@@ -704,7 +704,7 @@
                           <view class="flex ai-center">
                             <view class="price rmb">{{item.shop_price}}</view>
-                            <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+                            <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view>
                           </view>
                           <!-- <view class="price">￥{{item.shop_price}}</view> -->
                           <view class="comment">
@@ -92,7 +92,7 @@
 						<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 						<text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>			
 					</view>
-					<view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
+					<view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24 no_line_c">{{item.market_price}}</view>
 				</view>
@@ -119,7 +119,7 @@
                   </view>
                 </view>
                 <view class="comment">
-                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view>
                   <view class="fs24 t-r">
 										<span>评论{{item.comment_count}}</span>
 										<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -141,7 +141,7 @@
               <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                 <view class="flex ai-center">
                   <view class="price rmb">{{item.shop_price}}</view>
-                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
+                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb no_line_c">{{item.market_price}}</view>
                 </view>
                 <view class="comment">
                   <view class="flex ai-center">
@@ -160,7 +160,7 @@
               <block wx:else>
 								<view>
 									<view class="price rmb">{{item.shop_price}}</view>
-									<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+									<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view>
 								</view>
                 <!-- <view class="price">￥{{item.shop_price}}</view> -->
                 <view class="comment pdt10">
@@ -175,7 +175,7 @@
           <view wx:else>
 						<view class="flex ai-center">
 							<view class="price rmb">{{item.shop_price}}</view>
-							<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+							<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view>
 						</view>
             <view class="comment pdt10">
@@ -207,11 +207,11 @@
 							<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 							<text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>			
 						</view>
-						<view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
+						<view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24 no_line_c">{{item.market_price}}</view>
 					</view>
-		          <view class="comment pdt10">
+		          <view class="comment pdt10"> 
 <!--		             <view  class="word-line xc-ash">￥{{item.market_price}}</view>-->
 		            <view class="fs24 t-r">
 									<span>评论{{item.comment_count}}</span>
@@ -234,7 +234,7 @@
 		                </view>
 		              </view>
 		              <view class="comment">
-		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view>
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -244,7 +244,7 @@
 		            <block wx:else>
 		              <view class="price rmb">{{item.shop_price}}</view>
 		              <view class="comment">
-		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view>
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -256,7 +256,7 @@
 		            <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
 		              <view class="flex ai-center">
 		                <view class="price rmb">{{item.shop_price}}</view>
-		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
+		                <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb no_line_c">{{item.market_price}}</view>
 		              </view>
 		              <view class="comment">
 		                <view class="flex ai-center">
@@ -275,7 +275,7 @@
 		            <block wx:else>
 									<view>
 										<view class="price rmb">{{item.shop_price}}</view>
-										<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view>
+										<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view>
 									</view>
 		              <!-- <view class="price">￥{{item.shop_price}}</view> -->
 		              <view class="comment pdt10">
@@ -290,7 +290,7 @@
 		        <view wx:else>
 							<view class="">
 								<view class="price rmb">{{item.shop_price}}</view>
-								<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+								<view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view>
 							</view>
 		          <view class="comment pdt10">