Commit 9c0ac081f7f56ef1e536a3d835da353942df2f21
1 parent
52f2e3ca
1 积分购,预存充值的 文字显示的细节
Showing
7 changed files
with
20 additions
and
14 deletions
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | <view wx:elif="{{item.GradeSum>0}}">{{item.GradeSum}}成长值</view> | 31 | <view wx:elif="{{item.GradeSum>0}}">{{item.GradeSum}}成长值</view> |
| 32 | <view wx:else>{{item.GiveName}}</view> | 32 | <view wx:else>{{item.GiveName}}</view> |
| 33 | <!-- <view class="fs28 pdv10 txt-justify">节日可免费享受专业美甲,可以享受1次。</view> --> | 33 | <!-- <view class="fs28 pdv10 txt-justify">节日可免费享受专业美甲,可以享受1次。</view> --> |
| 34 | - <view wx:if="{{item.Qty>0}}" class="t-r fs24 c-y">数量:{{item.Qty}}</view> | 34 | + <view wx:if="{{item.Qty>0}}" class="t-r fs24">数量:{{item.Qty}}</view> |
| 35 | </view> | 35 | </view> |
| 36 | </view> | 36 | </view> |
| 37 | </view> | 37 | </view> |
packageA/pages/jfbuy/jfbuy.wxml
| @@ -6,8 +6,12 @@ | @@ -6,8 +6,12 @@ | ||
| 6 | <view bindtap="search_data" class="btn-search">搜索</view> | 6 | <view bindtap="search_data" class="btn-search">搜索</view> |
| 7 | </view> --> | 7 | </view> --> |
| 8 | 8 | ||
| 9 | - <view class="banner-container"> | 9 | + <view class="banner-container flex"> |
| 10 | <image src="{{url}}/miniapp/images/integral/liwu.png?v=1" class="banner"></image> | 10 | <image src="{{url}}/miniapp/images/integral/liwu.png?v=1" class="banner"></image> |
| 11 | + <view style="display: inline-block; padding-top: 72rpx;"> | ||
| 12 | + <view class="fs36">小积分大作为</view> | ||
| 13 | + <view class="fs26" style="color: #999; margin-top: 20rpx;">积分抵用现金,积少成多</view> | ||
| 14 | + </view> | ||
| 11 | </view> | 15 | </view> |
| 12 | 16 | ||
| 13 | <!-- 列表 --> | 17 | <!-- 列表 --> |
packageA/pages/jfbuy/jfbuy.wxss
| @@ -105,7 +105,7 @@ page { | @@ -105,7 +105,7 @@ page { | ||
| 105 | margin-left: 8rpx; | 105 | margin-left: 8rpx; |
| 106 | } | 106 | } |
| 107 | .list-container { | 107 | .list-container { |
| 108 | - height: calc(100% - 360rpx); | 108 | + height: calc(100% - 320rpx); |
| 109 | /* height: 100%; */ | 109 | /* height: 100%; */ |
| 110 | } | 110 | } |
| 111 | .list { | 111 | .list { |
| @@ -420,10 +420,13 @@ radio .wx-radio-input.wx-radio-input-checked::before{ | @@ -420,10 +420,13 @@ radio .wx-radio-input.wx-radio-input-checked::before{ | ||
| 420 | } */ | 420 | } */ |
| 421 | 421 | ||
| 422 | .banner-container { | 422 | .banner-container { |
| 423 | - height: 360rpx; | 423 | + height: 320rpx; |
| 424 | } | 424 | } |
| 425 | .banner { | 425 | .banner { |
| 426 | display: block; | 426 | display: block; |
| 427 | - width: 100%; | ||
| 428 | - height: 100%; | 427 | + width: 340rpx; |
| 428 | + height: 240rpx; | ||
| 429 | + margin-left:25rpx; | ||
| 430 | + margin-right:25rpx; | ||
| 431 | + margin-top: 30rpx; | ||
| 429 | } | 432 | } |
| 430 | \ No newline at end of file | 433 | \ No newline at end of file |
pages/cart/cart/cart.js
| @@ -30,7 +30,6 @@ Page({ | @@ -30,7 +30,6 @@ Page({ | ||
| 30 | bconf:null, | 30 | bconf:null, |
| 31 | btn_click:1, | 31 | btn_click:1, |
| 32 | }, | 32 | }, |
| 33 | - | ||
| 34 | onLoad: function() { | 33 | onLoad: function() { |
| 35 | var a = this,ee=a; | 34 | var a = this,ee=a; |
| 36 | //----获取系统参数----- | 35 | //----获取系统参数----- |
| @@ -50,8 +49,6 @@ Page({ | @@ -50,8 +49,6 @@ Page({ | ||
| 50 | a.getCardList(); | 49 | a.getCardList(); |
| 51 | }); | 50 | }); |
| 52 | 51 | ||
| 53 | - | ||
| 54 | - | ||
| 55 | }, | 52 | }, |
| 56 | onShow: function() { | 53 | onShow: function() { |
| 57 | 54 |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -967,12 +967,12 @@ | @@ -967,12 +967,12 @@ | ||
| 967 | <view>单独购买</view> | 967 | <view>单独购买</view> |
| 968 | </view> | 968 | </view> |
| 969 | <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:if="{{can_integral}}" >立即兑换</view> | 969 | <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:if="{{can_integral}}" >立即兑换</view> |
| 970 | - <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >立即兑换</view> | 970 | + <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >积分不足</view> |
| 971 | </block> | 971 | </block> |
| 972 | 972 | ||
| 973 | <block wx:else> | 973 | <block wx:else> |
| 974 | <view bindtap="go_pay_integral" class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}" >立即兑换</view> | 974 | <view bindtap="go_pay_integral" class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}" >立即兑换</view> |
| 975 | - <view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >立即兑换</view> | 975 | + <view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >积分不足</view> |
| 976 | </block> | 976 | </block> |
| 977 | 977 | ||
| 978 | </block> | 978 | </block> |
pages/index/index/index.wxml
| @@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ | ||
| 82 | </navigator> | 82 | </navigator> |
| 83 | </view> | 83 | </view> |
| 84 | <view class="venues_item"> | 84 | <view class="venues_item"> |
| 85 | - <navigator url="packageA/pages/quan_list/quan_list"> | 85 | + <navigator url="/packageA/pages/quan_list/quan_list"> |
| 86 | <image src="{{url}}/miniapp/images/index/youhui.png"></image> | 86 | <image src="{{url}}/miniapp/images/index/youhui.png"></image> |
| 87 | <view>优惠券</view> | 87 | <view>优惠券</view> |
| 88 | </navigator> | 88 | </navigator> |
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | </navigator> | 94 | </navigator> |
| 95 | </view> | 95 | </view> |
| 96 | <view class="venues_item"> | 96 | <view class="venues_item"> |
| 97 | - <navigator url="/pages/goods/categoryList/categoryList"> | 97 | + <navigator bindtap="go_url" data-url="/pages/goods/categoryList/categoryList"> |
| 98 | <image src="{{url}}/miniapp/images/index/fenlei.png"></image> | 98 | <image src="{{url}}/miniapp/images/index/fenlei.png"></image> |
| 99 | <view>全部分类</view> | 99 | <view>全部分类</view> |
| 100 | </navigator> | 100 | </navigator> |
pages/user/deposit/prepaid/prepaid.wxml
| @@ -7,7 +7,9 @@ | @@ -7,7 +7,9 @@ | ||
| 7 | <view class="info-container flex"> | 7 | <view class="info-container flex"> |
| 8 | <view class="left" catchtap="go_detail" data-id="{{perpaid.Id}}"> | 8 | <view class="left" catchtap="go_detail" data-id="{{perpaid.Id}}"> |
| 9 | <view>{{perpaid.ItemName}}</view> | 9 | <view>{{perpaid.ItemName}}</view> |
| 10 | - <view class="pdv20">充{{perpaid.BeginSum}}<text>送{{perpaid.NewSum}}元</text></view> | 10 | + <view class="pdv20">充{{perpaid.BeginSum}} |
| 11 | + <text wx:if="{{perpaid.NewSum>0}}">送{{perpaid.NewSum}}元</text> | ||
| 12 | + </view> | ||
| 11 | <view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view> | 13 | <view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view> |
| 12 | </view> | 14 | </view> |
| 13 | <view class="right">备注: | 15 | <view class="right">备注: |