diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 198b908..d92a8ec 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -59,9 +59,6 @@ Page({
}, {
name: "详情",
id: 1
- }, {
- name: "评论",
- id: 2
}],
activeCategoryId2: 0,
categories2: [{
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 70b30e5..4b1d717 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -4,468 +4,502 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{filters.toFix(data.shop_price,2)}}
- {{data.goods_name}}
-
-
-
- 销量：{{data.sales_sum}}
- 有效天数：{{data.validDays?data.validDays:'不限'}}
+
+
+
+
+
+ {{item.name}}
+
-
-
-
-
-
-
-
-
-
-
- 选择门店
-
- 更多门店
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
-
- 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
- (未找到门店)
-
- (未找到门店)
-
- (配送不匹配)
-
-
-
- 地址:{{def_pick_store.fulladdress}}
-
-
-
-
-
-
-
-
- {{store_config.service_bz}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{filters.toFix(data.shop_price,2)}}
+
+ {{data.goods_name}}
+
+
+
+
+ 销量：{{data.sales_sum}}
+ 有效天数：{{data.validDays?data.validDays:'不限'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择门店
+
+ 更多门店
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+
+ 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
-
-
+
+ (未找到门店)
+
+ (未找到门店)
+
+ (配送不匹配)
+
+
+
+ 地址:{{def_pick_store.fulladdress}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 项目名称
- 耗时(分)
-
- 次数
-
-
-
- {{item.projectName}}
- {{item.timeConsuming}}
-
- {{item.frequency}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{store_config.service_bz}}
+
+
+
+
+
+
+
+
+
-
-
+
+
+ 商品详情
+
+
+
+
+
+ 项目名称
+
+
+ 耗时(分)
+
+
+ 次数
+
-
- -->
+
+
+ {{item.projectName}}
+
+
+ {{item.timeConsuming}}
+
+
+ {{item.frequency}}
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 客服
-
-
-
-
- 客服
-
-
-
-
- {{cartGoodsNum}}
- 购物车
-
-
-
-
-
- 加入购物车
- 立即购买
-
-
-
-
-
-
+
+
+
+
+
+ 项目名称
+
+
+ 耗时(分)
+
+
+ 次数
+
+
+
+
+ {{item.projectName}}
+
+
+ {{item.timeConsuming}}
+
+
+ {{item.frequency}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 客服
+
+
+
+
+ 客服
+
+
+
+
+
+ {{cartGoodsNum}}
+ 购物车
+
+
+
+
+
+
+
+ 加入购物车
+ 立即购买
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{data.goods_name}}
-
- ￥{{data.shop_price}}
-
-
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
- 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
-
-
-
- 选择门店
-
-
- 更多门店
-
- (库存不足)
-
- (库存不足)
-
- (配送不匹配)
- (库存不足)
-
-
-
- 地址:{{def_pick_store.fulladdress}}
-
-
-
-
-
- 购买数量
-
- -
-
- +
-
-
-
-
-
-
- 配送不匹配
-
-
-
-
- 库存不足
-
-
-
-
-
- 库存不足
-
-
-
- 库存不足
-
-
-
- 请先选择门店
-
-
-
-
-
- 库存不足
-
-
- 加入购物车
-
- {{sele_g.offline_price?"券后购买":"立即购买"}}
-
-
-
-
-
-
- 库存不足
-
-
- 加入购物车
-
- {{sele_g.offline_price?"券后购买":"立即购买"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{data.goods_name}}
+
+ ￥
+ {{data.shop_price}}
+
+
+
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+ 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+
+
+
+
+
+
+ 选择门店
+
+
+ 更多门店
+
+ (库存不足)
+
+ (库存不足)
+
+ (配送不匹配)
+ (库存不足)
+
+
+
+ 地址:{{def_pick_store.fulladdress}}
+
+
+
+
+
+ 购买数量
+
+ -
+
+ +
+
+
+
+
+
+
+ 配送不匹配
+
+
+
+
+ 库存不足
+
+
+
+
+
+ 库存不足
+
+
+
+ 库存不足
+
+
+
+ 请先选择门店
+
+
+
+
+
+ 库存不足
+
+
+ 加入购物车
+
+ {{sele_g.offline_price?"券后购买":"立即购买"}}
+
+
+
+
+
+
+ 库存不足
+
+
+ 加入购物车
+
+ {{sele_g.offline_price?"券后购买":"立即购买"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+ 确定
+ 设为默认
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
@@ -473,14 +507,13 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss
index b7427bc..8893bfe 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/goodsInfo/goodsInfo.wxss
@@ -3,7 +3,10 @@
image {
vertical-align: top;
}
-.goods-detail{overflow: hidden}
+.goods-detail{
+ /* overflow: hidden */
+ padding-top: 78rpx;
+}
.type-navbar {
display: flex;
@@ -56,6 +59,7 @@ image {
.swiper_box {
width: 100%;
height: 750rpx;
+ background-color: #f2f2f2;
}
.goods-title {
display: flex;
@@ -1006,10 +1010,10 @@ left:31rpx;}
.red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; }
.tb-l{ /* line-height: 96rpx; */}
-.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;}
+.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;border-right: none;}
.tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 }
.item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */}
-.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;}
+.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;border-right:2rpx solid #e4e4e4;text-align: center;}
.item_right text{ /* margin-left: 66rpx; */}
.table_s .tb-l:last-child {border-bottom: none;}
diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js
index bb4b246..1e5edd9 100644
--- a/packageA/pages/jfbuy/jfbuy.js
+++ b/packageA/pages/jfbuy/jfbuy.js
@@ -187,64 +187,102 @@ Page({
/**
* 用户点击右上角分享
*/
- // onShareAppMessage: function () {
- // var th = this;
- // //礼包的转发
- // if(th.data.currentIndex==3){
- // var lbid=th.data.hui_active.lbId;
- // var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
- // if(getApp().globalData.user_id){
- // url+="&first_leader="+getApp().globalData.user_id;
- // }
- // var img=this.data.share_img;
- // var title=th.data.hui_active.giftTitle;
+ onShareAppMessage: function () {
+
+ var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+
+ var pagePath = this.route; //当前页面url
+
+ if(!store_name) store_name = getApp().globalData.setting.appName;
+
+ 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: store_name + '-积分购',
+ path: pagePath,
+ }
+ // var th = this;
+ // //礼包的转发
+ // if(th.data.currentIndex==3){
+ // var lbid=th.data.hui_active.lbId;
+ // var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
+ // if(getApp().globalData.user_id){
+ // url+="&first_leader="+getApp().globalData.user_id;
+ // }
+ // var img=this.data.share_img;
+ // var title=th.data.hui_active.giftTitle;
- // var ob={
- // title:title,
- // path:url,
- // imageUrl: img,
- // };
- // th.setData({share_hidden:1});
- // return ob;
+ // var ob={
+ // title:title,
+ // path:url,
+ // imageUrl: img,
+ // };
+ // th.setData({share_hidden:1});
+ // return ob;
- // }else{
- // //---秒杀，拼团，促销---
- // var item=this.data.share_good;
- // if(item){
- // var price = item.shop_price;
- // var title= item.goods_name;
- // var img=this.data.url+item.original_img;
- // var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
- // if(getApp().globalData.user_id){
- // url+="&first_leader="+getApp().globalData.user_id;
- // }
- // var ob={
- // title: price + "元 " +title,
- // path:url,
- // imageUrl: img,
- // };
- // th.setData({share_hidden:1,share_good:null});
- // return ob;
- // }else{
- // var url="/pages/index/index/index";
- // if(getApp().globalData.user_id){
- // url+="?first_leader="+getApp().globalData.user_id;
- // }
- // var hui_active=this.data.hui_active;
- // var title=hui_active.name;
- // if(!title) title=hui_active.main_goods_name;
- // if(!title) title=hui_active.giftTitle;
+ // }else{
+ // //---秒杀，拼团，促销---
+ // var item=this.data.share_good;
+ // if(item){
+ // var price = item.shop_price;
+ // var title= item.goods_name;
+ // var img=this.data.url+item.original_img;
+ // var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+ // if(getApp().globalData.user_id){
+ // url+="&first_leader="+getApp().globalData.user_id;
+ // }
+ // var ob={
+ // title: price + "元 " +title,
+ // path:url,
+ // imageUrl: img,
+ // };
+ // th.setData({share_hidden:1,share_good:null});
+ // return ob;
+ // }else{
+ // var url="/pages/index/index/index";
+ // if(getApp().globalData.user_id){
+ // url+="?first_leader="+getApp().globalData.user_id;
+ // }
+ // var hui_active=this.data.hui_active;
+ // var title=hui_active.name;
+ // if(!title) title=hui_active.main_goods_name;
+ // if(!title) title=hui_active.giftTitle;
- // var ob={
- // title: title,
- // path:url,
- // };
- // th.setData({share_hidden:1,share_good:null});
- // return ob;
- // }
- // }
+ // var ob={
+ // title: title,
+ // path:url,
+ // };
+ // th.setData({share_hidden:1,share_good:null});
+ // return ob;
+ // }
+ // }
- // },
+ },
+
+
+ onShareTimeline() {
+ var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+
+ var pagePath = this.route; //当前页面url
+
+ if(!store_name) store_name = getApp().globalData.setting.appName;
+ if(pagePath.indexOf('/') != 0) {
+ pagePath = '/' + pagePath;
+ }
+ return {
+ title: store_name + '-积分购',
+ path: pagePath,
+ }
+ },
//-- 点击tab --
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
index 7405e0f..2db8aab 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -486,7 +486,7 @@ Page({
// var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
// os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
- os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+ os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
// 读取文件成功则OK--
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 26e77cf..6e41cbc 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4649,7 +4649,7 @@ Page({
}
///二微码
var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
- os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+ os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
// var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
// os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";