满减优化

ghsApp/src/admin/item/detail.vue

@@ -39,6 +39,14 @@
           class="tui-input" name="skDiscountPrice" @focus="form.skDiscountPrice=''" placeholder="零售特价" type="digit" />
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">下单满</view>
+          <input v-model="form.reachNum" style="width:130upx;border:1upx solid #CCCCCC;color:#3385FF;text-align:center;height:50upx;margin-right:8upx;" placeholder-class="phcolor" 
+          class="tui-input" name="reachNum" @focus="form.reachNum=''" placeholder="数量" maxlength="50" type="number" />{{form.bigUnit||'扎'}} 优惠
+          <input v-model="form.reachNumDiscount" style="width:130upx;border:1upx solid #CCCCCC;text-align:center;height:50upx;margin-right:8upx;margin-left:8upx;" placeholder-class="phcolor" 
+          class="tui-input" name="reachNumDiscount" @focus="form.reachNumDiscount=''" placeholder="金额" type="digit" />元/{{form.bigUnit||'扎'}}
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
         <view class="tui-title">成本</view>
         <input v-model="form.cost" style="width:260upx;" placeholder-class="phcolor" @focus="form.cost=''" class="tui-input" name="cost" placeholder="请输入" type="digit"/>
@@ -241,6 +249,8 @@ export default {
         discountPrice:0,
         hjDiscountPrice:0,
         skDiscountPrice:0,
+        reachNum:0,
+        reachNumDiscount:0,
         cost:0,
         skMore:3,
         weight:'',

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -19,7 +19,7 @@
 						<view :class="['status-name']">{{ item.statusName }}</view>
 						<text style="color:red;margin-top:30upx;" v-if="item.debt == 1">欠款</text>
 
-						<view style="margin-top:30upx;"><button @click.stop="printOrder(item)" class="admin-button-com bule">打印</button> </view>
+						<view style="margin-top:30upx;"><button @click.stop="printOrder(item)" class="admin-button-com bule">打印{{item.printNum}}</button> </view>
 
 					</view>
 				</view>
@@ -93,11 +93,24 @@ export default {
 	},
 	methods: {
 		printOrder(item){
-			stockOutPrint({id:item.id}).then(res=>{
-				if(res.code == 1){
-					this.$msg('打印成功') 
-				}
-			})
+			let that = this
+			if(item.printNum >= 1){
+				this.$util.confirmModal({content:'已经打过，确认补打？'},() => {
+					stockOutPrint({id:item.id}).then(res=>{
+						if(res.code == 1){
+							item.printNum = Number(item.printNum)+1
+							this.$msg('打印成功') 
+						}
+					})
+				})
+			}else{
+				stockOutPrint({id:item.id}).then(res=>{
+					if(res.code == 1){
+						item.printNum = Number(item.printNum)+1
+						this.$msg('打印成功') 
+					}
+				})
+			}
 		},
 		init(){
 		},

ghsApp/src/pagesStorehouse/allot/exDetails.vue

@@ -78,7 +78,7 @@
 				<button v-if="outData.status != OUT_STATUS.CANCEL && outData.statusName != '已出库'" class="admin-button-com middle" @click="cancelEvent">取消</button>
 				<button v-if="outData.status == OUT_STATUS.CONFIRM" class="admin-button-com middle" @click="confirmEventPop">确认</button>
 
-				<button class="admin-button-com middle" @click="printOrder()">打印</button>
+				<button class="admin-button-com middle" @click="printOrder()">打印({{outData.printNum}})</button>
 				<button v-if="outData.status == 2 && outData.debt == 1" class="admin-button-com middle" @click="clearOrder()">结清</button>
 
 			</view>
@@ -134,11 +134,24 @@ export default {
 	},
 	methods: {
 		printOrder(){
-			stockOutPrint({id:this.outData.id}).then(res=>{
-				if(res.code == 1){
-					this.$msg('打印成功')
-				}
-			})
+			let that = this
+			if(this.outData.printNum && this.outData.printNum >= 1){
+				this.$util.confirmModal({content:'已经打过，确认补打？'},() => {
+					stockOutPrint({id:this.outData.id}).then(res=>{
+						if(res.code == 1){
+							that.outData.printNum = Number(that.outData.printNum)+1
+							this.$msg('打印成功')
+						}
+					})
+				})
+			}else{
+				stockOutPrint({id:this.outData.id}).then(res=>{
+					if(res.code == 1){
+						that.outData.printNum = Number(that.outData.printNum)+1
+						this.$msg('打印成功')
+					}
+				})
+			}
 		},
 		init(){
 

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -48,7 +48,7 @@
 					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in filterProductInfo" :key="classIndex" :id="`class_${classIndex}`">
 						<view class="item_list_title">{{ classItem.className }}</view>
 						<template v-for="(productItem, productIndex) in classItem.child">
-							<view style="position: relative;" :class="[productItem.variety == 1 ? 'big-box' : productItem.presell == 1 ? 'middle-box' : 'box']"  :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
+							<view style="position: relative;" :class="[productItem.variety == 1 ? 'big-box' : (productItem.presell == 1 || Number(productItem.reachNum)>0) ? 'middle-box' : 'box']"  :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 								<Commondity v-if="classItem.isActive"
 									:info="productItem"
 									:offVerifyRepertory="true"
@@ -67,10 +67,12 @@
 								<view v-if="productItem.variety && productItem.variety == 1" class="has-color" @click="goToSpecialVariety(productItem)">
 									<view class="has-color-button">选颜色</view>
 								</view>
-								<view v-if="productItem.presell && productItem.presell == 1" style="position:absolute;top:150upx;font-size:26upx;color:#3385ff;white-space: nowrap;text-overflow: hidden;">
-									到货日期：
-									<block v-if="!$util.isEmpty(productItem.presellDateShow)">
-										<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">，</text></text>
+								<view v-if="productItem.presell == 1 || Number(productItem.reachNum)>0" style="position:absolute;top:145upx;font-size:26upx;color:#3385ff;white-space: normal;word-wrap: break-word;">
+									<text style="font-weight:bold;">满{{productItem.reachNum}}扎 ¥{{productItem.reachPrice}}<block v-if="productItem.presell == 0">（提交订单后自动优惠）</block></text>
+									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum)>0">，</block>到货日期：
+										<block v-if="!$util.isEmpty(productItem.presellDateShow)">
+											<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">，</text></text>
+										</block>
 									</block>
 								</view>
 							</view>
@@ -912,7 +914,7 @@ export default {
 			height: 185upx
 		}
 		.middle-box{
-			height: 215upx;
+			height: 225upx;
 			position:relative;
 		}
 		.big-box{

hdApp/src/pagesPurchase/wechatPay.vue

@@ -10,11 +10,14 @@
         </block>
         <view class="wait">待付款</view>
         <block>
+          <div class="price" v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">
+            <span class="app-size-36 app-bold" style="text-decoration:line-through;">￥{{ parseFloat((Number(info.reachDiscountPrice)+Number(realPrice)).toFixed(2)) }}</span>
+          </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>
           <div class="price">
-            <span>￥</span>
-            <span class="app-size-36 app-bold">{{ realPrice || '0.00'}}</span>
+            <span class="app-size-36 app-bold">￥{{ realPrice || '0.00'}}</span>
           </div>
-          <div class="order-num app-color-3">订单号: {{ orderSn || ''}}</div>
+          <div class="order-num app-color-3" style="margin-top:12upx;">订单号 {{ orderSn || ''}}</div>
           <div v-if="remainPayTime > 0" class="order-num app-color-3" style="margin-top:18upx;font-size:26upx;"><span style="font-weight:bold;padding-right:8upx;">{{remainPayTime}}</span>秒后失效</div>
           <div v-else class="order-num app-color-3" style="margin-top:12upx;font-size:26upx;">订单已失效</div>
         </block>
@@ -78,7 +81,8 @@ export default {
       remainPayTime:120,
       hasDebtPay:0,
       balance:0,
-      getPayType:1
+      getPayType:1,
+      info:[]
     };
   },
   onLoad (options) {
@@ -100,7 +104,7 @@ export default {
           this.getPayType = res.data.getPayType
           that.hasDebtPay = res.data.hasDebtPay
           that.balance = res.data.balance
-
+          this.info = res.data
           that.remainPayTime = res.data.remainPayTime
           if(that.remainPayTime > 0){
             let t =setInterval(function(){