Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents fedf9a14 ca14fac9
Showing 18 changed files with 77 additions and 15 deletions
app.js
components/com_top_nav/com_top_nav.wxml
components/com_top_nav/com_top_nav.wxss
components/diy_goodsGroup/diy_goodsGroup.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.js
packageC/pages/presell/cardInfo/goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageD/pages/user/member/bring/bring.wxml
packageD/pages/user/member/bring/bring.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -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,
@@ -7,7 +7,7 @@
        <cover-view  class="gback">
             <cover-view class="rote_view" style="border: 3rpx solid {{color}};"></cover-view>
        </cover-view>
-       <cover-view >{{title}}</cover-view>
+       <cover-view class="ellip">{{title}}</cover-view>
    </cover-view>
 </cover-view>
@@ -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
@@ -9,7 +9,7 @@ var regeneratorRuntime = require(&#39;../../utils/runtime.js&#39;);
 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()
@@ -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;
@@ -11,7 +11,7 @@
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">
 	<view class="container">
-		<view class="type-navbar">
+		<view class="type-navbar" style="top:{{top_nav}}px">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
 				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
 					{{item.name}}
@@ -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}
@@ -11,7 +11,7 @@
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">
 	<view class="container">
-		<view class="type-navbar">
+		<view class="type-navbar" style="top:{{top_nav}}px">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
 				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
 					{{item.name}}
@@ -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}
@@ -14,7 +14,7 @@
 		<!-- 幸运购规则 -->
 		<view class="rules" bindtap="showRules">规则</view>
 		<!-- tab选项卡 -->
-    <view class="type-navbar">
+    <view class="type-navbar" style="top:{{top_nav}}px">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
       </view>
@@ -241,6 +241,10 @@ Page({
       //检查测肤
       getApp().check_skin_face(t,1,gid);
+
+      //-- 设置顶部高度 --
+      let height= getApp().globalData.navBarHeight;
+      ee.setData({ top_nav:height});
     //---获取手机地址坐标--
     //--如果tg_id是空的话，分享回来--
@@ -11,7 +11,7 @@
 <block wx:if="{{show}}">
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <view class="container">
-  <view class="type-navbar">
+  <view class="type-navbar" style="top:{{top_nav}}px">
     <view class="type-box" wx:for="{{categories}}" wx:key="categories">
       <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
         {{item.name}}
@@ -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
@@ -10,7 +10,7 @@
 <block wx:if="{{show}}">
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <view class="container">
-  <view class="type-navbar">
+  <view class="type-navbar" style="top:{{top_nav}}px">
     <view class="type-box" wx:for="{{categories}}" wx:key="categories">
       <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
         {{item.name}}
@@ -41,7 +41,7 @@
 		   <view class="one-lists"  hidden='{{current==2}}'>卡号
 			   <input name="card" bindinput="bankinput" bindblur="blurInputEvent"  class="srk-two"value="{{account_bank}}"placeholder='请输入银行卡账号' maxlength="23"> </input>
 		   </view>
-		   <view class="one-lists">姓名<input name="userName" class="srk-two" value='{{usernames}}' placeholder="{{current==2?'请输入微信的开户人姓名':'请输入银行卡的开户人姓名'}}"></input></view>
+		   <view class="{{current==2?'one-lists1':'one-lists'}}">姓名<input name="userName" class="srk-two" value='{{usernames}}' placeholder="{{current==2?'请输入微信的开户人姓名':'请输入银行卡的开户人姓名'}}"></input></view>
 		   <view class="yh"hidden='{{current==2}}'>银行<text class="yhmz">{{bank_name}}</text></view>
 		 </view>
 	  </view>
@@ -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;
@@ -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));
         }
@@ -15,7 +15,7 @@
   <view class="container">
     <!-- 拼单规则规则 -->
     <view wx:if="{{prom_type== 6}}" class="rules" bindtap="showRules">规则</view>
-    <view class="type-navbar">
+    <view class="type-navbar" style="top:{{top_nav}}px">
       <view class="type-box" wx:for="{{categories}}" wx:key="id">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
       </view>