Skip to content

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

优化保存提交11-21 11:30

parent e8099181
Show whitespace changes
Inline Side-by-side
Showing with 316 additions and 402 deletions
.DS_Store
View file @ 6a3b63fd
No preview for this file type
App.vue
View file @ 6a3b63fd
<script> <script>
import { ininIndex, initIndexGoods, initH5Setting, initAPPSetting } from '@/utils/index.js' import { loadDevice, loadLocation, loadNetwork, loadUuid, ininIndex, initIndexGoods, initH5Setting, initAPPSetting } from '@/utils/index.js'
import config from '@/config/api' import config from '@/config/api'
export default { export default {
globalData: { globalData: {
...@@ -25,6 +25,7 @@ export default { ...@@ -25,6 +25,7 @@ export default {
// #endif // #endif
// 强制竖屏 // 强制竖屏
plus.screen.lockOrientation("portrait-primary") plus.screen.lockOrientation("portrait-primary")
...@@ -42,6 +43,13 @@ export default { ...@@ -42,6 +43,13 @@ export default {
uni.setStorage({ key: 'm-header-version', data: versionNumber }); uni.setStorage({ key: 'm-header-version', data: versionNumber });
}) })
if (uni.getStorageSync('m-agreement')) {
loadNetwork()
loadDevice()
loadLocation()
loadUuid()
}
// 首页配置 // 首页配置
await ininIndex() await ininIndex()
await initIndexGoods() await initIndexGoods()
......
main.js
View file @ 6a3b63fd
...@@ -5,9 +5,13 @@ import Vue from 'vue' ...@@ -5,9 +5,13 @@ import Vue from 'vue'
Vue.config.productionTip = false Vue.config.productionTip = false
App.mpType = 'app' App.mpType = 'app'
import mixin from './mixin/index' import mixin from './mixin/index'
import Modal from './components/modal/modal' import Modal from './components/modal/modal'
import goodsItem from './components/goodsItem/index' import goodsItem from './components/goodsItem/index'
import upgradePopup from './components/showModal/upgradePopup' import upgradePopup from './components/showModal/upgradePopup'
import request from './utils/request.js' import request from './utils/request.js'
import * as utils from "./utils/index.js"; import * as utils from "./utils/index.js";
...@@ -16,6 +20,7 @@ Vue.component('view-modal', Modal); ...@@ -16,6 +20,7 @@ Vue.component('view-modal', Modal);
Vue.component('view-goods', goodsItem); Vue.component('view-goods', goodsItem);
Vue.component('upgrade-Popup', upgradePopup); Vue.component('upgrade-Popup', upgradePopup);
Vue.prototype.$request = request Vue.prototype.$request = request
Vue.mixin(mixin) Vue.mixin(mixin)
......
manifest.json
View file @ 6a3b63fd
...@@ -126,7 +126,16 @@ ...@@ -126,7 +126,16 @@
}, },
"splashscreen" : { "splashscreen" : {
"useOriginalMsgbox" : false, "useOriginalMsgbox" : false,
"androidStyle" : "common" "androidStyle" : "common",
"iosStyle" : "storyboard",
"ios" : {
"storyboard" : "CustomStoryboard.zip"
},
"android" : {
"hdpi" : "static/res/1125x2436.9.png",
"xhdpi" : "static/res/1125x2436.9.png",
"xxhdpi" : "static/res/1125x2436.9.png"
}
} }
}, },
"splashscreen" : { "splashscreen" : {
......
pages.json
View file @ 6a3b63fd
...@@ -126,6 +126,13 @@ ...@@ -126,6 +126,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/websrc/websrc",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "uni_modules/uni-frv-external/pages/common/webview/webview", "path": "uni_modules/uni-frv-external/pages/common/webview/webview",
"style": { "style": {
......
pages/agreement/index.vue
View file @ 6a3b63fd
...@@ -63,8 +63,6 @@ export default { ...@@ -63,8 +63,6 @@ export default {
}, },
// 同意授权 // 同意授权
handleSure() { handleSure() {
plus.runtime.agreePrivacy();
const that = this;
uni.setStorage({ uni.setStorage({
key: "m-agreement", key: "m-agreement",
data: 'true', data: 'true',
......
pages/login/login.vue
View file @ 6a3b63fd
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<input class='send-value' placeholder="请输入验证码" :value="sendcode" maxlength="6" type="number" <input class='send-value' placeholder="请输入验证码" :value="sendcode" maxlength="6" type="number"
@input="(e) => handleInput(e, 'sendcode')" /> @input="(e) => handleInput(e, 'sendcode')" />
<view class='send-text' @click='GetVerifyCode' v-if="canSendCode">获取验证码</view> <view class='send-text' @click='GetVerifyCode' v-if="canSendCode">获取验证码</view>
<view class="mobileCode-min" @click='GetVerifyCode' v-else>{{ count }}秒</view> <view class="mobileCode-min" v-else>{{ count }}秒</view>
</view> </view>
</view> </view>
......
pages/my/index.vue
View file @ 6a3b63fd
<template> <template>
<view class='my-page'> <view class='my-page'>
<view class='my-top'> <view v-if="mineData" class='my-top'>
<!-- 头部 --> <!-- 头部 -->
<view class='my-header'> <view class='my-header'>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- 我的还款&申请记录 --> <!-- 我的还款&申请记录 -->
<template v-if="isLogin && loanSwitch"> <template v-if="isLogin && loanSwitch">
<view class='my-line'> <view class='my-line'>
<view class='line-left' v-for="item in menuBar" :key="item.id" @click="goBar(item)"> <view class='line-left' v-for="item in mineData['menuBar']" :key="item.id" @click="goBar(item)">
<image class='left-img' :src='item.iconUrl'></image> <image class='left-img' :src='item.iconUrl'></image>
<view class='l-text'>{{ item.title }}</view> <view class='l-text'>{{ item.title }}</view>
<i class='l-go'></i> <i class='l-go'></i>
...@@ -25,10 +25,11 @@ ...@@ -25,10 +25,11 @@
<!-- 金刚栏位 --> <!-- 金刚栏位 -->
<template v-if="extMenuBarList && extMenuBarList.length > 0"> <template v-if="mineData['extMenuBarList'] && mineData['extMenuBarList'].length > 0">
<view class='my-box-s'> <view class='my-box-s'>
<view class='s-con'> <view class='s-con'>
<view class='con-item' @click="goPage(item)" v-for="item in extMenuBarList" :key="item.id"> <view class='con-item' @click="goPage(item)" v-for="item in mineData['extMenuBarList']"
:key="item.id">
<image class="item-img" :src="item.iconUrl"></image> <image class="item-img" :src="item.iconUrl"></image>
<view class='item-text'>{{ item.title }}</view> <view class='item-text'>{{ item.title }}</view>
</view> </view>
...@@ -37,10 +38,10 @@ ...@@ -37,10 +38,10 @@
</template> </template>
<!-- 更多服务 --> <!-- 更多服务 -->
<view v-if="menuList && menuList.length > 0" class="my-contain"> <view v-if="mineData['baseMenuBar'] && mineData['baseMenuBar'].length > 0" class="my-contain">
<i class='con-top'></i> <i class='con-top'></i>
<view class='con-box' v-if='menuList && menuList.length > 0'> <view class='con-box'>
<view class="box-line" v-for="item in menuList" @click='goItem(item)' :key="item.id"> <view class="box-line" v-for="item in mineData['baseMenuBar']" @click='goItem(item)' :key="item.id">
<view class='line-item'> <view class='line-item'>
<view class='item-l'> <view class='item-l'>
<image class='l-img' :src='item.iconUrl'></image> <image class='l-img' :src='item.iconUrl'></image>
...@@ -52,69 +53,9 @@ ...@@ -52,69 +53,9 @@
</view> </view>
</view> </view>
<!-- 未登录状态 -->
<template v-if="false">
<view class='my-box-s'>
<view class='s-con'>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/my-glance.png"></image>
<view class='item-text'>我的浏览</view>
</view>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/need-icon.png"></image>
<view class='item-text'>我的需要</view>
</view>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/my-attentiion.png"></image>
<view class='item-text'>我的关注</view>
</view>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/user-icon.png"></image>
<view class='item-text'>意见反馈</view>
</view>
</view>
</view>
<!-- 更多服务 -->
<view class="my-contain">
<i class='con-top'></i>
<view class='con-box'>
<view class="box-line">
<view @click="GoLogin" class='line-item'>
<view class='item-l'>
<image class='l-img' src="https://ddh.yyhock.com/appStatic/product.png"></image>
<view class='l-text'>产品列表</view>
</view>
<view class='item-r'></view>
</view>
</view>
<view class="box-line">
<view @click="GoLogin" class='line-item'>
<view class='item-l'>
<image class='l-img' src="https://ddh.yyhock.com/ddhMall/my-tel.png"></image>
<view class='l-text'>帮助中心</view>
</view>
<view class='item-r'></view>
</view>
</view>
<view class="box-line">
<view @click="GoLogin" class='line-item'>
<view class='item-l'>
<image class='l-img' src="https://ddh.yyhock.com/appStatic/setting.png"></image>
<view class='l-text'>设置</view>
</view>
<view class='item-r'></view>
</view>
</view>
</view>
</view>
</template>
<!-- 联系我们 --> <!-- 联系我们 -->
<view class='my-footer'> <view class='my-footer'>
<view class='footer-btn' @click="goTel"> <view class='footer-btn' @click="GoTel">
<i class='btn-tel'></i> <i class='btn-tel'></i>
<view class='btn-text'>联系我们</view> <view class='btn-text'>联系我们</view>
</view> </view>
...@@ -129,9 +70,7 @@ ...@@ -129,9 +70,7 @@
<script> <script>
import { switchShowTabbar } from '@/utils/index' import { switchShowTabbar } from '@/utils/index'
import { isLogin } from '../../utils'; const $mineData = uni.getStorageSync('mineData') ? uni.getStorageSync('mineData') : null;
const APP = JSON.parse(uni.getStorageSync('APP-SETTING'));
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : '';
export default { export default {
data() { data() {
...@@ -139,13 +78,8 @@ export default { ...@@ -139,13 +78,8 @@ export default {
isLogin: false, isLogin: false,
loanSwitch: false, loanSwitch: false,
mobile: '', mobile: '',
menuList: [],
mobileNum: '', mineData: $mineData
menuBar: [],
serviceCall: APP.serviceCall,
serviceCall: '',
extMenuBarList: [],
hFUrl: ''
} }
}, },
onShow() { onShow() {
...@@ -181,17 +115,16 @@ export default { ...@@ -181,17 +115,16 @@ export default {
initMine() { initMine() {
const self = this const self = this
self.$request('/app/v1/userIndex', 'GET').then(res => { self.$request('/app/v1/userIndex', 'GET').then(res => {
const { menuBar, baseMenuBar, extMenuBarList } = res.result self.mineData = res.result
self.menuBar = menuBar uni.setStorageSync('mineData', res.result)
self.menuList = baseMenuBar
self.extMenuBarList = extMenuBarList
}).catch(err => { }).catch(err => {
console.log(err, '请求出错') console.log(err, '初始化我的报错')
}) })
}, },
goPage(item) { goPage(item) {
console.log(item.title) if (!this.isLogin) {
return this.Go('uni:/pages/login/login')
}
switch (item.title) { switch (item.title) {
case "我的浏览": case "我的浏览":
this.buryingPoint('app:my_browsing_history_click') this.buryingPoint('app:my_browsing_history_click')
...@@ -238,35 +171,22 @@ export default { ...@@ -238,35 +171,22 @@ export default {
} }
}, },
goTel() { GoTel() {
const self = this try {
self.buryingPoint('app:my_contact_us_click') this.buryingPoint('app:my_contact_us_click')
const telPhone = uni.getStorageSync('telPhone') const APP_SETTING = uni.getStorageSync('APP-SETTING');
if (telPhone) { const serviceCall = APP_SETTING ? JSON.parse(APP_SETTING)['phone'] : ''
self.goPhone() this.handleCall(serviceCall)
} else { } catch (err) {
uni.showModal({ console.log('日')
title: '提示',
content: '该“联系我们”功能需要获取您的电话拨号等权限，以便于您通过拨打电话的方式向我们反映问题！',
showCancel: false,//没有取消按钮的弹框
confirmText: '确定',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
self.goPhone()
}
}
})
} }
}, },
goPhone() {
uni.setStorageSync('telPhone', '1')
uni.makePhoneCall({
phoneNumber: APP.serviceCall//仅为示例
});
},
goItem(item) { goItem(item) {
if (!this.isLogin) {
return this.Go('uni:/pages/login/login')
}
switch (item.title) { switch (item.title) {
case "设置": case "设置":
this.buryingPoint('app:my_settings_click') this.buryingPoint('app:my_settings_click')
......
pages/starPage/index.vue
View file @ 6a3b63fd
...@@ -21,12 +21,12 @@ export default { ...@@ -21,12 +21,12 @@ export default {
// 首页配置 // 首页配置
// await ininIndex() await ininIndex()
// await initIndexGoods() await initIndexGoods()
// // APP配置和H5配置 // APP配置和H5配置
// await initH5Setting() await initH5Setting()
// await initAPPSetting() await initAPPSetting()
this.init() this.init()
}, },
......
pages/web/face.vue
View file @ 6a3b63fd
<template> <template>
<view class="content"> <view class="content">
<!-- <template v-if="isCertified">
<uni-list >
<uni-list-item class="item" title="姓名1" :rightText="realName"></uni-list-item>
<uni-list-item class="item" title="身份证号码" :rightText="idCard"></uni-list-item>
</uni-list>
</template>
<template v-else> -->
<uni-frv-external-realname ref="frv" @start="startVerify" @finish="verifyFinish"></uni-frv-external-realname> <uni-frv-external-realname ref="frv" @start="startVerify" @finish="verifyFinish"></uni-frv-external-realname>
<!-- </template> -->
</view> </view>
</template> </template>
......
pages/web/web.vue
View file @ 6a3b63fd
...@@ -82,13 +82,18 @@ export default { ...@@ -82,13 +82,18 @@ export default {
}, },
async onLoad(option) { async onLoad(option) {
try { try {
console.log(option,'入参')
this.subnvue_open(); this.subnvue_open();
console.log(option, '入参')
const that = this; const that = this;
const config = JSON.parse(uni.getStorageSync('APP-SETTING')); const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
this.src = config['h5Url'] const timestamp = new Date().getTime()
console.log(config['h5Url'], 'H5地址') setTimeout(() => {
const token = uni.getStorageSync('tokenFinance')
const mobile = uni.getStorageSync('l-mobile')
const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}`
that.src = $src
}, 100);
uni.getStorage({ uni.getStorage({
key: 'm-device-info', key: 'm-device-info',
...@@ -112,38 +117,32 @@ export default { ...@@ -112,38 +117,32 @@ export default {
if (uni.getStorageSync('canRefreshWeb')) { if (uni.getStorageSync('canRefreshWeb')) {
uni.removeStorageSync('canRefreshWeb') uni.removeStorageSync('canRefreshWeb')
if (this.wv) { if (this.wv) {
// 为OCR做的刷新
const needReload = uni.getStorageSync('reloadFlag') const needReload = uni.getStorageSync('reloadFlag')
if (!needReload) { if (!needReload) {
console.log('刷新页面')
if (reloadTimeOut) clearTimeout(reloadTimeOut) if (reloadTimeOut) clearTimeout(reloadTimeOut)
reloadTimeOut = setTimeout(() => { reloadTimeOut = setTimeout(() => {
console.log('页面刷新了1')
this.wv.reload() this.wv.reload()
}, 1000) }, 1000)
} else {
console.log('不刷新页面')
} }
} }
} }
// 这里为借款做的刷新 // 这里为借款做的刷新
const canRefresh = uni.getStorageSync('canRefresh'); const canRefresh = uni.getStorageSync('canRefresh');
console.log(canRefresh, '是否需要刷新-这里为借款做的刷新')
console.log('onShow方法')
console.log(canRefresh, '是否需要刷新')
if (canRefresh) { if (canRefresh) {
uni.removeStorageSync('canRefresh') uni.removeStorageSync('canRefresh')
if (reloadTimeOut) clearTimeout(reloadTimeOut) if (reloadTimeOut) clearTimeout(reloadTimeOut)
reloadTimeOut = setTimeout(() => { reloadTimeOut = setTimeout(() => {
console.log('到这里了') console.log('页面刷新了2')
this.wv && this.wv.reload() this.wv && this.wv.reload()
}, 400) }, 400)
} }
}, },
onUnload() { onUnload() {
uni.$off('loadingSubnvue'); //移除监听配置的原生子窗体 uni.$off('loadingSubnvue'); //移除监听配置的原生子窗体
...@@ -545,8 +544,7 @@ export default { ...@@ -545,8 +544,7 @@ export default {
try { try {
CheckContactPermission((data) => { CheckContactPermission((data) => {
SelectContact((contact) => { SelectContact((contact) => {
that.GetWebView().evalJS( that.GetWebView().evalJS(`receivePickContactsBack('${JSON.stringify(contact)}')`)
`receivePickContactsBack('${JSON.stringify(contact)}')`)
}) })
}) })
} catch (err) { } catch (err) {
......
pages/web/websrc.vue
View file @ 6a3b63fd
...@@ -58,7 +58,6 @@ export default { ...@@ -58,7 +58,6 @@ export default {
async onLoad(option) { async onLoad(option) {
const that = this; const that = this;
if (option.url) this.src = option.url if (option.url) this.src = option.url
console.log(option.url,'地址')
uni.getStorage({ uni.getStorage({
key: 'm-device-info', key: 'm-device-info',
success: function (res) { success: function (res) {
......
pages/websrc/websrc.vue
View file @ 6a3b63fd
...@@ -5,56 +5,28 @@ ...@@ -5,56 +5,28 @@
</template> </template>
<script> <script>
export default { export default {
name: "WEB", name: "WEB",
data() { data() {
return { return {
// src:'http://192.168.0.38:8081/index.html#/middle?type=mieye&', src: null,
src:null,
webviewStyles: { webviewStyles: {
progress: { progress: {
color: '#FF4050' color: '#5688E8'
}
} }
},
timer:null,
titleVal:'',
urlWeb:'',
typePage:false,
deviceStatus:'',
viewerUrl:'/hybrid/html/web/viewer.html'
} }
}, },
onLoad(options){ onLoad(options) {
const that=this if (options.src) this.src = decodeURIComponent(options.src)
// console.log(options,'options')
that.src=decodeURIComponent(options.src)
let pages = getCurrentPages();
let page = pages[pages.length - 1];
let currentWebView = page.$getAppWebview();
// // #ifdef APP-PLUS
// var wv = plus.webview.create('', 'custom-webview', {
// plusrequire: 'none', //禁止远程网页使用plus的API
// 'uni-app': 'none', //不加载uni-app渲染层框架，避免样式冲突
// top: uni.getSystemInfoSync().statusBarHeight + 44 //放置在titleNView下方。
// });
// wv.loadURL(options);//加载url
// let pages = getCurrentPages();//获取当前页面栈的实例
// let currentPage = pages[pages.length - 1]; // 上一页
// var currentWebview = currentPage.$getAppWebview();//获取当前页面的webview对象实例
// currentWebview.append(wv);//Webview窗口中添加子窗口
// // #endif
}, },
methods: { methods: {
},
onShow(){
console.log("websrc 的webview")
}
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.page-web { .page-web {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
...@@ -62,5 +34,5 @@ ...@@ -62,5 +34,5 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
</style> </style>
splash.9.png 0 → 100644
View file @ 6a3b63fd
This diff is collapsed.
static/.DS_Store
View file @ 6a3b63fd
No preview for this file type
static/res/1125x2436.9.png 0 → 100644
View file @ 6a3b63fd
This diff is collapsed.
subPackage/setting/setting.vue
View file @ 6a3b63fd
...@@ -9,25 +9,25 @@ ...@@ -9,25 +9,25 @@
<view class='line-item' @click='cancelSize'> <view class='line-item' @click='cancelSize'>
<view class='item-text'>清除缓存</view> <view class='item-text'>清除缓存</view>
<view class='item-r'> <view class='item-r'>
<view class='r-text'>{{cacheSize}}</view> <view class='r-text'>{{ cacheSize }}</view>
<i class='r-icon'></i> <i class='r-icon'></i>
</view> </view>
</view> </view>
<view class='line-item'> <view class='line-item'>
<view class='item-text'>当前版本</view> <view class='item-text'>当前版本</view>
<view class='item-version'>{{versionNumber}}</view> <view class='item-version'>{{ versionNumber }}</view>
</view> </view>
</view> </view>
<view v-show="token!=''"> <view v-show="token != ''">
<view class='line-des'> <view class='line-des'>
如果您今后不打算使用APP，您可以选择 如果您今后不打算使用APP，您可以选择
<view class='des-x' @click='goCancel'>注销账号</view> <view class='des-x' @click='goCancel'>注销账号</view>
</view> </view>
<view class='line-tips' >注：该操作不可恢复</view> <view class='line-tips'>注：该操作不可恢复</view>
</view> </view>
</view> </view>
<view v-show="token!=''" class='set-footer' @click='goOut'>退出登录</view> <view v-show="token != ''" class='set-footer' @click='goOut'>退出登录</view>
<!-- 注销 --> <!-- 注销 -->
<view :hidden="userFeedbackHidden" class="popup_content"> <view :hidden="userFeedbackHidden" class="popup_content">
<view class="popup_title">提示</view> <view class="popup_title">提示</view>
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<view class='btn-confirm' @click='cancelAccount()'> <view class='btn-confirm' @click='cancelAccount()'>
确认 确认
</view> </view>
<view class='btn-cel' @click="hideDiv()" > <view class='btn-cel' @click="hideDiv()">
取消 取消
</view> </view>
</view> </view>
</view> </view>
<view class="popup_overlay" :hidden="userFeedbackHidden" ></view> <view class="popup_overlay" :hidden="userFeedbackHidden"></view>
<!-- 退出 --> <!-- 退出 -->
<view :hidden="outHidden" class="popup_content"> <view :hidden="outHidden" class="popup_content">
...@@ -55,33 +55,33 @@ ...@@ -55,33 +55,33 @@
<view class='btn-confirm' @click='loginOut()'> <view class='btn-confirm' @click='loginOut()'>
确认 确认
</view> </view>
<view class='btn-cel' @click="loginCel()" > <view class='btn-cel' @click="loginCel()">
取消 取消
</view> </view>
</view> </view>
</view> </view>
<view class="popup_overlay" :hidden="outHidden" ></view> <view class="popup_overlay" :hidden="outHidden"></view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
userFeedbackHidden:true,//弹窗 userFeedbackHidden: true,//弹窗
outHidden:true, outHidden: true,
protocolList:[], protocolList: [],
versionNumber:'', versionNumber: '',
cacheSize:'', cacheSize: '',
token:'' token: ''
} }
}, },
onLoad() { onLoad() {
let self = this; let self = this;
self.init() self.init()
self.buryingPoint('app:setting_pageView') self.buryingPoint('app:setting_pageView')
self.token=uni.getStorageSync('token') self.token = uni.getStorageSync('token')
plus.cache.calculate(size => { plus.cache.calculate(size => {
if (size < 1024) { if (size < 1024) {
self.cacheSize = size + 'B'; self.cacheSize = size + 'B';
...@@ -90,37 +90,37 @@ ...@@ -90,37 +90,37 @@
} else if (size / 1024 / 1024 >= 1) { } else if (size / 1024 / 1024 >= 1) {
self.cacheSize = Math.floor((size / 1024 / 1024) * 100) / 100 + 'M'; self.cacheSize = Math.floor((size / 1024 / 1024) * 100) / 100 + 'M';
} }
console.log(self.cacheSize,'size') console.log(self.cacheSize, 'size')
}); });
plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){ plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
if(wgtinfo.version){ if (wgtinfo.version) {
self.versionNumber = wgtinfo.version; self.versionNumber = wgtinfo.version;
}else{ } else {
self.versionNumber = plus.runtime.version; self.versionNumber = plus.runtime.version;
} }
console.log(self.versionNumber,'version') console.log(self.versionNumber, 'version')
}); });
}, },
methods: { methods: {
toJSON(){}, toJSON() { },
init(){ init() {
const self=this const self = this
self.$request('/pawn/setting','GET').then(res => { self.$request('/pawn/setting', 'GET').then(res => {
const { protocol,phone }=res.result const { protocol, phone } = res.result
console.log(protocol,typeof(protocol),'setting') console.log(protocol, typeof (protocol), 'setting')
if(protocol){ if (protocol) {
console.log(typeof(protocol),'8888') console.log(typeof (protocol), '8888')
self.protocolList=JSON.parse(protocol) self.protocolList = JSON.parse(protocol)
} }
}).catch(err=>{ }).catch(err => {
console.log(err,'请求出错') console.log(err, '请求出错')
}) })
}, },
cancelSize(){ cancelSize() {
let self = this; let self = this;
plus.cache.clear(res=>{ plus.cache.clear(res => {
uni.showToast({ uni.showToast({
title: '清除成功！', title: '清除成功！',
icon: 'none', icon: 'none',
...@@ -130,39 +130,39 @@ ...@@ -130,39 +130,39 @@
}); });
}) })
}, },
getProtol(){ getProtol() {
uni.navigateTo({ uni.navigateTo({
url:'/subPackage/prolist/prolist?mydata='+encodeURIComponent(JSON.stringify(this.protocolList)) url: '/subPackage/prolist/prolist?mydata=' + encodeURIComponent(JSON.stringify(this.protocolList))
}) })
}, },
goCancel(){ goCancel() {
this.userFeedbackHidden=false this.userFeedbackHidden = false
}, },
goOut(){ goOut() {
// this.userHidden=false // this.userHidden=false
this.outHidden=false this.outHidden = false
const pages = getCurrentPages(); const pages = getCurrentPages();
console.log(pages.length,'写') console.log(pages.length, '写')
pages.forEach(page=>{ pages.forEach(page => {
console.log(page.route,'路由信息') console.log(page.route, '路由信息')
}) })
}, },
cancelAccount(){ cancelAccount() {
//注销账号 //注销账号
const self=this const self = this
self.$request('/pawn/client/die','POST').then(res => { self.$request('/pawn/client/die', 'POST').then(res => {
console.log(res,'myinit'); console.log(res, 'myinit');
const { die}=res.result const { die } = res.result
console.log(die,'die') console.log(die, 'die')
if(die==true){ if (die == true) {
console.log(die,'die2') console.log(die, 'die2')
self.userFeedbackHidden=false self.userFeedbackHidden = false
uni.removeStorageSync('token') uni.removeStorageSync('token')
this.Go('uni:/pages/index/index','tab') this.Go('uni:/pages/index/index', 'tab')
} }
...@@ -170,48 +170,51 @@ ...@@ -170,48 +170,51 @@
}, },
loginOut(){ loginOut() {
const pages = getCurrentPages(); const pages = getCurrentPages();
pages.forEach(page=>{ pages.forEach(page => {
console.log(page,'页面') console.log(page, '页面')
const isWebView = page.$getAppWebview(); const isWebView = page.$getAppWebview();
if(isWebView){ if (isWebView) {
let currentPages = page.$getAppWebview() let currentPages = page.$getAppWebview()
let children = isWebView.children() let children = isWebView.children()
if (children.length){ if (children.length) {
children[0].close() children[0].close()
} }
} }
}) })
//退出登录 //退出登录
const self=this const self = this
console.log(333) console.log(333)
self.$request('/pawn/client/loginOut','POST').then(res => { self.$request('/pawn/client/loginOut', 'POST').then(res => {
console.log(res,'logout'); console.log(res, 'logout');
self.outHidden=false uni.setTabBarItem({
index: 1,
visible: false
})
self.outHidden = false
uni.removeStorageSync('token') uni.removeStorageSync('token')
this.Go('uni:/pages/index/index','tab') this.Go('uni:/pages/index/index', 'tab')
}) })
}, },
loginCel(){ loginCel() {
this.outHidden=true this.outHidden = true
}, },
hideDiv(){ hideDiv() {
//隐藏弹窗 //隐藏弹窗
this.userFeedbackHidden=true this.userFeedbackHidden = true
this.userHidden=true this.userHidden = true
this.outHidden=true this.outHidden = true
}, },
}, },
onShow() { onShow() {
this.init() this.init()
this.token=uni.getStorageSync('token') this.token = uni.getStorageSync('token')
}
} }
}
</script> </script>
<style src='./index.less' lang="less" scoped></style> <style src='./index.less' lang="less" scoped></style>
utils/header.js
View file @ 6a3b63fd
...@@ -19,20 +19,19 @@ export const convertPromise = function (FnName, params = {}) { ...@@ -19,20 +19,19 @@ export const convertPromise = function (FnName, params = {}) {
// 初始化请求头的device参数信息 // 初始化请求头的device参数信息
export const initHeaderDevice = function () { export const initHeaderDevice = function () {
let modelApp; let modelApp='';
// 手机型号 // 手机型号
if (uni.getStorageSync('m-agreement')) {
uni.getSystemInfo({ uni.getSystemInfo({
success: function (res) { success: function (res) {
modelApp = res.deviceBrand modelApp = res.deviceBrand
} }
}) })
}
// 获取版本号 // 获取版本号
let AppVersion = uni.getStorageSync('m-header-version'); let AppVersion = uni.getStorageSync('m-header-version');
console.log(AppVersion,'版本号')
const common = { const common = {
appName: 'DDH', appName: 'DDH',
appSourceId: modelApp, appSourceId: modelApp,
...@@ -58,7 +57,7 @@ export const initHeaderDevice = function () { ...@@ -58,7 +57,7 @@ export const initHeaderDevice = function () {
const locationInfo = uni.getStorageSync('m-location-info') const locationInfo = uni.getStorageSync('m-location-info')
const loadUuid = uni.getStorageSync('m-load-udid') const loadUuid = uni.getStorageSync('m-load-udid')
let device = {...common}; let device = { ...common };
if (deviceInfo) { if (deviceInfo) {
device = Object.assign(device, common, JSON.parse(deviceInfo)) device = Object.assign(device, common, JSON.parse(deviceInfo))
......
utils/request.js
View file @ 6a3b63fd
...@@ -17,7 +17,7 @@ const request = async (url, type, data) => { ...@@ -17,7 +17,7 @@ const request = async (url, type, data) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const token = uni.getStorageSync('token') const token = uni.getStorageSync('token')
const tokenFinance = uni.getStorageSync('tokenFinance') const tokenFinance = uni.getStorageSync('tokenFinance')
const $data = Object.assign({},data); const $data = Object.assign({}, data);
uni.request({ uni.request({
url: baseUrl + url, url: baseUrl + url,
...@@ -40,7 +40,7 @@ const request = async (url, type, data) => { ...@@ -40,7 +40,7 @@ const request = async (url, type, data) => {
console.log($data, '接口参数') console.log($data, '接口参数')
if (res.data.result) console.log(res.data.result, '返回内容') if (res.data.result) console.log(res.data.result, '返回内容')
else console.log(res.data, '返回内容') else console.log(res.data, '返回内容')
console.log('------------')
// #endif // #endif
const { data, statusCode } = res; const { data, statusCode } = res;
...@@ -48,13 +48,17 @@ const request = async (url, type, data) => { ...@@ -48,13 +48,17 @@ const request = async (url, type, data) => {
if (data.success == true) { if (data.success == true) {
return resolve(data) return resolve(data)
} else { } else {
if (data.code == '403'){ if (data.code === '403') {
// uni.removeStorageSync('token')
uni.clearStorageSync(); uni.clearStorageSync();
} setTimeout(() => {
return uni.redirectTo({ uni.redirectTo({
url:"/pages/login/login" url: "/pages/login/login"
}) })
}, 1500)
return reject({ ...data, message: res.errMsg })
} else if (data.code === '500') {
return reject({ ...data })
}
} }
} else { } else {
return reject({ ...data, message: res.errMsg }) 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