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

yvan.ni
2 parents d26035e3 d7c16e20
Showing 5 changed files with 18 additions and 13 deletions
packageA/pages/distribution/goods/goods.js
packageA/pages/distribution/goods/goods.wxml
packageA/pages/service_share/service_share.js
packageA/pages/service_share/service_share.wxml
packageA/pages/service_share/service_share.wxss
@@ -327,21 +327,26 @@ Page({
 	 */
 	search(callback) {
 		let url = '';
+		let currentTabIndex = 0;
 		let data = this.data.currentQuery;
 		if(data.orderField) delete data.orderField;
 		if(data.orderType) delete data.orderType;
-		if(this.data.inputVal) {
+		// if(this.data.inputVal) {
 			data.key_str = this.data.inputVal;
-		};
+			
+		// };
 		if(this.data.isHiddenDropdown) {
 			if(data.nation_id) delete data.nation_id;
 			if(data.brand_id) delete data.brand_id;
 			if(data.startprice) delete data.startprice;
 			if(data.endprice) delete data.endprice;
 		};
+		if(data.key_str != '') {
+				currentTabIndex = 5;
+		};
 		this.setData({
 			list: null,
-			currentTabIndex: 5
+			currentTabIndex,
 		});
 		// console.log('data', data);
@@ -206,7 +206,7 @@
 							  </block>
 							</block>
 							<!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
-							<view class="fs24 c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view>
+							<view class="fs24 c-a">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view>
 						</view>
 					</view>
 				</view>
@@ -167,9 +167,9 @@ Page({
 				active2: !this.data.active2
 			});
 		};		
-		if(this.data.orderField!="shop_price"){
+		if(this.data.orderField!="money"){
 			this.setData({
-				active1: 1,orderField:'shop_price',orderType:'asc',is_no_data:0,is_no_more:0,list:[],
+				active1: 1,orderField:'money',orderType:'asc',is_no_data:0,is_no_more:0,list:[],
 			});									
 		}else{
@@ -861,8 +861,8 @@ Page({
 	 goto:function(e) {
-	 	var url = e.currentTarget.dataset.url;
-	 	app.goto(url); 
+	 		var url = e.currentTarget.dataset.url;
+	 		 app.goto(url); 
 	 },
@@ -12,7 +12,7 @@
 		<view class="title">
 			<view class="title-item f1" bindtap="sale_sort">销量</view>
-			<block wx:if="{{orderField=='shop_price'}}">
+			<block wx:if="{{orderField=='money'}}">
 		    	<view class="title-item f1" bindtap="sort1">价格<text class="iconfont {{orderType=='asc'?'icon-shang':'icon-xia'}}"></text></view>
 			</block>
 			<block wx:else>
@@ -37,11 +37,11 @@
 		 >	
 		<block wx:for="{{list}}">
 			<!-- <view class class="list-item" bindtap="go_goods" data-index="{{index}}"> -->
-			<view class class="list-item" bindtap="goto" data-index="{{index}}" data-url="{{'/packageA/pages/cardDetails/cardDetails?id=' + item.id}}">
+			<view class class="list-item" bindtap="goto" data-index="{{index}}" data-url="{{'/packageA/pages/goodsInfo/goodsInfo?goods_id=' + item.id}}">
 				<view class="img-container">
-					 <image src="{{url+item.original_img}}" style="width: 100%; height: 100%;"
+					 <image src="{{url+item.imgUrl}}" style="width: 100%; height: 100%;"
 					   binderror="bind_bnerr2"  lazy-load="true" 
-					   data-errorimg="list[{{index}}].original_img"></image>					
+					   data-errorimg="list[{{index}}].imgUrl" mode="aspectFit"></image>					
 				</view>
 				<view class="details">
 					<view class="ellipsis-2 fs28 name">{{item.serviceName}}</view>	
@@ -67,7 +67,7 @@ page {
 }
 .img-container {
 	background-color: #f0f0f0;
-	width: 280rpx;
+	width: 248rpx;
 	height: 248rpx;
 	display: flex;
 	align-items: center;