Explorar o código

积分功能修改

junyuanz %!s(int64=5) %!d(string=hai) anos
pai
achega
5d994631d6

+ 3 - 3
packageUser/pages/user/integral/checkin/checkin.wxml

@@ -51,12 +51,12 @@
 					<b>+{{list.cent_award_conf.seven_day / 100}}</b>
 				</div>
 			</li>
-		</ul>
+		</ul>	
 		
 		<button type="button" class="qd-btn cancheckin" wx:if="{{ list.today_everyday_ok }}" bindtap="checkin">点我签到</button>
 		<button type="button" class="qd-btn" wx:else>今日已签到</button>
 		
-		<view class="has-jf">现有 <span>{{cent / 100}}</span> 积分</view>
+		<view class="has-jf">现有 <span>{{cent / 100}}</span> 积分,<navigator style="display: inline-block;color: #2196F3;" url="../../../../../pages/centcart/centcart">兑换商品</navigator></view>
   </view>
   <view class="task-list">
   	<h3><b>其他任务</b></h3>
@@ -64,7 +64,7 @@
   		<li>
   			<div class="task-list-box">
   				<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png"></image>
-	  			<h4>分享好友得积分<!--<small>奖励50-1000积分</small>--></h4>
+	  			<h4>分享好友得积分<small>奖励 {{list.cent_award_conf.new_man / 100}} 积分</small></h4>
 	  			<button type="button" data-name="shareBtn" open-type="share">分享</button>
   			</div>
   		</li>

+ 0 - 1
packageUser/pages/user/integral/checkin/checkin.wxss

@@ -14,7 +14,6 @@
     padding: 30rpx 0;
     width: 100%;
     overflow: hidden;
-    border-box
 }
 .qd-card ul li{
 	    background: #eee;

+ 5 - 0
packageUser/pages/user/order/order.wxml

@@ -79,6 +79,11 @@
 	      </view>
       </view>
       <view wx:if="{{order.status !== 'unpay'}}">
+      	<view style="overflow: hidden;width: 100%;">
+	      	<view class="orderDetail-payPrice__title">积分抵扣</view>
+	      	<text class="orderDetail-payPrice__count">{{order.cent_price / 100}}积分</text>
+	      </view>
+	      
 	      <view style="overflow: hidden;width: 100%;">
 	      	<view class="orderDetail-payPrice__title">代金券抵扣</view>
 	      	<text class="orderDetail-payPrice__count">{{order.coupon_price / 100}}代金券</text>

+ 2 - 0
packageUser/pages/user/orders/orders.wxml

@@ -46,6 +46,8 @@
       <view class="order-allprice" wx:if="{{item.status !== 'unpay'}}">共{{item.count}}件商品 合计:
         <view style="float: right;" wx:if="{{item.pay_way == 'integral' && item.product.mall_balance_price}}">{{(item.total_price+item.freight) / 100}}代金券
         </view>
+        <text style="float: right;" wx:elif="{{item.pay_way == 'cent'}}">{{(item.total_price+item.freight) / 100}} 积分
+        </text>
         <text style="float: right;" wx:elif="{{item.pay_way == 'balance'}}">{{(item.total_price+item.freight) / 100}}
         </text>
         <currency style="float: right;" wx:if="{{item.pay_way == 'weixinpay'}}" symbol="¥" value="{{item.total_price+item.freight}}"></currency>

+ 1 - 1
pages/home/home.wxml

@@ -26,7 +26,7 @@
         </view>
       </view>
       <view bindtap="tocentcart">
-        <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/about.png" class="item-index" />
+        <image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/navigation_icons/cent.png" class="item-index" />
         <view class="item-name">积分专区</view>
       </view>