修改bug

pages/login/login.vue

@@ -7,7 +7,7 @@
 
 		<!-- 背景图片 -->
 		<view class="logo-box">
-			<image class="logo content" src="@/static/login/logo.png" mode="widthFix"></image>
+			<image class="logo content" :src="image" mode="widthFix"></image>
 		</view>
 
 		<!-- 加载效果 -->
@@ -77,11 +77,12 @@
 				showSelectLanguage: false,
 				showService: false,
 				serverList: [],
-				loading: false
+				loading: false,
+				image : '',///static/login/logo.png
 			}
 		},
 		created() {
-
+			this.getImage()
 		},
 		methods: {
 			//登录
@@ -123,6 +124,14 @@
 				});
 
 			},
+			
+			getImage(){
+				this.request('getImage').then(res => {
+					if(res.code == 200){
+						this.image = res.result.title
+					}
+				})
+			},
 
 			//跳转注册页面
 			toRegister() {

pages/modifyUser/modifyUser.vue

@@ -18,8 +18,8 @@
 
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.payment') }}</view>
-					<input type="text" :placeholder="$t('page.modifyUser.payment-placeholder')"
-						v-model="form.confirmNewPassword" />
+					<input type="password" :placeholder="$t('page.modifyUser.payment-placeholder')"
+						v-model="form.newPassword" />
 				</view>
 			</view>
 		</view>
@@ -30,12 +30,12 @@
 			<view class="edit-list">
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.oldPassword') }}</view>
-					<input type="text" v-model="form.oldPassword" />
+					<input type="password" v-model="form.oldPassword" />
 				</view>
 
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.newPassword') }}</view>
-					<input type="text" v-model="form.newPassword" />
+					<input type="password" v-model="form.newPassword" />
 				</view>
 
 				<!-- <view class="edit-item">
@@ -106,7 +106,7 @@
 							console.log(res.message);
 							uni.$u.toast(this.$t(`message.${res.message}`))
 							setTimeout(() => uni.navigateTo({
-								url: '/pages/personalInfo/personalInfo'
+								url: '/pages/center/center'
 							}), 1000)
 						}
 					})
@@ -119,13 +119,14 @@
 						if (res.code == 200) {
 							uni.$u.toast(this.$t(`message.${res.message}`))
 							setTimeout(() => uni.navigateTo({
-								url: '/pages/personalInfo/personalInfo'
+								url: '/pages/center/center'
 							}), 1000)
 						}
 					})
 				} else {		//修改钱包地址
 					this.request('editMoneyAddress', {}, {
-						moneyAddress : this.form.moneyAddress
+						moneyAddress : this.form.moneyAddress,
+						payPass : this.form.newPassword
 					}).then(res => {
 						if (res.code == 200) {
 							uni.$u.toast(this.$t(`message.${res.message}`))

pages/runningWater/runningWater.vue

@@ -73,11 +73,20 @@ import navbar from '@/components/base/m-navbar.vue'
 			
 			selectType(index){
 				this.select = index
+				this.getRunningWater()
 			},
 
 			//获取流水
 			getRunningWater() {
-				this.request('WaterPage', {}, this.queryparams).then(res => {
+				let queryparams = {
+					...this.queryparams
+				}
+				
+				if(this.select != 0){
+					queryparams.type = this.select - 1
+				}
+				
+				this.request('WaterPage', {}, queryparams).then(res => {
 					if (res.code == 200) {
 						this.runningWaterList = res.result.records
 					}

utils/request.js

@@ -8,6 +8,7 @@ import shop from "./shop";
 const request = axios.create({
 	// baseURL: 'https://admin.arcskytech.top/uav-api',//生产环境外国服务器
 	baseURL: 'https://uav-api.xzaiyp.top/uav-api',//演示环境
+	// baseURL: 'http://h5.xzaiyp.top/uav-api',//开发环境
 	// baseURL: 'http://h5.xzaiyp.top/uav-two',//开发环境
 	
 	// baseURL: 'https://shop-admin.xzaiyp.top/shop_demo',

utils/shop.js

@@ -59,7 +59,7 @@ export default {
 	getTips : { url : '/index/getTips' , method : 'GET' , auth : true },
 	//获取banner列表
 	getAppBanner : { url : '/shop/getAppBanner' , method : 'GET' , auth : true },
-	//获取banner列表
+	//获取登录记录列表
 	getIpLogPage : { url : '/info/getIpLogPage' , method : 'GET' , auth : true },
 	//获取首页提示
 	getIndexTip : { url : '/index/getIndexTips' , method : 'GET' , auth : true },
@@ -69,4 +69,6 @@ export default {
 	recharge2 : { url : '/info/recharge2' , method : 'GET' , auth : true },
 	//提现第二版
 	withdrawal2 : { url : '/info/withdrawal2' , method : 'GET' , auth : true },
+	//获取登录页面上面的banner
+	getImage : { url : '/index/getImage' , method : 'GET' },
 }