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 @@
</view>
</block>
</view>
<navigator url="/pages/reserve/detail?id={{post.sid}}" catchtap="catchtap"
<navigator url="/pages/reserve/shopHome?id={{post.sid}}" catchtap="catchtap"
hover-class="navigator-hover" wx:if="{{hasSeller && post.sellerinfo}}">
<view class="view padding-sm flex align-center radius10 margin-bottom-sm" style="background-color: #F8F8F8;">
<view class="cu-avatar lg radius10 margin-right-sm"
... ...
... ... @@ -54,7 +54,7 @@
bindscrolltolower="getListMore"
style="width:100%;height: calc(100vh - 65px);">
<block wx:for="{{sellers}}" wx:key="sellers" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
... ...
... ... @@ -122,7 +122,7 @@ Component({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
}
... ...
... ... @@ -67,7 +67,7 @@ Component({
desc:seller.slogan,
category_list:(seller.cate && seller.cate.length>0)?seller.cate:['餐厅','饭店','餐饮','订包间','周到安排'],
image_list:seller.envi_image,
src_mini_program_path:'/pages/reserve/detail?id='+seller.id+'&from=haowu',
src_mini_program_path:'/pages/reserve/shopHome?id='+seller.id+'&from=haowu',
brand_info:{
name:seller.sellername,
logo:seller.seller_image,
... ...
<!--components/seller-card/seller-card.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<view class="card {{hasOnlineReserve?'online':''}}">
<formids url="{{hasOnlineReserve?'':('/pages/reserve/detail?id='+seller.id)}}" catchtap="">
<formids url="{{hasOnlineReserve?'':('/pages/reserve/shopHome?id='+seller.id)}}" catchtap="">
<view class="seller flex-lr">
<view class="flex-ll" style="max-width: {{hasShowStatus?'80%':'94%'}};">
<view class="avatar" wx:if="{{seller.seller_image}}">
... ...
... ... @@ -164,7 +164,7 @@ Page({
getReserve() {
clearTimeout(this.timers)
wx.reLaunch({
url: '/pages/reserve/detail?id=' + this.data.detail.sellerid
url: '/pages/reserve/shopHome?id=' + this.data.detail.sellerid
})
},
/**
... ...
... ... @@ -3,7 +3,7 @@
<nav hasHome>我的红包</nav>
<view class="pages" wx:if="{{list.length>0}}">
<view class="list-view list-view-{{item.sid}}" wx:for="{{list}}" wx:key="list">
<navigator url="/pages/reserve/detail?id={{item.sid}}" hover-class="navigator-hover" wx:if="{{item.sid>0}}">
<navigator url="/pages/reserve/shopHome?id={{item.sid}}" hover-class="navigator-hover" wx:if="{{item.sid>0}}">
<view class="sellername flex-lr">
<view>{{item.sellername}}</view>
<view class="flex-rr">
... ...
... ... @@ -3,7 +3,7 @@
<a2l bindshow="a2lshow" bindhide="a2lshow" key="BOOK-DETAIL" type="black" hitStr="通知客户"></a2l>
<!--订单信息-->
<view class="order-info" wx:if="{{bookInfo}}" >
<navigator url="/pages/reserve/detail?id={{bookInfo.seller.id}}" wx:if="{{isAdmin}}">
<navigator url="/pages/reserve/shopHome?id={{bookInfo.seller.id}}" wx:if="{{isAdmin}}">
<view class="flex-lr order-detail">
<view class="gray-deep-font font30r">餐厅名称</view>
<view class="flex-rr black-font font34r">
... ...
... ... @@ -75,7 +75,7 @@ Page({
id:this.data.seller.id,
fromid:getApp().openid,
hasSellerShare:true,
},'/pages/reserve/detail')
},'/pages/reserve/shopHome')
return {
title:'请客订包间，就上周到安排',
imageUrl:'https://xt04.colorcun.com/sellerShare/Share_'+this.data.seller.id+'.png?'+Math.random(),
... ... @@ -92,7 +92,7 @@ Page({
},
gotoSellerShop(){
wx.navigateTo({
url:util.http_build_query({id:this.data.seller.id},'/pages/reserve/detail')
url:util.http_build_query({id:this.data.seller.id},'/pages/reserve/shopHome')
})
},
})
\ No newline at end of file
... ...
... ... @@ -190,7 +190,7 @@ Page({
},
secondbook(){
wx.redirectTo({
url:'../reserve/detail?id='+this.data.detail.seller.id
url:'../reserve/shopHome?id='+this.data.detail.seller.id
})
},
setcoupon(){
... ...
... ... @@ -242,4 +242,4 @@
<template is="tpl-wenxin" data="{{...seller,options}}"></template>
</template>
<a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT"></a2l>
<activity-tips str="￥price" pos="pages/reserve/detail" cla="detail-invitation"></activity-tips>
\ No newline at end of file
<activity-tips str="￥price" pos="pages/reserve/shopHome" cla="detail-invitation"></activity-tips>
\ No newline at end of file
... ...
... ... @@ -359,14 +359,14 @@ Page({
},
gotoSellerDetail(e){
console.log(e)
let url='/pages/reserve/detail?id='+e.currentTarget.id
let url='/pages/reserve/shopHome?id='+e.currentTarget.id
wx.navigateTo({
url:url,
})
},
onUnload(){
let pages = getCurrentPages();
if(pages.length>2 && pages[pages.length-2].route=='pages/reserve/detail'){
if(pages.length>2 && pages[pages.length-2].route=='pages/reserve/shopHome'){
wx.setStorageSync('order', 'complete')
}
console.log(pages)
... ...
... ... @@ -181,7 +181,7 @@ cli(){
})
}else{
wx.redirectTo({
url:'../reserve/detail?id='+this.data.detail.seller.id
url:'../reserve/shopHome?id='+this.data.detail.seller.id
})
}
... ...
... ... @@ -191,7 +191,7 @@ Page({
})
} else {
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
}
... ...
... ... @@ -686,7 +686,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -641,7 +641,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -641,7 +641,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -640,7 +640,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -592,7 +592,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -641,7 +641,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -640,7 +640,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -677,7 +677,7 @@ Page({
secondbook() {
wx.reportMonitor('1013', 1)
wx.redirectTo({
url: '../reserve/detail?id=' + this.data.detail.seller.id
url: '../reserve/shopHome?id=' + this.data.detail.seller.id
})
},
// 文字转语音的方法
... ...
... ... @@ -22,7 +22,7 @@ Page({
},
secondbook(){
wx.redirectTo({
url:'../reserve/detail?id='+this.options.sid
url:'../reserve/shopHome?id='+this.options.sid
})
},
})
\ No newline at end of file
... ...
... ... @@ -162,7 +162,7 @@ Page({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
onpos(e){
... ...
... ... @@ -7,7 +7,7 @@
</view>
<view class="follow" wx:else="">
<block wx:for="{{sellers}}" wx:key="sellers" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
... ...
... ... @@ -139,7 +139,7 @@ Page({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
onpos(e){
... ...
... ... @@ -196,7 +196,7 @@ Page({
},
gotoSellerDetail(e){
console.log(e)
let url='/pages/reserve/detail?id='+e.currentTarget.id
let url='/pages/reserve/shopHome?id='+e.currentTarget.id
wx.navigateTo({
url:url,
})
... ...
... ... @@ -229,7 +229,7 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage: function () {
let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/detail')
let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/shopHome')
//let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0'
let shareParams={
title:'请客订包间，就上周到安排',
... ...
... ... @@ -163,7 +163,7 @@ Page({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
onpos(e){
... ...
... ... @@ -82,7 +82,7 @@
bindscroll="scrollEvent"
style="width:100%;height: calc(60vh - 50px);">
<block wx:for="{{sellers}}" wx:key="sellers" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
... ...
... ... @@ -348,7 +348,7 @@ Page({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
sellerFormat(sellers){
... ...
... ... @@ -54,7 +54,7 @@
bindscrolltolower="getListMore"
style="width:100%;height: calc(100vh - 65px);">
<block wx:for="{{sellers}}" wx:key="sellers" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
... ...
... ... @@ -265,7 +265,7 @@ Page({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
sellerFormat(sellers){
... ...
... ... @@ -702,7 +702,7 @@ Page({
},
gotoDetail(e){
wx.navigateTo({
url:'/pages/reserve/detail?id='+util.attr(e,'sid')
url:'/pages/reserve/shopHome?id='+util.attr(e,'sid')
})
},
IsSetActivity(){
... ...
... ... @@ -707,7 +707,7 @@ Page({
},
todetail(e){
let seller=this.data.sellers[e.currentTarget.dataset.index];
let url=util.http_build_query({id:seller.id},'/pages/reserve/detail');
let url=util.http_build_query({id:seller.id},'/pages/reserve/shopHome');
return wx.navigateTo({
url:url,
})
... ...
... ... @@ -138,7 +138,7 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage: function () {
let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/detail')
let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/shopHome')
//let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0'
let shareParams={
title:'请客订包间，就上周到安排',
... ...
... ... @@ -50,7 +50,7 @@
<view wx:if="{{sellers.length>0}}" class="margin-tb-lg padding-tb-lg">
<view class="txt-40-h text-bold margin-bottom margin-lr-lg">为你推荐</view>
<view wx:for="{{sellers}}" wx:key="sellers" class="margin-lr-sm" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<navigator url="/pages/reserve/shopHome?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
... ...
... ... @@ -298,7 +298,7 @@ Page({
}
},
gotoSellerDetail(e){
let url='/pages/reserve/detail?id='+e.currentTarget.id
let url='/pages/reserve/shopHome?id='+e.currentTarget.id
wx.navigateTo({
url:url,
})
... ...
... ... @@ -39,13 +39,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
if (options.sid) {
// 新传参是sid 老页面传参是id
if (options.sid || options.id) {
let sid = options.sid || options.id
this.setData({
sid: options.sid
sid
})
this.getDetail(options.sid)
this.getIsCollectionSellerFun(options.sid)
this.getSellerVersionFun(options.sid)
this.getDetail(sid)
this.getIsCollectionSellerFun(sid)
this.getSellerVersionFun(sid)
}
},
// 获取商家是否收藏状态
... ...
... ... @@ -70,7 +70,7 @@
<view class="imgMask">
<view class="IntroduceColor">
<view class="chefText font36r" wx:if="{{chef.is_introduce || chef.is_images}}">主厨介绍</view>
<view class="lines"></view>
<view class="lines" wx:if="{{chef && ((chef.is_introduce || chef.is_images) || (!chef.is_introduce || chef.is_introduce!='0'))}}"></view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
... ...