shish 5 years ago
parent
commit
6819e0b345
2 changed files with 10 additions and 10 deletions
  1. 9 9
      hdApp/src/admin/billing/affirm.vue
  2. 1 1
      hdApp/src/admin/order/detail.vue

+ 9 - 9
hdApp/src/admin/billing/affirm.vue

@@ -86,7 +86,7 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">实收金额</view>
 						<view class="flex-space" style="width: 100%;">
-							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;height:70rpx;" type="number" @focus="realMoney='',discountIndex=0" v-model="realMoney" placeholder-class="tui-placeholder"/>
+							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;height:70rpx;" type="number" @focus="modifyPrice='',discountIndex=0" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
 							<picker style="border: 1px solid #eee;width: 30%;" @change="discountChange" :value="discountIndex" :range="discount">
 								<view class="flex-space" style="height:70rpx;">
 									<view class="uni-input">{{discount[discountIndex]}}</view>
@@ -94,12 +94,12 @@
 								</view>
 							</picker>
 						</view>
-						<!--<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="realMoney=''" v-model="realMoney" placeholder-class="tui-placeholder"/>-->
+						<!--<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>-->
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">优惠</view>
-						<text style="color: #3385FF">{{	((allPrice+Number(packingMoney)+Number(freight)).toFixed(2) - realMoney).toFixed(2) }}</text>
+						<text style="color: #3385FF">{{	((allPrice+Number(packingMoney)+Number(freight)).toFixed(2) - modifyPrice).toFixed(2) }}</text>
 					</tui-list-cell>
 
 
@@ -112,7 +112,7 @@
 				<text class="price-title">收款</text>
 				<text class="price-number">
 					<!--¥ <text class="large">{{	(allPrice+Number(packingMoney)+Number(freight)).toFixed(2)  }}</text>-->
-					¥ <text class="large">{{	realMoney }}</text>
+					¥ <text class="large">{{ modifyPrice }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
@@ -157,7 +157,7 @@ export default {
 			autoLoad: false,
 			packingMoney:'',//包装费
 			freight:'',//运费
-			realMoney:0,//真实金额
+			modifyPrice:0,//真实金额
 			payType:0,//支付类型
 			clientInfo: '',//客户信息
 			showCustomer: false,
@@ -178,7 +178,7 @@ export default {
 				title: this.getMerchantInfo.name
 			});
 		}
-		this.realMoney = this.allPrice.toFixed(2);
+		this.modifyPrice = this.allPrice.toFixed(2);
 	},
 	computed: {
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"])
@@ -219,11 +219,11 @@ export default {
 					discount = (allPrices - (allPrices * 0.6)).toFixed(2);
 					break;
 			}
-			this.realMoney = (allPrices - discount).toFixed(2);
+			this.modifyPrice = (allPrices - discount).toFixed(2);
 		},
 		countAllPrices(){
 			let allPrices = this.allPrice.toFixed(2)
-			this.realMoney = (Number(allPrices) + Number(this.freight) + Number(this.packingMoney)).toFixed(2);
+			this.modifyPrice = (Number(allPrices) + Number(this.freight) + Number(this.packingMoney)).toFixed(2);
 		},
 		// 选取客户
 		changeCustomerFn(info) {
@@ -245,7 +245,7 @@ export default {
 				customId:this.clientInfo.id,// 客户
 				payWay:this.payType,//付款方式
 				sendType:this.sendType,
-				realPrice: this.realMoney,
+				modifyPrice: this.modifyPrice,
 				product:JSON.stringify(product),//下单商品
 			};
 			let self = this;

+ 1 - 1
hdApp/src/admin/order/detail.vue

@@ -107,7 +107,7 @@
       <!-- 优惠信息 -->
       <div
         class="module-com coupon-wrap"
-        v-if="data.discountAmount && data.discountAmount != '0.00'"
+        v-if="data.discountAmount && data.discountAmount != '0.00' && 1==2"
       >
         <div class="module-det flex-center-between">
           <div