xt / xcx-book · Commits

Go to a project

Commit f77d22b120fc8cda6efb08012a37477523ed5de0

Authored by pengye
1 parent 697feb24
build: skipped

商家详情页入口从reserve/detail地址改为reserve/shopHome

Inline Side-by-side
Showing 40 changed files with 48 additions and 46 deletions
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 </view> 29 </view>
30 </block> 30 </block>
31 </view> 31 </view>
32 - <navigator url="/pages/reserve/detail?id={{post.sid}}" catchtap="catchtap" 32 + <navigator url="/pages/reserve/shopHome?id={{post.sid}}" catchtap="catchtap"
33 hover-class="navigator-hover" wx:if="{{hasSeller && post.sellerinfo}}"> 33 hover-class="navigator-hover" wx:if="{{hasSeller && post.sellerinfo}}">
34 <view class="view padding-sm flex align-center radius10 margin-bottom-sm" style="background-color: #F8F8F8;"> 34 <view class="view padding-sm flex align-center radius10 margin-bottom-sm" style="background-color: #F8F8F8;">
35 <view class="cu-avatar lg radius10 margin-right-sm" 35 <view class="cu-avatar lg radius10 margin-right-sm"
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 bindscrolltolower="getListMore" 54 bindscrolltolower="getListMore"
55 style="width:100%;height: calc(100vh - 65px);"> 55 style="width:100%;height: calc(100vh - 65px);">
56 <block wx:for="{{sellers}}" wx:key="sellers" > 56 <block wx:for="{{sellers}}" wx:key="sellers" >
57 - <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover"> 57 + <navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
58 <seller-card class="seller-card" id="seller-{{item.id}}" 58 <seller-card class="seller-card" id="seller-{{item.id}}"
59 activeSellerID="{{activeSellerID}}" 59 activeSellerID="{{activeSellerID}}"
60 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card> 60 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
@@ -122,7 +122,7 @@ Component({ @@ -122,7 +122,7 @@ Component({
122 }, 122 },
123 gotoDetail(e){ 123 gotoDetail(e){
124 wx.navigateTo({ 124 wx.navigateTo({
125 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 125 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
126 }) 126 })
127 }, 127 },
128 } 128 }
@@ -67,7 +67,7 @@ Component({ @@ -67,7 +67,7 @@ Component({
67 desc:seller.slogan, 67 desc:seller.slogan,
68 category_list:(seller.cate && seller.cate.length>0)?seller.cate:['餐厅','饭店','餐饮','订包间','周到安排'], 68 category_list:(seller.cate && seller.cate.length>0)?seller.cate:['餐厅','饭店','餐饮','订包间','周到安排'],
69 image_list:seller.envi_image, 69 image_list:seller.envi_image,
70 - src_mini_program_path:'/pages/reserve/detail?id='+seller.id+'&from=haowu', 70 + src_mini_program_path:'/pages/reserve/shopHome?id='+seller.id+'&from=haowu',
71 brand_info:{ 71 brand_info:{
72 name:seller.sellername, 72 name:seller.sellername,
73 logo:seller.seller_image, 73 logo:seller.seller_image,
1 <!--components/seller-card/seller-card.wxml--> 1 <!--components/seller-card/seller-card.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 <view class="card {{hasOnlineReserve?'online':''}}"> 3 <view class="card {{hasOnlineReserve?'online':''}}">
4 - <formids url="{{hasOnlineReserve?'':('/pages/reserve/detail?id='+seller.id)}}" catchtap=""> 4 + <formids url="{{hasOnlineReserve?'':('/pages/reserve/shopHome?id='+seller.id)}}" catchtap="">
5 <view class="seller flex-lr"> 5 <view class="seller flex-lr">
6 <view class="flex-ll" style="max-width: {{hasShowStatus?'80%':'94%'}};"> 6 <view class="flex-ll" style="max-width: {{hasShowStatus?'80%':'94%'}};">
7 <view class="avatar" wx:if="{{seller.seller_image}}"> 7 <view class="avatar" wx:if="{{seller.seller_image}}">
@@ -164,7 +164,7 @@ Page({ @@ -164,7 +164,7 @@ Page({
164 getReserve() { 164 getReserve() {
165 clearTimeout(this.timers) 165 clearTimeout(this.timers)
166 wx.reLaunch({ 166 wx.reLaunch({
167 - url: '/pages/reserve/detail?id=' + this.data.detail.sellerid 167 + url: '/pages/reserve/shopHome?id=' + this.data.detail.sellerid
168 }) 168 })
169 }, 169 },
170 /** 170 /**
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <nav hasHome>我的红包</nav> 3 <nav hasHome>我的红包</nav>
4 <view class="pages" wx:if="{{list.length>0}}"> 4 <view class="pages" wx:if="{{list.length>0}}">
5 <view class="list-view list-view-{{item.sid}}" wx:for="{{list}}" wx:key="list"> 5 <view class="list-view list-view-{{item.sid}}" wx:for="{{list}}" wx:key="list">
6 - <navigator url="/pages/reserve/detail?id={{item.sid}}" hover-class="navigator-hover" wx:if="{{item.sid>0}}"> 6 + <navigator url="/pages/reserve/shopHome?id={{item.sid}}" hover-class="navigator-hover" wx:if="{{item.sid>0}}">
7 <view class="sellername flex-lr"> 7 <view class="sellername flex-lr">
8 <view>{{item.sellername}}</view> 8 <view>{{item.sellername}}</view>
9 <view class="flex-rr"> 9 <view class="flex-rr">
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <a2l bindshow="a2lshow" bindhide="a2lshow" key="BOOK-DETAIL" type="black" hitStr="通知客户"></a2l> 3 <a2l bindshow="a2lshow" bindhide="a2lshow" key="BOOK-DETAIL" type="black" hitStr="通知客户"></a2l>
4 <!--订单信息--> 4 <!--订单信息-->
5 <view class="order-info" wx:if="{{bookInfo}}" > 5 <view class="order-info" wx:if="{{bookInfo}}" >
6 - <navigator url="/pages/reserve/detail?id={{bookInfo.seller.id}}" wx:if="{{isAdmin}}"> 6 + <navigator url="/pages/reserve/shopHome?id={{bookInfo.seller.id}}" wx:if="{{isAdmin}}">
7 <view class="flex-lr order-detail"> 7 <view class="flex-lr order-detail">
8 <view class="gray-deep-font font30r">餐厅名称</view> 8 <view class="gray-deep-font font30r">餐厅名称</view>
9 <view class="flex-rr black-font font34r"> 9 <view class="flex-rr black-font font34r">
@@ -75,7 +75,7 @@ Page({ @@ -75,7 +75,7 @@ Page({
75 id:this.data.seller.id, 75 id:this.data.seller.id,
76 fromid:getApp().openid, 76 fromid:getApp().openid,
77 hasSellerShare:true, 77 hasSellerShare:true,
78 - },'/pages/reserve/detail') 78 + },'/pages/reserve/shopHome')
79 return { 79 return {
80 title:'请客订包间，就上周到安排', 80 title:'请客订包间，就上周到安排',
81 imageUrl:'https://xt04.colorcun.com/sellerShare/Share_'+this.data.seller.id+'.png?'+Math.random(), 81 imageUrl:'https://xt04.colorcun.com/sellerShare/Share_'+this.data.seller.id+'.png?'+Math.random(),
@@ -92,7 +92,7 @@ Page({ @@ -92,7 +92,7 @@ Page({
92 }, 92 },
93 gotoSellerShop(){ 93 gotoSellerShop(){
94 wx.navigateTo({ 94 wx.navigateTo({
95 - url:util.http_build_query({id:this.data.seller.id},'/pages/reserve/detail') 95 + url:util.http_build_query({id:this.data.seller.id},'/pages/reserve/shopHome')
96 }) 96 })
97 }, 97 },
98 }) 98 })
@@ -190,7 +190,7 @@ Page({ @@ -190,7 +190,7 @@ Page({
190 }, 190 },
191 secondbook(){ 191 secondbook(){
192 wx.redirectTo({ 192 wx.redirectTo({
193 - url:'../reserve/detail?id='+this.data.detail.seller.id 193 + url:'../reserve/shopHome?id='+this.data.detail.seller.id
194 }) 194 })
195 }, 195 },
196 setcoupon(){ 196 setcoupon(){
@@ -242,4 +242,4 @@ @@ -242,4 +242,4 @@
242 <template is="tpl-wenxin" data="{{...seller,options}}"></template> 242 <template is="tpl-wenxin" data="{{...seller,options}}"></template>
243 </template> 243 </template>
244 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT"></a2l> 244 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT"></a2l>
245 -<activity-tips str="￥price" pos="pages/reserve/detail" cla="detail-invitation"></activity-tips>  
  245 +<activity-tips str="￥price" pos="pages/reserve/shopHome" cla="detail-invitation"></activity-tips>
@@ -359,14 +359,14 @@ Page({ @@ -359,14 +359,14 @@ Page({
359 }, 359 },
360 gotoSellerDetail(e){ 360 gotoSellerDetail(e){
361 console.log(e) 361 console.log(e)
362 - let url='/pages/reserve/detail?id='+e.currentTarget.id 362 + let url='/pages/reserve/shopHome?id='+e.currentTarget.id
363 wx.navigateTo({ 363 wx.navigateTo({
364 url:url, 364 url:url,
365 }) 365 })
366 }, 366 },
367 onUnload(){ 367 onUnload(){
368 let pages = getCurrentPages(); 368 let pages = getCurrentPages();
369 - if(pages.length>2 && pages[pages.length-2].route=='pages/reserve/detail'){ 369 + if(pages.length>2 && pages[pages.length-2].route=='pages/reserve/shopHome'){
370 wx.setStorageSync('order', 'complete') 370 wx.setStorageSync('order', 'complete')
371 } 371 }
372 console.log(pages) 372 console.log(pages)
@@ -181,7 +181,7 @@ cli(){ @@ -181,7 +181,7 @@ cli(){
181 }) 181 })
182 }else{ 182 }else{
183 wx.redirectTo({ 183 wx.redirectTo({
184 - url:'../reserve/detail?id='+this.data.detail.seller.id 184 + url:'../reserve/shopHome?id='+this.data.detail.seller.id
185 }) 185 })
186 } 186 }
187 187
@@ -191,7 +191,7 @@ Page({ @@ -191,7 +191,7 @@ Page({
191 }) 191 })
192 } else { 192 } else {
193 wx.redirectTo({ 193 wx.redirectTo({
194 - url: '../reserve/detail?id=' + this.data.detail.seller.id 194 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
195 }) 195 })
196 } 196 }
197 197
@@ -686,7 +686,7 @@ Page({ @@ -686,7 +686,7 @@ Page({
686 secondbook() { 686 secondbook() {
687 wx.reportMonitor('1013', 1) 687 wx.reportMonitor('1013', 1)
688 wx.redirectTo({ 688 wx.redirectTo({
689 - url: '../reserve/detail?id=' + this.data.detail.seller.id 689 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
690 }) 690 })
691 }, 691 },
692 // 文字转语音的方法 692 // 文字转语音的方法
@@ -641,7 +641,7 @@ Page({ @@ -641,7 +641,7 @@ Page({
641 secondbook() { 641 secondbook() {
642 wx.reportMonitor('1013', 1) 642 wx.reportMonitor('1013', 1)
643 wx.redirectTo({ 643 wx.redirectTo({
644 - url: '../reserve/detail?id=' + this.data.detail.seller.id 644 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
645 }) 645 })
646 }, 646 },
647 // 文字转语音的方法 647 // 文字转语音的方法
@@ -641,7 +641,7 @@ Page({ @@ -641,7 +641,7 @@ Page({
641 secondbook() { 641 secondbook() {
642 wx.reportMonitor('1013', 1) 642 wx.reportMonitor('1013', 1)
643 wx.redirectTo({ 643 wx.redirectTo({
644 - url: '../reserve/detail?id=' + this.data.detail.seller.id 644 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
645 }) 645 })
646 }, 646 },
647 // 文字转语音的方法 647 // 文字转语音的方法
@@ -640,7 +640,7 @@ Page({ @@ -640,7 +640,7 @@ Page({
640 secondbook() { 640 secondbook() {
641 wx.reportMonitor('1013', 1) 641 wx.reportMonitor('1013', 1)
642 wx.redirectTo({ 642 wx.redirectTo({
643 - url: '../reserve/detail?id=' + this.data.detail.seller.id 643 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
644 }) 644 })
645 }, 645 },
646 // 文字转语音的方法 646 // 文字转语音的方法
@@ -592,7 +592,7 @@ Page({ @@ -592,7 +592,7 @@ Page({
592 secondbook() { 592 secondbook() {
593 wx.reportMonitor('1013', 1) 593 wx.reportMonitor('1013', 1)
594 wx.redirectTo({ 594 wx.redirectTo({
595 - url: '../reserve/detail?id=' + this.data.detail.seller.id 595 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
596 }) 596 })
597 }, 597 },
598 // 文字转语音的方法 598 // 文字转语音的方法
@@ -641,7 +641,7 @@ Page({ @@ -641,7 +641,7 @@ Page({
641 secondbook() { 641 secondbook() {
642 wx.reportMonitor('1013', 1) 642 wx.reportMonitor('1013', 1)
643 wx.redirectTo({ 643 wx.redirectTo({
644 - url: '../reserve/detail?id=' + this.data.detail.seller.id 644 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
645 }) 645 })
646 }, 646 },
647 // 文字转语音的方法 647 // 文字转语音的方法
@@ -640,7 +640,7 @@ Page({ @@ -640,7 +640,7 @@ Page({
640 secondbook() { 640 secondbook() {
641 wx.reportMonitor('1013', 1) 641 wx.reportMonitor('1013', 1)
642 wx.redirectTo({ 642 wx.redirectTo({
643 - url: '../reserve/detail?id=' + this.data.detail.seller.id 643 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
644 }) 644 })
645 }, 645 },
646 // 文字转语音的方法 646 // 文字转语音的方法
@@ -677,7 +677,7 @@ Page({ @@ -677,7 +677,7 @@ Page({
677 secondbook() { 677 secondbook() {
678 wx.reportMonitor('1013', 1) 678 wx.reportMonitor('1013', 1)
679 wx.redirectTo({ 679 wx.redirectTo({
680 - url: '../reserve/detail?id=' + this.data.detail.seller.id 680 + url: '../reserve/shopHome?id=' + this.data.detail.seller.id
681 }) 681 })
682 }, 682 },
683 // 文字转语音的方法 683 // 文字转语音的方法
@@ -22,7 +22,7 @@ Page({ @@ -22,7 +22,7 @@ Page({
22 }, 22 },
23 secondbook(){ 23 secondbook(){
24 wx.redirectTo({ 24 wx.redirectTo({
25 - url:'../reserve/detail?id='+this.options.sid 25 + url:'../reserve/shopHome?id='+this.options.sid
26 }) 26 })
27 }, 27 },
28 }) 28 })
@@ -162,7 +162,7 @@ Page({ @@ -162,7 +162,7 @@ Page({
162 }, 162 },
163 gotoDetail(e){ 163 gotoDetail(e){
164 wx.navigateTo({ 164 wx.navigateTo({
165 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 165 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
166 }) 166 })
167 }, 167 },
168 onpos(e){ 168 onpos(e){
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 </view> 7 </view>
8 <view class="follow" wx:else=""> 8 <view class="follow" wx:else="">
9 <block wx:for="{{sellers}}" wx:key="sellers" > 9 <block wx:for="{{sellers}}" wx:key="sellers" >
10 - <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover"> 10 + <navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
11 <seller-card class="seller-card" id="seller-{{item.id}}" 11 <seller-card class="seller-card" id="seller-{{item.id}}"
12 activeSellerID="{{activeSellerID}}" 12 activeSellerID="{{activeSellerID}}"
13 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card> 13 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
@@ -139,7 +139,7 @@ Page({ @@ -139,7 +139,7 @@ Page({
139 }, 139 },
140 gotoDetail(e){ 140 gotoDetail(e){
141 wx.navigateTo({ 141 wx.navigateTo({
142 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 142 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
143 }) 143 })
144 }, 144 },
145 onpos(e){ 145 onpos(e){
@@ -196,7 +196,7 @@ Page({ @@ -196,7 +196,7 @@ Page({
196 }, 196 },
197 gotoSellerDetail(e){ 197 gotoSellerDetail(e){
198 console.log(e) 198 console.log(e)
199 - let url='/pages/reserve/detail?id='+e.currentTarget.id 199 + let url='/pages/reserve/shopHome?id='+e.currentTarget.id
200 wx.navigateTo({ 200 wx.navigateTo({
201 url:url, 201 url:url,
202 }) 202 })
@@ -229,7 +229,7 @@ Page({ @@ -229,7 +229,7 @@ Page({
229 * 用户点击右上角分享 229 * 用户点击右上角分享
230 */ 230 */
231 onShareAppMessage: function () { 231 onShareAppMessage: function () {
232 - let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/detail') 232 + let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/shopHome')
233 //let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0' 233 //let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0'
234 let shareParams={ 234 let shareParams={
235 title:'请客订包间，就上周到安排', 235 title:'请客订包间，就上周到安排',
@@ -163,7 +163,7 @@ Page({ @@ -163,7 +163,7 @@ Page({
163 }, 163 },
164 gotoDetail(e){ 164 gotoDetail(e){
165 wx.navigateTo({ 165 wx.navigateTo({
166 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 166 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
167 }) 167 })
168 }, 168 },
169 onpos(e){ 169 onpos(e){
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 bindscroll="scrollEvent" 82 bindscroll="scrollEvent"
83 style="width:100%;height: calc(60vh - 50px);"> 83 style="width:100%;height: calc(60vh - 50px);">
84 <block wx:for="{{sellers}}" wx:key="sellers" > 84 <block wx:for="{{sellers}}" wx:key="sellers" >
85 - <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover"> 85 + <navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
86 <seller-card class="seller-card" id="seller-{{item.id}}" 86 <seller-card class="seller-card" id="seller-{{item.id}}"
87 activeSellerID="{{activeSellerID}}" 87 activeSellerID="{{activeSellerID}}"
88 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card> 88 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
@@ -348,7 +348,7 @@ Page({ @@ -348,7 +348,7 @@ Page({
348 }, 348 },
349 gotoDetail(e){ 349 gotoDetail(e){
350 wx.navigateTo({ 350 wx.navigateTo({
351 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 351 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
352 }) 352 })
353 }, 353 },
354 sellerFormat(sellers){ 354 sellerFormat(sellers){
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 bindscrolltolower="getListMore" 54 bindscrolltolower="getListMore"
55 style="width:100%;height: calc(100vh - 65px);"> 55 style="width:100%;height: calc(100vh - 65px);">
56 <block wx:for="{{sellers}}" wx:key="sellers" > 56 <block wx:for="{{sellers}}" wx:key="sellers" >
57 - <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover"> 57 + <navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
58 <seller-card class="seller-card" id="seller-{{item.id}}" 58 <seller-card class="seller-card" id="seller-{{item.id}}"
59 activeSellerID="{{activeSellerID}}" 59 activeSellerID="{{activeSellerID}}"
60 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card> 60 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
@@ -265,7 +265,7 @@ Page({ @@ -265,7 +265,7 @@ Page({
265 }, 265 },
266 gotoDetail(e){ 266 gotoDetail(e){
267 wx.navigateTo({ 267 wx.navigateTo({
268 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 268 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
269 }) 269 })
270 }, 270 },
271 sellerFormat(sellers){ 271 sellerFormat(sellers){
@@ -702,7 +702,7 @@ Page({ @@ -702,7 +702,7 @@ Page({
702 }, 702 },
703 gotoDetail(e){ 703 gotoDetail(e){
704 wx.navigateTo({ 704 wx.navigateTo({
705 - url:'/pages/reserve/detail?id='+util.attr(e,'sid') 705 + url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
706 }) 706 })
707 }, 707 },
708 IsSetActivity(){ 708 IsSetActivity(){
@@ -707,7 +707,7 @@ Page({ @@ -707,7 +707,7 @@ Page({
707 }, 707 },
708 todetail(e){ 708 todetail(e){
709 let seller=this.data.sellers[e.currentTarget.dataset.index]; 709 let seller=this.data.sellers[e.currentTarget.dataset.index];
710 - let url=util.http_build_query({id:seller.id},'/pages/reserve/detail'); 710 + let url=util.http_build_query({id:seller.id},'/pages/reserve/shopHome');
711 return wx.navigateTo({ 711 return wx.navigateTo({
712 url:url, 712 url:url,
713 }) 713 })
@@ -138,7 +138,7 @@ Page({ @@ -138,7 +138,7 @@ Page({
138 * 用户点击右上角分享 138 * 用户点击右上角分享
139 */ 139 */
140 onShareAppMessage: function () { 140 onShareAppMessage: function () {
141 - let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/detail') 141 + let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/shopHome')
142 //let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0' 142 //let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0'
143 let shareParams={ 143 let shareParams={
144 title:'请客订包间，就上周到安排', 144 title:'请客订包间，就上周到安排',
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <view wx:if="{{sellers.length>0}}" class="margin-tb-lg padding-tb-lg"> 50 <view wx:if="{{sellers.length>0}}" class="margin-tb-lg padding-tb-lg">
51 <view class="txt-40-h text-bold margin-bottom margin-lr-lg">为你推荐</view> 51 <view class="txt-40-h text-bold margin-bottom margin-lr-lg">为你推荐</view>
52 <view wx:for="{{sellers}}" wx:key="sellers" class="margin-lr-sm" > 52 <view wx:for="{{sellers}}" wx:key="sellers" class="margin-lr-sm" >
53 - <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover"> 53 + <navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
54 <seller-card class="seller-card" id="seller-{{item.id}}" 54 <seller-card class="seller-card" id="seller-{{item.id}}"
55 activeSellerID="{{activeSellerID}}" 55 activeSellerID="{{activeSellerID}}"
56 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card> 56 seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
@@ -298,7 +298,7 @@ Page({ @@ -298,7 +298,7 @@ Page({
298 } 298 }
299 }, 299 },
300 gotoSellerDetail(e){ 300 gotoSellerDetail(e){
301 - let url='/pages/reserve/detail?id='+e.currentTarget.id 301 + let url='/pages/reserve/shopHome?id='+e.currentTarget.id
302 wx.navigateTo({ 302 wx.navigateTo({
303 url:url, 303 url:url,
304 }) 304 })
@@ -39,13 +39,15 @@ Page({ @@ -39,13 +39,15 @@ Page({
39 * 生命周期函数--监听页面加载 39 * 生命周期函数--监听页面加载
40 */ 40 */
41 onLoad(options) { 41 onLoad(options) {
42 - if (options.sid) { 42 + // 新传参是sid 老页面传参是id
  43 + if (options.sid || options.id) {
  44 + let sid = options.sid || options.id
43 this.setData({ 45 this.setData({
44 - sid: options.sid 46 + sid
45 }) 47 })
46 - this.getDetail(options.sid)  
47 - this.getIsCollectionSellerFun(options.sid)  
48 - this.getSellerVersionFun(options.sid) 48 + this.getDetail(sid)
  49 + this.getIsCollectionSellerFun(sid)
  50 + this.getSellerVersionFun(sid)
49 } 51 }
50 }, 52 },
51 // 获取商家是否收藏状态 53 // 获取商家是否收藏状态
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <view class="imgMask"> 70 <view class="imgMask">
71 <view class="IntroduceColor"> 71 <view class="IntroduceColor">
72 <view class="chefText font36r" wx:if="{{chef.is_introduce || chef.is_images}}">主厨介绍</view> 72 <view class="chefText font36r" wx:if="{{chef.is_introduce || chef.is_images}}">主厨介绍</view>
73 - <view class="lines"></view> 73 + <view class="lines" wx:if="{{chef && ((chef.is_introduce || chef.is_images) || (!chef.is_introduce || chef.is_introduce!='0'))}}"></view>
74 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 74 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
75 <text class="texts">{{chef.introduce}} 75 <text class="texts">{{chef.introduce}}
76 </text> 76 </text>