diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js
index 11e3bcc..9d08feb 100644
--- a/packageA/pages/distribution/shop/shop.js
+++ b/packageA/pages/distribution/shop/shop.js
@@ -39,6 +39,10 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+
+ console.log("-- shop：load --");
+ console.log(options);
+
wx.setNavigationBarTitle({
title: "我的小店",
});
@@ -50,8 +54,12 @@ Page({
});
});
//从别人的分享的跳转过来
- var first_leader = decodeURIComponent(options.scene);
+ var first_leader = decodeURIComponent(options.first_leader);
if (first_leader && first_leader != 'undefined') {
+
+ console.log("-- shop：load2 --");
+ console.log("-- shop：load3 --"+first_leader);
+
getApp().globalData.first_leader = first_leader;
this.data.first_leader = first_leader;
@@ -357,8 +365,7 @@ Page({
}
var ob = {
- title: title,
- path: url,
+ title: title,path: url,
};
return ob;
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 982243c..3c956b7 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -235,6 +235,8 @@ Page({
room_id = t.room_id,
room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
+ var share_openid= t.share_openid;
+
//检查测肤
getApp().check_skin_face(t,1,gid);
diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml
index 674f7c3..4f5d563 100644
--- a/packageB/pages/zuhegou/index/index.wxml
+++ b/packageB/pages/zuhegou/index/index.wxml
@@ -16,7 +16,7 @@
- 门店:
+ 选择门店:
{{def_pick_store.pickup_name}}
{{def_pick_store.pickup_name}}
diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
index 5d11ee4..372f32e 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
@@ -205,7 +205,7 @@
评价
去评价
+ url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}">去评价
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index 75812e0..50c890e 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -2097,7 +2097,7 @@ Page({
if(!ord_prom && !is_get){
if(o_condition > 0 && this.data.pre_arr.is_useorderyh){
await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
- data: { store_id: os.stoid, orderAmount: condition }
+ data: { store_id: os.stoid, orderAmount: o_condition }
}).then(res => {
if (res.data.code == 0) {
ord_prom = res.data.data;
@@ -2107,11 +2107,12 @@ Page({
}
+ var bn_pick = th.data.pickup.pickup_id
//如果同意参与订单优惠
if (ord_prom) {
//th.check_is_order_prom(o_condition,async function (ord_price) {
var ord_price=o_condition;
- var bn_pick = th.data.pickup.pickup_id
+
var order_prom_amount = 0;
var order_prom_id = 0;
var order_m = 0;
@@ -2227,6 +2228,57 @@ Page({
var o_condition1 = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit);
if (o_condition1 < 0) o_condition1 = 0;
+ if(th.data.exp_type == 2) {
+ var good = th.data.goods;
+ //--------------开始计算物流------------------
+ var shipping_price = 0;
+ var lon = 0;
+ var lat = 0;
+ //-- 获取距离 --
+ await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+ is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address}
+ }).then(res => {
+ if (res.data.code == 0) {
+ var data = JSON.parse(res.data.data);
+ if (data.status == 0) {
+ lon = data.result.location.lng;
+ lat = data.result.location.lat;
+ }
+ }
+ })
+ var gd_w = good['weight'] * good['buynum'];
+ //-- 获取距离 --
+ var req_data = {
+ store_id: os.stoid,
+ order_amount: parseFloat(o_condition1),
+ lon: lon, lat: lat,
+ pickup_id: bn_pick,
+ goods_weight: gd_w,
+ }
+
+ var is_next = 1;
+ //获取同城配送参数
+ await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+ is_json: 1,
+ data: req_data
+ }).then(res => {
+ if (res.data.code == 0) {
+ shipping_price = res.data.data;
+ } else {
+ is_next = 0;
+ wx.showToast({
+ title: res.data.msg, icon: 'none', duration: 2000
+ })
+ }
+ })
+ if (!is_next) {
+ th.setData({show_submit: 1, disabled_btn: 1})
+ return false
+ }
+ exp_price = parseFloat(shipping_price).toFixed(2);
+ }
+
+
var the_price=parseFloat(o_condition1) + parseFloat(exp_price);
if(the_price
- 去评价
+ 去评价
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 6f81160..2aa8069 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1960,11 +1960,11 @@ Page({
//--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
for (var j = 0; j < ord_goods.length; j++) {
- if (ord_goods[j].is_gift) continue;
if (ord_goods[j].whsle_id) continue;
if (ord_goods[j].prom_type == 3 && ord_goods[j].prom_id == item_map.prom_id) {
ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh;
ord_goods[j].is_past = item_map.is_past;
+ if (ord_goods[j].is_gift) continue; //赠品不平摊
ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
@@ -6563,6 +6563,14 @@ Page({
is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样
};
+ var prom_goods_map=th.data.prom_goods_map[gf_pickup_id];
+ var fd=prom_goods_map[th.data.gf_prom_id];
+
+ if(fd){
+ newd.is_past=fd.is_past;
+ newd.is_xz_yh=fd.is_xz_yh;
+ }
+
//-- 如果是代发商品的时候 --
if (gf_item.goodsinfo.whsle_id) {
newd.whsle_id = gf_item.goodsinfo.whsle_id;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index d6171eb..14eb78e 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -179,7 +179,7 @@ Page({
}
this.init();
})
- th.setData({ submit:0})
+ this.setData({ submit:0})
},
GetBuyPrice: function (e) {
var that = this.data;
@@ -190,9 +190,6 @@ Page({
return false;
}
- if(th.data.submit) return false;
- th.setData({submit:1})
-
this.data.payMoney = th.data.sele_g.payMoney;
th.setData({buyType: 2})
@@ -201,6 +198,7 @@ Page({
openSpecModal: 1
})
} else {
+
var my_confirm = th.selectComponent("#my_confirm"); //组件的id
my_confirm.open(
"是否确定购买该礼包",
@@ -210,6 +208,7 @@ Page({
my_confirm.open_cancel(0);
},
function () {
+
my_confirm.open_cancel(0);
com.buy_libao(th)
}
diff --git a/pages/giftpack/public/buy_com.js b/pages/giftpack/public/buy_com.js
index 6f37976..49fb0b4 100644
--- a/pages/giftpack/public/buy_com.js
+++ b/pages/giftpack/public/buy_com.js
@@ -214,7 +214,9 @@ module.exports = {
}
}
+ if(th.data.submit) return false;
th.setData({submit:1})
+
var id=th.data.sele_g.lbId;
var that=th;
var json = {
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index ef023cf..f28e8f8 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -131,11 +131,11 @@
-
+
-->
- 输入商品关键字
+ 请输入商品关键字
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 69da82f..255145f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -284,7 +284,11 @@ Page({
prom_id = t.prom_id || 0; //活动ID
var share_openid = t.share_openid;
- //群id
+
+ console.log("gd onload-- 3 --");
+ console.log(t);
+
+ //群id
if(t && t.groupchat_id && !t.groupchat_id!='undefined' && !t.groupchat_id!='null'){
getApp().globalData.groupchat_id=t.groupchat_id
}
@@ -378,7 +382,7 @@ Page({
gid: gid
});
- console.log("gd onload--2");
+ console.log("gd onload-- 2 --");
console.log(first_leader);
if (first_leader) {
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 33fc66f..7ae0539 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -194,7 +194,7 @@
评价
去评价
+ url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}">去评价
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 943321f..1f8cb09 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -129,7 +129,7 @@ Page({
if (!user_info) return false;
ut.fy_back('',0);
- th.setData({
+ this.setData({
is_select:0,
focus:true,
})