优化

ghsApp/src/admin/shop/add.vue

@@ -193,7 +193,7 @@
 					<view class="tui-title " style="color:#3385FF;">整单满金额</view>
 					<input v-model="form.meetAmount" style="color:#3385FF;" @focus="form.meetAmount=''" placeholder-class="phcolor" class="tui-input" name="meetAmount" placeholder="多少钱" type="digit" />
 				</tui-list-cell>
-
+				<view style="background-color: white;font-size:32upx;padding-left:25upx;color:#3385FF;">上面二个要同时满足，才有优惠</view>
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title" style="color:#3385FF;">优惠方式</view>
 					<radio-group class="tui-input" @change="cutStyleChange" style="color:#3385FF;">

hdApp/src/admin/home/workbench.vue

@@ -380,45 +380,22 @@
                   <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 v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
+                          <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
+                            满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{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):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):0}}元
+                        <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
+                          <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
+                            满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
                           </text>
                         </block>
                       </block>
+
                     </text>
                   </view>
                 </view>

hdApp/src/pagesPurchase/order.vue

@@ -20,46 +20,21 @@
                   <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 v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
+                      <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
+                        <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
+                          满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                        </text>
+                      </block>
                     </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 v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
+                        <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
+                          满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                        </text>
+                      </block>
                     </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}}元
-                      </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):0}}元
-                      </text>
-                    </block>
-</block>
                   </text>
                 </view>
               </view>