From 9c0ac081f7f56ef1e536a3d835da353942df2f21 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 20 Nov 2020 14:11:45 +0800
Subject: [PATCH] 1   积分购，预存充值的 文字显示的细节

---
 packageA/pages/chongzhiDetails/chongzhiDetails.wxml |  2 +-
 packageA/pages/jfbuy/jfbuy.wxml                     |  6 +++++-
 packageA/pages/jfbuy/jfbuy.wxss                     | 11 +++++++----
 pages/cart/cart/cart.js                             |  3 ---
 pages/goods/goodsInfo/goodsInfo.wxml                |  4 ++--
 pages/index/index/index.wxml                        |  4 ++--
 pages/user/deposit/prepaid/prepaid.wxml             |  4 +++-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index ba047c1..170d1e7 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -31,7 +31,7 @@
 						<view wx:elif="{{item.GradeSum>0}}">{{item.GradeSum}}成长值</view>
 						<view wx:else>{{item.GiveName}}</view>
 						<!-- <view class="fs28 pdv10 txt-justify">节日可免费享受专业美甲，可以享受1次。</view> -->
-						<view wx:if="{{item.Qty>0}}" class="t-r fs24 c-y">数量：{{item.Qty}}</view>
+						<view wx:if="{{item.Qty>0}}" class="t-r fs24">数量：{{item.Qty}}</view>
 					</view>
 				</view>		
 			</view>			
diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml
index 67b4886..04be247 100644
--- a/packageA/pages/jfbuy/jfbuy.wxml
+++ b/packageA/pages/jfbuy/jfbuy.wxml
@@ -6,8 +6,12 @@
 		<view bindtap="search_data" class="btn-search">搜索</view>
 	</view> -->
 
-	<view class="banner-container">
+	<view class="banner-container flex">
 		<image src="{{url}}/miniapp/images/integral/liwu.png?v=1" class="banner"></image>
+		<view style="display: inline-block; padding-top: 72rpx;">
+			 <view class="fs36">小积分大作为</view>
+			 <view class="fs26" style="color: #999; margin-top: 20rpx;">积分抵用现金，积少成多</view>
+		</view>
 	</view>
 		
 	<!-- 列表 -->
diff --git a/packageA/pages/jfbuy/jfbuy.wxss b/packageA/pages/jfbuy/jfbuy.wxss
index 3bb8aae..9c86464 100644
--- a/packageA/pages/jfbuy/jfbuy.wxss
+++ b/packageA/pages/jfbuy/jfbuy.wxss
@@ -105,7 +105,7 @@ page {
 	margin-left: 8rpx;
 }
 .list-container {
-	height: calc(100% - 360rpx);
+	height: calc(100% - 320rpx);
 	/* height: 100%; */
 }
 .list {
@@ -420,10 +420,13 @@ radio .wx-radio-input.wx-radio-input-checked::before{
 } */
 
 .banner-container {
-	height: 360rpx;
+	height: 320rpx;
 }
 .banner {
 	display: block;
-	width: 100%;
-	height: 100%;
+	width: 340rpx;
+	height: 240rpx;
+	margin-left:25rpx;
+	margin-right:25rpx;
+	margin-top: 30rpx;
 }
\ No newline at end of file
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 98951c4..3c7aa22 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -30,7 +30,6 @@ Page({
 	bconf:null,	
 	btn_click:1,
   },
-
   onLoad: function() {
 	var a = this,ee=a;	 
 	//----获取系统参数-----
@@ -50,8 +49,6 @@ Page({
       a.getCardList();
     });
 
-
-
   },
   onShow: function() {
 	  
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index c001906..c82463b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -967,12 +967,12 @@
 			<view>单独购买</view>
 		  </view>  
 		  <view bindtap="go_pay_integral"  class="buy-btn cart-btn" wx:if="{{can_integral}}" >立即兑换</view>	
-		  <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >立即兑换</view>	
+		  <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >积分不足</view>	
 	  </block>
 	  
 	   <block wx:else>	 
 			<view bindtap="go_pay_integral"  class="buy-btn-all cart-btn"  style="width: 58%; margin-left:1%;"  wx:if="{{can_integral}}" >立即兑换</view>
-			<view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >立即兑换</view>	   
+			<view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >积分不足</view>	   
 	   </block>
 	  
 	</block>
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 037b67d..4d4ee9c 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -82,7 +82,7 @@
         </navigator>
       </view>
       <view class="venues_item">
-        <navigator url="packageA/pages/quan_list/quan_list">
+        <navigator url="/packageA/pages/quan_list/quan_list">
           <image src="{{url}}/miniapp/images/index/youhui.png"></image>
           <view>优惠券</view>
         </navigator>
@@ -94,7 +94,7 @@
         </navigator>
       </view>
       <view class="venues_item">
-        <navigator url="/pages/goods/categoryList/categoryList">
+        <navigator  bindtap="go_url"  data-url="/pages/goods/categoryList/categoryList">
           <image src="{{url}}/miniapp/images/index/fenlei.png"></image>
           <view>全部分类</view>
         </navigator>
diff --git a/pages/user/deposit/prepaid/prepaid.wxml b/pages/user/deposit/prepaid/prepaid.wxml
index 8641331..687197b 100644
--- a/pages/user/deposit/prepaid/prepaid.wxml
+++ b/pages/user/deposit/prepaid/prepaid.wxml
@@ -7,7 +7,9 @@
 		  <view class="info-container flex">
 				<view class="left"  catchtap="go_detail" data-id="{{perpaid.Id}}">
 					<view>{{perpaid.ItemName}}</view>
-					<view class="pdv20">充{{perpaid.BeginSum}}<text>送{{perpaid.NewSum}}元</text></view>
+					<view class="pdv20">充{{perpaid.BeginSum}}
+					   <text wx:if="{{perpaid.NewSum>0}}">送{{perpaid.NewSum}}元</text>
+					</view>
 					<view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view>
 				</view>
 				<view class="right">备注：
--
libgit2 0.21.4