Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
9e23d16d
Commit
9e23d16d
authored
Sep 09, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btn_bgc
parent
4b6684c4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
17 deletions
+54
-17
bottomTabs.wxml
src/component/bottomTabs/bottomTabs.wxml
+5
-6
bottomTabs.wxss
src/component/bottomTabs/bottomTabs.wxss
+11
-4
picNav.js
src/component/picNav/picNav.js
+7
-0
picNav.wxml
src/component/picNav/picNav.wxml
+28
-4
my.wxml
src/pages/my/my.wxml
+2
-2
project.config.json
src/project.config.json
+1
-1
No files found.
src/component/bottomTabs/bottomTabs.wxml
View file @
9e23d16d
<!--component/bottomTabs/bottomTabs.wxml-->
<!--component/bottomTabs/bottomTabs.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<wxs src="../../wxs/utils.wxs" module="utils" />
<wxs src="./handlerData.wxs" module="tools" />
<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-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}}">-->
<block wx:for="{{tabBar.images}}" wx:key="{{index}}" wx:for-item="tab">
<block wx:for="{{tabBar.images}}" wx:key="{{index}}" wx:for-item="tab">
<view class="tab">
<view class="tab">
<!--当前页面需要授权 切未授权-->
<!--当前页面需要授权 切未授权-->
...
@@ -12,21 +11,21 @@
...
@@ -12,21 +11,21 @@
bindgetuserinfo="_getUserInfo"
bindgetuserinfo="_getUserInfo"
data-jflag="false"
data-jflag="false"
open-type='getUserInfo'
open-type='getUserInfo'
class='btn btn-primary
df
'
class='btn btn-primary'
hover-class="btn-hover"
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)}}" />
<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
</button>
</button>
</view>
</view>
<view wx:else class="btn-tab" data-item="{{tab}}" bindtap="handelToPage">
<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)}}" />
<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
</button>
</button>
</view>
</view>
</view>
</view>
<view wx:else class="btn-tab" data-item="{{tab}}" bindtap="handelToPage">
<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)}}" />
<image class='tab-img' src="{{utils.formateUrl(currHomePageId == tab.redirectId ? tab.activeImageUrl: tab.imageUrl,baseImgUrl)}}" />
</button>
</button>
</view>
</view>
...
...
src/component/bottomTabs/bottomTabs.wxss
View file @
9e23d16d
...
@@ -6,8 +6,10 @@
...
@@ -6,8 +6,10 @@
justify-content: center;
justify-content: center;
}
}
.tab-img {
.tab-img {
width: 50rpx;
/* width: 50rpx;
height: 50rpx;
height: 50rpx; */
width: 70rpx;
height: 70rpx;
}
}
.tab {
.tab {
flex: 1;
flex: 1;
...
@@ -18,13 +20,17 @@
...
@@ -18,13 +20,17 @@
.bgc {
.bgc {
background-size: 100% 100%;
background-size: 100% 100%;
background-repeat: no-repeat;
background-repeat: no-repeat;
height: 1
08
rpx;
height: 1
14
rpx;
display: flex;
display: flex;
align-items: center;
align-items: center;
justify-content: center;
justify-content: center;
/* background-color: rgba(255, 255, 255, 1); */
box-shadow: 0px -4px 10px 0px rgba(232, 232, 232, 0.95);
box-shadow: 0px -4px 10px 0px rgba(232, 232, 232, 0.95);
padding-top: 20rpx;
}
}
.pdt {
.pdt {
padding-top: 50rpx;
padding-top: 50rpx;
}
}
/* .btn-tab {
display: flex;
justify-content: center;
} */
\ No newline at end of file
src/component/picNav/picNav.js
View file @
9e23d16d
...
@@ -10,6 +10,10 @@ Component({
...
@@ -10,6 +10,10 @@ Component({
* 组件的属性列表
* 组件的属性列表
*/
*/
properties
:
{
properties
:
{
currentHasUserInfo
:{
type
:
Boolean
,
type
:
false
},
picNav
:
{
picNav
:
{
type
:
Array
,
type
:
Array
,
value
:
[],
value
:
[],
...
@@ -35,6 +39,9 @@ Component({
...
@@ -35,6 +39,9 @@ Component({
* 组件的方法列表
* 组件的方法列表
*/
*/
methods
:
{
methods
:
{
_getUserInfo
(
res
=
{})
{
this
.
triggerEvent
(
'getAuth'
,
res
);
},
imageLoad
(
e
)
{
imageLoad
(
e
)
{
let
imageSize
=
utils
.
imageUtil
(
e
)
let
imageSize
=
utils
.
imageUtil
(
e
)
this
.
setData
({
this
.
setData
({
...
...
src/component/picNav/picNav.wxml
View file @
9e23d16d
<!--component/picNav/picNav.wxml-->
<!--component/picNav/picNav.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<wxs src="../../wxs/utils.wxs" module="utils" />
<view class="pic-nav">
<view class="pic-nav">
<view
<view
wx:for="{{picNav}}"
wx:for="{{picNav}}"
wx:key="{{index}}"
wx:key="{{index}}"
wx:for-item="item"
wx:for-item="item"
class="nav-block"
class="nav-block"
>
>
<image
<image
wx:if="{{
baseImgUrl
}}"
wx:if="{{
currentHasUserInfo
}}"
class="pic-img"
class="pic-img"
style="width: {{100}}%;height: {{100}}px;"
style="width: {{100}}%;height: {{100}}px;"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
data-appid="{{item.link.appid}}"
data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}"
data-path="{{item.link.url}}"
...
@@ -19,6 +19,29 @@
...
@@ -19,6 +19,29 @@
bindload="imageLoad"
bindload="imageLoad"
bindtap='preview'
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>
</view>
</view>
<authorization-modal
<authorization-modal
...
@@ -27,3 +50,4 @@
...
@@ -27,3 +50,4 @@
isAuthorizationType="{{isAuthorizationType}}"
isAuthorizationType="{{isAuthorizationType}}"
isAuthorizationActiveText="{{isAuthorizationActiveText}}"
isAuthorizationActiveText="{{isAuthorizationActiveText}}"
/>
/>
src/pages/my/my.wxml
View file @
9e23d16d
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
<person-center person-data="{{pItem.customer}}" />
<person-center person-data="{{pItem.customer}}" />
</view>
</view>
<view class="" wx:if="{{pItem.type == 3}}">
<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>
<view class="" wx:if="{{pItem.type == 4}}">
<view class="" wx:if="{{pItem.type == 4}}">
<bottom bottom="{{pItem.bottom}}" />
<bottom bottom="{{pItem.bottom}}" />
</view>
</view>
<view class="" wx:if="{{pItem.type == 5}}">
<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>
<view class="" wx:if="{{pItem.type == 6}}">
<view class="" wx:if="{{pItem.type == 6}}">
<announcement notice="{{pItem.notice}}" />
<announcement notice="{{pItem.notice}}" />
...
...
src/project.config.json
View file @
9e23d16d
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
"autoAudits"
:
false
"autoAudits"
:
false
},
},
"compileType"
:
"miniprogram"
,
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.
1
"
,
"libVersion"
:
"2.8.
2
"
,
"appid"
:
"wxc3b64b09b1d3dfc2"
,
"appid"
:
"wxc3b64b09b1d3dfc2"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"debugOptions"
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment