xt / xcx-book · Commits

Go to a project

Commit 5dbbf3a50d99d51717f32e78ea8dbf7c04dcbf45

Authored by liuxuqing
1 parent 23532019
build: skipped

套餐提醒

Inline Side-by-side
Showing 24 changed files with 266 additions and 36 deletions
@@ -312,3 +312,11 @@ image{ @@ -312,3 +312,11 @@ image{
312 content: ""; 312 content: "";
313 display: block; 313 display: block;
314 } 314 }
  315 +.notice{
  316 + width: 16rpx;
  317 + height: 16rpx;
  318 + border-radius: 50%;
  319 + background: #FA5151;
  320 + margin-bottom: 44rpx;
  321 + margin-left: -8rpx;
  322 +}
1 <!--components/2.0/pinglun/card.wxml--> 1 <!--components/2.0/pinglun/card.wxml-->
2 <wxs src="../../../utils/util.wxs" module="util" /> 2 <wxs src="../../../utils/util.wxs" module="util" />
3 <view class="view flex align-center justify-center margin-bottom {{cla}}"> 3 <view class="view flex align-center justify-center margin-bottom {{cla}}">
4 - <view class="cu-avatar round lg" style="background-image: url('{{post.author_image}}')"></view> 4 + <view class="cu-avatar round lg" style="background-image: url('{{post.isnoshow==1 ? 'http://nosqn.colorcun.com/noshow.jpg' : post.author_image}}');width: 72rpx;height: 72rpx;border-radius: 50%;" ></view>
5 <view class="flex-treble flex flex-direction margin-left-sm"> 5 <view class="flex-treble flex flex-direction margin-left-sm">
6 - <view class="txt-24-h text-bold margin-bottom-sm">{{post.author}}</view> 6 + <view class="txt-24-h text-bold margin-bottom-sm" style="margin-bottom: 10rpx;">{{post.isnoshow==1 ? '匿名用户' : post.author}}</view>
7 <stat value="{{post.grade}}" cla="card" disabled></stat> 7 <stat value="{{post.grade}}" cla="card" disabled></stat>
8 </view> 8 </view>
9 <view class="text-gray txt-24-h {{hasStatus?'hasStatus status-'+post.status:''}}">{{util.unixtoTime(post.create_time,'YYYY-MM-DD')}}</view> 9 <view class="text-gray txt-24-h {{hasStatus?'hasStatus status-'+post.status:''}}">{{util.unixtoTime(post.create_time,'YYYY-MM-DD')}}</view>
  1 +import util from '../../../utils/util';
  2 +import App from '../../../utils/api';
  3 +let systeminfo=wx.getSystemInfoSync();
  4 +let ratio=750/systeminfo.windowWidth,distance=systeminfo.windowHeight*ratio*0.3-78;
  5 +Component({
  6 + properties:{
  7 + pos:{
  8 + type:Object,
  9 + value:{
  10 + left:0,
  11 + top:distance,
  12 + right:0
  13 + }
  14 + },
  15 + },
  16 + data:{
  17 + shownotice:false,
  18 + },
  19 + attached(){
  20 + this.getautomenu();
  21 + },
  22 + methods:{
  23 + gotoList(e){
  24 + getApp().meListType=util.attr(e,'type')
  25 + wx.switchTab({
  26 + url:'/pages/me/list?type='+util.attr(e,'type')
  27 + })
  28 + },
  29 + getautomenu(){
  30 + console.log('tttttttt')
  31 + App.Foodset.GetUserFoodOrders({
  32 + status:2,//tabType,
  33 + openid: getApp().openid,
  34 + offset:1,
  35 + limit:1,
  36 + size:1,
  37 + }).then(res=>{
  38 + if(res.data.length>0){
  39 + this.setData({
  40 + shownotice:true
  41 + })
  42 + }
  43 + })
  44 + },
  45 + }
  46 +})
  1 +{
  2 + "component": true
  3 +}
  1 +<cover-view style="top:{{pos.top}}rpx;left:{{pos.left}}rpx;right:{{pos.right}}rpx;" class="notice-cover" bindtap="gotoList" data-type="5" wx:if="{{shownotice}}">
  2 + <cover-view class="taocan-notice flex-lr">
  3 + <cover-view class="font28r" style="color:#FA7268;font-weight: bold;">您有一个套餐券待使用</cover-view>
  4 + <cover-view class="notice-look font26r flex-cc">查看</cover-view>
  5 + </cover-view>
  6 + <cover-image src="http://nosqn.colorcun.com/nouse.jpg" class="taocan-image"></cover-image>
  7 +</cover-view>
  1 +@import "../../../app.wxss";
  2 +.notice-cover{
  3 + padding-top: 20rpx;
  4 + position: absolute;
  5 + z-index: 2;
  6 +}
  7 +.taocan-notice{
  8 + width: 100%;
  9 + height: 96rpx;
  10 + padding: 0 40rpx 28rpx 136rpx;
  11 + box-sizing: border-box;
  12 + border-radius: 20rpx 20rpx 0pt 0pt;
  13 + background: linear-gradient(to right, #FFF1EF , #E1ECF8);
  14 +}
  15 +.taocan-image{
  16 + width: 96rpx;
  17 + height: 80rpx;
  18 + position: absolute;
  19 + top: 0rpx;
  20 + left: 20rpx;
  21 +}
  22 +.notice-look{
  23 + width: 92rpx;
  24 + height: 48rpx;
  25 + border:2rpx solid #FA7268;
  26 + border-radius: 26rpx;
  27 + color: #FA7268;
  28 +}
@@ -15,6 +15,7 @@ Page({ @@ -15,6 +15,7 @@ Page({
15 * 生命周期函数--监听页面加载 15 * 生命周期函数--监听页面加载
16 */ 16 */
17 onLoad: function (options) { 17 onLoad: function (options) {
  18 + console.log(options,'uuuuu');
18 this.options=options 19 this.options=options
19 if(options.sid){ 20 if(options.sid){
20 this.setData({ 21 this.setData({
@@ -12,7 +12,8 @@ Page({ @@ -12,7 +12,8 @@ Page({
12 hasManagerInvitation:false, 12 hasManagerInvitation:false,
13 extraData:{ 13 extraData:{
14 id:55214, 14 id:55214,
15 - } 15 + },
  16 + shownotice:false,
16 }, 17 },
17 /** 18 /**
18 * 生命周期函数--监听页面加载 19 * 生命周期函数--监听页面加载
@@ -108,5 +109,20 @@ Page({ @@ -108,5 +109,20 @@ Page({
108 wx.switchTab({ 109 wx.switchTab({
109 url:'/pages/me/list?type='+util.attr(e,'type') 110 url:'/pages/me/list?type='+util.attr(e,'type')
110 }) 111 })
111 - } 112 + },
  113 + getautomenu(){
  114 + App.Foodset.GetUserFoodOrders({
  115 + status:2,//tabType,
  116 + openid: getApp().openid,
  117 + offset:1,
  118 + limit:1,
  119 + size:1,
  120 + }).then(res=>{
  121 + if(res.data.length>0){
  122 + this.setData({
  123 + shownotice:true
  124 + })
  125 + }
  126 + })
  127 + },
112 }) 128 })
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@
63 <view class="item-name flex-ll"> 63 <view class="item-name flex-ll">
64 <view class="taocan"></view> 64 <view class="taocan"></view>
65 <view>我的套餐</view> 65 <view>我的套餐</view>
  66 + <view class="notice" wx:if="{{shownotice==true}}"></view>
66 </view> 67 </view>
67 <view class="more"></view> 68 <view class="more"></view>
68 </view> 69 </view>
@@ -25,6 +25,7 @@ Page({ @@ -25,6 +25,7 @@ Page({
25 offset:0, 25 offset:0,
26 limit:10, 26 limit:10,
27 hasMore:true, 27 hasMore:true,
  28 + shownotice:false,
28 /** 29 /**
29 * 生命周期函数--监听页面加载 30 * 生命周期函数--监听页面加载
30 */ 31 */
@@ -51,6 +52,9 @@ Page({ @@ -51,6 +52,9 @@ Page({
51 onShow: function () { 52 onShow: function () {
52 PubSub.emit('custom-tab-bar') 53 PubSub.emit('custom-tab-bar')
53 console.log('getApp().meListType',getApp().meListType) 54 console.log('getApp().meListType',getApp().meListType)
  55 + if(getApp().meListType && getApp().meListType<5){
  56 + this.getautomenu();
  57 + }
54 if(!getApp().meListType) getApp().meListType=defTabType 58 if(!getApp().meListType) getApp().meListType=defTabType
55 if(this.data.list[this.tabType].length<1 || getApp().meListType!=this.tabType){ 59 if(this.data.list[this.tabType].length<1 || getApp().meListType!=this.tabType){
56 if(getApp().meListType!=this.tabType) { 60 if(getApp().meListType!=this.tabType) {
@@ -122,6 +126,21 @@ Page({ @@ -122,6 +126,21 @@ Page({
122 // } 126 // }
123 }) 127 })
124 }, 128 },
  129 + getautomenu(){
  130 + App.Foodset.GetUserFoodOrders({
  131 + status:2,//tabType,
  132 + openid: getApp().openid,
  133 + offset:1,
  134 + limit:1,
  135 + size:1,
  136 + }).then(res=>{
  137 + if(res.data.length>0){
  138 + this.setData({
  139 + shownotice:true
  140 + })
  141 + }
  142 + })
  143 + },
125 formatList(list) { 144 formatList(list) {
126 if (list.length<1) return []; 145 if (list.length<1) return [];
127 if(this.tabType>4) return list; 146 if(this.tabType>4) return list;
@@ -2,7 +2,10 @@ @@ -2,7 +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<5?'active':''}} margin-right-lg" data-type="1" bindtap="switchType">我的订单</view> 4 <view class="view item {{tabType<5?'active':''}} margin-right-lg" data-type="1" bindtap="switchType">我的订单</view>
5 - <view class="view item {{tabType>4?'active':''}}" data-type="5" bindtap="switchType">我的套餐</view> 5 + <view class="view item {{tabType>4?'active':''}} flex-ll" data-type="5" bindtap="switchType">
  6 + <view>我的套餐</view>
  7 + <view class="notice" wx:if="{{shownotice==true}}"></view>
  8 + </view>
6 </view> 9 </view>
7 </nav> 10 </nav>
8 <view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<5}}"> 11 <view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<5}}">
@@ -48,6 +48,7 @@ Page({ @@ -48,6 +48,7 @@ Page({
48 }, 48 },
49 files:[], //组件数据放入这里展示到页面上 49 files:[], //组件数据放入这里展示到页面上
50 hasAddFile:true,//出现上传加号 50 hasAddFile:true,//出现上传加号
  51 + isnoshow:1, //是否匿名
51 }, 52 },
52 53
53 /** 54 /**
@@ -200,10 +201,11 @@ Page({ @@ -200,10 +201,11 @@ Page({
200 text:this.text||'', 201 text:this.text||'',
201 types:1, 202 types:1,
202 grade:this.statVal, 203 grade:this.statVal,
  204 + isnoshow:this.data.isnoshow
203 } 205 }
204 App.User.SetComment(params).then(res=>{ 206 App.User.SetComment(params).then(res=>{
205 if(res.ret!=200){ 207 if(res.ret!=200){
206 - return util.toast(res.msg,'') 208 + return util.toast(res.msg,'');
207 } 209 }
208 wx.redirectTo({ 210 wx.redirectTo({
209 url:'./success?sellername='+this.options.sellername 211 url:'./success?sellername='+this.options.sellername
@@ -211,5 +213,10 @@ Page({ @@ -211,5 +213,10 @@ Page({
211 }).catch(e=>{ 213 }).catch(e=>{
212 this.submitIng=false 214 this.submitIng=false
213 }) 215 })
214 - } 216 + },
  217 + setnoshow(){
  218 + this.setData({
  219 + isnoshow:!this.data.isnoshow
  220 + })
  221 + },
215 }) 222 })
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <textarea 23 <textarea
24 class="margin-top-lg text-df textarea" 24 class="margin-top-lg text-df textarea"
25 bindinput="textareaInput" 25 bindinput="textareaInput"
26 - placeholder="从包间环境、菜品口味、服务来评价餐厅，可以帮助更多想要订这家餐厅的人哦～"></textarea> 26 + placeholder="从包间环境、菜品口味、服务来评价餐厅，可以帮助更多想要订这家餐厅的人哦～" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
27 </view> 27 </view>
28 <scroll-view class="view" 28 <scroll-view class="view"
29 scroll-into-view="{{scrollIntoView}}" 29 scroll-into-view="{{scrollIntoView}}"
@@ -66,6 +66,12 @@ @@ -66,6 +66,12 @@
66 66
67 <view id="scrollIntoView" class="qnupload" style="width: 0;"></view> 67 <view id="scrollIntoView" class="qnupload" style="width: 0;"></view>
68 </scroll-view> 68 </scroll-view>
  69 + <view class="flex-ll reamrk-noshow">
  70 + <view class="remark-ratio flex-cc {{isnoshow==1 ? 'active' : 'border'}}" bindtap="setnoshow">
  71 + <image src="http://nosqn.colorcun.com/right.jpg" wx:if="isnoshow==1"></image>
  72 + </view>
  73 + <view class="black-font font30r" bindtap="setnoshow">匿名评价</view>
  74 + </view>
69 </view> 75 </view>
70 <view class="bg-blue-blue submit text-bold txt-36-h round flex align-center justify-center" bindtap="submit">发布评价</view> 76 <view class="bg-blue-blue submit text-bold txt-36-h round flex align-center justify-center" bindtap="submit">发布评价</view>
71 </page> 77 </page>
@@ -95,4 +95,24 @@ @@ -95,4 +95,24 @@
95 font-weight: 400; 95 font-weight: 400;
96 color: #999999!important; 96 color: #999999!important;
97 line-height: 42rpx; 97 line-height: 42rpx;
  98 +}
  99 +.remark-ratio{
  100 + width: 36rpx;
  101 + height: 36rpx;
  102 + border-radius: 50%;
  103 + margin-right: 20rpx;
  104 +}
  105 +.remark-ratio.border{
  106 + border:2rpx solid #CCCCCC;
  107 +}
  108 +.remark-ratio.active{
  109 + background: linear-gradient(#FFC140,#FFA000);
  110 +}
  111 +.remark-ratio image{
  112 + width: 27rpx;
  113 + height: 18rpx;
  114 +}
  115 +.reamrk-noshow{
  116 + padding: 44rpx 40rpx 0;
  117 + box-sizing: border-box;
98 } 118 }
@@ -11,6 +11,21 @@ Page({ @@ -11,6 +11,21 @@ Page({
11 sellers:[], 11 sellers:[],
12 hasMore:true, 12 hasMore:true,
13 activity:null, 13 activity:null,
  14 + discountlist:[
  15 + {
  16 + name:'超值套餐',
  17 + slogan:'尝遍特色菜品 就选超值套餐'
  18 + },
  19 + {
  20 + name:'线下特惠',
  21 + slogan:'先预订再就餐 享受会员特惠'
  22 + },
  23 + {
  24 + name:'买单优惠',
  25 + slogan:'使用平台买单 多重优惠叠加'
  26 + },
  27 + ],
  28 + tabidx:0,
14 }, 29 },
15 sellers:[], 30 sellers:[],
16 /** 31 /**
@@ -19,7 +34,10 @@ Page({ @@ -19,7 +34,10 @@ Page({
19 options:null, 34 options:null,
20 onLoad: function (options) { 35 onLoad: function (options) {
21 //latitude=34.215637&longitude=108.891264&scale=16&height=397 36 //latitude=34.215637&longitude=108.891264&scale=16&height=397
22 - this.options=options 37 + this.options=options;
  38 + this.setData({
  39 + tabidx:options.tabidx,
  40 + })
23 }, 41 },
24 formatSellers(data){ 42 formatSellers(data){
25 let sellers=[]; 43 let sellers=[];
@@ -156,5 +174,11 @@ Page({ @@ -156,5 +174,11 @@ Page({
156 }) 174 })
157 } 175 }
158 }) 176 })
  177 + },
  178 + switchdiscount(e){
  179 + let tabidx=util.attr(e,'tabidx');
  180 + this.setData({
  181 + tabidx:tabidx,
  182 + })
159 } 183 }
160 }) 184 })
@@ -11,8 +11,14 @@ @@ -11,8 +11,14 @@
11 <view class="banner-image-bottom"></view> 11 <view class="banner-image-bottom"></view>
12 </navigator> 12 </navigator>
13 </view> 13 </view>
  14 + <view class="flex-lr discount-list">
  15 + <view wx:for="{{discountlist}}" class="discount-item flex-vc" data-tabidx="{{index}}" bindtap="switchdiscount">
  16 + <view class="gray-deep-font font32r {{index==tabidx ? 'text-bold font-orange' : ''}}" style="line-height: 44rpx;margin-bottom: 14rpx;">{{item.name}}</view>
  17 + <view class="discount-border {{index==tabidx ? 'active' : ''}}"></view>
  18 + </view>
  19 + </view>
14 <view class="follow" style="margin-top: {{activity?96:32}}rpx;"> 20 <view class="follow" style="margin-top: {{activity?96:32}}rpx;">
15 - <view class="biaoyu">先预订再就餐 优惠又安心</view> 21 + <view class="biaoyu">{{discountlist[tabidx].slogan}}</view>
16 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key" 22 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
17 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}"> 23 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
18 <sb-tr seller="{{item}}" 24 <sb-tr seller="{{item}}"
1 /* pages/reserve/discount.wxss */ 1 /* pages/reserve/discount.wxss */
  2 +@import "../../colorui/main.wxss";
2 page{ 3 page{
3 background-color: #F5F5F5; 4 background-color: #F5F5F5;
4 } 5 }
@@ -46,7 +47,7 @@ page{ @@ -46,7 +47,7 @@ page{
46 text-align: center; 47 text-align: center;
47 margin-left: calc(50% - 264rpx); 48 margin-left: calc(50% - 264rpx);
48 position: relative; 49 position: relative;
49 - margin-bottom: 30rpx; 50 + margin-bottom: 160rpx;
50 } 51 }
51 .biaoyu:after,.biaoyu:before{ 52 .biaoyu:after,.biaoyu:before{
52 content:""; 53 content:"";
@@ -63,4 +64,22 @@ page{ @@ -63,4 +64,22 @@ page{
63 background-image: url("http://nosqn.colorcun.com/activity/ar.png"); 64 background-image: url("http://nosqn.colorcun.com/activity/ar.png");
64 right:0; 65 right:0;
65 left: auto; 66 left: auto;
  67 +}
  68 +.discount-list{
  69 + width: 100%;
  70 + padding: 20rpx 60rpx 0;
  71 + box-sizing: border-box;
  72 +}
  73 +.discount-item{
  74 + padding-top: 20rpx;
  75 +}
  76 +.font-orange{
  77 + color: #F05522;
  78 +}
  79 +.discount-border{
  80 + width: 96rpx;
  81 + height: 6rpx;
  82 +}
  83 +.discount-border.active{
  84 + background: #F05522;
66 } 85 }
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 "filter-group":"/components/2.0/filter/filter-group", 8 "filter-group":"/components/2.0/filter/filter-group",
9 "seller-card":"/components/2.0/seller/card", 9 "seller-card":"/components/2.0/seller/card",
10 "chatbot":"/components/userinfo/chatbot", 10 "chatbot":"/components/userinfo/chatbot",
11 - "as-phone":"/components/2.0/dialog/phone" 11 + "as-phone":"/components/2.0/dialog/phone",
  12 + "taocan-notice":"/components/2.0/taocan/notice"
12 } 13 }
13 } 14 }
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 <image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image> 20 <image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
21 </view> 21 </view>
22 </view> 22 </view>
  23 +<taocan-notice></taocan-notice>
23 <view class="view content padding-top-xs" style="height: 70vh;"> 24 <view class="view content padding-top-xs" style="height: 70vh;">
24 <filter-group height="{{height}}" 25 <filter-group height="{{height}}"
25 id="filter-group" 26 id="filter-group"
@@ -11,6 +11,11 @@ Page({ @@ -11,6 +11,11 @@ Page({
11 data: { 11 data: {
12 location:'获取中...', 12 location:'获取中...',
13 hasFilter:false,// 13 hasFilter:false,//
  14 + taocanpos:{
  15 + top:193,
  16 + left:30,
  17 + right:30
  18 + }
14 }, 19 },
15 20
16 /** 21 /**
@@ -109,17 +114,17 @@ Page({ @@ -109,17 +114,17 @@ Page({
109 this.position=e.detail.position 114 this.position=e.detail.position
110 this.setData({ 115 this.setData({
111 location:e.detail.isAddr?e.detail.address:e.detail.city.name, 116 location:e.detail.isAddr?e.detail.address:e.detail.city.name,
112 - IsSetActivityByFoods:false, 117 + IsSetActivityByFoods:true,
113 sellers:[], 118 sellers:[],
114 }) 119 })
115 - App.Customer.IsSetActivityByFoods({  
116 - pid:this.city.pid,  
117 - code:this.city.code,  
118 - }).then(res=>{  
119 - this.setData({  
120 - IsSetActivityByFoods:res.data,  
121 - })  
122 - }) 120 + // App.Customer.IsSetActivityByFoods({
  121 + // pid:this.city.pid,
  122 + // code:this.city.code,
  123 + // }).then(res=>{
  124 + // this.setData({
  125 + // IsSetActivityByFoods:res.data,
  126 + // })
  127 + // })
123 this.GetRecomList() 128 this.GetRecomList()
124 }, 129 },
125 filterParams:null, 130 filterParams:null,
@@ -146,12 +151,13 @@ Page({ @@ -146,12 +151,13 @@ Page({
146 } 151 }
147 }, 152 },
148 goPath(e){ 153 goPath(e){
149 - let path=util.attr(e,'path'); 154 + let path=util.attr(e,'path'),tabidx=util.attr(e,'tabidx');
150 wx.navigateTo({ 155 wx.navigateTo({
151 url:util.http_build_query({ 156 url:util.http_build_query({
152 filter:this.filterParams?JSON.stringify(this.filterParams):null, 157 filter:this.filterParams?JSON.stringify(this.filterParams):null,
153 city:JSON.stringify(this.city), 158 city:JSON.stringify(this.city),
154 hows:JSON.stringify(this.findSellerData), 159 hows:JSON.stringify(this.findSellerData),
  160 + tabidx:tabidx,
155 },path) 161 },path)
156 }) 162 })
157 }, 163 },
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 "location":"/components/2.0/filter/location", 7 "location":"/components/2.0/filter/location",
8 "filter":"/components/2.0/filter/filter", 8 "filter":"/components/2.0/filter/filter",
9 "seller-card":"/components/2.0/seller/card", 9 "seller-card":"/components/2.0/seller/card",
10 - "as-phone":"/components/2.0/dialog/phone" 10 + "as-phone":"/components/2.0/dialog/phone",
  11 + "taocan-notice":"/components/2.0/taocan/notice"
11 } 12 }
12 } 13 }
1 <!--pages/reserve/home.wxml--> 1 <!--pages/reserve/home.wxml-->
2 <view class="view header"> 2 <view class="view header">
3 - <image src="http://nosqn.colorcun.com/search/s%20%281%29.png" 3 + <image src="http://nosqn.colorcun.com/search/s%20%281%29.png"
4 style="z-index: 1" 4 style="z-index: 1"
5 mode="widthFix" class="bg-img"></image> 5 mode="widthFix" class="bg-img"></image>
  6 + <taocan-notice pos="{{taocanpos}}"></taocan-notice>
6 </view> 7 </view>
7 <view class="view search margin-lr padding-top-0 padding-lr-lg padding-bottom-lg"> 8 <view class="view search margin-lr padding-top-0 padding-lr-lg padding-bottom-lg">
8 <view class="view solid-bottom flex justify-around align-center" style="height: 110rpx;"> 9 <view class="view solid-bottom flex justify-around align-center" style="height: 110rpx;">
@@ -35,14 +36,13 @@ @@ -35,14 +36,13 @@
35 查找包间 36 查找包间
36 </view> 37 </view>
37 </view> 38 </view>
38 -<view wx:if="{{IsSetActivityByFoods}}" class="margin-top-lg padding-lr-lg padding-top-lg" bindtap="goPath"  
39 - data-path="/pages/reserve/discount"> 39 +<view wx:if="{{IsSetActivityByFoods}}" class="margin-top-lg padding-lr-lg padding-top-lg">
40 <view class="txt-40-h text-bold margin-bottom">精选特惠</view> 40 <view class="txt-40-h text-bold margin-bottom">精选特惠</view>
41 - <view class="flex justify-center align-center">  
42 - <view class="view youhui-image image1" style=""></view> 41 + <view class="flex justify-center align-center" >
  42 + <view class="view youhui-image image1" style="" data-tabidx="0" data-path="/pages/reserve/discount" bindtap="goPath"></view>
43 <view class="margin-left-xs"> 43 <view class="margin-left-xs">
44 - <view class="view youhui-image image2"></view>  
45 - <view class="view youhui-image image3 margin-top-xs"></view> 44 + <view class="view youhui-image image2" data-tabidx="1" data-path="/pages/reserve/discount" bindtap="goPath"></view>
  45 + <view class="view youhui-image image3 margin-top-xs" data-tabidx="2" data-path="/pages/reserve/discount" bindtap="goPath"></view>
46 </view> 46 </view>
47 </view> 47 </view>
48 </view> 48 </view>
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 } 6 }
7 .bg-img{ 7 .bg-img{
8 width: 100%; 8 width: 100%;
  9 + height: 604rpx;
9 } 10 }
10 .header:before{ 11 .header:before{
11 width: calc(100% - 60rpx); 12 width: calc(100% - 60rpx);
@@ -76,12 +76,6 @@ @@ -76,12 +76,6 @@
76 } 76 }
77 }, 77 },
78 "condition": { 78 "condition": {
79 - "search": {  
80 - "list": []  
81 - },  
82 - "conversation": {  
83 - "list": []  
84 - },  
85 "plugin": { 79 "plugin": {
86 "list": [] 80 "list": []
87 }, 81 },
@@ -685,6 +679,18 @@ @@ -685,6 +679,18 @@
685 "pathName": "pack-book/pages/book/b_index", 679 "pathName": "pack-book/pages/book/b_index",
686 "query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=roomtype/roomtype", 680 "query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763&goPath=roomtype/roomtype",
687 "scene": null 681 "scene": null
  682 + },
  683 + {
  684 + "name": "booking/pack-book/pages/checkout/index",
  685 + "pathName": "booking/pack-book/pages/checkout/index",
  686 + "query": "rid=153180",
  687 + "scene": null
  688 + },
  689 + {
  690 + "name": "pack-checkout/pages/index",
  691 + "pathName": "pack-checkout/pages/index",
  692 + "query": "rid=153180&sid=1297",
  693 + "scene": null
688 } 694 }
689 ] 695 ]
690 } 696 }