Skip to content

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

优化部分页面

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