Commit 3dcfcc3bf15ed59a1e7e1a3bd3ff74cbcbef2305

Authored by yvan.ni
1 parent c7930fd4

1. 美导分享回来,美导业绩归属的bug优化

packageA/pages/activity_share/activity_share.js
@@ -167,7 +167,7 @@ Page({ @@ -167,7 +167,7 @@ Page({
167 167
168 var title= item.goods_name; 168 var title= item.goods_name;
169 var img=this.data.url+item.original_img; 169 var img=this.data.url+item.original_img;
170 - var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; 170 + var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
171 if(getApp().globalData.user_id){ 171 if(getApp().globalData.user_id){
172 url+="&first_leader="+getApp().globalData.user_id; 172 url+="&first_leader="+getApp().globalData.user_id;
173 } 173 }
@@ -497,7 +497,7 @@ Page({ @@ -497,7 +497,7 @@ Page({
497 497
498 var app = getApp(); 498 var app = getApp();
499 var unit = that.data.screenWidth / 750 * 1.35; //基础单位, 499 var unit = that.data.screenWidth / 750 * 1.35; //基础单位,
500 - var scene = th.data.gid+""; 500 + var scene = th.data.share_good.goods_id+"";
501 var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; 501 var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
502 if(user_id>0){ 502 if(user_id>0){
503 scene+="_"+user_id; 503 scene+="_"+user_id;
packageA/pages/goods_share/goods_share.js
@@ -136,7 +136,7 @@ Page({ @@ -136,7 +136,7 @@ Page({
136 var title= item.goods_name; 136 var title= item.goods_name;
137 var img=this.data.url+item.original_img; 137 var img=this.data.url+item.original_img;
138 138
139 - var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; 139 + var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
140 if(getApp().globalData.user_id){ 140 if(getApp().globalData.user_id){
141 url+="&first_leader="+getApp().globalData.user_id; 141 url+="&first_leader="+getApp().globalData.user_id;
142 } 142 }
@@ -325,7 +325,7 @@ Page({ @@ -325,7 +325,7 @@ Page({
325 325
326 var app = getApp(); 326 var app = getApp();
327 var unit = that.data.screenWidth / 750 * 1.35; //基础单位, 327 var unit = that.data.screenWidth / 750 * 1.35; //基础单位,
328 - var scene = th.data.gid+""; 328 + var scene = th.data.share_good.goods_id+"";
329 var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; 329 var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
330 if(user_id>0){ 330 if(user_id>0){
331 scene+="_"+user_id; 331 scene+="_"+user_id;
packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -401,8 +401,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un @@ -401,8 +401,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
401 var first_leader=options.first_leader; 401 var first_leader=options.first_leader;
402 if(first_leader){ 402 if(first_leader){
403 //-- user_id代过来免登陆 -- 403 //-- user_id代过来免登陆 --
404 - getApp().globalData.user_id=first_leader;  
405 - getApp().getUserFir(); 404 + getApp().globalData.first_leader=first_leader;
406 //调用接口判断是不是会员 405 //调用接口判断是不是会员
407 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{ 406 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{
408 if(res.data.code==0){ 407 if(res.data.code==0){
packageA/pages/quan_pro/quan_pro.js
@@ -19,6 +19,20 @@ Page({ @@ -19,6 +19,20 @@ Page({
19 }, 19 },
20 //------初始化加载---------- 20 //------初始化加载----------
21 onLoad: function(t) { 21 onLoad: function(t) {
  22 +
  23 + var th = this;
  24 + var first_leader=t.first_leader;
  25 + if(first_leader){
  26 + //-- user_id代过来免登陆 --
  27 + getApp().globalData.first_leader=first_leader;
  28 + //调用接口判断是不是会员
  29 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
  30 + if(res.data.code==0){
  31 + getApp().globalData.guide_id=res.data.data.id;
  32 + }
  33 + })
  34 + }
  35 +
22 var id=t.id; 36 var id=t.id;
23 this.data.id=id; 37 this.data.id=id;
24 var goods_list = this.selectComponent("#goods_list"); //组件的id 38 var goods_list = this.selectComponent("#goods_list"); //组件的id
pages/giftpack/giftpacklist/giftpacklist.js
@@ -42,10 +42,9 @@ Page({ @@ -42,10 +42,9 @@ Page({
42 var first_leader=options.first_leader; 42 var first_leader=options.first_leader;
43 if(first_leader){ 43 if(first_leader){
44 //-- user_id代过来免登陆 -- 44 //-- user_id代过来免登陆 --
45 - getApp().globalData.user_id=first_leader;  
46 - getApp().getUserFir(); 45 + getApp().globalData.first_leader=first_leader;
47 //调用接口判断是不是会员 46 //调用接口判断是不是会员
48 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{ 47 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
49 if(res.data.code==0){ 48 if(res.data.code==0){
50 getApp().globalData.guide_id=res.data.data.id; 49 getApp().globalData.guide_id=res.data.data.id;
51 } 50 }
pages/index/index/index.js
@@ -82,10 +82,9 @@ Page({ @@ -82,10 +82,9 @@ Page({
82 var first_leader=tt.first_leader; 82 var first_leader=tt.first_leader;
83 if(first_leader){ 83 if(first_leader){
84 //-- user_id代过来免登陆 -- 84 //-- user_id代过来免登陆 --
85 - getApp().globalData.user_id=first_leader;  
86 - getApp().getUserFir(); 85 + getApp().globalData.first_leader=first_leader;
87 //调用接口判断是不是会员 86 //调用接口判断是不是会员
88 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{ 87 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
89 if(res.data.code==0){ 88 if(res.data.code==0){
90 getApp().globalData.guide_id=res.data.data.id; 89 getApp().globalData.guide_id=res.data.data.id;
91 } 90 }