Commit 07e235fa0d8c1016e0ddd77f96420b99ddad8735

Authored by Yolanda
1 parent 97f19100

no message

... ... @@ -10,6 +10,7 @@
"pages/customer/list",
"pages/customer/remind",
"pages/customer/care",
"pages/customer/wecode",
"pages/reserve/index",
"pages/reserve/index_yy",
"pages/me/index",
... ...
{
"permissions": {
"openapi": [
]
}
}
\ No newline at end of file
... ...
// 云函数入口文件
const cloud = require('wx-server-sdk')
cloud.init()
// 云函数入口函数
exports.main = async (event, context) => {
const wxContext = cloud.getWXContext()
switch (event.action) {
case 'getUrlScheme': {
return getUrlScheme()
}
}
return 'action not found'
}
async function getUrlScheme() {
return cloud.openapi.urlscheme.generate({
jumpWxa: {
path: 'weixin://dl/business/?t=GC8I0gF6Bad', // <!-- replace -->
query: '',
},
// 如果想不过期则置为 false,并可以存到数据库
isExpire: false,
// 一分钟有效期
expireTime: parseInt(Date.now() / 1000 + 60),
})
}
... ...
{
"name": "public",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"dependencies": {
"wx-server-sdk": "~2.3.2"
}
}
\ No newline at end of file
... ...
... ... @@ -82,6 +82,7 @@ Component({
titleBarHeight:h,
})
console.log('this.setData', this.data);
// wx.setStorageSync('headerHeight',pt+h);
},
getHeight(){
return this.data.statusBarHeightFull
... ...
... ... @@ -46,7 +46,7 @@ Page({
tables.push(t.name);
})
let reserev=RS.reserve(res.data)
console.log('reserev',reserev)
console.log('ghjk',this.detail)
let dateSmart
if(res.data.type==1){
dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[0])
... ... @@ -70,6 +70,9 @@ Page({
})
})
},
getstaffinfo(){
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
... ...
... ... @@ -129,7 +129,7 @@ Page({
})
},
formatDatail(detail){
detail.rdateStr=util.unixtoTime(detail.ddate,'MM月DD日 WW HH:II');
detail.rdateStr=util.unixtoTime(detail.ddate,'YYYY-MM-DD 星期WW HH:II');
detail.tableSubInfo=[];
detail.tables.forEach(t=>{
detail.tableSubInfo.push(t.name);
... ...
... ... @@ -78,6 +78,11 @@
<view>下单时间:</view>
<view class="">{{order.cdateStr}}</view>
</view>
<view class="flex-ll item">
<view>用餐时间:</view>
<view class="">{{detail.rdateStr}}</view>
</view>
</view>
</view>
<view style="height: 150rpx;width: 100%;"></view>
... ...
Page({
onLoad(){
this.loadnum=0;
// this.loadnum=0;
},
getdata(e){
console.log(e)
this.loadnum=1;
// this.loadnum=1;
},
onShow(){
if(this.loadnum==1){
wx.navigateBack();
}
// if(this.loadnum==1){
// wx.navigateBack();
// }
}
})
\ No newline at end of file
... ...
<web-view src="https://xt04.colorcun.com/tarnsfer.html" bindload="getdata"></web-view>
\ No newline at end of file
<web-view src="https://xt04.colorcun.com/Fnaj2D4qtEXZY3cfvjXSSsAhatjL.jpg" bindload="getdata"></web-view>
\ No newline at end of file
... ...
... ... @@ -77,7 +77,75 @@ Page({
})
this.getDetail();
},
call(){
wx.makePhoneCall({
phoneNumber: this.data.staffinfo.phone //仅为示例,并非真实的电话号码
})
},
test(e){
console.log('ttttttttttttttt');
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'
// })
},
getstaffinfo(){
App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid:this.data.options.uid}).then((json)=>{
if(json.ret==200){
console.log(json)
this.setData({
staffinfo:json.data
})
}
})
},
getroomimage(){
App.Photo.getSellerPhotoById({sellerid:this.data.detail.seller.id,type:2}).then((json)=>{
if(json.ret==200){
this.setData({
roomimage:json.data
})
let urls=[];
json.data.forEach((v,i)=>{
urls.push(v.image);
})
this.urls=urls;
console.log(urls,'lllllll')
}
})
},
lookroom(){
wx.previewImage({
current: '', // 当前显示图片的http链接
urls: this.urls, // 需要预览的图片http链接列表
})
},
secondbook(){
wx.redirectTo({
url:'../reserve/detail?id='+this.data.detail.seller.id
})
},
getactivity(){
App.Activity.GetActivityByRid({rid:this.id}).then((json)=>{
if(json.ret==200){
console.log(json.data);
this.setData({
list:json.data
})
}
})
},
/**
* 生命周期函数--监听页面隐藏
*/
... ... @@ -130,6 +198,11 @@ Page({
image:res.data.image_url,
}
})
if(this.data.detail.type==0){
this.getstaffinfo();
this.getroomimage();
this.getactivity();
}
})
},
formatDatail(detail,dateSmart){
... ...
<!--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"></nav>
<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>
<view class="opt-button flex-lr">
<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>
</view>
<view class="opt flex-cc">
<formids class="button-none flex-vc" bindclick="lookLocation">
<view class="opt-text flex-cc">
<image class="buts-dh" src="http://nosqn.colorcun.com/manager-invitation/wx2/%E4%B8%80%E9%94%AE%E5%AF%BC%E8%88%AA.png"></image>
<view class="buts-text">一键导航</view>
</view>
</formids>
<button open-type="share" class="button-none flex-vc">
<view class="opt-text flex-cc">
<image class="buts-sh" src="http://nosqn.colorcun.com/manager-invitation/wx2/%E8%BD%AC%E5%8F%91%E7%BB%99%E5%A5%BD%E5%8F%8B.png"></image>
<view class="buts-text">转发给好友</view>
</view>
</button>
</view>
</view>
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
<block wx:if="{{detail.type==0}}">
<!-- <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">
<view class="staff-info flex-lr">
<view class="staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="flex-vl" style="padding-top: 16rpx;">
<view class="brown-font font34r font-bold" style="margin-bottom: 6rpx;">{{staffinfo.name}}</view>
<view class="brown-font font26r" style="margin-bottom: 6rpx;">{{staffinfo.position}}</view>
<view class="brown-font font26r" style="margin-bottom: 44rpx;">{{staffinfo.phone}}</view>
<view class="bg-light-brown book-concat flex-cc" style="margin-bottom: 20rpx;" bindtap="call">
<image src="http://sellershare.colorcun.com/share-call.png" class="book-concat-icon"></image>
<view class="brown-font font24r">电话</view>
</view>
<view class="bg-light-brown book-concat flex-cc" bindtap="addwechat">
<image src="http://sellershare.colorcun.com/share-wechat.png" class="book-concat-icon"></image>
<view class="brown-font font24r">微信</view>
</view>
</view>
<swiper class="seller-coupon" wx:if="{{list && list.length>0}}">
<swiper-item wx:for="{{list}}">
<view class="new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
<view class="font22r font-more font-bold" style="width:140rpx;display: block;">{{item.aname}}</view>
</view>
</swiper-item>
</swiper>
<block wx:else>
<view class="mask-line"></view>
</block>
</view>
<view class="order-info flex-vc">
<view class="order-decrote top-decrote" style="margin-bottom: 60rpx;"></view>
<view class="seller-name font34r font-bold brown-font">{{seller.name}}</view>
<view class="font26r smooth light-brown-font" style="margin-bottom: 12rpx;">已为您安排在包间</view>
<view class="room-info flex-cc">
<view class="room-decrote left-decrote"></view>
<view class="room-name font34r font-bold brown-font">{{seller.room}}</view>
<view class="room-decrote right-decrote"></view>
</view>
<view class="font24r smooth brown-font book-button bg-light-brown flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
<view class="font28r smooth brown-font" style="margin-top: 60rpx;margin-bottom: 20rpx;">时间:{{seller.date}}</view>
<view class="font28r smooth brown-font">地址:{{seller.addr}}</view>
<view class="font24r smooth brown-font book-button bg-light-brown flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
<view class="order-decrote bottom-decrote"></view>
</view>
</view>
<button class="font32r font-bold main-button book-button font-bold flex-cc" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
<view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
</view> -->
<view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;">
<view class="last-book-title"></view>
<view class="last-staff-info flex-lr">
<view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="last-staff-detail flex-vr" style="align-items: flex-end;">
<view class="white-font font60r">{{staffinfo.name}}</view>
<view class="white-font font32r">{{staffinfo.phone}}</view>
<view class="white-font font34r" style="margin-bottom: 20rpx;">{{staffinfo.position}}</view>
<view class="last-button-item flex-ll" style="margin-bottom: 20rpx;" bindtap="call">
<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">
<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>
</view>
<swiper class="last-seller-coupon" wx:if="{{list && list.length>0}}">
<swiper-item wx:for="{{list}}">
<view class="last-new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
<view class="font22r font-more font-bold last-coupon-content" style="width:290rpx;display: block;">{{item.aname}}</view>
<view class="black-font font24r flex-cc last-use-button">立即使用</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="last-order-info flex-vc">
<view class="font42r last-yellow-font" style="margin-bottom: 14rpx;">{{seller.name}}</view>
<view class="font42r last-yellow-font" style="margin-bottom: 26rpx;">{{seller.date}}</view>
<view class="white-font font32r" style="margin-bottom: 28rpx;">已为您安排在包间</view>
<view class="last-room-rect flex-cc">
<view class="font52r last-yellow-font font-bold">{{seller.room}}</view>
<view class="last-look-button last-comoon-button black-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
</view>
<view class="font28r last-yellow-font" style="margin-bottom: 10rpx;">{{seller.addr}}</view>
<view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
</view>
<button class="last-share-button font38r flex-cc font-bold" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
<!-- <block wx:elif="{{detail.hasCancel}}">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
</block>
<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>
</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>
<view class="opt-button flex-lr" wx:if="{{detail && detail.type!=0}}">
<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>
</view>
<view class="opt flex-cc">
<formids class="button-none flex-vc" bindclick="lookLocation">
<view class="opt-text flex-cc">
<image class="buts-dh" src="http://nosqn.colorcun.com/manager-invitation/wx2/%E4%B8%80%E9%94%AE%E5%AF%BC%E8%88%AA.png"></image>
<view class="buts-text">一键导航</view>
</view>
</formids>
<button open-type="share" class="button-none flex-vc">
<view class="opt-text flex-cc">
<image class="buts-sh" src="http://nosqn.colorcun.com/manager-invitation/wx2/%E8%BD%AC%E5%8F%91%E7%BB%99%E5%A5%BD%E5%8F%8B.png"></image>
<view class="buts-text">转发给好友</view>
</view>
</button>
</view>
</view>
<view class="cancel-icon" wx:if="{{detail.status==4}}"></view>
<!--//商务-->
<template name="tpl-1">
... ...
... ... @@ -25,7 +25,7 @@ Page({
options: {tplid: ''},
hasOwner: true,//是否为发起人
animation: 'animation',
couponhidden:false,
couponhidden:true,
getcoupon:false
},
id: null,
... ... @@ -41,7 +41,6 @@ Page({
}
param.tpls=[TP.tpls(options.tplid)]
this.setData(param)
this.getactivity();
mta.Page.init({
"appID": "500667280",
"eventID": "500667287",
... ... @@ -82,7 +81,65 @@ Page({
})
this.getDetail(getCurrentPages().length==1);
},
call(){
wx.makePhoneCall({
phoneNumber: this.data.staffinfo.phone //仅为示例,并非真实的电话号码
})
},
test(e){
console.log('ttttttttttttttt');
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
// })
},
getstaffinfo(){
App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid:this.data.options.uid}).then((json)=>{
if(json.ret==200){
console.log(json)
this.setData({
staffinfo:json.data
})
}
})
},
getroomimage(){
App.Photo.getSellerPhotoById({sellerid:this.data.detail.seller.id,type:2}).then((json)=>{
if(json.ret==200){
this.setData({
roomimage:json.data
})
let urls=[];
json.data.forEach((v,i)=>{
urls.push(v.image);
})
this.urls=urls;
console.log(urls,'lllllll')
}
})
},
lookroom(){
wx.previewImage({
current: '', // 当前显示图片的http链接
urls: this.urls, // 需要预览的图片http链接列表
})
},
secondbook(){
wx.redirectTo({
url:'../reserve/detail?id='+this.data.detail.seller.id
})
},
/**
* 生命周期函数--监听页面隐藏
*/
... ... @@ -103,6 +160,9 @@ Page({
onShareAppMessage: function () {
return this.shareSetting();
},
onShareTimeline(){
return this.shareSetting();
},
getDetail(fouce = false){
App.Reserve.Detail({
openid: getApp().openid,
... ... @@ -139,6 +199,12 @@ Page({
hasUpTime:reserev.type==1 && reserev.hasRunning && reserev.status!=2,
}
})
if(this.data.detail.type==0){
this.getstaffinfo();
this.getroomimage();
this.getactivity();
}
/*
App.Reserve.SellerInfo({seller_id:reserev.seller.id}).then(async sc=>{
this.msgTpl=await ST.getTplMsg(reserev,sc.data.setting.template_code,sc.data)
... ... @@ -255,14 +321,18 @@ Page({
})
},
shareSetting(){
let parmdata={
id:this.id,
fromid:getApp().openid,
hasInvitation:1,
tplid:this.data.options.tplid,
}
if(this.data.options.uid){
parmdata.uid=this.data.options.uid;
}
return {
title: this.data.tpls[0].shareTitle,
path: util.http_build_query({
id:this.id,
fromid:getApp().openid,
hasInvitation:1,
tplid:this.data.options.tplid,
},'/pages/customer/index'),
path: util.http_build_query(parmdata,'/pages/customer/index'),
imageUrl: this.data.tpls[0].shareImage,
}
},
... ...
<!--pages/customer/detail_owner.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<import src="../tpl/invitation"></import>
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome">
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}">
<!--
<service class="flex-rr" style="display: flex;flex-direction: row;" catchtap="catchtap">
<view class="service-view flex-vc">
... ... @@ -10,23 +10,136 @@
</service>
-->
</nav>
<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>
<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
<!-- 内部预定 -->
<block wx:if="{{detail.type==0}}">
<!-- <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>
<view class="cover-conent flex-vc">
<view class="staff-info flex-lr">
<view class="staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="flex-vl" style="padding-top: 16rpx;">
<view class="brown-font font34r font-bold" style="margin-bottom: 6rpx;">{{staffinfo.name}}</view>
<view class="brown-font font26r" style="margin-bottom: 6rpx;">{{staffinfo.position}}</view>
<view class="brown-font font26r" style="margin-bottom: 44rpx;">{{staffinfo.phone}}</view>
<view class="bg-light-brown book-concat flex-cc" style="margin-bottom: 20rpx;" bindtap="call">
<image src="http://sellershare.colorcun.com/share-call.png" class="book-concat-icon"></image>
<view class="brown-font font24r">电话</view>
</view>
<view class="bg-light-brown book-concat flex-cc" bindtap="addwechat">
<image src="http://sellershare.colorcun.com/share-wechat.png" class="book-concat-icon"></image>
<view class="brown-font font24r">微信</view>
</view>
</view>
<swiper class="seller-coupon" wx:if="{{list && list.length>0}}">
<swiper-item wx:for="{{list}}">
<view class="new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
<view class="font22r font-more font-bold" style="width:140rpx;display: block;">{{item.aname}}</view>
</view>
</swiper-item>
</swiper>
<block wx:else>
<view class="mask-line"></view>
</block>
</view>
<view class="order-info flex-vc">
<view class="order-decrote top-decrote" style="margin-bottom: 60rpx;"></view>
<view class="seller-name font34r font-bold brown-font">{{seller.name}}</view>
<view class="font26r smooth light-brown-font" style="margin-bottom: 12rpx;">已为您安排在包间</view>
<view class="room-info flex-cc">
<view class="room-decrote left-decrote"></view>
<view class="room-name font42r font-bold brown-font" style="font-size:42rpx;">{{seller.room}}</view>
<view class="room-decrote right-decrote"></view>
</view>
<view class="font24r smooth brown-font book-button bg-light-brown flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
<view class="font28r smooth brown-font" style="margin-top: 60rpx;margin-bottom: 20rpx;">时间:{{seller.date}}</view>
<view class="font28r smooth brown-font">地址:{{seller.addr}}</view>
<view class="font24r smooth brown-font book-button bg-light-brown flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
<view class="order-decrote bottom-decrote"></view>
</view>
</view>
<button open-type="share" class="font32r font-bold main-button book-button font-bold flex-cc" wx:if="{{!detail.hasOvered && !detail.hasCancel}}" catchtap="setUserInfoSuccess">转发好友</button>
<block wx:elif="{{detail.hasCancel}}">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
</block>
<block wx:else="">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
</block>
<view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
</view> -->
<view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;padding-bottom: {{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel ? 150 : 60}}rpx;">
<view class="last-book-title"></view>
<view class="last-staff-info flex-lr">
<view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="last-staff-detail flex-vr" style="align-items: flex-end;">
<view class="white-font font60r">{{staffinfo.name}}</view>
<view class="white-font font32r">{{staffinfo.phone}}</view>
<view class="white-font font34r" style="margin-bottom: 20rpx;">{{staffinfo.position}}</view>
<view class="last-button-item flex-ll" style="margin-bottom: 20rpx;" bindtap="call">
<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">
<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>
</view>
<swiper class="last-seller-coupon" wx:if="{{list && list.length>0}}">
<swiper-item wx:for="{{list}}">
<view class="last-new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
<view class="font22r font-more font-bold last-coupon-content" style="width:290rpx;display: block;">{{item.aname}}</view>
<view class="black-font font24r flex-cc last-use-button">立即使用</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="last-order-info flex-vc">
<view class="font42r last-yellow-font" style="margin-bottom: 14rpx;">{{seller.name}}</view>
<view class="font42r last-yellow-font" style="margin-bottom: 26rpx;">{{seller.date}}</view>
<view class="white-font font32r" style="margin-bottom: 28rpx;">已为您安排在包间</view>
<view class="last-room-rect flex-cc">
<view class="font52r last-yellow-font font-bold">{{seller.room}}</view>
<view class="last-look-button last-comoon-button black-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
</view>
<view class="font28r last-yellow-font" style="margin-bottom: 10rpx;">{{seller.addr}}</view>
<view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
</view>
<button class="last-share-button font38r flex-cc font-bold" open-type="share" wx:if="{{!detail.hasOvered && !detail.hasCancel}}" catchtap="setUserInfoSuccess">转发好友</button>
<!-- <block wx:elif="{{detail.hasCancel}}">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
</block>
<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>
<!-- 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>
</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>
<view class="bottom flex-lr" wx:if="{{detail.type!=0 && !detail.hasOvered && !detail.hasCancel}}">
<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>
... ... @@ -67,7 +180,7 @@
<ddate id="ddate" order="{{detail}}" wx:if="{{detail}}" bindevent="ddateEvent"></ddate>
<a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT-OWNER"></a2l>
<view class="coupon" wx:if="{{list && list.length>0}}" hidden="{{couponhidden}}" bindtap="close">
<!-- <view class="coupon" wx:if="{{list && list.length>0}}" hidden="{{couponhidden}}" bindtap="close">
<view class="coupon-content flex-vc" style="margin-top: -{{360+(list.length>2 ? 180 : 75*list.length+1)}}rpx;">
<view class="coupon-bg"></view>
<view class="coupon-info">
... ... @@ -92,9 +205,6 @@
</view>
</block>
<block wx:else>
<!-- <userinfo binduserinfo="setcoupon">
</userinfo> -->
<view class="flex-cc" style="padding-right: 15rpx;">
<view class="use-button flex-cc font20r">领取</view>
</view>
... ... @@ -112,12 +222,10 @@
</userinfo>
</block>
<!-- <official-account class="care flex-ll" bindload="load"></official-account> -->
</view>
<view class="" style="padding: 20rpx;position: relative;top: -94rpx;" catchtap="close">
<image src="http://nosqn.colorcun.com/book-close.png" style="width: 60rpx;height: 60rpx;"></image>
</view>
</view>
</view>
</view> -->
... ...
... ... @@ -2,8 +2,13 @@
@import "../tpl/tpls.wxss";
.pages{
width: 100%;
background-size: 100%;
font-size: 34rpx;
position: fixed;
left: 0;
top: 0;
bottom: 0;
}
image{
... ...
... ... @@ -50,13 +50,13 @@ Page({
return;
}
if(opt.act=='coupon'){
wx.redirectTo({
url:'../../me/coupon'
return wx.redirectTo({
url:'../me/coupon'
})
}
if(opt.act=='order'){
wx.redirectTo({
url:'../../me/list'
return wx.switchTab({
url:'../me/list'
})
}
if (opt.islove) {
... ... @@ -145,7 +145,11 @@ Page({
if (!opt.tplid || typeof opt.tplid == 'undefined' || opt.tplid == 'undefined') {
opt.tplid = 1
}
url += '?id=' + res.data.id + '&tplid=' + opt.tplid
console.log(opt,'hhhhh')
url += '?id=' + res.data.id + '&tplid=' + opt.tplid;
if(opt.uid && opt.uid!=''){
url+='&uid='+opt.uid;
}
console.log('wx.redirectTo', url, res);
this.redirectTo({url: url});
}).catch(res => {
... ...
Page({
onLoad(){
this.setData({
staffinfo:wx.getStorageSync('staffinfo')
})
}
})
\ No newline at end of file
... ...
{
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black",
"navigationBarTitleText":"周到安排",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ 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="cover flex-vc">
<image src="{{staffinfo.qrcode}}" mode="aspectFit" show-menu-by-longpress></image>
</view>
\ No newline at end of file
... ...
.cover{
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: #000;
}
.cover image{
width: 100%;
height: 100%;
}
\ No newline at end of file
... ...
... ... @@ -16,16 +16,17 @@ Page({
console.log('chat.options',options)
var chat = plugin.getChatComponent();
//chat.setTextToSpeech(false);
chat.editFoucs(true);
//return;
chat.send('人工服务')
setTimeout(()=>{
let msg=this.getMsg()
console.log('chat.msg',msg)
if(msg){
chat.send(msg)
}
},300)
chat.editFoucs(true);
//return;
chat.send('人工服务')
setTimeout(()=>{
let msg=this.getMsg()
console.log('chat.msg',msg)
if(msg){
chat.send(msg)
}
},300)
},
/**
... ...
... ... @@ -270,4 +270,306 @@
position: absolute;
right:0;
top:8rpx;
}
.brown-font{
color: #794F28;
}
.light-brown-font{
color: #C19E5B;
}
.bg-light-brown{
background: rgba(121,79,40,.1);
}
.cover-conent{
width: 670rpx;
/* padding: 60rpx; */
border-radius: 10rpx;
background: linear-gradient(to bottom,#F7F1E8,#E3D6C7);
margin: 0 auto 60rpx;
padding-bottom: 60rpx;
box-sizing: border-box;
}
.book-image{
width: 440rpx;
height: 196rpx;
margin: 0 auto;
background: url(http://sellershare.colorcun.com/share-book1.png) center center no-repeat;
background-size: contain;
margin-bottom: 20rpx;
}
.book-decrote{
width: 300rpx;
height: 40rpx;
background: url(http://sellershare.colorcun.com/book-decrote.png) center center no-repeat;
background-size: contain;
padding-top: 10rpx;
box-sizing: border-box;
}
.staff-info{
width: 100%;
margin-bottom: 40rpx;
background: url(http://sellershare.colorcun.com/share_bg1.png) left top no-repeat;
background-size: 100% auto;
padding: 20rpx 60rpx 40rpx;
box-sizing: border-box;
position: relative;
}
.staff-image{
width: 286rpx;
height: 378rpx;
margin-right: 76rpx;
background: #EEE;
}
.book-concat{
width: 128rpx;
height: 54rpx;
border-radius: 28rpx;
border-radius: 2rpx solid rgba(121,79,40,.1);
}
.book-concat-icon{
width: 24rpx;
height: 24rpx;
margin-right: 14rpx;
}
.order-decrote{
width: 390rpx;
height: 66rpx;
}
.seller-name{
margin-bottom: 30rpx;
}
.room-info{
height: 118rpx;
}
.room-decrote{
width: 60rpx;
height: 118rpx;
}
.book-button{
width: 136rpx;
height: 46rpx;
border-radius: 24rpx;
margin: 20rpx auto 0;
}
.main-button{
width: 340rpx;
height: 64rpx;
border-radius: 32rpx;
background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
color: #794F28;
margin-bottom: 30rpx;
}
.top-decrote{
background: url(http://sellershare.colorcun.com/share-decrote-top.png) center center no-repeat;
background-size: contain;
}
.bottom-decrote{
background: url(http://sellershare.colorcun.com/share-decrote-bottom.png) center center no-repeat;
background-size: contain;
}
.left-decrote{
background: url(http://sellershare.colorcun.com/room-decrote-left.png) center center no-repeat;
background-size: contain;
}
.right-decrote{
background: url(http://sellershare.colorcun.com/room-decrote-right.png) center center no-repeat;
background-size: contain;
}
.seller-coupon{
position: absolute;
left: 60rpx;
bottom: 0;
width: 302rpx;
height: 82rpx;
}
.new-coupon-item{
width: 100%;
height: 100%;
background: url(http://sellershare.colorcun.com/share-pocket.png) center center no-repeat;
background-size: contain;
padding: 0 20rpx;
box-sizing: border-box;
}
.new-coupon-item>view{
max-width: 140rpx;
height: 100%;
background: linear-gradient(to right, #C91300, #F85B4B,#C91300);
-webkit-background-clip: text;
line-height: 1.4;
-webkit-text-fill-color: transparent;
font-size:22rpx;
line-height: 82rpx;
}
.mask-line{
position: absolute;
left: 0px;
bottom: 0;
width: 100%;
height: 40rpx;
background: #EEDBC4;
}
.last-bg{
position: fixed;
left: 0;
top: 0;
bottom: 0;
right: 0;
padding-bottom: 60rpx;
box-sizing: border-box;
overflow-y: scroll;
background: url(http://sellershare.colorcun.com/last-bg.png) center center no-repeat;
background-size: 100% 100%;
}
.last-book-title{
width: 466rpx;
height: 102rpx;
background: url(http://sellershare.colorcun.com/last-booking.png) center center no-repeat;
background-size: contain;
margin:0 auto 2rpx;
}
.last-staff-info{
width: 100%;
padding-left: 130rpx;
padding-right: 60rpx;
box-sizing: border-box;
margin: 0 auto;
position: relative;
}
.last-staff-image{
width: 220rpx;
height: 476rpx;
margin-left: 30rpx;
}
.last-seller-coupon{
width: 290rpx;
height: 120rpx;
position: absolute;
left: 130rpx;
bottom: 50rpx;
}
.last-new-coupon-item{
width: 290rpx;
height: 120rpx;
position: relative;
}
.last-coupon-content{
width: 290rpx;
height: 104rpx;
background: url(http://sellershare.colorcun.com/last-coupon-bg.png) center center no-repeat;
background-size: contain;
padding-left: 60rpx;
box-sizing: border-box;
color: #FFD888;
font-size: 26rpx;
line-height: 104rpx;
padding-bottom: 16rpx
}
.last-use-button{
width: 128rpx;
height: 36rpx;
border-radius: 18rpx;
position: absolute;
left: 0;
right: 0;
bottom: 0;
background: #FFD888;
margin: 0 auto;
}
.last-icon{
width: 36rpx;
height: 36rpx;
margin-right: 10rpx;
}
.last-button-content{
width: 128rpx;
height: 36rpx;
border-radius: 18rpx;
background: #BA9953;
font-size: 22rpx;
}
.last-order-info{
width: 100%;
margin:0 auto;
padding: 0 60rpx;
box-sizing: border-box;
}
.last-room-rect{
width: 380rpx;
min-height: 160rpx;
border: 4rpx solid #BA9953;
border-radius: 26rpx;
padding: 30rpx 60rpx 48rpx;
color: #BA9953;
position: relative;
margin-bottom: 70rpx;
box-sizing: border-box;
line-height: 74rpx;
}
.last-comoon-button{
width: 130rpx;
height: 48rpx;
border-radius: 24rpx;
background: #BA9953;
}
.last-look-button{
position: absolute;
left: 0;
right: 0;
bottom: -24rpx;
margin: 0 auto;
}
.last-share-button{
width: 440rpx;
height: 80rpx;
border-radius: 14rpx;
color: #4A3404;
font-size: 38rpx;
background: #BA9953;
margin-bottom: 22rpx;
padding: 0;
font-size: 38rpx;
}
.font38r{
font-size: 38rpx;
}
.font60r{
font-size: 60rpx;
}
.font42r{
font-size: 42rpx;
}
.font22r{
font-size: 22rpx;
}
.font52r{
font-size: 52rpx;
}
.last-yellow-font{
color: #BA9953;
}
.last-diancan{
width: 100%;
position: absolute;
left: 0;
bottom: 0;
height: 90rpx;
background: #BA9953;
margin: 0;
padding: 0;
}
.last-buts-text{
width: 100%;
height: 100%;
}
.last-buts-text .icon{
width: 36rpx;
height: 36rpx;
margin-right: 20rpx;
}
.last-button-item{
padding: 0;
background: transparent;
}
\ No newline at end of file
... ...
... ... @@ -75,6 +75,7 @@
"decimal": 4
}
},
"cloudfunctionTemplateRoot": "cloudfunctionTemplate",
"condition": {
"plugin": {
"list": []
... ...
... ... @@ -636,8 +636,20 @@
{
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=157589&tplid=1&fromid=oB-xJ5MEi2mTMrBTiYImD9cpGH6o&hasSellerShare=0&hasInvitation=1 ",
"query": "id= 168368&hasSellerShare=1&hasInvitation=1&uid=3736",
"scene": 1047
},
{
"name": "pages/customer/detail_invitation",
"pathName": "pages/customer/detail_invitation",
"query": "id= 168368&hasInvitation=1&uid=3736",
"scene": null
},
{
"name": "分发",
"pathName": "pages/customer/index",
"query": "act=coupon",
"scene": null
}
]
}
... ...
... ... @@ -589,5 +589,11 @@ export default {
//获取各状态列表
'App.Activity.GetListByStatus':{
openid:'openid',
},
'App.Activity.GetCustomerActivityBaseinfo':null,
'App.Photo.getSellerPhotoById':null,
'App.Contact.UploadCustomerMedia':{
openid:'openid'
}
}
\ No newline at end of file
... ...