From fb4f35b9a558776ccde534910eb475520678d4a9 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 8 Jun 2020 10:25:35 +0800
Subject: [PATCH] 小程序业绩归属
---
packageA/pages/prom_list/prom_list.js | 14 ++++++++++++++
pages/cart/cart/cart.js | 13 +++++++++----
pages/cart/cart2/cart2.js | 39 ++++++++++++++++++++++++++++++++++-----
pages/cart/cart2_pt/cart2_pt.js | 28 ++++++++++++++++++++++++----
pages/cart/cart2_pt/cart2_pt.wxml | 2 +-
pages/cart/cart_wk/cart_wk.js | 2 +-
pages/goods/goodsInfo/goodsInfo.js | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
pages/goods/goodsList/goodsList.js | 33 ++++++++++++++++++++++++++++++---
pages/goods/goodsList/goodsList.json | 5 ++++-
pages/goods/goodsList/goodsList.wxml | 4 +++-
pages/goods/search/search.js | 12 ++++++++++++
pages/index/index/index.js | 9 ++++++++-
pages/team/team_show/team_show.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
pages/team/team_success/team_success.js | 31 ++++++++++++++++++++++++++++++-
pages/user/collect_list/collect_list.js | 14 ++++++++++++++
pages/user/collect_list/collect_list.wxml | 3 ++-
pages/user/index/index.js | 8 +++++---
pages/user/order_detail/order_detail.js | 4 +++-
utils/LoadMore.js | 2 +-
utils/pay.js | 5 +++--
20 files changed, 317 insertions(+), 46 deletions(-)
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index 2ff76e1..f563d5a 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -370,6 +370,20 @@ Page({
prom_id:o.prom_id
};
+ //---是不是从收藏夹出来的---
+ if(th.data.c_guide_id){
+ newd['guide_id'] = th.data.c_guide_id;
+ newd['guide_type']=2;
+ if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3;
+ }else{
+ if(getApp().globalData.guide_id){
+ newd['guide_id'] = getApp().globalData.guide_id;
+ newd['guide_type']=0;
+ if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1;
+ }
+ }
+
+
//-----如果是秒杀，团购，积分购,拼团-----
if (th.data.data.prom_type != 5) {
return s.my_warnning("商品不是搭配活动！", 0, th);
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 05f1aae..c8fef47 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -57,9 +57,12 @@ Page({
var th = this;
//调用底部导航
t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
-
this.getCardList();
- if(getApp().globalData.user_id) getApp().requestCardNum();
+ //--强行等待，让购物车的数量能够正确的线上
+ setTimeout(function () {
+ if(getApp().globalData.user_id) getApp().requestCardNum(th);
+ },500)
+
//--获取是否又秒杀活动--
getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
data: {
@@ -657,10 +660,11 @@ Page({
e.doCheckAll();
t.goods_num=false_data.false_data.buy_limit;
- e.update_cart(t, pitem, item);
-
+ e.update_cart(t, pitem, item);
return false;
}
+ e.update_cart(t, pitem, item);
+
}else{
//--- 看一下是不是线下库存 ---
if(th.data.sales_rules==2){
@@ -789,6 +793,7 @@ Page({
e.check_prom_activity(i)
}
e.doCheckAll();
+ getApp().requestCardNum(e);
}
});
},
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 51abda5..1ba655c 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -152,6 +152,7 @@ Page({
console.log("getuser_addr")
console.log(ie)
+
//地址切换要把包邮券清空
if( !th.data.user_addr || th.data.user_addr.address_id!=ie.address_id){
var using_quan=th.data.using_quan;
@@ -167,6 +168,7 @@ Page({
//更换地址回来要重新调用计算价钱的接口
if(!th.data.user_addr || th.data.user_addr.address_id!=ie.address_id){
+ th.setData({user_addr: ie });
if (th.data.is_b_now == 1) {
if(th.data.bn_goods) {
th.calculatePrice2();
@@ -176,9 +178,9 @@ Page({
th.calculatePrice();
}
}
+ }else{
+ th.setData({user_addr: ie });
}
-
- th.setData({user_addr: ie });
var going=0;
@@ -280,7 +282,7 @@ Page({
success: function (su) {
if (su.data.code == 0) {
var yuer = parseFloat(th.data.userinfo.user_money -
- th.data.userinfo.frozen_money - su.data.data.summoney).toFixed(2);
+ (th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
th.setData({ txmon: su.data.data.summoney, yuer: yuer });
}
}
@@ -596,7 +598,7 @@ Page({
var all_cutprice=0; //所有的优惠减件
var all_order_prom=0; //所有的订单优惠
- var umoney = th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money;
+ var umoney = th.data.userinfo.user_money - th.data.txmon - (th.data.userinfo.frozen_money?th.data.userinfo.frozen_money:0);
var freight_free = ee.freight_free; //全场满多少包邮
var no_ex_id=ee.no_ex_id;
var no_ex_good=null;
@@ -1423,7 +1425,20 @@ Page({
'prom_type':th.data.bn_goods.prom_type, //促销活动类型
'prom_id': th.data.bn_goods.prom_id, //促销活动id
};
-
+
+ //-- 把导购的信息填入--
+ if(gg.guide_id){
+ goods.guide_id=gg.guide_id;
+ goods.guide_type=gg.guide_type;
+ //调用接口判断是不是会员
+ await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{
+ if(res.data.code==0){
+ goods.guide_name=res.data.data.salesman;
+ goods.guide_sn=res.data.data.salesman_no;
+ }
+ })
+ }
+
//如果不立即购买或者秒杀，如果是线下库存购买的时候
if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){
var isok=1;
@@ -1610,6 +1625,19 @@ Page({
return false;
}
}
+
+ //导购ID
+ if(g_item.guide_id){
+ goods.guide_id=g_item.guide_id;
+ goods.guide_type=g_item.guide_type;
+ //调用接口判断是不是会员
+ await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+g_item.guide_id,{}).then(res=>{
+ if(res.data.code==0){
+ goods.guide_name=res.data.data.salesman;
+ goods.guide_sn=res.data.data.salesman_no;
+ }
+ })
+ }
item.order_goods.push(goods);
}
@@ -1620,6 +1648,7 @@ Page({
if (pdata.length==0) return;
var str = JSON.stringify(pdata);
+
wx.showLoading({title: "加载中"});
wx.request({
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 7d85168..357e537 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -56,7 +56,8 @@ Page({
qh:'', //期号
pt_listno:'',//期号
is_normal:0,
- is_express:0,//选择物流的控制器
+ is_express:0,//选择物流的控制器
+ yuer:0,
},
onLoad: function(t) {
console.log("onLoad_pt_cart");
@@ -128,6 +129,18 @@ Page({
th.setData({ userinfo: to.globalData.userInfo});
//获取立即购买的商品信息
th.get_buy_goods();
+
+ //获取提现金额
+ getApp().request.get("/api/weshop/withdrawals/summoney", {
+ data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 },
+ success: function (su) {
+ if (su.data.code == 0) {
+ var yuer = parseFloat(th.data.userinfo.user_money -
+ (th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
+ th.setData({ txmon: su.data.data.summoney, yuer: yuer });
+ }
+ }
+ });
},
//-----获取立即购买的商品信息----
@@ -325,12 +338,12 @@ Page({
var txt2 = "formData.order_amount";
//--------------如果使用余额---------------------
if (th.data.bn_use_money == 1) {
- if (th.data.userinfo.user_money > total_m) {
+ if ( parseFloat(th.data.yuer) > total_m) {
th.setData({ [txt]: total_m, [txt2]:0 })
}else{
- order_m = order_m - th.data.userinfo.user_money;
+ order_m = order_m - parseFloat(th.data.yuer);
order_m = order_m.toFixed(2);
- th.setData({ [txt]: th.data.userinfo.user_money, [txt2]: order_m })
+ th.setData({ [txt]: th.data.userinfo.yuer, [txt2]: order_m })
}
}else{
th.setData({ [txt]: 0, [txt2]: order_m })
@@ -422,6 +435,13 @@ Page({
'prom_type':th.data.bn_goods.prom_type, //促销活动类型
'prom_id': th.data.bn_goods.prom_id, //促销活动id
};
+
+ //--导购分享过来的id--
+ if(gg.guide_id){
+ goods.guide_id=gg.guide_id;
+ goods.guide_type=gg.guide_type;
+ }
+
item.order_goods.push(goods);
pdata.push(item);
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 4de1c84..58566d5 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -105,7 +105,7 @@
- 使用余额 :￥{{userinfo.user_money}}
+ 使用余额 :￥{{yuer}}
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 0bd9bda..b224433 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -389,7 +389,7 @@ Page({
getApp().my_warnning("支付成功",1,th);
setTimeout(function () {
th.setData({ isclose: 0 });
- wx.navigateTo({
+ wx.redirectTo({
url: "/pages/user/order_list/order_list"
})
}, 1000)
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 098e621..17ae1f3 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -251,14 +251,34 @@ Page({
var ee = this,
that = ee,
th = ee,
- gid = t.goods_id;
+ gid = t.goods_id,
+ first_leader=t.first_leader;
//---获取手机地址坐标--
//--如果tg_id是空的话，分享回来--
if (gid == undefined || gid == null || gid == "") {
- gid = decodeURIComponent(t.scene);
+ var gid_str = decodeURIComponent(t.scene);
+ gid_str.split("_");
+ gid=gid_str[0];
+ if(gid_str.length>1){
+ first_leader=gid_str[1];
+ }
}
ee.setData({ gid: gid});
+ if(first_leader){
+ getApp().globalData.first_leader=first_leader;
+ //调用接口判断是不是会员
+ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
+ if(res.data.code==0){
+ getApp().globalData.guide_id=res.data.data.bind_user_id;
+ }
+ })
+ }
+
+ var c_guide_id=t.c_guide_id;
+ if(c_guide_id){
+ th.data.c_guide_id=c_guide_id;
+ }
//----获取系统参数-----
getApp().getConfig2(function(e) {
@@ -932,6 +952,19 @@ Page({
sku: o.sku,
};
+ //---是不是从收藏夹出来的---
+ if(th.data.c_guide_id){
+ newd['guide_id'] = th.data.c_guide_id;
+ newd['guide_type']=2;
+ if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3;
+ }else{
+ if(getApp().globalData.guide_id){
+ newd['guide_id'] = getApp().globalData.guide_id;
+ newd['guide_type']=0;
+ if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1;
+ }
+ }
+
//如果是积分够，is_integral_normal就要有积分购普通购买字段
if(o.prom_type==4){
newd.is_integral_normal=1;
@@ -1028,8 +1061,6 @@ Page({
}
}
}
-
-
//if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
if ("add" == t.currentTarget.dataset.action) {
@@ -1064,7 +1095,6 @@ Page({
return s.my_warnning("库存不足！", 0, th);
}
}
-
var updata = {
id: item.id,
@@ -1073,7 +1103,18 @@ Page({
member_goods_price:newd.goods_price,
store_id: th.data.stoid,
};
-
+
+ //---是不是从收藏夹出来的---
+ if(th.data.c_guide_id){
+ updata['guide_id'] = th.data.c_guide_id;
+ updata['guide_type']=3; //加入购物车之后就变成了3
+ }else {
+ if (getApp().globalData.guide_id) {
+ updata['guide_id'] = getApp().globalData.guide_id;
+ updata['guide_type'] = 0;
+ }
+ }
+
i.put("/api/weshop/cart/update", {
data: updata,
success: function(t) {
@@ -1086,6 +1127,8 @@ Page({
}
});
} else {
+
+
i.post("/api/weshop/cart/save", {
data: newd,
success: function(t) {
@@ -1124,7 +1167,7 @@ Page({
break;
}
}
-
+
}
newd['pick_name'] = th.data.sto_sele_name;
@@ -1133,9 +1176,7 @@ Page({
}
},
-
-
-
+
//----------购买虚拟商品------
buyVirtualGoods: function(e) {
Object.assign(e, {
@@ -1319,6 +1360,12 @@ Page({
store_id: o.stoid,
add_time: timestamp,
};
+ //加入收藏夹就是导购的ID
+ if(getApp().globalData.guide_id){
+ d.guide_id=getApp().globalData.guide_id;
+ d.guide_type=2;
+ }
+
i.post("/api/weshop/goodscollect/save", { //添加收藏
data: d,
success: function(e) {
@@ -1438,10 +1485,14 @@ Page({
title=th.data.prom_act.share_title;
img=th.data.iurl+th.data.prom_act.share_imgurl;
}
+ var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+ if(getApp().globalData.user_id){
+ url+="&first_leader="+getApp().globalData.user_id;
+ }
return {
title: price + "元 " +title,
- path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid,
+ path:url,
imageUrl: img,
}
@@ -3126,7 +3177,12 @@ Page({
var app = getApp();
var unit = that.data.screenWidth / 750 * 1.35;
var path2 = that.data.data.original_img;
- var scene = th.data.gid;
+ var scene = th.data.gid+"";
+ var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
+ if(user_id>0){
+ scene+="_"+user_id;
+ }
+
///二微码
var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index ee77df3..a9ec61c 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -24,6 +24,19 @@ Page({
},
onLoad: function(t) {
+
+ //接受有没有导购的参数
+ var first_leader=t.first_leader;
+ if(first_leader){
+ getApp().globalData.first_leader=first_leader;
+ //调用接口判断是不是会员
+ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{
+ if(res.data.code==0){
+ getApp().globalData.guide_id=res.data.data.bind_user_id;
+ }
+ })
+ }
+
var th=this;
a.init(this, "", "requestData");
var url = this.data.baseUrl;
@@ -194,9 +207,23 @@ Page({
},
//---------分享配置--------
onShareAppMessage: function (e) {
- return {
- title: "商品列表",
- }
+ var curPage=this;
+ var pagePath = curPage.route; //当前页面url
+ if (pagePath.indexOf('/') != 0) {
+ pagePath = '/' + pagePath;
+ }
+ if(getApp().globalData.user_id){
+
+ if(pagePath.indexOf("?")>0){
+ pagePath+="&first_leader="+getApp().globalData.user_id;
+ }else{
+ pagePath+="?first_leader="+getApp().globalData.user_id;
+ }
+ }
+ return {
+ title: "商品列表",
+ path:pagePath,
+ }
},
//---图片失败，默认图片---
bind_bnerr2: function (e) {
diff --git a/pages/goods/goodsList/goodsList.json b/pages/goods/goodsList/goodsList.json
index 074fc3a..3dc51e0 100644
--- a/pages/goods/goodsList/goodsList.json
+++ b/pages/goods/goodsList/goodsList.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "商品列表"
+ "navigationBarTitleText": "商品列表",
+ "usingComponents": {
+ "share_box": "/components/share_box/share_box"
+ }
}
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 2aa4d1c..e3d4e06 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -164,4 +164,6 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index fb31a6a..10a8ea5 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -23,6 +23,18 @@ Page({
adname: "desc", //升降的字段
},
onLoad: function(t) {
+ //接受有没有导购的参数
+ var first_leader=t.first_leader;
+ if(first_leader){
+ getApp().globalData.first_leader=first_leader;
+ //调用接口判断是不是会员
+ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{
+ if(res.data.code==0){
+ getApp().globalData.guide_id=res.data.data.bind_user_id;
+ }
+ })
+ }
+
var th=this;
a.getConfig2(function(rs){
var arr=new Array(),arr2=new Array();
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 48e0915..d7099f7 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -112,7 +112,6 @@ Page({
t.editTabBar(th,o.stoid,th.data.url);
- if (getApp().globalData.user_id) getApp().requestCardNum();
await this.init_load();
//显示的时候要开启计时器
this.data.is_timer = 1;
@@ -125,6 +124,9 @@ Page({
if (new_nav == "") {
th.is_new();
}
+ setTimeout(function () {
+ if (getApp().globalData.user_id) getApp().requestCardNum(th);
+ },500)
});
} else {
@@ -405,6 +407,11 @@ Page({
if (new_nav == "") {
th.is_new();
}
+
+ setTimeout(function () {
+ if (getApp().globalData.user_id) getApp().requestCardNum(th);
+ },500)
+
});
var goods_list = this.selectComponent("#goods_list"); //组件的id
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index c3d2f8f..96b35b9 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -66,12 +66,29 @@ Page({
wx.setNavigationBarTitle({ title: "拼团订单",})
//var postdata=getApp().globalData.to_group;
var postdata=options;
- var tg_id = postdata.tg_id;
+ var tg_id = postdata.tg_id, first_leader=t.first_leader;
//如果tg_id是空的话
if(tg_id==undefined || tg_id==null || tg_id==""){
- tg_id=decodeURIComponent(postdata.scene);
+ var tg_id_str=decodeURIComponent(postdata.scene);
+ tg_id_str=tg_id_str.split("_");
+ tg_id=tg_id_str[0];
+ if(tg_id_str.length>1){
+ first_leader=tg_id_str[1];
+ }
}
- this.setData({tg_id: tg_id });
+ //--判断一下是不是导购--
+ if(first_leader){
+ getApp().globalData.first_leader=first_leader;
+ //调用接口判断是不是会员
+ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
+ if(res.data.code==0){
+ getApp().globalData.guide_id=res.data.data.bind_user_id;
+ }
+ })
+ }
+
+
+ this.setData({tg_id: tg_id });
getApp().globalData.to_group=null;
},
@@ -767,8 +784,12 @@ Page({
}
newd['pick_dis'] = th.data.pick_dis;
- s.set_b_now(newd);
+ if(getApp().globalData.guide_id){
+ newd['guide_id'] = getApp().globalData.guide_id;
+ newd['guide_type']=0;
+ }
+ s.set_b_now(newd);
wx.navigateTo({
url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
});
@@ -882,4 +903,30 @@ Page({
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
},
+ //------ 分享配置 --------
+ onShareAppMessage: function (e) {
+ var curPage=this;
+ var pagePath = curPage.route; //当前页面url
+ if (pagePath.indexOf('/') != 0) {
+ pagePath = '/' + pagePath;
+ }
+ var url=pagePath;
+
+ //--分享图片--
+ img=th.data.iurl+th.data.teamlist.share_imgurl;
+ //--把会员分享出去--
+ if(getApp().globalData.user_id){
+ if(url.indexOf("?")>0)
+ url+="&first_leader="+getApp().globalData.user_id;
+ else
+ url+="?first_leader="+getApp().globalData.user_id;
+ }
+
+ return {
+ path:url,
+ title: "商品分类",
+ imageUrl: img,
+ }
+ },
+
})
\ No newline at end of file
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 4081d8e..8408738 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -355,6 +355,12 @@ Page({
var app = getApp();
var unit = that.data.screenWidth / 750 * 1.35;
var scene=th.data.teamgroup.id;
+ var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
+ if(user_id>0){
+ scene+="_"+user_id;
+ }
+
+
//二微码
var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
@@ -667,7 +673,30 @@ Page({
ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
this.setData(ob);
- }
+ },
+
+
+ //------ 分享配置 --------
+ onShareAppMessage: function (e) {
+ var scene=th.data.teamgroup.id;
+ var url="/pages/team/team_show/team_show?tg_id="+scene;
+ //--分享图片--
+ img=th.data.iurl+th.data.teamlist.share_imgurl;
+ //--把会员分享出去--
+ if(getApp().globalData.user_id){
+ if(url.indexOf("?")>0)
+ url+="&first_leader="+getApp().globalData.user_id;
+ else
+ url+="?first_leader="+getApp().globalData.user_id;
+ }
+
+ return {
+ path:url,
+ title: "商品分类",
+ imageUrl: img,
+ }
+ },
+
})
diff --git a/pages/user/collect_list/collect_list.js b/pages/user/collect_list/collect_list.js
index 396deba..cc53c36 100644
--- a/pages/user/collect_list/collect_list.js
+++ b/pages/user/collect_list/collect_list.js
@@ -8,6 +8,7 @@ var t = function(t) {
o = new t.default();
var oo = e.globalData.setting,
app_d = e.globalData;
+var ut = require('../../../utils/util.js');
Page({
data: {
@@ -153,6 +154,19 @@ Page({
iconClick: function(e) {
var th = this.data;
var index = e.currentTarget.dataset.index;
+ var url = e.currentTarget.dataset.url;
+
+ var item=this.data.collects[index];
+ if(url){
+ console.log("---");
+ console.log(item.add_time);
+ console.log(ut.gettimestamp());
+
+ if(ut.gettimestamp()-item.add_time<3600*24 && item.guide_id>0)
+ url+="&c_guide_id="+item.guide_id;
+ getApp().goto(url);
+ return false;
+ }
var collect = "collects[" + index + "].checked";
if (this.data.collects[index].checked == true) {
this.setData({
diff --git a/pages/user/collect_list/collect_list.wxml b/pages/user/collect_list/collect_list.wxml
index 4e0dd07..00f5f3b 100644
--- a/pages/user/collect_list/collect_list.wxml
+++ b/pages/user/collect_list/collect_list.wxml
@@ -21,7 +21,8 @@
-
+
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index ca7b64e..3e25205 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -84,10 +84,12 @@ Page({
need_money = 0,
cur_g_num = 0;
- //调用底部导航
- getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
+ //调用底部导航
+ getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
getApp().get_isbuy(th.setappdata);
- if (getApp().globalData.user_id) getApp().requestCardNum();
+ setTimeout(function () {
+ if (getApp().globalData.user_id) getApp().requestCardNum(th);
+ },500)
/*------会员登录------*/
app.getUserFir(async function(e) {
if (e != undefined && e != null && e.mobile) {
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 2193860..084f4c2 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -522,7 +522,9 @@ Page({
zfwk:function(){
var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
- getApp().goto(url);
+ wx.redirectTo({
+ url:url,
+ })
},
//--------跳转到退款详情-----------
diff --git a/utils/LoadMore.js b/utils/LoadMore.js
index 37acfbd..7c405f1 100644
--- a/utils/LoadMore.js
+++ b/utils/LoadMore.js
@@ -87,7 +87,7 @@ var e = function() {
g[ii].original_img = oo.imghost + g[ii].original_img;
}
- if (g[ii].add_time != undefined){
+ if (g[ii].add_time != undefined && rurl.indexOf("goodscollect")<0){
var tx = g[ii].add_time + "";
if (tx.indexOf('-') == -1) {
g[ii].add_time = ut.formatTime(g[ii].add_time, 'yyyy-MM-dd hh:mm:ss');
diff --git a/utils/pay.js b/utils/pay.js
index eca068a..82b18ab 100644
--- a/utils/pay.js
+++ b/utils/pay.js
@@ -34,7 +34,7 @@ module.exports = {
if(t.data.code==0){
i.weixinPay(t.data.data, e, a);
}else{
- getApp().showWarning(t.data.msg);
+ getApp().confirmBox(t.data.msg);
setTimeout(function(){
wx.redirectTo({
url: "/pages/user/order_list/order_list",
@@ -62,7 +62,8 @@ module.exports = {
console.log(n), t.showSuccess("支付成功！", e);
},
fail: function(n) {
- console.log(n), "requestPayment:fail" == n.errMsg ? t.showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? t.showWarning("您已取消支付") : t.showWarning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
+ console.log(n), "requestPayment:fail" == n.errMsg ? t.showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? t.showWarning("您已取消支付") :
+ t.confirmBox("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
"function" == typeof a && a();
}
});
--
libgit2 0.21.4