Skip to content

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

优化APP11-15

parent 6af81378
Show whitespace changes
Inline Side-by-side
Showing with 560 additions and 2158 deletions
.DS_Store
View file @ dfee72cb
No preview for this file type
App.vue
View file @ dfee72cb
<script>
import { switchShowTabbar, loadDevice, initSettings, ininIndex, initApp, loadLocation, loadNetwork, loadUuid } from '@/utils/index.js'
import { ininIndex, initIndexGoods, initH5Setting, initAPPSetting } from '@/utils/index.js'
import config from '@/config/api'
export default {
globalData: {
......@@ -11,20 +11,26 @@ export default {
// #ifdef APP-PLUS
// var w = plus.webview.open('hybrid/html/advertise/advertise.html','splashscreen', {
// top: 0,
// bottom: 0,
// zindex: 999
// },
// 'fade-in',
// 500
// );
// //设置定时器，4s后关闭启动广告页
// setTimeout(function () {
// plus.webview.close(w);
// }, 4000);
// #endif
// 强制竖屏
plus.screen.lockOrientation("portrait-primary")
// 判断用户是否同意用户隐私协议，如果同意协议再获取设备信息等内容
// const isAgreePrivacy = plus.runtime.isAgreePrivacy();
// console.log(isAgreePrivacy, '是否同意了协议')
// // 同意了协议
// if (isAgreePrivacy) {
// loadNetwork()
// loadDevice()
// loadLocation()
// loadUuid()
// }
// 当前版本号
plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
let versionNumber
......@@ -38,13 +44,14 @@ export default {
// 存储所有请求的头部信息
uni.setStorage({ key: 'm-header-version', data: versionNumber });
})
},
async onShow() {
// 首页配置
await ininIndex()
await initSettings()
await initApp()
switchShowTabbar()
await initIndexGoods()
// APP配置和H5配置
await initH5Setting()
await initAPPSetting()
},
/** 切换到后台 */
onHide() {
......
README.md
View file @ dfee72cb
......@@ -32,3 +32,5 @@ APP当中的资源文件在【远益典当】账户的OSS里面
- [uniapp 全局数据（globalData）的设置，获取，更改](https://blog.csdn.net/qq_37128634/article/details/106059230)
- [UNIAPP 吸顶功能](https://blog.csdn.net/weixin_46371234/article/details/120202491)
- [webview 刷新](https://blog.csdn.net/weixin_63543108/article/details/132255480)
- [webview h5+](https://www.html5plus.org/doc/zh_cn/webview.html#plus.webview.prefetchURL)
\ No newline at end of file
components/goodsItem/index.vue
View file @ dfee72cb
......@@ -43,11 +43,7 @@
},
methods:{
goDetail:function(item){
this.Go('uni:/pages/productDetails/productDetails')
// const {productId}=item
// this.Go(`uni:/pages/details/details?productId=${productId}`)
console.log(item,'9655666')
// this.$emit('godetails', item);
this.Go('uni:/subPackage/productDetails/productDetails')
},
toupperTop:function(e){
console.log(e,'到顶了');
......
components/loading.nvue
View file @ dfee72cb
......@@ -15,6 +15,11 @@
uni.showLoading({
title: '加载中...'
});
setTimeout(() => {
uni.hideLoading()
}, 3000);
},
methods: {
......
hybrid/html/advertise/advertise.html 0 → 100644
View file @ dfee72cb
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>广告启动页</title>
<link rel="stylesheet" href="../css/advertise.css">
<!-- uni 的 SDK -->
<script type="text/javascript" src="../js/webView.js"></script>
</head>
<body>
<div class="content">
<div class="con">
<img id="img" src="../imgs/advertise.png" style="object-fit: contain;">
</div>
<div class="btn" id="timer">
<div id="info">跳过</div>
<div class="circleProgress_wrapper btn">
<div class="wrapper right">
<div class="circleProgress rightcircle"></div>
</div>
<div class="wrapper left">
<div class="circleProgress leftcircle"></div>
</div>
</div>
</div>
</div>
</body>
<script>
document.addEventListener('UniAppJSBridgeReady', function() {
document.querySelector('.btn').addEventListener('click', function(e) {
if (e.isTrusted) {
plus.webview.currentWebview().close();
}
});
});
setTimeout(function() {
plus.webview.currentWebview().close();
}, 4000);
</script>
</html>
hybrid/html/css/advertise.css 0 → 100644
View file @ dfee72cb
* {
margin: 0;
padding: 0;
}
html,
body {
width: 100%;
height: 100%;
}
.content {
width: 100%;
height: 100%;
}
.content .con {
width: 100%;
height: 100%;
font-size: 0;
display: flex;
align-items: center;
}
#img {
width: 100%;
height: 100%;
}
#timer {
display: inline-block;
position: fixed;
top: 40px;
right: 10px;
}
#info {
position: absolute;
top: 0;
left: 0;
width: 36px;
height: 36px;
line-height: 36px;
border-radius: 50%;
background-color: rgba(0, 0, 0, 0.3);
text-align: center;
color: #FFFFFF;
font-size: 12px;
}
.circleProgress_wrapper {
width: 36px;
height: 36px;
position: relative;
}
.wrapper {
width: 18px;
height: 36px;
position: absolute;
top: 0;
overflow: hidden;
}
.right {
right: 0;
}
.left {
left: 0;
}
.circleProgress {
width: 32px;
height: 32px;
border: 2px solid #FFFFFF;
border-radius: 50%;
position: absolute;
top: 0;
-webkit-transform: rotate(45deg);
}
.rightcircle {
border-top: 2px solid #03A9F4;
border-right: 2px solid #03A9F4;
right: 0;
-webkit-animation: circleProgressLoad_right 4s linear;
/*动画停留在最后一帧*/
animation-fill-mode: forwards;
-moz-animation-fill-mode: forwards;
-webkit-animation-fill-mode: forwards;
-o-animation-fill-mode: forwards;
}
.leftcircle {
border-bottom: 2px solid #03A9F4;
border-left: 2px solid #03A9F4;
left: 0;
-webkit-animation: circleProgressLoad_left 4s linear;
/*动画停留在最后一帧*/
animation-fill-mode: forwards;
-moz-animation-fill-mode: forwards;
-webkit-animation-fill-mode: forwards;
-o-animation-fill-mode: forwards;
}
@-webkit-keyframes circleProgressLoad_right {
0% {
border-top: 2px solid #03A9F4;
border-right: 2px solid #03A9F4;
-webkit-transform: rotate(45deg);
}
50% {
border-top: 2px solid #03A9F4;
border-right: 2px solid #03A9F4;
border-left: 2px solid #FFFFFF;
border-bottom: 2px solid #FFFFFF;
-webkit-transform: rotate(225deg);
}
100% {
border-left: 2px solid #FFFFFF;
border-bottom: 2px solid #FFFFFF;
-webkit-transform: rotate(225deg);
}
}
@-webkit-keyframes circleProgressLoad_left {
0% {
border-bottom: 2px solid #03A9F4;
border-left: 2px solid #03A9F4;
-webkit-transform: rotate(45deg);
}
50% {
border-bottom: 2px solid #03A9F4;
border-left: 2px solid #03A9F4;
border-top: 2px solid #FFFFFF;
border-right: 2px solid #FFFFFF;
-webkit-transform: rotate(45deg);
}
100% {
border-top: 2px solid #FFFFFF;
border-right: 2px solid #FFFFFF;
-webkit-transform: rotate(225deg);
}
}
hybrid/html/js/webView.js 0 → 100644
View file @ dfee72cb
!function(e,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):e.uni=i()}(this,function(){"use strict";var e={},o=[],s=/uni-app/i.test(navigator.userAgent),i=function(e,i){if(0===o.length&&s){var n=plus.webview.currentWebview();if(!n)throw new Error("plus.webview.currentWebview() is undefined");var t=n.parent();if(!t)throw new Error("plus.webview.currentWebview().parent() is undefined");o.push(t.id)}var a={options:{timestamp:+new Date},name:e,arg:i};if(s){var r=JSON.stringify(a);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("WEB_INVOKE_APPSERVICE",'+r+","+JSON.stringify(o)+");")}else window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:a,pageId:""},"*")};e.navigateTo=function(){var e=(0<arguments.length&&void 0!==arguments[0]?arguments[0]:{}).url;i("navigateTo",{url:encodeURI(e)})},e.navigateBack=function(){var e=(0<arguments.length&&void 0!==arguments[0]?arguments[0]:{}).delta;i("navigateBack",{delta:parseInt(e)||1})},e.switchTab=function(){var e=(0<arguments.length&&void 0!==arguments[0]?arguments[0]:{}).url;i("switchTab",{url:encodeURI(e)})},e.reLaunch=function(){var e=(0<arguments.length&&void 0!==arguments[0]?arguments[0]:{}).url;i("reLaunch",{url:encodeURI(e)})},e.redirectTo=function(){var e=(0<arguments.length&&void 0!==arguments[0]?arguments[0]:{}).url;i("redirectTo",{url:encodeURI(e)})},e.getEnv=function(e){e(s?{plus:!0}:{h5:!0})},e.postMessage=function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};i("postMessage",e.data||{})};var n={};"undefined"!=typeof wx&&wx.miniProgram&&(n.navigateTo=wx.miniProgram.navigateTo,n.navigateBack=wx.miniProgram.navigateBack,n.switchTab=wx.miniProgram.switchTab,n.reLaunch=wx.miniProgram.reLaunch,n.redirectTo=wx.miniProgram.redirectTo,n.postMessage=wx.miniProgram.postMessage,n.getEnv=wx.miniProgram.getEnv);var t={};-1<navigator.userAgent.indexOf("AlipayClient")&&"undefined"!=typeof my&&(t.navigateTo=my.navigateTo,t.navigateBack=my.navigateBack,t.switchTab=my.switchTab,t.reLaunch=my.reLaunch,t.redirectTo=my.redirectTo,t.postMessage=my.postMessage,t.getEnv=my.getEnv);var a={};"undefined"!=typeof swan&&swan.webView&&(a.navigateTo=swan.webView.navigateTo,a.navigateBack=swan.webView.navigateBack,a.switchTab=swan.webView.switchTab,a.reLaunch=swan.webView.reLaunch,a.redirectTo=swan.webView.redirectTo,a.postMessage=swan.webView.postMessage,a.getEnv=swan.webView.getEnv);var r={};"undefined"!=typeof tt&&tt.miniProgram&&(r.navigateTo=tt.miniProgram.navigateTo,r.redirectTo=tt.miniProgram.redirectTo,r.reLaunch=tt.miniProgram.reLaunch,r.switchTab=tt.miniProgram.switchTab,r.navigateBack=tt.miniProgram.navigateBack);var d=navigator.userAgent,c=/uni-app/i.test(d),g=/micromessenger/i.test(d),w=/AlipayClient/.test(d),u=/swan/i.test(d),v=/toutiaomicroapp/i.test(d),m={},p=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))};return c?(m=e,window.plus&&/complete|loaded|interactive/.test(document.readyState)?p():document.addEventListener("plusready",p)):g?(m=n,window.WeixinJSBridge&&WeixinJSBridge.invoke?p():document.addEventListener("WeixinJSBridgeReady",p)):(m=w?t:u?a:v?r:e,document.addEventListener("DOMContentLoaded",p)),m});
\ No newline at end of file
manifest.json
View file @ dfee72cb
......@@ -2,8 +2,8 @@
"name" : "多典花",
"appid" : "__UNI__DE04B13",
"description" : "",
"versionName" : "1.0.4",
"versionCode" : 104,
"versionName" : "1.0.5",
"versionCode" : 105,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......@@ -185,5 +185,9 @@
"uniStatistics" : {
"enable" : false
},
"vueVersion" : "2"
"vueVersion" : "2",
"optimization" : {
"subPackages" : true
},
"runmode" : "liberate"
}
pages.json
View file @ dfee72cb
{
"pages": [
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/init/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"navigationBarTitleText": "",
"app-plus": {
"bounce": "none",
"animationType": "none"
}
}
},
{
"path": "pages/starPage/index",
"path": "pages/index/index",
"style": {
"enablePullDownRefresh": true,
"navigationStyle": "custom",
"navigationBarTitleText": ""
"app-plus": {
"bounce": "none"
}
}
},
{
"path": "pages/index/index",
"path": "pages/agreement/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"app-plus": {
"bounce": "none",
"animationType": "fade-in",
"background": "transparent",
"backgroundColor": "rgba(0,0,0,0)",
"webviewBGTransparent": true,
"mask": "none",
"popGesture": "none"
}
}
},
{
"path": "pages/starPage/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": ""
}
},
{
"path": "pages/login/login",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"navigationBarTitleText": "登录",
"app-plus": {
"bounce": "none"
"softinputMode": "adjustResize"
}
}
},
{
"path": "pages/sort/index",
"style": {
......@@ -46,222 +74,184 @@
}
},
{
"path": "pages/recruit/index",
"path": "pages/contact/contact",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "鉴定师招聘"
"navigationBarTitleText": "通讯录",
"enablePullDownRefresh": false
}
},
{
"path": "pages/recruitResult/index",
"path": "pages/web/contact",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
"navigationBarTitleText": "通讯录",
"enablePullDownRefresh": false
}
},
{
"path": "pages/category/category",
"path": "pages/web/face",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "选择鉴定品类"
"navigationBarTitleText": "人脸识别",
"enablePullDownRefresh": false
}
},
{
"path": "pages/application/application",
"path": "pages/web/web",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"navigationBarTitleText": "我的鉴定申请"
}
},
"navigationBarTitleText": "",
"app-plus": {
"subNVues": [
{
"path": "pages/myneed/myneed",
"id": "loadingSubnvue", // 唯一标识
"path": "components/loading", // 页面路径
"type": "popup",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要的"
"position": "absolute",
"dock": "bottom",
"width": "100rpx",
"height": "150rpx",
"background": "transparent",
"mask": "rgba(0,0,0,0)"
}
}
]
}
}
},
{
"path": "pages/Ineed/Ineed",
"path": "pages/web/websrc",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要"
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
{
"path": "pages/productDetails/productDetails",
"path": "uni_modules/uni-frv-external/pages/common/webview/webview",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "商品详情"
"navigationBarTitleText": ""
}
},
}
],
"subPackages": [
{
"path": "pages/detailResult/detailResult",
"root": "subPackage",
"pages": [
{
"path": "recruit/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
"navigationBarTitleText": "鉴定师招聘"
}
},
{
"path": "pages/useFeed/useFeed",
"path": "recruitResult/index",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "用户反馈"
"navigationStyle": "custom"
}
},
{
"path": "pages/lookGoods/lookGoods",
"path": "category/category",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
"navigationBarTitleText": "选择鉴定品类"
}
},
{
"path": "pages/login/login",
"path": "application/application",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"navigationBarTitleText": "登录",
"app-plus": {
"softinputMode": "adjustResize"
}
"navigationBarTitleText": "我的鉴定申请"
}
},
{
"path": "pages/prolist/prolist",
"path": "myneed/myneed",
"style": {
"navigationBarTitleText": "相关协议"
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要的"
}
},
{
"path": "pages/setting/setting",
"path": "Ineed/Ineed",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "设置"
"navigationBarTitleText": "我需要"
}
},
{
"path": "pages/contact/contact",
"path": "productDetails/productDetails",
"style": {
"navigationBarTitleText": "通讯录",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarTitleText": "商品详情"
}
},
{
"path": "pages/web/contact",
"path": "detailResult/detailResult",
"style": {
"navigationBarTitleText": "通讯录",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/web/face",
"path": "useFeed/useFeed",
"style": {
"navigationBarTitleText": "人脸识别",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationBarTitleText": "用户反馈"
}
},
{
"path": "pages/webview/webview",
"path": "lookGoods/lookGoods",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
},
{
"path": "pages/websrc/websrc",
"path": "prolist/prolist",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"navigationBarTitleText": "相关协议"
}
},
{
"path": "pages/web/web",
"path": "setting/setting",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"navigationBarTitleText": "",
"app-plus": {
"subNVues": [
{
"id": "loadingSubnvue", // 唯一标识
"path": "components/loading", // 页面路径
"type": "popup",
"style": {
"position": "absolute",
"dock": "bottom",
"width": "100rpx",
"height": "150rpx",
"background": "transparent",
"mask": "rgba(0,0,0,0)"
}
}
]
}
}
},
{
"path": "pages/web/websrc",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false
"navigationBarTitleText": "设置"
}
},
{
"path": "pages/bill/indexs",
"path": "webview/webview",
"style": {
"navigationBarTitleText": "账单"
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
},
{
"path": "pages/finance/index",
"path": "finance/index",
"style": {
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
"path": "pages/app-update/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"app-plus": {
"bounce": "none",
"animationType": "fade-in",
"background": "transparent",
"backgroundColor": "rgba(0,0,0,0)",
"webviewBGTransparent": true,
"mask": "none",
"popGesture": "none"
}
]
}
],
"preloadRule": {
"pages/starPage/index": {
"network": "all",
"packages": ["__APP__"]
},
{
"path": "pages/agreement/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"app-plus": {
"bounce": "none",
"animationType": "fade-in",
"background": "transparent",
"backgroundColor": "rgba(0,0,0,0)",
"webviewBGTransparent": true,
"mask": "none",
"popGesture": "none"
}
"pages/index/index": {
"network": "all",
"packages": ["subPackage"]
}
},
{
"path": "uni_modules/uni-frv-external/pages/common/webview/webview",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
}
],
"tabBar": {
"borderStyle": "white",
"color": "#BBBBBB",
......
pages/.DS_Store
View file @ dfee72cb
No preview for this file type
pages/agreement/index.vue
View file @ dfee72cb
......@@ -108,7 +108,7 @@ export default {
url: protocolUrl
}
uni.navigateTo({
url: '/pages/webview/webview?mydata=' + encodeURIComponent(JSON.stringify(items))
url: '/subPackage/webview/webview?mydata=' + encodeURIComponent(JSON.stringify(items))
})
}
},
......
pages/app-update/config.js deleted 100644 → 0
View file @ 6af81378
export default {
// props里设置的是默认样式 使用组件时可以被覆盖
props: {
// 主题颜色
themeColor: {
default: '#61d287',
type: String
},
// 背景色
bgColor: {
default: '#fff',
type: String
},
// 版本号字体颜色
versionColor: {
default: '#fff',
type: String
},
// 关闭图标颜色
closeIconColor: {
default: "#fff",
type: String,
},
// 关闭图标大小
closeIconSize: {
default: 26,
type: Number
},
// 更新标题文字颜色
titleColor: {
default: '#5e5e5e',
type: String
},
// 更新内容文字颜色
contentColor: {
default: '#878787',
type: String
},
// 短期内不更新图标大小
notRemindIconSize: {
default: 22,
type: Number
},
// 短期内不更新选中图标颜色
notRemindIconActColor: {
default: '',
type: String
},
// 短期内不更新未选中图标颜色
notRemindIconNotActColor: {
default: '#9d9d9d',
type: String
},
// 短期内不更新选中文字颜色
notRemindTextActColor: {
default: '#6b6b6b',
type: String
},
// 短期内不更新未选中文字颜色
notRemindTextNotActColor: {
default: '#9d9d9d',
type: String
},
// 下载按钮ios文字
downloadBtnTextIOS: {
default: '立即跳转更新',
type: String
},
// 下载按钮Android文字
downloadBtnTextAndroid: {
default: '立即升级',
type: String
},
// 下载中文字提示
downLoadingText: {
default: '安装包下载中，请稍后',
type: String
},
// 下载完成文字提示
downloadSuccessText: {
default: '下载完成，立即安装',
type: String
},
// wgt安装中显示文字
wgtInstallingText: {
default: '正在安装....',
type: String
},
// wgt安装完成重启显示文字
wgtInstalledText: {
default: '安装完毕，点击重启',
type: String
},
// 按钮背景色
btnBgColor: {
default: '',
type: String
},
// 按钮文字颜色
btnColor: {
default: '#fff',
type: String
},
// 进度条颜色
progressColor: {
default: '',
type: String
},
// 进度条文字样式
progressTextColor: {
default: '#4c4c4c',
type: String
},
// 提示用户更新的间隔时间 单位day
intervalAlertUserUpdateDay: {
default: 1,
type: Number
}
}
}
pages/app-update/index.vue deleted 100644 → 0
View file @ 6af81378
<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 }">
<!-- 关闭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>
<!-- 更新详细信息 -->
<view class="info center">
<text class="title" :style="{ color: titleColor }">{{ title }}</text>
<!-- 更新内容 -->
<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 }}
</button>
<button v-else-if="wgtInstalled && isWGT" class="btn" :style="btnStyle" @click="restart">
{{ wgtInstalledText }}
</button>
<!-- 更新进度 -->
<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>
</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 }}
</view>
<!-- android -->
<view v-else class="btn confirm" :style="btnStyle" @click="updataApp">
{{ downloadBtnTextAndroid }}
</view>
</view>
<!-- 短期内不在提醒 -->
<!-- <view v-if="!isForceUpdata" class="notRemind" @click="userNotRemind = !userNotRemind"
:class="{active: userNotRemind}">
<u-icon :name="userNotRemind ? 'checkbox' : 'circle'" :size="notRemindIconSize"
:color="userNotRemind ? (notRemindIconActColor || themeColor) : notRemindIconNotActColor"></u-icon>
<view class="remind-text"
:style="{color: userNotRemind ? notRemindTextActColor : notRemindTextNotActColor}">
{{intervalAlertUserUpdateDay}}日内不在提醒
</view>
</view> -->
</view>
</view>
</uni-popup>
</view>
</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,
}
},
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;
}
}
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')
},
// 跳转应用市场
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 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');
}
}
// 检查版本 需要更新时才会触发回调
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('appDownLoadTempFilePath');
uni.removeStorageSync('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);
}
// 清空下载进度
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;
}
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
})
})
},
// 删除保存的文件
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() {
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'
});
// uni.navigateBack({
// delta: 1
// })
}
}
});
} else {
console.log(2, '9')
this.$refs.popup.close();
// 如果用户短期内不更新
if (this.userNotRemind) {
this.updataUserRefuseTime();
}
// uni.navigateBack({
// delta: 1
// })
uni.switchTab({
url: '/pages/index/index'
});
}
if (this.downloadSuccess) {
// 包已经下载完毕，稍后安装，将包保存在本地
this.saveFile(this.tempFilePath)
}
},
// 应用更新
updataApp() {
// 检查可跳转的应用市场 如果失败则走应用内更新
this.checkStoreScheme().catch(() => {
this.downloadPackage()
})
},
},
computed: {
btnStyle() {
return {
color: this.btnColor,
backgroundColor: this.btnBgColor || this.themeColor
}
}
}
}
</script>
<style lang="less">
page {
background: transparent;
}
.appUploadAlertBox {
position: relative;
width: 100vw;
height: 100vh;
display: flex;
background: rgba(0,0,0,0.4);
.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;
}
.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;
.title {
font-size: 42rpx;
}
.info_desc_scroll {
margin-top: 20rpx;
font-size: 33rpx;
min-height: 200rpx;
max-height: 400rpx;
box-sizing: border-box;
line-height: 1.3;
p:not(:last-child) {
margin-bottom: 12rpx;
}
}
}
.footer {
padding: 0 30rpx;
.progress-box {
width: 100%;
margin-top: 25rpx;
}
:deep(.progress) {
width: 90%;
height: 40rpx;
margin-bottom: 5rpx;
.uni-progress-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%;
}
.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);
}
}
</style>
pages/app-update/js-sdk/checkVersion.js deleted 100644 → 0
View file @ 6af81378
/**
* 检测升级 使用说明
* 上传包：
* 1. 先从数据库取出所有该平台（从上下文读取平台信息，默认 Andriod）的所有线上发行更新
* 2. 再从所有线上发行更新中取出版本最大的一版。如果可以，尽量先检测wgt的线上发行版更新
* 3. 使用上步取出的版本包的版本号 和传参 appVersion、wgtVersion 来检测是否有更新，必须同时大于这两项，否则返回暂无更新
* 4. 如果库中 wgt包 版本大于传参 appVersion，但是不满足 min_uni_version < appVersion，则不会使用wgt更新，会接着判断库中 app包version 是否大于 appVersion
*/
import { getAppVersion } from "@/api/api.js";
export default function checkVersion() {
return new Promise((resolve, reject) => {
// #ifdef APP-PLUS
uni.getSystemInfo({
success: (res) => {
let platform = res.platform;
// 获取本机版本号
let type;
platform === "android" ? (type = "ANDROID") : (type = "IOS");
getAppVersion(`/pawn/setting/other/appVersion/${type}`).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 || '';
resolve(result);
}
}).catch(err => {
reject(err);
})
}
});
// #endif
})
}
pages/app-update/js-sdk/silentlyAppUpdate.js deleted 100644 → 0
View file @ 6af81378
import checkVersion from './checkVersion.js';
// 版本对比
export const 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;
}
}
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;
}
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) => {
if (compare(res.versionName, wgtinfo.version) === 1) {
uni.redirectTo({
url: "/pages/app-update/index",
})
}
});
// 静默更新
// if (res.is_silently) {
// let dtask = plus.downloader.createDownload(res.downloadUrl, {}, (download, status) => {
// if (status == 200) {
// plus.runtime.install(download.filename, {
// force: false
// }, res => {
// // 静默更新后会自动重启
// uni.showLoading({
// icon: 'none',
// title: '更新完成，正在重启……',
// mask: true
// })
// setTimeout(() => {
// uni.hideLoading();
// plus.runtime.restart();
// }, 1000)
// }, err => {
// console.log(err);
// })
// }
// });
// dtask.start();
// }
})
}
pages/bill/index.less deleted 100644 → 0
View file @ 6af81378
.bill-page{
width: 100%;
height: 100vh;
// max-height: 1857rpx;
background: #F7FAFF;
.bill-data{
margin:0 20rpx;
.data-tips{
padding:15rpx 0 15rpx 18rpx;
height: 33rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #2263E6;
line-height: 33rpx;
text-align: left;
font-style: normal;
}
.scroll-Y{
// margin-top:15rpx;
height: 800rpx;
.data-card{
// width: 690rpx;
margin-bottom:24rpx;
height: 240rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(232,232,232,0.49);
border-radius: 10rpx;
.card-main{
padding:24rpx 20rpx 25rpx 25rpx;
.main-top{
display: flex;
align-items: center;
justify-content: space-between;
.top-l{
display: flex;
.l-icon{
width: 54rpx;
height: 55rpx;
background-size: 54rpx 55rpx;
}
.l-name{
padding:7rpx 55rpx 0 16rpx;
height: 40rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 28rpx;
color: #333333;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
}
.top-time{
padding: 12rpx 128rpx 13rpx 0rpx ;
height: 30rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 22rpx;
color: #999999;
line-height: 30rpx;
text-align: left;
font-style: normal;
}
.top-des{
padding-top:11rpx;
// padding-left: 34rpx;
height: 33rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #2263E6;
line-height: 33rpx;
text-align: right;
font-style: normal;
}
}
.main-s{
margin-top:34rpx;
display: flex;
align-items: center;
justify-content: space-between;
.s-f{
.f-num{
height: 49rpx;
font-family: DIN, DIN;
font-weight: bold;
font-size: 40rpx;
color: #333333;
line-height: 49rpx;
text-align: left;
font-style: normal;
}
.f-text{
padding-top:16rpx;
height: 37rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 26rpx;
color: #999999;
line-height: 37rpx;
text-align: left;
font-style: normal;
}
}
.s-t{
padding:0 128rpx 0 76rpx;
.t-text{
height: 56rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 40rpx;
color: #999999;
line-height: 56rpx;
text-align: left;
font-style: normal;
}
.t-red{
height: 56rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 40rpx;
color: #FC4D3E;
line-height: 56rpx;
text-align: left;
font-style: normal;
}
.t-blue{
height: 56rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 40rpx;
color: #2263E6;
line-height: 56rpx;
text-align: left;
font-style: normal;
}
.t-time{
margin-top:10rpx;
height: 37rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 26rpx;
color: #999999;
line-height: 37rpx;
text-align: left;
font-style: normal;
}
}
.s-btn{
// margin-top:10rpx;
width: 180rpx;
height: 64rpx;
background: #E8EFFC;
border-radius: 32rpx;
.btn-text{
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 26rpx;
color: #2263E6;
line-height: 64rpx;
text-align: center;
font-style: normal;
}
}
}
}
}
}
.data-text{
position: fixed;
bottom:0;
left:38%;
padding-bottom:20rpx;
height: 33rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #999999;
line-height: 33rpx;
text-align: center;
font-style: normal;
}
}
.bill-null{
padding-top:188rpx;
.n-img{
margin:0 auto 35rpx;
width: 328rpx;
height: 328rpx;
background: url('https://ddh.yyhock.com/appStatic/bill-null.png') 0 0 no-repeat;
background-size: 100%;
}
.n-text{
height: 33rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #999999;
line-height: 33rpx;
text-align: center;
font-style: normal;
}
.n-btn{
margin:87rpx 40rpx 0;
width: 670rpx;
height: 88rpx;
background: linear-gradient( 137deg, #3877F5 0%, #5690FA 100%);
border-radius: 44rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 32rpx;
color: #FFFFFF;
line-height: 88rpx;
text-align: center;
font-style: normal;
}
}
}
pages/bill/index.vue deleted 100644 → 0
View file @ 6af81378
<template>
<view class="page-web">
<web-view ref='webview' :webview-styles="webviewStyles" @message="handleMessage" :src="src"></web-view>
</view>
</template>
<script>
import {loadLocation} from '../../utils/tools.js'
import {CheckContactPermission,SelectContact} from '../../utils/authPerission.js'
import storage from '../../utils/storage.js'
import {UploadFile} from '../../utils/uploads.js'
import Permission from '@/js_sdk/wa-permission/permission' //权限工具类
const LF = uni.requireNativePlugin('AThree-LFv2')
import api from '@/config/api'
let reloadTimeOut = null
export default {
name: "WEB",
data() {
return {
src: api['h5'],
wv: null,
canBack: false,
webviewStyles: {
progress: {
color: '#FF4050'
}
},
deviceStatus: '',
};
},
onBackPress(e) {
if (this.wv && this.canBack) {
this.wv.back()
return true
}
return false
},
onReady() {
const _that = this
// #ifdef APP-PLUS
//此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
let currentWebview = _that.$scope.$getAppWebview();
setTimeout(() => {
this.wv = currentWebview.children()[0]
// 物理按键返回
_that.wv.addEventListener(
'loaded',
() => {
_that.wv.canBack((e) => {
_that.canBack = e.canBack
})
},
false
)
}, 1000) //如果是页面初始化调用时，需要延时一下
// #endif
},
onTabItemTap(e) {
console.log('点击tabbar', JSON.stringify(e))
// if (!this.$options.filters.isLogin('auth')) {
// this.$options.filters.navigateToLogin()
// } else {
this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
// }
},
async onLoad(option) {
// this.subnvue_open();
const that = this
if (option.src) {
that.src = option.src
}
uni.getStorage({
key: 'm-device-info',
success: function (res) {
const { device } = JSON.parse(res.data)
that.deviceStatus = device
}
})
},
onHide() {
// uni.removeStorageSync('hasRefresh')
},
onShow() {
console.log('WEB show方法')
this.switchShowTabbar()
if (uni.getStorageSync('canRefreshWeb')) {
uni.removeStorageSync('canRefreshWeb')
if (this.wv) {
const needReload = uni.getStorageSync('reloadFlag')
if (!needReload) {
console.log('刷新页面')
if(reloadTimeOut) clearTimeout(reloadTimeOut)
reloadTimeOut = setTimeout(()=>{
this.wv.reload()
},1000)
} else {
console.log('不刷新页面')
}
}
}
},
onUnload() {
uni.$off('loadingSubnvue'); //移除监听配置的原生子窗体
},
methods: {
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
})
}
})
}
},
subnvue_open() {
this.subNVue = uni.getSubNVueById('loadingSubnvue'); //通过id获取nvue子窗体
this.subNVue.show();
},
handleMessage(e) {
const data = e.detail.data;
if (!data || data.lenght === 0) {
this.toast('调用APP方法报错');
return;
}
const {
name,
params
} = data[0];
if (!name) {
this.toast('缺少方法名', 'error')
return
}
if (this.$options.filters.isLogin('auth')) {
if (params) {
this[name](params)
} else {
this[name]()
}
}
},
UserToken(token) {
uni.setStorage({
key: 'm-token',
data: token,
success: () => {
console.log('m-token存储成功');
}
})
},
// APP是否登陆
IS_LOGIN() {
const isLogin = this.$options.filters.isLogin('auth')
const res = {
isLogin: isLogin,
appName: '多典花',
}
this.GetWebView().evalJS(`IS_LOGIN('${JSON.stringify(res)}')`)
},
// 删除localtabbar
removeRefreshStorage() {
uni.removeStorageSync('hasRefresh')
console.log('删除了hasRefresh')
},
// 隐藏tabbar
hideLoading() {
// console.log('调用了APP的hideLoading方法')
uni.hideLoading()
},
// 隐藏tabbar
hideTabBar() {
uni.hideTabBar()
},
// 显示tabbar
showTabBar() {
uni.showTabBar()
},
// 获取当前WebView实例
GetWebView() {
const currentWebview = this.$scope.$getAppWebview();
let wv = currentWebview.children()[0];
return wv;
},
// 获取状态栏高度
GetStatusBarHei() {
try {
const windowInfo = uni.getWindowInfo()
const {
statusBarHeight
} = windowInfo;
this.GetWebView().evalJS("receiveStatusBarHei('" + statusBarHeight + "')")
} catch (err) {
console.log(err, '什么错')
this.toast('获取状态栏高度报错')
}
},
// 获取用户手机号
GetUserMobile() {
const mobileCall=uni.getStorageSync('mobileCall')
console.log(mobileCall,'mobileCall')
try {
this.GetWebView().evalJS(`receiveUserMobile('${mobileCall}')`)
} catch (err) {
console.log(err, '什么错')
this.toast('获取用户手机号报错')
}
},
// 拨打电话
MakeCall(num) {
try {
uni.makePhoneCall({
phoneNumber: num
});
} catch (err) {
this.toast('拨打电话报错')
}
},
// Toast提示框
toast(title, type) {
uni.showToast({
icon: type ? type : "none",
title
})
},
// Toast 提示框
Toast(config) {
try {
uni.showToast({
...config
})
} catch (err) {
this.toast('提示框报错')
}
},
// 实名认证正面
Camera_OCR_Front(config) {
console.log('实名认证前面', config)
// 检查相机权限
// if (!this.CheckCamera()) return;
console.log('哈哈哈')
const that = this;
try {
console.log(LF, '忍忍')
LF.Camera_UP({
...config
}, async (res) => {
console.log(res, 'res-front1')
if (res.code == 1 && res.info) {
let chacheImg = res.standardImage.replace(/\n/g, '')
if (res.info && res.info.rectifiedImage) delete res.info.rectifiedImage;
const result = {
info: res.info
}
UploadFile(config, `data:image/png;base64,${chacheImg}`).then(file => {
result.fileUrl = file.fileUrl
if (file.statusCode === 200) {
that.wv.evalJS(`receiveOcrFront('${JSON.stringify(result)}')`)
uni.showToast({
icon: "success",
title: "图片上传成功"
})
} else {
uni.showToast({
icon: "success",
title: "图片上传失败"
})
}
}).catch(err => {
console.log(err)
uni.showToast({
icon: 'error',
title: "图片上传失败"
})
})
} else if (res.code == 10) {
uni.showToast({
icon: "none",
title: "请重拍一张照片试一试"
})
} else {
uni.showToast({
icon: "none",
title: "请重拍一张照片试一试"
})
}
})
} catch (err) {
console.log(err, 'OCR识别错误')
}
},
// 实名认证反面
Camera_OCR_Back(config) {
// 检查相机权限
// if (!this.CheckCamera()) return;
const that = this;
try {
LF.Camera_UP({
...config
}, (res) => {
if (res.code == 1 && res.info) {
let chacheImg = res.standardImage.replace(/\n/g, '')
if (res.info && res.info.rectifiedImage) delete res.info.rectifiedImage;
const result = {
info: res.info
}
UploadFile(config, `data:image/png;base64,${chacheImg}`).then(file => {
result.fileUrl = file.fileUrl
if (file.statusCode === 200) {
that.wv.evalJS(`receiveOcrBack('${JSON.stringify(result)}')`)
uni.showToast({
icon: "success",
title: "图片上传成功"
})
} else {
uni.showToast({
icon: "success",
title: "图片上传失败"
})
}
}).catch(err => {
console.log(err)
uni.showToast({
icon: 'error',
title: "图片上传失败"
})
})
} else if (res.code == 10) {
uni.showToast({
icon: "none",
title: "请重拍一张照片试一试"
})
} else {
uni.showToast({
icon: "none",
title: "请重拍一张照片试一试"
})
}
})
} catch (err) {
console.log(err, 'OCR识别错误')
}
},
// 专门为OCR页面做的
SetReloadFlag(flag) {
if (flag === 'NO') {
uni.setStorageSync('reloadFlag', 'true')
} else {
if (uni.getStorageSync('reloadFlag')) uni.removeStorageSync('reloadFlag')
}
},
// 隐藏导航了
HideNavBar() {
try {
let pages = getCurrentPages();
let page = pages[pages.length - 1];
let currentWebView = page.$getAppWebview();
let titleNView = currentWebView.getStyle().titleNView;
console.log(titleNView, 'titleNView的值')
currentWebView.setStyle({
titleNView: false
})
} catch (err) {
this.toast('隐藏导航报错')
}
},
// 显示导航了
ShowNavBar() {
try {
let pages = getCurrentPages();
let page = pages[pages.length - 1];
let currentWebView = page.$getAppWebview();
let titleNView = currentWebView.getStyle().titleNView;
console.log(titleNView, 'titleNView的值')
currentWebView.setStyle({
titleNView: {}
})
} catch (err) {
this.toast('显示导航报错')
}
},
// 活体认证
async Camera_Live(config) {
// 检查相机权限
// if (!this.CheckCamera()) return;
const that = this;
try {
LF.Face_UP({
...config
}, (res) => {
if (res.code === 1000) {
const {
image
} = res;
const faceImage = image.replace(/\n/g, '')
const result = `data:image/png;base64,${faceImage}`;
UploadFile(config, result).then(file => {
if (file.statusCode === 200) {
const faceImgUrl = file.fileUrl;
// 提交活体检测
that.GetWebView().evalJS(
`receiveLiveBack(${JSON.stringify({ fileUrl: faceImgUrl })})`
)
} else {
uni.showToast({
icon: "success",
title: "认证失败"
})
}
}).catch(err => {
uni.showToast({
icon: 'error',
title: "认证失败"
})
})
}
})
} catch (err) {
console.log(err, 'LIVE活体识别错误')
}
},
// 获取设备信息
async GetDeviceInfo() {
try {
const res = await loadLocation();
this.GetWebView().evalJS(`receiveGetDeviceInfo('${JSON.stringify(res)}')`)
} catch (err) {
console.log(err, '设备信息报错')
this.GetWebView().evalJS(`receiveGetDeviceInfo('${JSON.stringify(err)}')`)
}
},
// 获取全部通讯录
GetContacts() {
const that = this;
try {
CheckContactPermission((data) => {
that.GetWebView().evalJS(`receiveContactsBack('${JSON.stringify(data)}')`)
})
} catch (err) {
console.log(err, '获取全部用户通讯录错误')
}
},
// 通讯录选择
PickContact() {
const that = this;
try {
CheckContactPermission((data) => {
SelectContact((contact) => {
that.GetWebView().evalJS(
`receivePickContactsBack('${JSON.stringify(contact)}')`)
})
})
} catch (err) {
console.log(err, '选择用户通讯录错误')
}
},
// 图片选择上传
PickImage(config) {
console.log(config, '参数')
const that = this;
try {
uni.chooseImage({
count: 1,
sourceType: ["album", "camera"],
success: (res) => {
if (res.tempFiles) {
const file = res.tempFiles[0];
UploadFile(config, file, true).then(file => {
if (file.statusCode === 200) {
const faceImgUrl = file.fileUrl;
console.log(faceImgUrl, '上传成功后的地址')
// 提交活体检测
that.GetWebView().evalJS(`receiveImage(${JSON.stringify({ fileUrl: file.fileUrl })})`
)
} else {
uni.showToast({
icon: "success",
title: "上传图片失败"
})
}
}).catch(err => {
uni.showToast({
icon: 'error',
title: "上传图片报错"
})
})
}
},
fail: () => {
console.log('选择图片报错')
},
});
} catch (err) {
console.log(err, 'H5调用PickImage方法报错')
}
},
// 检查文件和相机权限
async CheckFileAndCamera() {
const that = this;
if (plus.os.name == "iOS") {
const iosFirstCamera = uni.getStorageSync("iosFirstCamera"); // 是不是第一次开启相机
if (iosFirstCamera !== "false") {
uni.setStorageSync("iosFirstCamera", "false"); // 设为false就代表不是第一次开启相机
} else {
if (!Permission.judgeIosPermission('camera') || Permission.judgeIosPermission('photoLibrary')) {
that.GetWebView().evalJS(`receiveCheckFileAndCamera(${JSON.stringify({ flag: "false" })})`);
return false
}
}
} else {
const cameraFlag = await Permission.requestAndroidPermission('android.permission.CAMERA');
const fileFlag = await Permission.requestAndroidPermission('android.permission.READ_EXTERNAL_STORAGE');
if (cameraFlag != 1 || fileFlag !=1 ) {
that.GetWebView().evalJS(`receiveCheckFileAndCamera(${JSON.stringify({ flag: "false" })})`)
return false
}
}
that.GetWebView().evalJS(`receiveCheckFileAndCamera(${JSON.stringify({ flag: "true" })})`)
return true;
},
// 检测相机权限
async CheckCamera() {
const that = this;
if (plus.os.name == "iOS") {
const iosFirstCamera = uni.getStorageSync("iosFirstCamera"); // 是不是第一次开启相机
if (iosFirstCamera !== "false") {
uni.setStorageSync("iosFirstCamera", "false"); // 设为false就代表不是第一次开启相机
} else {
if (!Permission.judgeIosPermission('camera')) {
that.GetWebView().evalJS(`receiveCheckCamera(${JSON.stringify({ flag: "false" })})`);
uni.showModal({
title: "提示",
content: "您已经关闭相机权限,去设置",
success: function (res) {
if (res.confirm) {
Permission.gotoAppPermissionSetting();
}
},
});
return false
}
}
} else {
const result = await Permission.requestAndroidPermission('android.permission.CAMERA');
if (result != 1) {
uni.showModal({
title: "提示",
content: "您已经关闭相机权限,去设置",
success: function (res) {
if (res.confirm) {
Permission.gotoAppPermissionSetting();
}
}
})
that.GetWebView().evalJS(`receiveCheckCamera(${JSON.stringify({ flag: "false" })})`)
return false
}
}
that.GetWebView().evalJS(`receiveCheckCamera(${JSON.stringify({ flag: "true" })})`)
return true;
}
}
}
</script>
<style lang="less" scoped>
.page-web {
width: 100vw;
height: 100vh;
web-view {
width: 100%;
height: 100%;
}
}
</style>
\ No newline at end of file
pages/bill/indexs.vue deleted 100644 → 0
View file @ 6af81378
<template>
<view class="bill-page">
<!-- 有数据 -->
<view class='bill-data' v-if="billList && billList.length>0">
<view class='data-tips'>温馨提示：保持良好的借还习惯将有助于您提升借款额度</view>
<scroll-view
scroll-y="true"
class="scroll-Y"
@scrolltoupper="upper"
@scrolltolower="lower"
@scroll="scroll">
<view class='data-card' v-for="item in billList" :key="item.id">
<view class='card-main'>
<view class='main-top'>
<view class='top-l'>
<image class='l-icon' :src='item.appLogo'></image>
<view class='l-name'>{{item.appName}}</view>
</view>
<!-- <view class='top-time'>借款日：{{item.gmtCreated}}</view> -->
<view class='top-des'>{{item.loanStatusStr}}</view>
</view>
<view class='main-s'>
<view class='s-f'>
<view class='f-num'>{{item.amount}}</view>
<view class='f-text'>本期账单</view>
</view>
<view class='s-t'>
<view class='t-text' v-show="item.status=='UNCURRENT'">未到期</view>
<view class='t-red' v-show="item.status=='OVERDUED'">已逾期</view>
<view class='t-blue' v-show="item.status=='CURRENT'">当前期</view>
<view class='t-time'>{{moment(item.currentDate).format('MM-DD')}}</view>
</view>
<view class='s-btn' @click="gopay(item)">
<view class='btn-text'>立即还款</view>
</view>
</view>
</view>
</view>
</scroll-view>
<view class='data-text'>理性借贷 合理消费</view>
</view>
<!-- 空账单 -->
<view class='bill-null' v-else>
<view class='n-img'></view>
<view class='n-text'>目前还没有账单哦～</view>
<view class='n-btn' v-show="tokenShow==''" @click="goLoan">去登录</view>
</view>
</view>
</template>
<script>
import moment from "moment";
import {loadDevice,loadNetwork,loadUuid,loadLocation} from '../../utils/deviceInfo.js'
export default {
data() {
return {
moment,
title: 'Hello',
billList:[],
tokenShow:''
}
},
onLoad() {
const token=uni.getStorageSync('token')
this.tokenShow=token
const common = uni.getStorageSync("m-header-device")
},
methods: {
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
})
}
})
}
},
gopay(item){
const {loanNo,appNo,orderNo }=item
uni.setStorageSync('orderNo',orderNo)
uni.setStorageSync('appNo',appNo)
uni.navigateTo({
url:`/pages/billDetail/billDetail?loanNo=${loanNo}`
})
},
goLoan(){
const token=uni.getStorageSync('token')
if(token==''){
this.Go('uni:/pages/login/login')
}else{
//去做什么事情
this.Go('uni:/pages/indexfinance/index','tab')
}
},
upper: function(e) {
console.log(e)
},
lower: function(e) {
console.log(e)
},
scroll: function(e) {
console.log(e)
},
},
onShow() {
const token=uni.getStorageSync('token')
this.tokenShow=token
this.switchShowTabbar()
}
}
</script>
<style src='./index.less' lang="less" scoped></style>
pages/index/index.vue
View file @ dfee72cb
......@@ -102,10 +102,12 @@
</template>
<script>
import { isLogin, switchShowTabbar, ininIndex } from '@/utils/index'
import API from '@/server/common'
import { isLogin, switchShowTabbar } from '@/utils/index'
const cacheIndexData = uni.getStorageSync('dataIndex') ? JSON.parse(uni.getStorageSync('dataIndex')) : null;
const indexGoods = uni.getStorageSync('indexGoods') ? JSON.parse(uni.getStorageSync('indexGoods')) : [];
console.log(cacheIndexData,'日')
export default {
data() {
......@@ -160,13 +162,11 @@ export default {
}
},
async onLoad() {
// 显示隐藏tabBar
switchShowTabbar()
// 初始化首页数据
await ininIndex()
await this.initGoods();
await this.checkAppVersion()
// 设置页面滚动条位置
uni.pageScrollTo({
scrollTop: 0,
......@@ -179,17 +179,37 @@ export default {
},
async onShow() {
// 显示隐藏tabBar
switchShowTabbar()
// 初始化首页数据
await ininIndex()
await this.init()
await this.initGoods();
// 首页流量埋点
this.buryingPoint('app:index_page_view')
},
// 页面下拉刷新
async onPullDownRefresh() {
await this.init()
await this.initGoods();
setTimeout(() => {
uni.stopPullDownRefresh();
}, 1000);
},
methods: {
// 初始化首页数据
async init() {
try {
const res = await API.initIndex()
if (res.success) {
const data =res.result;
this.index = data;
uni.setStorageSync('dataIndex', JSON.stringify(data))
}
} catch (err) {
console.log('初始化首页报错')
}
},
// 获取元素距离顶部的距离
GetTop() {
var _this = this
......@@ -223,7 +243,7 @@ export default {
if (!isLogin()) {
this.JumpToLogin()
} else {
if (item.tager == 'uni:/pages/indexfinance/index,tab') {
if (item.tager == 'uni:/subPackage/indexfinance/index,tab') {
this.Go('uni:/pages/web/web', 'tab')
} else {
this.Go(item.tager)
......@@ -240,8 +260,7 @@ export default {
const self = this
uni.getSystemInfo({
success: (res) => {
console.log(res, '系统信息')
const appVersion = res.appVersion
const appVersion = uni.getStorageSync('m-header-version')
let platform = res.platform;
// 获取本机版本号
let type;
......@@ -249,9 +268,10 @@ export default {
self.$request(`/pawn/setting/other/appVersion/${type}`, 'GET').then(res => {
if (res.success == true) {
const response = res.result.data;
if (appVersion < response.versionName) {
const response = res.result.data;
console.log(appVersion, response.versionName, '版本比较')
if (appVersion && appVersion < response.versionName) {
const wgtType = self.containsWGTExtension(response.downloadUrl)
if (wgtType == true) {
let checkStatus = uni.getStorageSync('checkVersions')
......@@ -265,7 +285,7 @@ export default {
}
} else {
console.log('强更了',response)
console.log('强更了', response)
self.appUpgeadeObj = response
}
}
......@@ -285,7 +305,7 @@ export default {
// 首页流量埋点
this.buryingPoint('app:index_product_click')
uni.navigateTo({
url: '/pages/productDetails/productDetails?mydata=' + encodeURIComponent(JSON.stringify({ goodId: item.id }))
url: '/subPackage/productDetails/productDetails?mydata=' + encodeURIComponent(JSON.stringify({ goodId: item.id }))
})
},
......
pages/init/index.less deleted 100644 → 0
View file @ 6af81378
.stat-page{
width: 100%;
height: 100vh;
background: url('../../static/img/star-page.png') 0 0 no-repeat;
background-size: 100% 100vh;
.start-btn{
position: fixed;
bottom:290rpx;
margin:0 94rpx;
width: 561rpx;
height: 93rpx;
background: #2263E6;
box-shadow: 0rpx 4rpx 15rpx 0rpx rgba(116,178,251,0.5);
border-radius: 47rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 32rpx;
color: #FFFFFF;
line-height: 93rpx;
letter-spacing: 5rpx;
text-align: center;
font-style: normal;
}
}
\ No newline at end of file
pages/init/index.vue → pages/init/index.nvue
View file @ dfee72cb
......@@ -14,9 +14,5 @@ export default {
})
}
},
}
</script>
<style src="./index.less" lang="less" scoped></style>
\ No newline at end of file
pages/login/index.less
View file @ dfee72cb
......@@ -133,10 +133,12 @@
}
.login-footer {
margin-top: 25rpx;
display: flex;
align-items: center;
margin-left: 88rpx;
justify-content: center;
width: 600rpx;
margin: 25rpx auto;
line-height: 30rpx;
.f-checkbox {
width: 30rpx;
......@@ -165,10 +167,16 @@
text-align: left;
font-style: normal;
text-transform: none;
word-break: break-all;
word-wrap:break-word;
.link {
color: #2263E6;
}
.text-hidden{
display: none;
}
}
}
}
\ No newline at end of file
pages/login/login.vue
View file @ dfee72cb
......@@ -10,11 +10,11 @@
<view class='login-main'>
<view class='main-mobile'>
<input class='login-m-mobile' placeholder="请输入手机号" :value='mobile' maxlength="11" type="number"
@input="changeInput($event)" />
@input="(e) => handleInput(e, 'mobile')" />
</view>
<view class='main-mobile login-m-send'>
<input class='send-value' placeholder="请输入验证码" :value="sendcode" maxlength="6" type="number"
@input="changecode($event)" />
@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>
......@@ -23,11 +23,12 @@
<view class='login-btn' @click="loginBtn">登录</view>
<view class='login-footer'>
<view :class="clickStatus ? 'f-checkbox footer-click' : 'f-checkbox footer-icon'" @click="btnIcon"></view>
<view v-if="protocolf" class='footer-text'>
<view v-if="protocolList" class='footer-text'>
<text>我已阅读并同意</text>
<uni-link class="link" :href="protocolf.protocolUrl">《注册协议》</uni-link>
<text>和</text>
<uni-link class="link" :href="protocols.protocolUrl">《隐私政策》</uni-link>
<template v-for="(item, index) in protocolList">
<uni-link class="link" :href="item.protocolUrl">《{{ item.protocolName }}》</uni-link>
<text :class="[protocolList.length - 1 === index ? 'text-hidden' : '']">和</text>
</template>
</view>
</view>
</view>
......@@ -47,60 +48,51 @@ export default {
timer: null,//倒计时
count: '',//倒计时
smsDownCacheCode: '',
protocolf: null,
protocols: null,
// 协议列表
protocolList: null,
}
},
onLoad() {
onShow() {
this.init()
this.buryingPoint('app:login_pageView')
},
methods: {
GoBack(){
// 登录页返回
GoBack() {
this.Back()
},
// 预加载
initPreloadH5() {
try {
const { h5Url } = JSON.parse(uni.getStorageSync('APP-SETTING'));
// 预加载H5
plus.webview.prefetchURL(h5Url);
// 创建一个隐藏的webview 加载
// const wn = plus.webview.create(h5Url, 'duodianhuan', { render: 'always' });
// wn.show('none');
} catch (err) {
console.log('获取APP配置报错')
}
},
async init() {
const $App_Setting = uni.getStorageSync("APP-SETTING")
console.log($App_Setting,'内容呢')
if ($App_Setting) {
const { protocolList } = JSON.parse($App_Setting)
protocolList.map((item) => {
if (item.protocolName == '隐私协议') {
this.protocols = item
} else if (item.protocolName == '用户服务协议') {
this.protocolf = item
}
})
const { protocol } = JSON.parse($App_Setting)
this.protocolList = JSON.parse(protocol)
}
},
btnIcon() {
this.clickStatus = !this.clickStatus
},
goPro(type) {
if (type == '1') {
const { protocolUrl, protocolName } = this.protocolf
const items = {
name: protocolName,
url: protocolUrl
}
uni.navigateTo({
url: '/pages/webview/webview?mydata=' + encodeURIComponent(JSON.stringify(items))
})
} else {
const { protocolUrl, protocolName } = this.protocols
const items = {
name: protocolName,
url: protocolUrl
}
uni.navigateTo({
url: '/pages/webview/webview?mydata=' + encodeURIComponent(JSON.stringify(items))
})
}
},
GetVerifyCode() {
const self = this
const params = {
"mobile": self.mobile
}
const params = {mobile:this.mobile}
console.log(params,'日')
self.$request('/pawn/client/sendCode', 'POST', params).then(res => {
console.log(res, 'sendCode');
const { smsBizNo } = res.result
......@@ -200,15 +192,15 @@ export default {
}
self.$request('/app/v1/loginNoCheck', 'POST', params).then(res => {
const { deviceId, token } = res.result
const cacheData = Object.assign({}, res.result, { mobile: self.mobile })
uni.setStorageSync('user_info_obj', JSON.stringify(cacheData));
uni.setStorageSync('user_info_obj', JSON.stringify(cacheData));
uni.setStorageSync('mobileCall', self.mobile)
uni.setStorageSync('deviceId', deviceId)
uni.setStorageSync('tokenFinance', token)
this.initPreloadH5()
uni.navigateBack({
delta: 1
})
......@@ -217,12 +209,10 @@ export default {
console.log(err, '请求出错')
})
},
changeInput(e) {
this.mobile = e.detail.value
},
changecode(e) {
this.sendcode = e.detail.value
// 更新输入框
handleInput(e, key) {
const val = e.detail.value;
this[key] = val
}
}
}
......
pages/my/index.vue
View file @ dfee72cb
......@@ -6,7 +6,7 @@
<view class='my-header'>
<image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image>
<view class='header-des'>
<view class='des-name' v-if="userTel != ''">{{ userTel }}</view>
<view class='des-name' v-if="isLogin">{{ userTel }}</view>
<view class='des-name' v-else @click='GoLogin'>注册/登录</view>
<view class='des-text'>多典花承诺保护您的信息安全</view>
</view>
......@@ -135,12 +135,13 @@ import { switchShowTabbar } from '@/utils/index'
const APP = JSON.parse(uni.getStorageSync('APP-SETTING'));
const H5 = JSON.parse(uni.getStorageSync('H5-SETTING'));
const hasToken = uni.getStorageSync('token') ? true : false;
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : '';
export default {
data() {
return {
isLogin: hasToken,
userTel: '',
userTel: mobile,
menuList: [],
mobileNum: '',
menuBar: [],
......@@ -150,25 +151,17 @@ export default {
hFUrl: ''
}
},
onLoad() {
this.init()
},
onShow() {
const haveToken = uni.getStorageSync('token')
if (haveToken) this.isLogin = true
else this.isLogin = false
this.init()
// 显示隐藏tabBar
switchShowTabbar()
this.init()
// 埋点
this.buryingPoint('app:my_pageView')
},
// 页面下拉刷新
async onPullDownRefresh() {
// 初始化设备
await switchShowTabbar();
await this.init()
setTimeout(() => {
uni.stopPullDownRefresh();
......@@ -176,6 +169,7 @@ export default {
},
methods: {
toJSON() { },
// 跳转到登录
GoLogin() {
this.Go('uni:/pages/login/login')
......@@ -183,10 +177,17 @@ export default {
// 初始化
init() {
const token = uni.getStorageSync('token')
if (token) this.initMy()
console.log(token,'判断是否登录的依据')
if (token) {
this.initMine()
}
else {
this.isLogin = false
this.mobile = ''
}
},
// 初始化个人中心页面
initMy() {
initMine() {
const self = this
self.$request('/app/v1/userIndex', 'GET').then(res => {
const { menuBar, user, baseMenuBar, extMenuBarList } = res.result
......@@ -201,6 +202,7 @@ export default {
self.extMenuBarList = extMenuBarList
self.userTel = ''
if (user.cell) self.userTel = user.cell
this.isLogin = true
}).catch(err => {
console.log(err, '请求出错')
......@@ -224,6 +226,7 @@ export default {
default:
break;
}
console.log(item.linkUrl, '跳转地址')
this.Go(item.linkUrl)
},
......
pages/sort/index.vue
View file @ dfee72cb
......@@ -97,7 +97,7 @@
goodId:item.id
}
uni.navigateTo({
url:'/pages/productDetails/productDetails?mydata='+encodeURIComponent(JSON.stringify(params))
url:'/subPackage/productDetails/productDetails?mydata='+encodeURIComponent(JSON.stringify(params))
})
},
changeTab(index) {
......
pages/starPage/index.vue
View file @ dfee72cb
......@@ -5,7 +5,7 @@
</template>
<script>
import { ininIndex, initIndexGoods, initSettings, initApp } from '@/utils/index'
import { ininIndex, initIndexGoods, initH5Setting, initAPPSetting } from '@/utils/index'
export default {
async onLoad() {
......@@ -14,17 +14,19 @@ export default {
if (res.isConnected) {
await ininIndex()
await initIndexGoods()
await initSettings()
await initApp()
await initH5Setting()
await initAPPSetting()
}
})
await ininIndex()
await initIndexGoods()
await initSettings()
await initApp()
// 首页配置
// await ininIndex()
// await initIndexGoods()
// // APP配置和H5配置
// await initH5Setting()
// await initAPPSetting()
this.init()
},
......
pages/web/web.vue
View file @ dfee72cb
......@@ -13,9 +13,7 @@ import config from '@/config/api'
const LF = uni.requireNativePlugin('AThree-LFv2')
let reloadTimeOut = null
let token = uni.getStorageSync('token')
const H5 = JSON.parse(uni.getStorageSync('H5-SETTING'));
console.log(config['h5'], 'H5地址')
export default {
name: "WEB",
......@@ -55,6 +53,9 @@ export default {
_that.wv.canBack((e) => {
_that.canBack = e.canBack
})
const subNvue = uni.getSubNVueById('loadingSubnvue'); //通过id获取nvue子窗体
subNvue.hide();
},
false
)
......@@ -62,24 +63,31 @@ export default {
// #endif
},
onTabItemTap(e) {
try {
console.log(e, 'tabItemTap')
const pages = getCurrentPages();
const $CurrentPage = pages[pages.length - 1];
console.log($CurrentPage.route, '路由信息')
this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
const that = this;
const timestamp = new Date().getTime()
setTimeout(() => {
const token = uni.getStorageSync('tokenFinance')
const $src = config['h5Url'] + `?token=${token}&timestamp=${timestamp}`
console.log($src, '刷新的地址')
that.src = $src
}, 100);
} catch (err) {
console.log(err)
}
// this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
},
async onLoad(option) {
try {
this.subnvue_open();
// const mianH5Url = uni.getStorageSync('mianH5Url')
const that = this
console.log(H5.h5Url, '参数666')
if (option.src) {
console.log(option.src, '参数555')
that.src = option.src
} else if (H5.h5Url) {
console.log(H5.h5Url, '参数666')
that.src = H5.h5Url
}
console.log(option, '入参')
const that = this;
const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
this.src = config['h5Url']
console.log(config['h5Url'], 'H5地址')
uni.getStorage({
key: 'm-device-info',
......@@ -88,12 +96,16 @@ export default {
that.deviceStatus = device
}
})
} catch (err) {
console.log(err, 'onLoad执行报错')
}
},
onHide() {
// uni.removeStorageSync('hasRefresh')
const user_info_obj = uni.getStorageSync('user_info_obj')? JSON.parse(uni.getStorageSync('user_info_obj')):{}
const user_info_obj = uni.getStorageSync('user_info_obj') ? JSON.parse(uni.getStorageSync('user_info_obj')) : {}
user_info_obj.refreshIndex = false
uni.setStorageSync('user_info_obj', JSON.stringify(user_info_obj));
},
......@@ -136,9 +148,6 @@ export default {
},
onUnload() {
uni.$off('loadingSubnvue'); //移除监听配置的原生子窗体
},
methods: {
......
server/common.js
View file @ dfee72cb
......@@ -5,12 +5,12 @@ export default {
async initTabBar(data) {
return request('/pawn/setting/other/switch/loan', 'GET', data);
},
/* 初始化h5地址 */
async initSettings(data) {
/* 初始化APP配置 */
async initAPPSettings(data) {
return request('/pawn/setting', 'GET', data);
},
/* 初始化settings获取手机号 */
async initApp(data) {
/* 初始化贷超配置settings获取手机号 */
async initH5Settings(data) {
return request('/app/v1/settings', 'GET', data);
},
/* 初始化首页 */
......
pages/Ineed/Ineed.vue → subPackage/Ineed/Ineed.vue
View file @ dfee72cb
......@@ -51,7 +51,7 @@
})
},
needSubmit(){
this.Go('uni:/pages/myneed/myneed')
this.Go('uni:/subPackage/myneed/myneed')
},
toupperTop(e){
console.log(e,'到顶了');
......
pages/category/category.vue → subPackage/category/category.vue
View file @ dfee72cb
......@@ -118,7 +118,7 @@
"type": self.categoryType
}
self.$request('/pawn/authenticate/save','POST',params).then((res)=>{
self.Go('uni:/pages/application/application','redirect')
self.Go('uni:/subPackage/application/application','redirect')
console.log(res,'save')
})
},
......
pages/lookGoods/lookGoods.vue → subPackage/lookGoods/lookGoods.vue
View file @ dfee72cb
......@@ -108,7 +108,7 @@
goodId:item.id
}
uni.navigateTo({
url:'/pages/productDetails/productDetails?mydata='+encodeURIComponent(JSON.stringify(params))
url:'/subPackage/productDetails/productDetails?mydata='+encodeURIComponent(JSON.stringify(params))
})
},
toupperTop(e){
......
pages/productDetails/productDetails.vue → subPackage/productDetails/productDetails.vue
View file @ dfee72cb
......@@ -144,7 +144,7 @@
this.toast('商品数量不能为0')
return false
}
this.Go('uni:/pages/detailResult/detailResult','redirect')
this.Go('uni:/subPackage/detailResult/detailResult','redirect')
}
},
Gopurse(){
......
pages/prolist/prolist.vue → subPackage/prolist/prolist.vue
View file @ dfee72cb
......@@ -31,7 +31,7 @@
url:item.protocolUrl
}
uni.navigateTo({
url: '/pages/webview/webview?mydata=' + encodeURIComponent(JSON.stringify(parmas))
url: '/subPackage/webview/webview?mydata=' + encodeURIComponent(JSON.stringify(parmas))
})
}
},
......
pages/recruit/index.vue → subPackage/recruit/index.vue
View file @ dfee72cb
......@@ -58,7 +58,7 @@
console.log(params,'params')
self.$request('/pawn/recruit/add','POST',params).then(res => {
console.log(res,'add');
self.Go('uni:/pages/recruitResult/index','redirect')
self.Go('uni:/subPackage/recruitResult/index','redirect')
}).catch(err=>{
console.log(err,'请求出错')
})
......
pages/setting/setting.vue → subPackage/setting/setting.vue
View file @ dfee72cb
......@@ -132,7 +132,7 @@
},
getProtol(){
uni.navigateTo({
url:'/pages/prolist/prolist?mydata='+encodeURIComponent(JSON.stringify(this.protocolList))
url:'/subPackage/prolist/prolist?mydata='+encodeURIComponent(JSON.stringify(this.protocolList))
})
},
goCancel(){
......
utils/index.js
View file @ dfee72cb
......@@ -78,14 +78,14 @@ export const switchShowTabbar = async () => {
}
//获取h5url地址信息
export const initSettings = async () => {
export const initH5Setting = async () => {
const globalData = {
WebUrl: config['h5'],
H5: null,
APP: null
}
try {
const { success, result } = await API.initSettings()
const { success, result } = await API.initH5Settings()
if (success) {
globalData.H5 = result
uni.setStorageSync('H5-SETTING', JSON.stringify(result))
......@@ -96,17 +96,19 @@ export const initSettings = async () => {
}
//获取客服电话贷超
export const initApp = async () => {
export const initAPPSetting = async () => {
const globalData = {
WebUrl: config['h5'],
H5: null,
APP: null
}
try {
const { success, result } = await API.initApp()
const { success, result } = await API.initAPPSettings()
if (success) {
globalData.APP = result
uni.setStorageSync('APP-SETTING', JSON.stringify(result))
// 预加载H5
if (result && result['h5Url']) plus.webview.prefetchURL(result['h5Url']);
}
} catch (err) {
console.log(err, '初始化APP配置报错')
......
utils/request.js
View file @ dfee72cb
......@@ -12,9 +12,13 @@ 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);
uni.request({
url: baseUrl + url,
method: type,
......@@ -29,9 +33,11 @@ const request = async (url, type, data) => {
Author: token, //多典花
},
success: (res) => {
// #ifdef APP
console.log('------------')
console.log(`${url}`, '接口地址')
console.log(`${baseUrl}${url}`, '接口地址')
console.log($data, '接口参数')
if (res.data.result) console.log(res.data.result, '返回内容')
else console.log(res.data, '返回内容')
console.log('------------')
......
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