diff --git a/app.js b/app.js
index 55e8796..823a0e6 100644
--- a/app.js
+++ b/app.js
@@ -51,7 +51,7 @@ App({
config: null, //门店参数
config2: null, //门店配置
code: null,
- user_id:null,//6520390,//6520352
+ user_id:null,//6520352
// user_id:6520314,// qa-6519858,//
// user_id:14148118,// qa-6519858,//
buy_now: null,
@@ -72,7 +72,9 @@ App({
room_id: null, //直播间分享的房间ID
room_goods_id: null, //直播间分享的商品ID
fail_url: new Map(),
- sp_scene: null
+ sp_scene: null,
+
+ navBarHeight:44, //默认高度44
},
auth: o,
request: a,
diff --git a/components/com_top_nav/com_top_nav.wxml b/components/com_top_nav/com_top_nav.wxml
index 9efea58..4b3f92c 100644
--- a/components/com_top_nav/com_top_nav.wxml
+++ b/components/com_top_nav/com_top_nav.wxml
@@ -7,7 +7,7 @@
- {{title}}
+ {{title}}
diff --git a/components/com_top_nav/com_top_nav.wxss b/components/com_top_nav/com_top_nav.wxss
index a4de000..b7f06f4 100644
--- a/components/com_top_nav/com_top_nav.wxss
+++ b/components/com_top_nav/com_top_nav.wxss
@@ -12,3 +12,10 @@
width: 24rpx; height: 24rpx; margin-left: 6rpx; margin-top: 6rpx;
transform: rotate(45deg);
}
+
+.ellip{
+ max-width: 300rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index f6748d4..f40fad6 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -9,7 +9,7 @@ var regeneratorRuntime = require('../../utils/runtime.js');
var g_filter = require('./filter');
Component({
- properties: {
+ properties: {
// 这里定义了innerText属性，属性值可以在组件使用时指定
object: {
type: Object,
@@ -62,6 +62,7 @@ Component({
is_get:0,
is_retail_price:0, //是否显示零售价
+ swiperHeight:0
// action_index:0, //选中的tab项
},
@@ -606,9 +607,21 @@ Component({
});
}
}
-
+ if (th.data.object.style==6) {
+ th.setSwiper_h()
+ }
},
-
+ setSwiper_h(){
+ var th=this
+ wx.createSelectorQuery().in(this).select('.swiper_h').boundingClientRect(rect => {
+ if (rect && rect.height) {
+ var sumHeigth=(rect.height+13)+'px'
+ th.setData({
+ swiperHeight: sumHeigth
+ })
+ }
+ }).exec();
+ },
re_show: function () {
if (this.data.object.goodscount * this.data.page < this.data.total) {
this.setLoading()
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 6494045..42c4b4b 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -253,8 +253,10 @@ Page({
room_user_share=1;
};
};
-
- ee.setData({ gid: gid});
+
+ //-- 设置顶部高度 --
+ let height= getApp().globalData.navBarHeight;
+ ee.setData({ gid: gid,top_nav:height});
if(first_leader) {
getApp().globalData.first_leader=first_leader;
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 80b357c..c732b93 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -11,7 +11,7 @@
-
+
{{item.name}}
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index 74eb0b3..3b04c80 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -207,6 +207,14 @@ Page({
gid = t.goods_id,
first_leader = t.first_leader;
+
+ //-- 设置顶部高度 --
+ let height= getApp().globalData.navBarHeight;
+ this.setData({
+ top_nav:height
+ })
+
+
//-- 自定义海报 --
getApp().request.promiseGet("/api/weshop/goods/poster/page", {
data:{store_id:os.stoid, type:1, is_use:1}
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index c9a82ce..3f36a21 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -11,7 +11,7 @@
-
+
{{item.name}}
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 7e8e07f..19e40d5 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -336,6 +336,12 @@ Page({
//检查测肤
getApp().check_skin_face(t,0,gid);
+ //-- 设置顶部高度 --
+ let height= getApp().globalData.navBarHeight;
+ th.setData({
+ top_nav:height
+ })
+
//-- 自定义海报 --
getApp().request.promiseGet("/api/weshop/goods/poster/page", {
data: {store_id: os.stoid, type: 1, is_use: 1}
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 4c29b41..926618c 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -14,7 +14,7 @@
规则
-
+
{{item.name}}
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js
index 43a2843..4d5401b 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.js
+++ b/packageC/pages/presell/cardInfo/goodsInfo.js
@@ -241,6 +241,10 @@ Page({
//检查测肤
getApp().check_skin_face(t,1,gid);
+
+ //-- 设置顶部高度 --
+ let height= getApp().globalData.navBarHeight;
+ ee.setData({ top_nav:height});
//---获取手机地址坐标--
//--如果tg_id是空的话，分享回来--
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxml b/packageC/pages/presell/cardInfo/goodsInfo.wxml
index a0390d7..cf0d1dc 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/cardInfo/goodsInfo.wxml
@@ -11,7 +11,7 @@
-
+
{{item.name}}
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index d3711b2..ccf6668 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -283,6 +283,12 @@ Page({
wxlog.info(getApp().globalData.user_id+'-分享的内容:'+JSON.stringify(t));
}
+ //-- 设置顶部高度 --
+ let height= getApp().globalData.navBarHeight;
+ th.setData({
+ top_nav:height
+ })
+
//检查测肤
getApp().check_skin_face(t, 0, gid);
//群id
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index a1469bc..d38b242 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -10,7 +10,7 @@
-
+
{{item.name}}
diff --git a/packageD/pages/user/member/bring/bring.wxml b/packageD/pages/user/member/bring/bring.wxml
index 870889f..76dc009 100644
--- a/packageD/pages/user/member/bring/bring.wxml
+++ b/packageD/pages/user/member/bring/bring.wxml
@@ -41,7 +41,7 @@
卡号
- 姓名
+ 姓名
银行{{bank_name}}
diff --git a/packageD/pages/user/member/bring/bring.wxss b/packageD/pages/user/member/bring/bring.wxss
index 032db50..a188933 100644
--- a/packageD/pages/user/member/bring/bring.wxss
+++ b/packageD/pages/user/member/bring/bring.wxss
@@ -128,6 +128,14 @@ margin-top:28rpx;
margin-left: 60rpx;
border-bottom: 1px solid #EEEEEE;
}
+ .one-list1{
+ font-size: 25rpx;
+ width: 680rpx;
+ height: 110rpx;
+ color: #000000;
+ line-height: 130rpx;
+ margin-left: 60rpx;
+ }
/* 列表2 */
.two-list{
display: flex;
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 1fd44c9..c13eb2a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -298,6 +298,12 @@ Page({
console.log("gd onload-- 3 --");
console.log(t);
+ //-- 设置顶部高度 --
+ let height= getApp().globalData.navBarHeight;
+ th.setData({
+ top_nav:height
+ })
+
if(t){
wxlog.info(getApp().globalData.user_id+'-分享的内容:'+JSON.stringify(t));
}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 0c1a6f4..b150c13 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -15,7 +15,7 @@
规则
-
+
{{item.name}}