8折

ghsApp/src/pagesOrder/detail.vue

@@ -280,7 +280,7 @@
 						<div class="detail-price_box" style="font-size: 28upx">-¥{{ parseFloat(detailInfo.tkPrice) }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.orderReachDiscountPrice > 0" class="line-cell" :hover="false">
-						<div class="tui-title">整单满减</div>
+						<div class="tui-title">整单优惠</div>
 						<div class="detail-price_box" style="font-size: 28upx">-¥{{ detailInfo.orderReachDiscountPrice?parseFloat(detailInfo.orderReachDiscountPrice):0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">

hdApp/src/admin/home/workbench.vue

@@ -154,6 +154,36 @@
             <view class="text-group_7 flex-col justify-between" @click="enterShop(ghsInfo)">
               <text class="text_8">{{ghsInfo.name}}</text>
               <text class="text_9">
+
+<block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
+
+  <block v-if="ghsInfo.meetNum == 1 || ghsInfo.meetAmount == 1">
+                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                      <text style="color:red;font-weight:bold;">
+                        全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+                    <block v-else>
+                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                        全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+  </block>
+  <block v-else>
+                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                      <text style="color:red;font-weight:bold;">
+                        满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+                    <block v-else>
+                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                        满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+  </block>
+
+</block>
+<block v-else>
                 <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
                   <text style="color:red;font-weight:bold;">
                     满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
@@ -164,6 +194,8 @@
                     满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
                   </text>
                 </block>
+</block>
+
               </text>
             </view>
           </view>

hdApp/src/pagesPurchase/order.vue

@@ -19,6 +19,36 @@
                 <view class="text-group_7 flex-col justify-between">
                   <text class="text_8">{{ghsInfo.name}}</text>
                   <text class="text_9">
+
+<block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
+
+  <block v-if="ghsInfo.meetNum == 1 || ghsInfo.meetAmount == 1">
+                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                      <text style="color:red;font-weight:bold;">
+                        全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+                    <block v-else>
+                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                        全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+  </block>
+  <block v-else>
+                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                      <text style="color:red;font-weight:bold;">
+                        满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+                    <block v-else>
+                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                        满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </text>
+                    </block>
+  </block>
+
+</block>
+<block v-else>
                     <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
                       <text style="color:red;font-weight:bold;">
                         满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
@@ -29,6 +59,7 @@
                         满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
                       </text>
                     </block>
+</block>
                   </text>
                 </view>
               </view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -220,7 +220,7 @@
             <div class="detail-price_box" style="font-size: 28upx;">-¥{{ detailInfo.tkPrice?parseFloat(detailInfo.tkPrice):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.orderReachDiscountPrice > 0">
-            <div class="tui-title">整单满减</div>
+            <div class="tui-title">整单优惠</div>
             <div class="detail-price_box" style="font-size: 28upx;">-¥{{ detailInfo.orderReachDiscountPrice?parseFloat(detailInfo.orderReachDiscountPrice):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">

hdApp/src/pagesPurchase/readMe.vue

@@ -6,16 +6,16 @@
 			</view>
 			<view>
 				<view class="info">
-      			装箱说明：标准箱每件10把x20支。
+      			关于数量和种类选择：每份为5扎100支，请双份下单可混色，200支打包一件，工厂直出原装，确保品质
                 </view>
 				<view class="info">
-				55cm-75cm，最少下单5把
+				关于物流：下单请选择好您熟悉的物流冷链，减少二次沟通打扰
 				</view>
 				<view class="info">
-				40cm-50cm，最少下单10把
+				单件无备注默认德邦到付，预付打包物流费用会根据实际支出多退少补，多件请留好冷链名称
 				</view>
 				<view class="info">
-				下单请按照，10把=200支的倍数下单。
+				感谢各位支持，梦金鹏-只为品质玫瑰
 				</view>
 			</view>
 		</view>

hdApp/src/pagesPurchase/wechatPay.vue

@@ -15,10 +15,10 @@
           </div>
 
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" 
-          v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">花材满减 -￥{{ parseFloat(info.reachDiscountPrice) }}</div>
+          v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">花材优惠 -￥{{ parseFloat(info.reachDiscountPrice) }}</div>
 
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" 
-          v-if="info.orderReachDiscountPrice && Number(info.orderReachDiscountPrice)>0">整单满减 -￥{{ parseFloat(info.orderReachDiscountPrice) }}</div>
+          v-if="info.orderReachDiscountPrice && Number(info.orderReachDiscountPrice)>0">整单优惠 -￥{{ parseFloat(info.orderReachDiscountPrice) }}</div>
 
           <div class="price">
             <span class="app-size-36 app-bold">￥{{ realPrice || '0.00'}}</span>