xt / xcx-book · Commits

Go to a project

Commit 69cdd1195f073589d95e3a3256e72a87232f77b3

Authored by pengye
1 parent d0a901fd
build: skipped

小程序邀请函分包到pack-book文件里

Inline Side-by-side
Showing 46 changed files with 141 additions and 141 deletions
@@ -58,19 +58,10 @@ @@ -58,19 +58,10 @@
58 "pages/me/wananchi", 58 "pages/me/wananchi",
59 "pages/pinglun/createOpinion", 59 "pages/pinglun/createOpinion",
60 "pages/pinglun/opinionSuccess", 60 "pages/pinglun/opinionSuccess",
61 - "pages/customer/detail_owner_invitation1",  
62 - "pages/customer/detail_owner_invitation2",  
63 - "pages/customer/detail_owner_invitation3",  
64 - "pages/customer/detail_owner_invitation4",  
65 - "pages/customer/detail_owner_invitation5",  
66 - "pages/customer/detail_owner_invitation6",  
67 - "pages/customer/detail_owner_invitation7",  
68 - "pages/customer/detail_owner_invitation8",  
69 "pages/reserve/shopHome", 61 "pages/reserve/shopHome",
70 "pages/customer/joinSeller", 62 "pages/customer/joinSeller",
71 "pages/customer/collectSeller", 63 "pages/customer/collectSeller",
72 "pages/customer/detail_owner_invitation_new", 64 "pages/customer/detail_owner_invitation_new",
73 - "pages/customer/detail_owner_invitation9",  
74 "pages/me/invitation", 65 "pages/me/invitation",
75 "pages/reserve/index_new", 66 "pages/reserve/index_new",
76 "pages/reserve/sellerGift" 67 "pages/reserve/sellerGift"
@@ -147,7 +138,16 @@ @@ -147,7 +138,16 @@
147 "pages/book/roomtype/roomtype", 138 "pages/book/roomtype/roomtype",
148 "pages/book/b_reserve", 139 "pages/book/b_reserve",
149 "pages/checkout/index", 140 "pages/checkout/index",
150 - "pages/checkout/invoice" 141 + "pages/checkout/invoice",
  142 + "pages/invitation/detail_owner_invitation1",
  143 + "pages/invitation/detail_owner_invitation2",
  144 + "pages/invitation/detail_owner_invitation3",
  145 + "pages/invitation/detail_owner_invitation4",
  146 + "pages/invitation/detail_owner_invitation5",
  147 + "pages/invitation/detail_owner_invitation6",
  148 + "pages/invitation/detail_owner_invitation7",
  149 + "pages/invitation/detail_owner_invitation8",
  150 + "pages/invitation/detail_owner_invitation9"
151 ] 151 ]
152 } 152 }
153 ], 153 ],
@@ -157,15 +157,15 @@ Page({ @@ -157,15 +157,15 @@ Page({
157 // 支付成功/失败回调 types 1邀请函 2提前点餐 3商家端app分享 157 // 支付成功/失败回调 types 1邀请函 2提前点餐 3商家端app分享
158 callbackFun() { 158 callbackFun() {
159 let that = this; 159 let that = this;
160 - let url = '/pages/customer/detail_owner_invitation1?id=' + that.data.opt.detail.oid; 160 + let url = '/pack-book/pages/invitation/detail_owner_invitation1?id=' + that.data.opt.detail.oid;
161 if(that.data.opt.types == '1'){ 161 if(that.data.opt.types == '1'){
162 console.log('StyleType',this.data.StyleType); 162 console.log('StyleType',this.data.StyleType);
163 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17]; 163 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
164 let style =arr.includes(parseInt(this.data.StyleType)) 164 let style =arr.includes(parseInt(this.data.StyleType))
165 if (!style) { 165 if (!style) {
166 - url = `/pages/customer/detail_owner_invitation${that.data.StyleType}?id=${that.data.opt.detail.oid}`; 166 + url = `/pack-book/pages/invitation/detail_owner_invitation${that.data.StyleType}?id=${that.data.opt.detail.oid}`;
167 } else { 167 } else {
168 - url = `/pages/customer/detail_owner_invitation9?id=${that.data.opt.detail.oid}`; 168 + url = `/pack-book/pages/invitation/detail_owner_invitation9?id=${that.data.opt.detail.oid}`;
169 } 169 }
170 } 170 }
171 if (that.data.opt.types == '2') { 171 if (that.data.opt.types == '2') {
@@ -362,9 +362,9 @@ Page({ @@ -362,9 +362,9 @@ Page({
362 let style =arr.includes(parseInt(this.data.StyleType)) 362 let style =arr.includes(parseInt(this.data.StyleType))
363 let url = ''; 363 let url = '';
364 if (!style) { 364 if (!style) {
365 - url = `/pages/customer/detail_owner_invitation${this.data.StyleType}?id=${this.data.opt.detail.oid}`; 365 + url = `/pack-book/pages/invitation/detail_owner_invitation${this.data.StyleType}?id=${this.data.opt.detail.oid}`;
366 } else { 366 } else {
367 - url = `/pages/customer/detail_owner_invitation9?id=${this.data.opt.detail.oid}`; 367 + url = `/pack-book/pages/invitation/detail_owner_invitation9?id=${this.data.opt.detail.oid}`;
368 } 368 }
369 return wx.reLaunch({ 369 return wx.reLaunch({
370 url 370 url
1 -// pages/customer/detail_owner_invitation1.js 1 +// pack-book/pages/invitation/detail_owner_invitation1.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 const { 7 const {
8 regeneratorRuntime 8 regeneratorRuntime
9 } = global 9 } = global
10 -import ST from '../../utils/sms_tpls'; 10 +import ST from '../../../utils/sms_tpls';
11 Page({ 11 Page({
12 12
13 /** 13 /**
1 -<!--pages/customer/detail_owner_invitation1.wxml-->  
2 -<wxs src="../../utils/util.wxs" module="util" />  
3 -<import src="../../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation1.wxml-->
  2 +<wxs src="../../../utils/util.wxs" module="util" />
  3 +<import src="../../../pages/tpl/invitation"></import>
4 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"> 4 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}">
5 </nav> 5 </nav>
6 <!-- 内部预定 --> 6 <!-- 内部预定 -->
1 -/* pages/customer/detail_owner_invitation1.wxss1 */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation1.wxss1 */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 .pages { 4 .pages {
5 width: 100%; 5 width: 100%;
1 -// pages/customer/detail_owner_invitation2.js 1 +// pack-book/pages/invitation/detail_owner_invitation2.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation2.wxml-->  
2 -<import src="../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation2.wxml-->
  2 +<import src="../../../pages/tpl/invitation"></import>
3 <nav hasHome backgroundColor="{{themeSixteen}}" color="{{themeColor == 'pearlWhite'?'#515151':'#fff'}}" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 <nav hasHome backgroundColor="{{themeSixteen}}" color="{{themeColor == 'pearlWhite'?'#515151':'#fff'}}" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <image 5 <image
1 -/* pages/customer/detail_owner_invitation2.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation2.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
1 -// pages/customer/detail_owner_invitation3.js 1 +// pack-book/pages/invitation/detail_owner_invitation3.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation3.wxml-->  
2 -<import src="../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation3.wxml-->
  2 +<import src="../../../pages/tpl/invitation"></import>
3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <image 5 <image
1 -/* pages/customer/detail_owner_invitation3.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation3.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
1 -// pages/customer/detail_owner_invitation4.js 1 +// pack-book/pages/invitation/detail_owner_invitation4.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation4.wxml--> 1 +<!--pack-book/pages/invitation/detail_owner_invitation4.wxml-->
2 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 2 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
3 <scroll-view scroll-y class="{{themeColor}}"> 3 <scroll-view scroll-y class="{{themeColor}}">
4 <image 4 <image
1 -/* pages/customer/detail_owner_invitation4.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation4.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
1 -// pages/customer/detail_owner_invitation5.js 1 +// pack-book/pages/invitation/detail_owner_invitation5.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation5.wxml--> 1 +<!--pack-book/pages/invitation/detail_owner_invitation5.wxml-->
2 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 2 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
3 <scroll-view scroll-y class="{{themeColor}}"> 3 <scroll-view scroll-y class="{{themeColor}}">
4 <image 4 <image
1 -/* pages/customer/detail_owner_invitation5.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation5.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
1 -// pages/customer/detail_owner_invitation6.js 1 +// pack-book/pages/invitation/detail_owner_invitation6.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation6.wxml-->  
2 -<import src="../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation6.wxml-->
  2 +<import src="../../../pages/tpl/invitation"></import>
3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <image 5 <image
1 -/* pages/customer/detail_owner_invitation6.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation6.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 .titleImg { 4 .titleImg {
5 top: 160rpx; 5 top: 160rpx;
1 -// pages/customer/detail_owner_invitation7.js 1 +// pack-book/pages/invitation/detail_owner_invitation7.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation7.wxml-->  
2 -<import src="../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation7.wxml-->
  2 +<import src="../../../pages/tpl/invitation"></import>
3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <image 5 <image
1 -/* pages/customer/detail_owner_invitation7.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation7.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
1 -// pages/customer/detail_owner_invitation8.js 1 +// pack-book/pages/invitation/detail_owner_invitation8.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation8.wxml-->  
2 -<import src="../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation8.wxml-->
  2 +<import src="../../../pages/tpl/invitation"></import>
3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 <nav hasHome class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <image 5 <image
1 -/* pages/customer/detail_owner_invitation8.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation8.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
1 -// pages/customer/detail_owner_invitation9.js 1 +// pack-book/pages/invitation/detail_owner_invitation9.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 -import util from '../../utils/util';  
4 -import App from '../../utils/api';  
5 -import TP from '../../utils/tpls';  
6 -import RS from '../../utils/reserveStatus' 3 +import util from '../../../utils/util';
  4 +import App from '../../../utils/api';
  5 +import TP from '../../../utils/tpls';
  6 +import RS from '../../../utils/reserveStatus'
7 var plugin = requirePlugin("WechatSI"); 7 var plugin = requirePlugin("WechatSI");
8 -import canvas from "./canvas" 8 +import canvas from "../../../pages/customer/canvas"
9 Page({ 9 Page({
10 /** 10 /**
11 * 页面的初始数据 11 * 页面的初始数据
1 -<!--pages/customer/detail_owner_invitation9.wxml-->  
2 -<import src="../tpl/invitation"></import> 1 +<!--pack-book/pages/invitation/detail_owner_invitation9.wxml-->
  2 +<import src="../../../pages/tpl/invitation"></import>
3 <nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav> 3 <nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav>
4 <scroll-view scroll-y class="viewBox viewBox{{StyleType}}"> 4 <scroll-view scroll-y class="viewBox viewBox{{StyleType}}">
5 <image wx:if="{{hasValueBroadcast && reserve && reserve.swich_voice && reserve.swich_voice=='1'}}" class="musicImg" src="{{isPlay=='1'?'https://qn.colorcun.com/open.svg':'https://qn.colorcun.com/close.svg'}}" bindtap="stopMusic" animation="{{attentionAnim}}" /> 5 <image wx:if="{{hasValueBroadcast && reserve && reserve.swich_voice && reserve.swich_voice=='1'}}" class="musicImg" src="{{isPlay=='1'?'https://qn.colorcun.com/open.svg':'https://qn.colorcun.com/close.svg'}}" bindtap="stopMusic" animation="{{attentionAnim}}" />
1 -/* pages/customer/detail_owner_invitation9.wxss */  
2 -@import "../tpl/tpls.wxss"; 1 +/* pack-book/pages/invitation/detail_owner_invitation9.wxss */
  2 +@import "../../../pages/tpl/tpls.wxss";
3 3
4 @font-face { 4 @font-face {
5 font-family: 'Abel'; 5 font-family: 'Abel';
@@ -73,9 +73,9 @@ Page({ @@ -73,9 +73,9 @@ Page({
73 let style =arr.includes(parseInt(res.data.type)) 73 let style =arr.includes(parseInt(res.data.type))
74 let url = ''; 74 let url = '';
75 if (!style) { 75 if (!style) {
76 - url = `/pages/customer/detail_owner_invitation${res.data.type}?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`; 76 + url = `/pack-book/pages/invitation/detail_owner_invitation${res.data.type}?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
77 } else { 77 } else {
78 - url = `/pages/customer/detail_owner_invitation9?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`; 78 + url = `/pack-book/pages/invitation/detail_owner_invitation9?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
79 } 79 }
80 wx.navigateTo({ 80 wx.navigateTo({
81 url 81 url
@@ -126,9 +126,9 @@ Page({ @@ -126,9 +126,9 @@ Page({
126 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17]; 126 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
127 let style =arr.includes(parseInt(data.type)) 127 let style =arr.includes(parseInt(data.type))
128 if (!style) { 128 if (!style) {
129 - url = '/pages/customer/detail_owner_invitation' + data.type; 129 + url = '/pack-book/pages/invitation/detail_owner_invitation' + data.type;
130 } else { 130 } else {
131 - url = '/pages/customer/detail_owner_invitation9'; 131 + url = '/pack-book/pages/invitation/detail_owner_invitation9';
132 } 132 }
133 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve; 133 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve;
134 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束 134 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束
@@ -146,20 +146,20 @@ Page({ @@ -146,20 +146,20 @@ Page({
146 if (opt.hasInvitation == 1 && configType) { 146 if (opt.hasInvitation == 1 && configType) {
147 let style =arr.includes(parseInt(configType)) 147 let style =arr.includes(parseInt(configType))
148 if (!style) { 148 if (!style) {
149 - url = '/pages/customer/detail_owner_invitation' + configType; 149 + url = '/pack-book/pages/invitation/detail_owner_invitation' + configType;
150 } else { 150 } else {
151 - url = '/pages/customer/detail_owner_invitation9'; 151 + url = '/pack-book/pages/invitation/detail_owner_invitation9';
152 } 152 }
153 } else { 153 } else {
154 - url = '/pages/customer/detail_owner_invitation1'; 154 + url = '/pack-book/pages/invitation/detail_owner_invitation1';
155 } 155 }
156 } else { 156 } else {
157 if (opt.hasInvitation == 1 && configType) { 157 if (opt.hasInvitation == 1 && configType) {
158 let style =arr.includes(parseInt(configType)) 158 let style =arr.includes(parseInt(configType))
159 if (!style) { 159 if (!style) {
160 - url = '/pages/customer/detail_owner_invitation' + configType; 160 + url = '/pack-book/pages/invitation/detail_owner_invitation' + configType;
161 } else { 161 } else {
162 - url = '/pages/customer/detail_owner_invitation9'; 162 + url = '/pack-book/pages/invitation/detail_owner_invitation9';
163 } 163 }
164 } else if (res.data.openid == opt.openid) { 164 } else if (res.data.openid == opt.openid) {
165 url = '/pages/customer/detail_owner'; 165 url = '/pages/customer/detail_owner';
@@ -168,7 +168,7 @@ Page({ @@ -168,7 +168,7 @@ Page({
168 }, 168 },
169 gotoDetailHan(e){ 169 gotoDetailHan(e){
170 console.log(util.attr(e,'id')) 170 console.log(util.attr(e,'id'))
171 - let url='/pages/customer/detail_owner_invitation1?id='+util.attr(e,'id')+'&hasInvitation=1&hasSellerShare=1&tplid=1' 171 + let url='/pack-book/pages/invitation/detail_owner_invitation1?id='+util.attr(e,'id')+'&hasInvitation=1&hasSellerShare=1&tplid=1'
172 wx.navigateTo({ 172 wx.navigateTo({
173 url:url, 173 url:url,
174 }) 174 })
@@ -33,9 +33,9 @@ Page({ @@ -33,9 +33,9 @@ Page({
33 let style =arr.includes(parseInt(res.data.type)) 33 let style =arr.includes(parseInt(res.data.type))
34 let url = '' 34 let url = ''
35 if (!style) { 35 if (!style) {
36 - url = `/pages/customer/detail_owner_invitation${res.data.type}?id=${that.data.oid}`; 36 + url = `/pack-book/pages/invitation/detail_owner_invitation${res.data.type}?id=${that.data.oid}`;
37 } else { 37 } else {
38 - url = `/pages/customer/detail_owner_invitation9?id=${that.data.oid}`; 38 + url = `/pack-book/pages/invitation/detail_owner_invitation9?id=${that.data.oid}`;
39 } 39 }
40 return wx.reLaunch({ 40 return wx.reLaunch({
41 url 41 url
@@ -272,7 +272,7 @@ @@ -272,7 +272,7 @@
272 { 272 {
273 "id": -1, 273 "id": -1,
274 "name": "pages/customer/index 1803 iphone动画", 274 "name": "pages/customer/index 1803 iphone动画",
275 - "pathName": "pages/customer/detail_owner_invitation1", 275 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
276 "query": "id=1803&fromid=1111&hasInvitation=1", 276 "query": "id=1803&fromid=1111&hasInvitation=1",
277 "scene": "1044", 277 "scene": "1044",
278 "shareInfo": { 278 "shareInfo": {
@@ -298,7 +298,7 @@ @@ -298,7 +298,7 @@
298 { 298 {
299 "id": 40, 299 "id": 40,
300 "name": "邀请Ren pages/customer/index ", 300 "name": "邀请Ren pages/customer/index ",
301 - "pathName": "pages/customer/detail_owner_invitation1", 301 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
302 "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1", 302 "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1",
303 "scene": null 303 "scene": null
304 }, 304 },
@@ -458,8 +458,8 @@ @@ -458,8 +458,8 @@
458 }, 458 },
459 { 459 {
460 "id": -1, 460 "id": -1,
461 - "name": "pages/customer/detail_owner_invitation1",  
462 - "pathName": "pages/customer/detail_owner_invitation1", 461 + "name": "pack-book/pages/invitation/detail_owner_invitation1",
  462 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
463 "query": "id=43762&hasInvitation=1&hasSellerShare=1&tplid=1", 463 "query": "id=43762&hasInvitation=1&hasSellerShare=1&tplid=1",
464 "scene": null 464 "scene": null
465 }, 465 },
@@ -628,8 +628,8 @@ @@ -628,8 +628,8 @@
628 "scene": null 628 "scene": null
629 }, 629 },
630 { 630 {
631 - "name": "pages/customer/detail_owner_invitation1",  
632 - "pathName": "pages/customer/detail_owner_invitation1", 631 + "name": "pack-book/pages/invitation/detail_owner_invitation1",
  632 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
633 "query": "id= 157347", 633 "query": "id= 157347",
634 "scene": null 634 "scene": null
635 }, 635 },
@@ -350,7 +350,7 @@ @@ -350,7 +350,7 @@
350 { 350 {
351 "id": -1, 351 "id": -1,
352 "name": "pages/customer/index 1803 iphone动画", 352 "name": "pages/customer/index 1803 iphone动画",
353 - "pathName": "pages/customer/detail_owner_invitation1", 353 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
354 "query": "id=1803&fromid=1111&hasInvitation=1", 354 "query": "id=1803&fromid=1111&hasInvitation=1",
355 "scene": "1044", 355 "scene": "1044",
356 "shareInfo": { 356 "shareInfo": {
@@ -376,7 +376,7 @@ @@ -376,7 +376,7 @@
376 { 376 {
377 "id": 40, 377 "id": 40,
378 "name": "邀请Ren pages/customer/index ", 378 "name": "邀请Ren pages/customer/index ",
379 - "pathName": "pages/customer/detail_owner_invitation1", 379 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
380 "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1", 380 "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1",
381 "scene": null 381 "scene": null
382 }, 382 },
@@ -536,8 +536,8 @@ @@ -536,8 +536,8 @@
536 }, 536 },
537 { 537 {
538 "id": -1, 538 "id": -1,
539 - "name": "pages/customer/detail_owner_invitation1",  
540 - "pathName": "pages/customer/detail_owner_invitation1", 539 + "name": "pack-book/pages/invitation/detail_owner_invitation1",
  540 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
541 "query": "id=43762&hasInvitation=1&hasSellerShare=1&tplid=1", 541 "query": "id=43762&hasInvitation=1&hasSellerShare=1&tplid=1",
542 "scene": null 542 "scene": null
543 }, 543 },
@@ -706,8 +706,8 @@ @@ -706,8 +706,8 @@
706 "scene": null 706 "scene": null
707 }, 707 },
708 { 708 {
709 - "name": "pages/customer/detail_owner_invitation1",  
710 - "pathName": "pages/customer/detail_owner_invitation1", 709 + "name": "pack-book/pages/invitation/detail_owner_invitation1",
  710 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
711 "query": "id= 157347", 711 "query": "id= 157347",
712 "scene": null 712 "scene": null
713 }, 713 },
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@
234 }, 234 },
235 { 235 {
236 "name": "pages/customer/index 1803 iphone动画", 236 "name": "pages/customer/index 1803 iphone动画",
237 - "pathName": "pages/customer/detail_owner_invitation1", 237 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
238 "query": "id=1803&fromid=1111&hasInvitation=1", 238 "query": "id=1803&fromid=1111&hasInvitation=1",
239 "scene": "1044", 239 "scene": "1044",
240 "shareInfo": { 240 "shareInfo": {
@@ -257,7 +257,7 @@ @@ -257,7 +257,7 @@
257 }, 257 },
258 { 258 {
259 "name": "邀请Ren pages/customer/index ", 259 "name": "邀请Ren pages/customer/index ",
260 - "pathName": "pages/customer/detail_owner_invitation1", 260 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
261 "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1", 261 "query": "id= 45539&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1",
262 "scene": null 262 "scene": null
263 }, 263 },
@@ -395,7 +395,7 @@ @@ -395,7 +395,7 @@
395 }, 395 },
396 { 396 {
397 "name": "旧邀请函", 397 "name": "旧邀请函",
398 - "pathName": "pages/customer/detail_owner_invitation1", 398 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
399 "query": "id=364616&hasInvitation=1&hasSellerShare=1&tplid=1", 399 "query": "id=364616&hasInvitation=1&hasSellerShare=1&tplid=1",
400 "launchMode": "default", 400 "launchMode": "default",
401 "scene": null 401 "scene": null
@@ -545,8 +545,8 @@ @@ -545,8 +545,8 @@
545 "scene": null 545 "scene": null
546 }, 546 },
547 { 547 {
548 - "name": "pages/customer/detail_owner_invitation1",  
549 - "pathName": "pages/customer/detail_owner_invitation1", 548 + "name": "pack-book/pages/invitation/detail_owner_invitation1",
  549 + "pathName": "pack-book/pages/invitation/detail_owner_invitation1",
550 "query": "id= 157347", 550 "query": "id= 157347",
551 "scene": null 551 "scene": null
552 }, 552 },
@@ -603,56 +603,56 @@ @@ -603,56 +603,56 @@
603 }, 603 },
604 { 604 {
605 "name": "邀请函-----2", 605 "name": "邀请函-----2",
606 - "pathName": "pages/customer/detail_owner_invitation2", 606 + "pathName": "pack-book/pages/invitation/detail_owner_invitation2",
607 "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 607 "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
608 "launchMode": "default", 608 "launchMode": "default",
609 "scene": null 609 "scene": null
610 }, 610 },
611 { 611 {
612 "name": "邀请函-----3", 612 "name": "邀请函-----3",
613 - "pathName": "pages/customer/detail_owner_invitation3", 613 + "pathName": "pack-book/pages/invitation/detail_owner_invitation3",
614 "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 614 "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
615 "launchMode": "default", 615 "launchMode": "default",
616 "scene": null 616 "scene": null
617 }, 617 },
618 { 618 {
619 "name": "邀请函-----4", 619 "name": "邀请函-----4",
620 - "pathName": "pages/customer/detail_owner_invitation4", 620 + "pathName": "pack-book/pages/invitation/detail_owner_invitation4",
621 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 621 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
622 "launchMode": "default", 622 "launchMode": "default",
623 "scene": null 623 "scene": null
624 }, 624 },
625 { 625 {
626 "name": "邀请函-----5", 626 "name": "邀请函-----5",
627 - "pathName": "pages/customer/detail_owner_invitation5", 627 + "pathName": "pack-book/pages/invitation/detail_owner_invitation5",
628 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 628 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
629 "launchMode": "default", 629 "launchMode": "default",
630 "scene": null 630 "scene": null
631 }, 631 },
632 { 632 {
633 "name": "邀请函-----6", 633 "name": "邀请函-----6",
634 - "pathName": "pages/customer/detail_owner_invitation6", 634 + "pathName": "pack-book/pages/invitation/detail_owner_invitation6",
635 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 635 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
636 "launchMode": "default", 636 "launchMode": "default",
637 "scene": null 637 "scene": null
638 }, 638 },
639 { 639 {
640 "name": "邀请函-----7", 640 "name": "邀请函-----7",
641 - "pathName": "pages/customer/detail_owner_invitation7", 641 + "pathName": "pack-book/pages/invitation/detail_owner_invitation7",
642 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 642 "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
643 "launchMode": "default", 643 "launchMode": "default",
644 "scene": null 644 "scene": null
645 }, 645 },
646 { 646 {
647 "name": "邀请函-----8", 647 "name": "邀请函-----8",
648 - "pathName": "pages/customer/detail_owner_invitation8", 648 + "pathName": "pack-book/pages/invitation/detail_owner_invitation8",
649 "query": "id=1050371&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=", 649 "query": "id=1050371&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
650 "launchMode": "default", 650 "launchMode": "default",
651 "scene": null 651 "scene": null
652 }, 652 },
653 { 653 {
654 "name": "邀请函-----9", 654 "name": "邀请函-----9",
655 - "pathName": "pages/customer/detail_owner_invitation9", 655 + "pathName": "pack-book/pages/invitation/detail_owner_invitation9",
656 "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=2435", 656 "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=2435",
657 "launchMode": "default", 657 "launchMode": "default",
658 "scene": null 658 "scene": null