Skip to content

7
7-Eleven
Commit 0ef6c5c7 by 赵雅纹
Options

Merge branch 'dev_7.1.0' into feature-zyw-sc

parents 539872d4 7ea623ed
Showing with 99 additions and 25 deletions
src/component/bottomTabs/bottomTabs.wxml
<!--component/bottomTabs/bottomTabs.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<wxs src="./handlerData.wxs" module="tools" />
<view class='bgc fixed-bottom0' style="background-color:#FFF;background-image:url({{tabBar.num == 4 ? '': '/assets/imgs/7_1_0/bg.png'}});" wx:if="{{tabBar.num == 4}}">
<!--<view class='bgc fixed-bottom0' style="background-color:#FFF;background-image:url({{tabBar.num == 4 ? '': '/assets/imgs/7_1_0/bg.png'}});{{tabBar.num == 4 ? 'height: 108rpx':'height: 144rpx'}}" wx:if="{{tabBar.num == 4}}">-->
<view class='bgc fixed-bottom0' style="background-image:url({{tabBar.num == 4 ? '': '/assets/imgs/7_1_0/bg.png'}});" wx:if="{{tabBar.num == 4}}">
<block wx:for="{{tabBar.images}}" wx:key="{{index}}" wx:for-item="tab">
<view class="tab">
<!--当前页面需要授权 切未授权-->
......@@ -12,21 +11,21 @@
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
class='btn btn-primary df'
class='btn btn-primary'
hover-class="btn-hover"
style="height:100%"
style="height: 100%;background-color: #eee;"
>
<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
</button>
</view>
<view wx:else class="btn-tab" data-item="{{tab}}" bindtap="handelToPage">
<button class='btn btn-primary df' style="height:100%">
<button class='btn btn-primary' style="height: 100%;background-color: #eee;">
<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
</button>
</view>
</view>
<view wx:else class="btn-tab" data-item="{{tab}}" bindtap="handelToPage">
<button class='btn btn-primary df' style="height:100%">
<button class='btn btn-primary' style="height: 100%;background-color: #eee;">
<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
</button>
</view>
......
src/component/bottomTabs/bottomTabs.wxss
......@@ -6,8 +6,10 @@
justify-content: center;
}
.tab-img {
width: 50rpx;
height: 50rpx;
/* width: 50rpx;
height: 50rpx; */
width: 70rpx;
height: 70rpx;
}
.tab {
flex: 1;
......@@ -18,13 +20,17 @@
.bgc {
background-size: 100% 100%;
background-repeat: no-repeat;
height: 108rpx;
height: 114rpx;
display: flex;
align-items: center;
justify-content: center;
/* background-color: rgba(255, 255, 255, 1); */
box-shadow: 0px -4px 10px 0px rgba(232, 232, 232, 0.95);
padding-top: 20rpx;
}
.pdt {
padding-top: 50rpx;
}
/* .btn-tab {
display: flex;
justify-content: center;
} */
\ No newline at end of file
src/component/picNav/picNav.js
......@@ -10,6 +10,10 @@ Component({
* 组件的属性列表
*/
properties: {
currentHasUserInfo:{
type: Boolean,
type: false
},
picNav: {
type: Array,
value: [],
......@@ -35,6 +39,11 @@ Component({
* 组件的方法列表
*/
methods: {
_getUserInfo(res = {}) {
wxService.nextTick(() => {
this.triggerEvent('getAuth', res);
})
},
imageLoad(e) {
let imageSize = utils.imageUtil(e)
this.setData({
......
src/component/picNav/picNav.wxml
<!--component/picNav/picNav.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<view class="pic-nav">
<view
<view
wx:for="{{picNav}}"
wx:key="{{index}}"
wx:for-item="item"
class="nav-block"
>
<image
wx:if="{{baseImgUrl}}"
<image
wx:if="{{currentHasUserInfo}}"
class="pic-img"
style="width: {{100}}%;height: {{100}}px;"
style="width: {{100}}%;height: {{100}}px;"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}"
......@@ -19,6 +19,29 @@
bindload="imageLoad"
bindtap='preview'
/>
<button
wx:if="{{!currentHasUserInfo}}"
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
class='btn btn-primary df'
hover-class="btn-hover"
style="height:100%"
>
<image
class="pic-img"
style="width: {{100}}%;height: {{100}}px;"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}"
data-link="{{item.link}}"
data-item="{{item}}"
bindload="imageLoad"
bindtap='preview'
/>
</button>
</view>
</view>
<authorization-modal
......@@ -27,3 +50,4 @@
isAuthorizationType="{{isAuthorizationType}}"
isAuthorizationActiveText="{{isAuthorizationActiveText}}"
/>
src/component/tabSort/tabSort.js
......@@ -9,6 +9,10 @@ Component({
* 组件的属性列表
*/
properties: {
currentHasUserInfo:{
type: Boolean,
type: false
},
categoryType: {
type: Object,
value: null
......@@ -45,6 +49,11 @@ Component({
* 组件的方法列表
*/
methods: {
_getUserInfo(res = {}) {
wxService.nextTick(() => {
this.triggerEvent('getAuth', res);
})
},
handelToVipCode() {
wxService.router(`/pages/memberOfOwn/memberOfOwn`)
},
......
src/component/tabSort/tabSort.wxml
......@@ -12,7 +12,7 @@
style="width:{{navItemWidth}}%"
data-current="{{idx}}"
data-redirectId="{{navItem.redirectId}}"
data-item ="{{navItem}}"
data-item="{{navItem}}"
bindtap="switchNav"
>
<view>{{navItem.title}}</view>
......@@ -21,7 +21,26 @@
</scroll-view>
<!-- showQrcode 2 购物车 1 会员码 0 隐藏 -->
<view class="scroll-view-right" bindtap="handelToVipCode" wx:if="{{categoryType.showQrcode == 1}}">
<button
wx:if="{{!currentHasUserInfo}}"
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
class='btn btn-primary df'
hover-class="btn-hover"
style="height:100%"
>
<image
class="right-img"
src="/assets/imgs/7_1_0/scancode.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</button>
<image
wx:if="{{currentHasUserInfo}}"
class="right-img"
src="/assets/imgs/7_1_0/scancode.png"
mode="widthFix"
......@@ -29,10 +48,21 @@
binderror=""
bindload=""
/>
<text class="active vip-text" selectable="false" space="false" decode="false">会员码</text>
</view>
<view class="scroll-view-right" bindtap="handelToCart" wx:if="{{categoryType.showQrcode == 2}}">
<button
wx:if="{{!currentHasUserInfo}}"
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
class='btn btn-primary df'
hover-class="btn-hover"
style="height:100%"
/>
<image
wx:if="{{currentHasUserInfo}}"
class="right-img"
src="/assets/imgs/7_1_0/08_22/cart_point.png"
mode="widthFix"
......@@ -43,4 +73,3 @@
</view>
</view>
src/pages/my/my.js
......@@ -73,7 +73,6 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
console.log('0this.data.currentHasUserInfo', this.data.currentHasUserInfo)
// 取会员卡号
const baseUserInfo = wx.getStorageSync('_baseUserInfo')
const cardMember = wx.getStorageSync('_cardMember')
......
src/pages/my/my.wxml
......@@ -8,13 +8,13 @@
<person-center person-data="{{pItem.customer}}" />
</view>
<view class="" wx:if="{{pItem.type == 3}}">
<pic-nav pic-nav="{{pItem.navigation.images}}" />
<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
</view>
<view class="" wx:if="{{pItem.type == 4}}">
<bottom bottom="{{pItem.bottom}}" />
</view>
<view class="" wx:if="{{pItem.type == 5}}">
<bottom-tabs currHomePageId="{{currHomePageId}}" currentHasUserInfo="{{currentHasUserInfo}}" tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
<bottom-tabs currHomePageId="{{currHomePageId}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
</view>
<view class="" wx:if="{{pItem.type == 6}}">
<announcement notice="{{pItem.notice}}" />
......
src/pages/userCenter/userCenter.js
......@@ -36,8 +36,6 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad() {
// 设置 导航栏背景颜色
// wxService.getNavBarBackGroundColor('#000000', '#ff0000')
this.setData(
{
pages: [],
......@@ -75,7 +73,6 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
// 取会员卡号
const baseUserInfo = wx.getStorageSync('_baseUserInfo')
const cardMember = wx.getStorageSync('_cardMember')
......@@ -216,6 +213,7 @@ wxService.page({
// 获取plus购买信息
getPlusPurchase() {
wxService.get(`/sale/premium/query`).then(res => {
if(!res) return false
const { result, data } = res.data
if (result == 0) {
this.setData({
......
src/pages/userCenter/userCenter.wxml
......@@ -18,10 +18,10 @@
<bottom-tabs currHomePageId="{{currHomePageId}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
</view>
<view class="" wx:if="{{pItem.type == 6}}">
<announcement notice="{{pItem.notice}}" />
<announcement notice="{{pItem.notice}}"/>
</view>
<view class="" wx:if="{{pItem.type == 7}}">
<tab-sort category-type="{{pItem.categoryType}}" />
<tab-sort category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" />
</view>
<view class="" wx:if="{{pItem.type == 8}}">
<attention focus-wx="{{pItem.focusWx}}" />
......
src/project.config.json
......@@ -12,7 +12,7 @@
"autoAudits": false
},
"compileType": "miniprogram",
"libVersion": "2.8.1",
"libVersion": "2.8.2",
"appid": "wxc3b64b09b1d3dfc2",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": {
......
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