积分购

yvan.ni
1 parent e211cddc
Showing 2 changed files with 4 additions and 17 deletions
pages/goods/goodsInfo/g_filter.wxs
pages/goods/goodsInfo/goodsInfo.wxml
@@ -93,18 +93,7 @@ var g_filters = {
 		//折扣数值处理，小数位数为1时，只显示1位；小数位数为2时，才显示2位；
 		num: function(value) {
 			if(value != 0) {
-				var val = value.toFixed(2).toString();
-				if(val.indexOf('.') != -1) {
-					var arrval = val.split('.');
-					if(arrval[1].length == 1 && arrval[1][0] == 0) {
-						val = val.slice(0,-2);
-					};
-			
-					if(arrval[1].length == 2 && arrval[1][1] == 0) {
-						val = val.slice(0,-1);
-					};
-				};
-				return val;
+				return parseFloat(value);
 			} else {
 				return value.toFixed(0);
 			};
@@ -242,14 +242,14 @@
 			  <view class="goods-price">
 				  <!-- 价格显示 -->
 				  <view class="co-red" style="" >
-				      <view class="market-price" style="overflow: hidden; height: 66rpx;">
+				      <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex;">
 					     <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
 						 <block wx:if="{{prom_integral}}">{{prom_integral}}
 						 <text class="rel_txt">积分</text></block>						
 						 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>						
 					     <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> 					 
 						 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>						 
-						 <text class="rel_txt" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">&nbsp;&nbsp;&nbsp;零售价:￥{{data.market_price}}</text>
+						 <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">&nbsp;&nbsp;&nbsp;零售价:￥{{data.market_price}}</text>
 					  </view>
 				  </view>	
  
@@ -266,8 +266,7 @@
  
 				  <view class="goods-num">
 				    <view class="sales">销量：{{prom_act.buy_num}}件</view>
-				    <!-- <view class="stock">折扣：{{data.disc}}折</view> -->
-						<view class="stock">折扣：{{g_filters.num((prom_price?prom_price:0)*100/data.shop_price)}}折</view>
+					<view class="stock">折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折</view>
 				    <view class="stock">{{categories3[0].num}}人评价</view>
 				  </view>				 
 			  </view>			  			 
@@ -382,7 +381,6 @@
             <view class="goods-num" wx:if="{{prom_type!=1}}">
               <view class="sales">销量：{{data.sales_sum}}件</view>
               <view class="stock">折扣：{{data.disc}}折</view>
-							<!-- <view class="stock">折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折</view> -->
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
             <view wx:if="{{prom_type==1}}">