分区调整

pages/cart/cart.wxml

@@ -61,7 +61,7 @@
 						      </view>
 						      <view class="cartlist_info">
 						        <!-- <view class="cartlist_title"><i wx:if="{{item.pv < item.original_price}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view> -->
-						        <view class="cartlist_title"><i wx:if="{{item.use_quan == false}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
+						        <view class="cartlist_title"><i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
 						        
 								<view class="project-pack-list" wx:if="{{item.package}}">
 									<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">

pages/home/home.js

@@ -66,7 +66,9 @@ Page ({
 	word:'',
 	
 	price_sort:0,
-	sale_sort:0
+	sale_sort:0,
+	zones:[],
+	currentZones:0
   },
   onLoad: function () {
 	  const info = wx.getSystemInfoSync();
@@ -82,6 +84,7 @@ Page ({
     if (getApp().globalData.wx_id) {
       this.info()
     }
+	this.getZones()
 	this.getData()
 	
 	
@@ -124,6 +127,17 @@ Page ({
     this.geticons()
     this.getkilltime()
   },
+  getZones:function(){
+  	  var that = this
+  	  var url = '/v1/zones'
+  	  var params = {}
+  	  var success = function (res) {
+  	    that.setData({
+  	      zones: res.data
+  	    })
+  	  }
+  	  _request.$get(url, params, success)
+  },
   getList: function () {
     if (this.data.vershow) {
       this.getProjects()
@@ -173,6 +187,11 @@ Page ({
 	  price_sort:this.data.price_sort,
 	  sale_sort:this.data.sale_sort
     }
+	
+	if(this.data.currentZones != 0){
+		params['sale_sort'] = this.data.currentZones
+	}
+	
     var success = function (res) {
       that.setData({
         projects_more: res.data.list_count > that.data.productsList.length,
@@ -712,5 +731,22 @@ Page ({
 			price_sort:type,
 		})
 		this.getList();
+	},
+	selectzones(e){
+		var cur = e.currentTarget.dataset.id;
+		if (this.data.currentZones == cur) {
+		  return false
+		} else {
+		  this.setData({
+		    currentZones: cur,
+			products: {
+			  rd: 0,
+			  page: 1,
+			  per_page: 5
+			},
+			productsList: []
+		  })
+		  this.getList()
+		}
 	}
 })

pages/home/home.wxml

@@ -369,9 +369,13 @@
       <!--<view class="projects-title">—————————　<text style="color: #98a4b0">精选推荐</text>　—————————</view>--> 
       <view class="newprojects-title">
 		  <view class="sortlist">
-		  		  <view class="sortlist-item" bindtap="sortchangenormal">热门精选</view>
+		  		 <!-- <view class="sortlist-item" bindtap="sortchangenormal">热门精选</view>
 		  		  <view class="sortlist-item" bindtap="salesort">销量排行 <image src="../../images/footer/up.png" wx:if="{{sale_sort == 2}}"/><image src="../../images/footer/down.png" wx:if="{{sale_sort == 1}}"/></view>
-		  		  <view class="sortlist-item" bindtap="pricesort">价格排序 <image src="../../images/footer/up.png" wx:if="{{price_sort == 2}}"/><image src="../../images/footer/down.png" wx:if="{{price_sort == 1}}"/></view>
+		  		  <view class="sortlist-item" bindtap="pricesort">价格排序 <image src="../../images/footer/up.png" wx:if="{{price_sort == 2}}"/><image src="../../images/footer/down.png" wx:if="{{price_sort == 1}}"/></view> -->
+				  
+				  <!-- 新调整 -->
+				  <view class="sortlist-item" bindtap="selectzones" wx:for='{{zones}}' wx:for-item="zonesItem" data-id='{{zonesItem.id}}'>{{zonesItem.name}}</view>
+				  
 		  </view>
 	  </view>
       <view><image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/neverse/goods.png" class="newprojects-titleimg" /></view>
@@ -384,7 +388,7 @@
 			<view class="project-pack" wx:if="{{item.package}}">
 				<view class="project-left-pack">
 					<view class="project-title ellipsisLn" style="min-height: 48rpx;max-height:102">
-						<i wx:if="{{!item.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>
+						<i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>
 						{{item.name}}
 					</view>
 
@@ -412,7 +416,7 @@
 			<view  class="project" wx:else>
 				<view class="project-left">
 					<view class="project-title ellipsisLn">
-						<i wx:if="{{!item.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>
+						<i  style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>
 						{{item.name}}
 					</view>
 				
@@ -444,7 +448,7 @@
           <video class="project-video" custom-cache="{{false}}" bindtap='videoTap' data-index="{{index}}"  id='video{{index}}' show-fullscreen-btn="{{false}}" enable-progress-gesture="{{false}}" src="{{item.video_url}}" controls="{{false}}" show-center-play-btn='{{false}}'>
           	<cover-image class="playImg" src="../../images/footer/play.png"  wx:if="{{!item.video_play}}"></cover-image>
           </video>
-          <view class="project-title ellipsisLn"><i wx:if="{{!item.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.name}}</view>
+          <view class="project-title ellipsisLn"><i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>{{item.name}}</view>
           <view class="project-price" style="color: #999;text-decoration: line-through;font-size: 23rpx;">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
           <view class="project-price" style="float: left;font-size:35rpx;"><currency symbol="￥" value="{{item.price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
           <view class="project-count">已售{{item.sold_count}}件</view>

pages/projects/project-detail/project-detail.wxml

@@ -48,7 +48,7 @@
       <view><image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/neverse/otherskill.png" class="seckill-img" /></view>
     </view>
     
-    <h3 class="detail-width detail-title"><i wx:if="{{!project.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{project.name}}</h3>
+    <h3 class="detail-width detail-title"><i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{project.sale_zone_name}}</i>{{project.name}}</h3>
     <button bindtap="sharetips" class="sharebtn" wx:if="{{readOnly != 1}}"><image src="../../../images/footer/pyq.png" /><text>分享到朋友圈</text></button>
     <!--<view class="detail-width">
       <text class="detail-normal detail-mr">价格</text>
@@ -245,7 +245,7 @@
         <image class="dialog-img" src="{{project.pics[0].img}}"></image>
         
         <view class="dialog-info" style="margin-top: 20rpx;">
-          <h6 style="font-size: 35rpx;font-weight: bold;color: #666;"><i wx:if="{{!project.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{project.name}}</h6>
+          <h6 style="font-size: 35rpx;font-weight: bold;color: #666;"><i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>{{project.name}}</h6>
           <view class="dialog-word dialog-black" style="margin-top: 15rpx;color: #999;">库存{{project.left_count}}件   <text wx:if="{{project.have_size && (sname || cname)}}">(已选：{{cname}} {{sname}})</text></view>
           <view class="dialog-word dialog-red" style="font-size: 35rpx;margin-top: 25rpx;">
             <!-- {{project.price}}提货券 -->
@@ -315,7 +315,7 @@
       <view class="dialog-content">
         <image class="dialog-img" src="{{project.pics[0].img}}"></image>
         <view class="dialog-info" style="margin-top: 20rpx;">
-          <h6 style="font-size: 35rpx;font-weight: bold;color: #666;"><i wx:if="{{!project.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{project.name}}</h6>
+          <h6 style="font-size: 35rpx;font-weight: bold;color: #666;"><i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>{{project.name}}</h6>
           <view class="dialog-word dialog-black" style="margin-top: 15rpx;color: #999;">库存{{project.left_count}}件   <text wx:if="{{project.have_size && (sname || cname)}}">(已选：{{cname}} {{sname}})</text></view>
           <view class="dialog-word dialog-red" style="font-size: 35rpx;margin-top: 25rpx;">
             <!-- {{project.price}}提货券 -->

pages/projects/projects.js

@@ -24,6 +24,8 @@ Page({
 	selectShow: false,//控制下拉列表的显示隐藏，false隐藏、true显示
 	selectData: [],//下拉列表的数据
 	index: 0,//选择的下拉列表下标
+	zones:[],
+	currentZones:0
   },
   onLoad: function (options) {
 	  const info = wx.getSystemInfoSync();
@@ -113,10 +115,22 @@ Page({
       that.setData({
         navData: res.data
       })
+	  that.getZones()
       that.getProjects()
     }
     _request.$get(url, params, success)
   },
+  getZones:function(){
+	  var that = this
+	  var url = '/v1/zones'
+	  var params = {}
+	  var success = function (res) {
+	    that.setData({
+	      zones: res.data
+	    })
+	  }
+	  _request.$get(url, params, success)
+  },
   getProjects: function () {
     var id = this.data.navData[this.data.currentTab].id
     if (!this.data.vershow) {
@@ -141,6 +155,10 @@ Page({
 		  sale_sort:this.data.sale_sort
 		}
 	}
+	
+	if(this.data.currentZones != 0){
+		params['sale_sort'] = this.data.currentZones
+	}
     
     var success = function (res) {
       if (that.data.projects_change) {
@@ -266,6 +284,7 @@ Page({
 		    projects_page: 1,
 		    projects_change: true,
 			selectShow: !this.data.selectShow,
+			currentZones: 0
 		  })
 		  this.getProjects()
 		}
@@ -274,5 +293,20 @@ Page({
 		this.setData({
 		  selectShow: false
 		});
+	},
+	selectzones(e){
+		var cur = e.currentTarget.dataset.id;
+		if (this.data.currentZones == cur) {
+		  return false
+		} else {
+		  this.setData({
+		    currentZones: cur,
+		    projects_more: true,
+		    projects_page: 1,
+		    projects_change: true,
+			projects: []
+		  })
+		  this.getProjects()
+		}
 	}
 })

pages/projects/projects.wxml

@@ -31,14 +31,19 @@
 						    </view>
 						</view>
 					</view>
-		 		  <view class="sortlist-item" bindtap="sortchangenormal">热门精选</view>
+					
+					
+		 		  <!-- <view class="sortlist-item" bindtap="sortchangenormal">热门精选</view>
 		 		  <view class="sortlist-item" bindtap="salesort">销量排行 <image src="../../images/footer/up.png" wx:if="{{sale_sort == 2}}"/><image src="../../images/footer/down.png" wx:if="{{sale_sort == 1}}"/></view>
-		 		  <view class="sortlist-item" bindtap="pricesort">价格排序 <image src="../../images/footer/up.png" wx:if="{{price_sort == 2}}"/><image src="../../images/footer/down.png" wx:if="{{price_sort == 1}}"/></view>
+		 		  <view class="sortlist-item" bindtap="pricesort">价格排序 <image src="../../images/footer/up.png" wx:if="{{price_sort == 2}}"/><image src="../../images/footer/down.png" wx:if="{{price_sort == 1}}"/></view> -->
+				 
+				 <!-- 新调整 -->
+				 <view class="sortlist-item" bindtap="selectzones" wx:for='{{zones}}' wx:for-item="zonesItem" data-id='{{zonesItem.id}}'>{{zonesItem.name}}</view>
 		 </view>
       </view>
       <view class="project" wx:key="{{index}}" wx:for="{{projects}}"  data-val="{{item.id}}" bindtap="toProject">
         <view class="project-left">
-          <view class="project-title ellipsisLn"><i wx:if="{{!item.use_quan}}" style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">特惠</i>{{item.name}}</view>
+          <view class="project-title ellipsisLn"><i style="display: inline-block;background: #F44336;color: #fff;padding: 0px 5px;font-size: 11px;line-height: 35rpx;margin-right: 10rpx;vertical-align: middle;">{{item.sale_zone_name}}</i>{{item.name}}</view>
           <view class="project-count">已售{{item.sold_count}}件</view>
           <view class="project-price" style="padding-top:25rpx">
             <image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha-img"/>