Skip to content

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

删除init页面，逻辑判断放到APP里面，启动页手动关闭

parent c361858c
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 67 deletions
.DS_Store
View file @ cfe6acc9
No preview for this file type
App.vue
View file @ cfe6acc9
...@@ -24,6 +24,24 @@ export default { ...@@ -24,6 +24,24 @@ export default {
// }, 4000); // }, 4000);
// #endif // #endif
const appStart = uni.getStorageSync('appStart')
if (appStart) {
uni.switchTab({
url: "/pages/index/index",
success: function () {
plus.navigator.closeSplashscreen()
}
})
} else {
uni.redirectTo({
url: "/pages/starPage/index",
success: function () {
plus.navigator.closeSplashscreen()
}
})
}
// 强制竖屏 // 强制竖屏
......
components/showModal/upgradePopup.vue
View file @ cfe6acc9
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<view> <view>
<!-- 遮罩滚动锁定组件 --> <!-- 遮罩滚动锁定组件 -->
<page-meta :page-style="'overflow:' + (popupShow ? 'hidden' : 'visible')"></page-meta> <page-meta :page-style="'overflow:' + (popupShow ? 'hidden' : 'visible')"></page-meta>
<uni-popup ref="upgradePopup" background-color="#fff" class="upgradePopup" @change="upgradePopupChange" :mask-click="false"> <uni-popup ref="upgradePopup" background-color="#fff" class="upgradePopup" @change="upgradePopupChange"
:mask-click="false">
<view class="rocket-content"> <view class="rocket-content">
<view class="rocket-img"></view> <view class="rocket-img"></view>
...@@ -14,7 +15,8 @@ ...@@ -14,7 +15,8 @@
<view class="title"> <view class="title">
<!-- 更新内容 --> <!-- 更新内容 -->
<scroll-view class="info_desc_scroll" scroll-y="true"> <scroll-view class="info_desc_scroll" scroll-y="true">
<rich-text v-if="appUpgeadeObj.content" class='scroll-text' :nodes="appUpgeadeObj.content"></rich-text> <rich-text v-if="appUpgeadeObj.content" class='scroll-text'
:nodes="appUpgeadeObj.content"></rich-text>
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
...@@ -134,11 +136,11 @@ export default { ...@@ -134,11 +136,11 @@ export default {
url: that.appUpgeadeObj.downloadUrl, url: that.appUpgeadeObj.downloadUrl,
success: (downloadResult) => { success: (downloadResult) => {
if (downloadResult.statusCode === 200) { if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult plus.runtime.install(downloadResult.tempFilePath, {
.tempFilePath, {
force: false force: false
}, },
function () { function () {
console.log('日日')
plus.cache.clear(); plus.cache.clear();
plus.runtime.restart(); plus.runtime.restart();
}, },
......
config/api.js
View file @ cfe6acc9
...@@ -12,7 +12,7 @@ const BASE = { ...@@ -12,7 +12,7 @@ const BASE = {
stest: { stest: {
common: "http://portal.cloudsmake.cn", common: "http://portal.cloudsmake.cn",
event: 'http://118.31.124.88:21111', event: 'http://118.31.124.88:21111',
h5: 'http://ddang-h5-s.rockstect.cn/index.html#/' h5: 'http://ddang-h5-s.rockstect.cn/index.html'
}, },
gray: { gray: {
common: "https://api.yyhock.com", common: "https://api.yyhock.com",
...@@ -38,7 +38,7 @@ let env = process.env.VUE_APP_BASE_NODE_ENV ...@@ -38,7 +38,7 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
*/ */
// #ifdef APP-PLUS // #ifdef APP-PLUS
env = "stest"; env = "prod";
// #endif // #endif
const api = { const api = {
......
manifest.json
View file @ cfe6acc9
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name" : "多典花", "name" : "多典花",
"appid" : "__UNI__DE04B13", "appid" : "__UNI__DE04B13",
"description" : "", "description" : "",
"versionName" : "1.0.5", "versionName" : "1.0.7",
"versionCode" : 105, "versionCode" : 107,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
...@@ -90,6 +90,14 @@ ...@@ -90,6 +90,14 @@
"appkey_ios" : "219171ea69d16fa01856326bfce37395", "appkey_ios" : "219171ea69d16fa01856326bfce37395",
"appkey_android" : "d5eb8009720b7ef9e540d1869d3c5f15" "appkey_android" : "d5eb8009720b7ef9e540d1869d3c5f15"
} }
},
"statics" : {
"umeng" : {
"appkey_ios" : "674540e18f232a05f1bd67f7",
"channelid_ios" : "umeng",
"appkey_android" : "674540537e5e6a4eeba22a3c",
"channelid_android" : "umeng"
}
} }
}, },
"icons" : { "icons" : {
...@@ -126,22 +134,22 @@ ...@@ -126,22 +134,22 @@
}, },
"splashscreen" : { "splashscreen" : {
"useOriginalMsgbox" : false, "useOriginalMsgbox" : false,
"androidStyle" : "common", "androidStyle" : "default",
"iosStyle" : "storyboard", "iosStyle" : "storyboard",
"ios" : { "ios" : {
"storyboard" : "CustomStoryboard.zip" "storyboard" : "CustomStoryboard.zip"
}, },
"android" : { "android" : {
"hdpi" : "static/res/1125x2436.9.png", "hdpi" : "s.9.png",
"xhdpi" : "static/res/1125x2436.9.png", "xhdpi" : "s.9.png",
"xxhdpi" : "static/res/1125x2436.9.png" "xxhdpi" : "s.9.png"
} }
} }
}, },
"splashscreen" : { "splashscreen" : {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender" : false,
"waiting" : true, "waiting" : true,
"autoclose" : true, "autoclose" : false,
"delay" : 0 "delay" : 0
}, },
"compatible" : { "compatible" : {
...@@ -153,7 +161,8 @@ ...@@ -153,7 +161,8 @@
"Geolocation" : {}, "Geolocation" : {},
"Contacts" : {}, "Contacts" : {},
"Barcode" : {}, "Barcode" : {},
"FacialRecognitionVerify" : {} "FacialRecognitionVerify" : {},
"Statistic" : {}
}, },
"nativePlugins" : { "nativePlugins" : {
"AThree-LFv2" : { "AThree-LFv2" : {
......
pages.json
View file @ cfe6acc9
{ {
"pages": [ "pages": [
{
"path": "pages/init/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"app-plus": {
"bounce": "none",
"animationType": "none"
}
}
},
{ {
"path": "pages/index/index", "path": "pages/index/index",
...@@ -22,7 +12,6 @@ ...@@ -22,7 +12,6 @@
} }
} }
}, },
{ {
"path": "pages/agreement/index", "path": "pages/agreement/index",
"style": { "style": {
......
pages/agreement/index.vue
View file @ cfe6acc9
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
</view> </view>
<view> <view>
<text>为了加强对您个人信息的保护，根据最新法律法规要求，我们更新了隐私政策，请您仔细阅读并确认</text> <text>为了加强对您个人信息的保护，根据最新法律法规要求，我们更新了隐私政策，请您仔细阅读并确认</text>
<text @click="Go(protocols)" style="color: #3877F8">“隐私相关政策”</text> <uni-link :href="protocols.protocolUrl" style="color: #3877F8">“隐私相关政策”</uni-link>
<text>及</text> <text>及</text>
<text @click="Go(protocolf)" style="color: #3877F8">“用户注册协议”</text> <uni-link :href="protocolf.protocolUrl" style="color: #3877F8">“用户注册协议”</uni-link>
<text>我们将严格按照政策内容使用和保护您的个人信息，为您提供更好的服务，感谢您的信任。</text> <text>我们将严格按照政策内容使用和保护您的个人信息，为您提供更好的服务，感谢您的信任。</text>
</view> </view>
</scroll-view> </scroll-view>
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
async init() { async init() {
const self = this const self = this
self.$request('/pawn/setting', 'GET').then(res => { self.$request('/pawn/setting', 'GET').then(res => {
const { protocol, phone } = res.result const { protocol } = res.result
if (protocol) { if (protocol) {
const protocolList = JSON.parse(protocol) const protocolList = JSON.parse(protocol)
protocolList.map((item) => { protocolList.map((item) => {
......
pages/index/index.vue
View file @ cfe6acc9
...@@ -107,7 +107,7 @@ import { isLogin, switchShowTabbar } from '@/utils/index' ...@@ -107,7 +107,7 @@ import { isLogin, switchShowTabbar } from '@/utils/index'
const cacheIndexData = uni.getStorageSync('dataIndex') ? JSON.parse(uni.getStorageSync('dataIndex')) : null; const cacheIndexData = uni.getStorageSync('dataIndex') ? JSON.parse(uni.getStorageSync('dataIndex')) : null;
const indexGoods = uni.getStorageSync('indexGoods') ? JSON.parse(uni.getStorageSync('indexGoods')) : []; const indexGoods = uni.getStorageSync('indexGoods') ? JSON.parse(uni.getStorageSync('indexGoods')) : [];
console.log(cacheIndexData,'日') console.log(cacheIndexData, '日')
export default { export default {
data() { data() {
...@@ -166,22 +166,24 @@ export default { ...@@ -166,22 +166,24 @@ export default {
switchShowTabbar() switchShowTabbar()
// 初始化首页数据 // 初始化首页数据
await this.checkAppVersion() await this.checkAppVersion()
},
async onShow() {
const that = this;
// 设置页面滚动条位置 // 设置页面滚动条位置
uni.pageScrollTo({ uni.pageScrollTo({
scrollTop: 0, scrollTop: 0,
duration: 0 duration: 0
}) })
setTimeout(() => { setTimeout(() => {
this.GetTop() // 获取元素距离顶部的距离 that.GetTop() // 获取元素距离顶部的距离
}, 1000) }, 1000)
},
async onShow() {
// 初始化首页数据 // 初始化首页数据
await this.init() await this.init()
await this.initGoods(); await this.initGoods();
// 首页流量埋点 // 首页流量埋点
this.buryingPoint('app:index_page_view') this.buryingPoint('app:index_page_view')
}, },
...@@ -202,7 +204,7 @@ export default { ...@@ -202,7 +204,7 @@ export default {
try { try {
const res = await API.initIndex() const res = await API.initIndex()
if (res.success) { if (res.success) {
const data =res.result; const data = res.result;
this.index = data; this.index = data;
uni.setStorageSync('dataIndex', JSON.stringify(data)) uni.setStorageSync('dataIndex', JSON.stringify(data))
} }
...@@ -217,7 +219,7 @@ export default { ...@@ -217,7 +219,7 @@ export default {
success: () => { success: () => {
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query.select("#box").boundingClientRect((data) => { query.select("#box").boundingClientRect((data) => {
_this.Topdistance = data.top _this.Topdistance = data && data.top
}).exec(); }).exec();
} }
......
pages/init/index.nvue deleted 100644 → 0
View file @ c361858c
<template></template>
<script>
export default {
async onLoad() {
const appStart = uni.getStorageSync('appStart')
if (appStart) {
uni.switchTab({
url: "/pages/index/index"
})
} else {
uni.redirectTo({
url: "/pages/starPage/index"
})
}
},
}
</script>
pages/login/login.vue
View file @ cfe6acc9
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
} }
}, },
onShow() { onShow() {
switchShowTabbar()
this.init() this.init()
this.buryingPoint('app:login_pageView') this.buryingPoint('app:login_pageView')
}, },
...@@ -71,7 +72,6 @@ ...@@ -71,7 +72,6 @@
} else { } else {
this.Back() this.Back()
} }
}, },
// 预加载 // 预加载
initPreloadH5() { initPreloadH5() {
......
pages/my/index.vue
View file @ cfe6acc9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view class='my-header'> <view class='my-header'>
<image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image> <image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image>
<view class='header-des'> <view class='header-des'>
<view class='des-name' v-if="isLogin">{{ mobile }}</view> <view class='des-name' v-if="isLogin">{{ mineData['user']['cell'] }}</view>
<view class='des-name' v-else @click='GoLogin'>注册/登录</view> <view class='des-name' v-else @click='GoLogin'>注册/登录</view>
<view class='des-text'>多典花承诺保护您的信息安全</view> <view class='des-text'>多典花承诺保护您的信息安全</view>
</view> </view>
...@@ -77,7 +77,6 @@ export default { ...@@ -77,7 +77,6 @@ export default {
return { return {
isLogin: false, isLogin: false,
loanSwitch: false, loanSwitch: false,
mobile: '',
mineData: $mineData mineData: $mineData
} }
...@@ -85,11 +84,10 @@ export default { ...@@ -85,11 +84,10 @@ export default {
onShow() { onShow() {
const token = uni.getStorageSync('token') const token = uni.getStorageSync('token')
const loanSwitch = uni.getStorageSync('loanSwitch') const loanSwitch = uni.getStorageSync('loanSwitch')
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : ''
this.isLogin = token ? true : false this.isLogin = token ? true : false
this.loanSwitch = loanSwitch ? true : false this.loanSwitch = loanSwitch ? true : false
this.mobile = mobile;
this.initMine() this.initMine()
// 显示隐藏tabBar // 显示隐藏tabBar
......
pages/web/web.vue
View file @ cfe6acc9
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
const mobile = uni.getStorageSync('l-mobile') const mobile = uni.getStorageSync('l-mobile')
const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}` const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}`
console.log($src,'刷新的地址') console.log($src,'刷新的地址')
// that.src = $src that.src = $src
}, 100); }, 100);
} catch (err) { } catch (err) {
console.log(err) console.log(err)
......
s.9.png 0 → 100644
View file @ cfe6acc9
This diff is collapsed.
splash.9.png deleted 100644 → 0
View file @ c361858c
This diff is collapsed.
subPackage/setting/index.less
View file @ cfe6acc9
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
margin-top: -270rpx; margin-top: -270rpx;
background-color: white; background-color: white;
z-index: 1002; z-index: 1002;
overflow: auto; overflow: hidden;
// display: flex; // display: flex;
// flex-direction: column; // flex-direction: column;
......
utils/request.js
View file @ cfe6acc9
...@@ -49,7 +49,8 @@ const request = async (url, type, data) => { ...@@ -49,7 +49,8 @@ const request = async (url, type, data) => {
return resolve(data) return resolve(data)
} else { } else {
if (data.code === '403') { if (data.code === '403') {
uni.clearStorageSync(); uni.removeStorageSync('token');
uni.removeStorageSync('tokenFinance');
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ uni.redirectTo({
url: "/pages/login/login" url: "/pages/login/login"
......
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