xt / xcx-book · Commits

Go to a project

Commit ae29062fdf0269ac25423ee521773a4a88a4cbc3

Authored by wangfan
1 parent 43154dc1
build: skipped

most_pnum

Inline Side-by-side
Showing 4 changed files with 22 additions and 17 deletions
@@ -343,10 +343,12 @@ Page({ @@ -343,10 +343,12 @@ Page({
343 form.rdate =rdate 343 form.rdate =rdate
344 if(!form.rid){ 344 if(!form.rid){
345 try{ 345 try{
346 - let note_openid=util.cache('enter_params').seller_openid;  
347 - let note_name=util.cache('sellerInfo').seller_user.nickname;  
348 - form.note_openid=note_openid||'';  
349 - form.note_name=note_name||''; 346 + let enter_params=util.cache('enter_params');
  347 + let sc=(await App.Reserve.SellerInfo(enter_params)).data
  348 + let note_openid=enter_params.seller_openid;
  349 + let note_name=sc.seller_user.nickname;
  350 + form.note_openid=note_openid||'';
  351 + form.note_name=note_name||'';
350 }catch (e){} 352 }catch (e){}
351 } 353 }
352 form.ddate=d_rdate.substr(0,10); 354 form.ddate=d_rdate.substr(0,10);
@@ -7,7 +7,8 @@ Page({ @@ -7,7 +7,8 @@ Page({
7 actionSheetHidden:true, 7 actionSheetHidden:true,
8 actionSheetItems:['客户取消','客户行程改变'] 8 actionSheetItems:['客户取消','客户行程改变']
9 }, 9 },
10 - onLoad:function (opt) { 10 + sc:{},
  11 + onLoad:async function (opt) {
11 util.setBarTitle('预定详情'); 12 util.setBarTitle('预定详情');
12 console.log(opt) 13 console.log(opt)
13 this.getDetail(opt.id); 14 this.getDetail(opt.id);
@@ -17,6 +18,9 @@ Page({ @@ -17,6 +18,9 @@ Page({
17 console.log(res) 18 console.log(res)
18 } 19 }
19 }) 20 })
  21 + let enter_params=util.cache('enter_params');
  22 + this.sc=(await App.Reserve.SellerInfo(enter_params)).data;
  23 + console.log('this.sc',this.sc);
20 this.chooseManagerInit(); 24 this.chooseManagerInit();
21 }, 25 },
22 onShow:function(){ 26 onShow:function(){
@@ -31,7 +35,7 @@ Page({ @@ -31,7 +35,7 @@ Page({
31 var path='/pages/customer/index?id='+this.data.bookInfo.id; 35 var path='/pages/customer/index?id='+this.data.bookInfo.id;
32 let nickname=""; 36 let nickname="";
33 try{ 37 try{
34 - nickname='"'+util.cache('sellerInfo').seller_user.nickname+'"'; 38 + nickname='"'+this.sc.seller_user.nickname+'"';
35 }catch(e){} 39 }catch(e){}
36 let imageUrl=util.cgi('index.php?service=App.Reserve.MakePic&rid=').replace('?s=','')+obj.id 40 let imageUrl=util.cgi('index.php?service=App.Reserve.MakePic&rid=').replace('?s=','')+obj.id
37 console.log('App.Reserve.MakePic',imageUrl); 41 console.log('App.Reserve.MakePic',imageUrl);
@@ -63,7 +67,7 @@ Page({ @@ -63,7 +67,7 @@ Page({
63 }, 67 },
64 chooseManagerInit(){ 68 chooseManagerInit(){
65 try{ 69 try{
66 - let managers=util.cache('sellerInfo').manager; 70 + let managers=this.sc.manager;
67 let mans=[]; 71 let mans=[];
68 if(managers.length>0){ 72 if(managers.length>0){
69 managers.forEach(man=>{ 73 managers.forEach(man=>{
@@ -82,7 +86,7 @@ Page({ @@ -82,7 +86,7 @@ Page({
82 let mansIndex=util.val(e); 86 let mansIndex=util.val(e);
83 this.setData({mansIndex:mansIndex}); 87 this.setData({mansIndex:mansIndex});
84 try{ 88 try{
85 - let managers=util.cache('sellerInfo').manager; 89 + let managers=this.sc.manager;
86 let man=managers[mansIndex]; 90 let man=managers[mansIndex];
87 if(man){ 91 if(man){
88 App.Reserve.SetReserveCusman({ 92 App.Reserve.SetReserveCusman({
@@ -102,9 +106,7 @@ Page({ @@ -102,9 +106,7 @@ Page({
102 106
103 }, 107 },
104 flushSellerInfo(){ 108 flushSellerInfo(){
105 - App.Reserve.SellerInfo(util.cache('enter_params'),true).then(res=>{  
106 - util.cache('sellerInfo',res.data)  
107 - }) 109 + App.Reserve.SellerInfo(util.cache('enter_params'),true);
108 }, 110 },
109 detailData:null, 111 detailData:null,
110 getDetail(id,force=false){ 112 getDetail(id,force=false){
@@ -33,9 +33,7 @@ Page({ @@ -33,9 +33,7 @@ Page({
33 this.sellerid=opt.seller_id; 33 this.sellerid=opt.seller_id;
34 util.cache('sellerid',opt.seller_id) 34 util.cache('sellerid',opt.seller_id)
35 util.cache('enter_params',opt) 35 util.cache('enter_params',opt)
36 - App.Reserve.SellerInfo(opt).then(res=>{  
37 - util.cache('sellerInfo',res.data)  
38 - }) 36 + App.Reserve.SellerInfo(opt)
39 }else{ 37 }else{
40 this.sellerid=util.cache('sellerid'); 38 this.sellerid=util.cache('sellerid');
41 } 39 }
1 var util = require('../../utils/util.js') 1 var util = require('../../utils/util.js')
2 var uri=require('../../utils/uri.js') 2 var uri=require('../../utils/uri.js')
3 var bookOrder=require('../../utils/bookCommon.js') 3 var bookOrder=require('../../utils/bookCommon.js')
  4 +const {regeneratorRuntime} = global
4 Page({ 5 Page({
5 data:{ 6 data:{
6 grand:[ 7 grand:[
@@ -202,7 +203,7 @@ Page({ @@ -202,7 +203,7 @@ Page({
202 }) 203 })
203 } 204 }
204 }, 205 },
205 - formsubmit:function(){ 206 + formsubmit:async function(){
206 wx.showLoading({ 207 wx.showLoading({
207 title:'正在预定', 208 title:'正在预定',
208 mask:true 209 mask:true
@@ -219,9 +220,11 @@ Page({ @@ -219,9 +220,11 @@ Page({
219 cusdem:this.data.remark //备注 220 cusdem:this.data.remark //备注
220 } 221 }
221 try{ 222 try{
222 - let manager_id=util.cache('enter_params').manager_id; 223 + let enter_params=util.cache('enter_params');
  224 + let manager_id=enter_params.manager_id;
223 if(manager_id){ 225 if(manager_id){
224 - let managers=util.cache('sellerInfo').manager; 226 + let sc=(await App.Reserve.SellerInfo(enter_params)).data
  227 + let managers=sc.manager;
225 managers.forEach(man=>{ 228 managers.forEach(man=>{
226 if(manager_id==man.id){ 229 if(manager_id==man.id){
227 formData.cusman_id=man.id; 230 formData.cusman_id=man.id;