xt / xcx-book · Commits

Go to a project

Commit 59fe6c586e1c1d843e3cdb936c7b7af7fec19bd0

Authored by pengye
1 parent 8b6e29f9
build: skipped

我的、首页页面隐藏套餐、红包等入口，受邀函页面提交

Inline Side-by-side
Showing 9 changed files with 229 additions and 22 deletions
... ... @@ -71,7 +71,8 @@
"pages/customer/joinSeller",
"pages/customer/collectSeller",
"pages/customer/detail_owner_invitation_new",
"pages/customer/detail_owner_invitation9"
"pages/customer/detail_owner_invitation9",
"pages/me/invitation"
],
"requiredPrivateInfos": [
"getLocation",
... ...
... ... @@ -21,19 +21,19 @@
<block wx:else>
<view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-order-active'}}" data-path="/pages/me/list">订单</view>
</block>
<block wx:if="{{'pages/reserve/index'!=url}}">
<!-- <block wx:if="{{'pages/reserve/index'!=url}}">
<view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-home-active'}}" bindtap="topagerelunch" data-path="/pages/reserve/index">首页</view>
</block>
<block wx:else>
<view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-home-active'}}" data-path="/pages/me/index">首页</view>
</block>
</block> -->
<block wx:if="{{'pages/me/follow'!=url}}">
<view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-collection-active'}}" bindtap="topage" data-path="/pages/me/follow">收藏</view>
</block>
<block wx:else>
<view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-collection-active'}}" data-path="/pages/me/follow">收藏</view>
</block>
<block wx:if="{{'pages/me/list'!=url}}">
<!-- <block wx:if="{{'pages/me/list'!=url}}">
<view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" bindtap="gotoList" data-path="/pages/me/list" data-type="7">套餐
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
... ... @@ -42,7 +42,7 @@
<view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" data-path="/pages/me/list">套餐
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
</block>
</block> -->
<block wx:if="{{'pages/me/coupon_news'!=url}}">
<view class="menu-item white-font font30r smooth flex-vc {{menuhidden ? '' : 'menu-item-card-active'}}" bindtap="topage" data-path="/pages/me/coupon_news">
<view class="font24r">卡包</view>
... ... @@ -55,6 +55,16 @@
<view class="font24r">({{user.customer_activity}})</view>
</view>
</block>
<!-- <block wx:if="{{'pages/me/invitation'!=url}}">
<view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" bindtap="topage" data-path="/pages/me/invitation">邀约
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
</block>
<block wx:else>
<view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" data-path="/pages/me/invitation">邀约
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
</block> -->
</view>
<!-- <view class="menu-list flex-vl" style="justify-content: flex-end;" hidden="{{menuhidden}}" bindtap="hidemenu">
<view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu">
... ... @@ -80,8 +90,8 @@
</view>
</block>
</view> -->
<block wx:if="{{'pages/reserve/search'!=url && 'pages/reserve/searchKeyword'!=url}}">
<!-- <block wx:if="{{'pages/reserve/search'!=url && 'pages/reserve/searchKeyword'!=url}}">
<view class="menu-search-fixed flex-vc" bindtap="tosearch" data-path="/pages/reserve/search">
<view class="white-font font22r smooth" style="color: #42A5FF;">搜索</view>
</view>
</block>
\ No newline at end of file
</block> -->
\ No newline at end of file
... ...
... ... @@ -83,8 +83,8 @@
}
.menu-item-order-active{
opacity: 1;
left: 106rpx;
top: -146rpx;
left: 128rpx;
top: -128rpx;
}
.menu-item-home-active{
opacity: 1;
... ... @@ -94,17 +94,17 @@
.menu-item-collection-active{
opacity: 1;
left: 171rpx;
top: 56rpx;
top: -14rpx;
}
.menu-item-package-active{
opacity: 1;
left: 106rpx;
top: 146rpx;
left: 0rpx;
top: 170rpx;
}
.menu-item-card-active{
opacity: 1;
left: 0rpx;
top: 180rpx;
left: 122rpx;
top: 110rpx;
}
.menu-item-image{
width: 100rpx;
... ...
... ... @@ -19,7 +19,7 @@
<view class="money-title">我的收藏</view>
</view>
</navigator>
<navigator url="/pack-activity/pages/money" class="money-item">
<!-- <navigator url="/pack-activity/pages/money" class="money-item">
<view class="flex-vc">
<view class="money-value">￥{{user.balance.price||0}}</view>
<view class="money-title">余额</view>
... ... @@ -30,7 +30,7 @@
<view class="money-value">{{user.card}}</view>
<view class="money-title">红包</view>
</view>
</navigator>
</navigator> -->
<navigator url="./coupon_news" class="money-item">
<view class="flex-vc">
<view class="money-value">{{user.customer_activity}}</view>
... ... @@ -76,7 +76,7 @@
</view> -->
</view>
</view>
<view class="block-list" style="margin-bottom: 20rpx;" bindtap="gotoList" data-type="7">
<!-- <view class="block-list" style="margin-bottom: 20rpx;" bindtap="gotoList" data-type="7">
<view class="item flex-lr">
<view class="item-name flex-ll">
<view class="taocan"></view>
... ... @@ -85,7 +85,7 @@
</view>
<view class="more"></view>
</view>
</view>
</view> -->
<view class="block-rev actions">
<view class="title flex-lr">
<view >常用操作</view>
... ... @@ -139,7 +139,7 @@
</view>
</view>
</button>
<navigator
<!-- <navigator
target="miniProgram"
open-type="navigate"
app-id="wx8abaf00ee8c3202e"
... ... @@ -152,7 +152,7 @@
</view>
<view class="more"></view>
</view>
</navigator>
</navigator> -->
<!--
<navigator
url="/pages/reserve/index_yy" open-type="redirect" hover-class="other-navigator-hover">
... ...
// pages/me/invitation.js
import util from '../../utils/util';
Page({
/**
* 页面的初始数据
*/
data: {
sellers: [],
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
this.getList()
},
getList() {
let arr = [{
id: '795457',
ddate: '1724295600',
rname: '有薯条',
sex: '2',
sellerName: ' 东顺赶海济南奥体中心旗舰店',
ddate_solt: '2',
room: '101',
seller_image: 'http://libpc.colorcun.com/20240819110041_90f6ae8ac7e135697fbb4dbab15040f3',
}]
arr.forEach(i => {
i.ddateStr = util.unixtoTime(i.ddate, 'MM月DD日')
i.ddateYear = util.unixtoTime(i.ddate, 'YYYY年MM月DD日')
i.week = util.unixtoTime(i.ddate, '周WW')
i.mealStr = i.ddate_solt == '1' ? '早餐' : i.ddate_solt == '2' ? '午餐' : i.ddate_solt == '3' ? '晚餐' : ''
})
this.setData({
sellers: arr
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})
\ No newline at end of file
... ...
{
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "white",
"navigationBarTitleText":"受邀函",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pages/me/invitation.wxml-->
<nav hasHome id='nav'>受邀函</nav>
<view class="pages">
<view class="entry" wx:for="{{sellers}}" wx:key="item.id">
<view class="imgs">
<image src="{{item.seller_image}}" mode="aspectFill" />
<view class="maskBox">
<view class="maskTop">
{{item.sellerName}}
</view>
<view class="maskCenter">
<text>{{item.ddateStr}}</text>
<view>{{item.week}}<text>{{item.mealStr}}</text></view>
</view>
</view>
</view>
<view class="info">
<view class="title"><text>刘先生</text>邀请您</view>
<view>{{item.sellerName}}</view>
<view>{{item.ddateYear}}{{item.mealStr}}</view>
<view>{{item.room}}</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
/* pages/me/invitation.wxss */
.entry {
box-shadow: 0 0 8rpx rgba(0, 0, 0, 0.25);
margin: 24rpx 24rpx 36rpx 24rpx;
padding: 20rpx;
border-radius: 10px;
display: flex;
}
.imgs {
position: relative;
width: 240rpx;
height: 192rpx;
margin-right: 40rpx;
}
.imgs image {
position: absolute;
width: 100%;
height: 100%;
}
.imgs .maskBox {
position: absolute;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.4);
}
.imgs .maskTop {
position: absolute;
top: 6rpx;
left: 12rpx;
right: 12rpx;
font-size: 20rpx;
color: #FFEFC5;
text-align: center;
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.maskCenter {
position: absolute;
top: 70rpx;
left: 20rpx;
right: 20rpx;
color: #FFEFC5;
text-align: center;
font-size: 26rpx;
display: flex;
flex-direction: column;
font-weight: bold;
}
.maskCenter view text {
margin-left: 16rpx;
}
.info {
color: #626262;
line-height: 48rpx;
font-size: 28rpx;
}
.info .title {
color: #000;
}
.info .title text {
font-weight: 600;
font-size: 30rpx;
}
\ No newline at end of file
... ...
... ... @@ -2,10 +2,10 @@
<nav>
<view class="view header-tabs flex align-end">
<view class="view item {{tabType<7?'active':''}} margin-right-lg" data-type="1" bindtap="switchType">我的订单</view>
<view class="view item {{tabType>6?'active':''}} flex-ll" data-type="7" bindtap="switchType">
<!-- <view class="view item {{tabType>6?'active':''}} flex-ll" data-type="7" bindtap="switchType">
<view>我的套餐</view>
<view class="notice" wx:if="{{shownotice==true}}"></view>
</view>
</view> -->
</view>
</nav>
<view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<7}}">
... ...