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
f709c443
Commit
f709c443
authored
Oct 10, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
3ad0b41e
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
107 additions
and
18 deletions
+107
-18
attention.wxss
src/component/attention/attention.wxss
+2
-2
bottomTabs.wxss
src/component/bottomTabs/bottomTabs.wxss
+1
-0
plus.js
src/component/plus/plus.js
+2
-2
plus.wxss
src/component/plus/plus.wxss
+2
-1
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+3
-0
my.js
src/pages/my/my.js
+21
-0
my.wxml
src/pages/my/my.wxml
+4
-0
my.wxss
src/pages/my/my.wxss
+5
-1
myAddress.js
src/pages/myAddress/myAddress.js
+0
-1
userCenter.js
src/pages/userCenter/userCenter.js
+22
-0
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+3
-1
userCenter.wxss
src/pages/userCenter/userCenter.wxss
+5
-2
wantToBuyDetail.wxss
src/pages/wantToBuyDetail/wantToBuyDetail.wxss
+7
-5
subPage.js
src/subPackage/page/pages/subPage/subPage.js
+22
-0
subPage.wxml
src/subPackage/page/pages/subPage/subPage.wxml
+3
-1
subPage.wxss
src/subPackage/page/pages/subPage/subPage.wxss
+4
-2
currentLinkRouter.js
src/utils/currentLinkRouter.js
+1
-0
No files found.
src/component/attention/attention.wxss
View file @
f709c443
...
...
@@ -4,9 +4,9 @@
width: 710rpx;
height: 133rpx;
border-radius: 16rpx;
background-color: rgba(192, 154, 116, 1);
/* background-color: rgba(192, 154, 116, 1); */
margin-top: 50rpx;
margin-bottom:
10
0rpx;
margin-bottom:
5
0rpx;
display: flex;
align-items: center;
justify-content: space-between;
...
...
src/component/bottomTabs/bottomTabs.wxss
View file @
f709c443
...
...
@@ -5,6 +5,7 @@
display: flex;
align-items: center;
justify-content: center;
border-top: solid 1rpx #eee;
}
.tab-img {
/* width: 70rpx;
...
...
src/component/plus/plus.js
View file @
f709c443
...
...
@@ -44,8 +44,8 @@ Component({
wxService
.
request
({
url
:
app
.
globalData
.
ctx
+
'/sale/premium/query'
,
header
:
{
'tunnel-token'
:
'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
// 测试
//
'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
//
'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试
'tunnel-token'
:
'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8'
// 生产
},
success
:
(
res
)
=>
{
const
{
result
,
data
}
=
res
.
data
...
...
src/component/plus/plus.wxss
View file @
f709c443
...
...
@@ -11,7 +11,8 @@
position: fixed;
bottom: 88rpx;
padding: 36rpx 0 36rpx 30rpx;
background-color: rgba(192, 154, 116, 0.2);
/* background-color: rgba(192, 154, 116, 0.2); */
background-color: rgb(230,215,199);
}
.scroll-view_H {
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
f709c443
...
...
@@ -494,6 +494,9 @@ wxService.page({
wx
.
hideLoading
()
})
this
.
data
.
addressInfo
.
fullArea
=
this
.
data
.
addressInfo
.
provinceName
+
' '
+
this
.
data
.
addressInfo
.
cityName
+
' '
+
this
.
data
.
addressInfo
.
countyName
wx
.
setStorageSync
(
'_defalutAddress'
,
this
.
data
.
addressInfo
)
console
.
log
(
'WX---------------------'
,
this
.
data
.
addressInfo
)
},
fail
:
function
(
err
)
{
...
...
src/pages/my/my.js
View file @
f709c443
...
...
@@ -16,6 +16,7 @@ wxService.page({
*/
data
:
{
pages
:
[],
paddingBottom
:
'0'
,
render
:
null
,
// 渲染页面数据对象(安全渲染)
renderPageOver
:
false
,
// 渲染页面结束
integralNum
:
0
,
...
...
@@ -176,6 +177,26 @@ wxService.page({
const
renderData
=
render
.
next
()
this
.
data
.
renderPageOver
=
renderData
.
done
this
.
renderPageFunc
({
products
:
renderData
.
value
})
//是否有tabbar 或 plus
let
tabbar
=
products
.
filter
(
item
=>
item
.
type
==
5
);
let
plus
=
products
.
filter
(
item
=>
item
.
type
==
9
);
if
(
plus
.
length
!=
0
)
{
this
.
setData
({
paddingBottom
:
'320rpx'
})
}
else
if
(
tabbar
.
length
!=
0
)
{
this
.
setData
({
paddingBottom
:
'140rpx'
})
}
else
{
this
.
setData
({
paddingBottom
:
'40rpx'
})
}
}
}).
finally
(()
=>
{
...
...
src/pages/my/my.wxml
View file @
f709c443
...
...
@@ -32,3 +32,7 @@
</view>
<guide-page-modal show="{{guidePageModalShow}}" />
<!--<authorization-modal isAuthorization='{{isAuthorization}}'/>-->
<!-- 底部补充高度 防止被遮盖 -->
<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
src/pages/my/my.wxss
View file @
f709c443
/* pages/my/my.wxss */
@import './../../base/base.wxss';
.bottom-fixed{
padding-bottom: 40rpx;
}
.user-center{
box-sizing: border-box;
padding-bottom: 200rpx;
height: 100%;
}
...
...
src/pages/myAddress/myAddress.js
View file @
f709c443
...
...
@@ -43,7 +43,6 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
this
.
getAddressList
()
},
...
...
src/pages/userCenter/userCenter.js
View file @
f709c443
...
...
@@ -17,6 +17,7 @@ wxService.page({
*/
data
:
{
pages
:
[],
paddingBottom
:
'0'
,
render
:
null
,
// 渲染页面数据对象(安全渲染)
renderPageOver
:
false
,
// 渲染页面结束
integralNum
:
0
,
...
...
@@ -248,6 +249,27 @@ wxService.page({
const
renderData
=
render
.
next
()
this
.
data
.
renderPageOver
=
renderData
.
done
this
.
renderPageFunc
({
products
:
renderData
.
value
})
//是否有tabbar 或 plus
let
tabbar
=
products
.
filter
(
item
=>
item
.
type
==
5
);
let
plus
=
products
.
filter
(
item
=>
item
.
type
==
9
);
if
(
plus
.
length
!=
0
){
this
.
setData
({
paddingBottom
:
'320rpx'
})
}
else
if
(
tabbar
.
length
!=
0
){
this
.
setData
({
paddingBottom
:
'140rpx'
})
}
else
{
this
.
setData
({
paddingBottom
:
'40rpx'
})
}
}
}).
finally
(()
=>
{
...
...
src/pages/userCenter/userCenter.wxml
View file @
f709c443
...
...
@@ -3,7 +3,7 @@
<!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<view wx:if="{{pItem.type == 1}}">
<image-swiper image-data="{{pItem.rotationchart.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
<image-swiper image-data="{{pItem.rotationchart.images}}" bind:
updatePage="updatePage" bind:
getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
</view>
<view class="" wx:if="{{pItem.type == 2}}">
<person-center isVip="{{isVip}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
...
...
@@ -34,3 +34,5 @@
<guide-page-modal show="{{guidePageModalShow}}" />
<share-benefit-modal show="{{shareBenefitModalShow}}" benefit-data="{{benefitData}}"/>
<!--<authorization-modal isAuthorization='{{isAuthorization}}'/>-->
<!-- 底部补充高度 防止被遮盖 -->
<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
src/pages/userCenter/userCenter.wxss
View file @
f709c443
/* pages/userCenter.wxss */
@import './../../base/base.wxss';
page{
padding-bottom: 320rpx;
/* padding-bottom: 320rpx; */
}
.bottom-fixed{
padding-bottom: 40rpx;
}
.user-center{
box-sizing: border-box;
padding-bottom: 200rpx;
height: 100%;
}
...
...
src/pages/wantToBuyDetail/wantToBuyDetail.wxss
View file @
f709c443
...
...
@@ -2,7 +2,7 @@
@import './../../base/base.wxss';
page{
background: #ffffff;
padding-bottom:
8
0rpx;
padding-bottom:
9
0rpx;
}
scroll-view{
height: 100%;
...
...
@@ -50,18 +50,19 @@ swiper {
.share-oprate{
display: flex;
align-items: center;
margin-right: 30rpx;
}
.share-wrap{
display: flex;
justify-content:
space-between
;
justify-content:
flex-end
;
align-items: center;
/* margin-top: 31rpx; */
}
.share-img{
width:
28
rpx;
height:
28
rpx;
width:
30
rpx;
height:
30
rpx;
}
.share-number{
font-size: 24rpx;
...
...
@@ -143,7 +144,8 @@ swiper {
height: auto;
bottom: 0;
left: 0;
padding: 20rpx;
padding: 24rpx 40rpx;
padding-right: 20rpx;
box-sizing: border-box;
background: #ffffff;
border-top: solid 1px #eee;
...
...
src/subPackage/page/pages/subPage/subPage.js
View file @
f709c443
...
...
@@ -16,6 +16,7 @@ wxService.page({
*/
data
:
{
pages
:
[],
paddingBottom
:
'0'
,
render
:
null
,
// 渲染页面数据对象(安全渲染)
renderPageOver
:
false
,
// 渲染页面结束
integralNum
:
0
,
...
...
@@ -223,6 +224,27 @@ wxService.page({
const
renderData
=
render
.
next
()
this
.
data
.
renderPageOver
=
renderData
.
done
this
.
renderPageFunc
({
products
:
renderData
.
value
})
//是否有tabbar 或 plus
let
tabbar
=
products
.
filter
(
item
=>
item
.
type
==
5
);
let
plus
=
products
.
filter
(
item
=>
item
.
type
==
9
);
if
(
plus
.
length
!=
0
)
{
this
.
setData
({
paddingBottom
:
'320rpx'
})
}
else
if
(
tabbar
.
length
!=
0
)
{
this
.
setData
({
paddingBottom
:
'140rpx'
})
}
else
{
this
.
setData
({
paddingBottom
:
'40rpx'
})
}
}
}).
finally
(()
=>
{
...
...
src/subPackage/page/pages/subPage/subPage.wxml
View file @
f709c443
...
...
@@ -3,7 +3,7 @@
<!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<view wx:if="{{pItem.type == 1}}">
<image-swiper image-data="{{pItem.rotationchart.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
<image-swiper image-data="{{pItem.rotationchart.images}}" bind:
updatePage="updatePage" bind:
getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
</view>
<view class="" wx:if="{{pItem.type == 2}}">
<person-center bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
...
...
@@ -32,3 +32,5 @@
</block>
</view>
<guide-page-modal show="{{guidePageModalShow}}" />
<!-- 底部补充高度 防止被遮盖 -->
<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
src/subPackage/page/pages/subPage/subPage.wxss
View file @
f709c443
/* subPackage/page/pages/subPage/subPage.wxss */
@import './../../../../base/base.wxss';
page{
padding-bottom: 320rpx;
/* padding-bottom: 320rpx; */
}
.bottom-fixed{
padding-bottom: 40rpx;
}
.user-center{
box-sizing: border-box;
padding-bottom: 200rpx;
height: 100%;
}
...
...
src/utils/currentLinkRouter.js
View file @
f709c443
...
...
@@ -15,6 +15,7 @@ function currentLinkRouter(event, _this) {
}
else
if
(
curItemType
.
link
.
type
==
2
)
{
// 触发父组件更新页面
wxService
.
nextTick
(()
=>
{
_this
.
triggerEvent
(
'updatePage'
,
{
pageId
:
currentClickType
.
url
})
})
}
else
if
(
curItemType
.
link
.
type
==
3
)
{
...
...
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