achao 3 gadi atpakaļ
vecāks
revīzija
cf7bf37ce1

+ 3 - 3
pages/goodSource/index.vue

@@ -131,7 +131,7 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
-				confirmText: '',
+					confirmText: '确定',
 				showCancelButton: true,
 				isFirstIndex: null,
 				ObjSelect: {},
@@ -234,7 +234,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
+				this.alertTitle == '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -269,7 +269,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {

+ 14 - 14
pages/mine/driverCertificationNext.vue

@@ -35,7 +35,7 @@
 					</view>
 					<image class="" :src="dataDetails.driverLicenseBackPage" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">驾驶证有效截止日期</view>
 					<view class="" @click="selectValidityPeriod(0)">
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'选择有效截止日期>'}}
@@ -68,13 +68,13 @@
 					</view>
 					<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">行驶证档案编号</view>
-					<u--input placeholder="输入行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.drivingLicenseNumber">
+					<u--input placeholder="输入行驶证档案编号" inputAlign='right' border="none" v-model="dataDetails.drivingLicenseNumber">
 					</u--input>
 				</view>
 
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">行驶证有效期</view>
 					<view class="" @click="selectValidityPeriod(1)">
 						{{dataDetails.drivingLicenseValidityDate?dataDetails.drivingLicenseValidityDate:'选择有效截止日期>'}}
@@ -83,7 +83,7 @@
 
 
 				<view class="" v-if="isGCar">
-					<view class="title row flex">挂车行驶证主页</view>
+					<view class="title">挂车行驶证主页</view>
 					<view @click="uploadImg(5)" class="picture picture5" v-if="!dataDetails.trailerLicenseHomePage">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车行驶证主页</view>
@@ -98,7 +98,7 @@
 					</view>
 				</view>
 				<view v-if="isGCar">
-					<view class="title row flex">挂车行驶证副页</view>
+					<view class="title">挂车行驶证副页</view>
 					<view @click="uploadImg(6)" class="picture picture6" v-if="!dataDetails.trailerLicenseBackPage">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车行驶证副页</view>
@@ -114,11 +114,11 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">挂车行驶证档案编号</view>
-					<u--input placeholder="输入挂车行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.trailerLicenseNumber">
+					<u--input placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none" v-model="dataDetails.trailerLicenseNumber">
 					</u--input>
 				</view>
 
-				<view class="flex row" v-if="isGCar">
+				<view class="flex row flex-space-between" v-if="isGCar">
 					<view class="left-text">挂车行驶证有效期</view>
 					<view class="" @click="selectValidityPeriod(2)">
 						{{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期>'}}
@@ -138,7 +138,7 @@
 					</view>
 					<image class="" :src="dataDetails.qualificationCertificate" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">从业资格证有效期</view>
 					<view></view>
 					<view class="" @click="selectValidityPeriod(3)">
@@ -161,10 +161,10 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">道路运输证号</view>
-					<u--input placeholder="输入道路运输证号" inputAlign='left' border="none" v-model="dataDetails.operationCertificateNumber">
+					<u--input placeholder="输入道路运输证号" inputAlign='right' border="none" v-model="dataDetails.operationCertificateNumber">
 					</u--input>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(4)">
 						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
@@ -172,7 +172,7 @@
 				</view>
 
 				<view v-if="isGCar">
-					<view class="title row flex">挂车道路运输证</view>
+					<view class="title">挂车道路运输证</view>
 					<view @click="uploadImg(9)" class="picture picture9"
 						v-if="!dataDetails.trailerOperationCertificate">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
@@ -189,11 +189,11 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">挂车道路运输证号</view>
-					<u--input placeholder="输入挂车道路运输证号" inputAlign='left' border="none" v-model="dataDetails.trailerOperationCertificateNumber">
+					<u--input placeholder="输入挂车道路运输证号" inputAlign='right' border="none" v-model="dataDetails.trailerOperationCertificateNumber">
 					</u--input>
 				</view>
 
-				<view class="flex row" v-if="isGCar">
+				<view class="flex row flex-space-between" v-if="isGCar">
 					<view class="left-text">挂车道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(5)">
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}

+ 6 - 6
pages/mine/index.vue

@@ -110,14 +110,14 @@
 	export default {
 		data() {
 			return {
-				confirmText: '',
+				confirmText: '确定',
 				showCancelButton: true,
 				userName: '',
 				phone: '',
 				headUrl: "../../static/images/myimg/YongHu@3x.png",
 				isShowAlert: false,
-				alertTitle: '提示',
-				alertContent: '您尚未登录,是否立即登录?',
+				alertTitle: '您尚未登录,是否立即登录?',
+				// alertContent: '您尚未登录,是否立即登录?',
 				statusVal: '',
 				isFirstRZ: null,
 				driverCall: '',
@@ -169,7 +169,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
+				this.alertTitle == '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -239,7 +239,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {
@@ -258,7 +258,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {
-					if (type == 1 && this.statusVal == '已认证') {
+					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期') {
 						src = '/pages/mine/editDriverCertification'
 					}
 					console.log('this.isFirstSH', this.isFirstSH)

+ 1 - 4
pages/mine/manageBankCards/addBankCard.vue

@@ -195,7 +195,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功
 									console.log('图片地址', result)
@@ -204,9 +204,6 @@
 												bankImg: result,
 											}).then(res => {
 											console.log(res)
-
-
-
 											_this.dataDetails.payeeAddressUrl = result
 											if (res.data.bankNo) {
 												_this.dataDetails.bankCard = res.data.bankNo

+ 22 - 19
pages/mine/manageBankCards/index.vue

@@ -16,7 +16,7 @@
 			<view class="card-list-item" :style='{"background-image":"url("+item.cardColor+")"}'>
 				<view class="flex flex-end number carNumber">{{item.bankCard}}</view>
 				<view class="flex align-center">
-					<!-- @/static/images/mine/bank/gflogo@2x.png -->
+					<!-- @/static/images/mine/bank/gflogo.png -->
 					<image class="img left" :src="item.imgLogo" mode='widthFix'>
 					</image>
 					<view class="right">
@@ -129,54 +129,56 @@
 					}).then(res => {
 						if (res.code == '200') {
 							debugger
+							console.log('``````````````````````````````')
+							console.log(res.data)
 							this.bankList = res.data
 							for (let i = 0; i < this.bankList.length; i++) {
 								let _obj = this.bankList[i]
 								_obj.bankCard = this.number(_obj.bankCard)
 								switch (_obj.bankDeposit) {
 									case "建设银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
 										break
 									case "招商银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/zhaoshang@2x(1).png"
+											"../../../static/images/mine/bank/zhaoshang.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "中国银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "邮政银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/youzhenglogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh@2x.png"
+											"../../../static/images/mine/bank/youzhenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
 										break
 									case "交通银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/jiaotognlogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh@2x.png"
+											"../../../static/images/mine/bank/jiaotognlogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
 										break
 									case "工商银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "农业银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
 										break
 									case "民生银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/minshenglogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh@2x.png"
+											"../../../static/images/mine/bank/minshenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
 										break
 									case "中信银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/zhongxinlogo@2x.png"
+											"../../../static/images/mine/bank/zhongxinlogo.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "广发银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "华夏银行":
@@ -185,14 +187,15 @@
 										break
 									case "兴业银行":
 										this.bankList[i].imgLogo = "../../../static/images/mine/bank/xingye.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh@2x.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
 										break
 									default:
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt.png"
 										break
 								}
 							}
+							this.$forceUpdate()
 						} else {
 							uni.$u.toast(res.message);
 						}

+ 6 - 5
pages/news/index.vue

@@ -42,7 +42,7 @@
 				<view class="flex flex-space-between">
 					您的驾驶证即将到期,请尽快到“我的-身份认证”中更新,逾期将影响运费支付。
 				</view> -->
-				<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
+				<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true'
 					:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick"
 					@close="cancelClick" @cancel="cancelClick"></u-modal>
 			</view>
@@ -60,7 +60,7 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
-				confirmText: '',
+					confirmText: '确定',
 				showCancelButton: true,
 				isShowAlert: false,
 				alertTitle: '',
@@ -82,7 +82,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
+				this.alertTitle == '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -123,7 +123,7 @@
 		methods: {
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {
@@ -226,7 +226,8 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-						this.news = res.data.records
+						this.news = this.news.concat(res.data.records); //追加新数据
+						// this.news = res.data.records
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
 					})
 					.catch(res => {

+ 3 - 3
pages/order/index.vue

@@ -177,7 +177,7 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
-				confirmText: '',
+					confirmText: '确定',
 				showCancelButton: true,
 				showMenu: false,
 				searchStyle: {
@@ -276,7 +276,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
+				this.alertTitle == '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -397,7 +397,7 @@
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {

+ 0 - 0
static/images/mine/bank/gflogo@2x.png → static/images/mine/bank/gflogo.png


+ 0 - 0
static/images/mine/bank/gslogo@2x.png → static/images/mine/bank/gslogo.png


+ 0 - 0
static/images/mine/bank/jh@2x.png → static/images/mine/bank/jh.png


+ 0 - 0
static/images/mine/bank/jiansheogo@2x.png → static/images/mine/bank/jiansheogo.png


+ 0 - 0
static/images/mine/bank/jiaotognlogo@2x.png → static/images/mine/bank/jiaotognlogo.png


+ 0 - 0
static/images/mine/bank/minshenglogo@2x.png → static/images/mine/bank/minshenglogo.png


+ 0 - 0
static/images/mine/bank/nh@2x.png → static/images/mine/bank/nh.png


+ 0 - 0
static/images/mine/bank/nongyelogo@2x.png → static/images/mine/bank/nongyelogo.png


+ 0 - 0
static/images/mine/bank/qitalogo@2x.png → static/images/mine/bank/qitalogo.png


+ 0 - 0
static/images/mine/bank/qt@2x.png → static/images/mine/bank/qt.png


+ 0 - 0
static/images/mine/bank/youzhenglogo@2x.png → static/images/mine/bank/youzhenglogo.png


+ 0 - 0
static/images/mine/bank/zhaoshang@2x(1).png → static/images/mine/bank/zhaoshang.png


+ 0 - 0
static/images/mine/bank/zhongxinlogo@2x.png → static/images/mine/bank/zhongxinlogo.png


+ 0 - 0
static/images/mine/bank/zhongyin@2x.png → static/images/mine/bank/zhongyin.png