Compare commits

...

5 Commits

Author SHA1 Message Date
骆超
be6bc9c046 更换手机号,修改密码,新老手机号验证 2023-05-10 15:59:19 +08:00
69357846e7 Merge pull request '密码登录' (#2) from lc into caolc
Reviewed-on: #2
2023-05-09 02:30:30 +00:00
骆超
843ae242bc 密码登录 2023-05-09 10:29:56 +08:00
caolc
3c8c985cce Merge branch 'caolc' of http://121.196.213.68:3000/caoliancun/LSM_OIL_SITE_zhongping into caolc 2023-05-08 08:59:00 +08:00
caolc
50ffdddce6 1 2023-05-08 08:58:58 +08:00
6 changed files with 35 additions and 30 deletions

View File

@@ -1,5 +1,5 @@
import request from '@/utils/request' import request from '@/utils/request'
const service_name ='oil-user' const service_name ='xkhl-user'
const group_name ='oilCustomerChannelRelation' const group_name ='oilCustomerChannelRelation'
const change_phone ='sysCustomerInfo' const change_phone ='sysCustomerInfo'
export default{ export default{

View File

@@ -1,6 +1,6 @@
{ {
"name" : "星油云站", "name" : "星油云站",
"appid" : "__UNI__EA8D131", "appid" : "__UNI__F1ED4B9",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",

View File

@@ -53,6 +53,8 @@
frozen: false, // 验证码冷却时间 frozen: false, // 验证码冷却时间
auth: {}, auth: {},
verifyCodeToken:'', verifyCodeToken:'',
pwd:"",
authpwd:"",
loginUser: uni.getStorageSync('loginUser') loginUser: uni.getStorageSync('loginUser')
} }
}, },

View File

@@ -1,7 +1,7 @@
<template> <template>
<view class="page-content " :class="(PageCur=='home'||PageCur=='scan')?'my-bg':''"> <view class="page-content " :class="(PageCur=='home'||PageCur=='scan')?'my-bg':''">
<!-- <uni-nav-bar left-icon="back" left-text="返回" right-text="菜单" title="导航栏组件"></uni-nav-bar> --> <!-- <uni-nav-bar left-icon="back" left-text="返回" right-text="菜单" title="导航栏组件"></uni-nav-bar> -->
<home ref='homecheck' v-if="PageCur=='home'||PageCur=='scan'" :user-account="userAccount" @changMenus='changMenus' :site="userAccount" :menusList = 'menusList' :checkUser = 'checkUser'></home> <home ref='homecheck' v-if="PageCur==='home'||PageCur==='scan'" :user-account="userAccount" @changMenus='changMenus' :site="userAccount" :menusList = 'menusList' :checkUser = 'checkUser'></home>
<setup v-if="PageCur=='setup'"></setup> <setup v-if="PageCur=='setup'"></setup>
<view class="bottom-view"> <view class="bottom-view">
<view class="padding-top radius shadow bottom-bar-fixed"> <view class="padding-top radius shadow bottom-bar-fixed">
@@ -134,23 +134,23 @@
this.menusList =data this.menusList =data
}, },
longiCheck(){ longiCheck(){
let userInfo = uni.getStorageSync('loginUser'), let userInfo = uni.getStorageSync('loginUser')
_that =this const _that = this
//console.log(userInfo) //console.log(userInfo)
oliUserApi.getByPhone(userInfo.userPhone).then((res)=>{ oliUserApi.getByPhone(userInfo.userPhone).then((res)=>{
//console.log('调用') //console.log('调用')
if(res.code == 20000){ if(res.code == 20000){
_that.checkList = 'show'
_that.oliList = res.data _that.oliList = res.data
_that.checkList = 'show'
_that.changeChannel.username = _that.loginUser.userPhone _that.changeChannel.username = _that.loginUser.userPhone
_that.changeChannel.unionId = uni.getStorageSync('unionId') _that.changeChannel.unionId = uni.getStorageSync('unionId')
this.$refs.homecheck.oliList = res.data
}else{ }else{
uni.showToast({ uni.showToast({
title:'请求失败,请稍后再试', title:'请求失败,请稍后再试',
icon:'none' icon:'none'
}) })
} }
}) })
}, },
Splicing(list){ Splicing(list){

View File

@@ -464,9 +464,12 @@
}); });
}, },
sendMsg() { sendMsg() {
if(!this.checkUser){
return console.log("发送验证码",this.checkUser)
}
// if(!this.checkUser){
// return
// }
if (!this.frozen) { if (!this.frozen) {
if (this.auth.phone) { if (this.auth.phone) {
const data2 = { const data2 = {

View File

@@ -7,7 +7,7 @@ import utils from '@/utils/encode'
//42 洛超 /29 孙志华 /40 阿浩 //42 洛超 /29 孙志华 /40 阿浩
// 测试日日顺时需要连阿浩 // 测试日日顺时需要连阿浩
const testUrl = 'http://192.168.26:38080' const testUrl = 'http://192.168.20:38080'
// const productionUrl = 'https://www.51xingka.net/oilApp' // 生产,加密 old // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产,加密 old
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new