wxd / MShopWeApp

Merged
Merge Request #557 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 6 changed files
packageA/pages/chongzhi/chongzhi.wxml
  Edit  View file @8888a5d
1 1 <wxs module="g_filter" src="g_filter.wxs"></wxs>
2   -<view class="container">
  2 +<view class="container" style="background-color: {{ad_color?ad_color:'#e85f93'}};height: 100%;">
3 3 <!-- 封面 -->
4   - <view class="banner-container">
  4 + <view class="banner-container" wx:if="{{imgAd}}">
5 5 <image class="img-block" src="{{url + imgAd}}" binderror="onerror" data-errimg="imgAd"></image>
  6 + <!-- <image class="img-block" src="../../../images/banner.jpg" binderror="onerror" data-errimg="imgAd"></image> -->
6 7 </view>
7 8 <!-- 列表 -->
8 9 <view>
... ... @@ -12,37 +13,40 @@
12 13 <view class="t-item {{currentIndex == 1 ? 'active':''}}" data-index="1">已核销</view>
13 14 </view>
14 15 <!-- 内容 -->
15   - <view class="list" style="background-color: {{ad_color?ad_color:'#ff9a00'}};">
16   - <block wx:for="{{list}}" >
17   - <view class="l-item" bindtap="goDetails" data-id="{{item.ID}}" >
18   - <!-- 上 -->
19   - <view class="{{currentIndex == 0 ? 'top flex':'flex'}}">
20   - <!-- 左 -->
21   - <!-- <view class="left">
22   - <image class="img-block"></image>
23   - </view> -->
24   - <!-- 右 -->
25   - <view class="right">
26   - <view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view>
27   - <view>
28   - <view class="price fs24">零售价：￥{{item.PosPrice}}</view>
29   - <view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}</view>
  16 + <view class="list">
  17 + <!-- <scroll-view scroll-y> -->
  18 + <block wx:for="{{list}}" >
  19 + <view class="l-item" bindtap="goDetails" data-id="{{item.ID}}" >
  20 + <!-- 上 -->
  21 + <view class="{{currentIndex == 0 ? 'top flex':'flex'}}">
  22 + <!-- 左 -->
  23 + <!-- <view class="left">
  24 + <image class="img-block"></image>
  25 + </view> -->
  26 + <!-- 右 -->
  27 + <view class="right">
  28 + <view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view>
  29 + <view>
  30 + <view class="price fs24">零售价：￥{{item.PosPrice}}</view>
  31 + <view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}</view>
  32 + </view>
30 33 </view>
31 34 </view>
32   - </view>
33   - <!-- 下 -->
34   - <view class="bottom" wx:if="{{currentIndex == 0}}" >
35   - <text wx:if="{{g_filter.is_acting(item.EndDate)}}"
36   - catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text>
37   - <text data-index="{{index}}" class="btn details" >详情</text>
38   - </view>
39   - <view class="bottom" wx:if="{{currentIndex == 1}}" >
40   - <text data-index="{{index}}" class="btn" >已核销</text>
41   - <text data-index="{{index}}" class="btn details" >详情</text>
42   - </view>
43   -
44   - </view>
45   - </block>
  35 + <!-- 下 -->
  36 + <view class="bottom" wx:if="{{currentIndex == 0}}" >
  37 + <text wx:if="{{g_filter.is_acting(item.EndDate)}}"
  38 + catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text>
  39 + <text data-index="{{index}}" class="btn details" >详情</text>
  40 + </view>
  41 + <view class="bottom" wx:if="{{currentIndex == 1}}" >
  42 + <text data-index="{{index}}" class="btn" >已核销</text>
  43 + <text data-index="{{index}}" class="btn details" >详情</text>
  44 + </view>
  45 +
  46 + </view>
  47 + </block>
  48 + <!-- </scroll-view> -->
  49 +
46 50 <view hidden="{{!noMore}}" class="no-more t-c" wx:if="{{list.length !== 0}}">- 已全部加载 -</view>
47 51 </view>
48 52  
... ...
packageA/pages/chongzhi/chongzhi.wxss
  Edit  View file @8888a5d
... ... @@ -3,13 +3,17 @@
3 3  
4 4 page {
5 5 /* background-color: #FA437E; */
  6 + height: 100%;
  7 +}
  8 +
  9 +.container {
  10 + display: block;
6 11 }
7 12  
8 13 .banner-container {
9 14 height: 400rpx;
10 15 }
11 16  
12   -
13 17 .title {
14 18 background-color: white;
15 19 position: relative;
... ...
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
  Edit  View file @8888a5d
... ... @@ -2,7 +2,7 @@
2 2 <wxs module="g_filter" src="g_filter.wxs"></wxs>
3 3 <view class="container">
4 4 <view>
5   - <view class="banner-container">
  5 + <view class="banner-container" wx:if="{{show_img}}">
6 6 <image class="img-block" src="{{url+show_img}}" mode="widthFix"
7 7 lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></view>
8 8  
... ... @@ -13,7 +13,7 @@
13 13 <view>你的美丽我来缔造</view>
14 14 </view>
15 15 </view>
16   - <view style="background-color: {{ad_color?ad_color:'#fff'}};">
  16 + <view >
17 17 <view class="list-item flex" wx:for="{{result.givelist}}">
18 18 <!-- 左图片 -->
19 19 <view class="avatar">
... ... @@ -38,20 +38,21 @@
38 38 </view>
39 39 </view>
40 40  
41   - <view class="btn-container" >
42   - <block wx:if="{{result.is_acting}}">
43   - <text wx:if="{{type==0}}" data-advance="{{result.Id}}" data-money="{{result.BeginSum}}"
44   - class="btn" bindtap="go_buy">立即充值</text>
45   - <block wx:else>
46   - <text wx:if="{{result.AddType==0}}" class="btn" bindtap="onUse">立即使用</text>
47   - <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
48   - </block>
49   - </block>
50   - <block wx:else>
51   - <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
52   - </block>
53   - </view>
54   -
55   - <qrcode id="qrcode"></qrcode>
  41 + <block wx:if="{{result.is_acting}}">
  42 + <view class="btn-container" >
  43 + <text wx:if="{{type==0}}" data-advance="{{result.Id}}" data-money="{{result.BeginSum}}"
  44 + class="btn" bindtap="go_buy">立即充值</text>
  45 + <block wx:else>
  46 + <text wx:if="{{result.AddType==0 || result.AddType=='0'}}" class="btn" bindtap="onUse">立即使用</text>
  47 + <text wx:if="{{result.AddType==1 || result.AddType=='1'}}" class="btn" >已核销</text>
  48 + </block>
  49 + </view>
  50 + </block>
  51 + <block wx:else>
  52 + <view class="btn-container" wx:if="{{result.AddType=='1'}}" >
  53 + <text class="btn">已核销</text>
  54 + </view>
  55 + </block>
56 56  
  57 + <qrcode id="qrcode"></qrcode>
57 58 </view>
... ...
packageA/pages/chongzhiDetails/chongzhiDetails.wxss
  Edit  View file @8888a5d
... ... @@ -143,4 +143,8 @@
143 143 width: 500rpx;
144 144 height: 500rpx;
145 145 margin: 0 auto;
  146 +}
  147 +
  148 +.container{
  149 + display: block;min-height: 100%;width: 100%;position: absolute;left: 0;top: 0;z-index: 1;
146 150 }
147 151 \ No newline at end of file
... ...
pages/user/assistance/task_assistance.wxss
  Edit  View file @8888a5d
... ... @@ -251,4 +251,8 @@ line-height: 48rpx;
251 251 .rel {
252 252 display: flex;
253 253 align-items: center;
254   -}
255 254 \ No newline at end of file
  255 +}
  256 +
  257 +image{
  258 + -webkit-touch-callout:none
  259 +}
... ...
pages/user/deposit/prepaid/prepaid.wxml
  View file @8888a5d
1 1 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid">
2   - <view class="coupon-container">
  2 + <view class="coupon-container" wx:if="{{perpaid.NewSum>0}}">
3 3 <image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image>
4 4 <image wx:if="{{idx % 4 == 1}}" class="picture" src="{{iurl+'miniapp/images/usermoney/red.png'}}"></image>
5 5 <image wx:if="{{idx % 4 == 2}}" class="picture" src="{{iurl+'miniapp/images/usermoney/yellow.png'}}"></image>
... ... @@ -8,7 +8,7 @@
8 8 <view class="left" catchtap="go_detail" data-id="{{perpaid.Id}}">
9 9 <view>{{perpaid.ItemName}}</view>
10 10 <view class="pdv20">充{{perpaid.BeginSum}}
11   - <text wx:if="{{perpaid.NewSum>0}}">送{{perpaid.NewSum}}元</text>
  11 + <text>送{{perpaid.NewSum}}元</text>
12 12 </view>
13 13 <view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view>
14 14 </view>
... ...