更新

financialCenter/serviceStation/components/charge.vue

@@ -1,7 +1,7 @@
 <template>
-	<view>
+	<view >
 		<uni-popup @change="change" ref="popup" type="bottom" background-color="#fff">
-			<view style="height:35vh; display: flex;flex-direction: column;">
+			<view style="height:35vh; display: flex;flex-direction: column;padding-top: 40rpx;">
 				<view style="display: flex;">
 					<uni-easyinput @input="iconClick" @confirm="confirmFn" style="width: 90%; margin: 0 auto;"
 						prefixIcon="search" v-model="nameOrPhone" placeholder="请输入内容" />

financialCenter/serviceStation/index.vue

@@ -61,7 +61,8 @@
 					currentPage: 1,
 					pageSize: 10,
 					sorted: {
-						createTime: 'desc'
+						// createTime: 'desc'
+						balance:'asc'
 					},
 					params: {
 						accountName: ''
@@ -95,7 +96,7 @@
 		// },
 		methods: {
 			chargeChange(item) {
-				this.paramter.params.businessLeader = item.id
+				this.paramter.params.operateUser = item.id
 				this.paramter.params.name = item.userName
 				this.seachFn()
 			},

pages/login/coments/starlogin.vue

@@ -15,7 +15,7 @@
 					阅读并同意 <text style="color: #2A67FE;">《用户隐私政策》</text> 和 <text
 						style="color: #2A67FE;">《星油能源注册服务协议》</text>
 				</view>
-				<button @tap="sumit" style="margin-top:26rpx; " class="form_body_butten">一键登录</button>
+				<button @tap="sumit" style="margin-top:26rpx; " class="form_body_butten">登录</button>
 			</view>
 		</view>
 		<uni-popup ref="popup" type="center">

pages/login/login.vue

@@ -13,8 +13,11 @@
 				<view class="xian" style="flex: 1;"></view>
 			</view>
 			<view style="text-align: center;margin-top: 32rpx;">
-				<button class="wxlogin"  open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">
+				<!-- class="wxlogin" -->
-					<image class="wx" style="" src="@/static/wxlogo.png"></image>
+				<button type="primary" plain="true" size="mini" open-type="getPhoneNumber"
+					@getphonenumber="decryptPhoneNumber">
+					手机号快捷登录
+					<!-- <image class="wx" style="" src="@/static/wxlogo.png"></image> -->
 				</button>
 			</view>
 		</view>
@@ -37,7 +40,7 @@
 	 * @property {Function} decryptPhoneNumber: 微信获取用户手机号回调函数
 	 * @property {Function} bindLoginByPhone: 微信获取用户手机号回调成功后请求手机号登录接口
 	 * @property {Function} loginSuccess: 登陆成功后执行 存储到本地token等数据
-	*/
+	 */
 	import starlogin from './coments/starlogin.vue'
 	import password from './coments/passwordLogin.vue'
 	import verificationCode from './coments/verificationCode.vue'
@@ -50,7 +53,7 @@
 		},
 		data() {
 			return {
-				type:0,
+				type: 0,
 				sessionKey: '',
 				ishow: {
 					state: 0
@@ -66,12 +69,12 @@
 				that.ishow.state = e.state
 				that.phone = e.phone
 			})
-			if(e.type){
+			if (e.type) {
 				this.type = JSON.parse(e.type)
-				console.log(this.type,e.type,'*-*-')
+				console.log(this.type, e.type, '*-*-')
 			}
 			this.loginFn()
-			
+
 		},
 		methods: {
 			decryptPhoneNumber(e) {
@@ -91,7 +94,7 @@
 					})
 				}
 			},
-			
+
 			bindLoginByPhone(data) {
 				oilIdentityApi.bindLoginByPhone(data).then(res => {
 					if (res.code == 20000) {
@@ -106,36 +109,36 @@
 					uni.setStorageSync('accountStatus', resData.isCompanyAccount)
 					let user = resData.authTokenDTO.loginUser
 					uni.setStorageSync('user', user)
-						uni.showToast({
+					uni.showToast({
-							title: res.msg,
+						title: res.msg,
-							icon: 'none',
+						icon: 'none',
-							complete: (err) => {
+						complete: (err) => {
-								setTimeout(() => {
+							setTimeout(() => {
 								uni.redirectTo({
-									url:'../index/newindex'
+									url: '../index/newindex'
 								})
-								}, 1000);
+							}, 1000);
-								// console.log(err)
+							// console.log(err)
-							}
+						}
-						})
+					})
 				}
 			},
 			loginFn() {
 				uni.clearStorageSync()
-				if(this.type==1){
+				if (this.type == 1) {
-					uni.setStorageSync('logintype',this.type)
+					uni.setStorageSync('logintype', this.type)
 				}
 				uni.login({
 					provider: 'weixin',
 					success: (loginRes) => {
 						const code = loginRes.code
-						
+
 						// this.onceCode = code
 						oilIdentityApi.sendCode({
 							code: code
 						}).then(res => {
 							if (res.code === 20000) {
-								console.log(res.data,'--------------')
+								console.log(res.data, '--------------')
 								uni.setStorageSync('openid', res.data.openId)
 								uni.setStorageSync('unionid', res.data.unionId)
 								this.sessionKey = res.data.sessionKey
@@ -150,8 +153,7 @@
 								console.log('res', res.code)
 							}
 
-						}).catch(err => {
+						}).catch(err => {})
-						})
 
 					},
 					fail: err => {},
@@ -343,4 +345,4 @@
 		margin-top: 421rpx;
 
 	}
-</style>
+</style>