Skip to content

U
uni-app-ddh-shop
Commit e8099181 authored by caimeng's avatar caimeng
Browse files
Options

配合多典花进行优化1

parent dfee72cb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 911 deletions
App.vue
View file @ e8099181
......@@ -9,9 +9,6 @@ export default {
},
onLaunch: async function () {
// #ifdef APP-PLUS
// var w = plus.webview.open('hybrid/html/advertise/advertise.html','splashscreen', {
// top: 0,
......
pages.json
View file @ e8099181
......@@ -229,13 +229,6 @@
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
},
{
"path": "finance/index",
"style": {
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
}
]
}
......
pages/index/index.vue
View file @ e8099181
......@@ -214,15 +214,12 @@ export default {
GetTop() {
var _this = this
uni.getSystemInfo({
success: (res) => {
success: () => {
const query = uni.createSelectorQuery().in(this);
query.select("#box").boundingClientRect((data) => {
_this.Topdistance = data.top
}).exec();
},
fail: (res) => {
}
})
},
......
pages/login/login.vue
View file @ e8099181
......@@ -35,187 +35,214 @@
</template>
<script>
import {
switchShowTabbar
} from '@/utils/index'
export default {
data() {
return {
clickStatus: false,
mobile: '',
sendcode: '',
canSendCode: true,
timer: null, //倒计时
count: '', //倒计时
smsDownCacheCode: '',
// 协议列表
protocolList: null,
import { switchShowTabbar } from '@/utils/index'
export default {
data() {
return {
clickStatus: false,
mobile: '',
sendcode: '',
canSendCode: true,
timer: null,//倒计时
count: '',//倒计时
smsDownCacheCode: '',
// 协议列表
protocolList: null,
}
},
onShow() {
this.init()
this.buryingPoint('app:login_pageView')
},
methods: {
// 登录页返回
GoBack() {
this.Back()
},
// 预加载
initPreloadH5() {
try {
const { h5Url } = JSON.parse(uni.getStorageSync('APP-SETTING'));
// 预加载H5
plus.webview.prefetchURL(h5Url);
// 创建一个隐藏的webview 加载
// const wn = plus.webview.create(h5Url, 'duodianhuan', { render: 'always' });
// wn.show('none');
} catch (err) {
console.log('获取APP配置报错')
}
},
async init() {
const $App_Setting = uni.getStorageSync("APP-SETTING")
console.log($App_Setting,'内容呢')
if ($App_Setting) {
const { protocol } = JSON.parse($App_Setting)
this.protocolList = JSON.parse(protocol)
}
},
btnIcon() {
this.clickStatus = !this.clickStatus
onShow() {
this.init()
this.buryingPoint('app:login_pageView')
},
GetVerifyCode() {
const self = this
const params = {mobile:this.mobile}
console.log(params,'日')
self.$request('/pawn/client/sendCode', 'POST', params).then(res => {
console.log(res, 'sendCode');
const { smsBizNo } = res.result
if (smsBizNo) {
self.countdowns()
self.smsDownCacheCode = smsBizNo
methods: {
// 登录页返回
GoBack() {
const pages = getCurrentPages();
console.log(pages.length, '数量')
if (pages.length <= 1) {
uni.switchTab({
url: "/pages/index/index"
})
} else {
this.Back()
}
}).catch(err => {
console.log(err, '请求出错')
uni.showToast({
title: err.message,
icon: "none",
duration: 2000
})
})
},
// 获取验证码倒计时
countdowns() {
const TIME_COUNT = 60;
const self = this
if (!self.timer) {
self.count = TIME_COUNT;
self.canSendCode = false;
self.timer = setInterval(() => {
if (self.count > 0 && self.count <= TIME_COUNT) {
self.count--;
} else {
self.canSendCode = true;
clearInterval(self.timer);
self.timer = null;
}
}, 1000)
}
},
loginBtn() {
const self = this
if (self.mobile == '') {
uni.showToast({
title: '请先输入手机号',
icon: "none",
duration: 2000
})
return false
}
if (self.sendcode == '') {
uni.showToast({
title: '请先输入验证码',
icon: "none",
duration: 2000
})
return false
}
if (self.clickStatus == false) {
uni.showToast({
title: '请先勾选同意相关协议',
icon: "none",
duration: 2000
},
// 预加载
initPreloadH5() {
try {
const {
h5Url
} = JSON.parse(uni.getStorageSync('APP-SETTING'));
// 预加载H5
plus.webview.prefetchURL(h5Url);
// 创建一个隐藏的webview 加载
// const wn = plus.webview.create(h5Url, 'duodianhuan', { render: 'always' });
// wn.show('none');
} catch (err) {
console.log('获取APP配置报错')
}
},
async init() {
const $App_Setting = uni.getStorageSync("APP-SETTING")
console.log($App_Setting, '内容呢')
if ($App_Setting) {
const {
protocol
} = JSON.parse($App_Setting)
this.protocolList = JSON.parse(protocol)
}
},
btnIcon() {
this.clickStatus = !this.clickStatus
},
GetVerifyCode() {
const self = this
const params = {
mobile: this.mobile
}
console.log(params, '日')
self.$request('/pawn/client/sendCode', 'POST', params).then(res => {
console.log(res, 'sendCode');
const {
smsBizNo
} = res.result
if (smsBizNo) {
self.countdowns()
self.smsDownCacheCode = smsBizNo
}
}).catch(err => {
console.log(err, '请求出错')
uni.showToast({
title: err.message,
icon: "none",
duration: 2000
})
})
return false
}
const params = {
"mobile": self.mobile,
"smsDownCacheCode": self.smsDownCacheCode,
"verifyCode": self.sendcode
}
self.$request('/pawn/client/login', 'POST', params).then(res => {
const { userInfo, token } = res.result
if (userInfo) {
const { deviceId } = userInfo
uni.setStorageSync('deviceId', deviceId)
},
// 获取验证码倒计时
countdowns() {
const TIME_COUNT = 60;
const self = this
if (!self.timer) {
self.count = TIME_COUNT;
self.canSendCode = false;
self.timer = setInterval(() => {
if (self.count > 0 && self.count <= TIME_COUNT) {
self.count--;
} else {
self.canSendCode = true;
clearInterval(self.timer);
self.timer = null;
}
}, 1000)
}
},
loginBtn() {
const self = this
if (self.mobile == '') {
uni.showToast({
title: '请先输入手机号',
icon: "none",
duration: 2000
})
return false
}
if (self.sendcode == '') {
uni.showToast({
title: '请先输入验证码',
icon: "none",
duration: 2000
})
return false
}
if (self.clickStatus == false) {
uni.showToast({
title: '请先勾选同意相关协议',
icon: "none",
duration: 2000
})
return false
}
const params = {
"mobile": self.mobile,
"smsDownCacheCode": self.smsDownCacheCode,
"verifyCode": self.sendcode
}
self.$request('/pawn/client/login', 'POST', params).then(res => {
const {
userInfo,
token
} = res.result
if (userInfo) {
const {
deviceId
} = userInfo
uni.setStorageSync('deviceId', deviceId)
}
uni.setStorageSync('token', token)
uni.setStorageSync('l-mobile', self.mobile)
self.loginNocheck()
// 设置
switchShowTabbar();
}).catch(err => {
uni.showToast({
title: err.message,
icon: "none",
duration: 2000
uni.setStorageSync('token', token)
uni.setStorageSync('l-mobile', self.mobile)
self.loginNocheck()
// 设置
switchShowTabbar();
}).catch(err => {
uni.showToast({
title: err.message,
icon: "none",
duration: 2000
})
console.log(err, '请求出错')
})
console.log(err, '请求出错')
})
},
loginNocheck() {
const self = this
const params = {
"mobile": self.mobile,
"promoCode": 'own'
}
self.$request('/app/v1/loginNoCheck', 'POST', params).then(res => {
const { deviceId, token } = res.result
const cacheData = Object.assign({}, res.result, { mobile: self.mobile })
},
loginNocheck() {
const self = this
const params = {
"mobile": self.mobile,
"promoCode": 'own'
}
self.$request('/app/v1/loginNoCheck', 'POST', params).then(res => {
const {
deviceId,
token
} = res.result
const cacheData = Object.assign({}, res.result, {
mobile: self.mobile
})
uni.setStorageSync('user_info_obj', JSON.stringify(cacheData));
uni.setStorageSync('deviceId', deviceId)
uni.setStorageSync('tokenFinance', token)
uni.setStorageSync('user_info_obj', JSON.stringify(cacheData));
uni.setStorageSync('mobileCall', self.mobile)
uni.setStorageSync('deviceId', deviceId)
uni.setStorageSync('tokenFinance', token)
this.initPreloadH5()
this.initPreloadH5()
uni.navigateBack({
delta: 1
})
uni.navigateBack({
delta: 1
}).catch(err => {
console.log(err, '请求出错')
})
}).catch(err => {
console.log(err, '请求出错')
})
},
// 更新输入框
handleInput(e, key) {
const val = e.detail.value;
this[key] = val
},
// 更新输入框
handleInput(e, key) {
const val = e.detail.value;
this[key] = val
}
}
}
}
</script>
<style src='./index.less' lang="less" scoped></style>
<style src='./index.less' lang="less" scoped></style>
\ No newline at end of file
pages/my/index.vue
View file @ e8099181
......@@ -6,58 +6,55 @@
<view class='my-header'>
<image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image>
<view class='header-des'>
<view class='des-name' v-if="isLogin">{{ userTel }}</view>
<view class='des-name' v-if="isLogin">{{ mobile }}</view>
<view class='des-name' v-else @click='GoLogin'>注册/登录</view>
<view class='des-text'>多典花承诺保护您的信息安全</view>
</view>
</view>
<!-- 登录状态 -->
<template v-if="isLogin">
<!-- 我的还款&申请记录 -->
<template v-if="menuBar && menuBar.length > 0">
<view class='my-line'>
<view class='line-left' v-for="item in menuBar" :key="item.id" @click="goBar(item)">
<image class='left-img' :src='item.iconUrl'></image>
<view class='l-text'>{{ item.title }}</view>
<i class='l-go'></i>
</view>
<!-- 我的还款&申请记录 -->
<template v-if="isLogin && loanSwitch">
<view class='my-line'>
<view class='line-left' v-for="item in menuBar" :key="item.id" @click="goBar(item)">
<image class='left-img' :src='item.iconUrl'></image>
<view class='l-text'>{{ item.title }}</view>
<i class='l-go'></i>
</view>
</template>
</view>
</template>
<!-- 金刚栏位 -->
<template v-if="extMenuBarList && extMenuBarList.length > 0">
<view class='my-box-s'>
<view class='s-con'>
<view class='con-item' @click="goPage(item)" v-for="item in extMenuBarList" :key="item.id">
<image class="item-img" :src="item.iconUrl"></image>
<view class='item-text'>{{ item.title }}</view>
</view>
<!-- 金刚栏位 -->
<template v-if="extMenuBarList && extMenuBarList.length > 0">
<view class='my-box-s'>
<view class='s-con'>
<view class='con-item' @click="goPage(item)" v-for="item in extMenuBarList" :key="item.id">
<image class="item-img" :src="item.iconUrl"></image>
<view class='item-text'>{{ item.title }}</view>
</view>
</view>
</template>
</view>
</template>
<!-- 更多服务 -->
<view v-if="menuList && menuList.length > 0" class="my-contain">
<i class='con-top'></i>
<view class='con-box' v-if='menuList && menuList.length > 0'>
<view class="box-line" v-for="item in menuList" @click='goItem(item)' :key="item.id">
<view class='line-item'>
<view class='item-l'>
<image class='l-img' :src='item.iconUrl'></image>
<view class='l-text'>{{ item.title }}</view>
</view>
<view class='item-r'></view>
<!-- 更多服务 -->
<view v-if="menuList && menuList.length > 0" class="my-contain">
<i class='con-top'></i>
<view class='con-box' v-if='menuList && menuList.length > 0'>
<view class="box-line" v-for="item in menuList" @click='goItem(item)' :key="item.id">
<view class='line-item'>
<view class='item-l'>
<image class='l-img' :src='item.iconUrl'></image>
<view class='l-text'>{{ item.title }}</view>
</view>
<view class='item-r'></view>
</view>
</view>
</view>
</view>
</template>
<!-- 未登录状态 -->
<template v-else>
<!-- 未登录状态 -->
<template v-if="false">
<view class='my-box-s'>
<view class='s-con'>
......@@ -132,16 +129,16 @@
<script>
import { switchShowTabbar } from '@/utils/index'
import { isLogin } from '../../utils';
const APP = JSON.parse(uni.getStorageSync('APP-SETTING'));
const H5 = JSON.parse(uni.getStorageSync('H5-SETTING'));
const hasToken = uni.getStorageSync('token') ? true : false;
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : '';
export default {
data() {
return {
isLogin: hasToken,
userTel: mobile,
isLogin: false,
loanSwitch: false,
mobile: '',
menuList: [],
mobileNum: '',
menuBar: [],
......@@ -152,9 +149,15 @@ export default {
}
},
onShow() {
const token = uni.getStorageSync('token')
const loanSwitch = uni.getStorageSync('loanSwitch')
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : ''
this.init()
this.isLogin = token ? true : false
this.loanSwitch = loanSwitch ? true : false
this.mobile = mobile;
this.initMine()
// 显示隐藏tabBar
switchShowTabbar()
// 埋点
......@@ -162,7 +165,7 @@ export default {
},
// 页面下拉刷新
async onPullDownRefresh() {
await this.init()
await this.initMine()
setTimeout(() => {
uni.stopPullDownRefresh();
}, 1000);
......@@ -174,35 +177,14 @@ export default {
GoLogin() {
this.Go('uni:/pages/login/login')
},
// 初始化
init() {
const token = uni.getStorageSync('token')
console.log(token,'判断是否登录的依据')
if (token) {
this.initMine()
}
else {
this.isLogin = false
this.mobile = ''
}
},
// 初始化个人中心页面
initMine() {
const self = this
self.$request('/app/v1/userIndex', 'GET').then(res => {
const { menuBar, user, baseMenuBar, extMenuBarList } = res.result
const showIndex = uni.getStorageSync('showIndex')
console.log(showIndex, 'myindex')
if (showIndex == true) {
self.menuBar = menuBar
} else {
self.menuBar = []
}
const { menuBar, baseMenuBar, extMenuBarList } = res.result
self.menuBar = menuBar
self.menuList = baseMenuBar
self.extMenuBarList = extMenuBarList
self.userTel = ''
if (user.cell) self.userTel = user.cell
this.isLogin = true
}).catch(err => {
console.log(err, '请求出错')
......@@ -231,29 +213,30 @@ export default {
},
goBar(item) {
let newPath
switch (item.title) {
case "我的还款":
this.buryingPoint('app:my_repayment_click')
// const url='http://192.168.0.82:8080/#/'
newPath = H5.h5Url + item.linkUrl //app.vue中的全局写法
// newPath =this.hFUrl+ item.linkUrl
uni.navigateTo({
url: `/pages/web/websrc?url=${newPath}`
})
break;
case "申请记录":
this.buryingPoint('app:my_application_record_click')
// const url='http://192.168.0.82:8080/#/loanRecord'
newPath = H5.h5Url + item.linkUrl
// newPath =this.hFUrl+ item.linkUrl
uni.navigateTo({
url: `/pages/web/websrc?url=${newPath}`
})
break;
default:
break;
try {
const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
const timestamp = new Date().getTime()
const token = uni.getStorageSync('tokenFinance')
const mobile = uni.getStorageSync('l-mobile')
const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}#/${item.linkUrl}`
const newSrc = $src.split('?')
const targetSrc = `${newSrc[0]}?${encodeURIComponent(newSrc[1])}`
switch (item.title) {
case "我的还款":
this.buryingPoint('app:my_repayment_click')
break;
case "申请记录":
this.buryingPoint('app:my_application_record_click')
break;
}
uni.navigateTo({
url: `/pages/web/websrc?url=${targetSrc}`
})
} catch (err) {
console.log(err)
}
},
goTel() {
const self = this
......
pages/web/web.vue
View file @ e8099181
......@@ -25,7 +25,7 @@ export default {
canBack: false,
webviewStyles: {
progress: {
color: '#FF4050'
color: '#5688E8'
}
},
deviceStatus: '',
......@@ -70,7 +70,8 @@ export default {
const timestamp = new Date().getTime()
setTimeout(() => {
const token = uni.getStorageSync('tokenFinance')
const $src = config['h5Url'] + `?token=${token}&timestamp=${timestamp}`
const mobile = uni.getStorageSync('l-mobile')
const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}`
console.log($src, '刷新的地址')
that.src = $src
}, 100);
......@@ -103,10 +104,7 @@ export default {
},
onHide() {
// uni.removeStorageSync('hasRefresh')
const user_info_obj = uni.getStorageSync('user_info_obj') ? JSON.parse(uni.getStorageSync('user_info_obj')) : {}
user_info_obj.refreshIndex = false
uni.setStorageSync('user_info_obj', JSON.stringify(user_info_obj));
},
onShow() {
......
pages/web/websrc.vue
View file @ e8099181
......@@ -11,7 +11,6 @@ import { UploadFile } from './utils/uploads'
import Permission from '@/js_sdk/wa-permission/permission' //权限工具类
const LF = uni.requireNativePlugin('AThree-LFv2')
let token = uni.getStorageSync('token')
let reloadTimeOut = null
export default {
name: "WEB",
data() {
......@@ -22,7 +21,7 @@ export default {
canBack: false,
webviewStyles: {
progress: {
color: '#FF4050'
color: '#5688E8'
}
},
deviceStatus: '',
......@@ -56,16 +55,10 @@ export default {
}, 1000) //如果是页面初始化调用时，需要延时一下
// #endif
},
onTabItemTap(e) {
console.log(e, 'tabItemTap')
this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
},
async onLoad(option) {
const that = this
if (option.url) that.src = option.url
console.log(option, '参数')
const that = this;
if (option.url) this.src = option.url
console.log(option.url,'地址')
uni.getStorage({
key: 'm-device-info',
success: function (res) {
......@@ -74,31 +67,12 @@ export default {
}
})
},
onShow() {
console.log('onShow方法')
const canRefresh = uni.getStorageSync('canRefresh');
console.log(canRefresh, '可以刷新吗？')
if (canRefresh) {
uni.removeStorageSync('canRefresh')
if (reloadTimeOut) clearTimeout(reloadTimeOut)
reloadTimeOut = setTimeout(() => {
console.log('到这里了')
this.wv && this.wv.reload()
}, 400)
}
},
onUnload() {
const wv = this.$scope.$getAppWebview();
if(wv){
wv.clear()
wv.close()
}
const user_info_obj = uni.getStorageSync('user_info_obj')? JSON.parse(uni.getStorageSync('user_info_obj')):{}
user_info_obj.refreshIndex = true
uni.setStorageSync('user_info_obj', JSON.stringify(user_info_obj));
},
methods: {
handleMessage(e) {
const data = e.detail.data;
if (!data || data.lenght === 0) {
......@@ -250,6 +224,7 @@ export default {
this.toast('提示框报错')
}
},
// 实名认证正面
Camera_OCR_Front(config) {
console.log('实名认证前面', config)
......@@ -389,6 +364,7 @@ export default {
this.toast('隐藏导航报错')
}
},
// 显示导航了
ShowNavBar() {
try {
......@@ -446,6 +422,7 @@ export default {
console.log(err, 'LIVE活体识别错误')
}
},
// 活体认证
async uniFace(config) {
console.log(config, 'config')
......@@ -462,6 +439,7 @@ export default {
}
},
// 获取设备信息
async GetDeviceInfo() {
try {
......
subPackage/finance/index.vue deleted 100644 → 0
View file @ dfee72cb
This diff is collapsed.
utils/index.js
View file @ e8099181
......@@ -58,14 +58,15 @@ export const switchShowTabbar = async () => {
try {
const res = await API.initTabBar()
const { data } = res.result
uni.setStorageSync('showIndex', data)
if (data == true) {
if (data) {
uni.setStorageSync('loanSwitch',true)
uni.setTabBarItem({
index: 1,
text: '贷款',
visible: true,
})
} else {
uni.setStorageSync('loanSwitch',false)
uni.setTabBarItem({
index: 1,
visible: false
......
utils/request.js
View file @ e8099181
......@@ -48,9 +48,13 @@ const request = async (url, type, data) => {
if (data.success == true) {
return resolve(data)
} else {
if (data.code == '403') uni.removeStorageSync('token')
return reject(data)
if (data.code == '403'){
// uni.removeStorageSync('token')
uni.clearStorageSync();
}
return uni.redirectTo({
url:"/pages/login/login"
})
}
} else {
return reject({ ...data, message: res.errMsg })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment