Commit 59fe6c586e1c1d843e3cdb936c7b7af7fec19bd0

Authored by pengye
1 parent 8b6e29f9

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

@@ -71,7 +71,8 @@ @@ -71,7 +71,8 @@
71 "pages/customer/joinSeller", 71 "pages/customer/joinSeller",
72 "pages/customer/collectSeller", 72 "pages/customer/collectSeller",
73 "pages/customer/detail_owner_invitation_new", 73 "pages/customer/detail_owner_invitation_new",
74 - "pages/customer/detail_owner_invitation9" 74 + "pages/customer/detail_owner_invitation9",
  75 + "pages/me/invitation"
75 ], 76 ],
76 "requiredPrivateInfos": [ 77 "requiredPrivateInfos": [
77 "getLocation", 78 "getLocation",
@@ -21,19 +21,19 @@ @@ -21,19 +21,19 @@
21 <block wx:else> 21 <block wx:else>
22 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-order-active'}}" data-path="/pages/me/list">订单</view> 22 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-order-active'}}" data-path="/pages/me/list">订单</view>
23 </block> 23 </block>
24 - <block wx:if="{{'pages/reserve/index'!=url}}"> 24 + <!-- <block wx:if="{{'pages/reserve/index'!=url}}">
25 <view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-home-active'}}" bindtap="topagerelunch" data-path="/pages/reserve/index">首页</view> 25 <view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-home-active'}}" bindtap="topagerelunch" data-path="/pages/reserve/index">首页</view>
26 </block> 26 </block>
27 <block wx:else> 27 <block wx:else>
28 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-home-active'}}" data-path="/pages/me/index">首页</view> 28 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-home-active'}}" data-path="/pages/me/index">首页</view>
29 - </block> 29 + </block> -->
30 <block wx:if="{{'pages/me/follow'!=url}}"> 30 <block wx:if="{{'pages/me/follow'!=url}}">
31 <view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-collection-active'}}" bindtap="topage" data-path="/pages/me/follow">收藏</view> 31 <view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-collection-active'}}" bindtap="topage" data-path="/pages/me/follow">收藏</view>
32 </block> 32 </block>
33 <block wx:else> 33 <block wx:else>
34 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-collection-active'}}" data-path="/pages/me/follow">收藏</view> 34 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-collection-active'}}" data-path="/pages/me/follow">收藏</view>
35 </block> 35 </block>
36 - <block wx:if="{{'pages/me/list'!=url}}"> 36 + <!-- <block wx:if="{{'pages/me/list'!=url}}">
37 <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">套餐 37 <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">套餐
38 <view class="notice" wx:if="{{shownotice==true}}"></view> 38 <view class="notice" wx:if="{{shownotice==true}}"></view>
39 </view> 39 </view>
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" data-path="/pages/me/list">套餐 42 <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" data-path="/pages/me/list">套餐
43 <view class="notice" wx:if="{{shownotice==true}}"></view> 43 <view class="notice" wx:if="{{shownotice==true}}"></view>
44 </view> 44 </view>
45 - </block> 45 + </block> -->
46 <block wx:if="{{'pages/me/coupon_news'!=url}}"> 46 <block wx:if="{{'pages/me/coupon_news'!=url}}">
47 <view class="menu-item white-font font30r smooth flex-vc {{menuhidden ? '' : 'menu-item-card-active'}}" bindtap="topage" data-path="/pages/me/coupon_news"> 47 <view class="menu-item white-font font30r smooth flex-vc {{menuhidden ? '' : 'menu-item-card-active'}}" bindtap="topage" data-path="/pages/me/coupon_news">
48 <view class="font24r">卡包</view> 48 <view class="font24r">卡包</view>
@@ -55,6 +55,16 @@ @@ -55,6 +55,16 @@
55 <view class="font24r">({{user.customer_activity}})</view> 55 <view class="font24r">({{user.customer_activity}})</view>
56 </view> 56 </view>
57 </block> 57 </block>
  58 + <!-- <block wx:if="{{'pages/me/invitation'!=url}}">
  59 + <view class="menu-item white-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" bindtap="topage" data-path="/pages/me/invitation">邀约
  60 + <view class="notice" wx:if="{{shownotice==true}}"></view>
  61 + </view>
  62 + </block>
  63 + <block wx:else>
  64 + <view class="menu-item gray-font font30r smooth flex-cc {{menuhidden ? '' : 'menu-item-package-active'}}" data-path="/pages/me/invitation">邀约
  65 + <view class="notice" wx:if="{{shownotice==true}}"></view>
  66 + </view>
  67 + </block> -->
58 </view> 68 </view>
59 <!-- <view class="menu-list flex-vl" style="justify-content: flex-end;" hidden="{{menuhidden}}" bindtap="hidemenu"> 69 <!-- <view class="menu-list flex-vl" style="justify-content: flex-end;" hidden="{{menuhidden}}" bindtap="hidemenu">
60 <view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu"> 70 <view class="menu-item menu-seller-item flex-ll" bindtap="hidemenu">
@@ -80,8 +90,8 @@ @@ -80,8 +90,8 @@
80 </view> 90 </view>
81 </block> 91 </block>
82 </view> --> 92 </view> -->
83 -<block wx:if="{{'pages/reserve/search'!=url && 'pages/reserve/searchKeyword'!=url}}"> 93 +<!-- <block wx:if="{{'pages/reserve/search'!=url && 'pages/reserve/searchKeyword'!=url}}">
84 <view class="menu-search-fixed flex-vc" bindtap="tosearch" data-path="/pages/reserve/search"> 94 <view class="menu-search-fixed flex-vc" bindtap="tosearch" data-path="/pages/reserve/search">
85 <view class="white-font font22r smooth" style="color: #42A5FF;">搜索</view> 95 <view class="white-font font22r smooth" style="color: #42A5FF;">搜索</view>
86 </view> 96 </view>
87 -</block>  
  97 +</block> -->
@@ -83,8 +83,8 @@ @@ -83,8 +83,8 @@
83 } 83 }
84 .menu-item-order-active{ 84 .menu-item-order-active{
85 opacity: 1; 85 opacity: 1;
86 - left: 106rpx;  
87 - top: -146rpx; 86 + left: 128rpx;
  87 + top: -128rpx;
88 } 88 }
89 .menu-item-home-active{ 89 .menu-item-home-active{
90 opacity: 1; 90 opacity: 1;
@@ -94,17 +94,17 @@ @@ -94,17 +94,17 @@
94 .menu-item-collection-active{ 94 .menu-item-collection-active{
95 opacity: 1; 95 opacity: 1;
96 left: 171rpx; 96 left: 171rpx;
97 - top: 56rpx; 97 + top: -14rpx;
98 } 98 }
99 .menu-item-package-active{ 99 .menu-item-package-active{
100 opacity: 1; 100 opacity: 1;
101 - left: 106rpx;  
102 - top: 146rpx; 101 + left: 0rpx;
  102 + top: 170rpx;
103 } 103 }
104 .menu-item-card-active{ 104 .menu-item-card-active{
105 opacity: 1; 105 opacity: 1;
106 - left: 0rpx;  
107 - top: 180rpx; 106 + left: 122rpx;
  107 + top: 110rpx;
108 } 108 }
109 .menu-item-image{ 109 .menu-item-image{
110 width: 100rpx; 110 width: 100rpx;
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <view class="money-title">我的收藏</view> 19 <view class="money-title">我的收藏</view>
20 </view> 20 </view>
21 </navigator> 21 </navigator>
22 - <navigator url="/pack-activity/pages/money" class="money-item"> 22 + <!-- <navigator url="/pack-activity/pages/money" class="money-item">
23 <view class="flex-vc"> 23 <view class="flex-vc">
24 <view class="money-value">¥{{user.balance.price||0}}</view> 24 <view class="money-value">¥{{user.balance.price||0}}</view>
25 <view class="money-title">余额</view> 25 <view class="money-title">余额</view>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <view class="money-value">{{user.card}}</view> 30 <view class="money-value">{{user.card}}</view>
31 <view class="money-title">红包</view> 31 <view class="money-title">红包</view>
32 </view> 32 </view>
33 - </navigator> 33 + </navigator> -->
34 <navigator url="./coupon_news" class="money-item"> 34 <navigator url="./coupon_news" class="money-item">
35 <view class="flex-vc"> 35 <view class="flex-vc">
36 <view class="money-value">{{user.customer_activity}}</view> 36 <view class="money-value">{{user.customer_activity}}</view>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 </view> --> 76 </view> -->
77 </view> 77 </view>
78 </view> 78 </view>
79 - <view class="block-list" style="margin-bottom: 20rpx;" bindtap="gotoList" data-type="7"> 79 + <!-- <view class="block-list" style="margin-bottom: 20rpx;" bindtap="gotoList" data-type="7">
80 <view class="item flex-lr"> 80 <view class="item flex-lr">
81 <view class="item-name flex-ll"> 81 <view class="item-name flex-ll">
82 <view class="taocan"></view> 82 <view class="taocan"></view>
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 </view> 85 </view>
86 <view class="more"></view> 86 <view class="more"></view>
87 </view> 87 </view>
88 - </view> 88 + </view> -->
89 <view class="block-rev actions"> 89 <view class="block-rev actions">
90 <view class="title flex-lr"> 90 <view class="title flex-lr">
91 <view >常用操作</view> 91 <view >常用操作</view>
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 </view> 139 </view>
140 </view> 140 </view>
141 </button> 141 </button>
142 - <navigator 142 + <!-- <navigator
143 target="miniProgram" 143 target="miniProgram"
144 open-type="navigate" 144 open-type="navigate"
145 app-id="wx8abaf00ee8c3202e" 145 app-id="wx8abaf00ee8c3202e"
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 </view> 152 </view>
153 <view class="more"></view> 153 <view class="more"></view>
154 </view> 154 </view>
155 - </navigator> 155 + </navigator> -->
156 <!-- 156 <!--
157 <navigator 157 <navigator
158 url="/pages/reserve/index_yy" open-type="redirect" hover-class="other-navigator-hover"> 158 url="/pages/reserve/index_yy" open-type="redirect" hover-class="other-navigator-hover">
  1 +// pages/me/invitation.js
  2 +import util from '../../utils/util';
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + sellers: [],
  10 + },
  11 +
  12 + /**
  13 + * 生命周期函数--监听页面加载
  14 + */
  15 + onLoad(options) {
  16 + this.getList()
  17 + },
  18 + getList() {
  19 + let arr = [{
  20 + id: '795457',
  21 + ddate: '1724295600',
  22 + rname: '有薯条',
  23 + sex: '2',
  24 + sellerName: ' 东顺赶海济南奥体中心旗舰店',
  25 + ddate_solt: '2',
  26 + room: '101',
  27 + seller_image: 'http://libpc.colorcun.com/20240819110041_90f6ae8ac7e135697fbb4dbab15040f3',
  28 + }]
  29 + arr.forEach(i => {
  30 + i.ddateStr = util.unixtoTime(i.ddate, 'MM月DD日')
  31 + i.ddateYear = util.unixtoTime(i.ddate, 'YYYY年MM月DD日')
  32 + i.week = util.unixtoTime(i.ddate, '周WW')
  33 + i.mealStr = i.ddate_solt == '1' ? '早餐' : i.ddate_solt == '2' ? '午餐' : i.ddate_solt == '3' ? '晚餐' : ''
  34 + })
  35 + this.setData({
  36 + sellers: arr
  37 + })
  38 + },
  39 + /**
  40 + * 生命周期函数--监听页面初次渲染完成
  41 + */
  42 + onReady() {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 生命周期函数--监听页面显示
  48 + */
  49 + onShow() {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 生命周期函数--监听页面隐藏
  55 + */
  56 + onHide() {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 生命周期函数--监听页面卸载
  62 + */
  63 + onUnload() {
  64 +
  65 + },
  66 +
  67 + /**
  68 + * 页面相关事件处理函数--监听用户下拉动作
  69 + */
  70 + onPullDownRefresh() {
  71 +
  72 + },
  73 +
  74 + /**
  75 + * 页面上拉触底事件的处理函数
  76 + */
  77 + onReachBottom() {
  78 +
  79 + },
  80 +
  81 + /**
  82 + * 用户点击右上角分享
  83 + */
  84 + onShareAppMessage() {
  85 +
  86 + }
  87 +})
  1 +{
  2 + "navigationBarBackgroundColor": "#ffffff",
  3 + "navigationBarTextStyle": "white",
  4 + "navigationBarTitleText":"受邀函",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav"
  7 + }
  8 + }
  1 +<!--pages/me/invitation.wxml-->
  2 +<nav hasHome id='nav'>受邀函</nav>
  3 +<view class="pages">
  4 + <view class="entry" wx:for="{{sellers}}" wx:key="item.id">
  5 + <view class="imgs">
  6 + <image src="{{item.seller_image}}" mode="aspectFill" />
  7 + <view class="maskBox">
  8 + <view class="maskTop">
  9 + {{item.sellerName}}
  10 + </view>
  11 + <view class="maskCenter">
  12 + <text>{{item.ddateStr}}</text>
  13 + <view>{{item.week}}<text>{{item.mealStr}}</text></view>
  14 + </view>
  15 + </view>
  16 + </view>
  17 + <view class="info">
  18 + <view class="title"><text>刘先生</text>邀请您</view>
  19 + <view>{{item.sellerName}}</view>
  20 + <view>{{item.ddateYear}}{{item.mealStr}}</view>
  21 + <view>{{item.room}}</view>
  22 + </view>
  23 + </view>
  24 +</view>
  1 +/* pages/me/invitation.wxss */
  2 +.entry {
  3 + box-shadow: 0 0 8rpx rgba(0, 0, 0, 0.25);
  4 + margin: 24rpx 24rpx 36rpx 24rpx;
  5 + padding: 20rpx;
  6 + border-radius: 10px;
  7 + display: flex;
  8 +}
  9 +
  10 +.imgs {
  11 + position: relative;
  12 + width: 240rpx;
  13 + height: 192rpx;
  14 + margin-right: 40rpx;
  15 +}
  16 +
  17 +.imgs image {
  18 + position: absolute;
  19 + width: 100%;
  20 + height: 100%;
  21 +}
  22 +
  23 +.imgs .maskBox {
  24 + position: absolute;
  25 + width: 100%;
  26 + height: 100%;
  27 + background-color: rgba(0, 0, 0, 0.4);
  28 +}
  29 +
  30 +.imgs .maskTop {
  31 + position: absolute;
  32 + top: 6rpx;
  33 + left: 12rpx;
  34 + right: 12rpx;
  35 + font-size: 20rpx;
  36 + color: #FFEFC5;
  37 + text-align: center;
  38 + overflow: hidden;
  39 + word-break: break-all;
  40 + text-overflow: ellipsis;
  41 + display: -webkit-box;
  42 + -webkit-box-orient: vertical;
  43 + -webkit-line-clamp: 2;
  44 +}
  45 +
  46 +.maskCenter {
  47 + position: absolute;
  48 + top: 70rpx;
  49 + left: 20rpx;
  50 + right: 20rpx;
  51 + color: #FFEFC5;
  52 + text-align: center;
  53 + font-size: 26rpx;
  54 + display: flex;
  55 + flex-direction: column;
  56 + font-weight: bold;
  57 +}
  58 +
  59 +.maskCenter view text {
  60 + margin-left: 16rpx;
  61 +}
  62 +
  63 +.info {
  64 + color: #626262;
  65 + line-height: 48rpx;
  66 + font-size: 28rpx;
  67 +}
  68 +
  69 +.info .title {
  70 + color: #000;
  71 +
  72 +}
  73 +
  74 +.info .title text {
  75 + font-weight: 600;
  76 + font-size: 30rpx;
  77 +}
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <nav> 2 <nav>
3 <view class="view header-tabs flex align-end"> 3 <view class="view header-tabs flex align-end">
4 <view class="view item {{tabType<7?'active':''}} margin-right-lg" data-type="1" bindtap="switchType">我的订单</view> 4 <view class="view item {{tabType<7?'active':''}} margin-right-lg" data-type="1" bindtap="switchType">我的订单</view>
5 - <view class="view item {{tabType>6?'active':''}} flex-ll" data-type="7" bindtap="switchType"> 5 + <!-- <view class="view item {{tabType>6?'active':''}} flex-ll" data-type="7" bindtap="switchType">
6 <view>我的套餐</view> 6 <view>我的套餐</view>
7 <view class="notice" wx:if="{{shownotice==true}}"></view> 7 <view class="notice" wx:if="{{shownotice==true}}"></view>
8 - </view> 8 + </view> -->
9 </view> 9 </view>
10 </nav> 10 </nav>
11 <view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<7}}"> 11 <view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<7}}">