Skip to content

7
7-Eleven
Commit 8da4a77b by 赵雅纹
Options

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

parents 8c5b2c00 3d188f77
Showing with 298 additions and 135 deletions
src/app.json
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
"pages/share/share", "pages/share/share",
"pages/paymentStatus/paymentStatus", "pages/paymentStatus/paymentStatus",
"pages/fun/fun", "pages/fun/fun",
"pages/categoryPro/categoryPro" "pages/categoryPro/categoryPro",
"pages/plus/plus"
] ]
} }
], ],
......
src/component/announcement/announcement.js
...@@ -9,7 +9,10 @@ Component({ ...@@ -9,7 +9,10 @@ Component({
* 组件的属性列表 * 组件的属性列表
*/ */
properties: { properties: {
notice: {
type: Object,
value: null
}
}, },
attached () { attached () {
...@@ -24,6 +27,10 @@ Component({ ...@@ -24,6 +27,10 @@ Component({
* 组件的方法列表 * 组件的方法列表
*/ */
methods: { methods: {
handelToAnn(e){
const ev = e.currentTarget.dataset;
let redirectId = ev.redirectId
console.log('redirectid', redirectId)
}
} }
}) })
src/component/announcement/announcement.wxml
<!--component/announcement/announcement.wxml--> <!--component/announcement/announcement.wxml-->
<view class="announcement df"> <view class="announcement df" style="background-color:{{notice.backgroundColor}}" data-redirectId="{{notice.redirectId}}" bindtap="handelToAnn">
<view class="horn"> <view class="horn">
<image class="img" src="./../../assets/imgs/7_1_0/notice.png" mode="widthFix" lazy-load="false" binderror="" bindload="" /> <image class="img" src="{{notice.iconImageUrl? 'notice.iconImageUrl': '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view> </view>
<text class="text">公告公告公告公告公告公告公告公告公告公告公告公告公告公告公告公告公告</text> <text class="text" style="color:{{notice.fontColor}}">{{notice.content}}</text>
</view> </view>
\ No newline at end of file
src/component/imageSwiper/imageSwiper.js
...@@ -24,11 +24,6 @@ Component({ ...@@ -24,11 +24,6 @@ Component({
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
imgUrls: [
'https://images.unsplash.com/photo-1551334787-21e6bd3ab135?w=640',
'https://images.unsplash.com/photo-1551214012-84f95e060dee?w=640',
'https://images.unsplash.com/photo-1551446591-142875a901a1?w=640'
],
indicatorDots: true, indicatorDots: true,
autoplay: true, autoplay: true,
circular: true, circular: true,
......
src/component/imageSwiper/imageSwiper.wxml
<!--component/imageSwiper/imageSwiper.wxml--> <!--component/imageSwiper/imageSwiper.wxml-->
<!--<swiper
indicator-dots="{{indicatorDots}}"
autoplay="{{autoplay}}"
interval="{{interval}}"
duration="{{duration}}"
circular="{{circular}}"
class="image-swiper"
>
<block wx:for="{{imgUrls}}" wx:key="{{item}}">
<swiper-item class="swiper-item">
<image wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindtap='preview' class="slide-image" />
</swiper-item>
</block>
</swiper>-->
<swiper <swiper
class="image-swiper" class="image-swiper"
indicator-dots="{{indicatorDots}}" indicator-dots="{{indicatorDots}}"
...@@ -21,13 +7,17 @@ ...@@ -21,13 +7,17 @@
circular="{{circular}}" circular="{{circular}}"
duration="{{duration}}" duration="{{duration}}"
> >
<block wx:for="{{imgUrls}}" wx:key="{{item}}"> <block wx:for="{{imageData}}" wx:key="{{item}}">
<swiper-item> <swiper-item class="swiper-item">
<image <image
src="{{item}}" wx:if="{{baseImgUrl}}"
src="{{baseImgUrl}}{{item.imageUrl}}"
data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}"
data-link="{{item.link}}"
data-item="{{item}}"
bindtap='preview'
class="slide-image" class="slide-image"
width="355"
height="150"
/> />
</swiper-item> </swiper-item>
</block> </block>
......
src/component/picNav/picNav.wxml
<!--component/picNav/picNav.wxml--> <!--component/picNav/picNav.wxml-->
<view class="pic-nav"> <!--<view class="pic-nav">
<block <block
wx:for="{{picNavH}}" wx:for="{{picNavH}}"
wx:key="{{index}}" wx:key="{{index}}"
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
11 11
</view> </view>
</block> </block>
</view> </view>-->
<!--
<view class="pic-nav"> <view class="pic-nav">
<view <view
wx:for="{{picNav}}" wx:for="{{picNav}}"
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
class="nav-block" class="nav-block"
style="width: {{imagewidth}}px;height: {{imageheight}}px;" style="width: {{imagewidth}}px;height: {{imageheight}}px;"
> >
<image <image
wx:if="{{baseImgUrl}}" wx:if="{{baseImgUrl}}"
class="pic-img" class="pic-img"
...@@ -34,11 +33,6 @@ ...@@ -34,11 +33,6 @@
/> />
</view> </view>
</view> </view>
<authorization-modal
isAuthorization='{{isAuthorization}}'
bind:activeTocard="activeTocard"
isAuthorizationType="{{isAuthorizationType}}"
isAuthorizationActiveText="{{isAuthorizationActiveText}}"
/>
-->
src/component/tabSort/tabSort.js
...@@ -10,7 +10,10 @@ Component({ ...@@ -10,7 +10,10 @@ Component({
* 组件的属性列表 * 组件的属性列表
*/ */
properties: { properties: {
categorys:{
type: Array,
value: []
}
}, },
attached() { attached() {
...@@ -19,35 +22,7 @@ Component({ ...@@ -19,35 +22,7 @@ Component({
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
currentTab: 0, currentTab: 0
navData: [{
label: '分类1'
},
{
label: '分类2'
},
{
label: '分类3'
},
{
label: '分类4'
},
{
label: '分类5'
},
{
label: '分类6'
},
{
label: '分类7'
},
{
label: '分类8'
},
{
label: '分类9'
}
]
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
...@@ -57,6 +32,8 @@ Component({ ...@@ -57,6 +32,8 @@ Component({
switchNav(event) { switchNav(event) {
const ev = event.currentTarget.dataset; const ev = event.currentTarget.dataset;
let cur = ev.current let cur = ev.current
let redirectid = ev.redirectid
console.log('redirectid', redirectid)
if (this.data.currentTab == cur) { if (this.data.currentTab == cur) {
return false return false
} else { } else {
......
src/component/tabSort/tabSort.wxml
<!--component/tabSort/tabSort.wxml--> <!--component/tabSort/tabSort.wxml-->
<view class="tab-sort" wx:if="{{navData}}"> <view class="tab-sort" wx:if="{{categorys}}">
<scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}"> <scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}">
<block <block
wx:for="{{navData}}" wx:for="{{categorys}}"
wx:for-index="idx" wx:for-index="idx"
wx:for-item="navItem" wx:for-item="navItem"
wx:key="idx" wx:key="idx"
...@@ -11,13 +11,10 @@ ...@@ -11,13 +11,10 @@
class="scroll-view-item {{currentTab == idx ?'active':''}}" class="scroll-view-item {{currentTab == idx ?'active':''}}"
style="width:{{navItemWidth}}%" style="width:{{navItemWidth}}%"
data-current="{{idx}}" data-current="{{idx}}"
data-startTimeStr="{{navItem.startTimeStr}}" data-redirectId ="{{navItem.redirectId}}"
data-endTimeStr="{{navItem.endTimeStr}}"
data-btnText="{{navItem.buttonText}}"
data-id="{{navItem.id}}"
bindtap="switchNav" bindtap="switchNav"
> >
<view>{{navItem.label}}</view> <view>{{navItem.title}}</view>
</view> </view>
</block> </block>
</scroll-view> </scroll-view>
...@@ -34,7 +31,7 @@ ...@@ -34,7 +31,7 @@
bindchange="switchTab" bindchange="switchTab"
> >
<swiper-item <swiper-item
wx:for="{{navData}}" wx:for="{{categorys}}"
wx:for-item="navItem" wx:for-item="navItem"
wx:for-index="idx" wx:for-index="idx"
wx:key="idx" wx:key="idx"
......
src/pages/userCenter/userCenter.js
...@@ -28,7 +28,7 @@ wxService.page({ ...@@ -28,7 +28,7 @@ wxService.page({
baseUserInfo: null, baseUserInfo: null,
// cardMember: null, // cardMember: null,
pageBackgroundColor: 0, pageBackgroundColor: 0,
guidePageModalShow:true guidePageModalShow: false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
...@@ -133,45 +133,7 @@ wxService.page({ ...@@ -133,45 +133,7 @@ wxService.page({
}) })
} }
}, },
// 查询积分信息
getMemberPointInfo(){
wx.showLoading({
title: '加载中'
})
wxService.get(`/member/memberPoint/getMyPointInfo`).then(res => {
if(res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
this.setData({
integralNum: data && data.point || 0
})
}
}
})
},
// 查询优惠券数量
getMemberCouponInfo(){
wx.showLoading({
title: '加载中'
})
wxService.post(`/coupon/coupon/memberCouponCount`).then(res => {
if(res){
const { result, data } = res && res.data
if (result == 0) {
wx.hideLoading()
this.setData({
couponNum: data && data[1] || 0
})
}
} else {
wx.showToast({
title: '请求失败',
icon: 'none'
})
}
})
},
// page 信息 // page 信息
initPage(pageId){ initPage(pageId){
this.setData({ this.setData({
......
src/pages/userCenter/userCenter.wxml
<!--pages/userCenter.wxml--> <!--pages/userCenter.wxml-->
<view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px"> <view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px">
<!-- 1 轮播 2 个人中心 3 图片导航 4 底部--> <!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
<!-- 分类Tab --> <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<tab-sort/> {{pItem.type}}
<view class="page-bgc"> <view wx:if="{{pItem.type == 1}}">
<!-- 轮播 --> <image-swiper image-data="{{pItem.rotationchart.images}}"/>
</view>
<view class="" wx:if="{{pItem.type == 2}}">
<person-center person-data="{{pItem.customer}}"/>
</view>
<view class="" wx:if="{{pItem.type == 3}}">
<pic-nav pic-nav="{{pItem.navigation.images}}"/>
</view>
<view class="" wx:if="{{pItem.type == 4}}">
<bottom bottom="{{pItem.bottom}}" />
</view>
<view class="" wx:if="{{pItem.type == 5}}">
<bottom-tabs tabBar="{{pItem.tabBar}}"/>
</view>
<view class="" wx:if="{{pItem.type == 6}}">
<announcement notice="{{pItem.notice}}"/>
</view>
<view class="" wx:if="{{pItem.type == 7}}">
<tab-sort categorys="{{pItem.categoryType.categorys}}"/>
</view>
<view class="" wx:if="{{pItem.type == 8}}">
<attention focusWx="{{pItem.focusWx}}"/>
</view>
<view class="" wx:if="{{pItem.type == 9}}">
<attention/>
</view>
</block>
<!--
<tab-sort/>
<view class="page-bgc">
<image-swiper/> <image-swiper/>
<!--公告-->
<announcement/> <announcement/>
<!-- 导航图标 -->
<icon-swiper/> <icon-swiper/>
<!-- 图片导航 -->
<pic-nav/> <pic-nav/>
</view> </view>
<view class="person-hot border_box"> <view class="person-hot border_box">
...@@ -18,14 +50,14 @@ ...@@ -18,14 +50,14 @@
<span class="hot border_box">HOT -</span> <span class="hot border_box">HOT -</span>
</view> </view>
<!-- 商品活动 人气hot -->
<hot-item/> <hot-item/>
<!-- 关注 -->
<attention/> <attention/>
<!-- 图片广告 -->
<bannerAd/> <bannerAd/>-->
<!-- <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem"> <!-- <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<view class="pd1530" wx:if="{{pItem.type == 1}}"> <view class="pd1530" wx:if="{{pItem.type == 1}}">
...@@ -52,4 +84,4 @@ ...@@ -52,4 +84,4 @@
<!--<authorization-modal isAuthorization='{{isAuthorization}}' />--> <!--<authorization-modal isAuthorization='{{isAuthorization}}' />-->
<guide-page-modal show="{{guidePageModalShow}}" /> <guide-page-modal show="{{guidePageModalShow}}" />
<bottom-tabs />
src/project.config.json
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 17, "current": 37,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -285,6 +285,13 @@ ...@@ -285,6 +285,13 @@
"pathName": "subPackage/page/pages/fun/fun", "pathName": "subPackage/page/pages/fun/fun",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "plus",
"pathName": "subPackage/page/pages/plus/plus",
"query": "",
"scene": null
} }
] ]
} }
......
src/subPackage/page/pages/h5/h5page.json
{} {
\ No newline at end of file "navigationBarTitleText": "plus 购买页"
}
\ No newline at end of file
src/subPackage/page/pages/plus/plus.js 0 → 100644
// subPackage/home/pages/plus/plus.js
const wxService = require('../../../../utils/wxService')
wxService.page({
/**
* 页面的初始数据
*/
data: {
skuVOList:[
{
mainImgUrl:"http://testimg3.bigaka.com/group3/M00/00/17/Cv6CBF1Z9TKAU6T1AAAG8CvHO2o415.png",
amount:0.06
},
{
mainImgUrl:"http://testimg3.bigaka.com/group3/M00/00/17/Cv6CBF1Z9TKAU6T1AAAG8CvHO2o415.png",
amount:0.06
},
{
mainImgUrl:"http://testimg3.bigaka.com/group3/M00/00/17/Cv6CBF1Z9TKAU6T1AAAG8CvHO2o415.png",
amount:0.06
},
{
mainImgUrl:"http://testimg3.bigaka.com/group3/M00/00/17/Cv6CBF1Z9TKAU6T1AAAG8CvHO2o415.png",
amount:0.06
}
],
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
src/subPackage/page/pages/plus/plus.json 0 → 100644
{
"navigationBarTitleText": "plus 购买页"
}
\ No newline at end of file
src/subPackage/page/pages/plus/plus.wxml 0 → 100644
<!--subPackage/home/pages/plus/plus.wxml-->
<view class="plus">
<!-- plus 动态页面 -->
<!-- 底部 -->
<view class="plus-bottom fixed-bottom0 clearfix::after">
<view class="bottom-top">
<view class="pro-list">
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{skuVOList}}' wx:for-item="sub" wx:key="s">
<view class="upload_Item item-img" style="background-image:url({{sub.mainImgUrl}})">
<view class="item-mouth">每月仅￥ 25</view>
<view class="item-year">全年卡· 366 天</view>
<view class="item-price">￥ 300</view>
</view>
</block>
</view>
</scroll-view>
</view>
</view>
<view class="bottom-bottom">
<view class="bottom-pay">立即支付 ￥158 </view>
</view>
</view>
</view>
src/subPackage/page/pages/plus/plus.wxss 0 → 100644
/* subPackage/home/pages/plus/plus.wxss */
@import './../../../../base/base.wxss';
.plus-bottom {
height: 314rpx;
/* background-color: rgba(192, 154, 116, .02); */
background-color: pink;
}
.plus-bottom .bottom-top {
height: 226rpx;
}
.pro-list {
/* height: 155rpx; */
background-color: gray;
margin-left: 20rpx;
/* margin-top: 40rpx; */
box-sizing: border-box;
/* margin: 40rpx 30rpx 0 30rpx; */
}
.item-mouth {
height: 25rpx;
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
}
.item-year {
height: 33rpx;
color: rgba(247, 181, 0, 1);
font-size: 24rpx;
}
.item-price {
height: 50rpx;
color: rgba(245, 248, 250, 1);
font-size: 36rpx;
}
.plus-bottom .bottom-bottom {
width: 100%;
height: 88rpx;
padding-top: 18rpx;
background-color: rgba(255, 255, 255, 1);
}
.bottom-pay {
text-align: center;
width: 280rpx;
line-height: 52rpx;
height: 52rpx;
border-radius: 26px;
background-color: rgba(203, 60, 60, 1);
left: 480px;
color: rgba(255, 255, 255, 1);
font-size: 26rpx;
float: right;
margin-right: 30rpx;
}
.item-img {
background-repeat: no-repeat;
background-size: 100% 100%;
}
.uploadWrap {
/* height: 155rpx; */
height: 100%;
width: 100%;
display: flex;
align-items: center;
display: -webkit-box;
flex-direction: column;
/* margin: 40rpx 30rpx 0 30rpx; */
}
.upload_Item {
width: 209rpx;
height: 155rpx;
flex: 1;
margin: 0rpx 15rpx 15rpx 0;
box-sizing: border-box;
background-color: aqua;
}
.upload_Item:last-child {
margin-right: 20rpx;
}
.upload_Item_img {
width: 209rpx;
height: 155rpx;
}
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