Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

pages/mine/manageBankCards/index.vue

@@ -90,18 +90,29 @@
 			radioChange(val) {
 				for (let i = 0; i < this.bankList.length; i++) {
 					if (val.id == this.bankList[i].id) {
-						this.bankList[i].defaultFlag = 1
+						if(this.bankList[i].defaultFlag == 1){
+							this.bankList[i].defaultFlag = 0
+							this.bankList[i].flag = 2 //取消标志
+						}else{
+							this.bankList[i].defaultFlag = 1
+								this.bankList[i].flag = 1 //设置标志
+						}
 						this.$request.baseRequest('post', '/driverPayeeInfo/api/setDefault', val).then(res => {
 								if (res.code == '200') {
-									// this.bankList = res.data
-									this.$refs.uToast.show({
-										type: 'success',
-										message: "设置成功！",
-									})
+									if(this.bankList[i].flag == 1){
+										this.$refs.uToast.show({
+											type: 'success',
+											message: "设置成功！",
+										})
+									}else{
+										this.$refs.uToast.show({
+											type: 'success',
+											message: "取消成功！",
+										})
+									}
 								} else {
 									uni.$u.toast(res.message);
 								}
-
 							})
 							.catch(res => {
 								uni.$u.toast(res.message);

pages/mine/settings/editPassword.vue

@@ -149,7 +149,7 @@
 				this.$request.baseRequest('post','/commonUser/resetPassword',{phone:this.phone,password:this.password,verifyCode:this.verifyCode,identification:1}).then(res => {
 				    console.log("重置密码",res)
 					// 获得数据
-					if(res.data.code==200){
+					if(res.code==200){
 						if(this.isPhone){//判断是否是在个人首页进来的（若是退出重进）
 							uni.clearStorageSync();
 							this.$request.baseRequest('post', '/auth/api/logout').then(res => {})

pages/public/login.vue

@@ -3,7 +3,7 @@
 		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用智运</h2>
+			<h2 class="title Semibold">欢迎使用畅运通司机端</h2>
 			<view
 				style='position:relative;width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
 				class="flex">

pages/public/loginOther.vue

@@ -4,7 +4,7 @@
 		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用智运</h2>
+			<h2 class="title Semibold">欢迎使用畅运通司机端</h2>
 			<view style='width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;' class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>