Skip to content

7
7-Eleven
Commit 051a4667 by 谢中龙
Options

优化部分页面

parent 28aeaecc
Showing with 44 additions and 31 deletions
src/component/bottomTabs/bottomTabs.wxss
......@@ -5,7 +5,7 @@
display: flex;
align-items: center;
justify-content: center;
border-top: solid 1rpx #eee;
border-top: solid 1rpx #dddddd;
}
.tab-img {
/* width: 70rpx;
......
src/component/personCenter/personCenter.wxml
<!--component/personCenter/personCenter.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<view wx:if='{{!currentMobile}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<view class="person-center-p">
<view wx:if='{{!currentMobile}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<image
wx:if="{{currentHasUserInfo}}"
src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}"
......@@ -18,13 +19,13 @@
>
<image src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}" class="no-active-img" mode="widthFix" />
</button>
</view>
<view
</view>
<view
wx:if='{{currentMobile}}'
catchtap="handleToMemberOfOwn"
class="activation-content activation-bg {{true ? 'user-content' : ''}}"
style="{{personData.backgroundImageUrl ? 'background-image: url('+ utils.formateUrl(personData.backgroundImageUrl,baseImgUrl) +');' : 'background-color: ' + baseUrl + ';'}}"
>
>
<view class='user-info' wx:if='{{currentMobile}}'>
<view class="user-avatar">
<view class="avator">
......@@ -51,8 +52,8 @@
<image class="qr-code-img" src='https://img3.bigaka.com/prd/3001/202003/20200309/3001b0c7b943-a805-4550-a179-8b963913b513.png' />
</view>
</view>
</view>
<view class='df tc person-num' wx:if='{{currentMobile}}'>
</view>
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
......@@ -65,6 +66,7 @@
<view class='point-number' style="color:{{personCenter.fontColor}};">{{valueCardNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">超值卡</view>
</view>
</view>
</view>
<!--plus-->
<!-- <view class='df tc person-num' wx:if='{{currentMobile}}'>
......
src/component/personCenter/personCenter.wxss
......@@ -2,6 +2,11 @@
/* @import './../../base/base.wxss'; */
@import "/app.wxss";
.person-center-p{
padding: 20rpx;
padding-top: 30rpx;
}
.user-content{
height: 92rpx;
padding: 28rpx 35rpx 0 50rpx;
......
src/config/index.js
......@@ -8,17 +8,18 @@
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 ：
//3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3
//2007 多多一上 , wxf7bc302c51166dc0
//3001 3001 , wx313ec36b710125d4 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播
//2007 多多一上 , wxf7bc302c51166dc0 有直播
//2012 悦芙媞 wxfe14ebde4a6eea3d 有直播
//2008 雪岛书屋 wx207f8a95bbc9d3ab
//2003 苏州邻里 , wxe7770946f9d93d38
//2012 悦芙媞 wxfe14ebde4a6eea3d
//2010 热风 wxe6d270a3e399ade9
//2009 拉如 wxa0db9cb42b1cbdc9
//2013 阿特里里
//2014 包鞋
//2015 花在花园
//2015 花在花园 wx8a35f9a57afd13e9
//2016 阿吉豆
//2017 ACTREE wx2aae34874e88cdf5
//2992 山东盛联微商城 wx53dedc202ae0d0c2
......@@ -53,7 +54,7 @@ const isMall = true
* tunnel-token = aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD
* brandId = 1002
*/
// 拥有直播功能的商户 3001 泰华 多多一上 悦芙提
/** ***********************************生产环境配置信息************************************ */
const prod_brand_config = {
//3001舞象
......@@ -112,7 +113,7 @@ const prod_brand_config = {
contactUsPluginId: '78353bb39251a60b473f3d4ae81b1c39',
hasTrial: false,
isMall: isMall,
hasLiveVideo: false,//是否有直播功能
hasLiveVideo: true,//是否有直播功能
orderingMustOpenCard: true,
canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮
isOpenSelfMention: false, // 是否开启门店自提
......@@ -213,7 +214,7 @@ const prod_brand_config = {
plusIsOpen: false,
contactUsIsOpen: true,
canUseWechatAddress: false,//是否使用获取微信地址
contactUsPluginId: 'e61babc802dd4d0d1e819130f7aa4bc5',
contactUsPluginId: '6d310b33ba27c784fb6872942a57711d',
hasTrial: false,
hasLiveVideo: true,//是否有直播功能
touchPointStorageTime: 30 * 60 * 1000,//单位毫秒
......@@ -268,26 +269,26 @@ const prod_brand_config = {
shareTitle: '【包鞋微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
},
//花在花园
//2015花在花园里
2015 : {
appId: '',
tunnelToken: 'fa2816369abd2726d18b2a0dd51736f4',
appId: 'wx8a35f9a57afd13e9',
tunnelToken: '50a322b1d197d6213a2bbe75016da3d9',
brandId: 2015,
plusIsOpen: false,
contactUsIsOpen: true,
contactUsIsOpen: false,
contactUsPluginId: '',
hasTrial: false,
isMall: isMall,
hasLiveVideo: false,//是否有直播功能
canUseWechatAddress: false,//是否使用获取微信地址
touchPointStorageTime: 30 * 60 * 1000,//单位毫秒
orderingMustOpenCard: false,
canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮
isOpenSelfMention: false, // 是否开启门店自提
hasLiveVideo : false,//是否有直播功能
guiderCanScanQrcode: true,//导购是否有扫一扫功能
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【花在花园微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
shareTitle: '【花在花园里~】',
logo: 'https://img3.bigaka.com/prd/3001/202004/20200410/30019e5121d1-5e2c-49b6-b807-1dbf1481b361.png',
},
//阿吉豆
2016: {
......@@ -375,7 +376,8 @@ const prod_brand_config = {
//要跳转的外部小程序appid
// "wxa006e9b0a0ee1bfe", 外卖
// "wx39b5d8891f375d1c" 礼品卡
}
},
}
//默认分享logo
......
src/pages/my/my.js
......@@ -273,7 +273,7 @@ wxService.page({
}
else {
this.setData({
paddingBottom: '40rpx'
paddingBottom: '0rpx'
})
}
}
......
src/pages/userCenter/userCenter.js
......@@ -329,7 +329,7 @@ wxService.page({
this.data.paddingBottom = '130rpx';
}
else{
this.data.paddingBottom = '40rpx';
this.data.paddingBottom = '0rpx';
}
this.setData({
......
src/subPackage/page/pages/subPage/subPage.js
......@@ -226,9 +226,11 @@ wxService.page({
// wxService.post(`/merchant/modelPage/mainSetting/mall?brandId=${app.globalData.brandId}`).then(res => {
if (!res) return false
const { result, data } = res.data
console.log(data.page.backgroundColor)
this.data.pageBackgroundColor = data.page.backgroundColor ? data.page.backgroundColor : 0;
if (result == 0) {
this.setData({
pageBackgroundColor: data.page.backgroundColor || 0
pageBackgroundColor: this.data.pageBackgroundColor
})
// 动态设置title
wx.setNavigationBarTitle({
......@@ -260,21 +262,22 @@ wxService.page({
let tabbar = products.filter(item => item.type == 5);
let plus = products.filter(item => item.type == 9);
console.log(this.data.outoHeigth)
if (plus.length != 0) {
this.setData({
paddingBottom: '96rpx',
outoHeigth : '0',
outoHeigth : 0,
})
}
else if (tabbar.length != 0) {
this.setData({
paddingBottom: '140rpx',
outoHeigth: '0',
paddingBottom: '130rpx',
outoHeigth: this.data.outoHeigth - 73,
})
}
else {
this.setData({
paddingBottom: '40rpx'
paddingBottom: '0rpx'
})
}
......
src/subPackage/page/pages/subPage/subPage.wxml
<!--subPackage/page/pages/subPage/subPage.wxml-->
<view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px">
<view class='user-center' style="background: {{pageBackgroundColor == 1? '#eeeeee': '#ffffff'}};min-height: {{outoHeigth}}px">
<!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
<!-- {{pages}} -->
<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
......
src/subPackage/page/pages/subPage/subPage.wxss
......@@ -5,6 +5,7 @@ page{
}
.bottom-fixed{
padding-bottom: 40rpx;
background: transparent;
}
.user-center{
box-sizing: border-box;
......
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