From f6b3fd463834f6ab7f620c5fe105e107eaa1277c Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Fri, 17 Jan 2020 19:44:13 +0800
Subject: [PATCH] 有礼的优化

---
 pages/giftpack/birthdaygift/birthdaygift.wxml | 12 ++++++------
 pages/giftpack/evaluategift/evaluategift.wxml | 16 ++++++++--------
 pages/giftpack/festival/festival.wxml         | 15 ++++++++++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/pages/giftpack/birthdaygift/birthdaygift.wxml b/pages/giftpack/birthdaygift/birthdaygift.wxml
index 18602b8..fe5df0b 100644
--- a/pages/giftpack/birthdaygift/birthdaygift.wxml
+++ b/pages/giftpack/birthdaygift/birthdaygift.wxml
@@ -9,7 +9,7 @@
           <text>______</text>
         </view>
         <view class="top_box_text">
-          <text>新人专享\n你的美丽我来缔造</text>
+          <text>生日专享\n你的美丽我来缔造</text>
         </view>
         <view class="top_box_text">
           <text>______</text>
@@ -41,7 +41,7 @@
                 <text>{{item.fromName}}</text>
               </block>
               <block wx:if="{{item.lbType==3}}">
-                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                <text>{{"生日可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
               </block>
               <view class="num flex-level-right fs26">
                 <view>数量：</view>
@@ -67,7 +67,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享优惠券</text>
+            <text>生日专享优惠券</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -99,8 +99,8 @@
               </block>
               <block wx:else>
                 <view class="top_card_counte ">{{item.sum+"元券"}}</view>
-                <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
               </block>
+              <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
             </view>
           </view>
         </block>
@@ -121,7 +121,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享福利</text>
+            <text>生日专享福利</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -172,7 +172,7 @@
       </view>
     </block>
     <block wx:else>
-    <view class="foot_button_buy'}}" bindtap="GetReceive">
+      <view class="foot_button_buy'}}" bindtap="GetReceive">
         <text>一键全部领取</text>
       </view>
     </block>
diff --git a/pages/giftpack/evaluategift/evaluategift.wxml b/pages/giftpack/evaluategift/evaluategift.wxml
index 7a8ee89..7bee311 100644
--- a/pages/giftpack/evaluategift/evaluategift.wxml
+++ b/pages/giftpack/evaluategift/evaluategift.wxml
@@ -9,7 +9,7 @@
           <text>______</text>
         </view>
         <view class="top_box_text">
-          <text>新人专享\n你的美丽我来缔造</text>
+          <text>评价专享\n你的美丽我来缔造</text>
         </view>
         <view class="top_box_text">
           <text>______</text>
@@ -41,7 +41,7 @@
                 <text>{{item.fromName}}</text>
               </block>
               <block wx:if="{{item.lbType==3}}">
-                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                <text>{{"评价可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
               </block>
               <view class="num flex-level-right fs26">
                 <view>数量：</view>
@@ -67,7 +67,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享优惠券</text>
+            <text>评价专享优惠券</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
@@ -94,13 +94,13 @@
                   <view class="top_card_tite_a">分类限定</view>
                 </block>
               </view>
-                <block wx:if="{{item.isPack!=null}}">
+              <block wx:if="{{item.isPack!=null}}">
                 <view class="top_card_counte">包邮券</view>
               </block>
-              <block>
-              <view class="top_card_counte ">{{item.sum+"元券"}}</view>
-              <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
+              <block wx:else>
+                <view class="top_card_counte ">{{item.sum+"元券"}}</view>
               </block>
+              <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
             </view>
           </view>
         </block>
@@ -121,7 +121,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享福利</text>
+            <text>评价专享福利</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
diff --git a/pages/giftpack/festival/festival.wxml b/pages/giftpack/festival/festival.wxml
index 81da5c8..00a37a1 100644
--- a/pages/giftpack/festival/festival.wxml
+++ b/pages/giftpack/festival/festival.wxml
@@ -9,7 +9,7 @@
           <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
         </view>
         <view class="top_box_text">
-          <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享\n你的美丽我来缔造</text>
+          <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">节日专享\n你的美丽我来缔造</text>
         </view>
         <view class="top_box_text">
           <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
@@ -41,7 +41,7 @@
                 <text>{{item.fromName}}</text>
               </block>
               <block wx:if="{{item.lbType==3}}">
-                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                <text>{{"节日可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
               </block>
               <view class="num flex-level-right fs26" style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
                 <view>数量：</view>
@@ -67,7 +67,7 @@
             <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
           </view>
           <view class="top_box_text ">
-            <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享优惠券</text>
+            <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">节日专享优惠券</text>
           </view>
           <view class="top_box_text ">
             <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
@@ -94,7 +94,12 @@
                   <view class="top_card_tite_a">分类限定</view>
                 </block>
               </view>
-              <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+              <block wx:if="{{item.isPack!=null}}">
+                <view class="top_card_counte">包邮券</view>
+              </block>
+              <block wx:else>
+                <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+              </block>
               <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
             </view>
           </view>
@@ -116,7 +121,7 @@
             <text>———</text>
           </view>
           <view class="top_box_text ">
-            <text>新人专享福利</text>
+            <text>节日专享福利</text>
           </view>
           <view class="top_box_text ">
             <text>———</text>
--
libgit2 0.21.4