Skip to content

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

修改提交

parent cde25617
Hide whitespace changes
Inline Side-by-side
Showing with 3111 additions and 3043 deletions
.gitignore
View file @ 4735acca
......@@ -10,6 +10,9 @@ dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
unpackage/
.history
.hbuilderx
# Editor directories and files
.project
......@@ -22,4 +25,3 @@ yarn-error.log*
*.sw*
.history
.DS_Store
/unpackage
App.vue
View file @ 4735acca
<script>
import { convertPromise ,initHeaderInfo} from './utils/header.js'
import Permission from '@/js_sdk/wa-permission/permission'
import { SelectLocation } from "./utils/authPerission";
import { SelectLocation } from "./utils/authPerission";
import silentlyAppUpdate from '@/pages/app-update/js-sdk/silentlyAppUpdate'
export default {
onLaunch: function() {
const common = uni.getStorageSync("m-headers")
if (!common && plus.os.name=='iOS') {
console.log(plus.os.name,'9')
this.loadDevice();
this.loadNetwork();
this.loadLocation();
this.loadUuid()
}
let versionNumber
plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){
if(wgtinfo.version){
versionNumber = wgtinfo.version;
}else{
versionNumber = plus.runtime.version;
}
console.log(versionNumber,'versionNumber')
uni.setStorageSync('version',versionNumber)
})
onLaunch: function() {
const common = uni.getStorageSync("m-headers")
if (!common && plus.os.name=='iOS') {
this.loadDevice();
this.loadNetwork();
this.loadLocation();
this.loadUuid()
}
let versionNumber
plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){
if(wgtinfo.version){
versionNumber = wgtinfo.version;
}else{
versionNumber = plus.runtime.version;
}
uni.setStorageSync('version',versionNumber)
})
// 强制竖屏
plus.screen.lockOrientation("portrait-primary")
/*** tabbar*/
this.switchShowTabbar()
//app更新版本
silentlyAppUpdate()
const isAgree = uni.getStorageSync('m-agreement')
if (isAgree && plus.os.name=='iOS') {
silentlyAppUpdate()
}
// this.getAppVersion()
console.log('App Launch')
/*** tabbar*/
this.switchShowTabbar()
//app更新版本
// silentlyAppUpdate()
const isAgree = uni.getStorageSync('m-agreement')
if (isAgree && plus.os.name ==='iOS') {
silentlyAppUpdate()
}
},
methods:{
getAppVersion(){
const self=this
uni.getSystemInfo({
success: (res) => {
let platform = res.platform;
// 获取本机版本号
let type;
platform === "android" ? (type = "ANDROID") : (type = "IOS");
self.$request(`/pawn/setting/other/appVersion/${type}`,'GET').then(res => {
if (res.success==true) {
let response = res.result.data;
let result = {};
result.versionCode = response.version;
result.versionName = response.versionName;
result.versionInfo = response.content || "暂无";
result.forceUpdate = response.forceUpdate;
result.downloadUrl = response.downloadUrl;
result.is_silently = response.is_silently || false;
result.platform = platform;
result.storeList = response.storeList || '';
result.title = response.title || '';
result.type = response.type || '';
uni.setStorageSync('appVersion-info',result)
// resolve(result);
}
})
}
});
},
//tab的信息
switchShowTabbar(){
const token=uni.getStorageSync('token')
if (!token) {
console.log(token,'tokentab')
uni.setTabBarItem({
index: 1,
visible: false
})
} else {
const self=this
self.$request('/pawn/setting/other/switch/loan','GET').then(res => {
const {data}=res.result
if (res.code == 200 && data == true) {
try {
console.log(data,'显示')
uni.setTabBarItem({
index: 1,
text: '贷款',
visible: true,
})
} catch (error) {
console.log(error);
}
} else {
console.log(data,'隐藏')
uni.setTabBarItem({
index: 1,
visible: false
})
}
})
}
methods:{
getAppVersion(){
const self=this
uni.getSystemInfo({
success: (res) => {
let platform = res.platform;
// 获取本机版本号
let type;
platform === "android" ? (type = "ANDROID") : (type = "IOS");
self.$request(`/pawn/setting/other/appVersion/${type}`,'GET').then(res => {
if (res.success==true) {
let response = res.result.data;
let result = {};
result.versionCode = response.version;
result.versionName = response.versionName;
result.versionInfo = response.content || "暂无";
result.forceUpdate = response.forceUpdate;
result.downloadUrl = response.downloadUrl;
result.is_silently = response.is_silently || false;
result.platform = platform;
result.storeList = response.storeList || '';
result.title = response.title || '';
result.type = response.type || '';
uni.setStorageSync('appVersion-info',result)
// resolve(result);
}
})
}
});
},
//tab的信息
switchShowTabbar(){
const token=uni.getStorageSync('token')
if (!token) {
uni.setTabBarItem({
index: 1,
visible: false
})
} else {
const self=this
self.$request('/pawn/setting/other/switch/loan','GET').then(res => {
const {data}=res.result
if (res.code == 200 && data == true) {
try {
uni.setTabBarItem({
index: 1,
text: '贷款',
visible: true,
})
} catch (error) {
console.log(error);
}
} else {
console.log(data,'隐藏')
uni.setTabBarItem({
index: 1,
visible: false
})
}
})
}
},
// 获取common当中的设备信息
loadDevice: function() {
......@@ -130,7 +125,7 @@
key: 'm-device-info',
data: JSON.stringify(deviceInfo),
success: function() {
console.log('m-device-info存储成功');
// console.log('m-device-info存储成功');
}
});
}).catch(err => {
......@@ -160,7 +155,7 @@
key: 'm-network-info',
data: JSON.stringify(networkInfo),
success: function() {
console.log('m-network-info存储成功');
// console.log('m-network-info存储成功');
}
});
}).catch(err => {
......@@ -179,7 +174,7 @@
key: 'm-load-udid',
data: JSON.stringify(deviceInfo),
success: function() {
console.log('uuid存储成功');
// console.log('uuid存储成功');
}
})
},
......@@ -206,7 +201,7 @@
key: 'm-location-info',
data: JSON.stringify(locationInfo),
success: function() {
console.log('m-location-info存储成功');
// console.log('m-location-info存储成功');
}
});
}).catch(err => {
......@@ -215,19 +210,11 @@
})
})
}
},
onShow: function() {
console.log(2,'App Show')
},
onHide: function() {
console.log('App Hide')
}
}
</script>
<style >
<style >
/*每个页面公共css */
</style>
config/api.js
View file @ 4735acca
......@@ -47,8 +47,6 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
env = "development";
// #endif
console.log("env", env);
const api = {
common: BASE[env].common,
buyer: BASE[env].buyer,
......
js_sdk/wa-permission/permission.js
View file @ 4735acca
......@@ -45,7 +45,7 @@ function judgeIosPermissionLocation() {
var cllocationManger = plus.ios.import("CLLocationManager");
var status = cllocationManger.authorizationStatus();
result = (status != 2)
console.log("定位权限开启：" + result);
// console.log("定位权限开启：" + result);
// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
/* var enable = cllocationManger.locationServicesEnabled();
var status = cllocationManger.authorizationStatus();
......
pages.json
View file @ 4735acca
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"app-plus": {
"bounce": "none"
}
}
}
}
},
{
"path": "pages/sort/index",
......@@ -182,8 +182,8 @@
}
}
}
],
],
"tabBar": {
"borderStyle": "white",
"color": "#BBBBBB",
......@@ -233,5 +233,5 @@
"pages/my/index"
],
"resToLogin":true
}
}
}
pages/agreement/index.less
View file @ 4735acca
page{
background: transparent;
}
.page-agreement{
position: relative;
width: 100vw;
......
pages/agreement/index.vue
View file @ 4735acca
......@@ -82,8 +82,7 @@ export default {
const { protocol,phone }=res.result
if(protocol){
const protocolList=JSON.parse(protocol)
protocolList.map((item)=>{
console.log(item,'item9')
protocolList.map((item)=>{
if(item.protocolName=='隐私协议'){
self.protocols=item
}else if(item.protocolName=='用户服务协议'){
......
pages/app-update/index.vue
View file @ 4735acca
<template>
<view class="appUploadAlertBox">
<uni-popup ref="popup" mode="center" :maskCloseAble="false" @touchmove.stop.prevent zIndex="9999" width="590rpx" border-radius="10">
<view class="content_popup" :style="{backgroundColor: bgColor}">
<uni-popup ref="popup" mode="center" :maskCloseAble="false" @touchmove.stop.prevent zIndex="9999" width="590rpx"
border-radius="10">
<view class="content_popup" :style="{ backgroundColor: bgColor }">
<!-- 关闭app type="closeempty" size="32"
color="#ff0000"-->
<view v-if="!isForceUpdata" class="close" @click="closeUpdate">暂不更新</view>
<!-- 版本提示 -->
<view class="version" :style="{color: versionColor}">v{{version}}</view>
<!-- 背景 -->
<image class="backgroundImg" width="100%" height="100%" src="./img/appUploadAlertBoxBg.png"></image>
color="#ff0000"-->
<view v-if="!isForceUpdata" class="close" @click="closeUpdate">暂不更新</view>
<!-- 版本提示 -->
<view class="version" :style="{ color: versionColor }">v{{ version }}</view>
<!-- 背景 -->
<image class="backgroundImg" width="100%" height="100%" src="./img/appUploadAlertBoxBg.png"></image>
<!-- 更新详细信息 -->
<view class="info center">
<text class="title" :style="{color: titleColor}">{{title}}</text>
<text class="title" :style="{ color: titleColor }">{{ title }}</text>
<!-- 更新内容 -->
<scroll-view class="info_desc_scroll" :style="{color: contentColor}" scroll-y="true">
<scroll-view class="info_desc_scroll" :style="{ color: contentColor }" scroll-y="true">
<rich-text :nodes="content"></rich-text>
</scroll-view>
</view>
<view class="footer" v-if="platform">
<button v-if="downloadSuccess && !wgtInstalled" class="btn" :style="btnStyle"
@click="installPackage" :loading="wgtInstalling" :disabled="wgtInstalling">
{{wgtInstalling ? wgtInstallingText : downloadSuccessText}}
{{ wgtInstalling ? wgtInstallingText : downloadSuccessText }}
</button>
<button v-else-if="wgtInstalled && isWGT" class="btn" :style="btnStyle" @click="restart">
{{wgtInstalledText}}
{{ wgtInstalledText }}
</button>
<!-- 更新进度 -->
<view class="progress-box flex f-c f-y-c" :style="{color: progressTextColor}"
<view class="progress-box flex f-c f-y-c" :style="{ color: progressTextColor }"
v-else-if="downloading">
<progress class="progress" :percent="downLoadPercent" :activeColor="progressColor || themeColor"
show-info stroke-width="10" />
<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
<text>{{downLoadingText}}</text>
<text>({{downloadedSize}}M/{{packageFileSize || 0}}M)</text>
<text>{{ downLoadingText }}</text>
<text>({{ downloadedSize }}M/{{ packageFileSize || 0 }}M)</text>
</view>
</view>
<!-- 选项 -->
<view v-else class="btns flex f-x-b">
<!-- IOS -->
<view v-if="platform == 'ios'" class="btn confirm" :style="btnStyle" @click="jumpToAppStore">
{{downloadBtnTextIOS}}
{{ downloadBtnTextIOS }}
</view>
<!-- android -->
<view v-else class="btn confirm" :style="btnStyle" @click="updataApp">
{{downloadBtnTextAndroid}}
{{ downloadBtnTextAndroid }}
</view>
</view>
<!-- 短期内不在提醒 -->
......@@ -63,542 +64,547 @@
</template>
<script>
/**
* geek-appUpdata app更新提示框
* @description app更新提示框，支持热更新，强制更新，普通更新，暂不更新，后台下载，更新内容展示，进度条显示，ios跳转appstore等功能。
* @property {String} title 更新标题。
* @property {String} downloadBtnTextIOS 下载按钮ios文字。
* @property {String} downloadBtnText 下载按钮文字。
* @property {String} cancelDownloadBtnText 取消下载按钮文字。
* @property {String} downLoadingText 下载中文字提示。
* @property {Number} intervalAlertUserUpdateDay 用户提示更新的间隔时间 单位day(默认7day)。
* @example
*/
import config from './config.js';
import checkVersion from './js-sdk/checkVersion.js';
import {loadDevice,loadNetwork,loadUuid,loadLocation} from '../../utils/deviceInfo.js'
export default {
name: 'geekAppUpdata',
props: config.props,
data() {
return {
// 更新的版本号
version: '',
// 系统环境
platform: '',
// 下载链接
url: '',
// 跳转的应用市场列表
storeList: [],
// 是否wgt资源包
isWGT: false,
// 是否强制更新
isForceUpdata: false,
// 更新的标题
title: '',
// 更新的内容
content: ``,
// 下载下载状态
downloading: '',
// 是否下载完成
downloadSuccess: false,
// 下载进度
downLoadPercent: 0,
// 目前app已下载大小
downloadedSize: 0,
// app总大小
packageFileSize: 0,
// wgt是否安装中
wgtInstalling: false,
// wgt是否安装完成
wgtInstalled: false,
// 要安装的本地包地址
tempFilePath: false,
// 之前的安装的本地包地址
installForBeforeFilePath: null,
// 创建的下载任务
downloadTask: null,
// 用户上次拒绝的时间
userLastRefuseTime: uni.getStorageSync('userLastRefuseTime'),
// 用户是否短期内不更新
userNotRemind: false,
/**
* geek-appUpdata app更新提示框
* @description app更新提示框，支持热更新，强制更新，普通更新，暂不更新，后台下载，更新内容展示，进度条显示，ios跳转appstore等功能。
* @property {String} title 更新标题。
* @property {String} downloadBtnTextIOS 下载按钮ios文字。
* @property {String} downloadBtnText 下载按钮文字。
* @property {String} cancelDownloadBtnText 取消下载按钮文字。
* @property {String} downLoadingText 下载中文字提示。
* @property {Number} intervalAlertUserUpdateDay 用户提示更新的间隔时间 单位day(默认7day)。
* @example
*/
import config from './config.js';
import checkVersion from './js-sdk/checkVersion.js';
import { loadDevice, loadNetwork, loadUuid, loadLocation } from '../../utils/deviceInfo.js'
export default {
name: 'geekAppUpdata',
props: config.props,
data() {
return {
// 更新的版本号
version: '',
// 系统环境
platform: '',
// 下载链接
url: '',
// 跳转的应用市场列表
storeList: [],
// 是否wgt资源包
isWGT: false,
// 是否强制更新
isForceUpdata: false,
// 更新的标题
title: '',
// 更新的内容
content: ``,
// 下载下载状态
downloading: '',
// 是否下载完成
downloadSuccess: false,
// 下载进度
downLoadPercent: 0,
// 目前app已下载大小
downloadedSize: 0,
// app总大小
packageFileSize: 0,
// wgt是否安装中
wgtInstalling: false,
// wgt是否安装完成
wgtInstalled: false,
// 要安装的本地包地址
tempFilePath: false,
// 之前的安装的本地包地址
installForBeforeFilePath: null,
// 创建的下载任务
downloadTask: null,
// 用户上次拒绝的时间
userLastRefuseTime: uni.getStorageSync('userLastRefuseTime'),
// 用户是否短期内不更新
userNotRemind: false,
}
},
mounted() {
this.init();
},
methods: {
// 版本对比
compare(v1 = '0', v2 = '0') {
v1 = String(v1).split('.')
v2 = String(v2).split('.')
const minVersionLens = Math.min(v1.length, v2.length);
let result = 0;
for (let i = 0; i < minVersionLens; i++) {
const curV1 = Number(v1[i])
const curV2 = Number(v2[i])
if (curV1 > curV2) {
result = 1
break;
} else if (curV1 < curV2) {
result = -1
break;
}
}
},
mounted() {
this.init();
},
methods: {
// 版本对比
compare(v1 = '0', v2 = '0') {
v1 = String(v1).split('.')
v2 = String(v2).split('.')
const minVersionLens = Math.min(v1.length, v2.length);
let result = 0;
for (let i = 0; i < minVersionLens; i++) {
const curV1 = Number(v1[i])
const curV2 = Number(v2[i])
if (curV1 > curV2) {
result = 1
break;
} else if (curV1 < curV2) {
result = -1
if (result === 0 && (v1.length !== v2.length)) {
const v1BiggerThenv2 = v1.length > v2.length;
const maxLensVersion = v1BiggerThenv2 ? v1 : v2;
for (let i = minVersionLens; i < maxLensVersion.length; i++) {
const curVersion = Number(maxLensVersion[i])
if (curVersion > 0) {
v1BiggerThenv2 ? result = 1 : result = -1
break;
}
}
}
if (result === 0 && (v1.length !== v2.length)) {
const v1BiggerThenv2 = v1.length > v2.length;
const maxLensVersion = v1BiggerThenv2 ? v1 : v2;
for (let i = minVersionLens; i < maxLensVersion.length; i++) {
const curVersion = Number(maxLensVersion[i])
if (curVersion > 0) {
v1BiggerThenv2 ? result = 1 : result = -1
break;
}
}
}
return result;
},
// 获取更新内容片段
getContentHTML(content) {
let contentArr = content.split('\n');
return contentArr.map(item => `<p>${item}</p>`).join('\n')
},
return result;
},
// 获取更新内容片段
getContentHTML(content) {
let contentArr = content.split('\n');
return contentArr.map(item => `<p>${item}</p>`).join('\n')
},
// 跳转应用市场
checkStoreScheme() {
/**
* 跳转应用市场逻辑
* 如果本次更新设置了需要跳转的应用市场则从整个列表中筛选出来启用的应用市场
* 按照设置的优先级(priority)从大到小排序
* 并尝试跳转到所有应用市场
* 如果都跳转失败的话则会显示失败
*/
// 可以跳转的应用市场
const canStoreList = (this.storeList || []).filter(item => item.enable)
let openSchemePromise;
if (canStoreList && canStoreList.length) {
canStoreList
.sort((cur, next) => next.priority - cur.priority)
.map(item => item.scheme)
.reduce((promise, cur, curIndex) => {
openSchemePromise = (promise || (promise = Promise.reject())).catch(() => {
return new Promise((resolve, reject) => {
plus.runtime.openURL(cur, (err) => {
reject(err)
})
// 跳转应用市场
checkStoreScheme() {
/**
* 跳转应用市场逻辑
* 如果本次更新设置了需要跳转的应用市场则从整个列表中筛选出来启用的应用市场
* 按照设置的优先级(priority)从大到小排序
* 并尝试跳转到所有应用市场
* 如果都跳转失败的话则会显示失败
*/
// 可以跳转的应用市场
const canStoreList = (this.storeList || []).filter(item => item.enable)
let openSchemePromise;
if (canStoreList && canStoreList.length) {
canStoreList
.sort((cur, next) => next.priority - cur.priority)
.map(item => item.scheme)
.reduce((promise, cur, curIndex) => {
openSchemePromise = (promise || (promise = Promise.reject())).catch(() => {
return new Promise((resolve, reject) => {
plus.runtime.openURL(cur, (err) => {
reject(err)
})
})
return openSchemePromise
}, openSchemePromise)
return openSchemePromise
}
})
return openSchemePromise
}, openSchemePromise)
return openSchemePromise
}
return Promise.reject()
},
// 初始化
init() {
// 如果在用户上次拒绝的时间存在
if (this.userLastRefuseTime) {
// 目标时间戳
let targetTime = this.userLastRefuseTime + this.intervalAlertUserUpdateDay * 24 * 60 * 60 * 1000;
// 现在时间戳
let nowTime = (new Date).getTime();
// 如果目标时间戳大于现在时间戳
if (targetTime > nowTime) {
// 并阻止执行
return;
return Promise.reject()
},
// 初始化
init() {
// 如果在用户上次拒绝的时间存在
if (this.userLastRefuseTime) {
// 目标时间戳
let targetTime = this.userLastRefuseTime + this.intervalAlertUserUpdateDay * 24 * 60 * 60 * 1000;
// 现在时间戳
let nowTime = (new Date).getTime();
// 如果目标时间戳大于现在时间戳
if (targetTime > nowTime) {
// 并阻止执行
return;
} else {
// 清除拒绝时间
uni.removeStorageSync('userLastRefuseTime');
}
}
// const checkVersion=uni.getStorageSync('appVersion-info')
// if (!checkVersion.is_silently) {
// // 读取下载好的包的缓存
// const appDownLoadTempFilePath = uni.getStorageSync('appDownLoadTempFilePath');
// // 更新的版本号
// this.version = checkVersion.versionName;
// // 系统环境
// this.platform = checkVersion.platform;
// // 网络下载地址
// this.url = checkVersion.downloadUrl;
// // 跳转的应用市场列表
// this.storeList = checkVersion.store_list || [];
// // 更新内容
// this.content = checkVersion.versionInfo && this.getContentHTML(checkVersion.versionInfo);
// // 更新标题
// this.title = checkVersion.title || '发现新版本';
// // 是否强制更新
// this.isForceUpdata = checkVersion.forceUpdate;
// // 是否wgt资源包
// this.isWGT = checkVersion.type == 'wgt';
// // 如果已经有下载好的包
// if (appDownLoadTempFilePath && this.compare(this.version, uni.getStorageSync(
// 'appDownLoadTempFilePathVersion')) == 0) {
// this.tempFilePath = appDownLoadTempFilePath;
// this.downloadSuccess = true;
// this.installForBeforeFilePath = appDownLoadTempFilePath;
// } else {
// uni.clearStorageSync('appDownLoadTempFilePath');
// uni.clearStorageSync('appDownLoadTempFilePathVersion');
// }
// // 打开更新提示
// this.$refs.popup.open();
// }
// 检查版本 需要更新时才会触发回调
checkVersion().then((res) => {
// 非静默更新时触发
if (!res.is_silently) {
// 读取下载好的包的缓存
const appDownLoadTempFilePath = uni.getStorageSync('appDownLoadTempFilePath');
// 更新的版本号
this.version = res.versionName;
// 系统环境
this.platform = res.platform;
// 网络下载地址
this.url = res.downloadUrl;
// 跳转的应用市场列表
this.storeList = res.store_list || [];
// 更新内容
this.content = res.versionInfo && this.getContentHTML(res.versionInfo);
// 更新标题
this.title = res.title || '发现新版本';
// 是否强制更新
this.isForceUpdata = res.forceUpdate;
// 是否wgt资源包
this.isWGT = res.type == 'wgt';
// 如果已经有下载好的包
if (appDownLoadTempFilePath && this.compare(this.version, uni.getStorageSync(
'appDownLoadTempFilePathVersion')) == 0) {
this.tempFilePath = appDownLoadTempFilePath;
this.downloadSuccess = true;
this.installForBeforeFilePath = appDownLoadTempFilePath;
} else {
// 清除拒绝时间
uni.removeStorageSync('userLastRefuseTime');
uni.clearStorageSync('appDownLoadTempFilePath');
uni.clearStorageSync('appDownLoadTempFilePathVersion');
}
// 打开更新提示
this.$refs.popup.open();
}
// const checkVersion=uni.getStorageSync('appVersion-info')
// if (!checkVersion.is_silently) {
// // 读取下载好的包的缓存
// const appDownLoadTempFilePath = uni.getStorageSync('appDownLoadTempFilePath');
// // 更新的版本号
// this.version = checkVersion.versionName;
// // 系统环境
// this.platform = checkVersion.platform;
// // 网络下载地址
// this.url = checkVersion.downloadUrl;
// // 跳转的应用市场列表
// this.storeList = checkVersion.store_list || [];
// // 更新内容
// this.content = checkVersion.versionInfo && this.getContentHTML(checkVersion.versionInfo);
// // 更新标题
// this.title = checkVersion.title || '发现新版本';
// // 是否强制更新
// this.isForceUpdata = checkVersion.forceUpdate;
// // 是否wgt资源包
// this.isWGT = checkVersion.type == 'wgt';
// // 如果已经有下载好的包
// if (appDownLoadTempFilePath && this.compare(this.version, uni.getStorageSync(
// 'appDownLoadTempFilePathVersion')) == 0) {
// this.tempFilePath = appDownLoadTempFilePath;
// this.downloadSuccess = true;
// this.installForBeforeFilePath = appDownLoadTempFilePath;
// } else {
// uni.clearStorageSync('appDownLoadTempFilePath');
// uni.clearStorageSync('appDownLoadTempFilePathVersion');
// }
// // 打开更新提示
// this.$refs.popup.open();
// }
// 检查版本 需要更新时才会触发回调
checkVersion().then((res) => {
// 非静默更新时触发
if (!res.is_silently) {
// 读取下载好的包的缓存
const appDownLoadTempFilePath = uni.getStorageSync('appDownLoadTempFilePath');
// 更新的版本号
this.version = res.versionName;
// 系统环境
this.platform = res.platform;
// 网络下载地址
this.url = res.downloadUrl;
// 跳转的应用市场列表
this.storeList = res.store_list || [];
// 更新内容
this.content = res.versionInfo && this.getContentHTML(res.versionInfo);
// 更新标题
this.title = res.title || '发现新版本';
// 是否强制更新
this.isForceUpdata = res.forceUpdate;
// 是否wgt资源包
this.isWGT = res.type == 'wgt';
// 如果已经有下载好的包
if (appDownLoadTempFilePath && this.compare(this.version, uni.getStorageSync(
'appDownLoadTempFilePathVersion')) == 0) {
this.tempFilePath = appDownLoadTempFilePath;
this.downloadSuccess = true;
this.installForBeforeFilePath = appDownLoadTempFilePath;
} else {
uni.clearStorageSync('appDownLoadTempFilePath');
uni.clearStorageSync('appDownLoadTempFilePathVersion');
}
})
},
// 打开更新提示
this.$refs.popup.open();
// 下载app
downloadPackage() {
if (!this.downloadTask) {
this.downloading = true;
//下载包
this.downloadTask = plus.downloader.createDownload(this.url, {}, (download, status) => {
if (status == 200) {
this.downloadSuccess = true;
this.tempFilePath = download.filename;
uni.setStorageSync('appDownLoadTempFilePathVersion', this.version)
uni.setStorageSync('appDownLoadTempFilePath', this.tempFilePath);
}
})
},
// 下载app
downloadPackage() {
if (!this.downloadTask) {
this.downloading = true;
//下载包
this.downloadTask = plus.downloader.createDownload(this.url, {}, (download, status) => {
if (status == 200) {
this.downloadSuccess = true;
this.tempFilePath = download.filename;
uni.setStorageSync('appDownLoadTempFilePathVersion', this.version)
uni.setStorageSync('appDownLoadTempFilePath', this.tempFilePath);
}
// 清空下载进度
this.downLoadPercent = 0;
this.downloadedSize = 0;
this.packageFileSize = 0;
this.downloadTask = null;
});
this.downloadTask.start();
this.downloadTask.addEventListener("statechanged", (task, status) => {
switch (task.state) {
case 3:
// 更新下载进度
this.downLoadPercent = parseInt(task.downloadedSize / task.totalSize * 100);
this.downloadedSize = (task.downloadedSize / Math.pow(1024, 2)).toFixed(2);
this.packageFileSize = (task.totalSize / Math.pow(1024, 2)).toFixed(2);
break;
}
});
}
},
// 清空下载进度
this.downLoadPercent = 0;
this.downloadedSize = 0;
this.packageFileSize = 0;
this.downloadTask = null;
});
this.downloadTask.start();
this.downloadTask.addEventListener("statechanged", (task, status) => {
switch (task.state) {
case 3:
// 更新下载进度
this.downLoadPercent = parseInt(task.downloadedSize / task.totalSize * 100);
this.downloadedSize = (task.downloadedSize / Math.pow(1024, 2)).toFixed(2);
this.packageFileSize = (task.totalSize / Math.pow(1024, 2)).toFixed(2);
break;
}
});
}
},
// 安装app
installPackage() {
// wgt资源包安装
if (this.isWGT) {
this.wgtInstalling = true;
// 安装app
installPackage() {
// wgt资源包安装
if (this.isWGT) {
this.wgtInstalling = true;
}
plus.runtime.install(this.tempFilePath, {
force: false
}, async res => {
this.wgtInstalling = false;
this.wgtInstalled = true;
}, async err => {
console.log(err)
this.downloadSuccess = false;
// 如果是安装之前的包，安装失败后删除之前的包
if (this.installForBeforeFilePath) {
await this.deleteSavedFile(this.installForBeforeFilePath)
this.installForBeforeFilePath = '';
}
plus.runtime.install(this.tempFilePath, {
force: false
}, async res => {
this.wgtInstalling = false;
this.wgtInstalled = true;
}, async err => {
console.log(err)
this.downloadSuccess = false;
// 如果是安装之前的包，安装失败后删除之前的包
if (this.installForBeforeFilePath) {
await this.deleteSavedFile(this.installForBeforeFilePath)
this.installForBeforeFilePath = '';
}
uni.showLoading({
icon: 'none',
title: '更新失败，请重新下载',
mask: true
})
uni.showLoading({
icon: 'none',
title: '更新失败，请重新下载',
mask: true
})
},
})
},
// 删除保存的文件
deleteSavedFile(tempFilePath) {
uni.removeStorageSync('appDownLoadTempFilePath')
uni.removeSavedFile({
tempFilePath
})
},
// 保存文件
saveFile(tempFilePath) {
return new Promise((resolve, reject) => {
uni.saveFile({
tempFilePath,
success({
savedFilePath
}) {
uni.setStorageSync('appDownLoadTempFilePath', tempFilePath)
},
complete() {
resolve()
}
})
// 删除保存的文件
deleteSavedFile(tempFilePath) {
uni.removeStorageSync('appDownLoadTempFilePath')
uni.removeSavedFile({
tempFilePath
})
},
// 保存文件
saveFile(tempFilePath) {
return new Promise((resolve, reject) => {
uni.saveFile({
tempFilePath,
success({
savedFilePath
}) {
uni.setStorageSync('appDownLoadTempFilePath', tempFilePath)
},
complete() {
resolve()
}
})
},
// 重启应用
restart() {
this.wgtInstalled = false;
//更新完重启app
plus.runtime.restart();
},
// 跳转appstore
jumpToAppStore() {
// 请填入appid
plus.runtime.openURL(this.url);
},
// 更新用户拒绝时间
updataUserRefuseTime() {
// 存储用户暂不升级的时间戳
this.userLastRefuseTime = (new Date).getTime();
uni.setStorageSync('userLastRefuseTime', this.userLastRefuseTime);
},
// 关闭更新框
closeUpdate() {
uni.setStorage({
key: "m-agreement",
data: 'true',
success: function () {
console.log('m-agreement成功')
}
})
// loadDevice()
// loadNetwork()
// loadLocation()
// loadUuid()
const headerDevice = uni.getStorageSync('m-header-device')
console.log(headerDevice,'headerDevice')
if (this.downloading) {
console.log(1,'9')
uni.showModal({
title: '是否取消下载？',
cancelText: '否',
confirmText: '是',
success: res => {
if (res.confirm) {
this.downloadTask && this.downloadTask.abort();
this.$refs.popup.close();
uni.switchTab({
url: '/pages/index/index'
});
}
})
},
// 重启应用
restart() {
this.wgtInstalled = false;
//更新完重启app
plus.runtime.restart();
},
// 跳转appstore
jumpToAppStore() {
// 请填入appid
plus.runtime.openURL(this.url);
},
// 更新用户拒绝时间
updataUserRefuseTime() {
// 存储用户暂不升级的时间戳
this.userLastRefuseTime = (new Date).getTime();
uni.setStorageSync('userLastRefuseTime', this.userLastRefuseTime);
},
// 关闭更新框
closeUpdate() {
uni.setStorage({
key: "m-agreement",
data: 'true',
success: function () {
console.log('m-agreement成功')
}
})
// loadDevice()
// loadNetwork()
// loadLocation()
// loadUuid()
const headerDevice = uni.getStorageSync('m-header-device')
console.log(headerDevice, 'headerDevice')
if (this.downloading) {
console.log(1, '9')
uni.showModal({
title: '是否取消下载？',
cancelText: '否',
confirmText: '是',
success: res => {
if (res.confirm) {
this.downloadTask && this.downloadTask.abort();
this.$refs.popup.close();
uni.switchTab({
url: '/pages/index/index'
});
}
});
} else {
console.log(2,'9')
this.$refs.popup.close();
// 如果用户短期内不更新
if (this.userNotRemind) {
this.updataUserRefuseTime();
}
uni.switchTab({
url: '/pages/index/index'
});
});
} else {
console.log(2, '9')
this.$refs.popup.close();
// 如果用户短期内不更新
if (this.userNotRemind) {
this.updataUserRefuseTime();
}
uni.switchTab({
url: '/pages/index/index'
});
}
if (this.downloadSuccess) {
// 包已经下载完毕，稍后安装，将包保存在本地
this.saveFile(this.tempFilePath)
}
},
// 应用更新
updataApp() {
// 检查可跳转的应用市场 如果失败则走应用内更新
this.checkStoreScheme().catch(() => {
this.downloadPackage()
})
},
if (this.downloadSuccess) {
// 包已经下载完毕，稍后安装，将包保存在本地
this.saveFile(this.tempFilePath)
}
},
computed: {
btnStyle() {
return {
color: this.btnColor,
backgroundColor: this.btnBgColor || this.themeColor
}
// 应用更新
updataApp() {
// 检查可跳转的应用市场 如果失败则走应用内更新
this.checkStoreScheme().catch(() => {
this.downloadPackage()
})
},
},
computed: {
btnStyle() {
return {
color: this.btnColor,
backgroundColor: this.btnBgColor || this.themeColor
}
}
}
}
</script>
<style lang="less" scoped>
.appUploadAlertBox {
.bg {
width: 100%;
<style lang="less">
page {
background: transparent;
}
.appUploadAlertBox {
.bg {
width: 100%;
}
.content_popup {
width: 640rpx;
height: 690rpx;
background-size: cover;
background-repeat: no-repeat;
background-position: center;
box-sizing: border-box;
background-color: #FFF;
padding-bottom: 40rpx;
position: relative;
.close {
position: absolute;
right: 15rpx;
top: 15rpx;
z-index: 10000001;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #333333;
line-height: 40rpx;
text-align: right;
font-style: normal;
}
.content_popup {
width: 640rpx;
height: 690rpx;
background-size: cover;
background-repeat: no-repeat;
background-position: center;
box-sizing: border-box;
background-color: #FFF;
padding-bottom: 40rpx;
position: relative;
.close {
position: absolute ;
right: 15rpx;
top: 15rpx;
z-index: 10000001;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #333333;
line-height: 40rpx;
text-align: right;
font-style: normal;
}
.version {
position: absolute;
left: 40rpx;
top: 45rpx;
z-index: 3;
font-size: 75rpx;
}
.version {
position: absolute;
left: 40rpx;
top: 45rpx;
z-index: 3;
font-size: 75rpx;
}
.backgroundImg {
width: 100.1%;
height: 270rpx;
position: absolute;
top: -48rpx;
}
.info {
position: relative;
padding: 240rpx 40rpx 0;
z-index: 2;
.backgroundImg {
width: 100.1%;
height: 270rpx;
position: absolute;
top: -48rpx;
.title {
font-size: 42rpx;
}
.info {
position: relative;
padding: 240rpx 40rpx 0;
z-index: 2;
.info_desc_scroll {
margin-top: 20rpx;
font-size: 33rpx;
min-height: 200rpx;
max-height: 400rpx;
box-sizing: border-box;
line-height: 1.3;
.title {
font-size: 42rpx;
p:not(:last-child) {
margin-bottom: 12rpx;
}
}
}
.info_desc_scroll {
margin-top: 20rpx;
font-size: 33rpx;
min-height: 200rpx;
max-height: 400rpx;
box-sizing: border-box;
line-height: 1.3;
.footer {
padding: 0 30rpx;
p:not(:last-child) {
margin-bottom: 12rpx;
}
}
.progress-box {
width: 100%;
margin-top: 25rpx;
}
.footer {
padding: 0 30rpx;
:deep(.progress) {
width: 90%;
height: 40rpx;
margin-bottom: 5rpx;
.progress-box {
width: 100%;
margin-top: 25rpx;
}
.uni-progress-bar {
border-radius: 35rpx;
:deep(.progress) {
width: 90%;
height: 40rpx;
margin-bottom: 5rpx;
.uni-progress-bar {
.uni-progress-inner-bar {
border-radius: 35rpx;
.uni-progress-inner-bar {
border-radius: 35rpx;
}
}
}
}
.btn {
margin-top: 35rpx;
height: 75rpx;
line-height: 75rpx;
border-radius: 14rpx;
font-size: 34rpx;
font-weight: 400;
text-align: center;
width: 100%;
}
.btn {
margin-top: 35rpx;
height: 75rpx;
line-height: 75rpx;
border-radius: 14rpx;
font-size: 34rpx;
font-weight: 400;
text-align: center;
width: 100%;
}
.notRemind {
display: flex;
justify-content: center;
align-items: flex-start;
margin-top: 15rpx;
.remind-text {
color: #9d9d9d;
font-size: 30rpx;
margin-left: 3rpx;
transition: color 80ms linear;
}
.notRemind {
display: flex;
justify-content: center;
align-items: flex-start;
margin-top: 15rpx;
.remind-text {
color: #9d9d9d;
font-size: 30rpx;
margin-left: 3rpx;
transition: color 80ms linear;
}
}
}
.close-img {
width: 70rpx;
height: 70rpx;
z-index: 1000;
position: absolute;
bottom: -120rpx;
left: calc(50% - 70rpx / 2);
}
}
.close-img {
width: 70rpx;
height: 70rpx;
z-index: 1000;
position: absolute;
bottom: -120rpx;
left: calc(50% - 70rpx / 2);
}
}
</style>
pages/app-update/js-sdk/silentlyAppUpdate.js
View file @ 4735acca
......@@ -33,21 +33,19 @@ export const compare = (v1 = '0', v2 = '0') => {
return result;
}
export default function silentlyAppUpdate() {
// const checkVersion=uni.getStorageSync('appVersion-info')
// console.log(checkVersion,'checkVersion')
// plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
// if (compare(checkVersion.versionName, wgtinfo.version) === 1) {
// uni.redirectTo({
// url: "/pages/app-update/index",
// })
// }
export default function silentlyAppUpdate() {
// const checkVersion=uni.getStorageSync('appVersion-info')
// console.log(checkVersion,'checkVersion')
// plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
// if (compare(checkVersion.versionName, wgtinfo.version) === 1) {
// uni.redirectTo({
// url: "/pages/app-update/index",
// })
// }
// });
checkVersion().then(res => {
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
checkVersion().then(res => {
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
if (compare(res.versionName, wgtinfo.version) === 1) {
uni.redirectTo({
url: "/pages/app-update/index",
......@@ -77,7 +75,7 @@ export default function silentlyAppUpdate() {
// })
// }
// });
// dtask.start();
// }
......
pages/index/index.vue
View file @ 4735acca
......@@ -111,8 +111,7 @@
onReady() {
const systemInfo = uni.getSystemInfoSync();
if(systemInfo.platform === 'ios'){
const isAgree = uni.getStorageSync('m-agreement')
console.log(isAgree,'isAgree1')
const isAgree = uni.getStorageSync('m-agreement')
if (!isAgree) {
console.log(isAgree,'isAgree')
this.Go('uni:/pages/agreement/index')
......@@ -246,31 +245,32 @@
searchGood(){
const self=this
const { sort,pageSize,pageNum}=self
const params={
const params={
"current":pageNum,
"size":pageSize,
"sort":sort
}
console.log(params,'查询商品')
self.$request('/pawn/category/getGoodsPage','POST',params).then(res => {
try{
self.$request('/pawn/category/getGoodsPage','POST',params).then(res => {
const {current,total,size,records }=res.result
const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页
if(self.loadFlag){
self.IndexList=self.IndexList.concat(records)
}else{
self.IndexList=records
}
self.hasNextPage=hasNextPage
self.loadFlag=false
}).catch(err=>{
console.log(err,'请求出错')
})
const {current,total,size,records }=res.result
const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页
if(self.loadFlag){
self.IndexList=self.IndexList.concat(records)
}else{
self.IndexList=records
}
self.hasNextPage=hasNextPage
self.loadFlag=false
}catch{
console.log(err,'错误信息')
}
}).catch(err=>{
console.log(err,'请求出错')
})
},
toupperTop:function(e){
console.log(e,'到顶了');
......
unpackage/dist/dev/app-plus/app-config-service.js
View file @ 4735acca
var isReady=false;var onReadyCallbacks=[];
var isServiceReady=false;var onServiceReadyCallbacks=[];
var __uniConfig = {"pages":["pages/index/index","pages/sort/index","pages/my/index","pages/recruit/index","pages/recruitResult/index","pages/category/category","pages/application/application","pages/myneed/myneed","pages/Ineed/Ineed","pages/productDetails/productDetails","pages/detailResult/detailResult","pages/useFeed/useFeed","pages/lookGoods/lookGoods","pages/login/login","pages/prolist/prolist","pages/setting/setting","pages/contact/contact","pages/webview/webview","pages/web/web","pages/bill/indexs","pages/finance/index","pages/app-update/index","pages/agreement/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#F8F8F8","bounce":"none"},"tabBar":{"borderStyle":"white","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"多典花","compilerVersion":"4.24","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
var __uniConfig = {"pages":["pages/index/index","pages/sort/index","pages/my/index","pages/recruit/index","pages/recruitResult/index","pages/category/category","pages/application/application","pages/myneed/myneed","pages/Ineed/Ineed","pages/productDetails/productDetails","pages/detailResult/detailResult","pages/useFeed/useFeed","pages/lookGoods/lookGoods","pages/login/login","pages/prolist/prolist","pages/setting/setting","pages/contact/contact","pages/webview/webview","pages/web/web","pages/bill/indexs","pages/finance/index","pages/app-update/index","pages/agreement/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#F8F8F8","bounce":"none"},"tabBar":{"borderStyle":"white","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"多典花","compilerVersion":"4.28","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom","bounce":"none"}},{"path":"/pages/sort/index","meta":{},"window":{"navigationBarTitleText":"款式"}},{"path":"/pages/my/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/recruit/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"鉴定师招聘"}},{"path":"/pages/recruitResult/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/category/category","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"选择鉴定品类"}},{"path":"/pages/application/application","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我的鉴定申请"}},{"path":"/pages/myneed/myneed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要的"}},{"path":"/pages/Ineed/Ineed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要"}},{"path":"/pages/productDetails/productDetails","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"商品详情"}},{"path":"/pages/detailResult/detailResult","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/useFeed/useFeed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"用户反馈"}},{"path":"/pages/lookGoods/lookGoods","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/login/login","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"登录"}},{"path":"/pages/prolist/prolist","meta":{},"window":{"navigationBarTitleText":"相关协议"}},{"path":"/pages/setting/setting","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"设置"}},{"path":"/pages/contact/contact","meta":{},"window":{"navigationBarTitleText":"通讯录","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/web/web","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/bill/indexs","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"账单"}},{"path":"/pages/finance/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/app-update/index","meta":{},"window":{"disableScroll":true,"backgroundColorTop":"transparent","background":"transparent","titleNView":false,"scrollIndicator":false,"animationType":"fade-in","animationDuration":200,"disableSwipeBack":true}},{"path":"/pages/agreement/index","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"","enablePullDownRefresh":false,"bounce":"none","animationType":"fade-in","background":"transparent","backgroundColor":"rgba(0,0,0,0)","webviewBGTransparent":true,"mask":"none"}}];
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 4735acca
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 @ 4735acca
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/manifest.json
View file @ 4735acca
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__DE04B13","name":"多典花","version":{"name":"1.0.1","code":101},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Geolocation":{},"Contacts":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"none","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"distribute":{"orientation":["portrait-primary"]},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"useOriginalMsgbox":true,"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/> ","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"targetSdkVersion":30,"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissionExternalStorage":{"request":"none","prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"},"permissionPhoneState":{"request":"none","prompt":"为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"}},"apple":{"dSYMs":false,"privacyDescription":{"NSLocationWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysAndWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSPhotoLibraryUsageDescription":"为了给您提供意见反馈服务，请允许访问您的相册信息","NSCameraUsageDescription":"以便于您可以使用正常使用身份证认证、刷脸、申请借款等功能"},"idfa":false},"plugins":{"ad":{},"geolocation":{"system":{"__platform__":["ios","android"]},"amap":{"name":"amap_13669606635BrsJEpZoq","__platform__":["ios","android"],"appkey_ios":"219171ea69d16fa01856326bfce37395","appkey_android":"d5eb8009720b7ef9e540d1869d3c5f15"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"compatible":{"ignoreVersion":true},"nativePlugins":{"AThree-LFv2":{"__plugin_info__":{"name":"LFv2","description":"LFv2","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
\ No newline at end of file
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__DE04B13","name":"多典花","version":{"name":"1.0.1","code":101},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Camera":{},"Geolocation":{},"Contacts":{},"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"none","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"distribute":{"orientation":["portrait-primary"]},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"useOriginalMsgbox":true,"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/> ","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"targetSdkVersion":30,"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissionExternalStorage":{"request":"none","prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"},"permissionPhoneState":{"request":"none","prompt":"为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"}},"apple":{"dSYMs":false,"privacyDescription":{"NSLocationWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSLocationAlwaysAndWhenInUseUsageDescription":"为保护您账户安全，便于为您提供所在区域专属产品和服务，请您开启定位权限","NSPhotoLibraryUsageDescription":"为了给您提供意见反馈服务，请允许访问您的相册信息","NSCameraUsageDescription":"以便于您可以使用正常使用身份证认证、刷脸、申请借款等功能"},"idfa":false},"plugins":{"ad":{},"geolocation":{"system":{"__platform__":["ios","android"]},"amap":{"name":"amap_13669606635BrsJEpZoq","__platform__":["ios","android"],"appkey_ios":"219171ea69d16fa01856326bfce37395","appkey_android":"d5eb8009720b7ef9e540d1869d3c5f15"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"compatible":{"ignoreVersion":true},"nativePlugins":{"AThree-LFv2":{"__plugin_info__":{"name":"LFv2","description":"LFv2","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"4.28","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"borderStyle":"rgba(255,255,255,0.4)","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
\ No newline at end of file
unpackage/dist/dev/app-plus/view.umd.min.js
View file @ 4735acca
This source diff could not be displayed because it is too large. You can view the blob instead.
utils/authPerission.js
View file @ 4735acca
......@@ -107,7 +107,7 @@ export const SelectLocation = async function (callback) {
const platform = uni.getSystemInfoSync();
if (platform.osName === 'ios') {
if (Permission.judgeIosPermission('location')) {
console.log('进入这里了')
// console.log('进入这里了')
callback && callback()
} else {
CheckLocationPermission(callback)
......
utils/device.js 0 → 100644
View file @ 4735acca
import storage from './storage'
import store from '@/store'
import { device } from '@/api/other'
/**
* 设置请求头信息
*/
export function setDevice() {
const info = uni.getSystemInfoSync()
const { appVersion, deviceId, brand, platform, system } = info
let data = {
appKey: 'hhym',
appVersion, // app版本号
deviceId, // 设备号
deviceBrand: brand, // 品牌名称
sourceChannel: store.state.channel,
deviceType: platform, // 设备类型
systemVersion: system, // 系统版本
deviceToken: '', // APP推送标识
iosDeviceToken: '', // iOS推送标识
idfa: '', // 广告标识，iOS必填
mac: '', // mac地址
appPackage: 'com.huahuayoumi.hhym', // APP包名
}
if (platform == 'ios') {
plus.device.getInfo({
//需要勾选IDFA
success: e => {
console.log('getInfo:' + JSON.stringify(e))
return data.idfa = e.idfa
},
fail: err => {
console.log('getDeviceInfo failed: ' + JSON.stringify(err))
},
})
}
// 上传 device系统信息
setTimeout(() => {
try {
device(data).then((res) => {
console.log('res', JSON.stringify(res.data))
})
storage.setDeviceData(data)
} catch (error) {
console.error(error);
}
}, 300)
}
// Android mac地址
function getDeviceMac() {
//获取本机Mac地址
let deviceMac = ''
let net = plus.android.importClass('java.net.NetworkInterface')
let wl0 = net.getByName('wlan0')
let macByte = wl0.getHardwareAddress()
deviceMac = ''
for (let i = 0; i < macByte.length; i++) {
let tmp = ''
let num = macByte[i]
if (num < 0) {
tmp = (255 + num + 1).toString(16)
} else {
tmp = num.toString(16)
}
if (tmp.length == 1) {
tmp = '0' + tmp
}
deviceMac += tmp
}
return deviceMac
}
utils/header.js
View file @ 4735acca
......@@ -16,27 +16,25 @@ export const convertPromise = function (FnName, params = {}) {
})
});
}
export const initHeaderInfo = function (){
const versionNew=uni.getStorageSync('m-header-version')
let deviceName
if(plus.os.name=='Android'){
deviceName='android'
}else{
deviceName='ios'
}
console.log(plus.os.name,'plus.os.name')
// 根据当前时间戳生成一个随机整数
var randomNum = new Date().getTime();
const commons={
"appName":"DDH",
"appSourceId":"1",
"token":randomNum,
"device":deviceName,
"appVersion":versionNew,
}
console.log(commons,'commons')
return commons
export const initHeaderInfo = function () {
const versionNew = uni.getStorageSync('m-header-version')
let deviceName
if (plus.os.name == 'Android') {
deviceName = 'android'
} else {
deviceName = 'ios'
}
// 根据当前时间戳生成一个随机整数
var randomNum = new Date().getTime();
const commons = {
"appName": "DDH",
"appSourceId": "1",
"token": randomNum,
"device": deviceName,
"appVersion": versionNew,
}
return commons
}
// 初始化请求头的device参数信息
export const initHeaderDevice = function () {
......@@ -59,7 +57,7 @@ export const initHeaderDevice = function () {
const deviceInfo = uni.getStorageSync('m-device-info')
const networkInfo = uni.getStorageSync('m-network-info')
const locationInfo = uni.getStorageSync('m-location-info')
const loadUuid = uni.getStorageSync('m-load-udid')
const loadUuid = uni.getStorageSync('m-load-udid')
let device = {};
if (deviceInfo) {
device = Object.assign(device, common, JSON.parse(deviceInfo))
......@@ -72,15 +70,15 @@ export const initHeaderDevice = function () {
if (locationInfo) {
device = Object.assign(device, common, JSON.parse(locationInfo))
}
if(loadUuid){
device = Object.assign(device, common, JSON.parse(loadUuid))
}
if (deviceInfo && networkInfo && loadUuid) {
if (loadUuid) {
device = Object.assign(device, common, JSON.parse(loadUuid))
}
if (deviceInfo && networkInfo && loadUuid && locationInfo) {
const headerDeviceInfo = {
...JSON.parse(deviceInfo),
...JSON.parse(networkInfo),
...JSON.parse(locationInfo),
...JSON.parse(loadUuid),
...JSON.parse(locationInfo),
...JSON.parse(loadUuid),
...common
}
......@@ -89,7 +87,7 @@ export const initHeaderDevice = function () {
key: 'm-header-device',
data: JSON.stringify(headerDeviceInfo),
success: function () {
console.log('m-header-device存储成功4');
// console.log('m-header-device存储成功4');
}
});
......
utils/request.js
View file @ 4735acca
import {initHeaderDevice,initHeaderInfo} from './header.js'
import { initHeaderDevice, initHeaderInfo} from './header.js'
import api from '@/config/api.js'
const request=async(url,type,data)=>{
const baseUrl=api.common
const request = async (url, type, data) => {
const baseUrl = api.common
// 这里确保一定是可以获取得到的
const headerDevice = uni.getStorageSync('m-header-device')
const deviceInfo = uni.getStorageSync('m-device-info')
let rd=null
const tokenF=uni.getStorageSync('tokenFinance')
if(!deviceInfo || tokenF=='' && plus.os.name!='iOS'){
rd=initHeaderInfo()
}else{
const tokenF = uni.getStorageSync('tokenFinance')
let rd = null
if (!deviceInfo || tokenF == '' && plus.os.name != 'iOS') {
rd = initHeaderInfo()
} else {
if (headerDevice) {
rd = headerDevice
console.log(rd,'rd1')
} else {
const common = initHeaderDevice()
rd = JSON.stringify(common)
console.log(rd,'rd2')
console.log(common,'日===')
if (common) {
rd = JSON.stringify(common)
}
}
}
console.log(rd,'rd3')
return new Promise((resolve,reject)=>{
const token=uni.getStorageSync('token')
const tokenFinance=uni.getStorageSync('tokenFinance')
return new Promise((resolve, reject) => {
const token = uni.getStorageSync('token')
const tokenFinance = uni.getStorageSync('tokenFinance')
uni.request({
url: baseUrl+url,
method:type,
data: {
...data
},
url: baseUrl + url,
method: type,
data: {
...data
},
header: {
Accept: "application/json;charset=UTF-8",
"Content-Type": "application/json;charset=UTF-8",
device:rd,
Authorization:tokenFinance,//贷超
Author:token,//多典花
device: rd,
Authorization: tokenFinance, //贷超
Author: token, //多典花
},
success: (res) => {
const {data, statusCode} = res;
if (statusCode === 200) {
if (data.success==true) {
return resolve(data)
} else {
if(data.code=='403'){
console.log(res,'402');
uni.showToast({
title: data.message,
icon: "none",
duration: 2000
})
uni.removeStorageSync('token')
}else{
uni.showToast({
title: data.message,
icon: "none",
duration: 2000
})
return false
}
success: (res) => {
const {
data,
statusCode
} = res;
if (statusCode === 200) {
if (data.success == true) {
return resolve(data)
} else {
if (data.code == '403') {
console.log(res, '402');
uni.showToast({
title: data.message,
icon: "none",
duration: 2000
})
uni.removeStorageSync('token')
} else {
uni.showToast({
title: data.message,
icon: "none",
duration: 2000
})
return false
}
}
} else {
console.log(res.errMsg,'!200');
return reject({
data,
message: res.errMsg
})
}
},
fail:(err)=> {
console.log(err,954)
console.log(res.errMsg, '!200');
return reject({
data,
message: res.errMsg
})
}
},
fail: (err) => {
console.log(err, 954)
// return uni.showToast({
// icon:'loading',
// title:'请求失败'
......@@ -82,7 +86,7 @@ const request=async(url,type,data)=>{
reject(err)
}
});
})
}
......
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