更新

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.120:8090/',
-	baseUrlNew: 'http://api.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.114:9100/',
+	// baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageD/identity/companyIdentity.vue

@@ -29,12 +29,12 @@
 		<view v-else>
 			<view>
 				<!-- 个人身份证正面 -->
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+				<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
 					:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 					:custom="uploadCustom1" @on-progress="onProgress"></upload>
 				<!-- 个人身份证反面 -->
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+				<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
 					:size-type="['compressed']" @on-success="getImgUrl2" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 					:custom="uploadCustom2" @on-progress="onProgress"></upload>
@@ -75,7 +75,6 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
-				imgUrls: [],
 				uploadCustom: true,
 				uploadCustom1: true,
 				uploadCustom2:true,
@@ -136,7 +135,6 @@
 			getImgUrl(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				this.imgUrls.push(res);
 				this.identityAuthenticationInfo.businessLicenseAddressUrl = res
 			},
 			// 身份证正面
@@ -208,7 +206,6 @@
 				console.log(e)
 			},
 			onRemove(index) {
-				this.imgUrls.splice(index, 1);
 			},
 			jumpUrl() {
 				if (this.consentStatus) {

pageD/identity/companyIdentityThree.vue

@@ -342,24 +342,28 @@
 			},
 			amendprice() {
 				var that = this
-				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
-						phone: this.identityAuthenticationInfo.customerPhone,
-						verifyCode: this.verifyCode
-					}).then(res => {
-						if (res.data.code == 200) {
-							if (that.userInfo) {
-								that.identityAuthenticationInfo.commonId = that.userInfo.id
-							} else {
-								that.identityAuthenticationInfo.commonId = res.data.data.id
-							}
-							that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
-							that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-							uni.showModal({
-								content: "粮商身份信息审核通过后不可修改，是否确定提交？",
-								showCancel: true,
-								confirmText: '确定',
-								success: function(res) {
-									if (res.confirm) {
+				uni.showModal({
+					content: "粮商身份信息审核通过后不可修改，是否确定提交？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title:"正在提交",
+								mask:true
+							})
+							that.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+									phone: that.identityAuthenticationInfo.customerPhone,
+									verifyCode: that.verifyCode
+								}).then(res => {
+									if (res.data.code == 200) {
+										if (that.userInfo) {
+											that.identityAuthenticationInfo.commonId = that.userInfo.id
+										} else {
+											that.identityAuthenticationInfo.commonId = res.data.data.id
+										}
+										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
+										that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 										that.identityAuthenticationInfos.customerPhone = that
 											.identityAuthenticationInfo.customerPhone
 										that.$api.doRequest('get',
@@ -378,17 +382,15 @@
 																		.identityAuthenticationInfo
 																		)
 																	.then(res => {
-																		if (res.data
-																			.code ==
-																			200) {
+																		if (res.data.code ==200) {
 																			uni.showToast({
 																				title: '提交成功',
 																				icon: 'none',
 																				duration: 2000
 																			})
-																			uni.navigateBack({
+																			setTimeout(()=>{uni.navigateBack({
 																				delta: 3
-																			})
+																			})},2000);
 																		}
 																	})
 															}
@@ -405,11 +407,13 @@
 																	icon: 'none',
 																	duration: 2000
 																})
-																uni.navigateBack({
+																setTimeout(()=>{uni.navigateBack({
 																	delta: 3
-																})
+																})},2000);
+																
 															}
 															else{
+																console.log("异常1:",res)
 																uni.showToast({
 																	title: "系统异常，请联系管理员",
 																	icon: 'none',
@@ -418,37 +422,44 @@
 															}
 														})
 												}
+												uni.hideLoading()
 											}).catch(res => {
+												console.log("异常:",res)
 												uni.showToast({
 													title: "系统异常，请联系管理员",
 													icon: 'none',
 													duration: 2000
 												})
+												uni.hideLoading()
 											})
-									} else if (res.cancel) {
-										// console.log('用户点击取消');
+									} else {
+										that.verification = false
+										uni.showToast({
+											title: res.data.message,
+											icon: 'none',
+											duration: 2000
+										})
+										uni.hideLoading()
+										return false
 									}
-								}
-							})
-						} else {
-							that.verification = false
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							return false
+								})
+								.catch(res => {
+									that.verification = false
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+									return false
+								});
+							
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
 						}
-					})
-					.catch(res => {
-						that.verification = false
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-						return false
-					});
+					}
+				})
+				
 			},
 			getcode() {
 				var that = this

pageD/identity/driverIdentityThree.vue

@@ -208,6 +208,10 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title:"正在提交",
+								mask:true
+							})
 							that.$api.doRequest('get', '/driverViewInfo/selectPhone', that
 									.identityAuthenticationInfo)
 								.then(res => {
@@ -229,9 +233,9 @@
 																icon: 'none',
 																duration: 2000
 															})
-															uni.navigateBack({
+															setTimeout(()=>{uni.navigateBack({
 																delta: 3
-															})
+															})},2000);
 														} else if (res.data.code ==
 															'ERROR002') {
 															uni.showModal({
@@ -259,9 +263,9 @@
 													icon: 'none',
 													duration: 2000
 												})
-												uni.navigateBack({
+												setTimeout(()=>{uni.navigateBack({
 													delta: 3
-												})
+												})},2000);
 											} else if (res.data.code == 'ERROR002') {
 												uni.showModal({
 													title: '提示',
@@ -275,12 +279,14 @@
 											}
 										})
 									}
+									uni.hideLoading()
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
 										icon: 'none',
 										duration: 2000
 									})
+									uni.hideLoading()
 								})
 
 

pages.json

@@ -22,12 +22,12 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			// {
-			// 	"pagePath": "pages/grain_pulse/home",
-			// 	"iconPath": "static/img/liangmai.png",
-			// 	"selectedIconPath": "static/img/liangmai_check.png",
-			// 	"text": "粮脉"
-			// },
+			{
+				"pagePath": "pages/grain_pulse/home",
+				"iconPath": "static/img/liangmai.png",
+				"selectedIconPath": "static/img/liangmai_check.png",
+				"text": "粮脉"
+			},
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",

pages/user/user.vue

@@ -131,7 +131,7 @@
 						src:'../../static/img/sign/liangmai.png',
 						tips: 0,
 						url: '/pages/grain_pulse/my_grain_pulse',
-						show: false
+						show: true
 					},
 					{
 						num: 4,