Commit 7446f0861b4c15b73e1257b28aa9f19d90db0728

Authored by vking
1 parent 2a36c2be

painter

@@ -6,6 +6,10 @@ Component({ @@ -6,6 +6,10 @@ Component({
6 */ 6 */
7 properties: { 7 properties: {
8 seller_id:String, 8 seller_id:String,
  9 + hasSellerShare:{
  10 + type:Boolean,
  11 + value:false,
  12 + }
9 }, 13 },
10 14
11 /** 15 /**
@@ -38,6 +42,7 @@ Component({ @@ -38,6 +42,7 @@ Component({
38 url:util.http_build_query({ 42 url:util.http_build_query({
39 id:this.data.seller_id, 43 id:this.data.seller_id,
40 act:act, 44 act:act,
  45 + hasSellerShare:this.data.hasSellerShare
41 },'/pages/reserve/share') 46 },'/pages/reserve/share')
42 }) 47 })
43 }, 48 },
@@ -68,7 +68,12 @@ Page({ @@ -68,7 +68,12 @@ Page({
68 68
69 }, 69 },
70 onShareAppMessage: function () { 70 onShareAppMessage: function () {
71 - let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/detail') 71 + let path=util.http_build_query(
  72 + {
  73 + id:this.data.seller.id,
  74 + fromid:getApp().openid,
  75 + hasSellerShare:true,
  76 + },'/pages/reserve/detail')
72 return { 77 return {
73 title:'请客订包间,就上一键订', 78 title:'请客订包间,就上一键订',
74 imageUrl:'https://xt04.colorcun.com/sellerShare/Share_'+this.data.seller.id+'.png?'+Math.random(), 79 imageUrl:'https://xt04.colorcun.com/sellerShare/Share_'+this.data.seller.id+'.png?'+Math.random(),
@@ -62,4 +62,4 @@ @@ -62,4 +62,4 @@
62 </formids> 62 </formids>
63 </view> 63 </view>
64 <tabBar bindNewCustomer="NewCustomer" id="tabBar"></tabBar> 64 <tabBar bindNewCustomer="NewCustomer" id="tabBar"></tabBar>
65 -<share id="share" seller_id="{{seller.id}}"></share> 65 +<share id="share" seller_id="{{seller.id}}" hasSellerShare="{{true}}"></share>
@@ -230,7 +230,7 @@ Page({ @@ -230,7 +230,7 @@ Page({
230 openid:openid, 230 openid:openid,
231 fromid:this.options.fromid, 231 fromid:this.options.fromid,
232 sid:this.options.id, 232 sid:this.options.id,
233 - sub:this.options.sub||3,//关系类型:1/2/3 邀请关系/商户端分享关系/C端分享关系 233 + sub:this.options.hasSellerShare?2:3,//关系类型:1/2/3 邀请关系/商户端分享关系/C端分享关系
234 }) 234 })
235 }, 235 },
236 }) 236 })
@@ -83,6 +83,7 @@ Page({ @@ -83,6 +83,7 @@ Page({
83 code_type: 'wxcode', 83 code_type: 'wxcode',
84 'param_value[0]':options.id, 84 'param_value[0]':options.id,
85 'param_value[1]':openid, 85 'param_value[1]':openid,
  86 + 'param_value[2]':this.options.hasSellerShare
86 }); 87 });
87 this.setData({ 88 this.setData({
88 seller:seller, 89 seller:seller,
@@ -768,7 +768,7 @@ module.exports = { @@ -768,7 +768,7 @@ module.exports = {
768 http_build_query(obj,url=''){ 768 http_build_query(obj,url=''){
769 let ps=[] 769 let ps=[]
770 for(let i in obj){ 770 for(let i in obj){
771 - if(typeof obj[i]=='undefined' || obj[i]==null) continue; 771 + if(typeof obj[i]=='undefined' || obj[i]==null || obj[i]===false) continue;
772 ps.push(i+'='+obj[i].toString()) 772 ps.push(i+'='+obj[i].toString())
773 } 773 }
774 ps=ps.join('&'); 774 ps=ps.join('&');