Showing
4 changed files
with
7 additions
and
6 deletions
| @@ -156,7 +156,7 @@ Page({ | @@ -156,7 +156,7 @@ Page({ | ||
| 156 | } | 156 | } |
| 157 | }) | 157 | }) |
| 158 | }, | 158 | }, |
| 159 | - userinfo(){ | 159 | + confirmed(){ |
| 160 | if (!this.data.detail.hasCanSuccess) { | 160 | if (!this.data.detail.hasCanSuccess) { |
| 161 | let userInfo = util.cache('userInfo'); | 161 | let userInfo = util.cache('userInfo'); |
| 162 | if (userInfo) { | 162 | if (userInfo) { |
| @@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
| 4 | <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> | 4 | <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> |
| 5 | <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template> | 5 | <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template> |
| 6 | <view class="opt-view flex-vc"> | 6 | <view class="opt-view flex-vc"> |
| 7 | - <block wx:if="{{!hasCanSuccess}}"> | ||
| 8 | - <userinfo class="button-none flex-vc" binduserinfo="confirmed" wx:if="{{options.rid}}" catchtap="catchtap"> | 7 | + <block wx:if="{{!detail.hasCanSuccess}}"> |
| 8 | + <userinfo class="button-none flex-vc" binduserinfo="confirmed" catchtap="catchtap"> | ||
| 9 | <view class="buts-share animation customer"></view> | 9 | <view class="buts-share animation customer"></view> |
| 10 | </userinfo> | 10 | </userinfo> |
| 11 | </block> | 11 | </block> |
| @@ -80,6 +80,7 @@ Page({ | @@ -80,6 +80,7 @@ Page({ | ||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | App.Reserve.Detail(param).then(res => { | 82 | App.Reserve.Detail(param).then(res => { |
| 83 | + console.log(res.data.note_openid,this.enter_params.seller_openid) | ||
| 83 | if(this.enter_params){//商户 | 84 | if(this.enter_params){//商户 |
| 84 | //if(res.data.sid==this.enter_params.seller_id && opt.hasSellerShare==1){//不是客户端分享,且是同一个店的 | 85 | //if(res.data.sid==this.enter_params.seller_id && opt.hasSellerShare==1){//不是客户端分享,且是同一个店的 |
| 85 | if(res.data.note_openid==this.enter_params.seller_openid && opt.hasSellerShare==1){//不是客户端分享,且是记录人 | 86 | if(res.data.note_openid==this.enter_params.seller_openid && opt.hasSellerShare==1){//不是客户端分享,且是记录人 |
| @@ -88,7 +89,7 @@ Page({ | @@ -88,7 +89,7 @@ Page({ | ||
| 88 | url = '/pages/book/b_invitation'; | 89 | url = '/pages/book/b_invitation'; |
| 89 | } | 90 | } |
| 90 | } | 91 | } |
| 91 | - if(url!='/pages/book/b_detail'){ | 92 | + if(url!='/pages/book/b_invitation'){ |
| 92 | //设置关系 | 93 | //设置关系 |
| 93 | App.Reserve.SetRelaOpenid({ | 94 | App.Reserve.SetRelaOpenid({ |
| 94 | rid:res.data.id, | 95 | rid:res.data.id, |
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | "list": [] | 31 | "list": [] |
| 32 | }, | 32 | }, |
| 33 | "miniprogram": { | 33 | "miniprogram": { |
| 34 | - "current": 40, | 34 | + "current": 8, |
| 35 | "list": [ | 35 | "list": [ |
| 36 | { | 36 | { |
| 37 | "id": 0, | 37 | "id": 0, |
| @@ -92,7 +92,7 @@ | @@ -92,7 +92,7 @@ | ||
| 92 | "id": 8, | 92 | "id": 8, |
| 93 | "name": "邀请进入 pages/customer/index", | 93 | "name": "邀请进入 pages/customer/index", |
| 94 | "pathName": "pages/customer/index", | 94 | "pathName": "pages/customer/index", |
| 95 | - "query": "id=2639&fromid=test&hasInvitation=1&hasSellerShare=1&tplid=1", | 95 | + "query": "id=7611&fromid=test&hasInvitation=1&hasSellerShare=&tplid=1", |
| 96 | "scene": 1001 | 96 | "scene": 1001 |
| 97 | }, | 97 | }, |
| 98 | { | 98 | { |
-
Please register or login to post a comment