Skip to content

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

优化APP11-15

parent 6af81378
Expand all Hide 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: {
......@@ -9,22 +9,28 @@ export default {
},
onLaunch: async function () {
// #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
......@@ -31,4 +31,6 @@ APP当中的资源文件在【远益典当】账户的OSS里面
参考：
- [uniapp 全局数据（globalData）的设置，获取，更改](https://blog.csdn.net/qq_37128634/article/details/106059230)
- [UNIAPP 吸顶功能](https://blog.csdn.net/weixin_46371234/article/details/120202491)
\ No newline at end of file
- [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",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": ""
}
},
{
"path": "pages/index/index",
"style": {
"enablePullDownRefresh": false,
"enablePullDownRefresh": true,
"navigationStyle": "custom",
"app-plus": {
"bounce": "none"
}
}
},
{
"path": "pages/sort/index",
"style": {
"navigationBarTitleText": "款式"
}
},
{
"path": "pages/my/index",
"style": {
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
"path": "pages/recruit/index",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "鉴定师招聘"
}
},
{
"path": "pages/recruitResult/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/category/category",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "选择鉴定品类"
}
},
{
"path": "pages/application/application",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我的鉴定申请"
}
},
{
"path": "pages/myneed/myneed",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要的"
}
},
{
"path": "pages/Ineed/Ineed",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要"
}
},
{
"path": "pages/productDetails/productDetails",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "商品详情"
}
},
{
"path": "pages/detailResult/detailResult",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/useFeed/useFeed",
"path": "pages/agreement/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationBarTitleText": "用户反馈"
"app-plus": {
"bounce": "none",
"animationType": "fade-in",
"background": "transparent",
"backgroundColor": "rgba(0,0,0,0)",
"webviewBGTransparent": true,
"mask": "none",
"popGesture": "none"
}
}
},
{
"path": "pages/lookGoods/lookGoods",
"path": "pages/starPage/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"navigationBarTitleText": ""
}
},
......@@ -126,17 +58,19 @@
}
}
},
{
"path": "pages/prolist/prolist",
"path": "pages/sort/index",
"style": {
"navigationBarTitleText": "相关协议"
"navigationBarTitleText": "款式"
}
},
{
"path": "pages/setting/setting",
"path": "pages/my/index",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "设置"
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
{
......@@ -160,20 +94,6 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/webview/webview",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
},
{
"path": "pages/websrc/websrc",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/web/web",
"style": {
......@@ -206,54 +126,6 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/bill/indexs",
"style": {
"navigationBarTitleText": "账单"
}
},
{
"path": "pages/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"
}
}
},
{
"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": "uni_modules/uni-frv-external/pages/common/webview/webview",
"style": {
......@@ -262,6 +134,124 @@
}
}
],
"subPackages": [
{
"root": "subPackage",
"pages": [
{
"path": "recruit/index",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "鉴定师招聘"
}
},
{
"path": "recruitResult/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "category/category",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "选择鉴定品类"
}
},
{
"path": "application/application",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我的鉴定申请"
}
},
{
"path": "myneed/myneed",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要的"
}
},
{
"path": "Ineed/Ineed",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "我需要"
}
},
{
"path": "productDetails/productDetails",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "商品详情"
}
},
{
"path": "detailResult/detailResult",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "useFeed/useFeed",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "用户反馈"
}
},
{
"path": "lookGoods/lookGoods",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
},
{
"path": "prolist/prolist",
"style": {
"navigationBarTitleText": "相关协议"
}
},
{
"path": "setting/setting",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "设置"
}
},
{
"path": "webview/webview",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
},
{
"path": "finance/index",
"style": {
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
}
]
}
],
"preloadRule": {
"pages/starPage/index": {
"network": "all",
"packages": ["__APP__"]
},
"pages/index/index": {
"network": "all",
"packages": ["subPackage"]
}
},
"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
This diff is collapsed.
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
This diff is collapsed.
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,25 +179,45 @@ 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
uni.getSystemInfo({
success: (res) => {
const query = uni.createSelectorQuery().in(this);
query.select("#box").boundingClientRect((data) => {
_this.Topdistance = data.top
query.select("#box").boundingClientRect((data) => {
_this.Topdistance = data.top
}).exec();
},
......@@ -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
......@@ -2,8 +2,8 @@
<script>
export default {
async onLoad() {
const appStart = uni.getStorageSync('appStart')
async onLoad() {
const appStart = uni.getStorageSync('appStart')
if (appStart) {
uni.switchTab({
url: "/pages/index/index"
......@@ -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
......@@ -132,11 +132,13 @@
text-transform: none;
}
.login-footer {
margin-top: 25rpx;
.login-footer {
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,38 +63,49 @@ export default {
// #endif
},
onTabItemTap(e) {
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' })`)
try {
console.log(e, 'tabItemTap')
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) {
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
try {
this.subnvue_open();
console.log(option, '入参')
const that = this;
const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
this.src = config['h5Url']
console.log(config['h5Url'], 'H5地址')
uni.getStorage({
key: 'm-device-info',
success: function (res) {
const { device } = JSON.parse(res.data)
that.deviceStatus = device
}
})
} catch (err) {
console.log(err, 'onLoad执行报错')
}
uni.getStorage({
key: 'm-device-info',
success: function (res) {
const { device } = JSON.parse(res.data)
that.deviceStatus = device
}
})
},
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));
},
......@@ -130,15 +142,12 @@ export default {
}, 400)
}
},
onUnload() {
},
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
......@@ -5,16 +5,20 @@ const request = async (url, type, data) => {
// 这里确保一定是可以获取得到的
const headerDevice = uni.getStorageSync('m-header-device')
let rd
if (headerDevice) {
if (headerDevice) {
rd = encodeURIComponent(headerDevice)
} else {
rd = JSON.stringify(initHeaderDevice())
}
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