Commit 581a42d07e0221ebea7598ae8480551da77a23f4

Authored by yvan.ni
2 parents 7b960f77 c10963de

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

packageA/images/liveStreamDetails/circle.jpg 0 → 100644

3.83 KB

packageA/images/liveStreamDetails/friend.jpg 0 → 100644

4.38 KB

packageA/images/liveStreamDetails/home.jpg 0 → 100644

1.38 KB

packageA/images/liveStreamDetails/save.jpg 0 → 100644

968 Bytes

packageA/images/liveStreamDetails/share.jpg 0 → 100644

1.09 KB

packageA/pages/liveStreamDetails/liveStreamDetails.wxml
... ... @@ -35,7 +35,7 @@
35 35 <!-- <view>WEI</view> -->
36 36 <view>{{item.name}}</view>
37 37 </view>
38   - <view class="item-price">{{filter.toFix(item.price, 2)}}</view>
  38 + <view class="item-price">{{filter.toFix(item.price/100, 2)}}</view>
39 39 </view>
40 40 </view>
41 41 </block>
... ...
pages/user/coupons/coupons.js
... ... @@ -73,8 +73,10 @@ Page({
73 73 let grades = th.data.grades;
74 74 // console.log('is_show_dhwz----------------------------',is_show_dhwz);
75 75 if(is_show_dhwz) {
76   - grades.push('微券兑换');
77   - th.setData({ grades });
  76 + if(grades.indexOf('微券兑换') == -1) {
  77 + grades.push('微券兑换');
  78 + th.setData({ grades });
  79 + };
78 80 };
79 81 th.setData({ is_show_dhwz });
80 82 },1);
... ... @@ -143,6 +145,7 @@ Page({
143 145 noMore: false,
144 146 details: [],
145 147 by_list: [],
  148 + showQr: false,
146 149 });
147 150  
148 151  
... ... @@ -161,6 +164,7 @@ Page({
161 164 let useIndex = e.currentTarget.dataset.index;
162 165 let val = e.currentTarget.dataset.cashrepno;
163 166  
  167 +
164 168 this.setData({
165 169 showQr: true,
166 170 useIndex,
... ... @@ -598,5 +602,23 @@ Page({
598 602 });
599 603 };
600 604 },
  605 +
  606 + // 禁用滚动
  607 + // disableScroll() {
  608 + // this.setData({
  609 + // scrollType: 'disableScroll'
  610 + // });
  611 + // },
  612 +
  613 + //启用滚动
  614 + // enableScroll() {
  615 + // this.setData({
  616 + // scrollType: '',
  617 + // });
  618 + // },
  619 +
  620 + touchStart() {},
  621 + touchMove() {},
  622 + touchEnd() {},
601 623  
602 624 })
603 625 \ No newline at end of file
... ...
pages/user/coupons/coupons.wxml
... ... @@ -52,105 +52,111 @@
52 52 </form>
53 53 </view> -->
54 54  
55   -
56   -<view class="tab-head" bindtap="clickTab">
57   - <view wx:for="{{grades}}" wx:key="unique" class="tab-head-item {{currentIndex == index ? 'active':''}}" data-name="{{item}}" data-index="{{index}}">{{item}}</view>
58   -</view>
59   -
60   -<view class="tab-body">
61   - <block wx:if="{{currentIndex != 3}}">
62   - <view class="tab-list-item" wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
63   - <block wx:if="{{detail.isby}}">
64   - <view class="coupon">
65   - <view class="flex">
66   - <view class="c-l"><text class="fs40">包邮券</text></view>
67   - <view class="c-r dash">
68   - <view class="flex jc_sb ai_c">
69   - <view class="pdr20">
70   - <view class="fs28 ellipsis-1x">包邮券</view>
71   - <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
  55 +<view>
  56 +
  57 + <view class="tab-head" bindtap="clickTab">
  58 + <view wx:for="{{grades}}" wx:key="unique" class="tab-head-item {{currentIndex == index ? 'active':''}}" data-name="{{item}}" data-index="{{index}}">{{item}}</view>
  59 + </view>
  60 +
  61 + <view class="tab-body">
  62 + <block wx:if="{{currentIndex != 3}}">
  63 + <view class="tab-list-item" wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
  64 + <block wx:if="{{detail.isby}}">
  65 + <view class="coupon">
  66 + <view class="flex">
  67 + <view class="c-l"><text class="fs40">包邮券</text></view>
  68 + <view class="c-r dash">
  69 + <view class="flex jc_sb ai_c">
  70 + <view class="pdr20">
  71 + <view class="fs28 ellipsis-1x">包邮券</view>
  72 + <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
  73 + </view>
  74 + <view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
  75 + </view>
  76 + <view class="c-time">
  77 + <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
  78 + <text wx:else>有效期:不限</text>
72 79 </view>
73   - <view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
74 80 </view>
75   - <view class="c-time">
76   - <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
77   - <text wx:else>有效期:不限</text>
  81 + </view>
  82 + </view>
  83 + <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
  84 + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
  85 + </view>
  86 + </block>
  87 +
  88 + <block wx:else>
  89 + <view class="coupon">
  90 + <view class="flex">
  91 + <view class="c-l"><text class="rmb fs40">{{filter.getNum(detail.Sum)}}</text></view>
  92 + <view class="c-r dash">
  93 + <view class="flex jc_sb ai_c">
  94 + <view class="pdr20">
  95 + <view class="fs28 ellipsis-1x">{{filter.getNum(detail.Sum)}}元微券</view>
  96 + <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
  97 + </view>
  98 + <view class="shrink0">
  99 + <text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.CashRepNo}}">{{filter.showBtnText(currentIndex)}}</text>
  100 + </view>
  101 + </view>
  102 + <view class="c-time">
  103 + <text wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
  104 + <text wx:else>有效期:不限</text>
  105 + </view>
78 106 </view>
79 107 </view>
80 108 </view>
81   - </view>
82   - <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
83   - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
84   - </view>
85   - </block>
86   -
87   - <block wx:else>
88   - <view class="coupon">
  109 + <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
  110 + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
  111 + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
  112 + </view>
  113 + </block>
  114 + </view>
  115 + </block>
  116 +
  117 +
  118 + <block wx:else>
  119 + <view class="tab-list-item" wx:for="{{result}}" wx:for-item="result">
  120 + <view class="coupon2">
89 121 <view class="flex">
90   - <view class="c-l"><text class="rmb fs40">{{filter.getNum(detail.Sum)}}</text></view>
  122 + <view class="c-l"><text class="rmb fs40">{{filter.getNum(result.ToSum)}}</text></view>
91 123 <view class="c-r dash">
92 124 <view class="flex jc_sb ai_c">
93 125 <view class="pdr20">
94   - <view class="fs28 ellipsis-1x">{{filter.getNum(detail.Sum)}}元微券</view>
95   - <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
96   - </view>
97   - <view class="shrink0">
98   - <text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.CashRepNo}}">{{filter.showBtnText(currentIndex)}}</text>
  126 + <view class="fs26 ellipsis-1x breakall">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
  127 + <!-- <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view> -->
99 128 </view>
  129 + <view class="shrink0"><text class="btn2" bindtap="clickExchange" data-index="{{index}}">立即兑换</text></view>
100 130 </view>
101   - <view class="c-time">
102   - <text wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
  131 + <!-- <view class="c-time">
  132 + <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{ time.format_time(detail.use_end_time)}}</text>
103 133 <text wx:else>有效期:不限</text>
104   - </view>
  134 + </view> -->
105 135 </view>
106 136 </view>
107 137 </view>
108   - <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
109   - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
110   - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
111   - </view>
112   - </block>
113   - </view>
114   - </block>
115   -
116   -
117   - <block wx:else>
118   - <view class="tab-list-item" wx:for="{{result}}" wx:for-item="result">
119   - <view class="coupon2">
120   - <view class="flex">
121   - <view class="c-l"><text class="rmb fs40">{{filter.getNum(result.ToSum)}}</text></view>
122   - <view class="c-r dash">
123   - <view class="flex jc_sb ai_c">
124   - <view class="pdr20">
125   - <view class="fs26 ellipsis-1x breakall">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
126   - <!-- <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view> -->
127   - </view>
128   - <view class="shrink0"><text class="btn2" bindtap="clickExchange" data-index="{{index}}">立即兑换</text></view>
129   - </view>
130   - <!-- <view class="c-time">
131   - <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{ time.format_time(detail.use_end_time)}}</text>
132   - <text wx:else>有效期:不限</text>
133   - </view> -->
134   - </view>
135   - </view>
136 138 </view>
137   - </view>
138   - </block>
139   -
140   - <!-- 暂无数据 -->
141   - <nodata nodataContainer="t-c" wx:if="{{(is_no_more == 1 && current_page == 1) || (result.length == 0)}}"></nodata>
  139 + </block>
  140 +
  141 + <!-- 暂无数据 -->
  142 + <nodata nodataContainer="t-c" wx:if="{{(is_no_more == 1 && current_page == 1) || (result.length == 0)}}"></nodata>
  143 +
  144 + <block wx:if="{{is_get}}">
  145 + <!-- 没有更多数据 -->
  146 + <view class="noMore 1" wx:if="{{(is_no_more == 1)||((details.length !== 0) && (pageSize >= (byTotal+wjTotal)))}}">—— 已经到底了 ——</view>
  147 + </block>
  148 + <view class="noMore 2" wx:if="{{noMore}}">—— 已经到底了 ——</view>
  149 + </view>
142 150  
143   - <block wx:if="{{is_get}}">
144   - <!-- 没有更多数据 -->
145   - <view class="noMore 1" wx:if="{{(is_no_more == 1)||((details.length !== 0) && (pageSize >= (byTotal+wjTotal)))}}">—— 已经到底了 ——</view>
146   - </block>
147   - <view class="noMore 2" wx:if="{{noMore}}">—— 已经到底了 ——</view>
148 151 </view>
149 152  
  153 +
  154 +
  155 +
150 156 <!-- 遮罩层 -->
151   -<view class="mask" hidden="{{!showQr}}"></view>
  157 +<view class="mask" hidden="{{!showQr}}" catchtouchmove="touchMove"></view>
152 158 <!-- 码 -->
153   -<view class="popup-container" hidden="{{!showQr}}">
  159 +<view class="popup-container" hidden="{{!showQr}}" catchtouchmove="touchMove">
154 160 <view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
155 161 <view class="popup">
156 162 <view class="popup-title">
... ...
pages/user/coupons/coupons.wxss
... ... @@ -416,9 +416,18 @@ page {
416 416 .coupon {
417 417 position: relative;
418 418  
419   - background: radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx no-repeat,
420   - radial-gradient(transparent 6px, #fff 0),
421   - radial-gradient(transparent 6px, #fff 0);
  419 + background: -webkit-radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
  420 + -webkit-radial-gradient(transparent 12rpx, #fff 0),
  421 + -webkit-radial-gradient(transparent 12rpx, #fff 0);
  422 + background: -moz-radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
  423 + -moz-radial-gradient(transparent 12rpx, #fff 0),
  424 + -moz-radial-gradient(transparent 12rpx, #fff 0);
  425 + background: -o-radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
  426 + -o-radial-gradient(transparent 12rpx, #fff 0),
  427 + -o-radial-gradient(transparent 12rpx, #fff 0);
  428 + background: radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
  429 + radial-gradient(transparent 12rpx, #fff 0),
  430 + radial-gradient(transparent 12rpx, #fff 0);
422 431 }
423 432  
424 433  
... ... @@ -426,12 +435,23 @@ page {
426 435 content: '';
427 436 position: absolute;
428 437 height: 100%;
429   - width:4px;
  438 + width: 8rpx;
430 439 top: 0;
431 440 left: 0;
432   - background-image: linear-gradient(to bottom, #FFD3D6 4px, transparent 4px, transparent),
433   - radial-gradient(4px circle at 0px 8px, #f0f0f0 4px, #FFD3D6 4px);
434   - background-size: 4px 12px;
  441 +
  442 + background: -webkit-linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
  443 + -webkit-radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
  444 +
  445 + background: -moz-linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
  446 + -moz-radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
  447 +
  448 + background: -o-linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
  449 + -o-radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
  450 +
  451 + background: linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
  452 + radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
  453 +
  454 + background-size: 16rpx 24rpx;
435 455 background-repeat: repeat-y;
436 456 }
437 457  
... ... @@ -440,10 +460,22 @@ page {
440 460 /* width: 300px; */
441 461 padding: 40rpx 0;
442 462 position: relative;
443   - background: radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
444   - radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
445   - radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
446   - radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
  463 + background: -webkit-radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
  464 + -webkit-radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
  465 + -webkit-radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
  466 + -webkit-radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
  467 + background: -moz-radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
  468 + -moz-radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
  469 + -moz-radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
  470 + -moz-radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
  471 + background: -o-radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
  472 + -o-radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
  473 + -o-radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
  474 + -o-radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
  475 + background: radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
  476 + radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
  477 + radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
  478 + radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
447 479 /* filter: drop-shadow(2px 2px 2px rgba(0,0,0,.2)); */
448 480 }
449 481  
... ... @@ -584,9 +616,10 @@ page {
584 616 bottom: -12rpx;
585 617 width: 130%;
586 618 height: 20rpx;
587   - background-image: -webkit-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
588   - background-image: -moz-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
589   - background-image: radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
  619 + background: -webkit-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
  620 + background: -moz-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
  621 + background: -o-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
  622 + background: radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
590 623 background-size: 40rpx 40rpx;
591 624 transform: rotate(180deg);
592 625 -webkit-transform: rotate(180deg);
... ... @@ -623,6 +656,14 @@ page {
623 656 word-break: break-all;
624 657 }
625 658  
  659 + /* .disableScroll {
  660 + position: fixed;
  661 + top: 0;
  662 + left: 0;
  663 + width: 100%;
  664 + height: 100%;
  665 + } */
  666 +
626 667  
627 668  
628 669  
... ...