修改价格问题

ghsApp/src/admin/billing/affirm.vue

@@ -537,7 +537,7 @@ export default {
     },
     diffPriceConfirm(){
       this.form.dealPrice = 1
-      this.confirmSubmit()
+      this.formSubmit()
     },
     confirmSubmit () {
       let self = this;

ghsApp/src/admin/home/workbench.vue

@@ -136,7 +136,7 @@
 			<view style="margin-top:24upx;">续期一年到期时间：<text style="color:#3385FF;">{{ newDeadline }}</text></view>
 			<view style="margin-top:40upx;text-align:center;">
 				<button class="admin-button-com big default" @click="closeRenew()">稍后再说</button>
-        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;">续期一年</button>
+        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;">支持公司，续期一年</button>
 			</view>
         </view>
     </uni-popup>

ghsApp/src/pagesOrder/arrival.vue

@@ -4,7 +4,9 @@
 			<view class="module-com content-box">
 				<view class="commodity-view">
 					<view style="text-align:right;margin-right:20upx;padding-top:10upx;" v-if="detailInfo.book == 1 && detailInfo.status == 2 && parseFloat(detailInfo.actPrice) == 0">
-						<button class="admin-button-com default mini-btn" @click="addItem(detailInfo)">添加花材</button>
+						<button class="admin-button-com default mini-btn" @click="usePrice(detailInfo,0)" style="margin-right:20upx;">使用自定义价</button>
+						<button class="admin-button-com default mini-btn" @click="usePrice(detailInfo,1)" style="margin-right:20upx;">使用花材售价</button>
+						<button class="admin-button-com blue mini-btn" @click="addItem(detailInfo)">添加花材</button>
 					</view>
 					<view class="commodity-list">
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" style="position:relative;">
@@ -30,7 +32,7 @@
 									<text class="item-type"></text>
 									<view class="item-count" style="width:310upx;">
 										<input type="number" class="num" :class="[Number(s.xhNum)>Number(s.stock) ? 'stock-red' : '']" v-model="s.xhNum" placeholder="数量" style="width:100upx;" />
-										<input type="digit" class="price" v-model="s.currentHdPrice" placeholder="价格" style="width:120upx;" />
+										<input type="digit" class="price" :class="[Number(s.cost)>Number(s.currentHdPrice) ? 'cost-blue' : '']" v-model="s.currentHdPrice" placeholder="价格" style="width:120upx;" />
 										<text style="display:inline-block;height:50upx;line-height:50upx;">价格</text>
 									</view>
 								</view>
@@ -156,6 +158,18 @@ export default {
 		}
 	},
 	methods: {
+		usePrice(info,flag){
+			if(info.product && !this.$util.isEmpty(info.product)){
+				info.product.forEach((item,idx,array) => {
+					if(flag == 0){
+						item.currentHdPrice = item.itemModifyPrice
+					}else{
+						item.currentHdPrice = item.itemSalePrice
+					}
+				})
+				this.$forceUpdate()
+			}
+		},
 		changeOption(info){
 			let id = info.id ? info.id : 0
 			let orderSn = info.orderSn ? info.orderSn : ''
@@ -377,7 +391,13 @@ export default {
 								border:2upx solid red;
 								color:red;
 								font-weight:bold;
-								font-size: 26upx;
+								font-size: 27upx;
+							}
+							.cost-blue{
+								border:2upx solid blue;
+								color:blue;
+								font-weight:bold;
+								font-size: 27upx;
 							}
 						}
 					}

ghsApp/src/pagesOrder/detail.vue

@@ -192,7 +192,7 @@
 			<view class="module-com content-box">
 				<view class="commodity-view">
 					<view style="text-align:right;margin-right:20upx;padding-top:10upx;" v-if="detailInfo.book == 1 && detailInfo.status == 2 && parseFloat(detailInfo.actPrice) == 0">
-						<button class="admin-button-com default mini-btn" @click="addItem(detailInfo)">添加花材</button>
+						<button class="admin-button-com blue mini-btn" @click="addItem(detailInfo)">添加花材</button>
 					</view>
 					<view class="commodity-list">
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" style="position:relative;">