Skip to content

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

修改退出登录的弹框； 

贷超首页的刷新逻辑有问题，进行了优化（手机号相等判断有问题）
parent 456ddf99
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 112 deletions
pages/login/login.vue
View file @ bed17652
...@@ -214,9 +214,11 @@ export default { ...@@ -214,9 +214,11 @@ export default {
uni.setStorageSync('mobileCall', self.mobile) uni.setStorageSync('mobileCall', self.mobile)
uni.setStorageSync('deviceId', deviceId) uni.setStorageSync('deviceId', deviceId)
uni.setStorageSync('tokenFinance', token) uni.setStorageSync('tokenFinance', token)
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
}).catch(err => { }).catch(err => {
console.log(err, '请求出错') console.log(err, '请求出错')
}) })
......
pages/my/index.vue
View file @ bed17652
...@@ -91,6 +91,7 @@ export default { ...@@ -91,6 +91,7 @@ export default {
}, },
methods: { methods: {
toJSON(){},
// 初始化 // 初始化
init() { init() {
const token = uni.getStorageSync('token') const token = uni.getStorageSync('token')
......
pages/setting/index.less
View file @ bed17652
.set-page{ .set-page {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
// min-height: 1624rpx; // min-height: 1624rpx;
background: #F7FAFF; background: #F7FAFF;
.set-main{
padding-top:8rpx; .set-main {
.main-line{ padding-top: 8rpx;
margin:24rpx 30rpx;
.main-line {
margin: 24rpx 30rpx;
background: #FFFFFF; background: #FFFFFF;
.line-item{
.line-item {
margin: 0 13rpx 0 27rpx; margin: 0 13rpx 0 27rpx;
height: 110rpx; height: 110rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 1rpx solid #E9E9E9; border-bottom: 1rpx solid #E9E9E9;
.item-text{
.item-text {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
...@@ -24,16 +28,19 @@ ...@@ -24,16 +28,19 @@
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
.item-icon{
.item-icon {
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat; background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat;
background-size: 100%; background-size: 100%;
} }
.item-r{
.item-r {
display: flex; display: flex;
align-items: center; align-items: center;
.r-text{
.r-text {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
...@@ -42,16 +49,18 @@ ...@@ -42,16 +49,18 @@
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
.r-icon{
.r-icon {
display: inline-block; display: inline-block;
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat; background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat;
background-size: 100%; background-size: 100%;
} }
} }
.item-version{
.item-version {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
...@@ -61,12 +70,14 @@ ...@@ -61,12 +70,14 @@
font-style: normal; font-style: normal;
} }
} }
.line-item:last-child{
border-bottom:none; .line-item:last-child {
border-bottom: none;
} }
} }
.line-des{
margin-left:30rpx; .line-des {
margin-left: 30rpx;
display: flex; display: flex;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
...@@ -75,12 +86,14 @@ ...@@ -75,12 +86,14 @@
line-height: 33rpx; line-height: 33rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
.des-x{
color:#2263E6; .des-x {
color: #2263E6;
} }
} }
.line-tips{
margin-left:30rpx; .line-tips {
margin-left: 30rpx;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
...@@ -90,13 +103,14 @@ ...@@ -90,13 +103,14 @@
font-style: normal; font-style: normal;
} }
} }
.set-footer{
margin:0 40rpx; .set-footer {
margin: 0 40rpx;
position: fixed; position: fixed;
bottom:30rpx; bottom: 30rpx;
width: 670rpx; width: 670rpx;
height: 88rpx; height: 88rpx;
background: linear-gradient( 137deg, #3877F5 0%, #5690FA 100%); background: linear-gradient(137deg, #3877F5 0%, #5690FA 100%);
border-radius: 44rpx; border-radius: 44rpx;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
...@@ -106,78 +120,91 @@ ...@@ -106,78 +120,91 @@
text-align: center; text-align: center;
font-style: normal; font-style: normal;
} }
.popup_overlay {
position: fixed; .popup_overlay {
top: 0%; position: fixed;
left: 0%; top: 0%;
width: 100%; left: 0%;
height: 100%; width: 100%;
background-color: black; height: 100%;
z-index: 1001; background-color: black;
-moz-opacity: 0.8; z-index: 1001;
opacity: 0.5; -moz-opacity: 0.8;
filter: alpha(opacity=88); opacity: 0.5;
filter: alpha(opacity=88);
}
.popup_content {
position: fixed;
top: 50%;
left: 52%;
width: 540rpx;
height: 336rpx;
background: #FFFFFF;
border-radius: 22rpx;
margin-left: -290rpx;
margin-top: -270rpx;
background-color: white;
z-index: 1002;
overflow: auto;
// display: flex;
// flex-direction: column;
.popup_title {
text-align: center;
font-size: 32rpx;
height: 100rpx;
line-height: 100rpx;
box-sizing: border-box;
} }
.popup_content { .popup_main {
position: fixed; margin: 0 44rpx;
top: 50%; height: 136rpx;
left: 52%; font-size: 30rpx;
width: 540rpx; padding-top: 20rpx;
height: 336rpx; font-family: PingFangSC-Regular, PingFang SC;
background: #FFFFFF; font-weight: 400;
border-radius: 22rpx; color: #757575;
margin-left: -290rpx; line-height: 42rpx;
margin-top: -270rpx; padding-bottom: 26rpx;
background-color: white; box-sizing: border-box;
z-index: 1002; text-align: center;
overflow: auto; }
.popup_title {
padding:38rpx 0 24rpx 0;
text-align: center; .btn-main {
font-size: 32rpx; flex: 1;
} display: flex;
.popup_main{ align-items: center;
margin:0 44rpx; border-top: 2rpx solid #E5E5E5;
height: 84rpx; width: 100%;
font-size: 30rpx; height: 100rpx;
font-family: PingFangSC-Regular, PingFang SC; line-height: 100rpx;
font-weight: 400;
color: #757575; &>view {
line-height: 42rpx; flex: 1;
padding-bottom:26rpx; height: 100%;
font-size: 36rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
text-align: center; text-align: center;
} }
.popup-m-text{
padding-left:40rpx; .btn-cel {
color: #2263E6;
} }
.btn-main{
display: flex; .btn-confirm {
border-top: 2rpx solid #E5E5E5; background: #FFFFFF;
width: 100%; border-right: 2rpx solid #E5E5E5;
height: 100%; font-weight: 400;
.btn-cel{ color: #333333;
flex:1;
font-size: 36rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #2263E6;
line-height:109rpx;
text-align: center;
}
.btn-confirm{
flex:1;
background: #FFFFFF;
border-right: 2rpx solid #E5E5E5;
font-size: 36rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 109rpx;
text-align: center;
}
} }
} }
}
} }
\ No newline at end of file
pages/setting/setting.vue
View file @ bed17652
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
}); });
}, },
methods: { methods: {
toJSON(){},
init(){ init(){
const self=this const self=this
self.$request('/pawn/setting','GET').then(res => { self.$request('/pawn/setting','GET').then(res => {
...@@ -159,7 +160,24 @@ ...@@ -159,7 +160,24 @@
}) })
}, },
loginOut(){ loginOut(){
const pages = getCurrentPages();
pages.forEach(page=>{
console.log(page,'页面')
const isWebView = page.$getAppWebview();
if(isWebView){
let currentPages = page.$getAppWebview()
let children = isWebView.children()
if (children.length){
children[0].close()
}
}
})
//退出登录 //退出登录
const self=this const self=this
console.log(333) console.log(333)
......
pages/web/web.vue
View file @ bed17652
...@@ -6,21 +6,12 @@ ...@@ -6,21 +6,12 @@
<script> <script>
import { loadLocation } from './tools' import { loadLocation } from './tools'
import { import { CheckContactPermission, SelectContact } from './authPermission'
CheckContactPermission, import { UploadFile } from './utils/uploads'
SelectContact
} from './authPermission'
import storage from '@/utils/storage'
import {
UploadFile
} from './utils/uploads'
import Permission from '@/js_sdk/wa-permission/permission' //权限工具类 import Permission from '@/js_sdk/wa-permission/permission' //权限工具类
const LF = uni.requireNativePlugin('AThree-LFv2') const LF = uni.requireNativePlugin('AThree-LFv2')
import api from '@/config/api'
let reloadTimeOut = null let reloadTimeOut = null
let token = uni.getStorageSync('token') let token = uni.getStorageSync('token')
console.log(token, '是否登录')
export default { export default {
name: "WEB", name: "WEB",
...@@ -68,6 +59,9 @@ export default { ...@@ -68,6 +59,9 @@ export default {
}, },
onTabItemTap(e) { onTabItemTap(e) {
console.log(e, 'tabItemTap') console.log(e, 'tabItemTap')
const pages = getCurrentPages();
const $CurrentPage = pages[pages.length - 1];
console.log($CurrentPage.route, '路由信息')
this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`) this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
}, },
async onLoad(option) { async onLoad(option) {
......
unpackage/dist/dev/app-plus/app-service.js
View file @ bed17652
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/app-view.js
View file @ bed17652
...@@ -6651,7 +6651,7 @@ if(false) {} ...@@ -6651,7 +6651,7 @@ if(false) {}
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/runtime/api.js */ 10); var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/runtime/api.js */ 10);
exports = ___CSS_LOADER_API_IMPORT___(false); exports = ___CSS_LOADER_API_IMPORT___(false);
// Module // Module
exports.push([module.i, ".set-page[data-v-602012f8] {\n width: 100%;\n height: 100vh;\n background: #F7FAFF;\n}\n.set-page .set-main[data-v-602012f8] {\n padding-top: 8rpx;\n}\n.set-page .set-main .main-line[data-v-602012f8] {\n margin: 24rpx 30rpx;\n background: #FFFFFF;\n}\n.set-page .set-main .main-line .line-item[data-v-602012f8] {\n margin: 0 13rpx 0 27rpx;\n height: 110rpx;\n display: flex;\n align-items: center;\n justify-content: space-between;\n border-bottom: 1rpx solid #E9E9E9;\n}\n.set-page .set-main .main-line .line-item .item-text[data-v-602012f8] {\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #333333;\n line-height: 110rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-main .main-line .line-item .item-icon[data-v-602012f8] {\n width: 30rpx;\n height: 30rpx;\n background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat;\n background-size: 100%;\n}\n.set-page .set-main .main-line .line-item .item-r[data-v-602012f8] {\n display: flex;\n align-items: center;\n}\n.set-page .set-main .main-line .line-item .item-r .r-text[data-v-602012f8] {\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #999999;\n line-height: 40rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-main .main-line .line-item .item-r .r-icon[data-v-602012f8] {\n display: inline-block;\n width: 30rpx;\n height: 30rpx;\n background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat;\n background-size: 100%;\n}\n.set-page .set-main .main-line .line-item .item-version[data-v-602012f8] {\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #999999;\n line-height: 110rpx;\n text-align: right;\n font-style: normal;\n}\n.set-page .set-main .main-line .line-item[data-v-602012f8]:last-child {\n border-bottom: none;\n}\n.set-page .set-main .line-des[data-v-602012f8] {\n margin-left: 30rpx;\n display: flex;\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 24rpx;\n color: #999999;\n line-height: 33rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-main .line-des .des-x[data-v-602012f8] {\n color: #2263E6;\n}\n.set-page .set-main .line-tips[data-v-602012f8] {\n margin-left: 30rpx;\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 24rpx;\n color: #999999;\n line-height: 33rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-footer[data-v-602012f8] {\n margin: 0 40rpx;\n position: fixed;\n bottom: 30rpx;\n width: 670rpx;\n height: 88rpx;\n background: linear-gradient(137deg, #3877F5 0%, #5690FA 100%);\n border-radius: 44rpx;\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #FFFFFF;\n line-height: 88rpx;\n text-align: center;\n font-style: normal;\n}\n.set-page .popup_overlay[data-v-602012f8] {\n position: fixed;\n top: 0%;\n left: 0%;\n width: 100%;\n height: 100%;\n background-color: black;\n z-index: 1001;\n -moz-opacity: 0.8;\n opacity: 0.5;\n filter: alpha(opacity=88);\n}\n.set-page .popup_content[data-v-602012f8] {\n position: fixed;\n top: 50%;\n left: 52%;\n width: 540rpx;\n height: 336rpx;\n background: #FFFFFF;\n border-radius: 22rpx;\n margin-left: -290rpx;\n margin-top: -270rpx;\n background-color: white;\n z-index: 1002;\n overflow: auto;\n}\n.set-page .popup_content .popup_title[data-v-602012f8] {\n padding: 38rpx 0 24rpx 0;\n text-align: center;\n font-size: 32rpx;\n}\n.set-page .popup_content .popup_main[data-v-602012f8] {\n margin: 0 44rpx;\n height: 84rpx;\n font-size: 30rpx;\n font-family: PingFangSC-Regular, PingFang SC;\n font-weight: 400;\n color: #757575;\n line-height: 42rpx;\n padding-bottom: 26rpx;\n text-align: center;\n}\n.set-page .popup_content .popup-m-text[data-v-602012f8] {\n padding-left: 40rpx;\n}\n.set-page .popup_content .btn-main[data-v-602012f8] {\n display: flex;\n border-top: 2rpx solid #E5E5E5;\n width: 100%;\n height: 100%;\n}\n.set-page .popup_content .btn-main .btn-cel[data-v-602012f8] {\n flex: 1;\n font-size: 36rpx;\n font-family: PingFangSC-Medium, PingFang SC;\n font-weight: 500;\n color: #2263E6;\n line-height: 109rpx;\n text-align: center;\n}\n.set-page .popup_content .btn-main .btn-confirm[data-v-602012f8] {\n flex: 1;\n background: #FFFFFF;\n border-right: 2rpx solid #E5E5E5;\n font-size: 36rpx;\n font-family: PingFangSC-Regular, PingFang SC;\n font-weight: 400;\n color: #333333;\n line-height: 109rpx;\n text-align: center;\n}\n", ""]); exports.push([module.i, ".set-page[data-v-602012f8] {\n width: 100%;\n height: 100vh;\n background: #F7FAFF;\n}\n.set-page .set-main[data-v-602012f8] {\n padding-top: 8rpx;\n}\n.set-page .set-main .main-line[data-v-602012f8] {\n margin: 24rpx 30rpx;\n background: #FFFFFF;\n}\n.set-page .set-main .main-line .line-item[data-v-602012f8] {\n margin: 0 13rpx 0 27rpx;\n height: 110rpx;\n display: flex;\n align-items: center;\n justify-content: space-between;\n border-bottom: 1rpx solid #E9E9E9;\n}\n.set-page .set-main .main-line .line-item .item-text[data-v-602012f8] {\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #333333;\n line-height: 110rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-main .main-line .line-item .item-icon[data-v-602012f8] {\n width: 30rpx;\n height: 30rpx;\n background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat;\n background-size: 100%;\n}\n.set-page .set-main .main-line .line-item .item-r[data-v-602012f8] {\n display: flex;\n align-items: center;\n}\n.set-page .set-main .main-line .line-item .item-r .r-text[data-v-602012f8] {\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #999999;\n line-height: 40rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-main .main-line .line-item .item-r .r-icon[data-v-602012f8] {\n display: inline-block;\n width: 30rpx;\n height: 30rpx;\n background: url('https://ddh.yyhock.com/ddhMall/my-back.png') 0 0 no-repeat;\n background-size: 100%;\n}\n.set-page .set-main .main-line .line-item .item-version[data-v-602012f8] {\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #999999;\n line-height: 110rpx;\n text-align: right;\n font-style: normal;\n}\n.set-page .set-main .main-line .line-item[data-v-602012f8]:last-child {\n border-bottom: none;\n}\n.set-page .set-main .line-des[data-v-602012f8] {\n margin-left: 30rpx;\n display: flex;\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 24rpx;\n color: #999999;\n line-height: 33rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-main .line-des .des-x[data-v-602012f8] {\n color: #2263E6;\n}\n.set-page .set-main .line-tips[data-v-602012f8] {\n margin-left: 30rpx;\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 24rpx;\n color: #999999;\n line-height: 33rpx;\n text-align: left;\n font-style: normal;\n}\n.set-page .set-footer[data-v-602012f8] {\n margin: 0 40rpx;\n position: fixed;\n bottom: 30rpx;\n width: 670rpx;\n height: 88rpx;\n background: linear-gradient(137deg, #3877F5 0%, #5690FA 100%);\n border-radius: 44rpx;\n font-family: PingFangSC, PingFang SC;\n font-weight: 400;\n font-size: 32rpx;\n color: #FFFFFF;\n line-height: 88rpx;\n text-align: center;\n font-style: normal;\n}\n.set-page .popup_overlay[data-v-602012f8] {\n position: fixed;\n top: 0%;\n left: 0%;\n width: 100%;\n height: 100%;\n background-color: black;\n z-index: 1001;\n -moz-opacity: 0.8;\n opacity: 0.5;\n filter: alpha(opacity=88);\n}\n.set-page .popup_content[data-v-602012f8] {\n position: fixed;\n top: 50%;\n left: 52%;\n width: 540rpx;\n height: 336rpx;\n background: #FFFFFF;\n border-radius: 22rpx;\n margin-left: -290rpx;\n margin-top: -270rpx;\n background-color: white;\n z-index: 1002;\n overflow: auto;\n}\n.set-page .popup_content .popup_title[data-v-602012f8] {\n text-align: center;\n font-size: 32rpx;\n height: 100rpx;\n line-height: 100rpx;\n box-sizing: border-box;\n}\n.set-page .popup_content .popup_main[data-v-602012f8] {\n margin: 0 44rpx;\n height: 136rpx;\n font-size: 30rpx;\n padding-top: 20rpx;\n font-family: PingFangSC-Regular, PingFang SC;\n font-weight: 400;\n color: #757575;\n line-height: 42rpx;\n padding-bottom: 26rpx;\n box-sizing: border-box;\n text-align: center;\n}\n.set-page .popup_content .btn-main[data-v-602012f8] {\n flex: 1;\n display: flex;\n align-items: center;\n border-top: 2rpx solid #E5E5E5;\n width: 100%;\n height: 100rpx;\n line-height: 100rpx;\n}\n.set-page .popup_content .btn-main > uni-view[data-v-602012f8] {\n flex: 1;\n height: 100%;\n font-size: 36rpx;\n font-family: PingFangSC-Medium, PingFang SC;\n font-weight: 500;\n text-align: center;\n}\n.set-page .popup_content .btn-main .btn-cel[data-v-602012f8] {\n color: #2263E6;\n}\n.set-page .popup_content .btn-main .btn-confirm[data-v-602012f8] {\n background: #FFFFFF;\n border-right: 2rpx solid #E5E5E5;\n font-weight: 400;\n color: #333333;\n}\n", ""]);
// Exports // Exports
module.exports = exports; module.exports = exports;
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