Commit 53097e32a02e8bb70e9f8ce207a5cd2810f97dcb

Authored by Yolanda
1 parent 81c7ef61

4.20

... ... @@ -11,7 +11,9 @@
"pages/customer/remind",
"pages/customer/care",
"pages/customer/wecode",
"pages/customer/wechat",
"pages/reserve/index",
"pages/reserve/map",
"pages/reserve/index_yy",
"pages/me/index",
"pages/me/concat",
... ... @@ -143,16 +145,20 @@
"list": [
{
"pagePath": "pages/reserve/index",
"text": "订座"
"text": "附近"
},
{
"pagePath": "pages/reserve/search",
"text": "查找"
"text": "搜索"
},
{
"pagePath": "pages/me/list",
"text": "订单"
}
},
{
"pagePath": "pages/me/index",
"text": "我的"
}
]
},
"plugins": {
... ...
... ... @@ -11,7 +11,8 @@ Component({
* 组件的初始数据
*/
data: {
url:'pages/reserve/search'
url:'pages/reserve/search',
bottom:0,
},
pageLifetimes:{
show(){
... ... @@ -29,6 +30,11 @@ Component({
},
attached: function() {
// 在组件实例进入页面节点树时执行
const res = wx.getSystemInfoSync();
let ratio=750/res.windowWidth;
this.setData({
bottom:(res.windowHeight-res.safeArea.bottom)*ratio,
})
console.log('custom-tab-bar.attached')
PubSub.on('custom-tab-bar',()=>{
this.setStatus()
... ...
<!--components/book/tabBar/tabBar.wxml-->
<view class="view tabBar flex align-center" >
<view class="view home flex justify-center align-center {{('pages/reserve/index'==url)?'checked':''}}"
<view class="view tabBar flex-lr align-center" style="height:{{100+bottom}}rpx;padding-bottom: {{bottom}}rpx;">
<view class="view home flex-vc {{('pages/reserve/index'==url)?'checked':''}}"
bindtap="redirectTo" data-url="pages/reserve/index">
<view class="view icon"></view><view class="text">附近</view>
</view>
<view class="view search flex justify-center align-center {{('pages/reserve/search'==url)?'checked':''}}" bindtap="redirectTo" data-url="pages/reserve/search">
<view>
<view class="view icon"></view>
<view class="text">找包间</view>
</view>
<view class="view search flex-vc {{('pages/reserve/search'==url)?'checked':''}}" bindtap="redirectTo" data-url="pages/reserve/search">
<view class="view icon"></view>
<view class="text">搜索</view>
</view>
<view class="view order flex justify-center align-center {{('pages/me/list'==url)?'checked':''}}" bindtap="redirectTo" data-url="pages/me/list">
<view class="view order flex-vc {{('pages/me/list'==url)?'checked':''}}" bindtap="redirectTo" data-url="pages/me/list">
<view class="view icon"></view>
<view class="text">订单</view>
</view>
<view class="view me flex-vc {{('pages/me/index'==url)?'checked':''}}" bindtap="redirectTo" data-url="pages/me/index">
<view class="view icon"></view>
<view class="text">我的</view>
</view>
</view>
<me></me>
<!-- <me></me> -->
... ...
/* components/book/tabBar/tabBar.wxss */
@import "../colorui/main.wxss";
.flex-lr{
display: flex;
display: -webkit-flex;
justify-content: space-between;
align-items:center;
flex-direction: row;
-webkit-flex-direction: row;
}
/*垂直方向居中分布*/
.flex-vc{
display: flex;
display: -webkit-flex;
justify-content: center;
align-items: center;
flex-direction: column;
-webkit-flex-direction: column;
}
.tabBar{
position: fixed;
bottom: 34rpx;
left: calc(50% - 232rpx);
width: 464rpx;
bottom: 0;
left: 0;
width: 100%;
/* height: calc(100rpx + env(safe-area-inset-bottom)); */
height: 100rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 10rpx 0rpx #E5E5E5;
border-radius: 50rpx;
border: 2rpx solid #E5E5E5;
padding: 0 60rpx;
box-sizing: border-box;
/* border-radius: 50rpx; */
/* border: 2rpx solid #E5E5E5; */
}
.home,.order{
width:176rpx;
/* .view{
padding: 0 10rpx;
} */
.home,.order,.me,.search{
/* width:176rpx; */
font-size: 28rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #999999;
padding: 0 10rpx;
}
.tabBar .text{
/* .tabBar .text{
margin-left: 14rpx;
}
} */
.tabBar .checked .text{
color: #5EB2FF;
}
.tabBar .search.checked .icon{
/* .tabBar .search.checked .icon{
width: 56rpx;
height: 56rpx;
}
.tabBar .search.checked .text{
} */
/* .tabBar .search.checked .text{
color: #FFFFFF;
display: none;
}
} */
.home .icon{
width: 40rpx;
height: 40rpx;
background-image: url("http://nosqn.colorcun.com/2.0/home%20%287%29.png");
width: 48rpx;
height: 48rpx;
margin-bottom: 2rpx;
background-image: url("http://nosqn.colorcun.com/near.png");
}
.home.checked .icon{
background-image: url("http://nosqn.colorcun.com/2.0/home%20%286%29.png");
}
.order .icon{
width: 40rpx;
height: 40rpx;
background-image: url("http://nosqn.colorcun.com/2.0/home%20%2812%29.png");
background-image: url("http://nosqn.colorcun.com/near-checked.png");
}
.order.checked .icon{
background-image: url("http://nosqn.colorcun.com/2.0/home%20%285%29.png");
}
.search{
/* .search{
width: 112rpx;
height: 112rpx;
background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);
box-shadow: 0rpx 0rpx 6rpx 0rpx #42A5FF;
box-shadow: 0rpx 0rpx 8rpx 0rpx #E5E5E5;
background: #FFFFFF;
border-radius: 50%;
} */
.search .icon{
width: 48rpx;
height: 48rpx;
margin-bottom: 2rpx;
background-image: url("http://nosqn.colorcun.com/search.png");
}
.search.checked .icon{
background-image: url("http://nosqn.colorcun.com/search-checked.png");
}
.search .text{
font-size: 20rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
color: #999999;
line-height: 28rpx;
height: 28rpx;
margin-left: 0;
}
.search .icon{
.order .icon{
width: 48rpx;
height: 48rpx;
background-image: url("http://nosqn.colorcun.com/2.0/home%20%2810%29.png");
margin-bottom: 4rpx;
margin-bottom: 2rpx;
background-image: url("http://nosqn.colorcun.com/order-gray.png");
}
.order.checked .icon{
background-image: url("http://nosqn.colorcun.com/order-checked.png");
}
.me .icon{
width: 48rpx;
height: 48rpx;
background-image: url("http://nosqn.colorcun.com/me-gray.png");
margin-bottom: 2rpx;
}
.me.checked .icon{
background-image: url("http://nosqn.colorcun.com/me-checked.png");
}
... ...
... ... @@ -170,6 +170,32 @@ Page({
util.toast('手机号码错误', 'none')
return;
}
if(this.detail.seller.id==8){
let content='贵宾您好!您预订的'+this.data.seller.name+',已为您安排完毕';
console.log(content)
wx.cloud.callFunction({
name:'sms',
data:{
content:content,
path:'/index.html?id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1',
phoneNumberList:'+86'+this.detail.phone
},
success:(res)=>{
console.log('success',res);
if(res.result && res.result.errCode==0){
util.toast('发送成功', 'success')
}
},
fail:(fail)=>{
console.log('fail',fail)
}
})
}else{
wx.navigateTo({
url: '/pack-book/pages/book/b_sms?id=' + this.detail.id
});
}
// wx.cloud.callFunction({
// name:'common',
// data:{
... ... @@ -185,29 +211,8 @@ Page({
// }
// })
// let content='贵宾您好!您预订的'+this.data.seller.name+',已为您安排完毕';
// console.log(content)
// wx.cloud.callFunction({
// name:'sms',
// data:{
// content:content,
// path:'/index.html?id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1',
// phoneNumberList:'+86'+this.detail.phone
// },
// success:(res)=>{
// console.log('success',res);
// if(res.result && res.result.errCode==0){
// util.toast('发送成功', 'success')
// }
// },
// fail:(fail)=>{
// console.log('fail',fail)
// }
// })
wx.navigateTo({
url: '/pack-book/pages/book/b_sms?id=' + this.detail.id
});
},
gotoDetail(){
if(this.detail.type==1){//在线预订
... ...
... ... @@ -118,21 +118,22 @@ Page({
},
test(e){
console.log('ttttttttttttttt');
App.Contact.UploadCustomerMedia({url:this.data.staffinfo.qrcode}).then((json)=>{
if(json.ret==200) {
console.log('json')
}
})
// App.Contact.UploadCustomerMedia({url:this.data.staffinfo.qrcode}).then((json)=>{
// if(json.ret==200) {
// console.log('json')
// }
// })
},
addwechat(){
wx.previewImage({
current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
})
// util.cache('staffinfo',this.data.staffinfo);
// wx.navigateTo({
// url:'./care'
// })
// wx.previewImage({
// current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
// urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
// })
util.cache('staffinfo',this.data.staffinfo);
wx.navigateTo({
url:'./wechat?qrcode='+this.data.staffinfo.qrcode
})
},
getstaffinfo(){
App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid:this.data.options.uid}).then((json)=>{
... ...
<!--pages/customer/detail_owner.wxml-->
<import src="../tpl/invitation"></import>
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
<block wx:if="{{detail && detail.type==0 && detail.channel==3}}">
<block wx:if="{{detail && detail.type==0 && detail.channel==2}}">
<!-- <view class="pages bg-1" style="max-height:{{height}}px;overflow-y: scroll;padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;padding-bottom: 60rpx;position: relative;">
<view class="book-image flex-cc"></view>
<view class="cover-conent flex-vc">
... ... @@ -62,7 +62,11 @@
<image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
</view>
<button class="last-button-item flex-ll" open-type="contact" bindcontact="test">
<!-- <button class="last-button-item flex-ll" open-type="contact" bindcontact="test" send-message-img="{{staffinfo.qrcode}}" show-message-card="{{true}}" send-message-path="pages/customer/index?qrcode={{staffinfo.qrcode}}&islover=customer">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
</button> -->
<button class="last-button-item flex-ll" bindtap="addwechat">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
</button>
... ... @@ -95,25 +99,27 @@
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
</block> -->
<view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view>
<view style="height:50rpx;"></view>
<view style="height:40rpx;"></view>
<!-- <view bindtap="sendmsg" style="padding: 60px;" class="white-font font36r">测试发送短信息</view> -->
</scroll-view>
</block>
<block wx:else>
<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px; padding-top: 120rpx;overflow-y: auto;" wx:if="{{options.tplid}}">
<template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template>
<view class="opt-view flex-vc" style="padding-bottom: 320rpx;">
<block wx:if="{{!detail.hasCanSuccess && detail.status!=4}}">
<button class="button-none flex-vc" catchtap="confirmed">
<view class="buts-share animation customer"></view>
</button>
</block>
</view>
</view>
<block wx:if="{{detail}}">
<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px; padding-top: 120rpx;overflow-y: auto;" wx:if="{{options.tplid}}">
<template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template>
<view class="opt-view flex-vc" style="padding-bottom: 320rpx;">
<block wx:if="{{!detail.hasCanSuccess && detail.status!=4}}">
<button class="button-none flex-vc" catchtap="confirmed">
<view class="buts-share animation customer"></view>
</button>
</block>
</view>
</view>
</block>
</block>
<view class="opt-button flex-lr" wx:if="{{detail && detail.channel!=3}}">
<view class="opt-button flex-lr" wx:if="{{detail && detail.channel!=2}}">
<view bindtap="gotoHome" class="dingbaojian flex-vc">
<image src="http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114105901.png" class="icon"></image>
<view class="text">订包间</view>
... ...
... ... @@ -77,7 +77,7 @@ Page({
this.setData({
statusBarHeight: pt,
titleBarHeight: h,
height: systemInfo.windowHeight
height: systemInfo.windowHeight-90/(750/systemInfo.windowWidth)
})
this.getDetail(getCurrentPages().length==1);
},
... ... @@ -105,21 +105,22 @@ Page({
},
test(e){
console.log('ttttttttttttttt');
App.Contact.UploadCustomerMedia({url:this.data.staffinfo.qrcode}).then((json)=>{
if(json.ret==200) {
console.log('json')
}
})
// App.Contact.UploadCustomerMedia({url:this.data.staffinfo.qrcode}).then((json)=>{
// if(json.ret==200) {
// console.log('json')
// }
// })
},
addwechat(){
wx.previewImage({
current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
})
// util.cache('staffinfo',this.data.staffinfo);
// wx.navigateTo({
// url:'../me/chat?qrcode='+this.data.staffinfo.qrcode
// })
// wx.previewImage({
// current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
// urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
// })
util.cache('staffinfo',this.data.staffinfo);
wx.navigateTo({
url:'./wechat?qrcode='+this.data.staffinfo.qrcode
})
},
getstaffinfo(){
App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid:this.data.options.uid}).then((json)=>{
... ... @@ -471,4 +472,19 @@ Page({
couponhidden:true,
})
},
checkout(){
if(this.data.detail.status==0){
this.selectComponent('#showModal').options({
header: '您点早啦!',
body: '商家分配包间后,您可以通过在线买单支付,无需到前台结账排队等发票。'
}).show();
}else{
wx.navigateTo({
url:util.http_build_query({
rid:this.data.detail.id,
sid:this.data.detail.sid
},'/pack-checkout/pages/index')
})
}
},
})
... ...
... ... @@ -9,6 +9,7 @@
"ddate":"/components/reserve/invitation/ddate",
"a2l":"/components/tips/add-to-lite",
"userinfo-share": "/components/userinfo/share",
"service":"/components/tips/service"
"service":"/components/tips/service",
"showModal":"/components/tips/showModal/showModal"
}
}
\ No newline at end of file
... ...
... ... @@ -11,7 +11,7 @@
-->
</nav>
<!-- 内部预定 -->
<block wx:if="{{detail && detail.type==0 && detail.channel==3}}">
<block wx:if="{{detail && detail.type==0 && detail.channel==2}}">
<!-- <view class="pages bg-1" style="max-height:{{height}}px;overflow-y: scroll;padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;padding-bottom: 60rpx;">
<view class="book-image flex-cc">
</view>
... ... @@ -79,7 +79,11 @@
<image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
</view>
<button class="last-button-item flex-ll" open-type="contact" bindcontact="test">
<!-- <button class="last-button-item flex-ll" open-type="contact" bindcontact="test" send-message-img="{{staffinfo.qrcode}}" show-message-card="{{true}}" send-message-path="pages/customer/index?qrcode={{staffinfo.qrcode}}&islover=customer">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
</button> -->
<button class="last-button-item flex-ll" bindtap="addwechat">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
</button>
... ... @@ -111,37 +115,55 @@
<block wx:else="">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
</block> -->
<view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view>
<view style="height:{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel ? 140 : 50}}rpx;"></view>
<view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="sendmsg" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">短信通知</view>
<view style="height:40rpx;"></view>
</scroll-view>
<!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" -->
<userinfo binduserinfo="cookbook" class="last-diancan flex-vc" wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
<view class="last-buts-text flex-cc font30r">
<image src="http://nosqn.colorcun.com/manager-invitation/wx2/%E6%8F%90%E5%89%8D%E7%82%B9%E9%A4%90.png" class="icon"></image>
提前点餐
</view>
</userinfo>
<view class="last-bottom flex-lr">
<view class="booking-button last-buts-text flex-cc font30r" bindtap="secondbook" style="width:{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel ? (detail && detail.seller.isopen_md==1 ? 33.33 : 50) : 100}}%;">
<image src="http://sellershare.colorcun.com/yuding.png" class="icon" style="width: 32rpx;height: 32rpx;"></image>
再次预订
</view>
<block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
<userinfo binduserinfo="cookbook" class="last-diancan flex-vc" style="width:{{detail && detail.seller.isopen_md==1 ? 33.33 : 50}}%;">
<view class="last-buts-text flex-cc font30r" style="border-left:2rpx solid #D3BF9C;height: 50rpx;">
<image src="http://sellershare.colorcun.com/diancan.png" class="icon" style="width: 34rpx;height: 28rpx;"></image>
提前点餐
</view>
</userinfo>
<userinfo class="last-pay flex-cc" binduserinfo="checkout" share="{{detail}}" share-act="invitation" wx:if="{{detail && detail.seller.isopen_md==1}}">
<view class="last-buts-text font30r flex-cc" style="border-left:2rpx solid #D3BF9C;height: 50rpx;">
<image src="http://sellershare.colorcun.com/maidan.png" class="icon" style="width:30rpx;height: 24rpx;"></image>
在线买单
</view>
</userinfo>
</block>
</view>
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
<!-- <view bindtap="sendmsg">测试发送短信息</view> -->
</block>
<block wx:else>
<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
<template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
<view class="opt-view flex-vc">
<block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
<button open-type="share" class="button-none flex-vc" catchtap="setUserInfoSuccess">
<view class="buts-share"></view>
</button>
</block>
<block wx:elif="{{detail.hasCancel}}">
<view class="opt-view-tip Medium">订座已取消</view>
</block>
<block wx:else="">
<view class="opt-view-tip Medium">订座已完成</view>
</block>
</view>
</view>
<block wx:if="{{detail}}">
<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
<template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
<view class="opt-view flex-vc">
<block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
<button open-type="share" class="button-none flex-vc" catchtap="setUserInfoSuccess">
<view class="buts-share"></view>
</button>
</block>
<block wx:elif="{{detail.hasCancel}}">
<view class="opt-view-tip Medium">订座已取消</view>
</block>
<block wx:else="">
<view class="opt-view-tip Medium">订座已完成</view>
</block>
</view>
</view>
</block>
</block>
<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=3}}">
<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=2}}">
<view bindtap="gotoHome" class="dingbaojian flex-vc">
<image src="http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114105901.png" class="icon"></image>
... ...
... ... @@ -15,10 +15,10 @@ page{
margin-top: 40rpx;
}
.zhoudao{
width: 280rpx;
height: 52rpx;
width: 198rpx;
height: 32rpx;
background-size: 100% 100%;
background-image: url("http://nosqn.colorcun.com/2.0/home%20%2821%29.png");
background-image: url("http://nosqn.colorcun.com/zhoudaoanpai.png");
margin-top: 30rpx;
}
@keyframes dododo
... ...
Page({
onLoad(opt){
//导航栏自适应
let systemInfo = wx.getSystemInfoSync();
let reg = /ios/i;
let pt = 20;//导航状态栏上内边距
let h = 44;//导航状态栏高度
if (reg.test(systemInfo.system)) {
pt = systemInfo.statusBarHeight;
h = 44;
} else {
pt = systemInfo.statusBarHeight;
h = 48;
}
this.setData({
height: systemInfo.windowHeight,
statusBarHeight: pt,
titleBarHeight: h,
qrcode:opt.qrcode
})
},
saveimage(){
wx.downloadFile({
url: this.data.qrcode, //仅为示例,并非真实的资源
success (res) {
// 只要服务器有响应数据,就会把响应内容写入文件并进入 success 回调,业务需要自行判断是否下载到了想要的内容
if (res.statusCode === 200) {
wx.saveImageToPhotosAlbum({
filePath:res.tempFilePath,
success:(res)=>{
wx.showToast({
title:'保存成功',
duration:2000,
mask:true,
})
},
fail:(fail)=>{
}
})
}
}
})
}
})
\ No newline at end of file
... ...
{}
\ No newline at end of file
... ...
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
<view class="last-bg flex-vc" style="min-height:{{height}}px;justify-content:flex-start;padding-top: {{titleBarHeight+statusBarHeight}}px;">
<view class="last-yellow-font font-bold" style="font-size: 86rpx;margin-bottom: 40rpx;">添加微信</view>
<view class="wecode">
<image src="{{qrcode}}" mode="aspectFit"></image>
</view>
<view class="last-yellow-font font48r act-operate">1.点击“保存图片”按钮</view>
<view class="last-yellow-font font48r act-operate">2.打开微信扫一扫</view>
<view class="last-yellow-font font48r act-operate">3.选择相册该图片识别</view>
<view class="save-button flex-cc last-yellow-font font36r font-bold" bindtap='saveimage'>保存图片</view>
</view>
\ No newline at end of file
... ...
.last-bg{
width: 100%;
box-sizing: border-box;
overflow-y: scroll;
background: url(http://sellershare.colorcun.com/last-bg.png) center center no-repeat;
background-size: 100% 100%;
padding-bottom: 10rpx;
position: relative;
}
.last-yellow-font{
color: #BA9953;
}
.wecode{
width: 520rpx;
height: 520rpx;
border-radius: 20rpx;
border: 8rpx solid #BA9953;
margin-bottom: 80rpx;
overflow: hidden;
}
.wecode image{
width: 520rpx;
height: 520rpx;
}
.act-operate{
line-height: 1.4;
margin-bottom: 20rpx;
}
.save-button{
width: 440rpx;
height: 80rpx;
position: absolute;
left: 0;
right: 0;
bottom: 70rpx;
margin: 0 auto;
border-radius: 14rpx;
background: #BA9953;
color: #4A3404;
}
\ No newline at end of file
... ...
... ... @@ -43,13 +43,13 @@
</view>
<view class="text-df">{{util.unixtoTime(couponinfo.stime,'YYYY.MM.DD HH:II')}}-{{util.unixtoTime(couponinfo.etime,'YYYY.MM.DD HH:II')}}</view>
</view>
<view class="view padding block">
<!-- <view class="view padding block">
<view class="flex align-center margin-bottom-sm">
<view class="dot"></view>
<view class="txt-30-h text-bold">使用时间</view>
</view>
<view class="text-df">{{couponinfo.use_time}}</view>
</view>
</view> -->
<view class="view padding block padding-bottom-sm">
<view class="flex align-center margin-bottom-sm">
<view class="dot"></view>
... ...
// pages/me/index.js
import App from '../../utils/api';
import util from '../../utils/util'
import PubSub from '../../utils/PubSub'
const {regeneratorRuntime} = global
Page({
... ... @@ -56,12 +57,13 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected:3
})
}
// if (typeof this.getTabBar === 'function' &&
// this.getTabBar()) {
// this.getTabBar().setData({
// selected:3
// })
// }
PubSub.emit('custom-tab-bar')
App.User.GetBalance().then(res=>{
this.setData({
user:res.data
... ...
... ... @@ -111,6 +111,11 @@ Page({
console.log('moveToLocation')
this.selectComponent('#getpos').getPos(true);
},
switchpage(){
wx.redirectTo({
url: './map'
})
},
debounceTimer:null,
debounce(func,wait){
if(this.debounceTimer){
... ...
... ... @@ -13,14 +13,25 @@
enable-rotate
subkey="SDEBZ-I74W4-QLGUX-XXYXU-HIR23-3QFBJ"
layer-style="2"
style="width: 100%; height: 30vh;position: relative;">
style="width: 100%; height: 40vh;position: relative;">
</map>
<view class="moveToLocationView">
<!-- <view class="moveToLocationView">
<view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
</view>
</view> -->
<view class="moveToLocationView">
<view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/loaction.png"></image>
</view>
</view>
<view class="moveToLocationView">
<view bindtap="switchpage" class="view moveToLocation flex-vc" style="top: -140rpx;">
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/menu.png" style="width: 32rpx;height: 26rpx;margin-bottom: 8rpx;"></image>
<view style="color: #42A5FF;font-size: 20rpx;">地图</view>
</view>
</view>
<view class="view content padding-top-xs" style="height: 70vh;">
<view class="view content padding-top-xs" style="height: 60vh;">
<taocan-notice></taocan-notice>
<filter-group height="{{height}}"
id="filter-group"
... ... @@ -64,7 +75,7 @@
scroll-into-view="seller-{{scrollSellerID}}"
scroll-with-animation
bindscroll="scrollEvent"
style="width:100%;height: calc(70vh - 50px);">
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">
<seller-card class="seller-card" id="seller-{{item.id}}"
... ...
... ... @@ -9,16 +9,34 @@ page{
height: 0;
position: relative;
}
.moveToLocationView{
width: 100%;
height: 0;
position: relative;
}
.moveToLocation{
position: absolute;
width: 80rpx;
height: 80rpx;
right:0rpx;
top:-80rpx;
width: 100rpx;
height: 100rpx;
right:10rpx;
top:-260rpx;
background: #FFFFFF;
box-shadow: 0 4rpx 10rpx #E5E5E5;
border-radius: 50%;
}
.moveToLocation-image{
width: 40rpx;
height: 40rpx;
width: 48rpx;
height: 48rpx;
}
.switchpage{
position: absolute;
width: 100rpx;
height: 100rpx;
right:10rpx;
top:-610rpx;
background: #FFFFFF;
box-shadow: 0 4rpx 10rpx #E5E5E5;
border-radius: 50%;
}
.me{
width: 84rpx;
... ...
// pages/reservr/index.js
import util from '../../utils/util';
import App from '../../utils/api';
import PubSub from '../../utils/PubSub'
const {regeneratorRuntime} = global
const mapScale = 15//18;
const def_latitude = 39.684670;
const def_longitude = 118.176300;
const cates_version = '?1.2';
Page({
data:{
map:{},
height:1000,
meTop:20,
hasLoading:true,
activeSellerID:'',//高亮商家
scrollSellerID:'',//滚动到商家
current:0,
},
user:{},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
const systeminfo=wx.getSystemInfoSync();
let ratio=750/systeminfo.windowWidth;
console.log(systeminfo)
this.setData({
height:systeminfo.windowHeight-(350/ratio)
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
this.selectComponent('#getpos').getPos();
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
// PubSub.emit('custom-tab-bar')
if(wx.getMenuButtonBoundingClientRect){
let rect=wx.getMenuButtonBoundingClientRect()
this.setData({
meTop:rect.top-5,
})
}
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
return{
title:'请客订包间,就上周到安排'
}
},
switchpage(){
wx.switchTab({
url: './index'
})
},
onpos(e) {
let res = e.detail;
console.log('onpos.res', res);
let map = this.data.map;
if (!res.latitude){
map.latitude = def_latitude;
map.longitude = def_longitude;
}else{
map.latitude = res.latitude;
map.longitude = res.longitude;
}
map.scale = mapScale;
this.user.latitude = res.latitude;
this.user.longitude = res.longitude;
let sdobj = {
map: map,
}
this.setData(sdobj)
},
setLoacl(e){
let pos=util.attr(e,'val').split(',');
let map = this.data.map
map.latitude = pos[0];
map.longitude = pos[1];
this.setData({
map:map
})
},
reduceMapScale(){
let map = this.data.map
map.scale=parseInt(map.scale)-1
this.setData({
map:map
})
},
moveToLocation() {
console.log('moveToLocation')
this.selectComponent('#getpos').getPos(true);
},
debounceTimer:null,
debounce(func,wait){
if(this.debounceTimer){
clearTimeout(this.debounceTimer)
}
this.debounceTimer=setTimeout(()=>{
this.debounceTimer=null;
func()
},wait);
},
regionChange(e){
if(e.type=='end'){
console.log('regionChange', e)
this.debounce(this.regionChangeDo,800)
}
},
mapCtx:null,
mapData: {
latitude: 0,
longitude: 0,
scale: 30,
hasRegionchange: false,
region: {
southwest: {},
northeast: {},
},
},
regionChangeDo(){
console.log('regionChangeDo')
if(!this.mapCtx){
this.mapCtx = wx.createMapContext('map')
}
if(!this.mapCtx) return;
this.mapCtx.getScale({
success: (res) => {
this.mapScale = res.scale;
},
})
this.mapCtx.getRegion({
success: (res) => {
if (res.southwest.latitude) {
this.mapData.region = res
}
// this.selectComponent('#filter-group').hide();
this.getSellers();
},
})
},
hasSellers:0,
sellers:[],
getSellers(){
console.log('getSellers',this.mapScale,this.mapData)
this.setData({
hasLoading:true,
scrollSellerID:'',//清理,滚到顶
})
let param = {
lat: this.user.latitude == def_latitude ? '' : this.user.latitude,
lng: this.user.longitude == def_longitude ? '' : this.user.longitude,
offset: 0,
rows: 200,
distance: 100000,
map: JSON.stringify({...this.mapData.region, scale: 50})
}
if (param.lat) {
param.centre_pos = `${param.lat},${param.lng}`
} else {
let lat = (this.mapData.region.southwest.latitude + this.mapData.region.northeast.latitude) / 2
let lng = (this.mapData.region.southwest.longitude + this.mapData.region.northeast.longitude) / 2
param.centre_pos = `${lat},${lng}`
}
this.hasFilterData=false
if(this.filterGroupData.tags){
param.tags = this.filterGroupData.tags;
this.hasFilterData=true
}
if (this.filterGroupData.cuisine) {
param.cuisine = this.filterGroupData.cuisine;
this.hasFilterData=true
}
if(this.filterGroupData.average){
param.average = this.filterGroupData.average;
this.hasFilterData=true
}
this.param = param;
this.activeSellerID='';
App.Customer.SellerList(param).then(async res => {
if (res.ret == 200) {
this.hasSellers=res.data.flag;
res.data.list.forEach((v,i)=>{
v.distance=Math.round(Number(v.distance));
if(v.cate && v.cate.length>0){
v.cateStr=[];
v.cate.some(cate=>{
v.cateStr.push(cate.name);
if(v.cateStr.length>2){return true}
})
v.cateStr=v.cateStr.join('/')
}
})
this.sellers=res.data.list;
this.makeMarker();
this.makeSellers();
this.debounce(this.makeDefMarker,300)
}
}).catch(e=>{
this.debounce(this.getSellers,300)
})
},
makeMarker(){
this.mapCtx.getScale({
success: (res) => {
this.mapData.scale = res.scale;
let markers=[]
let sellersLength=this.sellers.length
this.sellers.forEach((seller,si)=>{
if(seller.scale>this.mapData.scale) return;
let marker = {
id: seller.id,
iconPath: "http://nosqn.colorcun.com/custom/lite-online/cates/circle1x5.png" + cates_version,
latitude: seller.lat,
longitude: seller.long,
width: 8,
height: 8,
//title:seller.seller_name,
zIndex: sellersLength - si,
zIndexBak: sellersLength - si,
//seller: seller,
};
// marker.callout={
// content: ' ' + seller.sellername + ' ',
// color: '#353535',
// fontSize: 12,
// borderWidth: 1,
// borderColor: '#cccccc',
// borderRadius: 50,
// bgColor: '#fefefe',
// padding: 5,
// textAlign: 'left',
// display:'BYCLICK',
// };
// marker.calloutDisplay='BYCLICK';
if (seller.mode.length > 0) {
seller.mode.forEach(x => {
if (x.id == 1) {//大图标
marker.iconPath = "http://nosqn.colorcun.com/custom/lite-online/cates/其他菜品.png";
if (seller.cate.length > 0) {
marker.iconPath = seller.cate[0].icon
}
marker.iconPath = marker.iconPath.replace(/\/cates\/(.*)\.png/, function ($0, $1) {
return '/cates/' + encodeURI($1) + '.png'
})
marker.iconPath += cates_version
marker.width = 20;
marker.height = 25;
}
// if(x.id==2){//商家名
// marker.callout.display='ALWAYS';
// marker.calloutDisplay='ALWAYS';
// }
})
}
markers.push(marker)
})
markers.push({
id: 'local',
iconPath: "http://nosqn.colorcun.com/2.0/home%20%288%29.png" + cates_version,
latitude: (this.user.latitude||def_latitude)+'',
longitude: (this.user.longitude||def_longitude)+'',
width: 25,
height: 41,
zIndex: 9999,
zIndexBak:9999,
})
this.setData({
markers:markers,
})
},
})
},
makeSellers(){
this.setData({
sellers:this.sellers,
hasSellers:(this.hasSellers==1 || this.sellers.length>0) || this.hasFilterData,
hasLoading:false,
hasFilterData:this.hasFilterData,
})
},
switchseller(e){
let current=e.detail.current;
let id=this.data.sellers[current].id;
this.markertap({markerId:id});
},
makeDefMarker(){
if(!this.activeSellerID && this.data.markers.length>0){
this.markertap({markerId:this.data.markers[0].id})
}
},
hasScrollToIng:false,
markertap(e,scrollTo=true){
if(!e.markerId || e.markerId=='local') return;
let markers=this.data.markers
this.activeSellerID = e.markerId
let bl = 1.2;
markers.forEach((m, i) => {
m.iconPath = m.iconPath.replace('/cates-active/', '/cates/')
m.zIndex = m.zIndexBak
if (m.width == 20 * bl) {
m.width = 20;
m.height = 25;
}
if (m.width == 12) {
m.width = 8;
m.height = 8;
}
if(m.callout){
m.callout.borderColor= '#cccccc';
m.callout.bgColor= '#fefefe';
m.callout.color= '#353535';
m.callout.display=m.calloutDisplay;
}
if (m.id == e.markerId) {
m.iconPath = m.iconPath.replace('/cates/', '/cates-active/')
if (m.width == 20) {
m.width = 20 * bl;
m.height = 25 * bl;
} else {
m.width = 12;
m.height = 12;
}
m.zIndex = 9999
if(m.callout){
m.callout.borderColor= '#F05522';
m.callout.bgColor= '#F05522';
m.callout.color= '#fefefe';
m.callout.display='ALWAYS';
}
this.setData({
current:i,
})
}
})
let obj = {
markers: markers,
activeSellerID:this.activeSellerID,
};
this.hasScrollToIng=false
if(scrollTo){
obj.scrollSellerID=this.activeSellerID
this.hasScrollToIng=true
}
this.setData(obj)
setTimeout(()=>{this.hasScrollToIng=false},800)
},
filterGroupData:{},
filterGroupEvent(e){
console.log('filterGroupEvent',e.detail)
this.filterGroupData=e.detail
this.debounce(this.getSellers,500)
},
sellerCardEvent(e){
if(e.detail.type=='phone'){
this.selectComponent('#as').show(e.detail.seller);
}
},
scrollTop:0,
scrollEvent(e){
if(this.mapScale<12) return;
//console.log(e.detail.scrollTop)
this.scrollTop=e.detail.scrollTop
if(this.hasScrollToIng)return;
this.debounce(()=>{
this.scrollEventActive()
},300)
},
scrollEventActive(){
let idx=parseInt(this.scrollTop/162)
let po=this.scrollTop%((idx>0?idx:1)*162);
if(po>80){
idx+=1;
}
//console.log(idx,po)
if(this.sellers[idx]){
//this.activeSellerID=this.sellers[idx].id
this.markertap({markerId:this.sellers[idx].id},false)
}
},
todetail(e){
let seller=this.data.sellers[e.currentTarget.dataset.index];
let url=util.http_build_query({id:seller.id},'/pages/reserve/detail');
return wx.navigateTo({
url:url,
})
},
reserve(e){
let seller=this.data.sellers[e.currentTarget.dataset.index];
if(seller.is_online_reserve==1){
let url=util.http_build_query({id:seller.id,activeTab:'reserve'},'/pages/reserve/reserve')
// let cid=seller.id;
// if(cid){
// url=util.http_build_query({
// classID:cid,
// className:util.attr(e,'cname'),
// },url)
// }
return wx.navigateTo({
url:url,
})
}else{
this.selectComponent('#as').show(seller);
}
},
})
... ...
{
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black",
"navigationBarTitleText":"周到安排",
"usingComponents": {
"getpos":"/components/2.0/userinfo/getpos",
"a2l":"/components/tips/add-to-lite",
"filter-group":"/components/2.0/filter/filter-group",
"seller-card":"/components/2.0/seller/card",
"chatbot":"/components/userinfo/chatbot",
"as-phone":"/components/2.0/dialog/phone",
"taocan-notice":"/components/2.0/taocan/notice"
}
}
\ No newline at end of file
... ...
<map id="map" scale="{{map.scale}}"
longitude="{{map.longitude||118.170300}}" latitude="{{map.latitude||39.65273}}"
markers="{{markers}}" polygons="{{polygons}}"
bindmarkertap="markertap"
bindcallouttap="markertap"
bindregionchange="regionChange"
bindupdated="mapUpdated"
show-location="{{false}}"
enable-3D="{{false}}"
enable-zoom
enable-scroll
enable-rotate
subkey="SDEBZ-I74W4-QLGUX-XXYXU-HIR23-3QFBJ"
layer-style="2"
style="width: 100%; height: 100vh;position: relative;">
</map>
<view class="moveToLocationView">
<view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/loaction.png"></image>
</view>
</view>
<view class="moveToLocationView">
<view bindtap="switchpage" class="view moveToLocation flex-vc" style="top: -490rpx;">
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/menu.png" style="width: 32rpx;height: 26rpx;margin-bottom: 8rpx;"></image>
<view style="color: #42A5FF;font-size: 20rpx;">列表</view>
</view>
</view>
<view class="seller-list">
<swiper previous-margin="50rpx" next-margin="50rpx" current="{{current}}" bindchange="switchseller">
<block wx:for="{{sellers}}" wx:key="{{item.id}}" wx:for-item="selleritem">
<swiper-item style="padding: 20rpx 0;">
<view class="seller-item" bindtap="todetail" data-index="{{index}}">
<view class="flex-ll" style="align-items: flex-start;">
<view class="seller-image-cover">
<image src="{{selleritem.seller_image}}" class="seller-image" mode="aspectFill"></image>
</view>
<view>
<view class="black-font font-bold font38r font-more" style="margin-bottom: 10rpx;width: 370rpx;">{{selleritem.sellername}}</view>
<view class="gray-font font26r" style="padding-bottom: 14rpx;">{{selleritem.cateStr}}</view>
<view style="padding-top:4rpx;" wx:if="{{selleritem.activity && selleritem.activity.length>0}}">
<block wx:for="{{selleritem.activity}}" wx:key="selleractivitykey" wx:if="{{index<2}}">
<view class="cu-tag line-yellow" style="margin-bottom: 6rpx;">
<text class="text-orange">{{(item.type==2?'满赠':item.title)}}</text>
</view>
</block>
</view>
<view class="flex-ll">
<view class="gray-font font24r" style="margin-right: 40rpx;">{{selleritem.distance}}m</view>
<view class="gray-font font24r" wx:if="{{selleritem.average>0}}">¥{{selleritem.average}}/人</view>
</view>
<!-- <view></view> -->
</view>
</view>
<view class="seller-room flex-ll">
<view class="flex-ll" style="width:450rpx;height:52rpx;overflow: scroll;">
<block wx:for="{{selleritem.class}}" wx:key="seclass">
<view data-cid="{{item.id}}" data-cname="{{item.name}}" class="room-type line-blue text-blue">{{item.name}}</view>
</block>
</view>
<view class="box-shadow"></view>
<view class="book-cover">
<view class="white-font font28r font-bold book-button" data-index="{{index}}" catchtap="reserve">订包间</view>
</view>
</view>
</view>
</swiper-item>
</block>
</swiper>
<!-- <block wx:for="{{sellers}}" wx:key="{{item.id}}" wx:for-item="selleritem">
<view class="seller-item" style="left:{{(index-current)*650+60}}rpx" catchtouchstart="start" catchtouchend="switch">
<view class="flex-ll" style="align-items: flex-start;">
<view class="seller-image-cover">
<cover-image src="{{selleritem.seller_image}}" class="seller-image"></cover-image>
</view>
<view>
<view class="black-font font-bold font38r font-more" style="margin-bottom: 10rpx;width: 370rpx;">{{selleritem.sellername}}</view>
<view class="gray-font font26r">{{selleritem.cateStr}}</view>
<block wx:for="{{selleritem.activity}}" wx:key="selleractivitykey" wx:if="{{index<3}}">
<view class="cu-tag line-yellow view">
<text class="text-orange">{{(item.type==2?'满赠':item.title)}}</text>
</view>
</block>
</view>
</view>
<view class="seller-room flex-ll">
<view class="flex-ll" style="width:450rpx;height:52rpx;overflow: auto;">
<block wx:for="{{selleritem.class}}" wx:key="seclass">
<view data-cid="{{item.id}}" data-cname="{{item.name}}" class="room-type line-blue text-blue">{{item.name}}</view>
</block>
</view>
<view class="book-cover">
<view class="white-font font28r font-bold book-button">订包间</view>
</view>
</view>
</view>
</block> -->
</view>
<getpos bindpos="onpos" id="getpos" hasFailPop></getpos>
<a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX" type="black20"></a2l>
<as-phone id="as"></as-phone>
\ No newline at end of file
... ...
@import "../../colorui/main.wxss";
.seller-list{
width: 100%;
height: 350rpx;
box-sizing: border-box;
position: fixed;
left: 0;
bottom:0;
z-index: 5;
}
.moveToLocationView{
width: 100%;
height: 0;
position: relative;
}
.moveToLocation{
position: absolute;
width: 100rpx;
height: 100rpx;
right:10rpx;
top:-610rpx;
background: #FFFFFF;
box-shadow: 0 4rpx 10rpx #E5E5E5;
border-radius: 50%;
}
.moveToLocation-image{
width: 48rpx;
height: 48rpx;
}
swiper{
height: 350rpx;
}
.seller-item{
width: 630rpx;
height: 310rpx;
background-color: #FFFFFF;
border-radius: 20rpx;
padding: 20rpx 0 0 20rpx;
box-sizing: border-box;
box-shadow: 0 0 30rpx #E5E5E5;
margin: 0 10rpx;
}
.seller-image{
width: 200rpx;
height: 200rpx;
border-radius: 10rpx;
}
.seller-image-cover{
width: 200rpx;
height: 200rpx;
border-radius: 10rpx;
margin-right: 20rpx;
}
.seller-room{
width: 100%;
height: 92rpx;
position: relative;
box-sizing: border-box;
}
.room-type{
padding: 0 20rpx;
height: 52rpx;
border: 2rpx solid #5EB2FF;
border-radius: 26rpx;
margin-right: 20rpx;
text-align: center;
line-height: 48rpx;
box-sizing: border-box;
}
.book-cover{
width: 160rpx;
position: absolute;
right: 0;
bottom: 20rpx;
background: #FFFFFF;
padding:0 20rpx;
box-sizing: border-box;
}
.box-shadow{
width: 4rpx;
height: 100%;
box-shadow: 0 0 10rpx rgba(0,0,0,.1);
}
.book-button{
width: 124rpx;
height: 54rpx;
box-sizing: border-box;
background: #3BBFF5;
/* background: linear-gradient(to right,#3BBFF5,#57A0FF); */
border-radius: 27rpx;
text-align: center;
line-height: 54rpx;
}
.cu-tag{
height: 36rpx;
line-height: 36rpx;
border-radius: 4rpx;
padding: 0 10rpx;
}
\ No newline at end of file
... ...
... ... @@ -517,7 +517,7 @@
margin: 0 auto;
}
.last-share-button{
width: 440rpx;
width: 260rpx;
height: 80rpx;
border-radius: 14rpx;
color: #4A3404;
... ... @@ -546,14 +546,11 @@
color: #BA9953;
}
.last-diancan{
width: 100%;
position: absolute;
left: 0;
bottom: 0;
height: 90rpx;
background: #BA9953;
width: 33.33%;
height: 100%;
margin: 0;
padding: 0;
color: #7B512A;
}
.last-buts-text{
width: 100%;
... ... @@ -569,4 +566,28 @@
padding: 0;
background: transparent;
margin: 0;
}
.last-bottom{
width: 100%;
position: absolute;
left: 0;
bottom: 0;
height: 90rpx;
background: #ECD9B7;
margin: 0;
padding: 0;
padding: 20rpx 0;
box-sizing: border-box;
}
.booking-button{
width: 33.33%;
height: 100%;
color: #7B512A;
}
.last-pay{
width: 35%;
height: 100%;
padding: 5rpx 0;
box-sizing: border-box;
color: #7B512A;
}
\ No newline at end of file
... ...
... ... @@ -15,7 +15,7 @@
{
"name": "预订本-商家1",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1001&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"query": "seller_id=1297&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"scene": 1001
},
{
... ... @@ -636,8 +636,26 @@
{
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=171312&tplid=1&hasSellerShare=1&hasInvitation=1",
"query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311",
"scene": 1047
},
{
"name": "pages/reserve/map",
"pathName": "pages/reserve/map",
"query": "id=174308&hasSellerShare=1&hasInvitation=1&uid=3736",
"scene": null
},
{
"name": "pack-activity/pages/qiye",
"pathName": "pack-activity/pages/qiye",
"query": "",
"scene": null
},
{
"name": "pages/customer/wechat",
"pathName": "pages/customer/wechat",
"query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311",
"scene": null
}
]
}
... ...