xt / xcx-book · Commits

Go to a project

Commit c4a73c5abb48bc375f9cddd3066f1a2dbb646e2f

Authored by pengye
1 parent ea964673
build: skipped

邀请函分模板路径修改

Inline Side-by-side
Showing 10 changed files with 39 additions and 67 deletions
@@ -55,12 +55,12 @@ @@ -55,12 +55,12 @@
55 "pages/reserve/reserve", 55 "pages/reserve/reserve",
56 "pages/tcads/cmyy", 56 "pages/tcads/cmyy",
57 "pages/pinglun/video", 57 "pages/pinglun/video",
58 - "pages/customer/detail_owner_invitation_new", 58 + "pages/customer/detail_owner_invitation_new1",
59 "pages/me/coupon_news", 59 "pages/me/coupon_news",
60 "pages/me/wananchi", 60 "pages/me/wananchi",
61 "pages/pinglun/createOpinion", 61 "pages/pinglun/createOpinion",
62 "pages/pinglun/opinionSuccess", 62 "pages/pinglun/opinionSuccess",
63 - "pages/customer/detail_owner_invitation_new_style" 63 + "pages/customer/detail_owner_invitation_new2"
64 ], 64 ],
65 "requiredPrivateInfos": [ 65 "requiredPrivateInfos": [
66 "getLocation", 66 "getLocation",
1 -// pages/customer/detail_owner_invitation_new.js 1 +// pages/customer/detail_owner_invitation_new1.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 import util from '../../utils/util'; 3 import util from '../../utils/util';
4 import App from '../../utils/api'; 4 import App from '../../utils/api';
1 -<!--pages/customer/detail_owner_invitation_new.wxml--> 1 +<!--pages/customer/detail_owner_invitation_new1.wxml-->
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 <nav hasHome class="navhome" place="{{true}}"> 3 <nav hasHome class="navhome" place="{{true}}">
4 </nav> 4 </nav>
1 -/* pages/customer/detail_owner_invitation_new.wxss */ 1 +/* pages/customer/detail_owner_invitation_new1.wxss */
2 @import "../tpl/tpls.wxss"; 2 @import "../tpl/tpls.wxss";
3 3
4 .titleImg { 4 .titleImg {
1 -// pages/customer/detail_owner_invitation_new.js 1 +// pages/customer/detail_owner_invitation_new1.js
2 var mta = require('mta-wechat-analysis') 2 var mta = require('mta-wechat-analysis')
3 import util from '../../utils/util'; 3 import util from '../../utils/util';
4 import App from '../../utils/api'; 4 import App from '../../utils/api';
1 { 1 {
2 - "navigationBarBackgroundColor": "#ffffff",  
3 - "navigationBarTextStyle": "white",  
4 - "navigationBarTitleText": "",  
5 - "usingComponents": {  
6 - "nav": "/components/nav/nav"  
7 - }  
8 -}  
  2 + "navigationBarBackgroundColor": "#ffffff",
  3 + "navigationBarTextStyle": "white",
  4 + "navigationBarTitleText": "",
  5 + "usingComponents": {
  6 + "nav": "/components/nav/nav"
  7 + }
  8 + }
1 -<!--pages/customer/detail_owner_invitation_new_style.wxml--> 1 +<!--pages/customer/detail_owner_invitation_new2.wxml-->
2 <nav hasHome class="navhome" place="{{true}}"></nav> 2 <nav hasHome class="navhome" place="{{true}}"></nav>
3 <scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y> 3 <scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y>
4 <view class="titleImg" style="background: rgba({{homeColor}});"> 4 <view class="titleImg" style="background: rgba({{homeColor}});">
@@ -171,4 +171,4 @@ @@ -171,4 +171,4 @@
171 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 171 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
172 </button> 172 </button>
173 </block> 173 </block>
174 -</view>  
  174 +</view>
1 -/* pages/customer/detail_owner_invitation_new_style.wxss */ 1 +/* pages/customer/detail_owner_invitation_new2.wxss */
2 @import "../tpl/tpls.wxss"; 2 @import "../tpl/tpls.wxss";
3 3
4 .titleImg { 4 .titleImg {
@@ -141,62 +141,34 @@ Page({ @@ -141,62 +141,34 @@ Page({
141 console.log(res.data.openid,'resdataopenidopenidopenidopenid'); 141 console.log(res.data.openid,'resdataopenidopenidopenidopenid');
142 console.log(opt.hasInvitation,'hasInvitation'); 142 console.log(opt.hasInvitation,'hasInvitation');
143 console.log(opt.openid,'optopenidoptopenidopt.openid'); 143 console.log(opt.openid,'optopenidoptopenidopt.openid');
144 - let ur1='/pages/customer/detail_owner';  
145 - let ur2='/pages/customer/detail_owner_invitation_new_style';  
146 - let ur3='/pages/customer/detail_owner_invitation_new';  
147 - let ur4='/pages/customer/detail_owner_invitation';  
148 - let ur5='/pages/customer/detail_customer';  
149 - let ur6='/pages/customer/detail_invitation';  
150 - // if (!res.data.openid) {//无预订人  
151 - // url = '/pages/customer/detail_owner';  
152 - // if (opt.hasInvitation == 1 && is_new=='1') {  
153 - // url = '/pages/customer/detail_owner_invitation_new';  
154 - // }else{  
155 - // url = '/pages/customer/detail_owner_invitation';  
156 - // }  
157 - // } else {  
158 - // url = '/pages/customer/detail_customer';  
159 - // if (opt.hasInvitation == 1 && is_new=='1') {  
160 - // url = '/pages/customer/detail_owner_invitation_new';  
161 - // }else{  
162 - // url = '/pages/customer/detail_invitation';  
163 - // }  
164 - // if (res.data.openid == opt.openid) {  
165 - // url = '/pages/customer/detail_owner';  
166 - // if (opt.hasInvitation == 1 && is_new=='1') {  
167 - // url = '/pages/customer/detail_owner_invitation_new';  
168 - // }else{  
169 - // url = '/pages/customer/detail_owner_invitation';  
170 - // }  
171 - // }  
172 - // } 144 + console.log('type',res.data.temp_config_type);
173 if (!res.data.openid) {//无预订人 145 if (!res.data.openid) {//无预订人
174 - url = ur1;  
175 - if (opt.hasInvitation == 1 && is_new=='1' && res.data.sid=='8') {//店铺是8 跳转到新邀请函新模板  
176 - url = ur2;  
177 - }else if(opt.hasInvitation == 1 && is_new=='1'){  
178 - url = ur3;  
179 - }else{  
180 - url = ur4;  
181 - } 146 + url = '/pages/customer/detail_owner';
  147 + if (opt.hasInvitation == 1 && is_new=='1' && res.data.temp_config_type=='1') {
  148 + url = '/pages/customer/detail_owner_invitation_new1';
  149 + }else if(opt.hasInvitation == 1 && is_new=='1' && res.data.temp_config_type=='2') {
  150 + url = '/pages/customer/detail_owner_invitation_new2';
  151 + }else{
  152 + url = '/pages/customer/detail_owner_invitation';
  153 + }
182 } else { 154 } else {
183 - url = ur5;  
184 - if (opt.hasInvitation == 1 && is_new=='1' && res.data.sid=='8') {//店铺是8 跳转到新邀请函新模板  
185 - url = ur2;  
186 - }else if(opt.hasInvitation == 1 && is_new=='1'){  
187 - url = ur3;  
188 - }else{  
189 - url = ur6; 155 + url = '/pages/customer/detail_customer';
  156 + if (opt.hasInvitation == 1 && is_new=='1' && res.data.temp_config_type=='1') {
  157 + url = '/pages/customer/detail_owner_invitation_new1';
  158 + }else if(opt.hasInvitation == 1 && is_new=='1' && res.data.temp_config_type=='2') {
  159 + url = '/pages/customer/detail_owner_invitation_new2';
  160 + }else{
  161 + url = '/pages/customer/detail_invitation';
190 } 162 }
191 if (res.data.openid == opt.openid) { 163 if (res.data.openid == opt.openid) {
192 - url = ur1;  
193 - if (opt.hasInvitation == 1 && is_new=='1' && res.data.sid=='8') {//店铺是8 跳转到新邀请函新模板  
194 - url = ur2;  
195 - }else if(opt.hasInvitation == 1 && is_new=='1'){  
196 - url = ur3; 164 + url = '/pages/customer/detail_owner';
  165 + if (opt.hasInvitation == 1 && is_new=='1' && res.data.temp_config_type=='1') {
  166 + url = '/pages/customer/detail_owner_invitation_new1';
  167 + }else if(opt.hasInvitation == 1 && is_new=='1' && res.data.temp_config_type=='2') {
  168 + url = '/pages/customer/detail_owner_invitation_new2';
197 }else{ 169 }else{
198 - url = ur4;  
199 - } 170 + url = '/pages/customer/detail_owner_invitation';
  171 + }
200 } 172 }
201 } 173 }
202 } 174 }