From e6181694d2ee244e726bff22b1419563cb5a0ae8 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 27 Oct 2021 10:47:24 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8F=91=E5=B8=83=E5=95=86=E5=93=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A2=84=E8=AE=A1=E5=88=B0=E8=B4=A6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/add.vue | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pages/goods/add.vue b/pages/goods/add.vue
index bfea111..4801be9 100644
--- a/pages/goods/add.vue
+++ b/pages/goods/add.vue
@@ -64,9 +64,9 @@
 				<input type="digit" v-model="skus_price" placeholder="0.00"/>
 				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
 			</view>
-			<view class="form-box inputs-flex input-unit">
-				<label class="form-label">分销佣金</label>
-				<input type="digit" v-model="skus_charge" placeholder="0.00"/>
+			<view class="form-box inputs-flex input-unit " style="background-color: #eee9fd;" v-if="skus_price>0">
+				<label class="form-label">可结算货款 ≈</label>
+				<input type="digit" :value="percentTotal" :disabled="true" /> <span class='des'>(扣除分佣后预计到账金额)</span>
 				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
 			</view>
 		</view>
@@ -191,7 +191,6 @@
 				skus_price	: '',	 // 销售价格
 				skus_number	: 1,	 // 易货起购数量
 				skus_unit	: '件',	 // 规格文字
-				skus_charge	: '',	 // 分销佣金
 				skus_stock	: '',	 // 库存
 				isChange	: false, // 是否支持易货
 				stores		: [],	 // 关联店铺
@@ -201,6 +200,7 @@
 					{text: '快递', type: 1},
 					{text: '自提', type: 2}
 				],
+				percent:0,// 预结算货款比例
 				// 配置信息
 				storesArr	: [],    // 可选店铺
 				tags		: [],	 // 可选商品标签
@@ -209,6 +209,11 @@
 				type		: 1,	 // 1为商品，2为服务
 			};
 		},
+		computed:{
+			percentTotal(){
+				return this.percent * this.skus_price
+			}
+		},
 		created() {
 			// 编辑状态信息
 			if(this.$Route.query.type && this.$Route.query.type === 'edit'){
@@ -244,7 +249,6 @@
 					this.skus_price	 = res.data.skus[0].price
 					this.skus_number = res.data.skus[0].number
 					this.skus_unit	 = res.data.skus[0].unit
-					this.skus_charge = res.data.skus[0].charge
 					this.skus_stock	 = res.data.skus[0].stock
 					this.isPostSale	 = res.data.is_post_sale == 0
 					this.isChange	 = res.data.is_change == 0
@@ -253,6 +257,9 @@
 					this.storesArr	 = storesArr
 					this.services	 = services
 					this.stores		 = stores
+					this.percent = Number(res.percent)
+					
+					
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
@@ -283,6 +290,7 @@
 				this.type		= res.type
 				this.categoryId	= this.$Route.query.id
 				this.categoryCid= this.$Route.query.cid
+				this.percent = Number(res.percent)
 			}).catch(err => {
 				uni.showToast({
 					title: err.message,
@@ -377,7 +385,6 @@
 					skus_price	 : this.skus_price,
 					skus_number	 : this.skus_number,
 					skus_unit	 : this.skus_unit,
-					skus_charge	 : this.skus_charge,
 					skus_stock	 : this.skus_stock,
 					is_change	 : this.isChange ? 0 : 1,
 					logistic_type: this.logisticArr[this.logisticType].type,
@@ -471,6 +478,12 @@
 		}
 		.input-unit{
 			padding-right: 200rpx;
+			.des{
+				font-size: 26rpx;padding-bottom: 20rpx;display: inline-block;
+				color: #999;
+				position: relative;
+				right: -200rpx;
+			}
 			.units{
 				position: absolute;
 				right: 0;