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
Hide 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>
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'
export default {
globalData: {
......@@ -25,6 +25,7 @@ export default {
// #endif
// 强制竖屏
plus.screen.lockOrientation("portrait-primary")
......@@ -42,6 +43,13 @@ export default {
uni.setStorage({ key: 'm-header-version', data: versionNumber });
})
if (uni.getStorageSync('m-agreement')) {
loadNetwork()
loadDevice()
loadLocation()
loadUuid()
}
// 首页配置
await ininIndex()
await initIndexGoods()
......
main.js
View file @ 6a3b63fd
......@@ -5,9 +5,13 @@ import Vue from 'vue'
Vue.config.productionTip = false
App.mpType = 'app'
import mixin from './mixin/index'
import Modal from './components/modal/modal'
import goodsItem from './components/goodsItem/index'
import upgradePopup from './components/showModal/upgradePopup'
import request from './utils/request.js'
import * as utils from "./utils/index.js";
......@@ -16,6 +20,7 @@ Vue.component('view-modal', Modal);
Vue.component('view-goods', goodsItem);
Vue.component('upgrade-Popup', upgradePopup);
Vue.prototype.$request = request
Vue.mixin(mixin)
......
manifest.json
View file @ 6a3b63fd
......@@ -126,7 +126,16 @@
},
"splashscreen" : {
"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" : {
......
pages.json
View file @ 6a3b63fd
......@@ -126,6 +126,13 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/websrc/websrc",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "uni_modules/uni-frv-external/pages/common/webview/webview",
"style": {
......
pages/agreement/index.vue
View file @ 6a3b63fd
......@@ -63,8 +63,6 @@ export default {
},
// 同意授权
handleSure() {
plus.runtime.agreePrivacy();
const that = this;
uni.setStorage({
key: "m-agreement",
data: 'true',
......
pages/login/login.vue
View file @ 6a3b63fd
......@@ -16,7 +16,7 @@
<input class='send-value' placeholder="请输入验证码" :value="sendcode" maxlength="6" type="number"
@input="(e) => handleInput(e, 'sendcode')" />
<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>
......
pages/my/index.vue
View file @ 6a3b63fd
<template>
<view class='my-page'>
<view class='my-top'>
<view v-if="mineData" class='my-top'>
<!-- 头部 -->
<view class='my-header'>
......@@ -15,7 +15,7 @@
<!-- 我的还款&申请记录 -->
<template v-if="isLogin && loanSwitch">
<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>
<view class='l-text'>{{ item.title }}</view>
<i class='l-go'></i>
......@@ -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='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>
<view class='item-text'>{{ item.title }}</view>
</view>
......@@ -37,10 +38,10 @@
</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>
<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='con-box'>
<view class="box-line" v-for="item in mineData['baseMenuBar']" @click='goItem(item)' :key="item.id">
<view class='line-item'>
<view class='item-l'>
<image class='l-img' :src='item.iconUrl'></image>
......@@ -52,69 +53,9 @@
</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='footer-btn' @click="goTel">
<view class='footer-btn' @click="GoTel">
<i class='btn-tel'></i>
<view class='btn-text'>联系我们</view>
</view>
......@@ -129,9 +70,7 @@
<script>
import { switchShowTabbar } from '@/utils/index'
import { isLogin } from '../../utils';
const APP = JSON.parse(uni.getStorageSync('APP-SETTING'));
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : '';
const $mineData = uni.getStorageSync('mineData') ? uni.getStorageSync('mineData') : null;
export default {
data() {
......@@ -139,13 +78,8 @@ export default {
isLogin: false,
loanSwitch: false,
mobile: '',
menuList: [],
mobileNum: '',
menuBar: [],
serviceCall: APP.serviceCall,
serviceCall: '',
extMenuBarList: [],
hFUrl: ''
mineData: $mineData
}
},
onShow() {
......@@ -181,17 +115,16 @@ export default {
initMine() {
const self = this
self.$request('/app/v1/userIndex', 'GET').then(res => {
const { menuBar, baseMenuBar, extMenuBarList } = res.result
self.menuBar = menuBar
self.menuList = baseMenuBar
self.extMenuBarList = extMenuBarList
self.mineData = res.result
uni.setStorageSync('mineData', res.result)
}).catch(err => {
console.log(err, '请求出错')
console.log(err, '初始化我的报错')
})
},
goPage(item) {
console.log(item.title)
if (!this.isLogin) {
return this.Go('uni:/pages/login/login')
}
switch (item.title) {
case "我的浏览":
this.buryingPoint('app:my_browsing_history_click')
......@@ -238,35 +171,22 @@ export default {
}
},
goTel() {
const self = this
self.buryingPoint('app:my_contact_us_click')
const telPhone = uni.getStorageSync('telPhone')
if (telPhone) {
self.goPhone()
} else {
uni.showModal({
title: '提示',
content: '该“联系我们”功能需要获取您的电话拨号等权限，以便于您通过拨打电话的方式向我们反映问题！',
showCancel: false,//没有取消按钮的弹框
confirmText: '确定',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
self.goPhone()
}
}
})
GoTel() {
try {
this.buryingPoint('app:my_contact_us_click')
const APP_SETTING = uni.getStorageSync('APP-SETTING');
const serviceCall = APP_SETTING ? JSON.parse(APP_SETTING)['phone'] : ''
this.handleCall(serviceCall)
} catch (err) {
console.log('日')
}
},
goPhone() {
uni.setStorageSync('telPhone', '1')
uni.makePhoneCall({
phoneNumber: APP.serviceCall//仅为示例
});
},
goItem(item) {
if (!this.isLogin) {
return this.Go('uni:/pages/login/login')
}
switch (item.title) {
case "设置":
this.buryingPoint('app:my_settings_click')
......
pages/starPage/index.vue
View file @ 6a3b63fd
......@@ -21,12 +21,12 @@ export default {
// 首页配置
// await ininIndex()
// await initIndexGoods()
await ininIndex()
await initIndexGoods()
// // APP配置和H5配置
// await initH5Setting()
// await initAPPSetting()
// APP配置和H5配置
await initH5Setting()
await initAPPSetting()
this.init()
},
......
pages/web/face.vue
View file @ 6a3b63fd
<template>
<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>
<!-- </template> -->
</view>
</template>
......
pages/web/web.vue
View file @ 6a3b63fd
......@@ -82,13 +82,18 @@ export default {
},
async onLoad(option) {
try {
console.log(option,'入参')
this.subnvue_open();
console.log(option, '入参')
const that = this;
const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
this.src = config['h5Url']
console.log(config['h5Url'], 'H5地址')
const timestamp = new Date().getTime()
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({
key: 'm-device-info',
......@@ -112,38 +117,32 @@ export default {
if (uni.getStorageSync('canRefreshWeb')) {
uni.removeStorageSync('canRefreshWeb')
if (this.wv) {
// 为OCR做的刷新
const needReload = uni.getStorageSync('reloadFlag')
if (!needReload) {
console.log('刷新页面')
if (reloadTimeOut) clearTimeout(reloadTimeOut)
reloadTimeOut = setTimeout(() => {
console.log('页面刷新了1')
this.wv.reload()
}, 1000)
} else {
console.log('不刷新页面')
}
}
}
// 这里为借款做的刷新
const canRefresh = uni.getStorageSync('canRefresh');
console.log('onShow方法')
console.log(canRefresh, '是否需要刷新')
console.log(canRefresh, '是否需要刷新-这里为借款做的刷新')
if (canRefresh) {
uni.removeStorageSync('canRefresh')
if (reloadTimeOut) clearTimeout(reloadTimeOut)
reloadTimeOut = setTimeout(() => {
console.log('到这里了')
console.log('页面刷新了2')
this.wv && this.wv.reload()
}, 400)
}
},
onUnload() {
uni.$off('loadingSubnvue'); //移除监听配置的原生子窗体
......@@ -545,8 +544,7 @@ export default {
try {
CheckContactPermission((data) => {
SelectContact((contact) => {
that.GetWebView().evalJS(
`receivePickContactsBack('${JSON.stringify(contact)}')`)
that.GetWebView().evalJS(`receivePickContactsBack('${JSON.stringify(contact)}')`)
})
})
} catch (err) {
......
pages/web/websrc.vue
View file @ 6a3b63fd
......@@ -58,7 +58,6 @@ export default {
async onLoad(option) {
const that = this;
if (option.url) this.src = option.url
console.log(option.url,'地址')
uni.getStorage({
key: 'm-device-info',
success: function (res) {
......
pages/websrc/websrc.vue
View file @ 6a3b63fd
<template>
<view class="page-web">
<web-view ref='webview' :webview-styles="webviewStyles" :src="src"></web-view>
<web-view ref='webview' :webview-styles="webviewStyles" :src="src"></web-view>
</view>
</template>
<script>
export default {
name: "WEB",
data() {
return {
// src:'http://192.168.0.38:8081/index.html#/middle?type=mieye&',
src:null,
webviewStyles: {
progress: {
color: '#FF4050'
}
},
timer:null,
titleVal:'',
urlWeb:'',
typePage:false,
deviceStatus:'',
viewerUrl:'/hybrid/html/web/viewer.html'
export default {
name: "WEB",
data() {
return {
src: null,
webviewStyles: {
progress: {
color: '#5688E8'
}
}
},
onLoad(options){
const that=this
// 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: {
},
onShow(){
console.log("websrc 的webview")
}
},
onLoad(options) {
if (options.src) this.src = decodeURIComponent(options.src)
},
methods: {
}
}
</script>
<style lang="less" scoped>
.page-web {
width: 100vw;
height: 100vh;
.page-web {
width: 100vw;
height: 100vh;
web-view {
width: 100%;
height: 100%;
}
}
web-view {
width: 100%;
height: 100%;
}
}
</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,209 +9,212 @@
<view class='line-item' @click='cancelSize'>
<view class='item-text'>清除缓存</view>
<view class='item-r'>
<view class='r-text'>{{cacheSize}}</view>
<view class='r-text'>{{ cacheSize }}</view>
<i class='r-icon'></i>
</view>
</view>
<view class='line-item'>
<view class='item-text'>当前版本</view>
<view class='item-version'>{{versionNumber}}</view>
<view class='item-version'>{{ versionNumber }}</view>
</view>
</view>
<view v-show="token!=''">
<view v-show="token != ''">
<view class='line-des'>
如果您今后不打算使用APP，您可以选择
<view class='des-x' @click='goCancel'>注销账号</view>
</view>
<view class='line-tips' >注：该操作不可恢复</view>
<view class='line-tips'>注：该操作不可恢复</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 class="popup_title">提示</view>
<view class='popup_main'>
您一但确认注销，您所有信息都会被清除，您确认注销账号？
</view>
<view class='btn-main'>
<view class='btn-confirm' @click='cancelAccount()'>
确认
</view>
<view class='btn-cel' @click="hideDiv()" >
取消
</view>
</view>
<view class="popup_title">提示</view>
<view class='popup_main'>
您一但确认注销，您所有信息都会被清除，您确认注销账号？
</view>
<view class='btn-main'>
<view class='btn-confirm' @click='cancelAccount()'>
确认
</view>
<view class='btn-cel' @click="hideDiv()">
取消
</view>
</view>
</view>
<view class="popup_overlay" :hidden="userFeedbackHidden" ></view>
<view class="popup_overlay" :hidden="userFeedbackHidden"></view>
<!-- 退出 -->
<view :hidden="outHidden" class="popup_content">
<view class="popup_title">提示</view>
<view class='popup_main'>
您确定退出登录吗？
</view>
<view class='btn-main'>
<view class='btn-confirm' @click='loginOut()'>
确认
</view>
<view class='btn-cel' @click="loginCel()" >
取消
</view>
</view>
<view class="popup_title">提示</view>
<view class='popup_main'>
您确定退出登录吗？
</view>
<view class='btn-main'>
<view class='btn-confirm' @click='loginOut()'>
确认
</view>
<view class='btn-cel' @click="loginCel()">
取消
</view>
</view>
</view>
<view class="popup_overlay" :hidden="outHidden" ></view>
<view class="popup_overlay" :hidden="outHidden"></view>
</view>
</template>
<script>
export default {
data() {
return {
userFeedbackHidden:true,//弹窗
outHidden:true,
protocolList:[],
versionNumber:'',
cacheSize:'',
token:''
export default {
data() {
return {
userFeedbackHidden: true,//弹窗
outHidden: true,
protocolList: [],
versionNumber: '',
cacheSize: '',
token: ''
}
},
onLoad() {
let self = this;
self.init()
self.buryingPoint('app:setting_pageView')
self.token = uni.getStorageSync('token')
plus.cache.calculate(size => {
if (size < 1024) {
self.cacheSize = size + 'B';
} else if (size / 1024 >= 1 && size / 1024 / 1024 < 1) {
self.cacheSize = Math.floor((size / 1024) * 100) / 100 + 'KB';
} else if (size / 1024 / 1024 >= 1) {
self.cacheSize = Math.floor((size / 1024 / 1024) * 100) / 100 + 'M';
}
console.log(self.cacheSize, 'size')
});
plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
if (wgtinfo.version) {
self.versionNumber = wgtinfo.version;
} else {
self.versionNumber = plus.runtime.version;
}
console.log(self.versionNumber, 'version')
});
},
methods: {
toJSON() { },
init() {
const self = this
self.$request('/pawn/setting', 'GET').then(res => {
const { protocol, phone } = res.result
console.log(protocol, typeof (protocol), 'setting')
if (protocol) {
console.log(typeof (protocol), '8888')
self.protocolList = JSON.parse(protocol)
}
}).catch(err => {
console.log(err, '请求出错')
})
},
onLoad() {
cancelSize() {
let self = this;
self.init()
self.buryingPoint('app:setting_pageView')
self.token=uni.getStorageSync('token')
plus.cache.calculate(size => {
if (size < 1024) {
self.cacheSize = size + 'B';
} else if (size / 1024 >= 1 && size / 1024 / 1024 < 1) {
self.cacheSize = Math.floor((size / 1024) * 100) / 100 + 'KB';
} else if (size / 1024 / 1024 >= 1) {
self.cacheSize = Math.floor((size / 1024 / 1024) * 100) / 100 + 'M';
}
console.log(self.cacheSize,'size')
});
plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){
if(wgtinfo.version){
self.versionNumber = wgtinfo.version;
}else{
self.versionNumber = plus.runtime.version;
plus.cache.clear(res => {
uni.showToast({
title: '清除成功！',
icon: 'none',
success() {
self.cacheSize = '0B';
}
console.log(self.versionNumber,'version')
});
});
})
},
methods: {
toJSON(){},
init(){
const self=this
self.$request('/pawn/setting','GET').then(res => {
const { protocol,phone }=res.result
console.log(protocol,typeof(protocol),'setting')
if(protocol){
console.log(typeof(protocol),'8888')
self.protocolList=JSON.parse(protocol)
}
}).catch(err=>{
console.log(err,'请求出错')
})
},
cancelSize(){
let self = this;
plus.cache.clear(res=>{
uni.showToast({
title: '清除成功！',
icon: 'none',
success() {
self.cacheSize = '0B';
}
});
})
},
getProtol(){
uni.navigateTo({
url:'/subPackage/prolist/prolist?mydata='+encodeURIComponent(JSON.stringify(this.protocolList))
})
},
goCancel(){
this.userFeedbackHidden=false
},
goOut(){
// this.userHidden=false
this.outHidden=false
const pages = getCurrentPages();
console.log(pages.length,'写')
pages.forEach(page=>{
console.log(page.route,'路由信息')
})
getProtol() {
uni.navigateTo({
url: '/subPackage/prolist/prolist?mydata=' + encodeURIComponent(JSON.stringify(this.protocolList))
})
},
goCancel() {
this.userFeedbackHidden = false
},
goOut() {
// this.userHidden=false
this.outHidden = false
},
cancelAccount(){
//注销账号
const self=this
self.$request('/pawn/client/die','POST').then(res => {
console.log(res,'myinit');
const { die}=res.result
console.log(die,'die')
if(die==true){
console.log(die,'die2')
self.userFeedbackHidden=false
uni.removeStorageSync('token')
this.Go('uni:/pages/index/index','tab')
const pages = getCurrentPages();
console.log(pages.length, '写')
pages.forEach(page => {
console.log(page.route, '路由信息')
})
},
cancelAccount() {
//注销账号
const self = this
self.$request('/pawn/client/die', 'POST').then(res => {
console.log(res, 'myinit');
const { die } = res.result
console.log(die, 'die')
if (die == true) {
console.log(die, 'die2')
self.userFeedbackHidden = false
uni.removeStorageSync('token')
this.Go('uni:/pages/index/index', 'tab')
}
})
},
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()
}
})
},
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
console.log(333)
self.$request('/pawn/client/loginOut','POST').then(res => {
console.log(res,'logout');
self.outHidden=false
uni.removeStorageSync('token')
this.Go('uni:/pages/index/index','tab')
}
})
//退出登录
const self = this
console.log(333)
self.$request('/pawn/client/loginOut', 'POST').then(res => {
console.log(res, 'logout');
uni.setTabBarItem({
index: 1,
visible: false
})
},
loginCel(){
this.outHidden=true
},
hideDiv(){
//隐藏弹窗
this.userFeedbackHidden=true
this.userHidden=true
this.outHidden=true
},
self.outHidden = false
uni.removeStorageSync('token')
this.Go('uni:/pages/index/index', 'tab')
})
},
onShow() {
this.init()
this.token=uni.getStorageSync('token')
}
loginCel() {
this.outHidden = true
},
hideDiv() {
//隐藏弹窗
this.userFeedbackHidden = true
this.userHidden = true
this.outHidden = true
},
},
onShow() {
this.init()
this.token = uni.getStorageSync('token')
}
}
</script>
<style src='./index.less' lang="less" scoped></style>
uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
View file @ 6a3b63fd
......@@ -36,12 +36,12 @@
<script>
let platform
setTimeout(() => {
// #ifdef MP-WEIXIN
platform = uni.getDeviceInfo().platform
// #endif
// #ifndef MP-WEIXIN
platform = uni.getSystemInfoSync().platform
setTimeout(() => {
// #ifdef MP-WEIXIN
platform = uni.getDeviceInfo().platform
// #endif
// #ifndef MP-WEIXIN
platform = uni.getSystemInfoSync().platform
// #endif
}, 16)
......@@ -105,10 +105,10 @@
contentnomore: ''
}
}
},
showText: {
type: Boolean,
default: true
},
showText: {
type: Boolean,
default: true
}
},
data() {
......@@ -118,10 +118,10 @@
imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZV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'
}
},
computed: {
computed: {
iconSnowWidth() {
return (Math.floor(this.iconSize / 24) || 1) * 2
},
},
contentdownText() {
return this.contentText.contentdown || t("uni-load-more.contentdown")
},
......@@ -169,7 +169,7 @@
}
.uni-load-more__text {
font-size: 14px;
font-size: 14px;
margin-left: 8px;
}
......
utils/header.js
View file @ 6a3b63fd
......@@ -19,20 +19,19 @@ export const convertPromise = function (FnName, params = {}) {
// 初始化请求头的device参数信息
export const initHeaderDevice = function () {
let modelApp;
let modelApp='';
// 手机型号
uni.getSystemInfo({
success: function (res) {
modelApp = res.deviceBrand
}
})
if (uni.getStorageSync('m-agreement')) {
uni.getSystemInfo({
success: function (res) {
modelApp = res.deviceBrand
}
})
}
// 获取版本号
let AppVersion = uni.getStorageSync('m-header-version');
console.log(AppVersion,'版本号')
const common = {
appName: 'DDH',
appSourceId: modelApp,
......@@ -58,7 +57,7 @@ export const initHeaderDevice = function () {
const locationInfo = uni.getStorageSync('m-location-info')
const loadUuid = uni.getStorageSync('m-load-udid')
let device = {...common};
let device = { ...common };
if (deviceInfo) {
device = Object.assign(device, common, JSON.parse(deviceInfo))
......
utils/request.js
View file @ 6a3b63fd
......@@ -5,7 +5,7 @@ const request = async (url, type, data) => {
// 这里确保一定是可以获取得到的
const headerDevice = uni.getStorageSync('m-header-device')
let rd
if (headerDevice) {
if (headerDevice) {
rd = encodeURIComponent(headerDevice)
} else {
rd = JSON.stringify(initHeaderDevice())
......@@ -17,8 +17,8 @@ const request = async (url, type, data) => {
return new Promise((resolve, reject) => {
const token = uni.getStorageSync('token')
const tokenFinance = uni.getStorageSync('tokenFinance')
const $data = Object.assign({},data);
const $data = Object.assign({}, data);
uni.request({
url: baseUrl + url,
method: type,
......@@ -33,14 +33,14 @@ const request = async (url, type, data) => {
Author: token, //多典花
},
success: (res) => {
// #ifdef APP
console.log('------------')
console.log(`${baseUrl}${url}`, '接口地址')
console.log($data, '接口参数')
if (res.data.result) console.log(res.data.result, '返回内容')
else console.log(res.data, '返回内容')
console.log('------------')
// #endif
const { data, statusCode } = res;
......@@ -48,13 +48,17 @@ const request = async (url, type, data) => {
if (data.success == true) {
return resolve(data)
} else {
if (data.code == '403'){
// uni.removeStorageSync('token')
if (data.code === '403') {
uni.clearStorageSync();
}
return uni.redirectTo({
url:"/pages/login/login"
})
setTimeout(() => {
uni.redirectTo({
url: "/pages/login/login"
})
}, 1500)
return reject({ ...data, message: res.errMsg })
} else if (data.code === '500') {
return reject({ ...data })
}
}
} 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