Merge branch 'wjw_ins_upadte'

manifest.json

@@ -51,7 +51,7 @@
       "mode": "history",
       "base": "/uni"
     },
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.26/",
+    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.26/",
     "optimization": {
       "treeShaking": {
         "enable": true

pages/apply/applypage1.vue

@@ -275,7 +275,7 @@
 					title: '提交中',
 					icon: 'none',
 					duration: 90000
-				})
+				});
 				uni.request({
 					url: url,
 					method: methond,

pages/checkstand/checkstand.vue

@@ -22,11 +22,11 @@
 		<view class="poupp_nper_detail">
 			<view>
 				<text>第1期 支付</text>
-				<text>¥ {{data.first_payment}}</text>
+				<text>¥ {{Number(data.first_payment)+(Number(data.equipment_price)-Number(data.advance_payment))*Number(data.count)}}</text>
 			</view>
 			<view>
 				<text>剩余{{data.periods_num-1}}期 每期支付</text>
-				<text>¥ {{data.remaining_payment}}</text>
+				<text>¥ {{Number(data.remaining_payment)+(Number(data.equipment_price)-Number(data.advance_payment))*Number(data.count)}}</text>
 			</view>
 		</view>
 		<view class="pay_btn" @click="open()">确认支付</view>

pages/financial/financialstage.vue

@@ -46,7 +46,7 @@
 		<view class="fin_recommended" v-if="EquipmentHotList">
 			<view class="fin_recommended_label">
 				<!-- <i class="fin_icon"></i> -->
-				<text class="fin_recommended_title">为您推荐</text>
+				<text class="fin_recommended_title">全部商品</text>
 			</view>
 			<view class="fin_rec_desc">
 				<i></i>

pages/installment/installmentinfo.vue

@@ -153,6 +153,10 @@
 						</view>
 					</view>
 					<view class="profile">利息每期(元)：¥{{((Number(e_info.equipment_price)-Number(e_info.advance_payment))*Number(e_info.count)).toFixed(2)}}</view>
+					<view class="sales_box">
+						<text class="sales_name">销售人员:</text>
+						<input class="sales_input" type="text" placeholder="销售人员姓名,选填" v-model="sales">
+					</view>
 				</view>
 				<view class="poupp_tips">金融分期需要上传金融资质, 包含法人信息/企业执照/银行流水等…</view>
 				<view class="poupp_btn" @click="buy_now()">立即分期</view>
@@ -187,7 +191,8 @@
 				isLogin: 0,
 				equipment_id: '',
 				is_auth: '0',
-				type: 2
+				type: 2,
+				sales: ''
 			}
 		},
 		onPageScroll(e){
@@ -267,6 +272,13 @@
 					equipment_id: this.equipment_id,
 					property_id: this.e_info.property_id
 				}
+				if(this.sales) {
+					
+				}
+				uni.setStorage({
+					key: 'sales',
+					data: this.sales
+				});
 				uni.setStorage({
 					key: 'advance_payment',
 					data: this.e_info.advance_payment
@@ -940,4 +952,15 @@
 		font-size: 32rpx;
 		padding: 24rpx;
 	}
+	.sales_box {
+		display: flex;
+		align-items: center;
+		margin-top: 20rpx;
+		.sales_name, .sales_input {
+			font-size: 26rpx;
+		}
+		.sales_input {
+			padding-left: 16rpx;
+		}
+	}
 </style>

pages/signcontract/signcontract.vue

@@ -144,6 +144,7 @@
 				const install = uni.getStorageSync('installment');
 				const {contract_no, equipment_id, property_id} = install;
 				const url = this.is_eidt ? '/uni/api/signcontract/EditContract' : '/uni/api/signcontract/AddContract';
+				const sales = uni.getStorageSync('sales') || '';
 				uni.showLoading({
 					title: '提交中...'
 				})
@@ -154,12 +155,14 @@
 						contract_no: contract_no,
 						equipment_id: equipment_id,
 						property_id: property_id,
-						contract_content: data
+						contract_content: data,
+						sales: sales
 					},
 					dataType: 'json',
 					success: (res) => {
-						const {data} = res;
+						const {data, message} = res;
 						if(data.code == 0){
+							uni.removeStorageSync('sales');
 							if(this.advance_payment === 0) {
 								uni.request({
 									url: '/uni/api/repayment/GoPay',
@@ -198,7 +201,7 @@
 						}else{
 							uni.showToast({
 								icon: 'none',
-								title: '提交失败，请重试'
+								title: message
 							})
 						}
 					}