|
@@ -12,6 +12,8 @@ Page({ |
|
@@ -12,6 +12,8 @@ Page({ |
|
12
|
/**
|
12
|
/**
|
|
13
|
* 生命周期函数--监听页面加载
|
13
|
* 生命周期函数--监听页面加载
|
|
14
|
*/
|
14
|
*/
|
|
|
|
15
|
+ islove:'',//用户在哪端
|
|
|
|
16
|
+ enter_params:'',//商户入口参数
|
|
15
|
async onLoad(opt) {
|
17
|
async onLoad(opt) {
|
|
16
|
console.log('onLoad', opt);
|
18
|
console.log('onLoad', opt);
|
|
17
|
//转化场景值到opt
|
19
|
//转化场景值到opt
|
|
@@ -31,10 +33,16 @@ Page({ |
|
@@ -31,10 +33,16 @@ Page({ |
|
31
|
this.selectComponent("#network").refresh();
|
33
|
this.selectComponent("#network").refresh();
|
|
32
|
return;
|
34
|
return;
|
|
33
|
}
|
35
|
}
|
|
34
|
- //进行商户判断
|
|
|
|
35
|
- let flag=await this.SellerForOpenid(opt.openid);
|
|
|
|
36
|
- if(flag) return;
|
36
|
+ if(opt.islove){
|
|
|
|
37
|
+ util.cache('islove',opt.islove);
|
|
|
|
38
|
+ this.islove=opt.islove
|
|
|
|
39
|
+ }else{
|
|
|
|
40
|
+ this.islove=await util.cache('islove')
|
|
|
|
41
|
+ }
|
|
37
|
|
42
|
|
|
|
|
43
|
+ //获得商户数据
|
|
|
|
44
|
+ this.enter_params=await this.SellerForOpenid(opt.openid);
|
|
|
|
45
|
+ //console.log('this.enter_params',this.enter_params)
|
|
38
|
let url = '/pages/customer/list';
|
46
|
let url = '/pages/customer/list';
|
|
39
|
if (opt.id > 0 || opt.sms_code) {
|
47
|
if (opt.id > 0 || opt.sms_code) {
|
|
40
|
if(opt.invite_name){
|
48
|
if(opt.invite_name){
|
|
@@ -55,20 +63,28 @@ Page({ |
|
@@ -55,20 +63,28 @@ Page({ |
|
55
|
}
|
63
|
}
|
|
56
|
|
64
|
|
|
57
|
App.Reserve.Detail(param).then(res => {
|
65
|
App.Reserve.Detail(param).then(res => {
|
|
58
|
- //设置关系
|
|
|
|
59
|
- App.Reserve.SetRelaOpenid({
|
66
|
+ console.log(this.enter_params.seller_openid)
|
|
|
|
67
|
+ if(this.enter_params){//商户
|
|
|
|
68
|
+ if(res.data.sid==this.enter_params.seller_id && !opt.fromid){//不是客户端分享，且是同一个店的
|
|
|
|
69
|
+ util.cache('enter_params',this.enter_params)
|
|
|
|
70
|
+ url = '/pages/book/b_detail';
|
|
|
|
71
|
+ }
|
|
|
|
72
|
+ }
|
|
|
|
73
|
+ if(url!='/pages/book/b_detail'){
|
|
|
|
74
|
+ //设置关系
|
|
|
|
75
|
+ App.Reserve.SetRelaOpenid({
|
|
60
|
rid:res.data.id,
|
76
|
rid:res.data.id,
|
|
61
|
openid:opt.openid,
|
77
|
openid:opt.openid,
|
|
62
|
fromid:opt.fromid?opt.fromid:''
|
78
|
fromid:opt.fromid?opt.fromid:''
|
|
63
|
- })
|
|
|
|
64
|
-
|
|
|
|
65
|
- if (!res.data.openid) {//无预订人
|
79
|
+ })
|
|
|
|
80
|
+ if (!res.data.openid) {//无预订人
|
|
66
|
url = '/pages/customer/detail_owner';
|
81
|
url = '/pages/customer/detail_owner';
|
|
67
|
- } else {
|
82
|
+ } else {
|
|
68
|
url = '/pages/customer/detail_customer';
|
83
|
url = '/pages/customer/detail_customer';
|
|
69
|
if (res.data.openid == opt.openid) {
|
84
|
if (res.data.openid == opt.openid) {
|
|
70
|
- url = '/pages/customer/detail_owner';
|
85
|
+ url = '/pages/customer/detail_owner';
|
|
71
|
}
|
86
|
}
|
|
|
|
87
|
+ }
|
|
72
|
}
|
88
|
}
|
|
73
|
url+='?id='+res.data.id
|
89
|
url+='?id='+res.data.id
|
|
74
|
console.log('wx.redirectTo',url,res);
|
90
|
console.log('wx.redirectTo',url,res);
|
|
@@ -77,8 +93,15 @@ Page({ |
|
@@ -77,8 +93,15 @@ Page({ |
|
77
|
this.redirectTo({url: url});
|
93
|
this.redirectTo({url: url});
|
|
78
|
})
|
94
|
})
|
|
79
|
} else {
|
95
|
} else {
|
|
80
|
- console.log('url',url);
|
|
|
|
81
|
- this.redirectTo({url: url});
|
96
|
+ if(this.enter_params && this.islove!='customer'){
|
|
|
|
97
|
+ //商户且未手动切换到顾客端
|
|
|
|
98
|
+ wx.reLaunch({
|
|
|
|
99
|
+ url:util.http_build_query(this.enter_params,'/pages/book/b_index')
|
|
|
|
100
|
+ })
|
|
|
|
101
|
+ return;
|
|
|
|
102
|
+ }
|
|
|
|
103
|
+ console.log('url',url);
|
|
|
|
104
|
+ this.redirectTo({url: url});
|
|
82
|
}
|
105
|
}
|
|
83
|
|
106
|
|
|
84
|
},
|
107
|
},
|
|
@@ -149,12 +172,15 @@ Page({ |
|
@@ -149,12 +172,15 @@ Page({ |
|
149
|
enter_params=res.data;
|
172
|
enter_params=res.data;
|
|
150
|
}
|
173
|
}
|
|
151
|
if(enter_params) {
|
174
|
if(enter_params) {
|
|
152
|
- console.log('seller_enter_params', enter_params)
|
|
|
|
153
|
- wx.reLaunch({
|
|
|
|
154
|
- url:util.http_build_query(enter_params,'/pages/book/b_index')
|
|
|
|
155
|
- })
|
|
|
|
156
|
- return true
|
175
|
+ return enter_params;
|
|
157
|
}
|
176
|
}
|
|
|
|
177
|
+ // if(enter_params) {
|
|
|
|
178
|
+ // console.log('seller_enter_params', enter_params)
|
|
|
|
179
|
+ // wx.reLaunch({
|
|
|
|
180
|
+ // url:util.http_build_query(enter_params,'/pages/book/b_index')
|
|
|
|
181
|
+ // })
|
|
|
|
182
|
+ // return true
|
|
|
|
183
|
+ // }
|
|
158
|
return false
|
184
|
return false
|
|
159
|
}
|
185
|
}
|
|
160
|
}) |
186
|
}) |
