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

yvan.ni
2 parents 3bd64274 4a845ead
Showing 4 changed files with 326 additions and 62 deletions
app.wxss
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/goods/goodsList/goodsList.wxss
@@ -46,6 +46,9 @@
 .pdl20 {
 	padding-left: 20rpx;
 }
+.pdl30 {
+	padding-left: 30rpx;
+}
 .pdr10 {
 	padding-right: 10rpx;
 }
@@ -632,7 +635,6 @@ background: #ffe3e2;
 .fs24{
     font-size: 24rpx !important;
 }
-
 .fs26{
     font-size: 26rpx;
 }
@@ -651,7 +653,7 @@ background: #ffe3e2;
     font-size:35rpx;
 }
 .fs36 {
-  font-size: 36rpx; 
+  font-size: 36rpx !important; 
 }
 .fs38 {
   font-size: 38rpx; 
@@ -22,6 +22,7 @@ Page({
 		is_hot:0,
         prom_goods_list:null,
         rq_data:null,
+				isToggle: false, //切换商品视图控制符
     },
     onLoad: function(t) {
@@ -273,6 +274,15 @@ Page({
   		  func(ob);	
      })
    },
+	 
+	 
+	 
+	 // 切换显示
+	 bindToggleDisplay() {
+			this.setData({
+				isToggle: !this.data.isToggle,
+			});
+	 },
 });
 \ No newline at end of file
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
-  <view style="padding: 20rpx 30rpx">
+  <view>
      <block wx:for="{{prom_goods_list}}">
-         <view  class="fs30 ellipsis-1">
+         <view  class="fs30 ellipsis-1" style="padding: 20rpx 30rpx">
            满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text>
            <text space="{{true}}" wx:if="{{item.content.is_money}}">减{{item.content.money}}元 </text>
            <text space="{{true}}" wx:if="{{item.content.is_sale}}">打{{item.content.sale}}折 </text>
@@ -13,7 +13,16 @@
          </view>
      </block>
   </view>
-
+	
+	<view class="pd20 flex ai-center jc_sb">
+		<!-- 搜索框 -->
+		<view class="search-box f1">
+			<navigator hover-class="none" url="/pages/goods/search/search"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
+		</view>
+		<!-- 单列/双列 显示切换 -->
+		<text class="iconfont {{isToggle ? 'icon-fenxiang':'icon-fenlie'}} pdl30 fs36" bindtap="bindToggleDisplay"></text>
+	</view>
+	
   <view class="nav">
     <navigator bindtap="changeTab" class="nav-item" data-href="sort" data-ad="{{adname}}">综合
       <view class="ico-dg" wx:if="{{tabname=='sort'}}">
@@ -40,29 +49,37 @@
             </view>
         </navigator> -->
-    <navigator class="nav-item search" url="/pages/goods/search/search">
+    <!-- <navigator class="nav-item search" url="/pages/goods/search/search">
       <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image>
-    </navigator>
+    </navigator> -->
   </view>
-  <view class="choice_list">
+	
+  <view class="choice_list" wx:if="{{!isToggle}}">
     <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
       <view class="img-wrap">
         <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
       </view>
       <view class="item-cont">
-        <view class="title">{{item.goods_name}}</view>
+        <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
         <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2}}">
-            <!-- 活动价 -->
-            <view class="price">
-				<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-				<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-				<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
-			</view>
+				<view class="flex on">
+					<!-- 活动价 -->
+					<view class="price">
+						<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+						<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+						<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
+					</view>
+					<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
+				</view>
+            
-            <view class="comment flex jc_sb">
-              <view class="word-line xc-ash">￥{{item.market_price}}</view>
-              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+            <view class="comment pdt10">
+              <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
+              <view class="fs24 t-r">
+								<span>评论{{item.comment_count}}</span>
+								<span class="pdl30">已售{{item.sales_sum}}</span>
+							</view>
             </view>
         </block>
         <block wx:else>
@@ -79,56 +96,201 @@
                     <text class="card_name">{{card_name}}</text>
                   </view>
                 </view>
-                <view class="comment flex jc_sb">
+                <view class="comment">
                   <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                  <view class="">
+										<span>评论{{item.comment_count}}</span>
+										<span>已售{{item.sales_sum}}</span>
+									</view>
                 </view>
               </block>
               <block wx:else>
                 <view class="price">￥{{item.shop_price}}</view>
-                <view class="comment flex jc_sb">
+                <view class="comment">
                   <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                  <view>
+										<span>评论{{item.comment_count}}</span>
+										<span>已售{{item.sales_sum}}</span>
+									</view>
                 </view>
               </block>
             </block>
             <block wx:else>
-              <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+              <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
                 <view class="flex ai-center">
-                  <view class="price">￥{{item.shop_price}}</view>
-                  <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+                  <view class="price rmb">{{item.shop_price}}</view>
+                  <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
                 </view>
-                <view class="comment flex jc_sb">
+                <view class="comment">
                   <view class="flex ai-center">
-                    <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
+                    <view class="rmb">{{g_filter.get_card_price(item,card_list,0)}}</view>
                     <view class="card_bg ellipsis-1">
                       <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
                       <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
                     </view>
                   </view>
-                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                  <view class="fs24 pdt10 t-r">
+										<span class="">评论{{item.comment_count}}</span>
+										<span class="pdl30">已售{{item.sales_sum}}</span>
+									</view>
                 </view>
-              </block>
+              </view>
               <block wx:else>
-                <view class="price">￥{{item.shop_price}}</view>
-                <view class="comment flex jc_sb">
-                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+								<view>
+									<view class="price">￥{{item.shop_price}}</view>
+									<view class="word-line xc-ash">￥{{item.market_price}}</view>
+								</view>
+                <!-- <view class="price">￥{{item.shop_price}}</view> -->
+                <view class="comment pdt10">
+                  <view class="fs24 t-r">
+										<span>评论{{item.comment_count}}</span>
+										<span>已售{{item.sales_sum}}</span>
+									</view>
                 </view>
               </block>
             </block>
           </block>
-          <block wx:else>
-            <view class="price">￥{{item.shop_price}}</view>
-            <view class="comment flex jc_sb">
-              <view class="word-line xc-ash">￥{{item.market_price}}</view>
-              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+          <view wx:else>
+						<view class="flex ai-center">
+							<view class="price rmb">{{item.shop_price}}</view>
+							<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+						</view>
+            
+            <view class="comment pdt10">
+              <view class="fs24 t-r">
+            		<span>评论{{item.comment_count}}</span>
+            		<span class="pdl30">已售{{item.sales_sum}}</span>
+            	</view>
             </view>
-          </block>
+          </view>
         </block>
         </view>
     </navigator>
     </view>
+		
+		
+		<view class="choice_list on" wx:else>
+		  <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+		    <view class="img-wrap">
+		      <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+		    </view>
+		    <view class="item-cont">
+		      <view class="title ellipsis-2">{{item.goods_name}}</view>
+		      <!-- 判断是否有活动价 -->
+		      <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2}}">
+					<view class="flex on">
+						<!-- 活动价 -->
+						<view class="price">
+							<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+							<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+							<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
+						</view>
+						<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
+					</view>
+		          
+						
+		          <view class="comment pdt10">
+		            <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
+		            <view class="fs24 t-r">
+									<span>评论{{item.comment_count}}</span>
+									<span class="pdl30">已售{{item.sales_sum}}</span>
+								</view>
+		          </view>
+		      </block>
+		      <block wx:else>
+		        <!-- 商品价格,先判断下是后又等级价-->
+		        <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+		          <!-- 当会员是等级卡的时候 -->
+		          <block wx:if="{{card_field}}">
+		            <!-- 等级价>0 -->
+		            <block wx:if="{{item[card_field]>0}}">
+		              <view class="flex ai-center">
+		                <view class="price">￥{{item[card_field]}}</view>
+		                <view class="card_bg ellipsis-1">
+		                  <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+		                  <text class="card_name">{{card_name}}</text>
+		                </view>
+		              </view>
+		              <view class="comment">
+		                <view class="word-line xc-ash">￥{{item.market_price}}</view>
+		                <view class="">
+											<span>评论{{item.comment_count}}</span>
+											<span>已售{{item.sales_sum}}</span>
+										</view>
+		              </view>
+		            </block>
+		            <block wx:else>
+		              <view class="price">￥{{item.shop_price}}</view>
+		              <view class="comment">
+		                <view class="word-line xc-ash">￥{{item.market_price}}</view>
+		                <view>
+											<span>评论{{item.comment_count}}</span>
+											<span>已售{{item.sales_sum}}</span>
+										</view>
+		              </view>
+		            </block>
+		          </block>
+		          <block wx:else>
+		            <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+		              <view class="flex ai-center">
+		                <view class="price rmb">{{item.shop_price}}</view>
+		                <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
+		              </view>
+		              <view class="comment">
+		                <view class="flex ai-center">
+		                  <view class="rmb">{{g_filter.get_card_price(item,card_list,0)}}</view>
+		                  <view class="card_bg ellipsis-1">
+		                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+		                    <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+		                  </view>
+		                </view>
+		                <view class="fs24 pdt10 t-r">
+											<span class="">评论{{item.comment_count}}</span>
+											<span class="pdl30">已售{{item.sales_sum}}</span>
+										</view>
+		              </view>
+		            </view>
+		            <block wx:else>
+									<view>
+										<view class="price">￥{{item.shop_price}}</view>
+										<view class="word-line xc-ash">￥{{item.market_price}}</view>
+									</view>
+		              <!-- <view class="price">￥{{item.shop_price}}</view> -->
+		              <view class="comment pdt10">
+		                <view class="fs24 t-r">
+											<span>评论{{item.comment_count}}</span>
+											<span>已售{{item.sales_sum}}</span>
+										</view>
+		              </view>
+		            </block>
+		          </block>
+		        </block>
+		        <view wx:else>
+							<view class="">
+								<view class="price rmb">{{item.shop_price}}</view>
+								<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+							</view>
+		          
+		          <view class="comment pdt10">
+		            <view class="fs24 t-r">
+		          		<span>评论{{item.comment_count}}</span>
+		          		<span class="pdl30">已售{{item.sales_sum}}</span>
+		          	</view>
+		          </view>
+		        </view>
+		      </block>
+		      </view>
+		  </navigator>
+		  </view>
+			
+			
+			
+		
+		
+
+		
+		
+		
     <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">没有相关的数据</view>
+page {
+	background-color: #f0f0f0;
+}
+
 .container {
   color: #666;
 }
+.nav {
+	display: flex;
+	border-radius: 30rpx 30rpx 0 0;
+	overflow: hidden;
+}
+
 .nav-item {
-  float: left;
-  width: 30%;
-  height: 90rpx;
-  line-height: 90rpx;
+  /* float: left; */
+	flex: 1;
+  /* width: 30%; */
+  height: 80rpx;
+  /* line-height: 90rpx; */
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 32rpx;
-  border-bottom: 1px solid #dfefef;
+  font-size: 26rpx;
+  border-bottom: 1px solid #f5f5f5;
   background-color: #fff;
 }
 .nav-item .ico-dg {
-  width: 18rpx;
-  height: 12rpx;
+  width: 12rpx;
+  height: 8rpx;
   margin-left: 10rpx;
   line-height: 0;
 }
@@ -46,6 +57,19 @@
   background-position-x: -32rpx;
 }
+.search-box {
+	color: #BEBEBE;
+	font-size: 24rpx;
+	/* border: 2rpx solid #f23030; */
+	border-radius: 40rpx;
+	padding: 16rpx;
+	background-color: #e0e0e0;
+}
+
+.icon-sousuo {
+	font-size: 26rpx !important;
+}
+
 .search {
   width: 10%;
 }
@@ -57,22 +81,31 @@
 .choice_list {
   background-color: #fff;
+	/* padding-left: 20rpx;
+	padding-right: 20rpx; */
 }
 .choice_item {
   position: relative;
   width: 100%;
-  min-height: 200rpx;
-  padding: 10rpx 0;
-  border-bottom: 1px solid #f5f6f6;
+  /* min-height: 200rpx; */
+  /* padding: 10rpx 0; */
+  /* border-bottom: 1px solid #f5f6f6; */
   font-size: 30rpx;
+	display: flex;
+	padding: 20rpx;
+	box-sizing: border-box;
 }
 .img-wrap {
-  float: left;
-  width: 180rpx;
-  height: 180rpx;
-  padding: 0 10rpx 10rpx;
+  /* float: left; */
+  width: 270rpx;
+  height: 270rpx;
+	margin-right: 22rpx;
+	border-radius: 15rpx;
+	overflow: hidden;
+	flex-shrink: 0;
+  /* padding: 0 10rpx 10rpx; */
 }
 .img-wrap image {
@@ -81,25 +114,36 @@
 }
 .item-cont .title {
+	font-size: 26rpx;
   height: 72rpx;
-  margin: 16rpx 0;
-  padding-right: 10rpx;
+  margin-bottom: 20rpx;
+  /* padding-right: 10rpx; */
   line-height: 36rpx;
-  color: #333;
+  color: #2C2C2C;
+	text-align: justify;
   overflow: hidden;
 }
 .price {
   display: inline-block;
   color: #f23030;
-  line-height: 24rpx;
+  /* line-height: 24rpx; */
+	font-size: 30rpx;
+	/* font-weight: bold;
+	font-size: 28rpx; */
   /* padding-bottom: 20rpx; */
 }
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
 .comment {
-  font-size: 25rpx;
-  margin-top: 4rpx;
-  padding-right: 30rpx;
+  font-size: 24rpx;
+  /* margin-top: 4rpx; */
+	color: #8d8d8d;
+  /* padding-right: 30rpx; */
 }
 .filter-modal {
@@ -207,9 +251,55 @@
 .mk_price {
   margin-left: 10rpx;
-  font-size: 25rpx;
+  font-size: 24rpx;
 }
 .item-cont {
   line-height: 38rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+	flex: 1;
+}
+
+
+.choice_list.on {
+	display: flex;
+	flex-wrap: wrap;
+	padding-bottom: 12rpx;
+	padding-left: 16rpx;
+	padding-right: 16rpx;
+	background-color: #f0f0f0;
+}
+
+.choice_list.on .choice_item {
+	padding: 0;
+	margin-top: 16rpx;
+	display: block;
+	width: 350rpx;
+	background-color: white;
+	border-radius: 15rpx;
+}
+
+.choice_list.on .choice_item:nth-child(even) {
+	margin-left: 18rpx;
+}
+
+.choice_list.on .img-wrap {
+	width: 350rpx;
+	height: 350rpx;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.choice_list.on .item-cont {
+	padding: 10rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+
+.choice_list.on .item-cont .flex.on {
+	display: block;
 }