wxd / MShopWeApp

Commit ca14fac9ec3575811a94fd2ea76bc77051317b4d

Authored by WXD-SEASON\season
2 parents beb8e5b2 b8eee6dc

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

Inline Side-by-side
Showing 18 changed files with 77 additions and 15 deletions
... ... @@ -51,7 +51,7 @@ App({
51 51 config: null, //门店参数
52 52 config2: null, //门店配置
53 53 code: null,
54   - user_id:null,//6520390,//6520352
  54 + user_id:null,//6520352
55 55 // user_id:6520314,// qa-6519858,//
56 56 // user_id:14148118,// qa-6519858,//
57 57 buy_now: null,
... ... @@ -72,7 +72,9 @@ App({
72 72 room_id: null, //直播间分享的房间ID
73 73 room_goods_id: null, //直播间分享的商品ID
74 74 fail_url: new Map(),
75   - sp_scene: null
  75 + sp_scene: null,
  76 +
  77 + navBarHeight:44, //默认高度44
76 78 },
77 79 auth: o,
78 80 request: a,
... ...
components/com_top_nav/com_top_nav.wxml
  View file @ca14fac
... ... @@ -7,7 +7,7 @@
7 7 <cover-view class="gback">
8 8 <cover-view class="rote_view" style="border: 3rpx solid {{color}};"></cover-view>
9 9 </cover-view>
10   - <cover-view >{{title}}</cover-view>
  10 + <cover-view class="ellip">{{title}}</cover-view>
11 11 </cover-view>
12 12  
13 13 </cover-view>
... ...
components/com_top_nav/com_top_nav.wxss
  View file @ca14fac
... ... @@ -12,3 +12,10 @@
12 12 width: 24rpx; height: 24rpx; margin-left: 6rpx; margin-top: 6rpx;
13 13 transform: rotate(45deg);
14 14 }
  15 +
  16 +.ellip{
  17 + max-width: 300rpx;
  18 + overflow: hidden;
  19 + white-space: nowrap;
  20 + text-overflow: ellipsis;
  21 +}
15 22 \ No newline at end of file
... ...
components/diy_goodsGroup/diy_goodsGroup.js
  View file @ca14fac
... ... @@ -9,7 +9,7 @@ var regeneratorRuntime = require(&#39;../../utils/runtime.js&#39;);
9 9 var g_filter = require('./filter');
10 10  
11 11 Component({
12   - properties: {
  12 + properties: {
13 13 // 这里定义了innerText属性，属性值可以在组件使用时指定
14 14 object: {
15 15 type: Object,
... ... @@ -62,6 +62,7 @@ Component({
62 62 is_get:0,
63 63  
64 64 is_retail_price:0, //是否显示零售价
  65 + swiperHeight:0
65 66 // action_index:0, //选中的tab项
66 67 },
67 68  
... ... @@ -606,9 +607,21 @@ Component({
606 607 });
607 608 }
608 609 }
609   -
  610 + if (th.data.object.style==6) {
  611 + th.setSwiper_h()
  612 + }
610 613 },
611   -
  614 + setSwiper_h(){
  615 + var th=this
  616 + wx.createSelectorQuery().in(this).select('.swiper_h').boundingClientRect(rect => {
  617 + if (rect && rect.height) {
  618 + var sumHeigth=(rect.height+13)+'px'
  619 + th.setData({
  620 + swiperHeight: sumHeigth
  621 + })
  622 + }
  623 + }).exec();
  624 + },
612 625 re_show: function () {
613 626 if (this.data.object.goodscount * this.data.page < this.data.total) {
614 627 this.setLoading()
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @ca14fac
... ... @@ -253,8 +253,10 @@ Page({
253 253 room_user_share=1;
254 254 };
255 255 };
256   -
257   - ee.setData({ gid: gid});
  256 +
  257 + //-- 设置顶部高度 --
  258 + let height= getApp().globalData.navBarHeight;
  259 + ee.setData({ gid: gid,top_nav:height});
258 260  
259 261 if(first_leader) {
260 262 getApp().globalData.first_leader=first_leader;
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @ca14fac
... ... @@ -11,7 +11,7 @@
11 11 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
12 12 <block wx:if="{{isshow}}">
13 13 <view class="container">
14   - <view class="type-navbar">
  14 + <view class="type-navbar" style="top:{{top_nav}}px">
15 15 <view class="type-box" wx:for="{{categories}}" wx:key="categories">
16 16 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
17 17 {{item.name}}
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
  View file @ca14fac
... ... @@ -207,6 +207,14 @@ Page({
207 207 gid = t.goods_id,
208 208 first_leader = t.first_leader;
209 209  
  210 +
  211 + //-- 设置顶部高度 --
  212 + let height= getApp().globalData.navBarHeight;
  213 + this.setData({
  214 + top_nav:height
  215 + })
  216 +
  217 +
210 218 //-- 自定义海报 --
211 219 getApp().request.promiseGet("/api/weshop/goods/poster/page", {
212 220 data:{store_id:os.stoid, type:1, is_use:1}
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
  View file @ca14fac
... ... @@ -11,7 +11,7 @@
11 11 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
12 12 <block wx:if="{{isshow}}">
13 13 <view class="container">
14   - <view class="type-navbar">
  14 + <view class="type-navbar" style="top:{{top_nav}}px">
15 15 <view class="type-box" wx:for="{{categories}}" wx:key="categories">
16 16 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
17 17 {{item.name}}
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @ca14fac
... ... @@ -336,6 +336,12 @@ Page({
336 336 //检查测肤
337 337 getApp().check_skin_face(t,0,gid);
338 338  
  339 + //-- 设置顶部高度 --
  340 + let height= getApp().globalData.navBarHeight;
  341 + th.setData({
  342 + top_nav:height
  343 + })
  344 +
339 345 //-- 自定义海报 --
340 346 getApp().request.promiseGet("/api/weshop/goods/poster/page", {
341 347 data: {store_id: os.stoid, type: 1, is_use: 1}
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @ca14fac
... ... @@ -14,7 +14,7 @@
14 14 <!-- 幸运购规则 -->
15 15 <view class="rules" bindtap="showRules">规则</view>
16 16 <!-- tab选项卡 -->
17   - <view class="type-navbar">
  17 + <view class="type-navbar" style="top:{{top_nav}}px">
18 18 <view class="type-box" wx:for="{{categories}}" wx:key="categories">
19 19 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
20 20 </view>
... ...
packageC/pages/presell/cardInfo/goodsInfo.js
  View file @ca14fac
... ... @@ -241,6 +241,10 @@ Page({
241 241  
242 242 //检查测肤
243 243 getApp().check_skin_face(t,1,gid);
  244 +
  245 + //-- 设置顶部高度 --
  246 + let height= getApp().globalData.navBarHeight;
  247 + ee.setData({ top_nav:height});
244 248  
245 249 //---获取手机地址坐标--
246 250 //--如果tg_id是空的话，分享回来--
... ...
packageC/pages/presell/cardInfo/goodsInfo.wxml
  View file @ca14fac
... ... @@ -11,7 +11,7 @@
11 11 <block wx:if="{{show}}">
12 12 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
13 13 <view class="container">
14   - <view class="type-navbar">
  14 + <view class="type-navbar" style="top:{{top_nav}}px">
15 15 <view class="type-box" wx:for="{{categories}}" wx:key="categories">
16 16 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
17 17 {{item.name}}
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @ca14fac
... ... @@ -283,6 +283,12 @@ Page({
283 283 wxlog.info(getApp().globalData.user_id+'-分享的内容:'+JSON.stringify(t));
284 284 }
285 285  
  286 + //-- 设置顶部高度 --
  287 + let height= getApp().globalData.navBarHeight;
  288 + th.setData({
  289 + top_nav:height
  290 + })
  291 +
286 292 //检查测肤
287 293 getApp().check_skin_face(t, 0, gid);
288 294 //群id
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @ca14fac
... ... @@ -10,7 +10,7 @@
10 10 <block wx:if="{{show}}">
11 11 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
12 12 <view class="container">
13   - <view class="type-navbar">
  13 + <view class="type-navbar" style="top:{{top_nav}}px">
14 14 <view class="type-box" wx:for="{{categories}}" wx:key="categories">
15 15 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
16 16 {{item.name}}
... ...
packageD/pages/user/member/bring/bring.wxml
  View file @ca14fac
... ... @@ -41,7 +41,7 @@
41 41 <view class="one-lists" hidden='{{current==2}}'>卡号
42 42 <input name="card" bindinput="bankinput" bindblur="blurInputEvent" class="srk-two"value="{{account_bank}}"placeholder='请输入银行卡账号' maxlength="23"> </input>
43 43 </view>
44   - <view class="one-lists">姓名<input name="userName" class="srk-two" value='{{usernames}}' placeholder="{{current==2?'请输入微信的开户人姓名':'请输入银行卡的开户人姓名'}}"></input></view>
  44 + <view class="{{current==2?'one-lists1':'one-lists'}}">姓名<input name="userName" class="srk-two" value='{{usernames}}' placeholder="{{current==2?'请输入微信的开户人姓名':'请输入银行卡的开户人姓名'}}"></input></view>
45 45 <view class="yh"hidden='{{current==2}}'>银行<text class="yhmz">{{bank_name}}</text></view>
46 46 </view>
47 47 </view>
... ...
packageD/pages/user/member/bring/bring.wxss
  View file @ca14fac
... ... @@ -128,6 +128,14 @@ margin-top:28rpx;
128 128 margin-left: 60rpx;
129 129 border-bottom: 1px solid #EEEEEE;
130 130 }
  131 + .one-list1{
  132 + font-size: 25rpx;
  133 + width: 680rpx;
  134 + height: 110rpx;
  135 + color: #000000;
  136 + line-height: 130rpx;
  137 + margin-left: 60rpx;
  138 + }
131 139 /* 列表2 */
132 140 .two-list{
133 141 display: flex;
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @ca14fac
... ... @@ -298,6 +298,12 @@ Page({
298 298 console.log("gd onload-- 3 --");
299 299 console.log(t);
300 300  
  301 + //-- 设置顶部高度 --
  302 + let height= getApp().globalData.navBarHeight;
  303 + th.setData({
  304 + top_nav:height
  305 + })
  306 +
301 307 if(t){
302 308 wxlog.info(getApp().globalData.user_id+'-分享的内容:'+JSON.stringify(t));
303 309 }
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @ca14fac
... ... @@ -15,7 +15,7 @@
15 15 <view class="container">
16 16 <!-- 拼单规则规则 -->
17 17 <view wx:if="{{prom_type== 6}}" class="rules" bindtap="showRules">规则</view>
18   - <view class="type-navbar">
  18 + <view class="type-navbar" style="top:{{top_nav}}px">
19 19 <view class="type-box" wx:for="{{categories}}" wx:key="id">
20 20 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
21 21 </view>
... ...