商户引导页面bug修复
This commit is contained in:
parent
bff1ced9fd
commit
faa9e290b1
@ -3,8 +3,7 @@
|
|||||||
<view v-if="newData.status && newData.status.status" style="height: 100rpx;"></view>
|
<view v-if="newData.status && newData.status.status" style="height: 100rpx;"></view>
|
||||||
<view class="foot" v-if="newData.status && newData.status.status">
|
<view class="foot" v-if="newData.status && newData.status.status">
|
||||||
<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
|
<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
|
||||||
<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
|
<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
|
||||||
@click="goRouter(item)">
|
|
||||||
<block v-if="item.link == activeRouter">
|
<block v-if="item.link == activeRouter">
|
||||||
<image :src="item.imgList[0]"></image>
|
<image :src="item.imgList[0]"></image>
|
||||||
<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
|
<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
|
||||||
@ -65,7 +64,6 @@
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@ -85,9 +83,11 @@
|
|||||||
box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
|
box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
|
||||||
padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
|
padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
|
||||||
padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
|
padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
|
||||||
|
|
||||||
&.filter {
|
&.filter {
|
||||||
filter: blur(2rpx);
|
filter: blur(2rpx);
|
||||||
}
|
}
|
||||||
|
|
||||||
.foot-item {
|
.foot-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
width: max-content;
|
width: max-content;
|
||||||
@ -95,6 +95,7 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.count-num {
|
.count-num {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -111,12 +112,14 @@
|
|||||||
padding: 4rpx;
|
padding: 4rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.foot-item image {
|
.foot-item image {
|
||||||
height: 50rpx;
|
height: 50rpx;
|
||||||
width: 50rpx;
|
width: 50rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.foot-item .txt {
|
.foot-item .txt {
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"name": "惠农生活",
|
"name": "惠农生活",
|
||||||
"appid": "__UNI__3A527D1",
|
"appid": "__UNI__3A527D1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"versionName" : "2.0.37",
|
"versionName": "2.0.60",
|
||||||
"versionCode": 2037,
|
"versionCode": 2037,
|
||||||
"transformPx": false,
|
"transformPx": false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
|
31
pages.json
31
pages.json
@ -19,7 +19,19 @@
|
|||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
// #endif
|
// #endif
|
||||||
"app-plus": {
|
"app-plus": {
|
||||||
"scrollIndicator": false //禁用原生导航栏
|
"scrollIndicator": false, //禁用原生导航栏
|
||||||
|
"subNVues": [{
|
||||||
|
"id": "concatIndex", // 唯一标识
|
||||||
|
"path": "pages/index/subnvue/concat", // 页面路径
|
||||||
|
"type": "popup",
|
||||||
|
"style": {
|
||||||
|
"position": "absolute",
|
||||||
|
"dock": "right",
|
||||||
|
"width": "750rpx",
|
||||||
|
"height": "1000px",
|
||||||
|
"background": "rgba(0,0,0,0.2)"
|
||||||
|
}
|
||||||
|
}]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
@ -34,7 +46,22 @@
|
|||||||
"style": {
|
"style": {
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"navigationBarTitleText": "工作台",
|
"navigationBarTitleText": "工作台",
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom",
|
||||||
|
"app-plus": {
|
||||||
|
"scrollIndicator": false, //禁用原生导航栏
|
||||||
|
"subNVues": [{
|
||||||
|
"id": "concat", // 唯一标识
|
||||||
|
"path": "pages/gather/subnvue/concat", // 页面路径
|
||||||
|
"type": "popup",
|
||||||
|
"style": {
|
||||||
|
"position": "absolute",
|
||||||
|
"dock": "right",
|
||||||
|
"width": "750rpx",
|
||||||
|
"height": "1500rpx",
|
||||||
|
"background": "rgba(0,0,0,0.2)"
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"path": "pages/order_addcart/order_addcart",
|
"path": "pages/order_addcart/order_addcart",
|
||||||
|
BIN
static/images/diverPointer.png
Normal file
BIN
static/images/diverPointer.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
static/images/greenLine.png
Normal file
BIN
static/images/greenLine.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.2 KiB |
BIN
static/images/greenLineDown.png
Normal file
BIN
static/images/greenLineDown.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.2 KiB |
BIN
static/images/pointer.png
Normal file
BIN
static/images/pointer.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
BIN
static/images/tabSc.png
Normal file
BIN
static/images/tabSc.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
@ -19,7 +19,9 @@ import {
|
|||||||
import Cache from '../../utils/cache';
|
import Cache from '../../utils/cache';
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
import Updater from '@/uni_modules/guyue-updater/index';
|
import Updater from '@/uni_modules/guyue-updater/index';
|
||||||
import { Toast } from "../../libs/uniApi.js";
|
import {
|
||||||
|
Toast
|
||||||
|
} from "../../libs/uniApi.js";
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
|
|
||||||
@ -28,14 +30,16 @@ const state = {
|
|||||||
token: Cache.get(LOGIN_STATUS) || null,
|
token: Cache.get(LOGIN_STATUS) || null,
|
||||||
uuid: uni.getStorageSync('uuid') || "",
|
uuid: uni.getStorageSync('uuid') || "",
|
||||||
backgroundColor: "#fff",
|
backgroundColor: "#fff",
|
||||||
userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get('USER_INFO'))||{},
|
userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get(
|
||||||
|
'USER_INFO')) || {},
|
||||||
uid: Cache.get(UID) || null,
|
uid: Cache.get(UID) || null,
|
||||||
globalData: uni.getStorageSync('GLOBAL_DATA') || {},
|
globalData: uni.getStorageSync('GLOBAL_DATA') || {},
|
||||||
homeActive: false,
|
homeActive: false,
|
||||||
copyPwd: null,
|
copyPwd: null,
|
||||||
pageFooter: uni.getStorageSync('pageFoot') || {},
|
pageFooter: uni.getStorageSync('pageFoot') || {},
|
||||||
keyColor: Cache.get('KEY_COLOR') || '_default',
|
keyColor: Cache.get('KEY_COLOR') || '_default',
|
||||||
viewColor: Cache.get('VIEW_COLOR') || '--view-theme: #E93323;--view-assist:#FF7612;--view-priceColor:#E93323;--view-bgColor:rgba(255, 118, 18,.1);--view-minorColor:rgba(233, 51, 35,.1);--view-bntColor11:#FDA923;--view-bntColor12:#FD6523;--view-bntColor21:#F11B09;--view-bntColor22:#F67A38;',
|
viewColor: Cache.get('VIEW_COLOR') ||
|
||||||
|
'--view-theme: #E93323;--view-assist:#FF7612;--view-priceColor:#E93323;--view-bgColor:rgba(255, 118, 18,.1);--view-minorColor:rgba(233, 51, 35,.1);--view-bntColor11:#FDA923;--view-bntColor12:#FD6523;--view-bntColor21:#F11B09;--view-bntColor22:#F67A38;',
|
||||||
};
|
};
|
||||||
|
|
||||||
const mutations = {
|
const mutations = {
|
||||||
@ -141,17 +145,17 @@ const actions = {
|
|||||||
} else {
|
} else {
|
||||||
apptype = 1
|
apptype = 1
|
||||||
}
|
}
|
||||||
console.log({
|
// console.log({
|
||||||
version: os.appWgtVersion,
|
// version: os.appWgtVersion,
|
||||||
type: apptype,
|
// type: apptype,
|
||||||
phone_brand:os.brand
|
// phone_brand:os.brand
|
||||||
});
|
// });
|
||||||
Appversion({
|
Appversion({
|
||||||
version: os.appWgtVersion,
|
version: os.appWgtVersion,
|
||||||
type: apptype,
|
type: apptype,
|
||||||
phone_brand: os.brand
|
phone_brand: os.brand
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
console.log(res);
|
// console.log(res);
|
||||||
if (data) uni.hideLoading()
|
if (data) uni.hideLoading()
|
||||||
if (Object.keys(res.data.appInfo).length > 0) {
|
if (Object.keys(res.data.appInfo).length > 0) {
|
||||||
// if(res.data.appInfo.version) uni.showLoading({
|
// if(res.data.appInfo.version) uni.showLoading({
|
||||||
@ -176,8 +180,7 @@ const actions = {
|
|||||||
Toast(e)
|
Toast(e)
|
||||||
}
|
}
|
||||||
// uni.hideLoading();
|
// uni.hideLoading();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
if (data) Toast('已经是最新版本了')
|
if (data) Toast('已经是最新版本了')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user