xt / xcx-book · Commits

Go to a project

Commit 07e235fa0d8c1016e0ddd77f96420b99ddad8735

Authored by Yolanda
1 parent 97f19100

no message

Inline Side-by-side
Showing 25 changed files with 863 additions and 90 deletions
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 "pages/customer/list", 10 "pages/customer/list",
11 "pages/customer/remind", 11 "pages/customer/remind",
12 "pages/customer/care", 12 "pages/customer/care",
  13 + "pages/customer/wecode",
13 "pages/reserve/index", 14 "pages/reserve/index",
14 "pages/reserve/index_yy", 15 "pages/reserve/index_yy",
15 "pages/me/index", 16 "pages/me/index",
  1 +{
  2 + "permissions": {
  3 + "openapi": [
  4 + ]
  5 + }
  6 +}
  1 +// 云函数入口文件
  2 +const cloud = require('wx-server-sdk')
  3 +
  4 +cloud.init()
  5 +
  6 +// 云函数入口函数
  7 +exports.main = async (event, context) => {
  8 + const wxContext = cloud.getWXContext()
  9 +
  10 + switch (event.action) {
  11 + case 'getUrlScheme': {
  12 + return getUrlScheme()
  13 + }
  14 + }
  15 +
  16 + return 'action not found'
  17 +}
  18 +
  19 +async function getUrlScheme() {
  20 + return cloud.openapi.urlscheme.generate({
  21 + jumpWxa: {
  22 + path: 'weixin://dl/business/?t=GC8I0gF6Bad', // <!-- replace -->
  23 + query: '',
  24 + },
  25 + // 如果想不过期则置为 false，并可以存到数据库
  26 + isExpire: false,
  27 + // 一分钟有效期
  28 + expireTime: parseInt(Date.now() / 1000 + 60),
  29 + })
  30 +}
  1 +{
  2 + "name": "public",
  3 + "version": "1.0.0",
  4 + "description": "",
  5 + "main": "index.js",
  6 + "scripts": {
  7 + "test": "echo \"Error: no test specified\" && exit 1"
  8 + },
  9 + "author": "",
  10 + "license": "ISC",
  11 + "dependencies": {
  12 + "wx-server-sdk": "~2.3.2"
  13 + }
  14 +}
@@ -82,6 +82,7 @@ Component({ @@ -82,6 +82,7 @@ Component({
82 titleBarHeight:h, 82 titleBarHeight:h,
83 }) 83 })
84 console.log('this.setData', this.data); 84 console.log('this.setData', this.data);
  85 + // wx.setStorageSync('headerHeight',pt+h);
85 }, 86 },
86 getHeight(){ 87 getHeight(){
87 return this.data.statusBarHeightFull 88 return this.data.statusBarHeightFull
@@ -46,7 +46,7 @@ Page({ @@ -46,7 +46,7 @@ Page({
46 tables.push(t.name); 46 tables.push(t.name);
47 }) 47 })
48 let reserev=RS.reserve(res.data) 48 let reserev=RS.reserve(res.data)
49 - console.log('reserev',reserev) 49 + console.log('ghjk',this.detail)
50 let dateSmart 50 let dateSmart
51 if(res.data.type==1){ 51 if(res.data.type==1){
52 dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[0]) 52 dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[0])
@@ -70,6 +70,9 @@ Page({ @@ -70,6 +70,9 @@ Page({
70 }) 70 })
71 }) 71 })
72 }, 72 },
  73 + getstaffinfo(){
  74 +
  75 + },
73 /** 76 /**
74 * 生命周期函数--监听页面初次渲染完成 77 * 生命周期函数--监听页面初次渲染完成
75 */ 78 */
@@ -129,7 +129,7 @@ Page({ @@ -129,7 +129,7 @@ Page({
129 }) 129 })
130 }, 130 },
131 formatDatail(detail){ 131 formatDatail(detail){
132 - detail.rdateStr=util.unixtoTime(detail.ddate,'MM月DD日 WW HH:II'); 132 + detail.rdateStr=util.unixtoTime(detail.ddate,'YYYY-MM-DD 星期WW HH:II');
133 detail.tableSubInfo=[]; 133 detail.tableSubInfo=[];
134 detail.tables.forEach(t=>{ 134 detail.tables.forEach(t=>{
135 detail.tableSubInfo.push(t.name); 135 detail.tableSubInfo.push(t.name);
@@ -78,6 +78,11 @@ @@ -78,6 +78,11 @@
78 <view>下单时间：</view> 78 <view>下单时间：</view>
79 <view class="">{{order.cdateStr}}</view> 79 <view class="">{{order.cdateStr}}</view>
80 </view> 80 </view>
  81 + <view class="flex-ll item">
  82 + <view>用餐时间：</view>
  83 + <view class="">{{detail.rdateStr}}</view>
  84 + </view>
  85 +
81 </view> 86 </view>
82 </view> 87 </view>
83 <view style="height: 150rpx;width: 100%;"></view> 88 <view style="height: 150rpx;width: 100%;"></view>
1 Page({ 1 Page({
2 onLoad(){ 2 onLoad(){
3 - this.loadnum=0; 3 + // this.loadnum=0;
4 }, 4 },
5 getdata(e){ 5 getdata(e){
6 console.log(e) 6 console.log(e)
7 - this.loadnum=1; 7 + // this.loadnum=1;
8 }, 8 },
9 onShow(){ 9 onShow(){
10 - if(this.loadnum==1){  
11 - wx.navigateBack();  
12 - } 10 + // if(this.loadnum==1){
  11 + // wx.navigateBack();
  12 + // }
13 } 13 }
14 }) 14 })
1 -<web-view src="https://xt04.colorcun.com/tarnsfer.html" bindload="getdata"></web-view>  
  1 +<web-view src="https://xt04.colorcun.com/Fnaj2D4qtEXZY3cfvjXSSsAhatjL.jpg" bindload="getdata"></web-view>
@@ -77,7 +77,75 @@ Page({ @@ -77,7 +77,75 @@ Page({
77 }) 77 })
78 this.getDetail(); 78 this.getDetail();
79 }, 79 },
80 - 80 + call(){
  81 + wx.makePhoneCall({
  82 + phoneNumber: this.data.staffinfo.phone //仅为示例，并非真实的电话号码
  83 + })
  84 + },
  85 + test(e){
  86 + console.log('ttttttttttttttt');
  87 + App.Contact.UploadCustomerMedia({url:this.data.staffinfo.qrcode}).then((json)=>{
  88 + if(json.ret==200) {
  89 + console.log('json')
  90 + }
  91 + })
  92 + },
  93 + addwechat(){
  94 + wx.previewImage({
  95 + current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
  96 + urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
  97 + })
  98 + // util.cache('staffinfo',this.data.staffinfo);
  99 + // wx.navigateTo({
  100 + // url:'./care'
  101 + // })
  102 + },
  103 + getstaffinfo(){
  104 + App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid:this.data.options.uid}).then((json)=>{
  105 + if(json.ret==200){
  106 + console.log(json)
  107 + this.setData({
  108 + staffinfo:json.data
  109 + })
  110 + }
  111 + })
  112 + },
  113 + getroomimage(){
  114 + App.Photo.getSellerPhotoById({sellerid:this.data.detail.seller.id,type:2}).then((json)=>{
  115 + if(json.ret==200){
  116 + this.setData({
  117 + roomimage:json.data
  118 + })
  119 + let urls=[];
  120 + json.data.forEach((v,i)=>{
  121 + urls.push(v.image);
  122 + })
  123 + this.urls=urls;
  124 + console.log(urls,'lllllll')
  125 + }
  126 + })
  127 + },
  128 + lookroom(){
  129 + wx.previewImage({
  130 + current: '', // 当前显示图片的http链接
  131 + urls: this.urls, // 需要预览的图片http链接列表
  132 + })
  133 + },
  134 + secondbook(){
  135 + wx.redirectTo({
  136 + url:'../reserve/detail?id='+this.data.detail.seller.id
  137 + })
  138 + },
  139 + getactivity(){
  140 + App.Activity.GetActivityByRid({rid:this.id}).then((json)=>{
  141 + if(json.ret==200){
  142 + console.log(json.data);
  143 + this.setData({
  144 + list:json.data
  145 + })
  146 + }
  147 + })
  148 + },
81 /** 149 /**
82 * 生命周期函数--监听页面隐藏 150 * 生命周期函数--监听页面隐藏
83 */ 151 */
@@ -130,6 +198,11 @@ Page({ @@ -130,6 +198,11 @@ Page({
130 image:res.data.image_url, 198 image:res.data.image_url,
131 } 199 }
132 }) 200 })
  201 + if(this.data.detail.type==0){
  202 + this.getstaffinfo();
  203 + this.getroomimage();
  204 + this.getactivity();
  205 + }
133 }) 206 })
134 }, 207 },
135 formatDatail(detail,dateSmart){ 208 formatDatail(detail,dateSmart){
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 -<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav>  
4 -<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px; padding-top: 120rpx;overflow-y: auto;" wx:if="{{options.tplid}}">  
5 - <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template>  
6 - <view class="opt-view flex-vc" style="padding-bottom: 320rpx;">  
7 - <block wx:if="{{!detail.hasCanSuccess && detail.status!=4}}">  
8 - <button class="button-none flex-vc" catchtap="confirmed">  
9 - <view class="buts-share animation customer"></view>  
10 - </button>  
11 - </block>  
12 - </view>  
13 -</view>  
14 -<view class="opt-button flex-lr">  
15 - <view bindtap="gotoHome" class="dingbaojian flex-vc">  
16 - <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>  
17 - <view class="text">订包间</view>  
18 - </view>  
19 - <view class="opt flex-cc">  
20 - <formids class="button-none flex-vc" bindclick="lookLocation">  
21 - <view class="opt-text flex-cc">  
22 - <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>  
23 - <view class="buts-text">一键导航</view>  
24 - </view>  
25 - </formids>  
26 - <button open-type="share" class="button-none flex-vc">  
27 - <view class="opt-text flex-cc">  
28 - <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>  
29 - <view class="buts-text">转发给好友</view>  
30 - </view>  
31 - </button>  
32 - </view>  
33 -</view> 3 +<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
  4 +<block wx:if="{{detail.type==0}}">
  5 + <!-- <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;">
  6 + <view class="book-image flex-cc"></view>
  7 + <view class="cover-conent flex-vc">
  8 + <view class="staff-info flex-lr">
  9 + <view class="staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
  10 + <view class="flex-vl" style="padding-top: 16rpx;">
  11 + <view class="brown-font font34r font-bold" style="margin-bottom: 6rpx;">{{staffinfo.name}}</view>
  12 + <view class="brown-font font26r" style="margin-bottom: 6rpx;">{{staffinfo.position}}</view>
  13 + <view class="brown-font font26r" style="margin-bottom: 44rpx;">{{staffinfo.phone}}</view>
  14 + <view class="bg-light-brown book-concat flex-cc" style="margin-bottom: 20rpx;" bindtap="call">
  15 + <image src="http://sellershare.colorcun.com/share-call.png" class="book-concat-icon"></image>
  16 + <view class="brown-font font24r">电话</view>
  17 + </view>
  18 + <view class="bg-light-brown book-concat flex-cc" bindtap="addwechat">
  19 + <image src="http://sellershare.colorcun.com/share-wechat.png" class="book-concat-icon"></image>
  20 + <view class="brown-font font24r">微信</view>
  21 + </view>
  22 + </view>
  23 + <swiper class="seller-coupon" wx:if="{{list && list.length>0}}">
  24 + <swiper-item wx:for="{{list}}">
  25 + <view class="new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
  26 + <view class="font22r font-more font-bold" style="width:140rpx;display: block;">{{item.aname}}</view>
  27 + </view>
  28 + </swiper-item>
  29 + </swiper>
  30 + <block wx:else>
  31 + <view class="mask-line"></view>
  32 + </block>
  33 + </view>
  34 + <view class="order-info flex-vc">
  35 + <view class="order-decrote top-decrote" style="margin-bottom: 60rpx;"></view>
  36 + <view class="seller-name font34r font-bold brown-font">{{seller.name}}</view>
  37 + <view class="font26r smooth light-brown-font" style="margin-bottom: 12rpx;">已为您安排在包间</view>
  38 + <view class="room-info flex-cc">
  39 + <view class="room-decrote left-decrote"></view>
  40 + <view class="room-name font34r font-bold brown-font">{{seller.room}}</view>
  41 + <view class="room-decrote right-decrote"></view>
  42 + </view>
  43 + <view class="font24r smooth brown-font book-button bg-light-brown flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
  44 + <view class="font28r smooth brown-font" style="margin-top: 60rpx;margin-bottom: 20rpx;">时间：{{seller.date}}</view>
  45 + <view class="font28r smooth brown-font">地址：{{seller.addr}}</view>
  46 + <view class="font24r smooth brown-font book-button bg-light-brown flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
  47 + <view class="order-decrote bottom-decrote"></view>
  48 + </view>
  49 + </view>
  50 + <button class="font32r font-bold main-button book-button font-bold flex-cc" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
  51 + <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
  52 + </view> -->
  53 + <view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;">
  54 + <view class="last-book-title"></view>
  55 + <view class="last-staff-info flex-lr">
  56 + <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
  57 + <view class="last-staff-detail flex-vr" style="align-items: flex-end;">
  58 + <view class="white-font font60r">{{staffinfo.name}}</view>
  59 + <view class="white-font font32r">{{staffinfo.phone}}</view>
  60 + <view class="white-font font34r" style="margin-bottom: 20rpx;">{{staffinfo.position}}</view>
  61 + <view class="last-button-item flex-ll" style="margin-bottom: 20rpx;" bindtap="call">
  62 + <image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
  63 + <view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
  64 + </view>
  65 + <button class="last-button-item flex-ll" open-type="contact" bindcontact="test">
  66 + <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
  67 + <view class="black-font font22r last-button-content flex-cc" >加我微信</view>
  68 + </button>
  69 + </view>
  70 + <swiper class="last-seller-coupon" wx:if="{{list && list.length>0}}">
  71 + <swiper-item wx:for="{{list}}">
  72 + <view class="last-new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
  73 + <view class="font22r font-more font-bold last-coupon-content" style="width:290rpx;display: block;">{{item.aname}}</view>
  74 + <view class="black-font font24r flex-cc last-use-button">立即使用</view>
  75 + </view>
  76 + </swiper-item>
  77 + </swiper>
  78 + </view>
  79 + <view class="last-order-info flex-vc">
  80 + <view class="font42r last-yellow-font" style="margin-bottom: 14rpx;">{{seller.name}}</view>
  81 + <view class="font42r last-yellow-font" style="margin-bottom: 26rpx;">{{seller.date}}</view>
  82 + <view class="white-font font32r" style="margin-bottom: 28rpx;">已为您安排在包间</view>
  83 + <view class="last-room-rect flex-cc">
  84 + <view class="font52r last-yellow-font font-bold">{{seller.room}}</view>
  85 + <view class="last-look-button last-comoon-button black-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
  86 + </view>
  87 + <view class="font28r last-yellow-font" style="margin-bottom: 10rpx;">{{seller.addr}}</view>
  88 + <view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
  89 + </view>
  90 + <button class="last-share-button font38r flex-cc font-bold" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
  91 + <!-- <block wx:elif="{{detail.hasCancel}}">
  92 + <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
  93 + </block>
  94 + <block wx:else="">
  95 + <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
  96 + </block> -->
  97 + <view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view>
  98 + </view>
  99 +
  100 +
  101 +</block>
  102 +<block wx:else>
  103 + <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px; padding-top: 120rpx;overflow-y: auto;" wx:if="{{options.tplid}}">
  104 + <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template>
  105 + <view class="opt-view flex-vc" style="padding-bottom: 320rpx;">
  106 + <block wx:if="{{!detail.hasCanSuccess && detail.status!=4}}">
  107 + <button class="button-none flex-vc" catchtap="confirmed">
  108 + <view class="buts-share animation customer"></view>
  109 + </button>
  110 + </block>
  111 + </view>
  112 + </view>
  113 +</block>
  114 +<view class="opt-button flex-lr" wx:if="{{detail && detail.type!=0}}">
  115 + <view bindtap="gotoHome" class="dingbaojian flex-vc">
  116 + <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>
  117 + <view class="text">订包间</view>
  118 + </view>
  119 + <view class="opt flex-cc">
  120 + <formids class="button-none flex-vc" bindclick="lookLocation">
  121 + <view class="opt-text flex-cc">
  122 + <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>
  123 + <view class="buts-text">一键导航</view>
  124 + </view>
  125 + </formids>
  126 + <button open-type="share" class="button-none flex-vc">
  127 + <view class="opt-text flex-cc">
  128 + <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>
  129 + <view class="buts-text">转发给好友</view>
  130 + </view>
  131 + </button>
  132 + </view>
  133 + </view>
34 <view class="cancel-icon" wx:if="{{detail.status==4}}"></view> 134 <view class="cancel-icon" wx:if="{{detail.status==4}}"></view>
35 <!--//商务--> 135 <!--//商务-->
36 <template name="tpl-1"> 136 <template name="tpl-1">
@@ -25,7 +25,7 @@ Page({ @@ -25,7 +25,7 @@ Page({
25 options: {tplid: ''}, 25 options: {tplid: ''},
26 hasOwner: true,//是否为发起人 26 hasOwner: true,//是否为发起人
27 animation: 'animation', 27 animation: 'animation',
28 - couponhidden:false, 28 + couponhidden:true,
29 getcoupon:false 29 getcoupon:false
30 }, 30 },
31 id: null, 31 id: null,
@@ -41,7 +41,6 @@ Page({ @@ -41,7 +41,6 @@ Page({
41 } 41 }
42 param.tpls=[TP.tpls(options.tplid)] 42 param.tpls=[TP.tpls(options.tplid)]
43 this.setData(param) 43 this.setData(param)
44 - this.getactivity();  
45 mta.Page.init({ 44 mta.Page.init({
46 "appID": "500667280", 45 "appID": "500667280",
47 "eventID": "500667287", 46 "eventID": "500667287",
@@ -82,7 +81,65 @@ Page({ @@ -82,7 +81,65 @@ Page({
82 }) 81 })
83 this.getDetail(getCurrentPages().length==1); 82 this.getDetail(getCurrentPages().length==1);
84 }, 83 },
85 - 84 + call(){
  85 + wx.makePhoneCall({
  86 + phoneNumber: this.data.staffinfo.phone //仅为示例，并非真实的电话号码
  87 + })
  88 + },
  89 + test(e){
  90 + console.log('ttttttttttttttt');
  91 + App.Contact.UploadCustomerMedia({url:this.data.staffinfo.qrcode}).then((json)=>{
  92 + if(json.ret==200) {
  93 + console.log('json')
  94 + }
  95 + })
  96 + },
  97 + addwechat(){
  98 + wx.previewImage({
  99 + current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
  100 + urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
  101 + })
  102 + // util.cache('staffinfo',this.data.staffinfo);
  103 + // wx.navigateTo({
  104 + // url:'../me/chat?qrcode='+this.data.staffinfo.qrcode
  105 + // })
  106 + },
  107 + getstaffinfo(){
  108 + App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid:this.data.options.uid}).then((json)=>{
  109 + if(json.ret==200){
  110 + console.log(json)
  111 + this.setData({
  112 + staffinfo:json.data
  113 + })
  114 + }
  115 + })
  116 + },
  117 + getroomimage(){
  118 + App.Photo.getSellerPhotoById({sellerid:this.data.detail.seller.id,type:2}).then((json)=>{
  119 + if(json.ret==200){
  120 + this.setData({
  121 + roomimage:json.data
  122 + })
  123 + let urls=[];
  124 + json.data.forEach((v,i)=>{
  125 + urls.push(v.image);
  126 + })
  127 + this.urls=urls;
  128 + console.log(urls,'lllllll')
  129 + }
  130 + })
  131 + },
  132 + lookroom(){
  133 + wx.previewImage({
  134 + current: '', // 当前显示图片的http链接
  135 + urls: this.urls, // 需要预览的图片http链接列表
  136 + })
  137 + },
  138 + secondbook(){
  139 + wx.redirectTo({
  140 + url:'../reserve/detail?id='+this.data.detail.seller.id
  141 + })
  142 + },
86 /** 143 /**
87 * 生命周期函数--监听页面隐藏 144 * 生命周期函数--监听页面隐藏
88 */ 145 */
@@ -103,6 +160,9 @@ Page({ @@ -103,6 +160,9 @@ Page({
103 onShareAppMessage: function () { 160 onShareAppMessage: function () {
104 return this.shareSetting(); 161 return this.shareSetting();
105 }, 162 },
  163 + onShareTimeline(){
  164 + return this.shareSetting();
  165 + },
106 getDetail(fouce = false){ 166 getDetail(fouce = false){
107 App.Reserve.Detail({ 167 App.Reserve.Detail({
108 openid: getApp().openid, 168 openid: getApp().openid,
@@ -139,6 +199,12 @@ Page({ @@ -139,6 +199,12 @@ Page({
139 hasUpTime:reserev.type==1 && reserev.hasRunning && reserev.status!=2, 199 hasUpTime:reserev.type==1 && reserev.hasRunning && reserev.status!=2,
140 } 200 }
141 }) 201 })
  202 + if(this.data.detail.type==0){
  203 + this.getstaffinfo();
  204 + this.getroomimage();
  205 + this.getactivity();
  206 + }
  207 +
142 /* 208 /*
143 App.Reserve.SellerInfo({seller_id:reserev.seller.id}).then(async sc=>{ 209 App.Reserve.SellerInfo({seller_id:reserev.seller.id}).then(async sc=>{
144 this.msgTpl=await ST.getTplMsg(reserev,sc.data.setting.template_code,sc.data) 210 this.msgTpl=await ST.getTplMsg(reserev,sc.data.setting.template_code,sc.data)
@@ -255,14 +321,18 @@ Page({ @@ -255,14 +321,18 @@ Page({
255 }) 321 })
256 }, 322 },
257 shareSetting(){ 323 shareSetting(){
  324 + let parmdata={
  325 + id:this.id,
  326 + fromid:getApp().openid,
  327 + hasInvitation:1,
  328 + tplid:this.data.options.tplid,
  329 + }
  330 + if(this.data.options.uid){
  331 + parmdata.uid=this.data.options.uid;
  332 + }
258 return { 333 return {
259 title: this.data.tpls[0].shareTitle, 334 title: this.data.tpls[0].shareTitle,
260 - path: util.http_build_query({  
261 - id:this.id,  
262 - fromid:getApp().openid,  
263 - hasInvitation:1,  
264 - tplid:this.data.options.tplid,  
265 - },'/pages/customer/index'), 335 + path: util.http_build_query(parmdata,'/pages/customer/index'),
266 imageUrl: this.data.tpls[0].shareImage, 336 imageUrl: this.data.tpls[0].shareImage,
267 } 337 }
268 }, 338 },
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 <import src="../tpl/invitation"></import> 3 <import src="../tpl/invitation"></import>
4 -<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"> 4 +<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}">
5 <!-- 5 <!--
6 <service class="flex-rr" style="display: flex;flex-direction: row;" catchtap="catchtap"> 6 <service class="flex-rr" style="display: flex;flex-direction: row;" catchtap="catchtap">
7 <view class="service-view flex-vc"> 7 <view class="service-view flex-vc">
@@ -10,23 +10,136 @@ @@ -10,23 +10,136 @@
10 </service> 10 </service>
11 --> 11 -->
12 </nav> 12 </nav>
13 -<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">  
14 - <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>  
15 - <view class="opt-view flex-vc">  
16 - <block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">  
17 - <button open-type="share" class="button-none flex-vc" catchtap="setUserInfoSuccess">  
18 - <view class="buts-share"></view>  
19 - </button>  
20 - </block>  
21 - <block wx:elif="{{detail.hasCancel}}">  
22 - <view class="opt-view-tip Medium">订座已取消</view>  
23 - </block>  
24 - <block wx:else="">  
25 - <view class="opt-view-tip Medium">订座已完成</view>  
26 - </block>  
27 - </view>  
28 -</view>  
29 -<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel}}"> 13 +<!-- 内部预定 -->
  14 +<block wx:if="{{detail.type==0}}">
  15 + <!-- <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;">
  16 + <view class="book-image flex-cc">
  17 + </view>
  18 + <view class="cover-conent flex-vc">
  19 + <view class="staff-info flex-lr">
  20 + <view class="staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
  21 + <view class="flex-vl" style="padding-top: 16rpx;">
  22 + <view class="brown-font font34r font-bold" style="margin-bottom: 6rpx;">{{staffinfo.name}}</view>
  23 + <view class="brown-font font26r" style="margin-bottom: 6rpx;">{{staffinfo.position}}</view>
  24 + <view class="brown-font font26r" style="margin-bottom: 44rpx;">{{staffinfo.phone}}</view>
  25 + <view class="bg-light-brown book-concat flex-cc" style="margin-bottom: 20rpx;" bindtap="call">
  26 + <image src="http://sellershare.colorcun.com/share-call.png" class="book-concat-icon"></image>
  27 + <view class="brown-font font24r">电话</view>
  28 + </view>
  29 + <view class="bg-light-brown book-concat flex-cc" bindtap="addwechat">
  30 + <image src="http://sellershare.colorcun.com/share-wechat.png" class="book-concat-icon"></image>
  31 + <view class="brown-font font24r">微信</view>
  32 + </view>
  33 + </view>
  34 + <swiper class="seller-coupon" wx:if="{{list && list.length>0}}">
  35 + <swiper-item wx:for="{{list}}">
  36 + <view class="new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
  37 + <view class="font22r font-more font-bold" style="width:140rpx;display: block;">{{item.aname}}</view>
  38 + </view>
  39 + </swiper-item>
  40 + </swiper>
  41 + <block wx:else>
  42 + <view class="mask-line"></view>
  43 + </block>
  44 + </view>
  45 + <view class="order-info flex-vc">
  46 + <view class="order-decrote top-decrote" style="margin-bottom: 60rpx;"></view>
  47 + <view class="seller-name font34r font-bold brown-font">{{seller.name}}</view>
  48 + <view class="font26r smooth light-brown-font" style="margin-bottom: 12rpx;">已为您安排在包间</view>
  49 + <view class="room-info flex-cc">
  50 + <view class="room-decrote left-decrote"></view>
  51 + <view class="room-name font42r font-bold brown-font" style="font-size:42rpx;">{{seller.room}}</view>
  52 + <view class="room-decrote right-decrote"></view>
  53 + </view>
  54 + <view class="font24r smooth brown-font book-button bg-light-brown flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
  55 + <view class="font28r smooth brown-font" style="margin-top: 60rpx;margin-bottom: 20rpx;">时间：{{seller.date}}</view>
  56 + <view class="font28r smooth brown-font">地址：{{seller.addr}}</view>
  57 + <view class="font24r smooth brown-font book-button bg-light-brown flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
  58 + <view class="order-decrote bottom-decrote"></view>
  59 + </view>
  60 + </view>
  61 + <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>
  62 + <block wx:elif="{{detail.hasCancel}}">
  63 + <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
  64 + </block>
  65 + <block wx:else="">
  66 + <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
  67 + </block>
  68 + <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
  69 + </view> -->
  70 + <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;">
  71 + <view class="last-book-title"></view>
  72 + <view class="last-staff-info flex-lr">
  73 + <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
  74 + <view class="last-staff-detail flex-vr" style="align-items: flex-end;">
  75 + <view class="white-font font60r">{{staffinfo.name}}</view>
  76 + <view class="white-font font32r">{{staffinfo.phone}}</view>
  77 + <view class="white-font font34r" style="margin-bottom: 20rpx;">{{staffinfo.position}}</view>
  78 + <view class="last-button-item flex-ll" style="margin-bottom: 20rpx;" bindtap="call">
  79 + <image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
  80 + <view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
  81 + </view>
  82 + <button class="last-button-item flex-ll" open-type="contact" bindcontact="test">
  83 + <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
  84 + <view class="black-font font22r last-button-content flex-cc" >加我微信</view>
  85 + </button>
  86 + </view>
  87 + <swiper class="last-seller-coupon" wx:if="{{list && list.length>0}}">
  88 + <swiper-item wx:for="{{list}}">
  89 + <view class="last-new-coupon-item flex-vl" data-id="{{item.id}}" catchtap="todetail">
  90 + <view class="font22r font-more font-bold last-coupon-content" style="width:290rpx;display: block;">{{item.aname}}</view>
  91 + <view class="black-font font24r flex-cc last-use-button">立即使用</view>
  92 + </view>
  93 + </swiper-item>
  94 + </swiper>
  95 + </view>
  96 + <view class="last-order-info flex-vc">
  97 + <view class="font42r last-yellow-font" style="margin-bottom: 14rpx;">{{seller.name}}</view>
  98 + <view class="font42r last-yellow-font" style="margin-bottom: 26rpx;">{{seller.date}}</view>
  99 + <view class="white-font font32r" style="margin-bottom: 28rpx;">已为您安排在包间</view>
  100 + <view class="last-room-rect flex-cc">
  101 + <view class="font52r last-yellow-font font-bold">{{seller.room}}</view>
  102 + <view class="last-look-button last-comoon-button black-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
  103 + </view>
  104 + <view class="font28r last-yellow-font" style="margin-bottom: 10rpx;">{{seller.addr}}</view>
  105 + <view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
  106 + </view>
  107 + <button class="last-share-button font38r flex-cc font-bold" open-type="share" wx:if="{{!detail.hasOvered && !detail.hasCancel}}" catchtap="setUserInfoSuccess">转发好友</button>
  108 + <!-- <block wx:elif="{{detail.hasCancel}}">
  109 + <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
  110 + </block>
  111 + <block wx:else="">
  112 + <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
  113 + </block> -->
  114 + <view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view>
  115 + </view>
  116 + <!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" -->
  117 + <userinfo binduserinfo="cookbook" class="last-diancan flex-vc" wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
  118 + <view class="last-buts-text flex-cc font30r">
  119 + <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>
  120 + 提前点餐
  121 + </view>
  122 + </userinfo>
  123 +</block>
  124 +<block wx:else>
  125 + <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
  126 + <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
  127 + <view class="opt-view flex-vc">
  128 + <block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
  129 + <button open-type="share" class="button-none flex-vc" catchtap="setUserInfoSuccess">
  130 + <view class="buts-share"></view>
  131 + </button>
  132 + </block>
  133 + <block wx:elif="{{detail.hasCancel}}">
  134 + <view class="opt-view-tip Medium">订座已取消</view>
  135 + </block>
  136 + <block wx:else="">
  137 + <view class="opt-view-tip Medium">订座已完成</view>
  138 + </block>
  139 + </view>
  140 + </view>
  141 +</block>
  142 +<view class="bottom flex-lr" wx:if="{{detail.type!=0 && !detail.hasOvered && !detail.hasCancel}}">
30 <view bindtap="gotoHome" class="dingbaojian flex-vc"> 143 <view bindtap="gotoHome" class="dingbaojian flex-vc">
31 <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> 144 <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>
32 <view class="text">订包间</view> 145 <view class="text">订包间</view>
@@ -67,7 +180,7 @@ @@ -67,7 +180,7 @@
67 <ddate id="ddate" order="{{detail}}" wx:if="{{detail}}" bindevent="ddateEvent"></ddate> 180 <ddate id="ddate" order="{{detail}}" wx:if="{{detail}}" bindevent="ddateEvent"></ddate>
68 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT-OWNER"></a2l> 181 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INVIT-OWNER"></a2l>
69 182
70 -<view class="coupon" wx:if="{{list && list.length>0}}" hidden="{{couponhidden}}" bindtap="close"> 183 +<!-- <view class="coupon" wx:if="{{list && list.length>0}}" hidden="{{couponhidden}}" bindtap="close">
71 <view class="coupon-content flex-vc" style="margin-top: -{{360+(list.length>2 ? 180 : 75*list.length+1)}}rpx;"> 184 <view class="coupon-content flex-vc" style="margin-top: -{{360+(list.length>2 ? 180 : 75*list.length+1)}}rpx;">
72 <view class="coupon-bg"></view> 185 <view class="coupon-bg"></view>
73 <view class="coupon-info"> 186 <view class="coupon-info">
@@ -92,9 +205,6 @@ @@ -92,9 +205,6 @@
92 </view> 205 </view>
93 </block> 206 </block>
94 <block wx:else> 207 <block wx:else>
95 - <!-- <userinfo binduserinfo="setcoupon">  
96 -  
97 - </userinfo> -->  
98 <view class="flex-cc" style="padding-right: 15rpx;"> 208 <view class="flex-cc" style="padding-right: 15rpx;">
99 <view class="use-button flex-cc font20r">领取</view> 209 <view class="use-button flex-cc font20r">领取</view>
100 </view> 210 </view>
@@ -112,12 +222,10 @@ @@ -112,12 +222,10 @@
112 </userinfo> 222 </userinfo>
113 223
114 </block> 224 </block>
115 -  
116 - <!-- <official-account class="care flex-ll" bindload="load"></official-account> -->  
117 </view> 225 </view>
118 <view class="" style="padding: 20rpx;position: relative;top: -94rpx;" catchtap="close"> 226 <view class="" style="padding: 20rpx;position: relative;top: -94rpx;" catchtap="close">
119 <image src="http://nosqn.colorcun.com/book-close.png" style="width: 60rpx;height: 60rpx;"></image> 227 <image src="http://nosqn.colorcun.com/book-close.png" style="width: 60rpx;height: 60rpx;"></image>
120 </view> 228 </view>
121 </view> 229 </view>
122 -</view> 230 +</view> -->
123 231
@@ -2,8 +2,13 @@ @@ -2,8 +2,13 @@
2 @import "../tpl/tpls.wxss"; 2 @import "../tpl/tpls.wxss";
3 3
4 .pages{ 4 .pages{
  5 + width: 100%;
5 background-size: 100%; 6 background-size: 100%;
6 font-size: 34rpx; 7 font-size: 34rpx;
  8 + position: fixed;
  9 + left: 0;
  10 + top: 0;
  11 + bottom: 0;
7 } 12 }
8 13
9 image{ 14 image{
@@ -50,13 +50,13 @@ Page({ @@ -50,13 +50,13 @@ Page({
50 return; 50 return;
51 } 51 }
52 if(opt.act=='coupon'){ 52 if(opt.act=='coupon'){
53 - wx.redirectTo({  
54 - url:'../../me/coupon' 53 + return wx.redirectTo({
  54 + url:'../me/coupon'
55 }) 55 })
56 } 56 }
57 if(opt.act=='order'){ 57 if(opt.act=='order'){
58 - wx.redirectTo({  
59 - url:'../../me/list' 58 + return wx.switchTab({
  59 + url:'../me/list'
60 }) 60 })
61 } 61 }
62 if (opt.islove) { 62 if (opt.islove) {
@@ -145,7 +145,11 @@ Page({ @@ -145,7 +145,11 @@ Page({
145 if (!opt.tplid || typeof opt.tplid == 'undefined' || opt.tplid == 'undefined') { 145 if (!opt.tplid || typeof opt.tplid == 'undefined' || opt.tplid == 'undefined') {
146 opt.tplid = 1 146 opt.tplid = 1
147 } 147 }
148 - url += '?id=' + res.data.id + '&tplid=' + opt.tplid 148 + console.log(opt,'hhhhh')
  149 + url += '?id=' + res.data.id + '&tplid=' + opt.tplid;
  150 + if(opt.uid && opt.uid!=''){
  151 + url+='&uid='+opt.uid;
  152 + }
149 console.log('wx.redirectTo', url, res); 153 console.log('wx.redirectTo', url, res);
150 this.redirectTo({url: url}); 154 this.redirectTo({url: url});
151 }).catch(res => { 155 }).catch(res => {
  1 +Page({
  2 + onLoad(){
  3 + this.setData({
  4 + staffinfo:wx.getStorageSync('staffinfo')
  5 + })
  6 + }
  7 +})
  1 +{
  2 + "navigationBarBackgroundColor": "#FFFFFF",
  3 + "navigationBarTextStyle": "black",
  4 + "navigationBarTitleText":"周到安排",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav"
  7 + }
  8 +}
  1 +<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
  2 +<view class="cover flex-vc">
  3 + <image src="{{staffinfo.qrcode}}" mode="aspectFit" show-menu-by-longpress></image>
  4 +</view>
  1 +.cover{
  2 + position: fixed;
  3 + left: 0;
  4 + right: 0;
  5 + top: 0;
  6 + bottom: 0;
  7 + background: #000;
  8 +}
  9 +.cover image{
  10 + width: 100%;
  11 + height: 100%;
  12 +}
@@ -16,16 +16,17 @@ Page({ @@ -16,16 +16,17 @@ Page({
16 console.log('chat.options',options) 16 console.log('chat.options',options)
17 var chat = plugin.getChatComponent(); 17 var chat = plugin.getChatComponent();
18 //chat.setTextToSpeech(false); 18 //chat.setTextToSpeech(false);
19 - chat.editFoucs(true);  
20 - //return;  
21 - chat.send('人工服务')  
22 - setTimeout(()=>{  
23 - let msg=this.getMsg()  
24 - console.log('chat.msg',msg)  
25 - if(msg){  
26 - chat.send(msg)  
27 - }  
28 - },300) 19 + chat.editFoucs(true);
  20 + //return;
  21 + chat.send('人工服务')
  22 + setTimeout(()=>{
  23 + let msg=this.getMsg()
  24 + console.log('chat.msg',msg)
  25 + if(msg){
  26 + chat.send(msg)
  27 + }
  28 + },300)
  29 +
29 }, 30 },
30 31
31 /** 32 /**
@@ -270,4 +270,306 @@ @@ -270,4 +270,306 @@
270 position: absolute; 270 position: absolute;
271 right:0; 271 right:0;
272 top:8rpx; 272 top:8rpx;
  273 +}
  274 +.brown-font{
  275 + color: #794F28;
  276 +}
  277 +.light-brown-font{
  278 + color: #C19E5B;
  279 +}
  280 +.bg-light-brown{
  281 + background: rgba(121,79,40,.1);
  282 +}
  283 +.cover-conent{
  284 + width: 670rpx;
  285 + /* padding: 60rpx; */
  286 + border-radius: 10rpx;
  287 + background: linear-gradient(to bottom,#F7F1E8,#E3D6C7);
  288 + margin: 0 auto 60rpx;
  289 + padding-bottom: 60rpx;
  290 + box-sizing: border-box;
  291 +}
  292 +.book-image{
  293 + width: 440rpx;
  294 + height: 196rpx;
  295 + margin: 0 auto;
  296 + background: url(http://sellershare.colorcun.com/share-book1.png) center center no-repeat;
  297 + background-size: contain;
  298 + margin-bottom: 20rpx;
  299 +}
  300 +.book-decrote{
  301 + width: 300rpx;
  302 + height: 40rpx;
  303 + background: url(http://sellershare.colorcun.com/book-decrote.png) center center no-repeat;
  304 + background-size: contain;
  305 + padding-top: 10rpx;
  306 + box-sizing: border-box;
  307 +}
  308 +.staff-info{
  309 + width: 100%;
  310 + margin-bottom: 40rpx;
  311 + background: url(http://sellershare.colorcun.com/share_bg1.png) left top no-repeat;
  312 + background-size: 100% auto;
  313 + padding: 20rpx 60rpx 40rpx;
  314 + box-sizing: border-box;
  315 + position: relative;
  316 +}
  317 +.staff-image{
  318 + width: 286rpx;
  319 + height: 378rpx;
  320 + margin-right: 76rpx;
  321 + background: #EEE;
  322 +}
  323 +.book-concat{
  324 + width: 128rpx;
  325 + height: 54rpx;
  326 + border-radius: 28rpx;
  327 + border-radius: 2rpx solid rgba(121,79,40,.1);
  328 +}
  329 +.book-concat-icon{
  330 + width: 24rpx;
  331 + height: 24rpx;
  332 + margin-right: 14rpx;
  333 +}
  334 +.order-decrote{
  335 + width: 390rpx;
  336 + height: 66rpx;
  337 +}
  338 +.seller-name{
  339 + margin-bottom: 30rpx;
  340 +}
  341 +.room-info{
  342 + height: 118rpx;
  343 +}
  344 +.room-decrote{
  345 + width: 60rpx;
  346 + height: 118rpx;
  347 +}
  348 +.book-button{
  349 + width: 136rpx;
  350 + height: 46rpx;
  351 + border-radius: 24rpx;
  352 + margin: 20rpx auto 0;
  353 +}
  354 +.main-button{
  355 + width: 340rpx;
  356 + height: 64rpx;
  357 + border-radius: 32rpx;
  358 + background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
  359 + color: #794F28;
  360 + margin-bottom: 30rpx;
  361 +}
  362 +.top-decrote{
  363 + background: url(http://sellershare.colorcun.com/share-decrote-top.png) center center no-repeat;
  364 + background-size: contain;
  365 +}
  366 +.bottom-decrote{
  367 + background: url(http://sellershare.colorcun.com/share-decrote-bottom.png) center center no-repeat;
  368 + background-size: contain;
  369 +}
  370 +.left-decrote{
  371 + background: url(http://sellershare.colorcun.com/room-decrote-left.png) center center no-repeat;
  372 + background-size: contain;
  373 +}
  374 +.right-decrote{
  375 + background: url(http://sellershare.colorcun.com/room-decrote-right.png) center center no-repeat;
  376 + background-size: contain;
  377 +}
  378 +.seller-coupon{
  379 + position: absolute;
  380 + left: 60rpx;
  381 + bottom: 0;
  382 + width: 302rpx;
  383 + height: 82rpx;
  384 +}
  385 +.new-coupon-item{
  386 + width: 100%;
  387 + height: 100%;
  388 + background: url(http://sellershare.colorcun.com/share-pocket.png) center center no-repeat;
  389 + background-size: contain;
  390 + padding: 0 20rpx;
  391 + box-sizing: border-box;
  392 +}
  393 +.new-coupon-item>view{
  394 + max-width: 140rpx;
  395 + height: 100%;
  396 + background: linear-gradient(to right, #C91300, #F85B4B,#C91300);
  397 + -webkit-background-clip: text;
  398 + line-height: 1.4;
  399 + -webkit-text-fill-color: transparent;
  400 + font-size:22rpx;
  401 + line-height: 82rpx;
  402 +}
  403 +.mask-line{
  404 + position: absolute;
  405 + left: 0px;
  406 + bottom: 0;
  407 + width: 100%;
  408 + height: 40rpx;
  409 + background: #EEDBC4;
  410 +}
  411 +.last-bg{
  412 + position: fixed;
  413 + left: 0;
  414 + top: 0;
  415 + bottom: 0;
  416 + right: 0;
  417 + padding-bottom: 60rpx;
  418 + box-sizing: border-box;
  419 + overflow-y: scroll;
  420 + background: url(http://sellershare.colorcun.com/last-bg.png) center center no-repeat;
  421 + background-size: 100% 100%;
  422 +}
  423 +.last-book-title{
  424 + width: 466rpx;
  425 + height: 102rpx;
  426 + background: url(http://sellershare.colorcun.com/last-booking.png) center center no-repeat;
  427 + background-size: contain;
  428 + margin:0 auto 2rpx;
  429 +
  430 +}
  431 +.last-staff-info{
  432 + width: 100%;
  433 + padding-left: 130rpx;
  434 + padding-right: 60rpx;
  435 + box-sizing: border-box;
  436 + margin: 0 auto;
  437 + position: relative;
  438 +}
  439 +.last-staff-image{
  440 + width: 220rpx;
  441 + height: 476rpx;
  442 + margin-left: 30rpx;
  443 +}
  444 +.last-seller-coupon{
  445 + width: 290rpx;
  446 + height: 120rpx;
  447 + position: absolute;
  448 + left: 130rpx;
  449 + bottom: 50rpx;
  450 +}
  451 +.last-new-coupon-item{
  452 + width: 290rpx;
  453 + height: 120rpx;
  454 + position: relative;
  455 +}
  456 +.last-coupon-content{
  457 + width: 290rpx;
  458 + height: 104rpx;
  459 + background: url(http://sellershare.colorcun.com/last-coupon-bg.png) center center no-repeat;
  460 + background-size: contain;
  461 + padding-left: 60rpx;
  462 + box-sizing: border-box;
  463 + color: #FFD888;
  464 + font-size: 26rpx;
  465 + line-height: 104rpx;
  466 + padding-bottom: 16rpx
  467 +}
  468 +.last-use-button{
  469 + width: 128rpx;
  470 + height: 36rpx;
  471 + border-radius: 18rpx;
  472 + position: absolute;
  473 + left: 0;
  474 + right: 0;
  475 + bottom: 0;
  476 + background: #FFD888;
  477 + margin: 0 auto;
  478 +}
  479 +.last-icon{
  480 + width: 36rpx;
  481 + height: 36rpx;
  482 + margin-right: 10rpx;
  483 +}
  484 +.last-button-content{
  485 + width: 128rpx;
  486 + height: 36rpx;
  487 + border-radius: 18rpx;
  488 + background: #BA9953;
  489 + font-size: 22rpx;
  490 +}
  491 +.last-order-info{
  492 + width: 100%;
  493 + margin:0 auto;
  494 + padding: 0 60rpx;
  495 + box-sizing: border-box;
  496 +
  497 +}
  498 +.last-room-rect{
  499 + width: 380rpx;
  500 + min-height: 160rpx;
  501 + border: 4rpx solid #BA9953;
  502 + border-radius: 26rpx;
  503 + padding: 30rpx 60rpx 48rpx;
  504 + color: #BA9953;
  505 + position: relative;
  506 + margin-bottom: 70rpx;
  507 + box-sizing: border-box;
  508 + line-height: 74rpx;
  509 +}
  510 +.last-comoon-button{
  511 + width: 130rpx;
  512 + height: 48rpx;
  513 + border-radius: 24rpx;
  514 + background: #BA9953;
  515 +}
  516 +.last-look-button{
  517 + position: absolute;
  518 + left: 0;
  519 + right: 0;
  520 + bottom: -24rpx;
  521 + margin: 0 auto;
  522 +}
  523 +.last-share-button{
  524 + width: 440rpx;
  525 + height: 80rpx;
  526 + border-radius: 14rpx;
  527 + color: #4A3404;
  528 + font-size: 38rpx;
  529 + background: #BA9953;
  530 + margin-bottom: 22rpx;
  531 + padding: 0;
  532 + font-size: 38rpx;
  533 +}
  534 +.font38r{
  535 + font-size: 38rpx;
  536 +}
  537 +.font60r{
  538 + font-size: 60rpx;
  539 +}
  540 +.font42r{
  541 + font-size: 42rpx;
  542 +}
  543 +.font22r{
  544 + font-size: 22rpx;
  545 +}
  546 +.font52r{
  547 + font-size: 52rpx;
  548 +}
  549 +.last-yellow-font{
  550 + color: #BA9953;
  551 +}
  552 +.last-diancan{
  553 + width: 100%;
  554 + position: absolute;
  555 + left: 0;
  556 + bottom: 0;
  557 + height: 90rpx;
  558 + background: #BA9953;
  559 + margin: 0;
  560 + padding: 0;
  561 +}
  562 +.last-buts-text{
  563 + width: 100%;
  564 + height: 100%;
  565 +
  566 +}
  567 +.last-buts-text .icon{
  568 + width: 36rpx;
  569 + height: 36rpx;
  570 + margin-right: 20rpx;
  571 +}
  572 +.last-button-item{
  573 + padding: 0;
  574 + background: transparent;
273 } 575 }
@@ -75,6 +75,7 @@ @@ -75,6 +75,7 @@
75 "decimal": 4 75 "decimal": 4
76 } 76 }
77 }, 77 },
  78 + "cloudfunctionTemplateRoot": "cloudfunctionTemplate",
78 "condition": { 79 "condition": {
79 "plugin": { 80 "plugin": {
80 "list": [] 81 "list": []
@@ -636,8 +636,20 @@ @@ -636,8 +636,20 @@
636 { 636 {
637 "name": "pages/customer/index", 637 "name": "pages/customer/index",
638 "pathName": "pages/customer/index", 638 "pathName": "pages/customer/index",
639 - "query": "id=157589&tplid=1&fromid=oB-xJ5MEi2mTMrBTiYImD9cpGH6o&hasSellerShare=0&hasInvitation=1 ", 639 + "query": "id= 168368&hasSellerShare=1&hasInvitation=1&uid=3736",
640 "scene": 1047 640 "scene": 1047
  641 + },
  642 + {
  643 + "name": "pages/customer/detail_invitation",
  644 + "pathName": "pages/customer/detail_invitation",
  645 + "query": "id= 168368&hasInvitation=1&uid=3736",
  646 + "scene": null
  647 + },
  648 + {
  649 + "name": "分发",
  650 + "pathName": "pages/customer/index",
  651 + "query": "act=coupon",
  652 + "scene": null
641 } 653 }
642 ] 654 ]
643 } 655 }
@@ -589,5 +589,11 @@ export default { @@ -589,5 +589,11 @@ export default {
589 //获取各状态列表 589 //获取各状态列表
590 'App.Activity.GetListByStatus':{ 590 'App.Activity.GetListByStatus':{
591 openid:'openid', 591 openid:'openid',
  592 + },
  593 + 'App.Activity.GetCustomerActivityBaseinfo':null,
  594 + 'App.Photo.getSellerPhotoById':null,
  595 + 'App.Contact.UploadCustomerMedia':{
  596 + openid:'openid'
592 } 597 }
  598 +
593 } 599 }