wxd / MShopWeApp

Commit abc988e37564d6c6a58d624243da4cdc4d7f93ea

Authored by 后端研发-苏明海
2 parents 55e3fd30 beef55c7

Merge branch 'dev' into 'test' 

Dev

See merge request !152
Inline Side-by-side
Showing 18 changed files with 790 additions and 218 deletions
components/goods_list/goods_list.wxml
  View file @abc988e
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <view class="flex xc-wc"> 23 <view class="flex xc-wc">
24 <view class="fs24">￥</view> 24 <view class="fs24">￥</view>
25 <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> 25 <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
26 - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{card_name}}</view> 26 + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
27 </view> 27 </view>
28 </view> 28 </view>
29 <view class="flex" style="line-height: 28rpx;" > 29 <view class="flex" style="line-height: 28rpx;" >
components/goods_list/goods_list.wxss
  View file @abc988e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 margin-top: 40rpx; 2 margin-top: 40rpx;
3 } 3 }
4 .ib{ 4 .ib{
5 - display: inline-block; 5 + display: inline-block;
6 } 6 }
7 .fs20{ 7 .fs20{
8 font-size: 20rpx; 8 font-size: 20rpx;
@@ -151,6 +151,11 @@ color: #b9b9b9; @@ -151,6 +151,11 @@ color: #b9b9b9;
151 } 151 }
152 152
153 .line_th{ text-decoration: line-through} 153 .line_th{ text-decoration: line-through}
154 -.card_bg {display: flex; width: 108rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx; 154 +.card_bg {display: flex; padding: 2rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx;max-width: 110rpx;
155 background: #333; color: #fff; justify-content: center; margin-left: 2rpx;} 155 background: #333; color: #fff; justify-content: center; margin-left: 2rpx;}
156 -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}  
157 \ No newline at end of file 156 \ No newline at end of file
  157 +.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}.card_bg .card_name{
  158 + max-width: 76rpx;
  159 + width: auto;
  160 + overflow: hidden;
  161 + white-space:nowrap;
  162 +}
158 \ No newline at end of file 163 \ No newline at end of file
pages/getphone/getphone.js
  View file @abc988e
@@ -17,7 +17,9 @@ Page({ @@ -17,7 +17,9 @@ Page({
17 var openid = getApp().globalData.openid; 17 var openid = getApp().globalData.openid;
18 18
19 if (openid == "" || openid == null) { 19 if (openid == "" || openid == null) {
20 - openid = getApp().globalData.userInfo.weapp_openid; 20 +
  21 + if (getApp().globalData.userInfo)
  22 + openid = getApp().globalData.userInfo.weapp_openid;
21 } 23 }
22 24
23 if(openid=="" || openid==null ){ 25 if(openid=="" || openid==null ){
pages/goods/goodsInfo/goodsInfo.js
  View file @abc988e
@@ -3045,11 +3045,11 @@ Page({ @@ -3045,11 +3045,11 @@ Page({
3045 is_gps: "3" 3045 is_gps: "3"
3046 }); 3046 });
3047 } 3047 }
3048 -  
3049 th.data.is_get_local_ok = 1; 3048 th.data.is_get_local_ok = 1;
3050 } 3049 }
3051 }) 3050 })
3052 }else{ 3051 }else{
  3052 + th.data.is_get_local_ok = 1;
3053 th.get_sto(); 3053 th.get_sto();
3054 } 3054 }
3055 3055
pages/goods/goodsInfo/goodsInfo.wxml
  View file @abc988e
1 <import src="../../../utils/wxParse/wxParse.wxml"></import> 1 <import src="../../../utils/wxParse/wxParse.wxml"></import>
2 <wxs module="filters" src="../../../utils/filter.wxs"></wxs> 2 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
3 <wxs module="g_filters" src="g_filter.wxs"></wxs> 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 -  
5 <wxs module="" src="filter.wxs"></wxs> 4 <wxs module="" src="filter.wxs"></wxs>
  5 +<!-- 商品内容区域,普通商品,秒杀,拼团 -->
6 <block wx:if="{{isshow}}"> 6 <block wx:if="{{isshow}}">
7 <view class="container"> 7 <view class="container">
8 - <view class="type-navbar"> 8 + <view class="type-navbar">
9 <view class="type-box" wx:for="{{categories}}" wx:key="categories"> 9 <view class="type-box" wx:for="{{categories}}" wx:key="categories">
10 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}"> 10 <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
11 {{item.name}} 11 {{item.name}}
12 - </view> 12 + </view>
13 </view> 13 </view>
14 </view> 14 </view>
15 15
16 <view class="goods-detail"> 16 <view class="goods-detail">
17 <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}"> 17 <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
18 - <!-- 视频,滚动图bannar --> 18 + <!-- 视频 -->
19 <!-- <swiper bindchange="swiperChange"class="xc-pictures swiperContainer rel" current="{{swiperCurrent}}" 19 <!-- <swiper bindchange="swiperChange"class="xc-pictures swiperContainer rel" current="{{swiperCurrent}}"
20 indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> --> 20 indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->
21 <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove"> 21 <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </view> 44 </view>
45 <view class="xc-video-picture abs"> 45 <view class="xc-video-picture abs">
46 <view class="xc-video" data-vipi="0" bindtap="videopicture"> 46 <view class="xc-video" data-vipi="0" bindtap="videopicture">
47 - <view class=" {{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}} {{videopicture==0 ? 'xc-sn':''}}"> 47 + <view class="{{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}} {{videopicture==0 ? 'xc-sn':''}}">
48 视频 48 视频
49 </view> 49 </view>
50 </view> 50 </view>
@@ -57,6 +57,8 @@ @@ -57,6 +57,8 @@
57 </block> 57 </block>
58 </view> 58 </view>
59 </view> 59 </view>
  60 +
  61 +
60 <!----显示秒杀价,团购，积分购----> 62 <!----显示秒杀价,团购，积分购---->
61 <view class="prom_show rel" wx:if="{{prom_type==1}}"> 63 <view class="prom_show rel" wx:if="{{prom_type==1}}">
62 64
@@ -78,6 +80,7 @@ @@ -78,6 +80,7 @@
78 <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> 80 <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
79 </view> 81 </view>
80 </view> 82 </view>
  83 +
81 <!----拼单----> 84 <!----拼单---->
82 <view class="pt_show " wx:if="{{prom_type==6}}"> 85 <view class="pt_show " wx:if="{{prom_type==6}}">
83 <view class="pt_view rel"> 86 <view class="pt_view rel">
@@ -225,10 +228,11 @@ @@ -225,10 +228,11 @@
225 </view> 228 </view>
226 </view> 229 </view>
227 </view> 230 </view>
  231 +
228 <block wx:if="{{prom_type!=6}}"> 232 <block wx:if="{{prom_type!=6}}">
229 <view class="goods-price rel"> 233 <view class="goods-price rel">
230 <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}"> 234 <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}">
231 - <view class="market-price" style="overflow: hidden"> 235 + <view class="market-price" style="overflow: hidden">
232 <block wx:if="{{card_field && data[card_field]>0}}"> 236 <block wx:if="{{card_field && data[card_field]>0}}">
233 <view class="flex ai-center grade-card-frame" style="margin-left:12rpx;"> 237 <view class="flex ai-center grade-card-frame" style="margin-left:12rpx;">
234 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> 238 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
@@ -244,6 +248,7 @@ @@ -244,6 +248,7 @@
244 <view class='yj'><text>原价:￥{{data.market_price}}</text></view> 248 <view class='yj'><text>原价:￥{{data.market_price}}</text></view>
245 </block> 249 </block>
246 </view> 250 </view>
  251 +
247 </view> 252 </view>
248 253
249 <!-- 这个是分享按钮 --> 254 <!-- 这个是分享按钮 -->
@@ -251,9 +256,14 @@ @@ -251,9 +256,14 @@
251 <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> 256 <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
252 <view class="share-font">分享</view> 257 <view class="share-font">分享</view>
253 </view> 258 </view>
254 -  
255 - <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> 259 +
  260 +
  261 +
  262 +
  263 + <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
  264 +
256 <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}"> 265 <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
  266 +
257 <view class="flex ai-center grade-card-frame card-frame"style="padding-right:0rpx" > 267 <view class="flex ai-center grade-card-frame card-frame"style="padding-right:0rpx" >
258 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> 268 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
259 <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view> 269 <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
@@ -263,10 +273,11 @@ @@ -263,10 +273,11 @@
263 ￥</text>{{g_filters.get_card_price(data,card_list,0)}} 273 ￥</text>{{g_filters.get_card_price(data,card_list,0)}}
264 </view> 274 </view>
265 </view> 275 </view>
266 -  
267 -  
268 - <!-- 等级卡的显示,购买, 等级卡近30天要显示续费--> 276 +
  277 + <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
  278 +
269 <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> 279 <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
  280 +
270 <view wx:if="{{!card_field }}"> 281 <view wx:if="{{!card_field }}">
271 <view class="beauty-makeup-frame flex ai-center"> 282 <view class="beauty-makeup-frame flex ai-center">
272 <view class="left flex ai-center"> 283 <view class="left flex ai-center">
@@ -309,15 +320,8 @@ @@ -309,15 +320,8 @@
309 </view> 320 </view>
310 321
311 </block> 322 </block>
312 -  
313 -  
314 -  
315 -  
316 -  
317 -  
318 -  
319 -  
320 - <!-- 商品名称 --> 323 + <!--许程商品名字-->
  324 +
321 <view wx:if="{{prom_type!=1}}"> 325 <view wx:if="{{prom_type!=1}}">
322 <view class="goods-title"> 326 <view class="goods-title">
323 <view class="goods-name elli">{{data.goods_name}}</view> 327 <view class="goods-name elli">{{data.goods_name}}</view>
@@ -325,7 +329,7 @@ @@ -325,7 +329,7 @@
325 </view> 329 </view>
326 330
327 <view class="goods-num" wx:if="{{prom_type!=1}}"> 331 <view class="goods-num" wx:if="{{prom_type!=1}}">
328 - <view class="sales">销量:{{data.sales_sum}}件</view> 332 + <view class="sales">销量：{{data.sales_sum}}件</view>
329 <view class="stock">折扣：{{data.disc}}折</view> 333 <view class="stock">折扣：{{data.disc}}折</view>
330 <view class="stock">{{categories3[0].num}}人评价</view> 334 <view class="stock">{{categories3[0].num}}人评价</view>
331 </view> 335 </view>
@@ -344,7 +348,7 @@ @@ -344,7 +348,7 @@
344 </view> 348 </view>
345 </view> 349 </view>
346 </view> 350 </view>
347 - <view style='height:42rpx'></view> 351 +
348 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}"> 352 <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}">
349 {{data.goods_name}} 353 {{data.goods_name}}
350 </view> 354 </view>
@@ -371,6 +375,37 @@ @@ -371,6 +375,37 @@
371 375
372 </view> 376 </view>
373 </block> 377 </block>
  378 +
  379 + <!-- 门店收货地址 -->
  380 + <view class="xc-address_frame flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
  381 + <view class="address_frame" bindtap="choice_store" data-ind="0">
  382 + <view class="flex-vertical-between ">
  383 + <view class="flex-vertical select_store_height">
  384 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  385 + <view class="fs30 xc-ash-9f">选择门店</view>
  386 + </view>
  387 + <view class="red_bb fs32">
  388 + 更多门店
  389 + <text class="bg_jj"></text>
  390 + </view>
  391 + </view>
  392 +
  393 + <view wx:if="{{def_pick_store}}">
  394 + <view class="flex-space-between address ai_end ">
  395 + <view>
  396 + <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
  397 + </view>
  398 + <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
  399 + 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  400 +
  401 + </view>
  402 + </view>
  403 + <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
  404 + </view>
  405 + </view>
  406 +
  407 + </view>
  408 +
374 <!--许程 7.24暂时注释 --> 409 <!--许程 7.24暂时注释 -->
375 <view wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> 410 <view wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}">
376 <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> 411 <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
@@ -412,16 +447,16 @@ @@ -412,16 +447,16 @@
412 <view class="xc_comment-left"> 447 <view class="xc_comment-left">
413 <view class="xc_comment-user"> 448 <view class="xc_comment-user">
414 <view class="xc_user-img"> 449 <view class="xc_user-img">
415 - <image class="xc_imgs" src='{{item.head_pic}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image> 450 + <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
416 </view> 451 </view>
417 452
418 <view class="xc_user"> 453 <view class="xc_user">
419 - <view class="xc_user-name five-level-word">{{item.username}}</view> 454 + <view class="xc_user-name five-level-word">{{item.is_anonymous!=1?item.username:'匿名'}}</view>
420 <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> 455 <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
421 </view> 456 </view>
422 </view> 457 </view>
423 - <view class="xc_comment-font pj_word_size ellipsis-3">  
424 - {{item.content?item.content:''}} 458 + <view class="xc_comment-font pj_word_size ellipsis-2">
  459 + {{item.content?item.content:''}}
425 </view> 460 </view>
426 <view class="xc_comment-val"> 461 <view class="xc_comment-val">
427 <view class="xc_comment-time">{{item.add_time}}</view> 462 <view class="xc_comment-time">{{item.add_time}}</view>
@@ -429,7 +464,8 @@ @@ -429,7 +464,8 @@
429 </view> 464 </view>
430 </view> 465 </view>
431 <view class="xc_goods-img-frame"> 466 <view class="xc_goods-img-frame">
432 - <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image> 467 + <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
  468 + <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
433 <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image> 469 <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
434 </view> 470 </view>
435 </view> 471 </view>
@@ -503,7 +539,7 @@ @@ -503,7 +539,7 @@
503 <text>规格</text> 539 <text>规格</text>
504 </view> 540 </view>
505 <view class="item_right"> 541 <view class="item_right">
506 - <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text> 542 + <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
507 </view> 543 </view>
508 </view> 544 </view>
509 <view class="tb_item tb-l"> 545 <view class="tb_item tb-l">
@@ -532,11 +568,27 @@ @@ -532,11 +568,27 @@
532 </view> 568 </view>
533 569
534 <!-- 显示商品 --> 570 <!-- 显示商品 -->
535 - <goods_recommend id="goods_list"></goods_recommend> 571 + <view class="xc-goods ">
  572 + <view>
  573 + <view bindtap="go_goods" data-gid="{{item.goods_id}}" class="rel xc-goods-recommend {{index%2==0?'':'ml'}}" wx:for="{{recommend_list}}">
  574 + <image class="xc-goods-imgs" src="{{iurl+item.original_img}}"></image>
  575 + <view class='xc-goods-bottom abs'>
  576 + <view class="flex monry-frame">
  577 + <view class="flex">
  578 + <view class="three-level-word money-color-val rmb-symbol">￥</view>
  579 + <view class="two-level-word money-color-val" style='margin-top:8rpx;'>{{item.shop_price}}</view>
  580 + </view>
  581 + <view class="word-lines xc-original-price"> 原价￥{{item.market_price}}</view>
  582 + </view>
  583 + <view class="xc-good-explain ellipsis-2">{{item.goods_name}}</view>
  584 + </view>
  585 + </view>
  586 + </view>
  587 + </view>
536 588
537 </view> 589 </view>
538 590
539 - <!------------商品详情图片页面--------------> 591 + <!------------商品详情图片页面---------------->
540 <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}"> 592 <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
541 <view class="table_s"> 593 <view class="table_s">
542 <view class="tb_item tb-l"> 594 <view class="tb_item tb-l">
@@ -609,7 +661,7 @@ @@ -609,7 +661,7 @@
609 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> 661 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
610 </view> 662 </view>
611 </view> 663 </view>
612 - <!------------评价页面--------------> 664 + <!---------------评价页面-------------->
613 <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> 665 <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
614 <view class="topframe"> 666 <view class="topframe">
615 <view class="topframe-top"> 667 <view class="topframe-top">
@@ -629,26 +681,33 @@ @@ -629,26 +681,33 @@
629 <view style='border-bottom:4rpx solid #eee;'> 681 <view style='border-bottom:4rpx solid #eee;'>
630 <view class="middle"> 682 <view class="middle">
631 <view class="middle-img-frame"> 683 <view class="middle-img-frame">
632 - <image class="middle-img" src="{{item.head_pic}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image> 684 + <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
633 <view class="middle-user-frame"> 685 <view class="middle-user-frame">
634 - <view class="middle-user">{{item.username==''?'匿名用户':item.username}}</view> 686 + <view class="middle-user">{{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}</view>
635 <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> 687 <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
636 </view> 688 </view>
637 </view> 689 </view>
638 <view class="xc-pirces"> 690 <view class="xc-pirces">
639 - <text class="middle-font"> 691 + <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" >
640 {{item.content?item.content:''}} 692 {{item.content?item.content:''}}
641 - </text> 693 + </view>
642 </view> 694 </view>
  695 + <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view>
  696 + <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleContent'>收起</view>
643 <view class="img-ul"> 697 <view class="img-ul">
644 - <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">  
645 - <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}"  
646 - data-id="{{index}}" src="{{iurl}}{{item}}"></image>  
647 - </view>  
648 - </view>  
649 698
650 - <view class="iddle-goods-img">  
651 - <image bindtap="previewCommentImgs" class="goods-img" wx:for="{{item.img}}" wx:key="{{index}}" data-cidx="{{cIdx}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image> 699 + <block wx:if="{{item.source_type==0}}">
  700 + <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
  701 + <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}"
  702 + data-id="{{index}}" src="{{iurl}}{{item}}"></image>
  703 + </view>
  704 + </block>
  705 + <block wx:if="{{item.source_type==1}}">
  706 + <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
  707 + <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}"
  708 + data-id="{{index}}" src="{{aitem}}"></image>
  709 + </view>
  710 + </block>
652 </view> 711 </view>
653 712
654 <view class="z_parameter"> 713 <view class="z_parameter">
@@ -670,8 +729,11 @@ @@ -670,8 +729,11 @@
670 </view> 729 </view>
671 </view> 730 </view>
672 </block> 731 </block>
673 - <block wx:if="{{comments.length==0 && get_c}}">  
674 - <text class="no_pj_list">暂无评价</text> 732 + <block wx:if="{{(!comments || comments.length==0) && get_c }}">
  733 + <text class="no_pj_list">暂无评价</text>
  734 + </block>
  735 + <block wx:if="{{comments.length>10 && comments_no_more}}">
  736 + <text class="no_pj_list">已经加载到底部</text>
675 </block> 737 </block>
676 </view> 738 </view>
677 </view> 739 </view>
@@ -680,6 +742,7 @@ @@ -680,6 +742,7 @@
680 <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}"> 742 <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
681 <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image> 743 <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
682 </view> 744 </view>
  745 +
683 <!-------------------底部按钮--------------------> 746 <!-------------------底部按钮-------------------->
684 <view class="join-cart"> 747 <view class="join-cart">
685 <view bindtap="contactService" class="custom-service cart-ico new_split"> 748 <view bindtap="contactService" class="custom-service cart-ico new_split">
@@ -698,15 +761,19 @@ @@ -698,15 +761,19 @@
698 <view>购物车</view> 761 <view>购物车</view>
699 </navigator> 762 </navigator>
700 </view> 763 </view>
701 - <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>-->  
702 - <block wx:if="{{prom_type==0}}"> 764 + <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
  765 +
  766 + <!---- 普通商品购买 ----->
  767 + <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}">
703 768
704 - <block wx:if="{{data.store_count>0}}">  
705 - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>  
706 - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view> 769 + <block wx:if="{{sele_g.store_count>0}}">
  770 + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
  771 + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
707 </block> 772 </block>
708 - <block wx:else>  
709 - <view data-ind="1" class="join-btn cart-btn no_store">库存不足</view> 773 + <block wx:else>
  774 + <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">
  775 + 库存不足
  776 + </view>
710 </block> 777 </block>
711 778
712 </block> 779 </block>
@@ -731,13 +798,7 @@ @@ -731,13 +798,7 @@
731 <!-------拼单--------> 798 <!-------拼单-------->
732 <block wx:if="{{prom_type==6}}"> 799 <block wx:if="{{prom_type==6}}">
733 <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h"> 800 <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">
734 - <block wx:if="{{card_field && data[card_field]>0}}">  
735 - <view class="fir-v">￥{{filters.toFix(data[card_field],2)}}</view>  
736 - </block>  
737 - <block wx:else>  
738 - <view class="fir-v">￥{{filters.toFix(data.shop_price,2)}}</view>  
739 - </block>  
740 - 801 + <view class="fir-v">￥{{filters.toFix(data.shop_price,2)}}</view>
741 <view>单独购买</view> 802 <view>单独购买</view>
742 </view> 803 </view>
743 804
@@ -789,54 +850,81 @@ @@ -789,54 +850,81 @@
789 <view hidden="{{!openSpecModal}}"> 850 <view hidden="{{!openSpecModal}}">
790 <view bindtap="closeSpecModal" class="cover-layer"></view> 851 <view bindtap="closeSpecModal" class="cover-layer"></view>
791 <view class="spec-model"> 852 <view class="spec-model">
792 - <view class="pding">  
793 - <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> 853 + <view class="pding">
  854 + <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
794 <view class="spec-goods"> 855 <view class="spec-goods">
795 - <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> 856 + <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
796 <view class="spec-goods-info"> 857 <view class="spec-goods-info">
797 - <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->  
798 - <view class="spec-goods-price" wx:if="{{prom_price==null}}">  
799 - <!-- 如果是等级会员，且有等级价 -->  
800 - <block wx:if="{{card_field && sele_g[card_field]>0}}">  
801 - ￥ {{sele_g[card_field]}}  
802 - </block>  
803 - <block wx:else>  
804 - ￥ {{sele_g.shop_price}}  
805 - </block>  
806 - </view>  
807 - <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view> 858 + <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
  859 + <view class="flex ai_end xc-val-money">
  860 + <view class="spec-goods-price" wx:if="{{prom_price==null}}">
  861 + <text class="fs20">￥</text>
  862 + <!-- 如果是等级会员，且有等级价 -->
  863 + <block wx:if="card_field && sele_g[card_field]>0">
  864 + {{sele_g[card_field]}}
  865 + </block>
  866 + <block wx:else>
  867 + {{sele_g.shop_price}}
  868 + </block>
  869 +
  870 + </view>
  871 + <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
  872 + </view>
  873 +
808 <block wx:if="{{prom_type==0}}"> 874 <block wx:if="{{prom_type==0}}">
  875 + <view class="flex">
809 <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view> 876 <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
810 <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view> 877 <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
811 - <view class="spec-goods-stock">已选：{{sele_g.gg}}</view> 878 +
  879 + </view>
812 </block> 880 </block>
813 <block wx:if="{{prom_type==1}}"> 881 <block wx:if="{{prom_type==1}}">
  882 + <view class="flex">
814 <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view> 883 <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
815 <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view> 884 <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
816 <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view> 885 <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
817 - <view class="spec-goods-stock">已选：{{sele_g.gg}}</view> 886 +
  887 +
  888 + </view>
818 </block> 889 </block>
819 </view> 890 </view>
820 - </view> 891 +
  892 + <!-- 选择门店模块 -->
  893 + <view class="flex-space-between address ai_end xc-width ">
  894 +
  895 + <view class="flex ai_end" wx:if="{{def_pick_store}}">
  896 + <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
  897 + <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
  898 + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  899 +
  900 + </view>
  901 + </view>
  902 +
  903 + <!-- 没有门店的时候 -->
  904 + <view class="flex" bindtap="choice_store"wx:else>
  905 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  906 + <view class="fs28 xc-ash-9f">选择门店</view>
  907 + </view>
  908 +
  909 + <view class="red-co fs28" bindtap="choice_store" >
  910 + 更多门店
  911 + <text class="right-arrow"></text>
  912 + </view>
  913 + </view>
  914 + <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
  915 + </view>
  916 +
821 <!----商品的属性项目----> 917 <!----商品的属性项目---->
  918 + <view class="xc-goods-attribute">
822 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view> 919 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
823 <view hidden="{{ismend==1}}" class="flex"> 920 <view hidden="{{ismend==1}}" class="flex">
824 <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g"> 921 <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
825 {{item.gg}} 922 {{item.gg}}
826 </view> 923 </view>
827 </view> 924 </view>
  925 +</view>
  926 +
828 927
829 - <!----点击选择门店的时候要隐藏---->  
830 - <view hidden="{{ismend==1}}">  
831 - <view bindtap="getmendian" class="quhuo logistics-item">  
832 - <view wx:if="{{sto_sele_name==''}}">取货门店  
833 - <text class='small'>（选择门店）</text>  
834 - </view>  
835 - <view wx:else>取货门店({{sto_sele_name}})</view>  
836 - <view class="item-img">  
837 - <image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>  
838 - </view>  
839 - </view>  
840 <view class="b_num"> 928 <view class="b_num">
841 <view>购买数量</view> 929 <view>购买数量</view>
842 <view class="count"> 930 <view class="count">
@@ -846,6 +934,14 @@ @@ -846,6 +934,14 @@
846 </view> 934 </view>
847 </view> 935 </view>
848 </view> 936 </view>
  937 + <view class="spec-cart-btns">
  938 +
  939 +
  940 + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
  941 + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
  942 +
  943 + </view>
  944 +
849 <view class="clear"></view> 945 <view class="clear"></view>
850 <!---选择门店的列表---> 946 <!---选择门店的列表--->
851 <view hidden="{{ismend==0}}" class="sto_v"> 947 <view hidden="{{ismend==0}}" class="sto_v">
@@ -871,51 +967,80 @@ @@ -871,51 +967,80 @@
871 </view> 967 </view>
872 </view> 968 </view>
873 </view> 969 </view>
874 - <view class="spec-cart-btns">  
875 - <block>  
876 - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="add">加入购物车</view>  
877 - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>  
878 - </block>  
879 - </view>  
880 - </view> 970 +
881 </view> 971 </view>
882 -  
883 <!----弹起来,选择规格数量,拼单商品购买------> 972 <!----弹起来,选择规格数量,拼单商品购买------>
884 <view hidden="{{!openSpecModal_pt}}"> 973 <view hidden="{{!openSpecModal_pt}}">
885 <view bindtap="closeSpecModal" class="cover-layer"></view> 974 <view bindtap="closeSpecModal" class="cover-layer"></view>
886 <view class="spec-model"> 975 <view class="spec-model">
887 <view class="pding"> 976 <view class="pding">
888 <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> 977 <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
  978 +
  979 + <!-- 商品名称 -->
889 <view class="spec-goods"> 980 <view class="spec-goods">
890 - <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> 981 + <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
891 <view class="spec-goods-info"> 982 <view class="spec-goods-info">
892 - <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->  
893 - <view class="spec-goods-price" wx:if="{{is_normal==1}}">  
894 - <!-- 如果是等级会员，且有等级价 -->  
895 - <block wx:if="{{card_field && sele_g[card_field]>0}}">  
896 - ￥ {{sele_g[card_field]}}  
897 - </block>  
898 - <block wx:else>  
899 - ￥ {{sele_g.shop_price}}  
900 - </block>  
901 - </view>  
902 - <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view> 983 + <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
  984 + <view class="flex ai_end xc-val-money">
  985 + <view class="spec-goods-price" wx:if="{{is_normal==1}}">
  986 + <!-- 如果是等级会员，且有等级价 -->
  987 + <block wx:if="card_field && sele_g[card_field]>0">
  988 + ￥ {{sele_g[card_field]}}
  989 + </block>
  990 + <block wx:else>
  991 + ￥ {{sele_g.shop_price}}
  992 + </block>
  993 + </view>
  994 + <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
  995 + </view>
903 996
904 - <block wx:if="{{is_normal==0}}">  
905 - <view class="spec-goods-stock">已售：{{prom_act.buy_num}}</view>  
906 - <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>  
907 - <view class="spec-goods-stock">已选：{{sele_g.gg}}</view> 997 + <block wx:if="{{is_normal==1}}">
  998 + <view class="flex">
  999 + <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
  1000 + <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
  1001 + </view>
908 </block> 1002 </block>
909 - <block wx:else>  
910 - <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>  
911 - <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>  
912 - <view class="spec-goods-stock">已选：{{sku_g_pt[0].gg}}</view> 1003 + <block wx:if="{{is_normal==0}}">
  1004 + <view class="flex">
  1005 + <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num}}</view>
  1006 + <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
  1007 + <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
  1008 + </view>
913 </block> 1009 </block>
914 </view> 1010 </view>
  1011 +
  1012 + </view>
  1013 +
  1014 +
  1015 +
  1016 + <view style="clear: both"></view>
  1017 + <view style="margin-top: 20rpx">
  1018 + <view class="flex-space-between address ai_end xc-width ">
  1019 +
  1020 + <view class="flex ai_end" wx:if="{{def_pick_store}}">
  1021 + <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
  1022 + <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
  1023 + 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  1024 +
  1025 + </view>
  1026 + </view>
  1027 +
  1028 + <!-- 没有门店的时候 -->
  1029 + <view class="flex" bindtap="choice_store"wx:else>
  1030 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  1031 + <view class="fs28 xc-ash-9f">选择门店</view>
  1032 + </view>
  1033 +
  1034 + <view class="red-co fs28" bindtap="choice_store" >
  1035 + 更多门店
  1036 + <text class="right-arrow"></text>
  1037 + </view>
  1038 + </view>
  1039 + <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
915 </view> 1040 </view>
916 <!----商品的属性项目----> 1041 <!----商品的属性项目---->
  1042 + <view>
917 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view> 1043 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
918 -  
919 <block wx:if="{{is_normal==0}}"> 1044 <block wx:if="{{is_normal==0}}">
920 <view hidden="{{ismend==1}}" class="flex"> 1045 <view hidden="{{ismend==1}}" class="flex">
921 <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}} 1046 <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
@@ -930,22 +1055,26 @@ @@ -930,22 +1055,26 @@
930 </view> 1055 </view>
931 </block> 1056 </block>
932 <view class="clear"></view> 1057 <view class="clear"></view>
  1058 + </view>
933 1059
934 - <view>  
935 - <view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">  
936 - <view wx:if="{{sto_sele_name==''}}">取货门店  
937 - <text class='small'>（选择门店）</text>  
938 - </view>  
939 - <view wx:else>{{sto_sele_name}}</view>  
940 - <view class="item-img">  
941 - <image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>  
942 - </view>  
943 - </view>  
944 - <view class="b_num" hidden="{{ismend==1}}"> 1060 +
  1061 + <view>
  1062 + <!--<view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">-->
  1063 + <!--<view wx:if="{{sto_sele_name==''}}">取货门店-->
  1064 + <!--<text class='small'>（选择门店）</text>-->
  1065 + <!--</view>-->
  1066 + <!--<view wx:else>{{sto_sele_name}}</view>-->
  1067 + <!--<view class="item-img">-->
  1068 + <!--<image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>-->
  1069 + <!--</view>-->
  1070 + <!--</view>-->
  1071 +
  1072 +
  1073 + <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx">
945 <view>购买数量</view> 1074 <view>购买数量</view>
946 <view class="count"> 1075 <view class="count">
947 <view bindtap="subCartNum" class="sub">-</view> 1076 <view bindtap="subCartNum" class="sub">-</view>
948 - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> 1077 + <input bindblur="inputCartNum xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
949 <view bindtap="addCartNum" class="add">+</view> 1078 <view bindtap="addCartNum" class="add">+</view>
950 </view> 1079 </view>
951 </view> 1080 </view>
@@ -958,7 +1087,7 @@ @@ -958,7 +1087,7 @@
958 </view> 1087 </view>
959 <!-----第一级显示------> 1088 <!-----第一级显示------>
960 <view class="itemlists" hidden="{{is_sec_mend==1}}"> 1089 <view class="itemlists" hidden="{{is_sec_mend==1}}">
961 - <block wx:if="{{is_show_sto_cat}}"> 1090 + <block wx:if="{{is_show_sto_cat>0}}">
962 <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view> 1091 <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view>
963 </block> 1092 </block>
964 <block wx:else> 1093 <block wx:else>
@@ -975,12 +1104,13 @@ @@ -975,12 +1104,13 @@
975 </view> 1104 </view>
976 </view> 1105 </view>
977 </view> 1106 </view>
978 - </view> 1107 + </view>
979 <view class="pt_qd"> 1108 <view class="pt_qd">
980 <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view> 1109 <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
981 </view> 1110 </view>
982 </view> 1111 </view>
983 </view> 1112 </view>
  1113 +<!----弹起来优惠信息------>
984 <view hidden="{{!openPromModal}}"> 1114 <view hidden="{{!openPromModal}}">
985 <view bindtap="closePromModal" class="cover-layer"></view> 1115 <view bindtap="closePromModal" class="cover-layer"></view>
986 <view class="prom-model"> 1116 <view class="prom-model">
@@ -1035,7 +1165,7 @@ @@ -1035,7 +1165,7 @@
1035 <view class="xc-frame"> 1165 <view class="xc-frame">
1036 <view class="top-frame"> 1166 <view class="top-frame">
1037 <view class="xc-coupon-frame "> 1167 <view class="xc-coupon-frame ">
1038 - <!--单张的券--> 1168 + <!---单张的券--->
1039 <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}"> 1169 <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
1040 <view class="coupon flex"> 1170 <view class="coupon flex">
1041 <view class="circle xc-circular-one"></view> 1171 <view class="circle xc-circular-one"></view>
@@ -1070,9 +1200,151 @@ @@ -1070,9 +1200,151 @@
1070 </view> 1200 </view>
1071 </view> 1201 </view>
1072 1202
  1203 +<!-- 选择门店的弹框，1.1版最新的 -->
  1204 +<block wx:if="{{store==1}}">
  1205 + <view class="mongolia-layer" bindtap="close_popup"></view>
  1206 + <view class="popup-frame">
  1207 + <block wx:if="{{sort_store==0}}">
  1208 + <!-- 头部 标题 -->
  1209 + <view class="popup-top flex-space-between">
  1210 + <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
  1211 + <view>
  1212 + <view>
  1213 + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
  1214 + </view>
  1215 + <view class="felx choose_more" bindtap="more_store">
  1216 + <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
  1217 + <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
  1218 + </view>
  1219 + </view>
  1220 + </view>
  1221 + <!-- 门店列表，最外层的门店列表，一开始 -->
  1222 + <view class="store-list">
  1223 + <!--如果还没有点击更多门店的时候 -->
  1224 + <block wx:if="{{choice_sort_store==0}}">
  1225 + <!-- 需要for循环 -->
  1226 + <block wx:if="{{is_show_sto_cat==1}}">
  1227 + <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
  1228 + <view class="store flex-vertical">
  1229 + <!-- 需要点击事件 -->
  1230 + <block wx:if="{{index==fir_pick_index}}">
  1231 + <view class="circle white xc-hook fs20 red-b">Г</view>
  1232 + </block>
  1233 + <block wx:else>
  1234 + <view class="circle xc-hooks"></view>
  1235 + </block>
  1236 + <view class="address-frame xc-ash">
  1237 + <view class="flex-vertical-between butttem5">
  1238 + <view class="flex xc-ash">
  1239 + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
  1240 + </view>
  1241 + <view>
  1242 + <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
  1243 + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
  1244 + </view>
  1245 + </view>
  1246 + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
  1247 + </view>
  1248 + </view>
  1249 + </view>
  1250 + </block>
  1251 + <block wx:else>
  1252 + <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
  1253 + <view class="store flex-vertical">
  1254 + <!-- 需要点击事件 -->
  1255 + <block wx:if="{{index==fir_pick_index}}" >
  1256 + <view class="circle white xc-hook fs20 red-b">Г</view>
  1257 + </block>
  1258 + <block wx:else>
  1259 + <view class="circle xc-hooks"></view>
  1260 + </block>
  1261 +
  1262 + <view class="address-frame xc-ash">
  1263 + <view class="flex-vertical-between ">
  1264 + <view class="flex xc-ash">
  1265 + <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
  1266 + </view>
  1267 + <view>
  1268 + <view class="distance fs24 address-val"
  1269 + wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
  1270 + </view>
  1271 + </view>
  1272 + </view>
  1273 + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
  1274 + </view>
  1275 + </view>
  1276 + </view>
  1277 + </block>
  1278 + </block>
  1279 + <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店 -->
  1280 + <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
  1281 + <view class="store flex-vertical">
  1282 + <!-- 需要点击事件 -->
  1283 + <block wx:if="{{index==sec_pick_index}}">
  1284 + <view class="circle white xc-hook fs20 red-b">Г</view>
  1285 + </block>
  1286 + <block wx:else>
  1287 + <view class="circle xc-hooks"></view>
  1288 + </block>
  1289 +
  1290 + <view class="address-frame xc-ash">
  1291 + <view class="flex-vertical-between ">
  1292 + <view class="flex xc-ash">
  1293 + <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
  1294 + </view>
  1295 + <view>
  1296 + <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
  1297 + </view>
  1298 + </view>
  1299 + <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
  1300 + </view>
  1301 + </view>
  1302 + </view>
  1303 + </block>
  1304 +
  1305 + </view>
  1306 +
  1307 + <!-- 门店列表底部 -->
  1308 + <view class="store-bottom-frame">
  1309 + <view class="store-bottom flex-vertical-between">
  1310 + <view class="determine red-b fs28 white t-c" bindtap="sure_pick"
  1311 + data-openindstore="{{open_ind_store}}">确定</view>
  1312 + <view class="default t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
  1313 + </view>
  1314 + </view>
  1315 +
  1316 + </block>
  1317 +
  1318 +
  1319 + <block wx:else>
  1320 + <view class="popup-top flex-space-between">
  1321 + <text class="fs32 nearby_store">门店分类选择</text>
  1322 + <view>
  1323 + <view>
  1324 + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
  1325 + </view>
  1326 + <view class="felx choose_mores" bindtap="returns">
  1327 + <text class="fs26 red-co">返回</text>
  1328 + </view>
  1329 + </view>
  1330 + </view>
  1331 + <view class="sort_store_list">
  1332 +
  1333 + <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
  1334 + <view class="sort-store flex-vertical-between" >
  1335 + <view class="fs30" di>{{item.name}}</view>
  1336 + <view class="black_rights-frame">
  1337 + <view class="black_rights"></view>
  1338 + </view>
  1339 + </view>
  1340 + </view>
  1341 +
  1342 + </view>
  1343 + </block>
  1344 + </view>
  1345 +</block>
  1346 +
1073 <!-- ---------------分享弹窗--------------- --> 1347 <!-- ---------------分享弹窗--------------- -->
1074 <!--二维码显示页面--> 1348 <!--二维码显示页面-->
1075 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas> 1349 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas>
1076 -  
1077 -  
1078 <warn id="warn"></warn> 1350 <warn id="warn"></warn>
1079 \ No newline at end of file 1351 \ No newline at end of file
pages/goods/goodsInfo/goodsInfo.wxss
  View file @abc988e
@@ -6,7 +6,7 @@ image { @@ -6,7 +6,7 @@ image {
6 .goods-detail{overflow: hidden} 6 .goods-detail{overflow: hidden}
7 7
8 .type-navbar { 8 .type-navbar {
9 - display: flex; 9 + display: flex;
10 justify-content: center; 10 justify-content: center;
11 width: 100%; 11 width: 100%;
12 height: 80rpx; 12 height: 80rpx;
@@ -26,6 +26,9 @@ image { @@ -26,6 +26,9 @@ image {
26 } 26 }
27 .type-navbar-item { 27 .type-navbar-item {
28 border-bottom: 4rpx solid #fff; 28 border-bottom: 4rpx solid #fff;
  29 + display: flex;
  30 + justify-content: center;
  31 + width: 100%;
29 } 32 }
30 .type-item-on { 33 .type-item-on {
31 border-bottom: 4rpx solid #333; 34 border-bottom: 4rpx solid #333;
@@ -282,6 +285,7 @@ image { @@ -282,6 +285,7 @@ image {
282 width: 150rpx; 285 width: 150rpx;
283 height: 150rpx; 286 height: 150rpx;
284 margin-top: 8rpx; 287 margin-top: 8rpx;
  288 + margin-right: 10rpx;
285 } 289 }
286 290
287 .comment-btn { 291 .comment-btn {
@@ -321,6 +325,9 @@ image { @@ -321,6 +325,9 @@ image {
321 height: 100rpx; 325 height: 100rpx;
322 background-color: #fff; 326 background-color: #fff;
323 text-align: center; 327 text-align: center;
  328 + z-index: 9;
  329 + border-top: 4rpx solid #eee;
  330 +
324 } 331 }
325 332
326 .join-cart>view { 333 .join-cart>view {
@@ -355,7 +362,7 @@ image { @@ -355,7 +362,7 @@ image {
355 .cart-num { 362 .cart-num {
356 position: absolute; 363 position: absolute;
357 left: 50%; 364 left: 50%;
358 - top: 0; 365 + top: 1rpx;
359 width: 40rpx; 366 width: 40rpx;
360 height: 40rpx; 367 height: 40rpx;
361 line-height: 40rpx; 368 line-height: 40rpx;
@@ -368,11 +375,19 @@ image { @@ -368,11 +375,19 @@ image {
368 .cart-btn { 375 .cart-btn {
369 font-size: 28rpx; 376 font-size: 28rpx;
370 color: #fff; 377 color: #fff;
371 - line-height: 100rpx; 378 + line-height: 70rpx;
  379 + margin-top: 16rpx;
  380 +
  381 +
372 } 382 }
373 383
374 .join-btn { 384 .join-btn {
375 background-color: #ffb03f; 385 background-color: #ffb03f;
  386 + height: 70rpx;
  387 +border-radius: 55rpx 0rpx 0rpx 55rpx;
  388 +margin-top: 16rpx;
  389 +
  390 +
376 } 391 }
377 392
378 view.cart-btn-lg { 393 view.cart-btn-lg {
@@ -381,6 +396,9 @@ view.cart-btn-lg { @@ -381,6 +396,9 @@ view.cart-btn-lg {
381 396
382 .buy-btn { 397 .buy-btn {
383 background-color: #f23030; 398 background-color: #f23030;
  399 + height: 70rpx;
  400 +border-radius: 0 56rpx 55rpx 0;
  401 +
384 } 402 }
385 403
386 .toTop { 404 .toTop {
@@ -505,24 +523,23 @@ view.cart-btn-lg { @@ -505,24 +523,23 @@ view.cart-btn-lg {
505 /* padding: 0 30rpx; */ 523 /* padding: 0 30rpx; */
506 font-size: 32rpx; 524 font-size: 32rpx;
507 box-sizing: border-box; 525 box-sizing: border-box;
508 - 526 + border-radius: 20rpx;
  527 + height: 72%;
509 } 528 }
510 529
511 .spec-model .pding{padding: 0 30rpx;} 530 .spec-model .pding{padding: 0 30rpx;}
512 531
513 .spec-goods { 532 .spec-goods {
514 - padding: 15rpx 0 10rpx; 533 + padding: 30rpx 0 20rpx;
515 float: left; 534 float: left;
516 width: 100%; 535 width: 100%;
517 - border-bottom: 1px solid #f8f8f8; 536 + border-bottom:2rpx solid #eee;
518 } 537 }
519 538
520 .spec-img { 539 .spec-img {
521 float: left; 540 float: left;
522 height: 186rpx; 541 height: 186rpx;
523 width: 186rpx; 542 width: 186rpx;
524 - position: relative;  
525 - top:-40rpx;  
526 border: 4rpx solid #eee 543 border: 4rpx solid #eee
527 } 544 }
528 545
@@ -542,7 +559,7 @@ view.cart-btn-lg { @@ -542,7 +559,7 @@ view.cart-btn-lg {
542 } 559 }
543 560
544 .spec-goods-price { 561 .spec-goods-price {
545 - color: #ec5151; 562 + color: #d60021;
546 font-size: 33rpx; 563 font-size: 33rpx;
547 font-weight: bold; 564 font-weight: bold;
548 } 565 }
@@ -551,6 +568,7 @@ view.cart-btn-lg { @@ -551,6 +568,7 @@ view.cart-btn-lg {
551 margin-top: 3rpx; 568 margin-top: 3rpx;
552 font-size: 24rpx; 569 font-size: 24rpx;
553 color: #999999; 570 color: #999999;
  571 + margin-right: 15rpx;
554 } 572 }
555 573
556 .spec-name { 574 .spec-name {
@@ -568,7 +586,7 @@ view.cart-btn-lg { @@ -568,7 +586,7 @@ view.cart-btn-lg {
568 position: fixed; 586 position: fixed;
569 display: flex; 587 display: flex;
570 height: 50rpx; 588 height: 50rpx;
571 - border: 1rpx solid #f8f8f8; 589 + border: 1rpx solid #000;
572 font-size: 28rpx; 590 font-size: 28rpx;
573 right: 30rpx; 591 right: 30rpx;
574 } 592 }
@@ -581,15 +599,15 @@ view.cart-btn-lg { @@ -581,15 +599,15 @@ view.cart-btn-lg {
581 text-align: center; 599 text-align: center;
582 } 600 }
583 .spec_bt{ 601 .spec_bt{
584 - background: fff;color: #333; margin-left: 10rpx;padding: 8rpx 12rpx; border-radius: 5px;font-size: 24rpx;border: 1rpx solid #ccc; 602 + background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc;
585 } 603 }
586 -.spec_bt.act{background: #C4182E;color: #fff;border: 1rpx solid #C4182E;} 604 +.spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
587 .sub { 605 .sub {
588 - border-right: 1px solid #ddd; 606 + border-right: 1px solid #000;
589 } 607 }
590 608
591 .add { 609 .add {
592 - border-left: 1px solid #ddd; 610 + border-left: 1px solid #000;
593 } 611 }
594 612
595 .spec-btn { 613 .spec-btn {
@@ -611,22 +629,24 @@ view.cart-btn-lg { @@ -611,22 +629,24 @@ view.cart-btn-lg {
611 } 629 }
612 630
613 .spec-cart-btns { 631 .spec-cart-btns {
614 - /* background-color: #f8f8f8;  
615 - margin: 40rpx -30rpx 0;  
616 - padding: 20rpx 34rpx; */  
617 - float: left;  
618 - width: 100%;  
619 - line-height: 80rpx;  
620 - margin-top: 40rpx; 632 + width: 92%;
  633 + line-height: 70rpx;
  634 + margin: 0rpx auto;
  635 + margin-top: 160rpx;
  636 + border-radius: 20rpx;
  637 +position: fixed;
  638 +bottom: 50rpx;
  639 +left: 4%;
  640 +
621 } 641 }
622 642
623 .spec-cart-btn { 643 .spec-cart-btn {
624 - float: left;  
625 - width: 100%; 644 +
  645 + width:100%;
626 font-size: 30rpx; 646 font-size: 30rpx;
627 text-align: center; 647 text-align: center;
628 color: white; 648 color: white;
629 - border-radius: 4rpx; 649 + border-radius: 40rpx;
630 } 650 }
631 651
632 .spec-add-cart { 652 .spec-add-cart {
@@ -718,7 +738,8 @@ left:31rpx;} @@ -718,7 +738,8 @@ left:31rpx;}
718 738
719 .pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;} 739 .pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;}
720 .pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;} 740 .pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;}
721 -.pding{padding-top: 20rpx;padding-left: 20rpx; padding-right: 20rpx;font-size: 26rpx;color: #ea120f} 741 +.pding{padding-top: 20rpx;padding-left: 20rpx;height: 81%;
  742 + padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
722 .pdres{margin-left: 10rpx;color: #8f8f94} 743 .pdres{margin-left: 10rpx;color: #8f8f94}
723 .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden } 744 .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden }
724 .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx} 745 .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx}
@@ -741,7 +762,7 @@ left:31rpx;} @@ -741,7 +762,7 @@ left:31rpx;}
741 .wf .item .item_txy.hs{ background: #cbcbcb;} 762 .wf .item .item_txy.hs{ background: #cbcbcb;}
742 .po{margin-bottom: 20rpx;} 763 .po{margin-bottom: 20rpx;}
743 764
744 -.cart-btn.line-h{ line-height: 40rpx;} 765 +.cart-btn.line-h{ line-height: 26rpx;}
745 .cart-btn .fir-v{ margin-top: 10rpx;} 766 .cart-btn .fir-v{ margin-top: 10rpx;}
746 767
747 .hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;} 768 .hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;}
@@ -777,7 +798,7 @@ left:31rpx;} @@ -777,7 +798,7 @@ left:31rpx;}
777 .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;} 798 .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;}
778 799
779 .pt_qd{margin-top: 40rpx; height: auto;} 800 .pt_qd{margin-top: 40rpx; height: auto;}
780 -.spec-cart-btn.w100{width: 100%; margin-left: 0; height: 80rpx; line-height: 80rpx;} 801 +.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
781 802
782 .sto_v{color: #333;} 803 .sto_v{color: #333;}
783 .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} 804 .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
@@ -927,14 +948,13 @@ left:31rpx;} @@ -927,14 +948,13 @@ left:31rpx;}
927 border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx } 948 border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx }
928 949
929 .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; 950 .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333;
930 - font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:31rpx } 951 + font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx }
931 .red_bb{ color: #d70026; min-width:158rpx;width: auto;} 952 .red_bb{ color: #d70026; min-width:158rpx;width: auto;}
932 .bg_jj{ width: 18rpx; height:18rpx; 953 .bg_jj{ width: 18rpx; height:18rpx;
933 border-top: 2rpx solid #d70026; 954 border-top: 2rpx solid #d70026;
934 border-right: 2rpx solid #d70026; 955 border-right: 2rpx solid #d70026;
935 transform: rotate(45deg);display:inline-block; 956 transform: rotate(45deg);display:inline-block;
936 margin-bottom:3rpx; 957 margin-bottom:3rpx;
937 -  
938 } 958 }
939 /* 顶部边框 */ 959 /* 顶部边框 */
940 .topframe{ 960 .topframe{
@@ -952,7 +972,7 @@ left:31rpx;} @@ -952,7 +972,7 @@ left:31rpx;}
952 margin-bottom: 36rpx; 972 margin-bottom: 36rpx;
953 color: #7d7d7d; 973 color: #7d7d7d;
954 padding-left: 20rpx; 974 padding-left: 20rpx;
955 - font-size: 28rpx; 975 + font-size: 32rpx;
956 } 976 }
957 /*评价人数量*/ 977 /*评价人数量*/
958 .topframe .topframe-top .topframe-top-val{ 978 .topframe .topframe-top .topframe-top-val{
@@ -980,7 +1000,7 @@ left:31rpx;} @@ -980,7 +1000,7 @@ left:31rpx;}
980 1000
981 .buttem-list .item{ 1001 .buttem-list .item{
982 min-width: 17%; 1002 min-width: 17%;
983 - font-size: 23rpx; 1003 + font-size: 24rpx;
984 border-radius: 20rpx; 1004 border-radius: 20rpx;
985 background:#ffe3e2; 1005 background:#ffe3e2;
986 height:38rpx; 1006 height:38rpx;
@@ -996,16 +1016,11 @@ left:31rpx;} @@ -996,16 +1016,11 @@ left:31rpx;}
996 1016
997 /* 用户评价 */ 1017 /* 用户评价 */
998 .middle{ 1018 .middle{
999 -  
1000 width: 95%; 1019 width: 95%;
1001 - height:auto;  
1002 -  
1003 margin:0 auto; 1020 margin:0 auto;
1004 -  
1005 -  
1006 } 1021 }
1007 .middle-img-frame{ 1022 .middle-img-frame{
1008 - height:65rp; 1023 + height:65rpx;
1009 display: flex; 1024 display: flex;
1010 margin-top: 32rpx; 1025 margin-top: 32rpx;
1011 1026
@@ -1035,11 +1050,13 @@ left:31rpx;} @@ -1035,11 +1050,13 @@ left:31rpx;}
1035 text-align: center; 1050 text-align: center;
1036 margin-bottom:20rpx; 1051 margin-bottom:20rpx;
1037 margin-left:5rpx; 1052 margin-left:5rpx;
1038 - 1053 +}
  1054 +.xc-pirces{
  1055 + margin-top: 14rpx;
1039 } 1056 }
1040 /* 评价文字 */ 1057 /* 评价文字 */
1041 .middle-font{ 1058 .middle-font{
1042 - font-size: 24rpx; 1059 + font-size: 30rpx;
1043 1060
1044 } 1061 }
1045 .iddle-goods-img{ 1062 .iddle-goods-img{
@@ -1065,11 +1082,12 @@ left:31rpx;} @@ -1065,11 +1082,12 @@ left:31rpx;}
1065 height: 45rpx; 1082 height: 45rpx;
1066 display:flex; 1083 display:flex;
1067 line-height: 45rpx; 1084 line-height: 45rpx;
  1085 + margin-top: 20rpx;
1068 margin-bottom: 14rpx; 1086 margin-bottom: 14rpx;
1069 justify-content : space-between; 1087 justify-content : space-between;
1070 } 1088 }
1071 .parameter-font{ 1089 .parameter-font{
1072 - font-size: 24rpx; 1090 + font-size: 26rpx;
1073 1091
1074 } 1092 }
1075 /* 规格 */ 1093 /* 规格 */
@@ -1091,13 +1109,13 @@ left:31rpx;} @@ -1091,13 +1109,13 @@ left:31rpx;}
1091 } 1109 }
1092 /* 点赞图片 */ 1110 /* 点赞图片 */
1093 .parameter-img{ 1111 .parameter-img{
1094 - width: 25rpx;  
1095 - height: 25rpx; 1112 + width: 27rpx;
  1113 + height: 27rpx;
1096 margin-top: 3rpx; 1114 margin-top: 3rpx;
1097 } 1115 }
1098 .parameter-val{ 1116 .parameter-val{
1099 margin-left:25rpx; 1117 margin-left:25rpx;
1100 - font-size: 24rpx; 1118 + font-size: 26rpx;
1101 color: #999; 1119 color: #999;
1102 } 1120 }
1103 /* 回复 */ 1121 /* 回复 */
@@ -1170,7 +1188,7 @@ left:31rpx;} @@ -1170,7 +1188,7 @@ left:31rpx;}
1170 width: 524rpx; 1188 width: 524rpx;
1171 margin-left: 34rpx; 1189 margin-left: 34rpx;
1172 border-radius: 25rpx; 1190 border-radius: 25rpx;
1173 - border: 1rpx solid #d6d4d5; 1191 + border: 2rpx solid #d6d4d5;
1174 overflow: hidden; 1192 overflow: hidden;
1175 } 1193 }
1176 1194
@@ -1197,19 +1215,20 @@ left:31rpx;} @@ -1197,19 +1215,20 @@ left:31rpx;}
1197 margin-right: 5rpx 1215 margin-right: 5rpx
1198 } 1216 }
1199 .xc_comment-font{ 1217 .xc_comment-font{
1200 - height: 85rpx; 1218 + height: 75rpx;
1201 margin-left: 22rpx; 1219 margin-left: 22rpx;
1202 white-space:normal; 1220 white-space:normal;
1203 overflow: hidden; 1221 overflow: hidden;
1204 margin-top: 8rpx; 1222 margin-top: 8rpx;
  1223 +
1205 } 1224 }
1206 .xc_comment-val{ 1225 .xc_comment-val{
1207 width: 88%; 1226 width: 88%;
1208 height: 30rpx; 1227 height: 30rpx;
1209 margin-left: 22rpx; 1228 margin-left: 22rpx;
1210 display: flex; 1229 display: flex;
1211 - margin-top: 28rpx;  
1212 - margin-bottom:8rpx; 1230 + margin-top: 15rpx;
  1231 + margin-bottom:15rpx;
1213 } 1232 }
1214 1233
1215 .xc_comment-time{ 1234 .xc_comment-time{
@@ -1266,7 +1285,7 @@ left:31rpx;} @@ -1266,7 +1285,7 @@ left:31rpx;}
1266 height: 100%; 1285 height: 100%;
1267 line-height: 100rpx; 1286 line-height: 100rpx;
1268 overflow: hidden; 1287 overflow: hidden;
1269 - margin-left: 7rpx; 1288 + margin-left: 10rpx;
1270 } 1289 }
1271 .xc-coupon-fram{ 1290 .xc-coupon-fram{
1272 position: relative; 1291 position: relative;
@@ -1306,7 +1325,7 @@ left:31rpx;} @@ -1306,7 +1325,7 @@ left:31rpx;}
1306 padding-left:15rpx; 1325 padding-left:15rpx;
1307 color: #d70025; 1326 color: #d70025;
1308 position: absolute; 1327 position: absolute;
1309 - right: 7rpx; 1328 + right: 5rpx;
1310 } 1329 }
1311 1330
1312 /* 自定义弹出窗口 */ 1331 /* 自定义弹出窗口 */
@@ -2221,9 +2240,247 @@ right:17rpx; top:55rpx; @@ -2221,9 +2240,247 @@ right:17rpx; top:55rpx;
2221 .pd_top1{padding-top: 10rpx} 2240 .pd_top1{padding-top: 10rpx}
2222 .s_ms_bth{margin-top: 85rpx} 2241 .s_ms_bth{margin-top: 85rpx}
2223 2242
2224 -.xc-pirces{  
2225 - height:40rpx;  
2226 - line-height:15rpx; 2243 +
  2244 +.no_pj_list{text-align: center; width: 100%; color: #999; margin: 30rpx 0; display: inline-block; font-size: 28rpx}
  2245 +/* 门店地址 */
  2246 +.xc-address_frame{
  2247 + border-top:1rpx solid #eee;
  2248 + width: 100%;
  2249 + height: auto;
  2250 +}
  2251 +.on_height{
  2252 +height: 90rpx;
  2253 +}
  2254 +.sn_height{
  2255 + height: 170rpx;
  2256 +}
  2257 +.xc-address_frame .address_frame{
  2258 + width: 92%;
  2259 +padding-left: 10rpx;
  2260 +margin: auto;
  2261 +
  2262 +}
  2263 +.shop_name{
  2264 +
  2265 +}
  2266 +.stores-img{
  2267 +width: 40rpx;
  2268 + height: 35rpx;
  2269 + margin-right: 10rpx;
  2270 +}
  2271 +.shop_name{
  2272 + margin-right: 10rpx;
  2273 +}
  2274 +.address{
  2275 + width: 87%;
  2276 + margin-top: 5rpx;
  2277 + margin-bottom: 5rpx;
  2278 +}
  2279 +.distance{
  2280 + padding-left: 15rpx;
  2281 + padding-right: 15rpx;
  2282 + background: #eee;
  2283 + border-radius: 20rpx;
  2284 + margin-right: 5rpx;
  2285 + color: #999;
  2286 + height: 38rpx;
  2287 +line-height: 38rpx;
  2288 +
  2289 +}
  2290 +/* 选择门店的弹窗 */
  2291 +.mongolia-layer{
  2292 + position: fixed;
  2293 +left: 0;
  2294 +top: 0;
  2295 +right: 0;
  2296 +bottom: 0;
  2297 +z-index: 11;
  2298 +background: rgba(0,0,0,0.4);
  2299 +width: 100%;
  2300 +height: 91.9%;
  2301 +
  2302 +}
  2303 +.popup-frame{
  2304 + position: fixed;
  2305 +bottom:99rpx;
  2306 +z-index: 20;
  2307 +background: white;
  2308 +width: 100%;
  2309 +border-radius: 20rpx 20rpx 0 0;
  2310 +height: 72%;
  2311 +}
  2312 +.popup-top{
  2313 + border-bottom: 1rpx solid #eee;
  2314 + height: 155rpx;
  2315 + width: 95%;
  2316 + margin: auto;
  2317 + line-height: 155rpx;
  2318 +
  2319 +}
  2320 +.bg_rights{
  2321 + border-top: 2rpx solid ;
  2322 + border-right: 2rpx solid ;
  2323 + transform: rotate(45deg);
  2324 + display:inline-block;
  2325 + width:15rpx;height:15rpx;
  2326 + border-color:#da0b31;
  2327 +}
  2328 +.modal-closes {
  2329 + position: absolute;
  2330 + right: 30rpx;
  2331 + top: -15rpx;
  2332 + height: 25rpx;
  2333 +
  2334 +}
  2335 +.choose_more{
  2336 + margin-top: 40rpx;
  2337 + margin-right: 20rpx;
  2338 +
  2339 +}
  2340 +.choose_mores{
  2341 + margin-top: 30rpx;
  2342 + margin-right: 15rpx;
  2343 +
  2344 +}
  2345 +.store-list{
  2346 + width: 95%;
  2347 + height: 72%;
  2348 + overflow-y: scroll;
  2349 + margin: auto;
  2350 +}
  2351 +.store-list .store_choose{
  2352 + width: 100%;
  2353 + height: 120rpx;
  2354 + line-height: 125rpx;
  2355 + border-bottom: 1rpx solid #eee;
  2356 +
  2357 +}
  2358 +.store-list .store_choose .store{
  2359 +width: 100%;
  2360 +margin: auto;
  2361 +line-height: 37rpx;
  2362 +padding-left: 20rpx;
  2363 +
  2364 +}
  2365 +.xc-hook{
  2366 + width: 35rpx;
  2367 + height: 35rpx;
  2368 + transform: rotate(-145deg);
  2369 +line-height: 37rpx;
  2370 +text-align: center;
  2371 +}
  2372 + .xc-hooks{
  2373 + width: 30rpx;
  2374 + height: 30rpx;
  2375 + border: 1rpx solid #999;
  2376 + }
  2377 + .address-frame{
  2378 + width: 93%;
  2379 +margin-left: 7rpx;
  2380 +
  2381 + }
  2382 + .nearby_store{
  2383 +margin-left: 17rpx;
  2384 + }
  2385 + .address_name{
  2386 + margin-right: 10rpx;
  2387 +
  2388 + }
  2389 + .address-val{
  2390 + height: 38rpx;
  2391 +line-height: 38rpx;
  2392 +
  2393 + }
  2394 + .store-bottom{
  2395 + width: 85%;
  2396 + margin: auto;
  2397 + height: 70rpx;
  2398 + }
  2399 + .determine{
  2400 + width: 260rpx;
  2401 + height: 55rpx;
  2402 + border-radius: 50rpx;
  2403 + line-height: 55rpx;
  2404 + }
  2405 + .default{
  2406 + width: 260rpx;
  2407 + height: 55rpx;
  2408 + border:3rpx solid #c8c8c8;
  2409 + border-radius: 50rpx;
  2410 + line-height: 55rpx;
  2411 + }
  2412 + .store-bottom-frame{
  2413 + width: 95%;
  2414 + margin: auto;
  2415 +
  2416 + }
  2417 + /* 门店分类列表 */
  2418 +.sort_store_list{
  2419 + height: 82%;
  2420 + overflow: hidden;
  2421 + overflow-y: scroll;
  2422 + width: 95%;
  2423 + margin: auto;
  2424 +}
  2425 +.sort_store_list .sort-store-frame{
  2426 + width: 100%;
  2427 +height: 100rpx;
  2428 +line-height:100rpx;
  2429 +border-bottom: 1rpx solid #eee;
  2430 +
  2431 +}
  2432 +.sort_store_list .sort-store-frame .sort-store{
  2433 + width: 94.5%;
  2434 + margin: auto;
  2435 +}
  2436 +.black_rights-frame{
  2437 +width: 50%；
  2438 +}
  2439 +.black_rights-frame .black_rights{
  2440 + border-top: 3rpx solid;
  2441 +border-right: 3rpx solid;
  2442 +transform: rotate(45deg);
  2443 +display: inline-block;
  2444 +width: 20rpx;
  2445 +height: 20rpx;
  2446 +}
  2447 +.xc-val-money{
  2448 + height:80rpx;
  2449 +}
  2450 +
  2451 +.xc-distance-bottom{
  2452 + margin-bottom: 40rpx;
  2453 +}
  2454 +.xc-distance-top{
  2455 +margin-top: 10rpx;
  2456 +}
  2457 +.xc-width{
  2458 + width: 100%;
  2459 +}
  2460 +.right-arrow{ width: 15rpx; height:15rpx;
  2461 + border-top: 2rpx solid #d70026;
  2462 + border-right: 2rpx solid #d70026;
  2463 + transform: rotate(45deg);display:inline-block;
  2464 + margin-bottom:3rpx;
  2465 +}
  2466 +.xc-goods-attribute{
  2467 + border-bottom: 1px solid #eee;
  2468 +padding-bottom: 15px;
  2469 +margin-bottom:40rpx;
  2470 +}
  2471 +.xc-val-fream{
  2472 + width: 105rpx;
  2473 +}
  2474 +.is_stock{
  2475 +width: 58%;
  2476 +height: 70rpx;
  2477 +border-radius: 55rpx;
  2478 +}
  2479 +.select_store_height{
  2480 + height: 50rpx;
  2481 +}
  2482 +.butttem5{
  2483 + margin-bottom: 5rpx;
2227 } 2484 }
2228 2485
2229 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx} 2486 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
@@ -2233,8 +2490,7 @@ right:17rpx; top:55rpx; @@ -2233,8 +2490,7 @@ right:17rpx; top:55rpx;
2233 width: 58%; background-color: #adadad; 2490 width: 58%; background-color: #adadad;
2234 } 2491 }
2235 2492
2236 -  
2237 - 2493 +.s_btn{ margin-top: 25rpx; }
2238 /* 美妆价的样式 */ 2494 /* 美妆价的样式 */
2239 .beauty-makeup-frame{ 2495 .beauty-makeup-frame{
2240 width: 101.5%; 2496 width: 101.5%;
@@ -2266,14 +2522,14 @@ right:17rpx; top:55rpx; @@ -2266,14 +2522,14 @@ right:17rpx; top:55rpx;
2266 border-radius: 0rpx 20rpx 20rpx 0rpx; 2522 border-radius: 0rpx 20rpx 20rpx 0rpx;
2267 } 2523 }
2268 .grade-card-frame{ 2524 .grade-card-frame{
2269 - width: 26%; 2525 +
2270 height:45rpx ; 2526 height:45rpx ;
2271 background: #3c300a; 2527 background: #3c300a;
2272 border-radius: 20rpx; 2528 border-radius: 20rpx;
2273 margin-top: 10px; 2529 margin-top: 10px;
2274 margin-left: 7rpx; 2530 margin-left: 7rpx;
2275 justify-content: center; 2531 justify-content: center;
2276 - padding: 0 10rpx; 2532 + padding: 0 15rpx;
2277 } 2533 }
2278 .grade-card-frame .img{ 2534 .grade-card-frame .img{
2279 width: 24rpx; 2535 width: 24rpx;
@@ -2283,6 +2539,9 @@ right:17rpx; top:55rpx; @@ -2283,6 +2539,9 @@ right:17rpx; top:55rpx;
2283 } 2539 }
2284 .grade-card-frame .card-name{ 2540 .grade-card-frame .card-name{
2285 margin-left: 5rpx; 2541 margin-left: 5rpx;
  2542 + max-width: 120rpx;
  2543 + margin-right: 6px;
  2544 +
2286 } 2545 }
2287 .card-effect{ 2546 .card-effect{
2288 margin-left: 15rpx; 2547 margin-left: 15rpx;
pages/goods/goodsList/goodsList.wxml
  View file @abc988e
@@ -47,7 +47,8 @@ @@ -47,7 +47,8 @@
47 <block wx:if="{{item[card_field]>0}}"> 47 <block wx:if="{{item[card_field]>0}}">
48 <view class="flex ai-center"> 48 <view class="flex ai-center">
49 <view class="price">￥{{item[card_field]}}</view> 49 <view class="price">￥{{item[card_field]}}</view>
50 - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{card_name}}</view> 50 + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  51 + <view class="card_name">{{card_name}}</view></view>
51 </view> 52 </view>
52 <view class="comment flex jc_sb"> 53 <view class="comment flex jc_sb">
53 <view class="word-line xc-ash">￥{{item.market_price}}</view> 54 <view class="word-line xc-ash">￥{{item.market_price}}</view>
pages/goods/goodsList/goodsList.wxss
  View file @abc988e
@@ -156,8 +156,17 @@ @@ -156,8 +156,17 @@
156 width: 300rpx; 156 width: 300rpx;
157 } 157 }
158 158
159 -.card_bg {display: flex; width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;  
160 -background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx;} 159 +.card_bg {display: flex; max-width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;
  160 +background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx;
  161 +padding: 2rpx 10rpx;width: auto;
  162 +
  163 +}
  164 +.card_bg .card_name{
  165 + max-width: 76rpx;
  166 + width: auto;
  167 + overflow: hidden;
  168 + white-space:nowrap;
  169 +}
161 .card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} 170 .card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle}
162 .mk_price{margin-left: 10rpx; font-size: 25rpx;} 171 .mk_price{margin-left: 10rpx; font-size: 25rpx;}
163 .item-cont{ line-height: 38rpx} 172 .item-cont{ line-height: 38rpx}
164 \ No newline at end of file 173 \ No newline at end of file
pages/goods/search/search.wxml
  View file @abc988e
@@ -43,7 +43,9 @@ @@ -43,7 +43,9 @@
43 <block wx:if="{{item[card_field]>0}}"> 43 <block wx:if="{{item[card_field]>0}}">
44 <view class="flex ai-center"> 44 <view class="flex ai-center">
45 <view class="price">￥{{item[card_field]}}</view> 45 <view class="price">￥{{item[card_field]}}</view>
46 - <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{card_name}}</view> 46 + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  47 + <view class="card_name">{{card_name}}</view>
  48 + </view>
47 </view> 49 </view>
48 <view class="comment flex jc_sb"> 50 <view class="comment flex jc_sb">
49 <view class="word-line xc-ash">￥{{item.market_price}}</view> 51 <view class="word-line xc-ash">￥{{item.market_price}}</view>
pages/goods/search/search.wxss
  View file @abc988e
@@ -227,8 +227,14 @@ @@ -227,8 +227,14 @@
227 margin-left: 15rpx; 227 margin-left: 15rpx;
228 } 228 }
229 229
230 -.card_bg {display: flex; width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;  
231 -background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx;}  
232 -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} 230 +.card_bg {display: flex; max-width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;padding: 2rpx 10rpx;
  231 +background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx; width: auto}
  232 +.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle}
  233 +.card_bg .card_name{
  234 + max-width: 76rpx;
  235 + width: auto;
  236 + overflow: hidden;
  237 + white-space:nowrap;
  238 +}
233 .mk_price{margin-left: 10rpx; font-size: 25rpx;} 239 .mk_price{margin-left: 10rpx; font-size: 25rpx;}
234 .item-cont{ line-height: 38rpx} 240 .item-cont{ line-height: 38rpx}
pages/user/cardinfo/cardinfo.js
  View file @abc988e
@@ -40,18 +40,22 @@ Page({ @@ -40,18 +40,22 @@ Page({
40 user_card: null,//会员买的卡 40 user_card: null,//会员买的卡
41 free:null,//分佣的数据 41 free:null,//分佣的数据
42 expiryDate:"",//卡到期时间 42 expiryDate:"",//卡到期时间
43 - is_guoqi:0, //卡是不是过期 43 + is_guoqi:0, //卡是不是过期
44 44
45 - yu_e_show:0,//装入余额的弹窗 45 + yu_e_show:0,//装入余额的弹窗
46 }, 46 },
47 47
48 -  
49 -  
50 -  
51 /** 48 /**
52 * 生命周期函数--监听页面加载 49 * 生命周期函数--监听页面加载
53 */ 50 */
54 onLoad: function (options) { 51 onLoad: function (options) {
  52 + //--先判断会员状态--
  53 + var user_info = getApp().globalData.userInfo;
  54 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  55 + wx.navigateTo({ url: '/pages/getphone/getphone' })
  56 + return false;
  57 + }
  58 +
55 var that = this,ee=this; 59 var that = this,ee=this;
56 var th=this; 60 var th=this;
57 //-----------等级卡说明------------------- 61 //-----------等级卡说明-------------------
@@ -709,7 +713,7 @@ Page({ @@ -709,7 +713,7 @@ Page({
709 //-----立即续费的功能------ 713 //-----立即续费的功能------
710 xufei:async function(){ 714 xufei:async function(){
711 var th = this,is_card = 0,end_time=0; 715 var th = this,is_card = 0,end_time=0;
712 - await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=1&type=3", 716 + await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id="+os.stoid+"&type=3",
713 {1:1}).then(res => { 717 {1:1}).then(res => {
714 if (res.data.code == 0) { 718 if (res.data.code == 0) {
715 end_time=res.data.data.pageData[0].end_time; 719 end_time=res.data.data.pageData[0].end_time;
pages/user/collect_list/collect_list.js
  View file @abc988e
@@ -50,7 +50,7 @@ Page({ @@ -50,7 +50,7 @@ Page({
50 }) 50 })
51 var goods_list = th.selectComponent("#goods_recommend"); //组件的id 51 var goods_list = th.selectComponent("#goods_recommend"); //组件的id
52 goods_list.init(); 52 goods_list.init();
53 - setTimeOut(function () { goods_list.get_list(); }, 300) 53 + setTimeout(function () { goods_list.get_list(); }, 300)
54 } 54 }
55 }); 55 });
56 }, 56 },
pages/user/collect_list/collect_list.wxml
  View file @abc988e
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio> 27 <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
28 </view> 28 </view>
29 <!-- 商品图片 --> 29 <!-- 商品图片 -->
30 - <view class="flex"> 30 + <view class="flex" style="width:96%">
31 <view class="{{editEd?'collect_image iconrp':'collect_image'}}"> 31 <view class="{{editEd?'collect_image iconrp':'collect_image'}}">
32 <image src="{{item.original_img}}" binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image> 32 <image src="{{item.original_img}}" binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
33 </view> 33 </view>
pages/user/collect_list/collect_list.wxss
  View file @abc988e
@@ -193,6 +193,8 @@ page { @@ -193,6 +193,8 @@ page {
193 line-height: 68rpx; 193 line-height: 68rpx;
194 height: 183rpx; 194 height: 183rpx;
195 margin-left: 21rpx; 195 margin-left: 21rpx;
  196 + width: 70%;
  197 +
196 } 198 }
197 199
198 .commodity .collects_max .collect .attribute .attribute_name { 200 .commodity .collects_max .collect .attribute .attribute_name {
pages/user/comment/comment.js
  View file @abc988e
@@ -91,8 +91,10 @@ Page({ @@ -91,8 +91,10 @@ Page({
91 91
92 if(!com_data) com_data=rs_data; 92 if(!com_data) com_data=rs_data;
93 else com_data= com_data.concat(rs_data); 93 else com_data= com_data.concat(rs_data);
94 - th.setData({ comments: com_data, isloaded: 1, }) 94 + th.setData({ comments: com_data })
95 } 95 }
  96 +
  97 + th.setData({isloaded: 1,})
96 }, 98 },
97 99
98 onReachBottom: function() { 100 onReachBottom: function() {
pages/user/index/index.js
  View file @abc988e
@@ -38,8 +38,14 @@ Page({ @@ -38,8 +38,14 @@ Page({
38 * 生命周期函数--监听页面加载 38 * 生命周期函数--监听页面加载
39 */ 39 */
40 onLoad: function (options) { 40 onLoad: function (options) {
41 - 41 + //--先判断会员状态--
  42 + var user_info = getApp().globalData.userInfo;
  43 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  44 + wx.navigateTo({ url: '/pages/getphone/getphone'})
  45 + return false;
  46 + }
42 }, 47 },
  48 +
43 /** 49 /**
44 * 生命周期函数--监听页面显示 50 * 生命周期函数--监听页面显示
45 */ 51 */
@@ -140,7 +146,6 @@ Page({ @@ -140,7 +146,6 @@ Page({
140 } 146 }
141 }) 147 })
142 148
143 -  
144 //--会员权益中心页的修改-- 149 //--会员权益中心页的修改--
145 for(var i in backClass){ 150 for(var i in backClass){
146 var im=backClass[i]; 151 var im=backClass[i];
pages/user/order_list/order_list.wxml
  View file @abc988e
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
24 <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> 24 <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
25 <view wx:if="{{(item.order_status==2)}}">待评价</view> 25 <view wx:if="{{(item.order_status==2)}}">待评价</view>
26 <view wx:if="{{item.order_status==4}}">已评价</view> 26 <view wx:if="{{item.order_status==4}}">已评价</view>
27 - <view wx:if="{{item.order_status==3}}">已取消</view> 27 + <view wx:if="{{item.order_status==3 && item.pt_status!=6}}">已取消</view>
28 <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view> 28 <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
29 <view wx:if="{{item.order_status==6}}">退款成功</view> 29 <view wx:if="{{item.order_status==6}}">退款成功</view>
30 - <view wx:if="{{item.pt_status==6}}">支付尾款失败</view> 30 + <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
31 </block> 31 </block>
32 <block wx:else>退款中</block> 32 <block wx:else>退款中</block>
33 <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}"> 33 <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
pages/user/plus/plus.js
  View file @abc988e
@@ -58,7 +58,7 @@ Page({ @@ -58,7 +58,7 @@ Page({
58 } 58 }
59 }) 59 })
60 var fir_leader = options.scene; 60 var fir_leader = options.scene;
61 - that.setData({fir_leader:fir_leader}) 61 + if (fir_leader) that.setData({fir_leader:fir_leader})
62 //--先判断会员状态-- 62 //--先判断会员状态--
63 var user_info = getApp().globalData.userInfo; 63 var user_info = getApp().globalData.userInfo;
64 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { 64 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
@@ -199,9 +199,12 @@ Page({ @@ -199,9 +199,12 @@ Page({
199 th.setData({ 199 th.setData({
200 is_plusCard: plusCard, is_show: 1 200 is_plusCard: plusCard, is_show: 1
201 }) 201 })
202 - var goods_list = th.selectComponent("#goods_list"); //组件的id  
203 - goods_list.init();  
204 - goods_list.get_list(); 202 +
  203 + setTimeout(function(){
  204 + var goods_list = th.selectComponent("#goods_list"); //组件的id
  205 + goods_list.init();
  206 + goods_list.get_list();
  207 + },1000)
205 208
206 }) 209 })
207 }, 210 },