1

pages/order-submit/order-submit.vue

@@ -257,13 +257,15 @@
 				 @click="exitPay">
 					<u-icon name="close" size="40"></u-icon>
 				</view>
-				<view style="padding:10px 0 0 10px;text-align:center;">代付金额</view>
+			<view style="padding:10px 0 0 10px;text-align:center;">代付金额</view>
 				<view style="text-align:center;padding-bottom:40rpx;">
 					<view class="daif" :style="{'color': mc}">
 						<text style="margin-bottom: 2px;">
 							￥
 						</text>
-						<span :style="{'font-size': '30px','color': mc}">{{ds.total_price}}</span>
+					
+						<span :style="{'font-size': '30px','color': mc}" v-if="mallUserInfo.TenantId == 29&&depositPrice>0&&goodPrice!=depositPrice">{{depositPrice}}</span>
+							<span :style="{'font-size': '30px','color': mc}" v-else>{{ds.total_price}}</span>
 					</view>
 					<u-button :disabled="!address_enable" size="30" :ripple="true" shape="circle" open-type="share" :custom-style="{
 							backgroundColor: mc,

pages/order/payment-order.vue

@@ -112,6 +112,14 @@
 						<view class="label">商品总额</view>
 						<view class="content right">￥{{ orders.PreferPrice }}</view>
 					</view>
+					<view class="field" v-if="u.TenantId==29&&orders.GoodsDepositMoney>0">
+						<view class="label">订金金额</view>
+						<view class="content right">￥{{ orders.GoodsDepositMoney }}</view>
+					</view>
+					<view class="field" v-if="u.TenantId==29&&orders.PayIncome>0">
+						<view class="label">已付金额</view>
+						<view class="content right">￥{{ orders.PayIncome }}</view>
+					</view>
 					<view class="field">
 						<view class="label">运费</view>
 						<view class="content right">+￥{{ orders.FreightMoney }}</view>
@@ -208,6 +216,8 @@
 			this.delivery_time = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.delivery_time : 14;
 			let p = getCurrentPages();
 			let u = uni.getStorageSync("mall_UserInfo");
+			this.u=u;
+			
 			this.uid = u.UserId ? u.UserId : 0;
 			if (p.length > 1) {
 				this.prevPage = p[p.length - 2].route;
@@ -279,7 +289,8 @@
 				this.payInfo.OrderId = e.OrderId;
 				this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0, 10);
 				this.payInfo.PaymentWay = e.PaymentWay;
-				this.payInfo.total_price = e.Income;
+				this.payInfo.total_price = this.u.TenantId == 29 ? e.ResultPayMoney: e.Income;
+				//this.payInfo.total_price = e.Income;
 				this.payBtn = true
 			},
 			exitPay() {