Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 9daf4439 ffba0e20
Showing 2 changed files with 22 additions and 7 deletions
packageA/pages/service_share/service_share.js
packageA/pages/service_share/service_share.wxml
@@ -24,7 +24,9 @@ Page({
 		dis_switch:0,    //-- 分销开关 --
 		pattern:0,       //-- 分成的方式 --
 		share_hidden:1,  //-- 分享的按钮隐藏 --
-		share_good:null  //--- 要分享的商品 --- 
+		share_good:null  ,//--- 要分享的商品 --- 
+		
+		isSale: true,
   },
   /**
    * 生命周期函数--监听页面加载
@@ -162,9 +164,15 @@ Page({
 	// 点击价格排序
 	sort1() {
+		this.setData({
+			isSale: false,
+			isPrice: true,
+			isNew: false,
+		});
 		if(this.data.active2) {
 			this.setData({
-				active2: !this.data.active2
+				active2: !this.data.active2,
+				
 			});
 		};		
 		if(this.data.orderField!="money"){
@@ -178,6 +186,7 @@ Page({
 				orderType:ty,is_no_data:0,is_no_more:0,list:[],
 			});
 		}	
+		
 		this.data.is_load=0;
 		this.data.currentPage=1;	
 		this.requestGoodsList();	
@@ -218,6 +227,9 @@ Page({
 		if(this.data.orderField!="sales_sum"){
 			this.setData({
 				active1: 0,active2:0,orderType:'desc',is_no_data:0,is_no_more:0,orderField:'sales_sum',list:[],
+				isSale: true,
+				isPrice: false,
+				isNew: false,
 			});
 			this.data.is_load=0;
 			this.data.currentPage=1;	
@@ -229,7 +241,10 @@ Page({
 	new_sort:function(){
 		if(this.data.orderField!="is_new"){ 
 			this.setData({
-				active1: 0,active2:0,orderType:'desc',is_no_data:0,is_no_more:0,orderField:'is_new',list:[],
+				active1: 0,active2:0,orderType:'desc',is_no_data:0,is_no_more:0,list:[],
+				isSale: false,
+				isPrice:false,
+				isNew: true,
 			});
 			this.data.is_load=0;
 			this.data.currentPage=1;	
@@ -10,13 +10,13 @@
 	<view class="list-container">
 		<!-- 标题 -->
 		<view class="title">
-			<view class="title-item f1" bindtap="sale_sort">销量</view>
+			<view class="title-item f1 {{isSale?'c-red':''}}" bindtap="sale_sort">销量</view>
 			<block wx:if="{{orderField=='money'}}">
-		    	<view class="title-item f1" bindtap="sort1">价格<text class="iconfont {{orderType=='asc'?'icon-shang':'icon-xia'}}"></text></view>
+		    	<view class="title-item f1 {{isPrice?'c-red':''}}" bindtap="sort1">价格<text class="iconfont {{orderType=='asc'?'icon-shang':'icon-xia'}}"></text></view>
 			</block>
 			<block wx:else>
-			    <view class="title-item f1" bindtap="sort1">价格<text class="iconfont icon-shang"></text></view>
+			    <view class="title-item f1 {{isPrice?'c-red':''}}" bindtap="sort1">价格<text class="iconfont icon-shang"></text></view>
 			</block>
 			<!-- <block wx:if="{{orderField=='commission'}}">
@@ -26,7 +26,7 @@
 			   <view class="title-item" bindtap="sort2">佣金<text class="iconfont icon-xia"></text></view>
 			</block> --> 
-			<view class="title-item f1" bindtap='new_sort'>最新</view>
+			<view class="title-item f1 {{isNew?'c-red':''}}" bindtap='new_sort'>最新</view>
 		</view>
 		<!-- 列表项 -->
 		<scroll-view