From 1f8cdbb27083ffe1e5255d146e9466447b97c9d4 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sat, 20 Jan 2024 12:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                            |   2 +-
 components/productWindow/index.vue   |   4 +-
 config/app.js                        |   2 +-
 manifest.json                        |  46 ++---
 pages.json                           |  14 ++
 pages/goods_details/index.vue        |  11 +-
 pages/order_details/index.vue        |   2 +
 pages/users/installment/index.vue    |  13 +-
 pages/users/order_confirm/index.vue  | 298 +++++++++++++++------------
 pages/users/order_improves/index.vue |  85 +++++++-
 pages/users/pay_success/index.vue    | 110 ++++++++++
 pages/users/repayment/index.vue      |  42 ++--
 pages/users/user_info/index.vue      |   4 +-
 project.config.json                  |   2 +-
 static/images/succeed.png            | Bin 0 -> 2154 bytes
 static/images/success.png            | Bin 0 -> 2457 bytes
 16 files changed, 423 insertions(+), 212 deletions(-)
 create mode 100644 pages/users/pay_success/index.vue
 create mode 100644 static/images/succeed.png
 create mode 100644 static/images/success.png

diff --git a/README.md b/README.md
index e93df0a..e090fe5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 移动端 文件列表    
+# 移动端 文件列表
 ~~~
 .
 ├── App.vue                文件主入口
diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index dbb7c9e..b5e2fb7 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -151,14 +151,14 @@
 				getfenqilist(data).then(res => {
 					this.fenqlist = res.data.list
 					this.installments = res.data.list[0] //刚开始就赋值
-					localStorage.setItem('installments',JSON.stringify(this.installments))
+					this.$Cache.set('installments', this.installments);
 				})
 			},
 			// 点击切换高亮
 			btnone(item, index) {
 				this.indexs = index
 				this.installments = item //点击后将内容赋值
-				localStorage.setItem('installments',JSON.stringify(this.installments))
+				this.$Cache.set('installments', this.installments);
 			},
 
 			goCat: function() {
diff --git a/config/app.js b/config/app.js
index 34beea3..472b3a2 100644
--- a/config/app.js
+++ b/config/app.js
@@ -8,7 +8,7 @@ module.exports = {
 		// HTTP_REQUEST_URL:'',
 		HTTP_REQUEST_URL: domain,
 		// H5商城地址
-		HTTP_H5_URL: 'http://117.50.215.20:20410',
+		HTTP_H5_URL: 'http://117.50.215.20:20410/',
 	// #endif
 	// #ifdef H5
 		HTTP_REQUEST_URL:domain,
diff --git a/manifest.json b/manifest.json
index d894717..3f06f8f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "crmeb",
-    "appid" : "__UNI__BF308B6",
+    "name" : "先享后付",
+    "appid" : "wx46c3a73d8c4f7051", //wxb74514b47a2f29d4  wx46c3a73d8c4f7051  __UNI__EB8A7B
     "description" : "crmeb商城",
     "versionName" : "2.1",
     "versionCode" : 2,
@@ -47,34 +47,7 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-                ],
+                "permissions" : [],
                 "abiFilters" : [ "armeabi-v7a" ],
                 "permissionExternalStorage" : {
                     "request" : "none",
@@ -176,7 +149,13 @@
                 }
             },
             "splashscreen" : {
-                "useOriginalMsgbox" : true
+                "useOriginalMsgbox" : true,
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/480.png",
+                    "xhdpi" : "unpackage/res/icons/1242.png",
+                    "xxhdpi" : "unpackage/res/icons/1082.png"
+                }
             }
         }
     },
@@ -184,7 +163,8 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxcda5a2b1b98b6a95",
+        "appid" : "wx46c3a73d8c4f7051",
+        "libVersion" : "latest",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -239,7 +219,7 @@
         "async" : {
             "timeout" : 200000
         },
-        "title" : "CRMEB"
+        "title" : "先享后付"
     },
     "plus" : {
         "statusbar" : {
diff --git a/pages.json b/pages.json
index fef231a..f727e09 100644
--- a/pages.json
+++ b/pages.json
@@ -645,6 +645,20 @@
 						}
 					}
 				},
+				{
+					"path": "pay_success/index",
+					"style": {
+						"navigationBarTitleText": "支付成功",
+						"navigationStyle": "custom",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "goods_logistics/index",
 					"style": {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index bd451d5..0b374f8 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -248,11 +248,11 @@
 				@showShare="showShare"></shareRedPackets>
 			<!-- 组件 -->
 			<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-				@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'
-				@getImg="showImg">
+				@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum"  id='product-window'
+				@getImg="showImg" @installments="installments">
 			</productWindow>
 			<couponListWindow :coupon='coupon' :typeNum="couponDeaultType[0].useType"
-				@ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
+				@ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons" 
 				@ChangCouponsUseState="ChangCouponsUseState" @tabCouponType="tabCouponType"></couponListWindow>
 			<!-- 分享按钮 -->
 			<view class="generate-posters" :class="posters ? 'on' : ''">
@@ -657,6 +657,11 @@
 			uni.$emit('scroll');
 		},
 		methods: {
+			// 
+		
+			
+			
+			
 			// 请求分期列表
 			// getfqList: function() {
 			// 	let data = {
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 280d2d5..fe1cba2 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -376,6 +376,7 @@
 				this.getOrderInfo();
 				this.payMode[1].number = this.userInfo.nowMoney;
 				this.$set(this, 'payMode', this.payMode);
+
 			} else {
 				toLogin();
 			}
@@ -504,6 +505,7 @@
 					that.$set(that, 'system_store', res.data.systemStore);
 					that.$set(that, 'id', res.data.id);
 					that.$set(that, 'cartInfo', res.data.orderInfoList);
+					console.log(this.orderInfo)
 					if (res.data.refundStatus != 0) {
 						that.isGoodsReturn = true;
 					};
diff --git a/pages/users/installment/index.vue b/pages/users/installment/index.vue
index a61c223..af619fa 100644
--- a/pages/users/installment/index.vue
+++ b/pages/users/installment/index.vue
@@ -3,12 +3,12 @@
 		<!-- 产品信息 -->
 		<view class="mobile">
 			<view class="ltpic">
-				<image src="../../../static/images/sj1.png" mode=""></image>
+				<image :src="cart[0].image" mode=""></image>
 			</view>
 			<view class="rtcan">
-				<text class="title">iPhone 14 Pro Max 现货 支持移动联通电信5q 双卡双待手...</text>
+				<text class="title">{{cart[0].productName}}</text>
 				<view class="combination">
-					<text>套餐:</text> <text>256G</text> <text>深空灰</text> <text>到期买断</text>
+					<text>套餐:</text> <text>{{cart[0].sku}}</text>
 				</view>
 				<view class="tenancy">
 					<text>租期:</text> <text>{{num}}期</text>
@@ -17,7 +17,7 @@
 					<text>间隔:</text> <text>30天</text>
 				</view>
 				<view class="tenancy">
-					<text>数量:</text> <text>1</text>
+					<text>数量:</text> <text>{{cart[0].payNum}}</text>
 				</view>
 			</view>
 		</view>
@@ -67,15 +67,17 @@
 		data() {
 			return {
 				installmentlist: [],
+				cart:[],
 				hireshou: '', //首期租金
 				sum:0,
 				num:0, //总租期
 			}
 		},
 		onLoad(option) {
+			this.cart = JSON.parse(option.cart)
 			this.installmentlist = JSON.parse(option.list)
 			this.hireshou = this.installmentlist[0].repaymentAmount
-			// console.log(this.installmentlist)
+
 		},
 		methods: {
 			// 返回上一页
@@ -117,6 +119,7 @@
 				image {
 					width: 220rpx;
 					height: 165rpx;
+					border-radius: 20rpx;
 				}
 			}
 
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index dcc5ee9..11ca29c 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -63,7 +63,7 @@
 						</image>
 					</view>
 					<view class="cen">
-						<text>完善身份信息</text>
+						<text>完善身份信息 &nbsp;&nbsp;{{sfxx}}</text>
 						<text>填写资料 加速审核</text>
 					</view>
 					<view class="rt">
@@ -149,29 +149,29 @@
 						<a @click="btnment">
 							<view class="planjh">
 								<text>分期计划</text>
-								<view class="datejt"><text class="detewz">{{fenqiname}}</text><uni-view
+								<view class="datejt"><text class="detewz">{{installmentobj.name}}</text><uni-view
 										data-v-064d693c="" class="iconfont icon-jiantou"></uni-view></view>
 							</view>
 						</a>
 						<view class="planjh">
 							<text>首付金额</text>
-							<view class="datejt"><text class="detewzs">￥256.00</text></view>
+							<view class="datejt"><text class="detewzs">￥{{fenqiobj.downPaymentAmount}}</text></view>
 						</view>
 						<view class="planjh">
 							<text>还款周期(间隔)</text>
-							<view class="datejt"><text class="detewzs">7天</text></view>
+							<view class="datejt"><text class="detewzs">{{fenqiobj.cycle}}天</text></view>
 						</view>
 						<view class="planjh">
 							<text>还款期数</text>
-							<view class="datejt"><text class="detewzs">12</text></view>
+							<view class="datejt"><text class="detewzs">{{fenqiobj.downPaymentNumber}}</text></view>
 						</view>
 						<view class="planjh">
 							<text>每期还款</text>
-							<view class="datejt"><text class="detewzs">￥256.00</text></view>
+							<view class="datejt"><text class="detewzs">￥{{fenqiobj.repaymentAmount}}</text></view>
 						</view>
 						<view class="planjh">
 							<text>合计付款</text>
-							<view class="datejt"><text class="detewzs">￥2561</text></view>
+							<view class="datejt"><text class="detewzs">￥{{fenqiobj.totalAmount}}</text></view>
 						</view>
 						<!-- 支付方式 -->
 						<!-- <view>支付方式</view>
@@ -382,6 +382,7 @@
 				addressList: [], //地址列表数据
 				orderProNum: 0,
 				preOrderNo: '', //预下单订单号
+				shopobj: {},
 				theme: app.globalData.theme,
 				formContent: '',
 				addressChangeId: 0,
@@ -389,7 +390,13 @@
 				installmentid: '', //分期id
 				fenqiname: '',
 				installmentarr: [],
-				checkeds: false
+				checkeds: false,
+				timeString: '',
+				shopmey: 0,
+				orderNo: '',
+				sfxx: '未完成',
+				fenqiobj: {} ,//分期还款信息
+				installmentobj:{}
 			};
 		},
 		computed: {
@@ -436,14 +443,20 @@
 			} else {
 				toLogin();
 			}
-			this.installmentid = JSON.parse(localStorage.getItem('installments')).id
-			this.fenqiname = JSON.parse(localStorage.getItem('installments')).name
+			
+			// this.installmentid = JSON.parse(localStorage.getItem('installments')).id
+			// this.fenqiname = JSON.parse(localStorage.getItem('installments')).name
+			this.installmentobj = JSON.parse(this.$Cache.get('installments'))
 			this.getinstallmentpost()
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
+			// console.log(this.$Cache.get('improvescode'))
+			if(this.$Cache.get('improvescode') == '操作成功'){
+					this.sfxx = '已完成'
+			}
 			let _this = this
 			// wx.getLaunchOptionsSync 
 			this.textareaStatus = true;
@@ -462,32 +475,22 @@
 				let data = {
 					preOrderNo: this.preOrderNo,
 					uid: this.$store.getters.uid,
-					comboId: this.installmentid
+					comboId: this.installmentobj.id
 				}
 				getinstallment(data).then(res => {
-					this.installmentarr = res.data
+					this.fenqiobj = res.data
+					this.installmentarr = res.data.userInstallmentBills
+
 				})
 			},
 			// 跳转到分期计划
 			btnment() {
+
 				uni.navigateTo({
-					url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr)
+					url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr) + '&cart=' +
+						JSON.stringify(this.cartInfo)
 				})
 			},
-
-			// 邮箱失焦事件
-			// inpblurs() {
-			// 	var aqq = /^[1-9][0-9]{4,10}@qq.com$/
-			// 	if (!aqq.test(this.emitext)) {
-			// 		return this.$util.Tips({
-			// 			title: '请填写正确的邮箱'
-			// 		});
-			// 	} else if (this.emitext == '') {
-			// 		return this.$util.Tips({
-			// 			title: '邮箱不能为空'
-			// 		});
-			// 	}
-			// },
 			// 点击跳转到完善信息页面
 			btnimprovess() {
 				uni.navigateTo({
@@ -501,9 +504,9 @@
 			// 订单详情
 			getloadPreOrder: function() {
 				loadPreOrderApi(this.preOrderNo).then(res => {
-
 					let orderInfoVo = res.data.orderInfoVo;
 					this.orderInfoVo = orderInfoVo;
+					this.shopmey = this.orderInfoVo.proTotalFee //商品金额
 					if (orderInfoVo.addressId && this.addressChangeId === 0) {
 						this.addressId = orderInfoVo.addressId;
 					} else {
@@ -523,9 +526,9 @@
 						.productType ===
 						'normal' ? true : false;
 				}).catch(err => {
-					uni.navigateTo({
-						url: '/pages/users/order_list/index'
-					});
+					// uni.navigateTo({
+					// 	url: '/pages/users/pay_success/index'
+					// });
 				})
 			},
 			/**
@@ -744,110 +747,110 @@
 					uni.hideLoading();
 					return that.$util.Tips({
 						title: err
-					}, '/pages/users/order_list/index');
-				});
-			},
-			getOrderPay: function(orderNo, message) {
-				let that = this;
-				let goPages = '/pages/order_pay_status/index?order_id=' + orderNo;
-				orderPay({
-					orderNo: orderNo,
-					payChannel: that.payChannel,
-					payType: that.payType,
-					scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
-				}).then(res => {
-					let jsConfig = res.data.jsConfig;
-					switch (res.data.payType) {
-						case 'weixin':
-							that.weixinPay(jsConfig, orderNo, goPages);
-							break;
-						case 'yue':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: message
-							}, {
-								tab: 5,
-								url: goPages + '&status=1'
-							});
-							break;
-						case 'weixinh5':
-							uni.hideLoading();
-							setTimeout(() => {
-								location.href = jsConfig.mwebUrl + '&redirect_url=' +
-									window.location
-									.protocol + '//' + window.location.host + goPages +
-									'&status=1';
-							}, 100)
-							break;
-						case 'alipay':
-							//#ifdef H5
-							if (this.$wechat.isWeixin()) {
-								uni.redirectTo({
-									url: `/pages/users/alipay_invoke/index?id=${orderNo}&type=order`
-								});
-							} else {
-								//h5支付
-								uni.hideLoading();
-								that.formContent = res.data.alipayRequest;
-								uni.setStorage({
-									key: 'orderNo',
-									data: orderNo
-								});
-								that.$nextTick(() => {
-									document.forms['punchout_form'].submit();
-								})
-							}
-							//#endif
-							// #ifdef APP-PLUS
-							let alipayRequest = res.data.alipayRequest;
-							uni.requestPayment({
-								provider: 'alipay',
-								orderInfo: alipayRequest,
-								success: (e) => {
-									uni.showToast({
-										title: "支付成功"
-									})
-									setTimeout(res => {
-										uni.navigateTo({
-											url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
-												orderNo +
-												'&payChannel=' +
-												'appAlipay'
-										})
-									}, 1000)
-								},
-								fail: (e) => {
-									console.log(e, '失败');
-									uni.showModal({
-										content: "支付失败",
-										showCancel: false,
-										success: function(res) {
-											if (res.confirm) {
-												//点击确认的操作
-												uni.navigateTo({
-													url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
-														orderNo +
-														'&payChannel=' +
-														'appAlipay'
-												})
-											}
-										}
-									})
-								},
-								complete: () => {
-									uni.hideLoading();
-								},
-							});
-							// #endif
-							break;
-					}
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					});
+					}, );
 				});
 			},
+			// getOrderPay: function(orderNo, message) {
+			// 	let that = this;
+			// 	let goPages = '/pages/order_pay_status/index?order_id=' + orderNo;
+			// 	orderPay({
+			// 		orderNo: orderNo,
+			// 		payChannel: that.payChannel,
+			// 		payType: that.payType,
+			// 		scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
+			// 	}).then(res => {
+			// 		let jsConfig = res.data.jsConfig;
+			// 		switch (res.data.payType) {
+			// 			case 'weixin':
+			// 				that.weixinPay(jsConfig, orderNo, goPages);
+			// 				break;
+			// 			case 'yue':
+			// 				uni.hideLoading();
+			// 				return that.$util.Tips({
+			// 					title: message
+			// 				}, {
+			// 					tab: 5,
+			// 					url: goPages + '&status=1'
+			// 				});
+			// 				break;
+			// 			case 'weixinh5':
+			// 				uni.hideLoading();
+			// 				setTimeout(() => {
+			// 					location.href = jsConfig.mwebUrl + '&redirect_url=' +
+			// 						window.location
+			// 						.protocol + '//' + window.location.host + goPages +
+			// 						'&status=1';
+			// 				}, 100)
+			// 				break;
+			// 			case 'alipay':
+			// 				//#ifdef H5
+			// 				if (this.$wechat.isWeixin()) {
+			// 					uni.redirectTo({
+			// 						url: `/pages/users/alipay_invoke/index?id=${orderNo}&type=order`
+			// 					});
+			// 				} else {
+			// 					//h5支付
+			// 					uni.hideLoading();
+			// 					that.formContent = res.data.alipayRequest;
+			// 					uni.setStorage({
+			// 						key: 'orderNo',
+			// 						data: orderNo
+			// 					});
+			// 					that.$nextTick(() => {
+			// 						document.forms['punchout_form'].submit();
+			// 					})
+			// 				}
+			// 				//#endif
+			// 				// #ifdef APP-PLUS
+			// 				let alipayRequest = res.data.alipayRequest;
+			// 				uni.requestPayment({
+			// 					provider: 'alipay',
+			// 					orderInfo: alipayRequest,
+			// 					success: (e) => {
+			// 						uni.showToast({
+			// 							title: "支付成功"
+			// 						})
+			// 						setTimeout(res => {
+			// 							uni.navigateTo({
+			// 								url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
+			// 									orderNo +
+			// 									'&payChannel=' +
+			// 									'appAlipay'
+			// 							})
+			// 						}, 1000)
+			// 					},
+			// 					fail: (e) => {
+			// 						console.log(e, '失败');
+			// 						uni.showModal({
+			// 							content: "支付失败",
+			// 							showCancel: false,
+			// 							success: function(res) {
+			// 								if (res.confirm) {
+			// 									//点击确认的操作
+			// 									uni.navigateTo({
+			// 										url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
+			// 											orderNo +
+			// 											'&payChannel=' +
+			// 											'appAlipay'
+			// 									})
+			// 								}
+			// 							}
+			// 						})
+			// 					},
+			// 					complete: () => {
+			// 						uni.hideLoading();
+			// 					},
+			// 				});
+			// 				// #endif
+			// 				break;
+			// 		}
+			// 	}).catch(err => {
+			// 		uni.hideLoading();
+			// 		return that.$util.Tips({
+			// 			title: err
+			// 		});
+			// 	});
+			// },
 			weixinPay(jsConfig, orderNo, goPages) {
 				let that = this;
 				// #ifdef MP
@@ -883,7 +886,6 @@
 							})
 						},
 						fail: function(e) {
-							console.log(e)
 							uni.hideLoading();
 							return that.$util.Tips({
 								title: '取消支付'
@@ -935,7 +937,6 @@
 							})
 						},
 						fail: function(e) {
-							console.log(e)
 							uni.hideLoading();
 							return that.$util.Tips({
 								title: '取消支付'
@@ -1083,6 +1084,10 @@
 					return this.$util.Tips({
 						title: '请勾选并同意政策'
 					});
+				} else if (this.sfxx == '未完成') {
+					return this.$util.Tips({
+						title: '请填写身份信息'
+					});
 				} else {
 					data = {
 						realName: that.contacts,
@@ -1097,8 +1102,8 @@
 						shippingType: that.$util.$h.Add(that.shippingType, 1),
 						payChannel: that.payChannel,
 						uid: this.$store.getters.uid,
-						systemInstallmentsComboId:this.installmentid,
-						type:2,
+						systemInstallmentsComboId:this.installmentobj.id,
+						type: 2,
 					};
 					if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
 						return that.$util.Tips({
@@ -1115,8 +1120,27 @@
 					// #ifndef MP
 					that.payment(data);
 					// #endif
+
+					let now = new Date();
+					let year = now.getFullYear(); // 获取年份  
+					let month = now.getMonth() + 1; // 获取月份（注意，月份从0开始计数，所以需要加1）  
+					let day = now.getDate(); // 获取日期  
+					let shi = now.toLocaleTimeString(); // 获取本地时间字符串
+					this.timeString = year + '-' + month + '-' + day + ' ' + shi
+
+					this.shopobj.shopmey = this.shopmey
+					this.shopobj.date = this.timeString
+					this.shopobj.preOrderNo = this.preOrderNo
+				
+
+
+
+					uni.navigateTo({
+						url: '/pages/users/pay_success/index?shopobj=' + JSON.stringify(this.shopobj)
+					})
 				}
 
+
 				// uni.navigateTo({
 				// 	url: '/pages/users/purchase_succeed/index'
 				// })
diff --git a/pages/users/order_improves/index.vue b/pages/users/order_improves/index.vue
index e8e0fc1..3ac5a62 100644
--- a/pages/users/order_improves/index.vue
+++ b/pages/users/order_improves/index.vue
@@ -61,13 +61,28 @@
 			<view class="names">
 				<text>联系人手机</text> <input type="text" v-model="teltwo" @blur="telinptwo" placeholder="请输入联系人手机" />
 			</view>
-			<view class="addname">
+			<view class="addname" v-if="flags">
 				<a href="javascript:;" @click="btnadd">
 					<view class="add">+</view>
 					<text>继续添加(有助于提高审核成功率)</text>
 				</a>
 			</view>
 		</view>
+		<!-- 隐藏 -->
+		<view class="emergency_contact" v-if="flaglxr">
+			<view class="name" @click="openPopupadd('bottomadd')">
+				<view class="jinj">紧急联系人</view>
+				<view class="lianx"><text>{{lxrmorenadd}}</text> <uni-view data-v-064d693c=""
+						class="iconfont icon-jiantou"></uni-view></view>
+			</view>
+			<view class="name">
+				<text>联系人姓名</text> <input type="text" v-model="realNameadd" @blur="realNameinpadd"
+					placeholder="请输入联系人姓名" />
+			</view>
+			<view class="name">
+				<text>联系人手机</text> <input type="text" v-model="teladd" @blur="telinpadd" placeholder="请输入联系人手机" />
+			</view>
+		</view>
 		<!-- 常用邮箱 -->
 		<view class="cye_mail">
 			<view class="email">
@@ -98,6 +113,12 @@
 				<view @click="btnlxrs(item)" v-for="(item,index) in lxrarr" :key="index">{{item}}</view>
 			</view>
 		</liu-popup>
+		<!-- 多次添加 -->
+		<liu-popup type="bottom" ref="bottomadd" class="boxlist">
+			<view class="lxrlist">
+				<view @click="btnlxradd(item)" v-for="(item,index) in lxrarr" :key="index">{{item}}</view>
+			</view>
+		</liu-popup>
 	</view>
 </template>
 
@@ -128,6 +149,12 @@
 				emitext: '', //邮箱
 				shenfenpic: '', //身份证正面的base64格式
 				shenfenpics: '', //身份证反面的base64格式
+				flaglxr:false,
+				flags:true,
+				lxrmorenadd:'请选择您与联系人的关系',
+				teladd:'',
+				realNameadd:''
+				
 			}
 		},
 		onLoad() {
@@ -180,6 +207,35 @@
 					});
 				}
 			},
+			telinpadd(){
+				let photopatten = /^1[3456789]\d{9}$/
+				if (this.teladd == '') {
+					return this.$util.Tips({
+						title: '手机号不能为空'
+					});
+				} else if (photopatten.test(this.teladd)) {
+				
+				} else {
+					return this.$util.Tips({
+						title: '请填写正确的手机号'
+					});
+				}
+			},
+			realNameinpadd(){
+				let that = this
+				let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/
+				if (this.realNameadd == '') {
+					return that.$util.Tips({
+						title: '姓名不能为空'
+					});
+				} else if (namepatten.test(this.realNameadd)) {
+				
+				} else {
+					return that.$util.Tips({
+						title: '请填写正确的姓名'
+					});
+				}
+			},
 			// 判断身份证
 			idcardinp() {
 				let result = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/
@@ -259,6 +315,9 @@
 			openPopups(e) {
 				this.$refs[e].open();
 			},
+			openPopupadd(e){
+				this.$refs[e].open();
+			},
 			// 选择联系人关系
 			btnlxr(val) {
 				this.lxrmoren = val
@@ -266,7 +325,9 @@
 			btnlxrs(val) {
 				this.lxrmorens = val
 			},
-
+            btnlxradd(val){
+				this.lxrmorenadd = val
+			},
 			// 判断邮箱
 			emitextinp() {
 				let aqq = /^[1-9][0-9]{4,10}@qq.com$/
@@ -395,13 +456,18 @@
 				}
 				getInformation(data).then(res => {
 					let data = res.data;
-					console.log(data)
+					// 身份认证成功存储
+					this.$Cache.set('improvescode', res.message);
+					uni.navigateBack({
+						delta: 1
+					})
 				})
 			},
 
 			// 点击继续添加联系人
 			btnadd() {
-				// console.log(this.$store.getters.uid)
+				 this.flaglxr = true
+				 this.flags = false
 			},
 
 
@@ -482,7 +548,6 @@
 		padding: 20rpx 30rpx !important;
 		box-sizing: border-box;
 		color: gray;
-
 		view:hover {
 			background-color: aqua;
 			color: #000;
@@ -521,7 +586,7 @@
 		background-color: rgb(228, 228, 228);
 		padding: 20rpx;
 		box-sizing: border-box;
-		font-size: 11px !important;
+		font-size: 12px !important;
 
 		// 身份姓名手机号信息
 		.nameshenfen {
@@ -639,7 +704,7 @@
 				border-bottom: 1px solid #ccc;
 
 				.jinj {
-					width: 160rpx;
+					width:320rpx;
 				}
 
 				input {
@@ -647,14 +712,14 @@
 					line-height: 80rpx;
 					font-size: 11px;
 					width: 45%;
-					margin-left: 80rpx;
+					margin-left: 100rpx;
 				}
 
 				.lianx {
 					width: 100%;
 					display: flex;
 					justify-content: space-between;
-					margin-left: 80rpx;
+					// margin-left: 20rpx;
 
 					text {
 						margin-right: 80rpx;
@@ -697,7 +762,7 @@
 					line-height: 80rpx;
 					font-size: 11px;
 					width: 45%;
-					margin-left: 80rpx;
+					margin-left: 100rpx;
 				}
 
 				.lianx {
diff --git a/pages/users/pay_success/index.vue b/pages/users/pay_success/index.vue
new file mode 100644
index 0000000..478f436
--- /dev/null
+++ b/pages/users/pay_success/index.vue
@@ -0,0 +1,110 @@
+<template>
+	<view class="Pay_success">
+		<view class="successbox">
+			<image src="../../../static/images/success.png" mode=""></image>
+			<view class="title">
+				 申请成功，请等待审核
+			</view>
+			<view class="content">
+				<view class="bd">
+					<view class="">订单编号</view> <text>{{shopobj.preOrderNo.length > 30 ? shopobj.preOrderNo.slice(0, 30) + '...' : shopobj.preOrderNo}}</text>
+				</view>
+				<view class="bd">
+					<view class="">下单时间</view> <text>{{shopobj.date}}</text>
+				</view>
+				<view class="bd">
+					<view class="">支付方式</view> <text>分期支付</text>
+				</view>
+				<view class="bd">
+					<view class="">支付金额</view> <text>{{shopobj.shopmey}}</text>
+				</view>
+			</view>
+			<navigator url="../../../pages/users/order_list/index" class="ckdj">查看订单</navigator>
+			<navigator url="../../../pages/index/index" open-type="switchTab" class="fhsy">返回首页</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			   shopobj:{}
+			}
+		},
+		onLoad(option) {
+			this.shopobj = JSON.parse(option.shopobj)
+		},
+		methods: {
+		
+		},
+		mounted() {
+		
+		}
+	}
+	
+	
+</script>
+
+<style lang="less">
+	 .Pay_success{
+		 width: 100%;
+		 margin-top: 200rpx;
+		 background-color: #fff;
+		 padding-bottom: 80rpx;
+		 .successbox{
+			 position: relative;
+			 width: 100%;
+			 box-sizing: border-box;
+			 padding: 0 40rpx;
+			 image{
+				 position: absolute;
+				 top: -65rpx;
+				 left: 50%;
+				 transform: translateX(-50%);
+				 width: 138rpx;
+				 height: 138rpx;
+			 }
+			 .title{
+				 width: 100%;
+				 text-align: center;
+				 padding-top: 100rpx;
+				 box-sizing: border-box;
+				 font-weight: 700;
+				 line-height: 120rpx;
+				 border-bottom: 1px solid #ccc;
+			 }
+			 .content{
+				 .bd{
+					 display: flex;
+					 width: 100%;
+					 justify-content: space-between;
+					 margin-top: 20rpx;
+					 text{
+						 color: #666;
+					 }
+				 }
+			 }
+			 .ckdj{
+				 width: 100%;
+				 height: 84rpx;
+				 border: 1px solid #ccc;
+				 border-radius: 50rpx;
+				 line-height: 84rpx;
+				 text-align: center;
+				 margin-top: 50rpx;
+				 background-color: #42ca4d;
+				 color: #fff;
+			 }
+			 .fhsy{
+				 width: 100%;
+				 height: 84rpx;
+				 border: 1px solid #ccc;
+				 border-radius: 50rpx;
+				 line-height: 84rpx;
+				 text-align: center;
+				 margin-top: 50rpx;
+			 }
+		 }
+	 }
+</style>
\ No newline at end of file
diff --git a/pages/users/repayment/index.vue b/pages/users/repayment/index.vue
index 0b0b9da..7252842 100644
--- a/pages/users/repayment/index.vue
+++ b/pages/users/repayment/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="repaymentbox">
 		<view class="repaymenttext">
-				<a href="javascript:;" :class="index == 0 ? 'active' : ''" :v-model="index" @click="btnhk">待还款</a>
-				<a href="javascript:;" :class="index == 1 ? 'active' : ''" :v-model="index" @click="btnjq">已结清</a>
+			<a href="javascript:;" :class="index == 0 ? 'active' : ''" v-model="index" @click="btnhk">待还款</a>
+			<a href="javascript:;" :class="index == 1 ? 'active' : ''" v-model="index" @click="btnjq">已结清</a>
 		</view>
 		<view class="repaymentlist" v-for="(item,index) in binglist" :key="index">
 			<view class="lt">
@@ -14,7 +14,9 @@
 				</view>
 				<view class="xuhuan">
 					<text>须还金额：</text><text>￥{{item.repaymentAmount}}</text>
-					<view class="yuqi">{{item.repaymentStatus = 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期'}}</view>
+					<view class="yuqi">
+						{{item.repaymentStatus == 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期'}}</view>
+					<!-- 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期' -->
 				</view>
 			</view>
 			<view class="rt">
@@ -25,39 +27,41 @@
 </template>
 
 <script>
-	import {getreceivable} from '@/api/api.js'
+	import {
+		getreceivable
+	} from '@/api/api.js'
 	export default {
 		data() {
 			return {
 				index: 0,
-				binglist:[],
-				title:'还款'
+				binglist: [],
+				title: '还款'
 			}
 		},
 		onLoad() {
-            this.getData()
+			this.getData()
 		},
 		methods: {
 			btnhk() {
 				this.index = 0
 				this.title = '还款'
-			   this.getData()
+				this.getData()
 			},
 			btnjq() {
 				this.index = 1
 				this.title = '已结清'
-			    this.getData()
+				this.getData()
 			},
 			// 请求分期还款
-			getData:function(){
+			getData: function() {
 				let data = {
-					uid:this.$store.getters.uid,
-					type:this.index
+					uid: this.$store.getters.uid,
+					type: this.index
 				}
 				getreceivable(data).then(res => {
 					this.binglist = res.data
 				})
-			},
+			}
 		}
 	}
 </script>
@@ -84,7 +88,8 @@
 			box-sizing: border-box;
 			padding-top: 108rpx;
 			padding-bottom: 16rpx;
-            display: flex;
+			display: flex;
+
 			a {
 				text-decoration: none;
 				color: rgba(166, 166, 166, 1);
@@ -109,7 +114,6 @@
 					color: rgba(33, 37, 41, 0.6);
 
 					.yuqi {
-						// width: 80rpx;
 						padding: 0 10rpx;
 						box-sizing: border-box;
 						height: 40rpx;
@@ -128,10 +132,12 @@
 					color: rgba(33, 37, 41, 0.6);
 				}
 
-				.rq {}
+				.rq {
+					line-height: 50rpx;
+					color: rgba(33, 37, 41, 0.6);
+				}
+
 
-				line-height: 50rpx;
-				color: rgba(33, 37, 41, 0.6);
 			}
 
 			.rt {
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 8a0aec2..ce51e11 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -198,6 +198,8 @@
 			outLogin: function() {
 				let that = this;
 				if (that.loginType == 'h5') {
+					// 点击退出登录替换身份验证，需要重新身份验证
+					this.$Cache.set('improvescode', '操作失败');
 					uni.showModal({
 						title: '提示',
 						content: '确认退出登录?',
@@ -218,7 +220,7 @@
 										uni.hideLoading();
 									});
 							} else if (res.cancel) {
-								console.log('用户点击取消');
+								// console.log('用户点击取消');
 							}
 						}
 					});
diff --git a/project.config.json b/project.config.json
index 79069d1..cbf7736 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-    "appid": "wxb74514b47a2f29d4",
+    "appid": "wx46c3a73d8c4f7051", //wx46c3a73d8c4f7051  wxb74514b47a2f29d4
     "compileType": "miniprogram",
     "libVersion": "3.3.1",
     "packOptions": {
diff --git a/static/images/succeed.png b/static/images/succeed.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fb7bd953373268b2076b20d9220b38ab2128e62
GIT binary patch
literal 2154
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

literal 0
HcmV?d00001

diff --git a/static/images/success.png b/static/images/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..013d2253f0a2cbf7c8811d8d24f591f34636d9dd
GIT binary patch
literal 2457
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
XnksE(TB0_700000NkvXXu0mjfLdlL8

literal 0
HcmV?d00001