Skip to content

7
7-Eleven
Commit 570e6f1d by 高淑倩
Options

Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

parents a57b71dc 0adc7e9f
Showing with 461 additions and 7 deletions
src/app.json
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
"pages/myRelease/myRelease", "pages/myRelease/myRelease",
"pages/orderBenefit/orderBenefit", "pages/orderBenefit/orderBenefit",
"pages/myReleaseDetail/myReleaseDetail", "pages/myReleaseDetail/myReleaseDetail",
"pages/grassCommunity/grassCommunity" "pages/grassCommunity/grassCommunity",
"pages/myInvite/myInvite"
] ]
} }
], ],
......
src/component/guidePageModal/guidePageModal.js 0 → 100644
// component/guidePageModal/guidePageModal.js
Component({
/**
* 组件的属性列表
*/
properties: {
show: { // 显示标识
type: Boolean,
value: false
}
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
hidePopup(){
this.setData({
show: false
})
}
}
})
src/component/guidePageModal/guidePageModal.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/guidePageModal/guidePageModal.wxml 0 → 100644
<!--component/guidePageModal/guidePageModal.wxml-->
<view class="modal-container" bindtap="hidePopup" hidden="{{!show}}"></view>
<view class="modal-content" hidden="{{!show}}">
<image class="guide-img" src="/assets/imgs/7_1_0/guide.png" mode="widthFix"></image>
<view class="modal-close" bindtap="hidePopup">知道了</view>
</view>
src/component/guidePageModal/guidePageModal.wxss 0 → 100644
/* component/guidePageModal/guidePageModal.wxss */
@import "/app.wxss";
.modal-container {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
z-index: 98;
}
.modal-content {
position: fixed;
z-index: 99;
top: 0;
right: 80rpx;
}
.modal-close{
width: 250rpx;
height: 92rpx;
border-radius: 49rpx;
border: 4rpx solid rgba(255, 255, 255, 1);
line-height: 92rpx;
text-align: center;
color: #ffffff;
font-size: 38rpx;
margin-top: 40rpx;
margin-left: 160rpx;
}
.guide-img{
width: 599rpx;
}
\ No newline at end of file
src/component/shareModal/shareModal.js 0 → 100644
// component/shareModal/shareModal.js
const wxService = require('../../utils/wxService')
Component({
/**
* 组件的属性列表
*/
properties: {
show: { // 显示标识
type: Boolean,
value: false
}
},
/**
* 组件的初始数据
*/
data: {
shareHight:0
},
observers: {
show() {
const { show } = this.data
if (show){
wxService.nextTick(() => {
this.getHeightFun();
})
}
}
},
/**
* 组件的方法列表
*/
methods: {
//获取高度
getHeightFun(){
//获取屏幕高度
let windowHeight = '';
wx.getSystemInfo({
success: function (res) {
console.log(res.windowHeight);
windowHeight = res.windowHeight
},
})
//获取底部元素高度
let query = wx.createSelectorQuery().in (this);
query.select('#bottom-query').boundingClientRect(rect => {
let height = rect.height;
console.log(height)
this.setData({
shareHight: windowHeight - height + 'px'
})
}).exec();
}
}
})
src/component/shareModal/shareModal.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/shareModal/shareModal.wxml 0 → 100644
<!--component/shareModal/shareModal.wxml-->
<view class="modal-container" bindtap="hidePopup" hidden="{{!show}}"></view>
<view class="modal-content" hidden="{{!show}}">
<image style="height:{{shareHight}}" src="/assets/imgs/7_1_0/share-modal.png"></image>
</view>
<view class="share-modal-list " id="bottom-query" hidden="{{!show}}">
<view class="share-modal-item" bindtap="onTapForward">转发</view>
<view class="share-modal-item">添加到我的小程序</view>
<view class="share-modal-item">关于聚FUN</view>
<view class="share-modal-item">返回</view>
</view>
src/component/shareModal/shareModal.wxss 0 → 100644
/* component/shareModal/shareModal.wxss */
@import "/app.wxss";
.modal-container {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
/* transform: translateY(100%); */
/* opacity: 0; */
/* transition: opacity 200ms; */
z-index: 98;
}
.modal-content {
position: fixed;
z-index: 99;
top: 0;
right: 70rpx;
/* transition: transform 300ms;
transform: translateY(100%); */
}
.share-modal-list{
position: fixed;
bottom: 0;
z-index: 99;
width: 100%;
/* transition: transform 300ms;
transform: translateY(100%); */
}
.share-modal-item{
text-align: center;
color: #333333;
height: 88rpx;
line-height: 88rpx;
background-color: #ffffff;
margin-bottom: 2rpx;
}
.share-modal-item:last-child{
margin-bottom: 0;
margin-top: 8rpx;
}
src/pages/extendProduct/extendProduct.js
...@@ -7,7 +7,7 @@ Page({ ...@@ -7,7 +7,7 @@ Page({
data: { data: {
currentTab: 0, currentTab: 0,
isAllSelect: false, isAllSelect: false,
showShareModal:false
}, },
/** /**
...@@ -78,6 +78,14 @@ Page({ ...@@ -78,6 +78,14 @@ Page({
} }
}, },
//快速分享
onTapShare(){
console.log('111')
this.setData({
showShareModal: true
})
},
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
......
src/pages/extendProduct/extendProduct.json
{ {
"navigationBarTitleText": "推广商品", "navigationBarTitleText": "推广商品",
"usingComponents": {} "usingComponents": {
"share-modal": "/component/shareModal/shareModal"
}
} }
\ No newline at end of file
src/pages/extendProduct/extendProduct.wxml
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</view> </view>
</view> </view>
<view class="share-wrap"> <view class="share-wrap">
<view class="share-button"> <view class="share-button" bindtap="onTapShare">
<image mode="widthFix"></image> <image mode="widthFix"></image>
<text>快速分享</text> <text>快速分享</text>
</view> </view>
...@@ -114,3 +114,4 @@ ...@@ -114,3 +114,4 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<share-modal show="{{showShareModal}}" />
src/pages/userCenter/userCenter.js
...@@ -26,7 +26,8 @@ wxService.page({ ...@@ -26,7 +26,8 @@ wxService.page({
pageId: 3, pageId: 3,
baseUserInfo: null, baseUserInfo: null,
// cardMember: null, // cardMember: null,
pageBackgroundColor: 0 pageBackgroundColor: 0,
guidePageModalShow:true
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
......
src/pages/userCenter/userCenter.json
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem", "hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention" "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal"
} }
} }
\ No newline at end of file
src/pages/userCenter/userCenter.wxml
...@@ -50,4 +50,5 @@ ...@@ -50,4 +50,5 @@
</block>--> </block>-->
</view> </view>
<!--<authorization-modal isAuthorization='{{isAuthorization}}' />--> <!--<authorization-modal isAuthorization='{{isAuthorization}}' />-->
<guide-page-modal show="{{guidePageModalShow}}" />
src/project.config.json
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 31, "current": 32,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -250,6 +250,12 @@ ...@@ -250,6 +250,12 @@
"pathName": "subPackage/page/pages/grassCommunity/grassCommunity", "pathName": "subPackage/page/pages/grassCommunity/grassCommunity",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "我的邀请",
"pathName": "subPackage/page/pages/myInvite/myInvite",
"scene": null
} }
] ]
} }
......
src/subPackage/page/pages/myInvite/myInvite.js 0 → 100644
// subPackage/page/pages/myInvite/myInvite.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/subPackage/page/pages/myInvite/myInvite.json 0 → 100644
{
"navigationBarTitleText": "我的邀请",
"usingComponents": {}
}
\ No newline at end of file
src/subPackage/page/pages/myInvite/myInvite.wxml 0 → 100644
<!--subPackage/page/pages/myInvite/myInvite.wxml-->
<view class="page-my-invite">
<view class="release-num weui-flex df-j--bt">
<view class="num-invite df-1 border_box">
<view class="share-number">1287</view>
<view class="share-title">当前邀请人数</view>
</view>
<view class="extension-line"></view>
<view class="num-invite-yesterday df-1 border_box">
<view class="share-number">87</view>
<view class="share-title">昨日邀请新增</view>
</view>
</view>
<view class="invite-banner">
<image ></image>
</view>
<view class="order-benefit-wrap">
<view class="order-benefit-list">
<view class="top-info">
<image class="invite-avatar"></image>
<view class="invite-phone">
<view class="order-num">18355407690</view>
<view class="order-date">2019-03-24 至 2019-06-23</view>
</view>
</view>
<view class="bottom-info">
<view>
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
<view>
<image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
<view>
<image src="/assets/imgs/7_1_0/experience.png" class="experience-icon" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
<view>
<image src="/assets/imgs/7_1_0/share-value.png" class="share-value" mode="widthFix"></image>
<text class="benefit-num">100</text>
</view>
</view>
</view>
</view>
<view class="benefit-tips">
<text>邀请好友只显示前50名</text>
</view>
</view>
\ No newline at end of file
src/subPackage/page/pages/myInvite/myInvite.wxss 0 → 100644
/* subPackage/page/pages/myInvite/myInvite.wxss */
@import './../../../../base/base.wxss';
.release-num {
height: 120rpx;
background: linear-gradient(to right, rgba(192,154,116,0.2) 69%,rgba(207,179,150,0.1) 100%);
align-items: center;
}
/* .num-invite {
border-right: 1rpx solid #C09A74 ;
} */
.extension-line{
width: 3rpx;
height: 50rpx;
background-color: rgba(192, 154, 116, 0.2);
}
.num-invite, .num-invite-yesterday {
text-align: center;
margin: 25rpx 0 30rpx 0 ;
}
.share-number{
color: #333333;
font-size: 42rpx;
}
.share-title{
font-size: 18rpx;
color: #666666;
}
.invite-banner{
padding: 0 20rpx;
margin-top: 20rpx;
}
.invite-banner image{
width: 712rpx;
height: 298rpx;
border-radius: 17rpx;
background-color: rgba(216, 216, 216, 1);
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
}
.order-benefit-wrap{
margin-top: 8rpx;
padding: 0 20rpx;
}
.order-benefit-list{
border-radius: 10rpx;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
padding: 33rpx 20rpx 36rpx;
margin-top: 20rpx;
}
.top-info{
border-bottom: 1px solid rgba(151,151,151,0.3);
padding: 0 0 15rpx 29rpx;
display: flex;
}
.order-num{
color: #333333;
}
.order-date{
color: #aaaaaa;
font-size: 20rpx;
margin-top: 5rpx;
}
.bottom-info{
padding: 16rpx 60rpx 0 29rpx;
display: flex;
justify-content: space-between;
}
.integral-icon{
width: 36rpx;
vertical-align: middle;
}
.coupon-icon{
width: 29rpx;
height: 29rpx;
vertical-align: middle;
}
.experience-icon{
width: 51rpx;
vertical-align: middle;
}
.share-value{
width: 40rpx;
vertical-align: middle;
}
.benefit-num{
color: #333333;
font-size: 18rpx;
vertical-align: middle;
margin-left: 15rpx;
}
.benefit-tips{
width: 750rpx;
height: 53rpx;
background-color: rgba(0, 0, 0, 0.25);
position: fixed;
bottom: 0;
line-height: 53rpx;
color: #ffffff;
font-size: 20rpx;
text-align: center;
}
.invite-avatar{
width: 68rpx;
height: 68rpx;
background-color: rgba(216, 216, 216, 1);
border: 1px solid rgba(151, 151, 151, 1);
border-radius: 50%;
vertical-align: middle;
}
.invite-phone{
vertical-align: middle;
margin-left: 32rpx;
}
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