Skip to content

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

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

parent c361858c
Hide 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 {
// }, 4000);
// #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 @@
<view>
<!-- 遮罩滚动锁定组件 -->
<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-img"></view>
......@@ -14,7 +15,8 @@
<view class="title">
<!-- 更新内容 -->
<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>
</view>
</view>
......@@ -31,12 +33,12 @@
<button v-show='appUpgeadeObj.type == "IOS"' class="updated-button" type="warn"
@tap.stop="upgradeNow">立即升级</button>
</view>
<view v-if="progressBolean" class="progress-bar">
<progress border-radius="90" font-size="24" activeColor="#DB4032" backgroundColor="#f0f0f0" show-info
:percent="progressData.percent" stroke-width="15" />
</view>
</uni-popup>
</view>
</template>
......@@ -134,11 +136,11 @@ export default {
url: that.appUpgeadeObj.downloadUrl,
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
plus.runtime.install(downloadResult
.tempFilePath, {
plus.runtime.install(downloadResult.tempFilePath, {
force: false
},
function () {
console.log('日日')
plus.cache.clear();
plus.runtime.restart();
},
......
config/api.js
View file @ cfe6acc9
......@@ -12,7 +12,7 @@ const BASE = {
stest: {
common: "http://portal.cloudsmake.cn",
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: {
common: "https://api.yyhock.com",
......@@ -38,7 +38,7 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
*/
// #ifdef APP-PLUS
env = "stest";
env = "prod";
// #endif
const api = {
......
manifest.json
View file @ cfe6acc9
......@@ -2,8 +2,8 @@
"name" : "多典花",
"appid" : "__UNI__DE04B13",
"description" : "",
"versionName" : "1.0.5",
"versionCode" : 105,
"versionName" : "1.0.7",
"versionCode" : 107,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......@@ -90,6 +90,14 @@
"appkey_ios" : "219171ea69d16fa01856326bfce37395",
"appkey_android" : "d5eb8009720b7ef9e540d1869d3c5f15"
}
},
"statics" : {
"umeng" : {
"appkey_ios" : "674540e18f232a05f1bd67f7",
"channelid_ios" : "umeng",
"appkey_android" : "674540537e5e6a4eeba22a3c",
"channelid_android" : "umeng"
}
}
},
"icons" : {
......@@ -126,22 +134,22 @@
},
"splashscreen" : {
"useOriginalMsgbox" : false,
"androidStyle" : "common",
"androidStyle" : "default",
"iosStyle" : "storyboard",
"ios" : {
"storyboard" : "CustomStoryboard.zip"
},
"android" : {
"hdpi" : "static/res/1125x2436.9.png",
"xhdpi" : "static/res/1125x2436.9.png",
"xxhdpi" : "static/res/1125x2436.9.png"
"hdpi" : "s.9.png",
"xhdpi" : "s.9.png",
"xxhdpi" : "s.9.png"
}
}
},
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"alwaysShowBeforeRender" : false,
"waiting" : true,
"autoclose" : true,
"autoclose" : false,
"delay" : 0
},
"compatible" : {
......@@ -153,7 +161,8 @@
"Geolocation" : {},
"Contacts" : {},
"Barcode" : {},
"FacialRecognitionVerify" : {}
"FacialRecognitionVerify" : {},
"Statistic" : {}
},
"nativePlugins" : {
"AThree-LFv2" : {
......
pages.json
View file @ cfe6acc9
{
"pages": [
{
"path": "pages/init/index",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"app-plus": {
"bounce": "none",
"animationType": "none"
}
}
},
{
"path": "pages/index/index",
......@@ -22,7 +12,6 @@
}
}
},
{
"path": "pages/agreement/index",
"style": {
......
pages/agreement/index.vue
View file @ cfe6acc9
......@@ -11,9 +11,9 @@
</view>
<view>
<text>为了加强对您个人信息的保护，根据最新法律法规要求，我们更新了隐私政策，请您仔细阅读并确认</text>
<text @click="Go(protocols)" style="color: #3877F8">“隐私相关政策”</text>
<uni-link :href="protocols.protocolUrl" style="color: #3877F8">“隐私相关政策”</uni-link>
<text>及</text>
<text @click="Go(protocolf)" style="color: #3877F8">“用户注册协议”</text>
<uni-link :href="protocolf.protocolUrl" style="color: #3877F8">“用户注册协议”</uni-link>
<text>我们将严格按照政策内容使用和保护您的个人信息，为您提供更好的服务，感谢您的信任。</text>
</view>
</scroll-view>
......@@ -84,7 +84,7 @@ export default {
async init() {
const self = this
self.$request('/pawn/setting', 'GET').then(res => {
const { protocol, phone } = res.result
const { protocol } = res.result
if (protocol) {
const protocolList = JSON.parse(protocol)
protocolList.map((item) => {
......
pages/index/index.vue
View file @ cfe6acc9
......@@ -107,7 +107,7 @@ 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,'日')
console.log(cacheIndexData, '日')
export default {
data() {
......@@ -166,22 +166,24 @@ export default {
switchShowTabbar()
// 初始化首页数据
await this.checkAppVersion()
},
async onShow() {
const that = this;
// 设置页面滚动条位置
uni.pageScrollTo({
scrollTop: 0,
duration: 0
})
setTimeout(() => {
this.GetTop() // 获取元素距离顶部的距离
that.GetTop() // 获取元素距离顶部的距离
}, 1000)
},
async onShow() {
// 初始化首页数据
await this.init()
await this.initGoods();
// 首页流量埋点
this.buryingPoint('app:index_page_view')
},
......@@ -202,7 +204,7 @@ export default {
try {
const res = await API.initIndex()
if (res.success) {
const data =res.result;
const data = res.result;
this.index = data;
uni.setStorageSync('dataIndex', JSON.stringify(data))
}
......@@ -216,8 +218,8 @@ export default {
uni.getSystemInfo({
success: () => {
const query = uni.createSelectorQuery().in(this);
query.select("#box").boundingClientRect((data) => {
_this.Topdistance = data.top
query.select("#box").boundingClientRect((data) => {
_this.Topdistance = data && data.top
}).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 @@
}
},
onShow() {
switchShowTabbar()
this.init()
this.buryingPoint('app:login_pageView')
},
......@@ -71,7 +72,6 @@
} else {
this.Back()
}
},
// 预加载
initPreloadH5() {
......
pages/my/index.vue
View file @ cfe6acc9
......@@ -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="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-text'>多典花承诺保护您的信息安全</view>
</view>
......@@ -77,7 +77,6 @@ export default {
return {
isLogin: false,
loanSwitch: false,
mobile: '',
mineData: $mineData
}
......@@ -85,11 +84,10 @@ export default {
onShow() {
const token = uni.getStorageSync('token')
const loanSwitch = uni.getStorageSync('loanSwitch')
const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : ''
this.isLogin = token ? true : false
this.loanSwitch = loanSwitch ? true : false
this.mobile = mobile;
this.initMine()
// 显示隐藏tabBar
......
pages/web/web.vue
View file @ cfe6acc9
......@@ -73,7 +73,7 @@ export default {
const mobile = uni.getStorageSync('l-mobile')
const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}`
console.log($src,'刷新的地址')
// that.src = $src
that.src = $src
}, 100);
} catch (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 @@
margin-top: -270rpx;
background-color: white;
z-index: 1002;
overflow: auto;
overflow: hidden;
// display: flex;
// flex-direction: column;
......
utils/request.js
View file @ cfe6acc9
......@@ -49,7 +49,8 @@ const request = async (url, type, data) => {
return resolve(data)
} else {
if (data.code === '403') {
uni.clearStorageSync();
uni.removeStorageSync('token');
uni.removeStorageSync('tokenFinance');
setTimeout(() => {
uni.redirectTo({
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