12

Reviewed-on: #1

BagAuth/pages/login/oldLogin.vue

@@ -8,7 +8,7 @@
 			<view class="padding-xl ">
 				<view class="image login-bg">
 					<image :src="otherImgURL+'logo@ZP.png'" mode="widthFix"></image>
-					<view class="text-bold text-lg padding-top">
+					<view class=" xxx text-bold text-lg padding-top">
 						一路油你 中品加油
 					</view>
 					<view class="text-df text-grey padding-top-xs padding-bottom">
@@ -19,8 +19,7 @@
 		</view>
 		<scroll-view class="bg-white nav padding login-shadow">
 			<view class="flex text-center padding-bottom">
-				<view class="cu-item text-bold text-lg flex-sub">
+				<view class="cu-item text-bold text-lg flex-sub"> 
-
 				</view>
 				<!-- <view class="cu-item text-bold text-lg flex-sub "
 					:class="[1==TabCur?'text-red cur':'',(animation=='animation-fades'&&1==TabCur)?'animation-fade':'']"
@@ -53,10 +52,10 @@
 				</view>
 
 				<view class="cu-form-group  text-sm">
-					<view class="" v-if="showRandom" >
+					<view class="" v-show="showRandom" @tap="accuntSourceSelect">
 						当前为验证码登录
 					</view>
-					<view class="" v-else >
+					<view class="" v-show="!showRandom" @tap="accuntSourceSelect">
 						当前为密码登录
 					</view>
 

BagAuth/pages/login/register.vue

@@ -7,7 +7,7 @@
 			:style="'background-image: url('+imgURL+'login-bg-top.png);height: 480upx;'">
 			<view class="padding-xl ">
 				<view class="image login-bg">
-					<image :src="imgURL+'new-logo.png'" mode="widthFix"></image>
+					<image :src="otherImgURL+'logo@ZP.png'" mode="widthFix"></image>
 					<view class="text-bold text-lg padding-top">
 						一路油你 中品加油
 					</view>
@@ -24,7 +24,7 @@
 					<view class="cu-item text-bold text-lg flex-sub">
 
 					</view>
-					<view class="cu-item text-red cur text-bold text-lg  flex-sub ">
+					<view class="cu-item text-blues cur text-bold text-lg  flex-sub ">
 						个人账号
 					</view>
 					<view class="cu-item text-bold text-lg flex-sub">
@@ -86,12 +86,14 @@
 <script>
 	import loginBottom from './components/loginBottom.vue'
 	import authApi from '@/api/auth.js'
+	import userApi from '@/api/user.js'
 	export default {
 		components: {
 			loginBottom
 		},
 		data() {
 			return {
+				otherImgURL: this.global.otherImgURL,
 				tips: '发送验证码',
 				accuntSource: false,
 				imgURL: this.global.imgURL,
@@ -110,11 +112,30 @@
 		onShow() {},
 		methods: {
 			savePwd() {
-
+				userApi.setUserPwd({
+					userName:this.driver.username,
+					password:this.password
+				}).then(res=>{
+					if(res.code===20000){
+						uni.showToast({
+							title: '修改密码成功',
+							icon: 'success',
+							duration: 2000
+						})
+						
+						this.skipPwd()
+					}else{
+						uni.showToast({
+							title: '修改密码失败',
+							icon: 'success',
+							duration: 2000
+						})
+					}
+				})
 			},
 			skipPwd() {
-				uni.switchTab({
+				uni.reLaunch({
-					url: '/pages/tabbar/home/home'
+					url: '/BagAuth/pages/login/login'
 				})
 			},
 			sendRandom() {

BagStation/pages/makeOrder/payResult.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
-			<block slot="backText">返回</block>
+			<block @click='clearInterval(timeinterval)' slot="backText">返回</block>
 			<block slot="content">订单支付结果</block>
 		</cu-custom>
 		<view   :class="showQr ? 'bg-blue' :''" >
@@ -315,7 +315,7 @@
 				},1000)  //设置定时器，时时间每隔一秒钟走一次（即每秒）
 				setTimeout(()=>{
 					this.newQrString()
-				},5000)
+				},2000)
 			
 			if(option.payMethod == '1' && option.status == 'success'){
 				if(option.status == 'success') {
@@ -399,13 +399,16 @@
 		,
 		onHide() {
 			console.log('这里是hiden')
-			this.innerAudioContext.stop()
+			this.innerAudioContext.stop();
+			clearInterval(this.timeinterval);
+			this.timeinterval =null
 		},
 		onUnload() {
 			console.log('这里是卸载页面')
 			this.innerAudioContext.stop();
-			if(this.timeinterval)clearInterval(this.timeinterval);
+			clearInterval(this.timeinterval);
-		},
+			this.timeinterval  = null
+			},
 	}
 </script>
 

api/auth.js

@@ -39,7 +39,7 @@ export default {
    },
   checkPersonalAccount (data) {
      return request({
-       url: `/${service_name}/${group_name}/verifyCodeLoginCheckAccountPersonal`,
+       url: `/xkhl-user/sysCustomerInfo/verifyCodeLoginByDriver`,
        method: 'post',
 	   data:data
      })

api/oil-site.js

@@ -49,9 +49,9 @@ export default {
 	// 未登录查询油站
 	readOnlySites(data) {
 		return request({
-			url: `/${service_name}/${group_name}/findNotLoginSiteInfoByPage`,
+			url: `/xkhl-site/saasSiteInfo/findNotLoginSiteInfoByPage`,
 			method: 'post',
-			data: data
+			data: Object.assign(data,{targetApp:'SAAS'})  
 		})
 	},
 	getCheckInfo(data) {

api/user.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+const service_name = "xkhl-user"
+const group_name = "sysSecurityUserPsw"
+export default {
+	//统计用户油卡总数量、总余额 
+	setUserPwd (data) {
+	  return request({
+	    url: `/${service_name}/${group_name}/setUserPwd`,
+	    method: 'post',
+		data
+	  })
+	},
+	
+}

components/three-sites.vue

@@ -9,6 +9,7 @@
 						<text class="cuIcon-close text-red"></text>
 					</view>
 				</view>
+				<img src=""  alt="">
 				<view class="padding-xl bg-white">
 					<view class="" v-if="siteList.length>0">
 						<three-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"

utils/encode.js

@@ -1,7 +1,7 @@
 import CryptoJS from 'crypto-js'
 import md5 from 'js-md5'
 
-// let Base64 = require('js-base64').Base64
+// let Base64 = require('js-base64').Base64   12 
 // import { JSEncrypt } from 'jsencrypt'
 var keyStr = 'qDfajQ*v@W1mCruZ'
 

utils/request.js

@@ -2,12 +2,12 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 
 // const env = process.env.NODE_ENV
-// const env = 'production'/*  */
+const env = 'production'/*  */
-const env = 'test'
+// const env = 'test'
-const testUrl = 'http://192.168.0.20:38080'
+const testUrl = 'http://192.168.0.26:38080'
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
-const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new 
 // const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new 
 const service = axios.create({
 	baseURL: env == 'production' ? productUrl : testUrl,