345324

@@ -15,6 +15,7 @@ App({
     // 获取用户信息
     // 获取用户信息
     wx.getSetting({
     wx.getSetting({
       success: res => {
       success: res => {
+        
         if (res.authSetting['scope.userInfo']) {
         if (res.authSetting['scope.userInfo']) {
           // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
           // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
           wx.getUserInfo({
           wx.getUserInfo({
@@ -155,7 +156,7 @@ App({
   },
   },
   globalData: {
   globalData: {
     userInfo: null,
     userInfo: null,
-    url:'http://winesbook.cn/static/images_mini/',
+    url:'https://winesbook.cn/static/images_mini/',
     baseUrl:'https://winesbook.cn/api'
     baseUrl:'https://winesbook.cn/api'
   }
   }
 })
 })

 {
 {
   "pages": [
   "pages": [
+    
     "pages/homapage/homepage",
     "pages/homapage/homepage",
+    "pages/login/login",
     "pages/forgetmima/forgetmima",
     "pages/forgetmima/forgetmima",
     "pages/setmima/setmima",
     "pages/setmima/setmima",
     "pages/myblock/shezhimima/shezhimima",
     "pages/myblock/shezhimima/shezhimima",
     "pages/enteryanzheng/enteryanzheng",
     "pages/enteryanzheng/enteryanzheng",
-    "pages/login/login",
     "pages/homeblock/zhinengselect/zhinengselect",
     "pages/homeblock/zhinengselect/zhinengselect",
     "pages/homeblock/search/search",
     "pages/homeblock/search/search",
     "pages/find/find",
     "pages/find/find",
@@ -52,7 +53,10 @@
     "pages/findblock/jiulist/jiulist",
     "pages/findblock/jiulist/jiulist",
     "pages/findblock/putongwenzhang/putongwenzhang",
     "pages/findblock/putongwenzhang/putongwenzhang",
     "pages/findblock/wenzhangdetail/wenzhangdetail",
     "pages/findblock/wenzhangdetail/wenzhangdetail",
-    "pages/homeblock/bofangexample/bofangexample"
+    "pages/homeblock/bofangexample/bofangexample",
+    "pages/myblock/jiudan/jiudan",
+    "pages/myblock/yonghufankui/yonghufankui",
+    "pages/myblock/xiugaimima/xiugaimima"
   ],
   ],
   "window": {
   "window": {
     "backgroundTextStyle": "light",
     "backgroundTextStyle": "light",

@@ -110,3 +110,25 @@ image {
 .nambottom .namebottomitem:first-child {
 .nambottom .namebottomitem:first-child {
   padding-left: 0;
   padding-left: 0;
 }
 }
+
+.nodataimg{
+  width:124rpx;
+  height:249rpx;
+  font-size: 0;
+  margin:350rpx auto 0;
+}
+.nodataimg image{
+  width:100%;
+  height:100%;
+}
+
+.cannodataimg{
+   width:124rpx;
+  height:249rpx;
+  font-size: 0;
+  margin:73rpx auto 0;
+}
+.cannodataimg image{
+  width:100%;
+  height:100%;
+}

@@ -10,7 +10,7 @@ Page({
     'http://winesbook.cn/static/images_mini/aicon_60@2x.png'
     'http://winesbook.cn/static/images_mini/aicon_60@2x.png'
     ],
     ],
     indicatorDots: false,
     indicatorDots: false,
-    autoplay: false,
+    autoplay: true,
     interval: 2000,
     interval: 2000,
     duration: 1000,
     duration: 1000,
     currentSwiper: 0,
     currentSwiper: 0,
@@ -23,9 +23,13 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
-    this.setData({
-      url: app.globalData.url
-    })
+    let that=this;
+    setTimeout(function(){
+      that.setData({
+        url: app.globalData.url
+      })
+    },1000)
+   
 
 
     
     
   },
   },
@@ -168,6 +172,7 @@ Page({
     }
     }
 
 
   },
   },
+  
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
@@ -214,6 +219,7 @@ Page({
    * 用户点击右上角分享
    * 用户点击右上角分享
    */
    */
   onShareAppMessage: function (e) {
   onShareAppMessage: function (e) {
+    console.log(9090)
     let that = this;
     let that = this;
     console.log(e)
     console.log(e)
     let id=e.target.dataset.id;
     let id=e.target.dataset.id;

 <view class="swiper_image">
 <view class="swiper_image">
-  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange">
+  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange" circular="true">
     <block wx:for="{{imgUrls}}" wx:key="doct">
     <block wx:for="{{imgUrls}}" wx:key="doct">
-      <swiper-item >
-        <image src="{{item.image}}" data-index='{{index}}' class="slide-image"  width="355" height="150" />
+      <swiper-item>
+        <image src="{{item.image}}" data-index='{{index}}' class="slide-image" width="355" height="150" />
       </swiper-item>
       </swiper-item>
     </block>
     </block>
   </swiper>
   </swiper>
@@ -18,10 +18,10 @@
 <view class="middlehead" bindtap="everyjiu">
 <view class="middlehead" bindtap="everyjiu">
   <view class="rilihead">
   <view class="rilihead">
     <view class="rili">
     <view class="rili">
-      <image src="{{url}}aicon_62x.png"></image>
+      <image src="{{url}}aicon_62x.png" mode="aspectFit"></image>
     </view>
     </view>
     <view class="every">
     <view class="every">
-      <image src="{{url}}aicon_63x.png"></image>
+      <image src="{{url}}aicon_63x.png" mode="aspectFit"></image>
     </view>
     </view>
   </view>
   </view>
 
 
@@ -34,22 +34,22 @@
 
 
 </view>
 </view>
 <view class="dayjiu" bindtap="everyjiu">
 <view class="dayjiu" bindtap="everyjiu">
-<view class="tast" wx:for="{{news}}" wx:key='' catchtap="jumpnewdetail" data-id="{{item.wine_id}}">
-  <view class="tastimg">
-    <image src="{{item.thumb}}"></image>
-  </view>
+  <view class="tast" wx:for="{{news}}" wx:key='' catchtap="jumpnewdetail" data-id="{{item.wine_id}}">
+    <view class="tastimg">
+      <image src="{{item.thumb}}"></image>
+    </view>
 
 
-  <view class="tastcontent">
-    <view class="tasttitle">{{item.title}}</view>
-    <view class="tasttext">{{item.description}}</view>
-  </view>
+    <view class="tastcontent">
+      <view class="tasttitle">{{item.title}}</view>
+      <view class="tasttext">{{item.description}}</view>
+    </view>
 
 
-</view>
+  </view>
 </view>
 </view>
 
 
 
 
-<view class="wineblock" wx:for="{{list}}" wx:key="" bindtap="jump" data-type="{{item.type}}" data-id="{{item.id}}">
-  <view class="middlehead">
+<view class="wineblock" wx:for="{{list}}" wx:key="">
+  <view class="middlehead" bindtap="jump" data-type="{{item.type}}" data-id="{{item.id}}">
     <view class="rilihead">
     <view class="rilihead">
       <view class="rili">
       <view class="rili">
         <image src="{{item.icon}}" mode="aspectFit"></image>
         <image src="{{item.icon}}" mode="aspectFit"></image>
@@ -67,18 +67,18 @@
     </view>
     </view>
 
 
   </view>
   </view>
-  <view class="winetitle" catchtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}">{{item.article.share_content}}</view>
+  <view class="winetitle" bindtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}">{{item.article.title}}</view>
+
 
 
 
 
-  
-  <view class="wineimg" wx:if="{{item.type==2}}" data-url="{{item.article.video}}" catchtap='entervideo' catchtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}">
+  <view class="wineimg" wx:if="{{item.type==2}}" data-url="{{item.article.video}}" catchtap='entervideo' bindtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}">
     <image src="{{item.article.video_image}}"></image>
     <image src="{{item.article.video_image}}"></image>
 
 
     <view class="vioimg">
     <view class="vioimg">
-        <image src="{{url}}/aicon_70x.png"></image>
+      <image src="{{url}}/aicon_70x.png"></image>
     </view>
     </view>
   </view>
   </view>
-  <view class="wineimg" wx:else catchtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}"> 
+  <view class="wineimg" wx:else bindtap='enterdetail' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}">
     <image src="{{item.article.thumb}}"></image>
     <image src="{{item.article.thumb}}"></image>
   </view>
   </view>
 
 
@@ -95,8 +95,8 @@
       <view class="winerighttou">
       <view class="winerighttou">
         <view class="winerighttouimg" catchtap='dianzan' data-userid="{{item.article.user_id}}" data-type="{{item.type}}" data-id="{{item.article.id}}" data-winemaker_id="{{item.article.winemaker_id}}">
         <view class="winerighttouimg" catchtap='dianzan' data-userid="{{item.article.user_id}}" data-type="{{item.type}}" data-id="{{item.article.id}}" data-winemaker_id="{{item.article.winemaker_id}}">
           <image src="{{url}}aicon_71x.png" wx:if="{{item.article.is_good==1}}"></image>
           <image src="{{url}}aicon_71x.png" wx:if="{{item.article.is_good==1}}"></image>
-           <image src="{{url}}aicon_66x.png"wx:else></image>
-        
+          <image src="{{url}}aicon_66x.png" wx:else></image>
+
         </view>
         </view>
         <view class="winezan">{{item.article.good_count}}</view>
         <view class="winezan">{{item.article.good_count}}</view>
       </view>
       </view>
@@ -110,9 +110,9 @@
       <view class="winerighttou">
       <view class="winerighttou">
         <view class="winerighttouimg" catchtap='share'>
         <view class="winerighttouimg" catchtap='share'>
           <image src="{{url}}aicon_68x.png"></image>
           <image src="{{url}}aicon_68x.png"></image>
-          <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.article.id}}" data-type="{{item.type}}"  data-winemaker_id="{{item.article.winemaker_id}}"></button>
+          <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.article.id}}" data-type="{{item.type}}" data-winemaker_id="{{item.article.winemaker_id}}"></button>
         </view>
         </view>
-       
+
 
 
       </view>
       </view>
     </view>
     </view>

@@ -191,10 +191,15 @@ image{
   justify-content: space-around
   justify-content: space-around
 }
 }
 .winerighttouimg{
 .winerighttouimg{
-  width:30rpx;
+  width:60rpx;
   height:28rpx;
   height:28rpx;
   font-size: 0;
   font-size: 0;
   position:relative;
   position:relative;
+  text-align: center
+}
+.winerighttouimg image{
+  width:30rpx;
+  margin:0 auto;
 }
 }
 .lj_share{
 .lj_share{
   width:60rpx;
   width:60rpx;
@@ -215,7 +220,7 @@ button::after{
   align-items: center
   align-items: center
 }
 }
 .wineeng{
 .wineeng{
-  color:#666666;
+  color:#666666;     
   font-size: 28rpx;
   font-size: 28rpx;
   margin-left: 20rpx;
   margin-left: 20rpx;
 }
 }
@@ -223,6 +228,9 @@ button::after{
   color:#666666;
   color:#666666;
   font-size:28rpx;
   font-size:28rpx;
   margin-left:10rpx;
   margin-left:10rpx;
+  /* height:28rpx;
+  line-height:28rpx; */
+  margin-top:1rpx;
 }
 }
 .wineblock{
 .wineblock{
   border-bottom: 14rpx solid #F2F2F2;
   border-bottom: 14rpx solid #F2F2F2;

@@ -148,6 +148,15 @@ Page({
 
 
     })
     })
   },
   },
+
+  jumpbrand(e) {
+    let id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+    })
+
+
+  },
   
   
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
@@ -160,6 +169,10 @@ Page({
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
   onShow: function () {
   onShow: function () {
+    this.setData({
+      page:1,
+      rec_list:[]
+    })
     this.getjiudandetail()
     this.getjiudandetail()
   },
   },
 
 

@@ -18,27 +18,27 @@
   <view class="jiudanfenitem">
   <view class="jiudanfenitem">
       <view class="jiudanfenimg" bindtap="collect" data-id="{{info.user_id}}">
       <view class="jiudanfenimg" bindtap="collect" data-id="{{info.user_id}}">
        <image src="{{url}}/aicon_10x.png" wx:if="{{info.is_favorite==1}}"></image>
        <image src="{{url}}/aicon_10x.png" wx:if="{{info.is_favorite==1}}"></image>
-          <image src="{{url}}/aicon_09x.png" wx:else></image>
+          <image src="{{url}}aicon_09x.png" wx:else></image>
       </view>
       </view>
       <view class="collect">收藏</view>
       <view class="collect">收藏</view>
   </view>
   </view>
    <view class="jiudanfenitem">
    <view class="jiudanfenitem">
       <view class="jiudanfenimg zhuan">
       <view class="jiudanfenimg zhuan">
-          <image src="{{url}}/aicon_68x.png"></image>
+          <image src="{{url}}aicon_68x.png"></image>
            <button class="lj_share" catchtap="buildshare" open-type='share'></button>
            <button class="lj_share" catchtap="buildshare" open-type='share'></button>
       </view>
       </view>
       <view class="collect">转发</view>
       <view class="collect">转发</view>
   </view>
   </view>
    <view class="jiudanfenitem" bindtap="pinglun" data-id="{{info.id}}">
    <view class="jiudanfenitem" bindtap="pinglun" data-id="{{info.id}}">
       <view class="jiudanfenimg">
       <view class="jiudanfenimg">
-          <image src="{{url}}/aicon_67x.png"></image>
+          <image src="{{url}}aicon_67x.png"></image>
       </view>
       </view>
       <view class="collect">{{info.comment_count}}</view>
       <view class="collect">{{info.comment_count}}</view>
   </view>
   </view>
    <view class="jiudanfenitem" bindtap="dianzan" data-id="{{info.user_id}}">
    <view class="jiudanfenitem" bindtap="dianzan" data-id="{{info.user_id}}">
       <view class="jiudanfenimg">
       <view class="jiudanfenimg">
-          <image src="{{url}}/aicon_46x.png" wx:if="{{info.is_good==1}}"></image>
-          <image src="{{url}}/aicon_47x.png" wx:else></image>
+          <image src="{{url}}aicon_46x.png" wx:if="{{info.is_good==1}}"></image>
+          <image src="{{url}}aicon_47x.png" wx:else></image>
          
          
       </view>
       </view>
       <view class="collect">{{info.good_count}}</view>
       <view class="collect">{{info.good_count}}</view>
@@ -50,7 +50,11 @@
 
 
   <view class="jiupin" >
   <view class="jiupin" >
 
 
-    <view class="searchitem" wx:for="{{rec_list}}" wx:key=''>
+  <view class="nodataimg" wx:if="{{rec_list.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+
+    <view class="searchitem" wx:for="{{rec_list}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}"> 
       <view class="searchitemleft">
       <view class="searchitemleft">
         <view class="itemleftimg">
         <view class="itemleftimg">
           <image src="{{item.logo}}"></image>
           <image src="{{item.logo}}"></image>

@@ -166,6 +166,7 @@ Page({
   },
   },
   //进入详情页
   //进入详情页
   detail(e){
   detail(e){
+    console.log(9090)
     let id=e.currentTarget.dataset.id;
     let id=e.currentTarget.dataset.id;
     wx.navigateTo({
     wx.navigateTo({
       url: '/pages/findblock/jiudandetail/jiudandetail?id='+id,
       url: '/pages/findblock/jiudandetail/jiudandetail?id='+id,

+<view class="nodataimg" wx:if="{{peoplelist.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+
+<block wx:else>
 <view class="wineblock" wx:for="{{peoplelist}}" wx:key=''>
 <view class="wineblock" wx:for="{{peoplelist}}" wx:key=''>
-<view class="date">{{item.date}}</view>
-<view class='wine_list' >
-  <view class='list_item' wx:for="{{item.list}}" wx:key="" bindtap="detail" data-id="{{item.id}}">
-    <view class='img_box'>
-      <image src='{{item.avatar}}'></image>
-    </view>
-    <view class='wine_title'>{{item.title}}</view>
-    <view class='wine_name'>{{item.user_nickname}}</view>
-    <view class='wine_leavel'>lv{{item.level}}</view>
-    <view class='action_box'>
-      <view class='single_action' catchtap="zan" data-id="{{item.user_id}}">
-        <view class='zan_icon'>
-          <image src='/img/aicon_46.png' mode='widthFix' wx:if="{{item.is_good==1}}"></image>
-          <image src='/img/aicon_47.png' mode='widthFix' wx:else></image>
+  <view class="date">{{item.date}}</view>
+  <view class='wine_list'>
+    <view class='list_item' wx:for="{{item.list}}" wx:key="">
+
+      <view class="tou" bindtap="detail" data-id="{{item.id}}">
+        <view class='img_box'>
+          <image src='{{item.avatar}}'></image>
         </view>
         </view>
-        {{item.good_count}}
+        <!-- <view class='wine_title'>{{item.title}}</view> -->
+        <view class='wine_name'>{{item.user_nickname}}</view>
+        <view class='wine_leavel'>lv{{item.level}}</view>
       </view>
       </view>
-      <view class='single_action' catchtap="pinglun" data-id="{{item.id}}">
-        <view class='zan_icon'>
-          <image src='/img/aicon_67.png' mode='widthFix'></image>
+
+      <view class='action_box'>
+        <view class='single_action' catchtap="zan" data-id="{{item.user_id}}">
+          <view class='zan_icon'>
+            <image src='/img/aicon_46.png' mode='widthFix' wx:if="{{item.is_good==1}}"></image>
+            <image src='/img/aicon_47.png' mode='widthFix' wx:else></image>
+          </view>
+          {{item.good_count}}
         </view>
         </view>
-        {{item.comment_count}}
-      </view>
-      <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}">
-        <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
-        <view class='min_action_box'>
-          <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
-          <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
+        <view class='single_action' catchtap="pinglun" data-id="{{item.id}}">
+          <view class='zan_icon'>
+            <image src='/img/aicon_67.png' mode='widthFix'></image>
+          </view>
+          {{item.comment_count}}
+        </view>
+        <view class='single_action {{item.choose?"active":""}}' catchtap='shareAction' data-id="{{item.id}}">
+          <image src='/img/gengduo.png' mode='widthFix' class='moreIcon'></image>
+          <view class='min_action_box'>
+            <view class='action_btn' wx:if="{{item.is_favorite==0}}" catchtap="collect" data-id="{{item.user_id}}">收藏</view>
+            <view class='action_btn yishou' wx:else catchtap="collect" data-id="{{item.user_id}}">已收藏</view>
 
 
-          <view class='action_btn'>分享</view>
-           <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}"   ></button>
-        </view> 
+            <view class='action_btn'>分享</view>
+            <button class="lj_share" catchtap="buildshare" open-type='share' data-id="{{item.id}}"></button>
+          </view>
+        </view>
       </view>
       </view>
     </view>
     </view>
+
   </view>
   </view>
- 
-</view>
 
 
 </view>
 </view>
+</block>

@@ -71,7 +71,7 @@ page{
   margin-right: 10rpx;
   margin-right: 10rpx;
 }
 }
 .moreIcon{
 .moreIcon{
-  width: 4rpx;
+  width: 5rpx;
 }
 }
 .min_action_box{
 .min_action_box{
   width: 134rpx;
   width: 134rpx;
@@ -141,4 +141,9 @@ button::after{
   border:none;
   border:none;
   outline: none;
   outline: none;
   background: transparent
   background: transparent
+}
+.tou{
+  display:flex;
+  flex-direction: column;
+  align-items: center
 }
 }

+<view class="nodataimg" wx:if="{{winelist.length==0}}">
+    <image src="/img/wushuju.png"></image>
+</view>
+
+<block wx:else>
 <view class="jiupin" wx:for="{{winelist}}" wx:key=''>
 <view class="jiupin" wx:for="{{winelist}}" wx:key=''>
 
 
   <view class="date">{{item.date}}</view>
   <view class="date">{{item.date}}</view>
 
 
-  <view class="searchitem" wx:for="{{item.list}}" wx:key="" bindtap="jump" data-id="{{item.wine_id}}">
-    <view class="searchitemleft">
+  <view class="searchitem" wx:for="{{item.list}}" wx:key="" >
+    <view class="searchitemleft" bindtap="jump" data-id="{{item.wine_id}}">
       <view class="itemleftimg">
       <view class="itemleftimg">
         <image src="{{item.thumb}}"></image>
         <image src="{{item.thumb}}"></image>
       </view>
       </view>
@@ -19,12 +24,14 @@
       </view>
       </view>
     </view>
     </view>
 
 
-    <view class="starimg" catchtap="collect" data-id="{{item.wine_id}}">
+    <view class="searchitemright" bindtap="collect" data-id="{{item.wine_id}}">
+
+    <view class="starimg">
       <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
       <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
       <image src="{{url}}aicon_09x.png" wx:else></image>
       <image src="{{url}}aicon_09x.png" wx:else></image>
-
     </view>
     </view>
-
+    </view>
   </view>
   </view>
 
 
-</view>
+</view>
+</block>

@@ -7,6 +7,7 @@
    border-bottom: 1rpx solid #f5f5f5;
    border-bottom: 1rpx solid #f5f5f5;
  }
  }
  .searchitemleft{
  .searchitemleft{
+   width:670rpx;
    display:flex;
    display:flex;
    align-items: center
    align-items: center
  }
  }
@@ -76,4 +77,10 @@
    padding: 11rpx 32rpx;
    padding: 11rpx 32rpx;
    box-sizing: border-box;
    box-sizing: border-box;
    background: #F2F2F2
    background: #F2F2F2
+ }
+ .searchitemright{
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   flex:1;
  }
  }

-<view class="niangjiulist">
-    <view class="niangjiuitem" wx:for="{{list}}" wx:key="" bindtap="niangjiuteacherdetail" data-id="{{item.winemaker_id}}">
-        <view class="teachimg">
-            <image src="{{item.avatar}}"></image>
+
+<view class="nodataimg" wx:if="{{list.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+
+<view class="niangjiulist" wx:else>
+  <view class="niangjiuitem" wx:for="{{list}}" wx:key="" >
+
+  <view bindtap="niangjiuteacherdetail" data-id="{{item.winemaker_id}}">
+   <view class="teachimg">
+      <image src="{{item.avatar}}"></image>
+    </view>
+    <view class="jiuname">{{item.name}}</view>
+
+    <view class="atten" wx:if="{{item.is_concern==0}}" catchtap="atten" data-id="{{item.winemaker_id}}">关注</view>
+    <view class="atten aten1" wx:else catchtap="atten" data-id="{{item.winemaker_id}}">取消关注</view>
+  
+  </view>
+   
+
+    <view class="jiubottom">
+      <view class="jiuleft">
+        <view class="jiuleftimg" catchtap="zan" data-id="{{item.winemaker_id}}">
+          <image src="{{url}}/aicon_47x.png" wx:if="{{item.is_good==0}}"></image>
+          <image src="{{url}}/aicon_46x.png" wx:else></image>
         </view>
         </view>
-        <view class="jiuname">{{item.name}}</view>
-
-        <view class="atten" wx:if="{{item.is_concern==0}}" catchtap="atten" data-id="{{item.winemaker_id}}">关注</view>
-        <view class="atten aten1" wx:else catchtap="atten" data-id="{{item.winemaker_id}}">取消关注</view>
-
-        <view class="jiubottom">
-            <view class="jiuleft">
-                <view class="jiuleftimg" catchtap="zan" data-id="{{item.winemaker_id}}">
-                    <image src="{{url}}/aicon_47x.png" wx:if="{{item.is_good==0}}"></image>
-                    <image src="{{url}}/aicon_46x.png" wx:else></image>
-                </view>
-                <view class="jiuzan">{{item.good_count}}</view>
-            </view>
-
-            <view class="jiumiddle" catchtap="ping" data-id="{{item.winemaker_id}}">
-              <view class="middleimg">
-                  <image src="{{url}}/aicon_67x.png"></image>
-              </view>
-              <view class="tiao">{{item.comment_count}}</view>
-            </view>
-
-            <view class="jiuright">
-              <image src="{{url}}/aicon_68x.png"></image>
-              <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.winemaker_id}}" ></button>
-            </view>
+        <view class="jiuzan">{{item.good_count}}</view>
+      </view>
+
+      <view class="jiumiddle" catchtap="ping" data-id="{{item.winemaker_id}}">
+        <view class="middleimg">
+          <image src="{{url}}/aicon_67x.png"></image>
         </view>
         </view>
+        <view class="tiao">{{item.comment_count}}</view>
+      </view>
+
+      <view class="jiuright">
+        <image src="{{url}}/aicon_68x.png"></image>
+        <button class="lj_share" bindtap="buildshare" open-type='share' data-id="{{item.winemaker_id}}"></button>
+      </view>
     </view>
     </view>
-   
-</view>
+  </view>
+
+</view>

@@ -63,17 +63,20 @@ Page({
 
 
       let newlist=that.data.list;
       let newlist=that.data.list;
       for(var obj of newlist){
       for(var obj of newlist){
-        if (obj.is_good==0){
-          obj.is_good=1;
-          obj.good_count = obj.good_count+1
-        }else{
-          obj.is_good=0;
-          if (obj.good_count==0){
-            obj.obj.good_count=0
-          }else{
-            obj.good_count = obj.good_count-1
+        if(obj.id==id){
+          if (obj.is_good == 0) {
+            obj.is_good = 1;
+            obj.good_count = obj.good_count + 1
+          } else {
+            obj.is_good = 0;
+            if (obj.good_count == 0) {
+              obj.obj.good_count = 0
+            } else {
+              obj.good_count = obj.good_count - 1
+            }
           }
           }
         }
         }
+       
       }
       }
 
 
       that.setData({
       that.setData({

+<view class="nodataimg" wx:if="{{list.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
 
 
-<view class="nodata" wx:if="{{list.length==0}}" class="nodata">暂无数据</view>
 <block wx:else>
 <block wx:else>
 <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
 <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
  
  

@@ -44,6 +44,9 @@ Page({
         info: res.info,
         info: res.info,
        
        
       })
       })
+      wx.setNavigationBarTitle({
+        title: res.info.title //页面切换，更换页面标题
+      })
 
 
 
 
 
 

@@ -128,11 +128,11 @@ image{
 }
 }
 
 
 .lj_share{
 .lj_share{
-  width:20rpx;
+  width:100rpx;
   height:30rpx;
   height:30rpx;
   border:none;
   border:none;
   position: absolute;
   position: absolute;
-  right:0;
+  right:-52rpx;
   top:0;
   top:0;
   background: transparent
   background: transparent
 
 

-<view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
+<!-- <view class="wineblock" wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
   <view class="winetitle">{{item.title}}</view>
   <view class="winetitle">{{item.title}}</view>
   <view class="wineimg" catchtap="entervideo" data-url="{{item.video}}">
   <view class="wineimg" catchtap="entervideo" data-url="{{item.video}}">
     <image src="{{item.video_image}}"></image>
     <image src="{{item.video_image}}"></image>
@@ -25,13 +25,22 @@
       </view>
       </view>
     </view>
     </view>
   </view>
   </view>
+</view> -->
+
+<view class="nodataimg" wx:if="{{list.length==0}}">
+<image src="/img/wushuju.png"></image>
 </view>
 </view>
-<view class="wineblock">
 
 
-  <view class="winetitle">浓香酒酿酒大师：沈才宏</view>
+<block wx:else>
+<view class="wineblock"  wx:for="{{list}}" wx:key='' bindtap="detail" data-id="{{item.id}}">
+
+  <view class="winetitle">{{item.title}}</view>
 
 
-  <view class="wineimg">
-    <image src="{{url}}aicon_64.png"></image>
+  <view class="wineimg" catchtap="entervideo" data-url="{{item.video}}">
+    <image src="{{item.video_image}}"></image>
+    <view class="vimg">
+      <image src="{{url}}/aicon_70x.png"></image>
+    </view>
   </view>
   </view>
 
 
   <view class="winebottom">
   <view class="winebottom">
@@ -69,3 +78,4 @@
   </view>
   </view>
 
 
 </view>
 </view>
+</block>

 .winetitle{
 .winetitle{
   color:#1A1A1A;
   color:#1A1A1A;
   font-size: 28rpx;
   font-size: 28rpx;
-  margin-left:36rpx;
+  /* margin-left:36rpx; */
+  padding: 0 36rpx;
+  box-sizing: border-box;
   font-weight: bold
   font-weight: bold
 }
 }
 .wineimg{
 .wineimg{
@@ -14,6 +16,8 @@
   display:flex;
   display:flex;
   justify-content: space-between;
   justify-content: space-between;
   align-items: center;
   align-items: center;
+  
+  padding: 0 30rpx;
   box-sizing: border-box;
   box-sizing: border-box;
   margin-top:30rpx;
   margin-top:30rpx;
 }
 }
@@ -40,10 +44,14 @@
   justify-content: space-between
   justify-content: space-between
 }
 }
 .winerighttouimg{
 .winerighttouimg{
-  width:30rpx;
+  width:60rpx;
   height:28rpx;
   height:28rpx;
   font-size: 0;
   font-size: 0;
-  position: relative
+  position: relative;
+  text-align: center
+}
+.winerighttouimg image{
+  width:30rpx;
 }
 }
 .winerighttou{
 .winerighttou{
   display:flex;
   display:flex;

@@ -138,10 +138,11 @@ Page({
   },
   },
   send(e){
   send(e){
     let that=this;
     let that=this;
-    let content=e.detail.value;
-    if(content==''){
+    
+    if(that.data.content==''){
       wx.showToast({
       wx.showToast({
         title: '请输入评论内容',
         title: '请输入评论内容',
+        icon:'none'
       })
       })
     }else{
     }else{
       let url = 'index/Common/comment', params = {
       let url = 'index/Common/comment', params = {
@@ -158,7 +159,8 @@ Page({
         })
         })
         that.setData({
         that.setData({
           page:1,
           page:1,
-          comment_list:[]
+          comment_list:[],
+          content:''
 
 
         })
         })
 
 

@@ -59,7 +59,7 @@
 </view>
 </view>
 <view class="pingjiabottom">
 <view class="pingjiabottom">
   <view class="pbleft">
   <view class="pbleft">
-    <input placeholder='输入评论的内容' placeholder-class='enterping' bindinput="entercontent"/>
+    <input placeholder='输入评论的内容' placeholder-class='enterping' value="{{content}}" bindinput="entercontent"/>
   </view>
   </view>
 
 
   <view class="pbright" bindtap="send">发送</view>
   <view class="pbright" bindtap="send">发送</view>

+page{
+  overflow-x:hidden;
+}
+
 .detailhead {
 .detailhead {
   width: 750rpx;
   width: 750rpx;
   height: 483rpx;
   height: 483rpx;
@@ -94,7 +98,7 @@
 .winezan {
 .winezan {
   color: #666;
   color: #666;
   font-size: 28rpx;
   font-size: 28rpx;
-  margin-left: 5rpx;
+  margin-left: 10rpx;
 }
 }
 
 
 .wineblock {
 .wineblock {
@@ -224,4 +228,7 @@ image {
 button::after{
 button::after{
   border:none;
   border:none;
   outline:none;
   outline:none;
+}
+.niangjiubox{
+  overflow-x: hidden;
 }
 }

@@ -17,7 +17,9 @@ Page({
     disabled:false,
     disabled:false,
     yanzhengcode:'',
     yanzhengcode:'',
     newpassword:'',
     newpassword:'',
-    dengshow:false
+    dengshow:false,
+    newmima:true,
+   
   },
   },
 
 
   /**
   /**
@@ -27,15 +29,13 @@ Page({
     this.setData({
     this.setData({
       url: app.globalData.url
       url: app.globalData.url
     })
     })
-
-   
   },
   },
 
 
   enterphone(e){
   enterphone(e){
     this.setData({
     this.setData({
       phone:e.detail.value
       phone:e.detail.value
     })
     })
-    this.yanhzengphone()
+    this.yanhzengphone();
     
     
   },
   },
 
 
@@ -51,6 +51,11 @@ Page({
       })
       })
     }
     }
   },
   },
+  showmima(){
+    this.setData({
+      newmima:false
+    })
+  },
   clearphone(){
   clearphone(){
     console.log(342)
     console.log(342)
     this.setData({
     this.setData({
@@ -70,7 +75,6 @@ Page({
         first:false,
         first:false,
         second:true
         second:true
       })
       })
-
       this.getcode()
       this.getcode()
     }
     }
 
 

@@ -41,11 +41,14 @@
   <view class="yanzheng mima">
   <view class="yanzheng mima">
     <view class="yanzhengmiddle yanzhengma">
     <view class="yanzhengmiddle yanzhengma">
 
 
-      <input placeholder='设置新密码' placeholder-class='enterphone' bindinput="setnewmima" type="password" value="{{newpassword}}"/>
+      <input placeholder='设置新密码' placeholder-class='enterphone' bindinput="setnewmima" type="password" value="{{newpassword}}" wx:if="{{newmima}}"/>
+
+      <input placeholder='设置新密码' placeholder-class='enterphone' bindinput="setnewmima" type="text" value="{{newpassword}}" wx:else/>
+      
     </view>
     </view>
     <view class="mimaimg">
     <view class="mimaimg">
       
       
-      <view class="eyeimg">
+      <view class="eyeimg" bindtap="showmima">
         <image src="{{url}}/bicon_13x.png"></image>
         <image src="{{url}}/bicon_13x.png"></image>
       </view>
       </view>
     </view>
     </view>

@@ -175,10 +175,15 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function(options) {
   onLoad: function(options) {
-    this.setData({
-      url: app.globalData.url
-    })
-    console.log(this.data.url)
+    let that=this;
+    setTimeout(function(){
+      that.setData({
+        url: app.globalData.url
+      })
+    },1000)
+    
+    
+   
     this.getshailist();
     this.getshailist();
    
    
     this.getcity();
     this.getcity();
@@ -453,37 +458,58 @@ Page({
     let newshaikind = this.data.shaikind;
     let newshaikind = this.data.shaikind;
 
 
     for (var obj of newshaikind) {
     for (var obj of newshaikind) {
-      if (obj.id == id) {
-        obj.sel = !obj.sel
-      } else {
-        obj.sel = false
-      }
+      
 
 
       if (this.data.type == 1) {
       if (this.data.type == 1) {
-        if (obj.sel == true) {
-          this.setData({
-            sort_id: obj.id,
-            
-          })
+        if (obj.id == id) {
+          obj.sel = !obj.sel;
+          if (obj.sel == true) {
+            this.setData({
+              sort_id: obj.id,
 
 
-          let newkindlist=this.data.kindlist;
-          newkindlist[0].name = obj.sort_name;
-          this.setData({
-            kindlist:newkindlist
-          })
+            })
+
+            let newkindlist = this.data.kindlist;
+            newkindlist[0].name = obj.sort_name;
+            this.setData({
+              kindlist: newkindlist
+            })
+          } else {
+            let newkindlist = this.data.kindlist;
+            newkindlist[0].name = "品类";
+            this.setData({
+              kindlist: newkindlist
+            })
+          }
+        } else {
+          obj.sel = false
         }
         }
+        
       } else if (this.data.type == 4) {
       } else if (this.data.type == 4) {
-        if (obj.sel == true) {
-          this.setData({
-            odor_id: obj.id
-          })
 
 
-          let newkindlist = this.data.kindlist;
-          newkindlist[3].name = obj.odor_name;
-          this.setData({
-            kindlist: newkindlist
-          })
+        if(obj.id==id){
+          obj.sel = !obj.sel;
+          if (obj.sel == true) {
+            this.setData({
+              odor_id: obj.id
+            })
+
+            let newkindlist = this.data.kindlist;
+            newkindlist[3].name = obj.odor_name;
+            this.setData({
+              kindlist: newkindlist
+            })
+          }else{
+            let newkindlist = this.data.kindlist;
+            newkindlist[3].name = "香型";
+            this.setData({
+              kindlist: newkindlist
+            })
+          }
+        }else{
+          obj.sel = false
         }
         }
+        
       }
       }
 
 
 
 
@@ -548,19 +574,30 @@ Page({
 
 
     for (var obj of newcountrylist) {
     for (var obj of newcountrylist) {
       obj.sel = !obj.sel;
       obj.sel = !obj.sel;
-      if (obj.sel == true) {
+     
         if (obj.id == countryid) {
         if (obj.id == countryid) {
-          let newkindlist = this.data.kindlist;
+          if (obj.sel == true) {
+            let newkindlist = this.data.kindlist;
 
 
-          newkindlist[1].name = obj.country_name
-          this.setData({
-            kindlist: newkindlist,
-            country: obj.country_name
-          })
+            newkindlist[1].name = obj.country_name
+            this.setData({
+              kindlist: newkindlist,
+              country: obj.country_name
+            })
+          }else{
+            let newkindlist = this.data.kindlist;
+
+            newkindlist[1].name = "国别"
+            this.setData({
+              kindlist: newkindlist,
+              country: ''
+            })
+          }
+          
         } else {
         } else {
           obj.sel = false
           obj.sel = false
         }
         }
-      }
+      
 
 
 
 
     }
     }
@@ -609,17 +646,25 @@ Page({
     for(var i=0;i<newreginlist.length;i++){
     for(var i=0;i<newreginlist.length;i++){
     //  newreginlist[i].sel = !newreginlist[i].sel
     //  newreginlist[i].sel = !newreginlist[i].sel
       if(i==reginindex){
       if(i==reginindex){
-        console.log(243782347)
-        newreginlist[i].sel=true;
-        let newkindlist = this.data.kindlist;
-        newkindlist[2].name = newreginlist[i].name;
-        this.setData({
-          kindlist: newkindlist,
-          region: newreginlist[i].name
-        })
+        newreginlist[i].sel = !newreginlist[i].sel;
+        if (newreginlist[i].sel==true){
+          // newreginlist[i].sel=true;
+          let newkindlist = this.data.kindlist;
+          newkindlist[2].name = newreginlist[i].name;
+          this.setData({
+            kindlist: newkindlist,
+            region: newreginlist[i].name
+          })
 
 
-        console.log(this.data.kindlist)
-        
+          console.log(this.data.kindlist)
+        }else{
+          let newkindlist = this.data.kindlist;
+          newkindlist[2].name = "产区";
+          this.setData({
+            kindlist: newkindlist,
+            region: ""
+          })
+        }
       }else{
       }else{
         newreginlist[i].sel=false
         newreginlist[i].sel=false
       }
       }

@@ -21,9 +21,15 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
+    let that = this;
+    setTimeout(function () {
+      that.setData({
+        url: app.globalData.url
+      })
+    }, 1000)
     console.log(options)
     console.log(options)
     this.setData({
     this.setData({
-      url: app.globalData.url,
+      
       brandid:options.id
       brandid:options.id
     })
     })
 
 
@@ -36,6 +42,10 @@ Page({
       status:e.currentTarget.dataset.idx+1
       status:e.currentTarget.dataset.idx+1
 
 
     })
     })
+    this.setData({
+      page:1,
+      brandlist:[]
+    })
     this.getbrandlist()
     this.getbrandlist()
     
     
   },
   },
@@ -54,7 +64,7 @@ Page({
       console.log(res);
       console.log(res);
       that.setData({
       that.setData({
         info: res.info,
         info: res.info,
-        brandlist:res.list
+        brandlist:that.data.brandlist.concat(res.list)
       })
       })
 
 
 
 
@@ -77,9 +87,23 @@ Page({
       console.log(res);
       console.log(res);
       wx.showToast({
       wx.showToast({
         title: res,
         title: res,
-        icon:'none'
+        icon:'none',
+       
+      })
+      let newinfo=that.data.info;
+      if (newinfo.is_favorite==0){
+        newinfo.is_favorite=1
+      }else{
+        newinfo.is_favorite = 0
+      }
+      that.setData({
+        info:newinfo
       })
       })
-      that.getbrandlist()
+      // that.setData({
+      //   page: 1,
+      //   brandlist: []
+      // })
+      // that.getbrandlist()
 
 
 
 
     }).catch((err) => {
     }).catch((err) => {
@@ -102,7 +126,24 @@ Page({
         title: res,
         title: res,
         icon:'none'
         icon:'none'
       })
       })
-      that.getbrandlist()
+
+      let newbrandlist=that.data.brandlist;
+      console.log(newbrandlist)
+      console.log(id)
+      for (var obj of newbrandlist){
+       
+          if(obj.id==id){
+            console.log(888)
+            if (obj.is_favorite==0){
+              obj.is_favorite=1
+            } else {
+              obj.is_favorite = 0
+            }
+          }
+      }
+      that.setData({
+        brandlist: newbrandlist
+      })
 
 
 
 
     }).catch((err) => {
     }).catch((err) => {
@@ -118,6 +159,15 @@ Page({
       url: '/pages/homeblock/brandpage/brandpage?id='+id,
       url: '/pages/homeblock/brandpage/brandpage?id='+id,
     })
     })
   },
   },
+  jumpbrand(e) {
+    let id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+    })
+    
+
+  },
+
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
@@ -157,7 +207,13 @@ Page({
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
   onReachBottom: function () {
   onReachBottom: function () {
+    let page=this.data.page;
+    page++;
+    this.setData({
+      page:page
+    })
 
 
+    this.getbrandlist()
   },
   },
 
 
   /**
   /**

@@ -26,10 +26,12 @@
 <view class="baiyun">{{info.name}}</view>
 <view class="baiyun">{{info.name}}</view>
 
 
 <view>
 <view>
-
-<view class="nodata" wx:if="{{brandlist.length==0}}">暂无数据</view>
+<view class="nodataimg" wx:if="{{brandlist.length==0}}">
+<image src="/img/wushuju.png"></image>
+</view>
+<!-- <view class="nodata" wx:if="{{brandlist.length==0}}">暂无数据</view> -->
 <block wx:else>
 <block wx:else>
-  <view class="searchitem" wx:for="{{brandlist}}" wx:key=''>
+  <view class="searchitem" wx:for="{{brandlist}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
     <view class="searchitemleft">
     <view class="searchitemleft">
       <view class="itemleftimg">
       <view class="itemleftimg">
         <image src="{{item.logo}}"></image>
         <image src="{{item.logo}}"></image>
@@ -46,7 +48,7 @@
       </view>
       </view>
     </view>
     </view>
 
 
-    <view class="starimg" bindtap="collectwine" data-id="{{item.id}}">
+    <view class="starimg" catchtap="collectwine" data-id="{{item.id}}">
 
 
       <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
       <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
       <image src="{{url}}aicon_09x.png" wx:else></image>
       <image src="{{url}}aicon_09x.png" wx:else></image>

@@ -17,8 +17,14 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
+    let that = this;
+    setTimeout(function () {
+      that.setData({
+        url: app.globalData.url
+      })
+    }, 1000)
     this.setData({
     this.setData({
-      url: app.globalData.url,
+     
       id:options.id
       id:options.id
     })
     })
     this.getbrandtail()
     this.getbrandtail()

@@ -32,11 +32,11 @@
 
 
 <view class="brandbox">
 <view class="brandbox">
   <view class="brandboxitem" wx:for="{{attr}}" wx:key='' wx:for-index="idxs">
   <view class="brandboxitem" wx:for="{{attr}}" wx:key='' wx:for-index="idxs">
-    <view class="boxtop">
+    <view class="boxtop" bindtap="showinfo" data-idx="{{idxs}}">
       <view class="boxtopleft">
       <view class="boxtopleft">
         {{item.name}}
         {{item.name}}
       </view>
       </view>
-      <view class="boxright" bindtap="showinfo" data-idx="{{idxs}}">
+      <view class="boxright" >
         <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
         <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
         <image src="{{url}}aicon_52x.png" wx:else></image>
         <image src="{{url}}aicon_52x.png" wx:else></image>
       </view>
       </view>

@@ -8,11 +8,9 @@ Page({
    */
    */
   data: {
   data: {
     url:'',
     url:'',
-    imgUrls: ["http://winesbook.cn/static/images_mini/aicon_23@2x.png",
-      "http://winesbook.cn/static/images_mini/aicon_23@2x.png",
-      "http://winesbook.cn/static/images_mini/aicon_23@2x.png"],
+    imgUrls: [],
     indicatorDots: false,
     indicatorDots: false,
-    autoplay: false,
+    autoplay: true,
     interval: 2000,
     interval: 2000,
     duration: 1000,
     duration: 1000,
     currentSwiper: 0,
     currentSwiper: 0,
@@ -26,8 +24,14 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
+    let that=this;
+    setTimeout(function(){
+      that.setData({
+        url: app.globalData.url,
+      })
+    },1500)
     this.setData({
     this.setData({
-      url: app.globalData.url,
+      
       id:options.id
       id:options.id
     })
     })
     this.getcompanydetail()
     this.getcompanydetail()
@@ -137,7 +141,7 @@ Page({
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
   onUnload: function () {
   onUnload: function () {
-
+    wx.setStorageSync("guantype", "")
   },
   },
 
 
   /**
   /**

@@ -13,7 +13,7 @@
 
 
 </view>
 </view>
 <view class="swiper_image">
 <view class="swiper_image">
-  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange">
+  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange" circular='true'>
     <block wx:for="{{imgUrls}}" wx:key="doct">
     <block wx:for="{{imgUrls}}" wx:key="doct">
       <swiper-item style="border-radius:10px;">
       <swiper-item style="border-radius:10px;">
         <image src="{{item.url}}" data-index='{{index}}' class="slide-image" bindtap='viewImg' width="355" height="150" />
         <image src="{{item.url}}" data-index='{{index}}' class="slide-image" bindtap='viewImg' width="355" height="150" />
@@ -31,11 +31,11 @@
 
 
 <view class="brandbox">
 <view class="brandbox">
   <view class="brandboxitem" wx:for="{{attr}}" wx:key='' wx:for-index="idxs">
   <view class="brandboxitem" wx:for="{{attr}}" wx:key='' wx:for-index="idxs">
-    <view class="boxtop">
+    <view class="boxtop" bindtap="showinfo" data-idx="{{idxs}}">
       <view class="boxtopleft">
       <view class="boxtopleft">
         {{item.name}}
         {{item.name}}
       </view>
       </view>
-      <view class="boxright" bindtap="showinfo" data-idx="{{idxs}}">
+      <view class="boxright" >
         <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
         <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
         <image src="{{url}}aicon_52x.png" wx:else></image>
         <image src="{{url}}aicon_52x.png" wx:else></image>
       </view>
       </view>

@@ -75,7 +75,9 @@ image{
 .boxtop{
 .boxtop{
   display:flex;
   display:flex;
   justify-content: space-between;
   justify-content: space-between;
-  align-items: center
+  align-items: center;
+  padding: 10rpx 0;
+  box-sizing: border-box
 }
 }
 .boxtopleft{
 .boxtopleft{
   color:#1A1A1A;
   color:#1A1A1A;

@@ -7,7 +7,7 @@ Page({
    */
    */
   data: {
   data: {
     url: '',
     url: '',
-    star1: 0,
+    star1: 5,
     sepic: true,
     sepic: true,
     id: '',
     id: '',
     biaoqian: false,
     biaoqian: false,
@@ -180,7 +180,12 @@ Page({
   sureadd() {
   sureadd() {
 
 
     let that = this;
     let that = this;
-    if (that.data.labelname.length > 10) {
+    if (that.data.labelname==''){
+      wx.showToast({
+        title: '请输入标签名字',
+        icon: 'none'
+      })
+    }else if (that.data.labelname.length > 10) {
       wx.showToast({
       wx.showToast({
         title: '请输入10以下的字符',
         title: '请输入10以下的字符',
         icon: 'none'
         icon: 'none'
@@ -392,54 +397,73 @@ Page({
   //发布
   //发布
   publish() {
   publish() {
     let that = this;
     let that = this;
-    let newfiles = [];
-    let newimages = that.data.chuanimages;
-    if (that.data.chuanvideoimg != '') {
-      newfiles.push(that.data.chuanvideoimg)
+    if (that.data.star1==0){
+      wx.showToast({
+        title: '请滑动选择星星评分',
+        icon: 'none'
+      })
+    }else if (that.data.content==''){
+      wx.showToast({
+        title: '请输入评论内容',
+        icon:'none'
+      })
+    } else if (that.data.labelid.length==0){
+      wx.showToast({
+        title: '请选择标签',
+        icon: 'none'
+      })
     }
     }
-
-    if (newimages.length != 0) {
-      for (var i = 0; i < newimages.length; i++) {
-        newfiles.push(newimages[i])
+    else{
+      let newfiles = [];
+      let newimages = that.data.chuanimages;
+      if (that.data.chuanvideoimg != '') {
+        newfiles.push(that.data.chuanvideoimg)
       }
       }
-    }
-    newfiles = newfiles.join(",");
-    console.log(newfiles)
-    let newlabelid=that.data.labelid;
 
 
-    newlabelid= newlabelid.join(",")
-    console.log(newlabelid)
+      if (newimages.length != 0) {
+        for (var i = 0; i < newimages.length; i++) {
+          newfiles.push(newimages[i])
+        }
+      }
+      newfiles = newfiles.join(",");
+      console.log(newfiles)
+      let newlabelid = that.data.labelid;
 
 
+      newlabelid = newlabelid.join(",")
+      console.log(newlabelid)
 
 
-    let url = 'index/Wine/create_comment',
-      params = {
-        wine_id: that.data.id,
-        score: that.data.star1,
-        content: that.data.content,
-        files: newfiles,
-        position: that.data.currentCity,
-        tags: newlabelid
 
 
-      }
-    app.post(url, params).then((res) => {
-      console.log(res);
+      let url = 'index/Wine/create_comment',
+        params = {
+          wine_id: that.data.id,
+          score: that.data.star1,
+          content: that.data.content,
+          files: newfiles,
+          position: that.data.currentCity,
+          tags: newlabelid
 
 
-      wx.showToast({
-        title: '发布成功',
-        icon:'none'
-      })
+        }
+      app.post(url, params).then((res) => {
+        console.log(res);
 
 
-      setTimeout(function(){
-        wx.navigateBack({
-          checked:true
+        wx.showToast({
+          title: '发布成功',
+          icon: 'none'
         })
         })
-      },1500)
 
 
+        setTimeout(function () {
+          wx.navigateBack({
+            checked: true
+          })
+        }, 1500)
 
 
 
 
-    }).catch((err) => {
 
 
-    })
+      }).catch((err) => {
+
+      })
+    }
+    
   },
   },
 
 
   /**
   /**

@@ -40,11 +40,11 @@
 
 
 </view>
 </view>
 
 
-<view class="biaoqian">
+<view class="biaoqian" bindtap="se">
   <view class="biaoqianleft">
   <view class="biaoqianleft">
     选择标签
     选择标签
   </view>
   </view>
-  <view class="biaoqianright" bindtap="se">
+  <view class="biaoqianright" >
     <image src="{{sepic==true?'http://winesbook.cn/static/images_mini/aicon_53x.png':'http://winesbook.cn/static/images_mini/aicon_52x.png'}}"></image>
     <image src="{{sepic==true?'http://winesbook.cn/static/images_mini/aicon_53x.png':'http://winesbook.cn/static/images_mini/aicon_52x.png'}}"></image>
   </view>
   </view>
 </view>
 </view>

@@ -21,7 +21,7 @@
   display:flex;
   display:flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  margin-top:105rpx;
+  margin-top:95rpx;
 }
 }
 .biaoqianright{
 .biaoqianright{
   width:24rpx;
   width:24rpx;
@@ -39,6 +39,7 @@
   flex-wrap: wrap;
   flex-wrap: wrap;
   padding: 0 32rpx 0 32rpx;
   padding: 0 32rpx 0 32rpx;
   box-sizing: border-box;
   box-sizing: border-box;
+  margin-top:20rpx;
  
  
 }
 }
 .showpicitem{
 .showpicitem{
@@ -212,5 +213,6 @@ font-size: 32rpx
   font-size: 32rpx;
   font-size: 32rpx;
 }
 }
 .labelactive{
 .labelactive{
-  border:1rpx solid #E81825
+  background: #E81825;
+  color:#fff;
 }
 }

@@ -89,6 +89,21 @@ Page({
     })
     })
   },
   },
 
 
+  //图片预览
+  viewImg(e) {
+   
+    let that = this;
+    let parindex = e.currentTarget.dataset.paridx;
+    let childindex = e.currentTarget.dataset.childidx;
+    wx.previewImage({
+      current: that.data.list[parindex].files[childindex].url,
+      urls: that.data.list[parindex].files,
+      success: function (res) { },
+      fail: function (res) { },
+      complete: function (res) { },
+    })
+  },
+
   //进入视频页面
   //进入视频页面
   entervido(e){
   entervido(e){
     let url=e.currentTarget.dataset.url
     let url=e.currentTarget.dataset.url

@@ -142,7 +142,7 @@
   <view class="hotticket">热门标签</view>
   <view class="hotticket">热门标签</view>
 
 
   <view class="botlabet">
   <view class="botlabet">
-    <view class="labelitem" wx:for="{{hot_tag}}" wx:key=''>
+    <view class="labelitem" wx:for="{{hot_tag}}" wx:key='' >
       <text>{{item.name}}</text>
       <text>{{item.name}}</text>
       <text class="labelitemright">{{item.comment_count}}</text>
       <text class="labelitemright">{{item.comment_count}}</text>
     </view>
     </view>
@@ -152,7 +152,7 @@
 </view>
 </view>
 
 
 <view class="boxmiddle">
 <view class="boxmiddle">
-  <view class="boxmiddleitem" wx:for="{{list}}" wx:key=''>
+  <view class="boxmiddleitem" wx:for="{{list}}" wx:key='' wx:for-index='par'>
     <view class="evaluteitemleft">
     <view class="evaluteitemleft">
       <image src="{{item.avatar}}"></image>
       <image src="{{item.avatar}}"></image>
     </view>
     </view>
@@ -195,7 +195,7 @@
       <view class="evaltext">{{item.content}}</view>
       <view class="evaltext">{{item.content}}</view>
       <view class="medioblock">
       <view class="medioblock">
         <block wx:if="{{item.files.length!=0}}">
         <block wx:if="{{item.files.length!=0}}">
-          <view class="evalimgitem" wx:for='{{item.files}}' wx:key="">
+          <view class="evalimgitem" wx:for='{{item.files}}' wx:key="" bindtap='viewImg' data-paridx="{{par}}" wx:for-index='sec' data-childidx="{{sec}}">
             <image src="{{item}}"></image>
             <image src="{{item}}"></image>
           </view>
           </view>
 
 

@@ -205,14 +205,19 @@ image {
 }
 }
 
 
 .zanimg{
 .zanimg{
-  width:30rpx;
+  width:60rpx;
+ 
   height:28rpx;
   height:28rpx;
-  font-size: 0
+  font-size: 0;
+  text-align: center
+}
+.zanimg image{
+   width:30rpx;
 }
 }
 .zannum{
 .zannum{
   color:#999999;
   color:#999999;
   font-size: 28rpx;
   font-size: 28rpx;
-  margin-left:20rpx;
+  margin-left:0rpx;
 }
 }
 .writeimg{
 .writeimg{
   width:126rpx;
   width:126rpx;

@@ -2,11 +2,19 @@
   标准图
   标准图
 
 
 </view>
 </view>
+
+
+
 <view class="biaozhaunbox">
 <view class="biaozhaunbox">
-  <view class="biaozhuanitem" wx:for="{{banner}}" wx:key="" bindtap='viewImg' data-index="{{index}}">
-      <image src="{{item.url}}"></image>
+
+  <view class="nodataimg" wx:if="{{banner.length==0}}">
+    <image src="/img/wushuju.png"></image>
   </view>
   </view>
-  
+  <block wx:else>
+    <view class="biaozhuanitem" wx:for="{{banner}}" wx:key="" bindtap='viewImg' data-index="{{index}}">
+      <image src="{{item.url}}"></image>
+    </view>
+  </block>
 </view>
 </view>
 
 
 
 
@@ -16,8 +24,12 @@
 
 
 </view>
 </view>
 <view class="biaozhaunbox">
 <view class="biaozhaunbox">
-  <view class="biaozhuanitem" wx:for="{{picture}}" wx:key='' bindtap='viewImg1' data-index="{{index}}">
-      <image src="{{item.url}}"></image>
+  <view class="nodataimg" wx:if="{{picture.length==0}}">
+    <image src="/img/wushuju.png"></image>
   </view>
   </view>
- 
+  <block wx:else>
+    <view class="biaozhuanitem" wx:for="{{picture}}" wx:key='' bindtap='viewImg1' data-index="{{index}}">
+      <image src="{{item.url}}"></image>
+    </view>
+  </block>
 </view>
 </view>

 // pages/homeblock/jiuzidian/jiuzidian.js
 // pages/homeblock/jiuzidian/jiuzidian.js
 var WxParse = require('../../../wxParse/wxParse.js');
 var WxParse = require('../../../wxParse/wxParse.js');
-const app=getApp()
+const app = getApp()
 Page({
 Page({
 
 
   /**
   /**
@@ -10,63 +10,75 @@ Page({
     navarr: [],
     navarr: [],
 
 
     current: 0,
     current: 0,
-    url:'',
-    kind:0,
-    picindex:0,
-    id:'',
-    wineinfo:'',
-    selectid:-1,
-    canshu:[],
-    qiye:[],
-    jiushi:[],
+    url: '',
+    kind: 0,
+    picindex: 0,
+    id: '',
+    wineinfo: '',
+    selectid: -1,
+    canshu: [],
+    qiye: [],
+    jiushi: [],
     jiushiarr: [],
     jiushiarr: [],
-    zhuanye:[],
-    jiben:[],
-    jiushishow:true,
-    othercontent:[],
-    qiyearr:[],
-    score:'',
-    panorama:[],
-    imglogo:'',
-    videoimg:''
-    
+    zhuanye: [],
+    jiben: [],
+    jiushishow: true,
+    othercontent: [],
+    qiyearr: [],
+    score: '',
+    panorama: [],
+    imglogo: '',
+    videoimg: '',
+    autoplay: true,
+    interval: 2000,
+    duration: 1000,
+    currentSwiper: 0,
+
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
+    let that = this;
+    setTimeout(function () {
+      that.setData({
+        url: app.globalData.url
+      })
+    }, 1000)
+
     console.log(options)
     console.log(options)
     this.setData({
     this.setData({
-      url: app.globalData.url,
-      id:options.id,
-      wineinfo:''
+     
+      id: options.id,
+      wineinfo: ''
     })
     })
 
 
-    
-    this.getwinedetail();
-    let token=wx.getStorageSync("token");
-    if(token==''){
+
+
+    let token = wx.getStorageSync("token");
+    if (token == '') {
       wx.navigateTo({
       wx.navigateTo({
-        url: '/pages/login/login?id=' + this.data.id+'&type=' +2,//type=2酒字典详情页
+        url: '/pages/login/login?id=' + this.data.id + '&type=' + 2, //type=2酒字典详情页
       })
       })
 
 
       wx.setStorageSync("url", "/pages/homeblock/jiuzidian/jiuzidian")
       wx.setStorageSync("url", "/pages/homeblock/jiuzidian/jiuzidian")
     }
     }
   },
   },
   //获取酒品详情
   //获取酒品详情
-  getwinedetail(){
+  getwinedetail() {
     let that = this;
     let that = this;
-    let url = 'index/Wine/detail', params = {
-      wine_id: that.data.id,
+    let url = 'index/Wine/detail',
+      params = {
+        wine_id: that.data.id,
 
 
-    }
+      }
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
       console.log(res);
       console.log(res);
       that.setData({
       that.setData({
-        wineinfo:res,
+        wineinfo: res,
         navarr: res.wine_attr,
         navarr: res.wine_attr,
-        score: res.score*10,
+        score: res.score * 10,
         panorama: res.panorama,
         panorama: res.panorama,
         imglogo: res.panorama[0].product_thumbnail,
         imglogo: res.panorama[0].product_thumbnail,
         videoimg: res.panorama[0].product_url,
         videoimg: res.panorama[0].product_url,
@@ -74,23 +86,23 @@ Page({
 
 
       wx.setStorageSync("quanurl", res.panorama[0].product_url)
       wx.setStorageSync("quanurl", res.panorama[0].product_url)
 
 
-     
+
 
 
       let newnavarr = that.data.navarr;
       let newnavarr = that.data.navarr;
-      for (var obj of newnavarr){
-        if(obj.id==-1){
+      for (var obj of newnavarr) {
+        if (obj.id == -1) {
           that.setData({
           that.setData({
-            canshu:obj.value
+            canshu: obj.value
           })
           })
-        }else if(obj.id==-2){
-          
+        } else if (obj.id == -2) {
+
           that.setData({
           that.setData({
-            qiye:obj.value[0].attr,
-            qiyearr:obj.value[0]
+            qiye: obj.value[0].attr,
+            qiyearr: obj.value[0]
           })
           })
-          
+
           let newqiye = obj.value[0].attr;
           let newqiye = obj.value[0].attr;
-          
+
           for (let i = 0; i < newqiye.length; i++) {
           for (let i = 0; i < newqiye.length; i++) {
             newqiye[i].show = true
             newqiye[i].show = true
 
 
@@ -106,12 +118,12 @@ Page({
             qiye: newqiye
             qiye: newqiye
           })
           })
 
 
-          
+
 
 
         } else if (obj.id == -3) {
         } else if (obj.id == -3) {
           that.setData({
           that.setData({
-           jiushi: obj.value[0],
-           jiushiarr:obj.value[0].attr
+            jiushi: obj.value[0],
+            jiushiarr: obj.value[0].attr
           })
           })
 
 
           let newjiushiarr = obj.value[0].attr
           let newjiushiarr = obj.value[0].attr
@@ -129,9 +141,9 @@ Page({
           }
           }
 
 
           that.setData({
           that.setData({
-            jiushiarr:newjiushiarr
+            jiushiarr: newjiushiarr
           })
           })
-          
+
         } else if (obj.id == -4) {
         } else if (obj.id == -4) {
           that.setData({
           that.setData({
             zhuanye: obj.value
             zhuanye: obj.value
@@ -157,7 +169,7 @@ Page({
           that.setData({
           that.setData({
             jiben: obj.value
             jiben: obj.value
           })
           })
-        }else{
+        } else {
           that.setData({
           that.setData({
             othercontent: obj.value
             othercontent: obj.value
           })
           })
@@ -187,25 +199,83 @@ Page({
 
 
     })
     })
   },
   },
-  jiushinfoshow(){
+  //酒师点赞和取消点赞
+  dianzan(e) {
+    let id = e.currentTarget.dataset.id;
+
+
+    let that = this;
+    let url = 'index/Common/good',
+      params = {
+        sort: 3,
+        id: id
+
+      }
+    app.post(url, params).then((res) => {
+      console.log(res);
+      wx.showToast({
+        title: res,
+        icon: 'none'
+      })
+
+
+      let newjiushi = that.data.jiushi;
+      console.log(newjiushi)
+
+      if (newjiushi.is_good == 0) {
+
+        newjiushi.is_good = 1
+      } else {
+        newjiushi.is_good = 0
+      }
+      that.setData({
+        jiushi: newjiushi
+      })
+      console.log(that.data.jiushi)
+
+
+    }).catch((err) => {
+
+    })
+
+  },
+
+  //进入评论页面
+  ping(e) {
+    // + '&winemaker_id=' + winemaker_id,
+    let id = e.currentTarget.dataset.id;
+
+
+    wx.navigateTo({
+      url: '/pages/myblock/pingjia/pingjia?type=' + 3 + '&winemaker_id=' + id
+    })
+  },
+
+  swiperChange: function(e) {
+    this.setData({
+      currentSwiper: e.detail.current
+    })
+  },
+  jiushinfoshow() {
     this.setData({
     this.setData({
       jiushishow: !this.data.jiushishow
       jiushishow: !this.data.jiushishow
     })
     })
   },
   },
   //关注酒师
   //关注酒师
-  attenjiushi(e){
+  attenjiushi(e) {
     let that = this;
     let that = this;
-    let id=e.currentTarget.dataset.id
-    let url = 'index/Common/concern', params = {
-      sort: 2,
-      id:id
+    let id = e.currentTarget.dataset.id
+    let url = 'index/Common/concern',
+      params = {
+        sort: 2,
+        id: id
 
 
-    }
+      }
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
       console.log(res);
       console.log(res);
       wx.showToast({
       wx.showToast({
         title: res,
         title: res,
-        icon:'none'
+        icon: 'none'
       })
       })
 
 
       that.getwinedetail()
       that.getwinedetail()
@@ -215,14 +285,15 @@ Page({
     })
     })
   },
   },
   //关注企业
   //关注企业
-  attenqiye(e){
+  attenqiye(e) {
     let that = this;
     let that = this;
     let id = e.currentTarget.dataset.id
     let id = e.currentTarget.dataset.id
-    let url = 'index/Common/concern', params = {
-      sort: 1,
-      id: id
+    let url = 'index/Common/concern',
+      params = {
+        sort: 1,
+        id: id
 
 
-    }
+      }
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
       console.log(res);
       console.log(res);
       wx.showToast({
       wx.showToast({
@@ -236,25 +307,25 @@ Page({
 
 
     })
     })
   },
   },
-  selectkind(e){
+  selectkind(e) {
     this.setData({
     this.setData({
-      kind:e.currentTarget.dataset.kind
+      kind: e.currentTarget.dataset.kind
     })
     })
     let kind = e.currentTarget.dataset.kind;
     let kind = e.currentTarget.dataset.kind;
-    if(kind==0){
+    if (kind == 0) {
       this.setData({
       this.setData({
         imglogo: this.data.panorama[0].product_thumbnail,
         imglogo: this.data.panorama[0].product_thumbnail,
         videoimg: this.data.panorama[0].product_url
         videoimg: this.data.panorama[0].product_url
       })
       })
 
 
       wx.setStorageSync("quanurl", this.data.panorama[0].product_url)
       wx.setStorageSync("quanurl", this.data.panorama[0].product_url)
-    }else if(kind==1){
+    } else if (kind == 1) {
       this.setData({
       this.setData({
         imglogo: this.data.panorama[1].product_thumbnail,
         imglogo: this.data.panorama[1].product_thumbnail,
         videoimg: this.data.panorama[1].product_url
         videoimg: this.data.panorama[1].product_url
       })
       })
       wx.setStorageSync("quanurl", this.data.panorama[1].product_url)
       wx.setStorageSync("quanurl", this.data.panorama[1].product_url)
-    }else {
+    } else {
       this.setData({
       this.setData({
         imglogo: this.data.panorama[2].product_thumbnail,
         imglogo: this.data.panorama[2].product_thumbnail,
         videoimg: this.data.panorama[2].product_url
         videoimg: this.data.panorama[2].product_url
@@ -263,10 +334,10 @@ Page({
       wx.setStorageSync("quanurl", this.data.panorama[2].product_url)
       wx.setStorageSync("quanurl", this.data.panorama[2].product_url)
     }
     }
   },
   },
-  entervideo(e){
+  entervideo(e) {
     console.log(e)
     console.log(e)
-    let url=e.currentTarget.dataset.url;
-   wx.setStorageSync('quanurl', url)
+    let url = e.currentTarget.dataset.url;
+    wx.setStorageSync('quanurl', url)
     wx.navigateTo({
     wx.navigateTo({
       url: '/pages/homeblock/bofangexample/bofangexample',
       url: '/pages/homeblock/bofangexample/bofangexample',
     })
     })
@@ -275,35 +346,35 @@ Page({
     console.log(e)
     console.log(e)
     this.setData({
     this.setData({
       current: e.currentTarget.dataset.idx,
       current: e.currentTarget.dataset.idx,
-      selectid:e.currentTarget.dataset.id
+      selectid: e.currentTarget.dataset.id
     })
     })
     console.log(this.data.selectid)
     console.log(this.data.selectid)
   },
   },
-  selectpic(e){
+  selectpic(e) {
     let pic = e.currentTarget.dataset.pic
     let pic = e.currentTarget.dataset.pic
     this.setData({
     this.setData({
-      picindex:e.currentTarget.dataset.pic
+      picindex: e.currentTarget.dataset.pic
     })
     })
 
 
-    if (pic==1){
+    if (pic == 1) {
       wx.navigateTo({
       wx.navigateTo({
-        url: '/pages/homeblock/guanimg/guanimg?wineid='+this.data.id,
+        url: '/pages/homeblock/guanimg/guanimg?wineid=' + this.data.id,
       })
       })
-    }else if(pic==2){
+    } else if (pic == 2) {
       wx.navigateTo({
       wx.navigateTo({
-        url: '/pages/homeblock/shipaiimg/shipaiimg?wineid='+this.data.id,
+        url: '/pages/homeblock/shipaiimg/shipaiimg?wineid=' + this.data.id,
       })
       })
-    }else if(pic==3){
+    } else if (pic == 3) {
       wx.navigateTo({
       wx.navigateTo({
-        url: '/pages/homeblock/shortvideo/shortvideo?wineid='+this.data.id,
+        url: '/pages/homeblock/shortvideo/shortvideo?wineid=' + this.data.id,
       })
       })
-    }else if(pic==0){
+    } else if (pic == 0) {
       wx.navigateTo({
       wx.navigateTo({
         url: '/pages/homeblock/bofangexample/bofangexample',
         url: '/pages/homeblock/bofangexample/bofangexample',
       })
       })
     }
     }
 
 
-    
+
   },
   },
 
 
   showinfo(e) {
   showinfo(e) {
@@ -320,7 +391,7 @@ Page({
     })
     })
   },
   },
 
 
-  showjiushi(e){
+  showjiushi(e) {
     let idx = e.currentTarget.dataset.idx;
     let idx = e.currentTarget.dataset.idx;
     console.log(idx)
     console.log(idx)
     let newjiushiarr = this.data.jiushiarr;
     let newjiushiarr = this.data.jiushiarr;
@@ -334,7 +405,7 @@ Page({
     })
     })
   },
   },
 
 
-  showzhuanye(e){
+  showzhuanye(e) {
     let idx = e.currentTarget.dataset.idx;
     let idx = e.currentTarget.dataset.idx;
     console.log(idx)
     console.log(idx)
     let newzhuanye = this.data.zhuanye;
     let newzhuanye = this.data.zhuanye;
@@ -349,14 +420,14 @@ Page({
   },
   },
 
 
   //评价页面
   //评价页面
-  evalute(){
-    
+  evalute() {
+
     wx.navigateTo({
     wx.navigateTo({
-      url: '/pages/homeblock/evalutecontent/evalutecontent?wineid='+this.data.id,
+      url: '/pages/homeblock/evalutecontent/evalutecontent?wineid=' + this.data.id,
     })
     })
   },
   },
   //进入属性页面
   //进入属性页面
-  entershu(){
+  entershu() {
     wx.navigateTo({
     wx.navigateTo({
       url: '/pages/homeblock/shuxing/shuxing',
       url: '/pages/homeblock/shuxing/shuxing',
     })
     })
@@ -365,63 +436,73 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
-  onReady: function () {
+  onReady: function() {
 
 
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
-  onShow: function () {
-
+  onShow: function() {
+    this.getwinedetail();
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面隐藏
    * 生命周期函数--监听页面隐藏
    */
    */
-  onHide: function () {
+  onHide: function() {
 
 
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
-  onUnload: function () {
+  onUnload: function() {
 
 
   },
   },
 
 
   /**
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    * 页面相关事件处理函数--监听用户下拉动作
    */
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
 
 
   },
   },
 
 
   /**
   /**
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
 
 
   },
   },
 
 
   /**
   /**
    * 用户点击右上角分享
    * 用户点击右上角分享
    */
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function(e) {
     let that = this;
     let that = this;
+    let id = e.target.dataset.id;
+
+    let type = e.target.dataset.type;
+    let url=''
+
+    if (type == 3) {
+      url = '/pages/homeblock/niangjiuteacher/niangjiuteacher?id=' + id
+    } else {
+       url = '/pages/homeblock/jiuzidian/jiuzidian?id=' + that.data.id
+    }
+
 
 
-    let url = '/pages/homeblock/jiuzidian/jiuzidian?id=' + that.data.id
     return {
     return {
       title: '发现', // 转发后 所显示的title
       title: '发现', // 转发后 所显示的title
       // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
       // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
 
 
-      path: url,//建档攻略分享1
+      path: url, //建档攻略分享1
       // path:'',
       // path:'',
-      success: (res) => {    // 成功后要做的事情
+      success: (res) => { // 成功后要做的事情
         console.log(res)
         console.log(res)
 
 
       },
       },
-      fail: function (res) {
+      fail: function(res) {
         // 分享失败
         // 分享失败
         console.log(res)
         console.log(res)
       }
       }

@@ -85,11 +85,17 @@
 
 
 <!-- 基本参数 -->
 <!-- 基本参数 -->
 <view class="jibencanshu" wx:if="{{selectid==-1}}">
 <view class="jibencanshu" wx:if="{{selectid==-1}}">
-  <view class="canshuitem" wx:for='{{canshu}}' wx:key="">
-    <view class="canleft">{{item.name}}</view>
-    <view class='cantext'>{{item.content}}</view>
+
+  <view class="cannodataimg" wx:if="{{canshu.length==0}}">
+    <image src="/img/wushuju.png"></image>
   </view>
   </view>
 
 
+  <block wx:else>
+    <view class="canshuitem" wx:for='{{canshu}}' wx:key="">
+      <view class="canleft">{{item.name}}</view>
+      <view class='cantext'>{{item.content}}</view>
+    </view>
+  </block>
 </view>
 </view>
 
 
 <!-- 生产企业 -->
 <!-- 生产企业 -->
@@ -108,30 +114,53 @@
 
 
   </view>
   </view>
 
 
+  <view class="swiper_image">
+    <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange" circular="true">
+      <block wx:for="{{qiyearr.banner}}" wx:key="doct">
+        <swiper-item>
+          <image src="{{item.url}}" data-index='{{index}}' class="slide-image" width="355" height="150" />
+        </swiper-item>
+      </block>
+    </swiper>
+
+    <view class="dots">
+      <block wx:for="{{qiyearr.banner}}" wx:key="">
+        <view class="dot{{index == currentSwiper ? ' active' : ''}}"></view>
+      </block>
+    </view>
+
+  </view>
+
   <view class="brandbox">
   <view class="brandbox">
-    <view class="brandboxitem" wx:for="{{qiye}}" wx:key='' wx:for-index="idxs">
-      <view class="boxtop">
-        <view class="boxtopleft">
-          {{item.name}}
-        </view>
-        <view class="boxright" bindtap="showinfo" data-idx="{{idxs}}">
-          <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
-          <image src="{{url}}aicon_52x.png" wx:else></image>
+
+    <view class="cannodataimg" wx:if="{{qiye.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
+
+    <block wx:else>
+      <view class="brandboxitem" wx:for="{{qiye}}" wx:key='' wx:for-index="idxs">
+        <view class="boxtop" bindtap="showinfo" data-idx="{{idxs}}">
+          <view class="boxtopleft">
+            {{item.name}}
+          </view>
+          <view class="boxright">
+            <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+            <image src="{{url}}aicon_52x.png" wx:else></image>
+          </view>
         </view>
         </view>
-      </view>
 
 
-      <view class="brandtext" wx:if="{{item.show}}">
-        <block wx:for="{{artileList}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
-          <block wx:if="{{idxs==idx}}">
-            <template is="wxParse" data="{{wxParseData:item}}" />
+        <view class="brandtext" wx:if="{{item.show}}">
+          <block wx:for="{{artileList}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+            <block wx:if="{{idxs==idx}}">
+              <template is="wxParse" data="{{wxParseData:item}}" />
+            </block>
           </block>
           </block>
-        </block>
-      </view>
-
+        </view>
 
 
 
 
-    </view>
 
 
+      </view>
+    </block>
 
 
 
 
   </view>
   </view>
@@ -162,6 +191,33 @@
     </view>
     </view>
   </view>
   </view>
 
 
+  <view class="winebottonright">
+
+    <view class="winerighttou">
+      <view class="winerighttouimg" catchtap='dianzan'  data-id="{{jiushi.id}}" >
+        <image src="{{url}}aicon_71x.png" wx:if="{{jiushi.is_good==1}}"></image>
+        <image src="{{url}}aicon_66x.png" wx:else></image>
+
+      </view>
+      <view class="winezan">{{jiushi.good_count}}</view>
+    </view>
+    <view class="winerighttou" bindtap="ping" data-id="{{jiushi.id}}"  >
+      <view class="winerighttouimg">
+        <image src="{{url}}aicon_67x.png"></image>
+      </view>
+      <view class="winezan">{{jiushi.comment_count}}</view>
+    </view>
+
+    <view class="winerighttou">
+      <view class="winerighttouimg" catchtap='share'>
+        <image src="{{url}}aicon_68x.png"></image>
+        <button class="lj_share"  open-type='share' data-id="{{jiushi.id}}" data-type="3"></button>
+      </view>
+
+
+    </view>
+  </view>
+
   <view class="wineimg">
   <view class="wineimg">
     <image src="{{jiushi.thumb}}"></image>
     <image src="{{jiushi.thumb}}"></image>
   </view>
   </view>
@@ -169,11 +225,11 @@
   <view class="niangjiubox">
   <view class="niangjiubox">
 
 
     <view class="brandboxitem">
     <view class="brandboxitem">
-      <view class="boxtop">
+      <view class="boxtop" bindtap="jiushinfoshow">
         <view class="boxtopleft">
         <view class="boxtopleft">
           基本信息
           基本信息
         </view>
         </view>
-        <view class="boxright" bindtap="jiushinfoshow">
+        <view class="boxright">
           <image src="{{url}}aicon_53x.png" wx:if="{{jiushishow}}"></image>
           <image src="{{url}}aicon_53x.png" wx:if="{{jiushishow}}"></image>
           <image src="{{url}}aicon_52x.png" wx:else></image>
           <image src="{{url}}aicon_52x.png" wx:else></image>
         </view>
         </view>
@@ -197,32 +253,32 @@
 
 
 
 
     </view>
     </view>
-    <view class="brandboxitem" wx:for="{{jiushiarr}}" wx:key='' wx:for-index="idxs">
-      <view class="boxtop">
-        <view class="boxtopleft">
-          {{item.name}}
-        </view>
-        <view class="boxright" bindtap="showjiushi" data-idx="{{idxs}}">
-          <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
-          <image src="{{url}}aicon_52x.png" wx:else></image>
-        </view>
-      </view>
-
-      <view class="brandtext" wx:if="{{item.show}}">
-
-        <block wx:for="{{artileList1}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
-          <block wx:if="{{idxs==idx}}">
-            <template is="wxParse" data="{{wxParseData:item}}" />
-          </block>
-        </block>
-
 
 
+    <view class="cannodataimg" wx:if="{{jiushiarr.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
 
 
+    <block wx:else>
+      <view class="brandboxitem" wx:for="{{jiushiarr}}" wx:key='' wx:for-index="idxs">
+        <view class="boxtop" bindtap="showjiushi" data-idx="{{idxs}}">
+          <view class="boxtopleft">
+            {{item.name}}
+          </view>
+          <view class="boxright">
+            <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+            <image src="{{url}}aicon_52x.png" wx:else></image>
+          </view>
+        </view>
 
 
+        <view class="brandtext" wx:if="{{item.show}}">
+          <block wx:for="{{artileList1}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+            <block wx:if="{{idxs==idx}}">
+              <template is="wxParse" data="{{wxParseData:item}}" />
+            </block>
+          </block>
+        </view>
       </view>
       </view>
-
-
-    </view>
+    </block>
 
 
 
 
 
 
@@ -231,30 +287,36 @@
 <!-- 专业品评 -->
 <!-- 专业品评 -->
 <view class="jiuqiye" wx:elif="{{selectid==-4}}">
 <view class="jiuqiye" wx:elif="{{selectid==-4}}">
   <view class="brandbox">
   <view class="brandbox">
-    <view class="brandboxitem" wx:for="{{zhuanye}}" wx:key='' wx:for-index="idxs">
-      <view class="boxtop">
-        <view class="boxtopleft">
-          {{item.title}}
-        </view>
-        <view class="boxright" bindtap="showzhuanye" data-idx="{{idxs}}">
-          <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
-          <image src="{{url}}aicon_52x.png" wx:else></image>
+
+    <view class="cannodataimg" wx:if="{{zhuanye.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
+
+    <block wx:else>
+      <view class="brandboxitem" wx:for="{{zhuanye}}" wx:key='' wx:for-index="idxs">
+        <view class="boxtop" bindtap="showzhuanye" data-idx="{{idxs}}">
+          <view class="boxtopleft">
+            {{item.title}}
+          </view>
+          <view class="boxright">
+            <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+            <image src="{{url}}aicon_52x.png" wx:else></image>
+          </view>
         </view>
         </view>
-      </view>
 
 
-      <view class="brandtext" wx:if="{{item.show}}">
-        <block wx:for="{{artileList2}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
-          <block wx:if="{{idxs==idx}}">
-            <template is="wxParse" data="{{wxParseData:item}}" />
+        <view class="brandtext" wx:if="{{item.show}}">
+          <block wx:for="{{artileList2}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+            <block wx:if="{{idxs==idx}}">
+              <template is="wxParse" data="{{wxParseData:item}}" />
+            </block>
           </block>
           </block>
-        </block>
-      </view>
-
+        </view>
 
 
 
 
-    </view>
 
 
+      </view>
 
 
+    </block>
 
 
   </view>
   </view>
 
 
@@ -263,14 +325,23 @@
 <!-- 关键词 -->
 <!-- 关键词 -->
 
 
 <view class="keyword" wx:elif="{{selectid==-5}}">
 <view class="keyword" wx:elif="{{selectid==-5}}">
-  <view class="keyworditem" wx:for="{{jiben}}" wx:key="">{{item.content}}</view>
-
+  <view class="cannodataimg" wx:if="{{jiben.length==0}}">
+    <image src="/img/wushuju.png"></image>
+  </view>
+  <block wx:else>
+    <view class="keyworditem" wx:for="{{jiben}}" wx:key="">{{item.content}}</view>
+  </block>
 </view>
 </view>
 
 
 <view wx:else>
 <view wx:else>
   <view class="brandbox">
   <view class="brandbox">
-    <view class="brandboxitem" wx:for="{{othercontent}}" wx:key='' wx:for-index="idxs">
-      <!-- <view class="boxtop">
+    <view class="cannodataimg" wx:if="{{othercontent.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
+
+    <block wx:else>
+      <view class="brandboxitem" wx:for="{{othercontent}}" wx:key='' wx:for-index="idxs">
+        <!-- <view class="boxtop">
         <view class="boxtopleft">
         <view class="boxtopleft">
           {{item.name}}
           {{item.name}}
         </view>
         </view>
@@ -280,26 +351,23 @@
         </view>
         </view>
       </view> -->
       </view> -->
 
 
-      <view class="brandtext" wx:if="{{item.show}}">
-        <block wx:for="{{artileList4}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
-          <block wx:if="{{idxs==idx}}">
-            <template is="wxParse" data="{{wxParseData:item}}" />
+        <view class="brandtext" wx:if="{{item.show}}">
+          <block wx:for="{{artileList4}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+            <block wx:if="{{idxs==idx}}">
+              <template is="wxParse" data="{{wxParseData:item}}" />
+            </block>
           </block>
           </block>
-        </block>
-      </view>
-
-
-
-    </view>
+        </view>
 
 
 
 
 
 
+      </view>
+    </block>
   </view>
   </view>
-
 </view>
 </view>
 
 
 <view class='pingjia' bindtap="evalute">
 <view class='pingjia' bindtap="evalute">
-  <image src="/img/aicon_29@2x.png"></image>
+  <image src="/img/pingjia.png"></image>
 
 
   <view class="pingcount">{{wineinfo.comment_count}}</view>
   <view class="pingcount">{{wineinfo.comment_count}}</view>
   <view class="pingname">评价</view>
   <view class="pingname">评价</view>

@@ -158,15 +158,15 @@ page{
   color:#FFFFFF;
   color:#FFFFFF;
   font-size:24rpx;
   font-size:24rpx;
   position: fixed;
   position: fixed;
-  bottom:113rpx;
+  bottom:118rpx;
   right:67rpx;
   right:67rpx;
 }
 }
 .pingname{
 .pingname{
   color:#FFFFFF;
   color:#FFFFFF;
   font-size:24rpx;
   font-size:24rpx;
   position: fixed;
   position: fixed;
-  bottom:81rpx;
-  right:56rpx;
+  bottom:89rpx;
+  right:60rpx;
 
 
 }
 }
 .page-section{
 .page-section{
@@ -177,4 +177,126 @@ page{
 }
 }
 .heig{
 .heig{
     height:100rpx;
     height:100rpx;
+}
+
+ .swiper_image{
+  width:750rpx;
+  height:300rpx;
+  font-size: 0;
+  position: relative
+  
+
+}
+.swiper_item_img{
+ 
+  height:300rpx;
+}
+.swiper_image image{
+  width:100%;
+  height:100%;
+  /* box-shadow:0px -1px 6px 0px rgba(212,137,96,0.11); */
+  /* border-radius:10px; */
+}
+.swiper_item_img swiper-item{
+   width:750rpx;
+  height:300rpx;
+ 
+
+  
+}
+.swiper_item_img swiper-item image{
+  width:100%;
+  height:100%;
+  
+}
+
+
+.dots{
+    /* width: 156rpx; */
+    height: 36rpx;
+    display: flex;
+    flex-direction: row;
+    position: absolute;
+    justify-content: center;
+    align-items: center;
+    left: 0;
+    right:0;
+    bottom: 20rpx;
+}
+/*未选中时的小圆点样式 */
+.dot{
+    width: 10rpx;
+    height: 10rpx;
+    border-radius: 50%;
+    margin-right: 26rpx;
+    background-color:#000000
+}
+/*选中以后的小圆点样式  */
+.active{
+    width: 10rpx;
+    height: 10rpx;
+    border-radius:50%;
+    background-color: #E81825;
+   
+
+}
+
+.winebottonright{
+  /* width:345rpx; */
+  display:flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 32rpx;
+  box-sizing: border-box
+}
+.winerighttouimg{
+  width:60rpx;
+  height:28rpx;
+  font-size: 0;
+  position:relative;
+  text-align: center
+}
+.winerighttouimg image{
+  width:30rpx;
+  margin:0 auto;
+}
+.lj_share{
+  width:60rpx;
+  height:40rpx;
+  border:none;
+  position: absolute;
+  right:0;
+  top:0;
+  background: transparent
+
+}
+button::after{
+  border:none;
+  background: transparent
+}
+.winerighttou{
+  display:flex;
+  align-items: center
+}
+.wineeng{
+  color:#666666;     
+  font-size: 28rpx;
+  margin-left: 20rpx;
+}
+.winezan{
+  color:#666666;
+  font-size:28rpx;
+  margin-left:10rpx;
+  /* height:28rpx;
+  line-height:28rpx; */
+  margin-top:1rpx;
+}
+.wineblock{
+  border-bottom: 14rpx solid #F2F2F2;
+  padding-bottom: 30rpx;
+}
+.pin{
+  width:16rpx;
+  height:32rpx;
+  font-size: 0
 }
 }

@@ -9,7 +9,8 @@ Page({
   data: {
   data: {
     url:'',
     url:'',
     id:'',
     id:'',
-    page:1
+    page:1,
+    jiushishow:true
   },
   },
 
 
   /**
   /**
@@ -168,6 +169,12 @@ Page({
       url: '/pages/myblock/pingjia/pingjia?winemaker_id='+id+'&type='+3,
       url: '/pages/myblock/pingjia/pingjia?winemaker_id='+id+'&type='+3,
     })
     })
   },
   },
+
+  jiushinfoshow() {
+    this.setData({
+      jiushishow: !this.data.jiushishow
+    })
+  },
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
@@ -193,7 +200,7 @@ Page({
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
   onUnload: function () {
   onUnload: function () {
-
+    wx.setStorageSync("guantype", 1)
   },
   },
 
 
   /**
   /**

@@ -37,21 +37,83 @@
 
 
   <view class="lastimg">
   <view class="lastimg">
 
 
-   <view class="jiuright">
-    <image src="{{url}}/aicon_68x.png"></image>
-    <button class="lj_share" catchtap="buildshare" open-type='share'></button>
-  </view>
-  <view class="tiao">分享</view>
-  
+    <view class="jiuright">
+      <image src="{{url}}/aicon_68x.png"></image>
+      <button class="lj_share" catchtap="buildshare" open-type='share'></button>
+    </view>
+    <view class="tiao">分享</view>
+
   </view>
   </view>
 
 
- 
+
 </view>
 </view>
 
 
 <view class="wineimg">
 <view class="wineimg">
   <image src="{{info.thumb}}"></image>
   <image src="{{info.thumb}}"></image>
 </view>
 </view>
 
 
+<view class="niangjiubox">
+
+  <view class="brandboxitem">
+    <view class="boxtop" bindtap="jiushinfoshow">
+      <view class="boxtopleft">
+        基本信息
+      </view>
+      <view class="boxright">
+        <image src="{{url}}aicon_53x.png" wx:if="{{jiushishow}}"></image>
+        <image src="{{url}}aicon_52x.png" wx:else></image>
+      </view>
+    </view>
+
+    <view class="brandtext" wx:if="{{jiushishow}}">
+      <view class="baisinfo">
+        <view class="basinfoleft">性别</view>
+        <view class="baisinforight" wx:if="{{info.sex==1}}">男</view>
+        <view class="baisinforight" wx:if="{{info.sex==2}}">女</view>
+      </view>
+      <view class="baisinfo">
+        <view class="basinfoleft">年龄</view>
+        <view class="baisinforight">{{info.age}}</view>
+      </view>
+      <view class="baisinfo">
+        <view class="basinfoleft">所属酒厂</view>
+        <view class="baisinforight">{{info.company_name}}</view>
+      </view>
+    </view>
+
+
+  </view>
+
+  <view class="cannodataimg" wx:if="{{jiushiarr.length==0}}">
+    <image src="/img/wushuju.png"></image>
+  </view>
+
+  <block wx:else>
+    <view class="brandboxitem" wx:for="{{jiushiarr}}" wx:key='' wx:for-index="idxs">
+      <view class="boxtop" bindtap="showjiushi" data-idx="{{idxs}}">
+        <view class="boxtopleft">
+          {{item.name}}
+        </view>
+        <view class="boxright">
+          <image src="{{url}}aicon_53x.png" wx:if="{{item.show}}"></image>
+          <image src="{{url}}aicon_52x.png" wx:else></image>
+        </view>
+      </view>
+
+      <view class="brandtext" wx:if="{{item.show}}">
+        <block wx:for="{{artileList1}}" wx:for-item="item" wx:for-index="idx" wx:key=''>
+          <block wx:if="{{idxs==idx}}">
+            <template is="wxParse" data="{{wxParseData:item}}" />
+          </block>
+        </block>
+      </view>
+    </view>
+  </block>
+
+
+
+</view>
+
 
 
 <view class="niangjiubox">
 <view class="niangjiubox">
 
 

 @import '../brandpage/brandpage.wxss';
 @import '../brandpage/brandpage.wxss';
+/* @import '../jiuzidian/jiuzidian.wxss'; */
 
 
 image{
 image{
   width:100%;
   width:100%;
@@ -127,11 +128,11 @@ image{
   align-items: center
   align-items: center
 }
 }
 .lj_share{
 .lj_share{
-  width:20rpx;
+  width:101rpx;
   height:30rpx;
   height:30rpx;
   border:none;
   border:none;
   position: absolute;
   position: absolute;
-  right:0;
+  right:-52rpx;
   top:0;
   top:0;
   background: transparent
   background: transparent
 
 
@@ -139,4 +140,7 @@ image{
 button::after{
 button::after{
   border:none;
   border:none;
   outline:none;
   outline:none;
+}
+.brandboxitem:first-child{
+  padding-bottom: 20rpx;
 }
 }

@@ -79,7 +79,9 @@ Page({
      select:e.currentTarget.dataset.id,
      select:e.currentTarget.dataset.id,
      searchshow: false,
      searchshow: false,
       recordshow: true,
       recordshow: true,
-     searchlist:false
+     searchlist:false,
+     page:1,
+     searchlistarr:[]
    })
    })
 
 
     this.getsearchtext()
     this.getsearchtext()
@@ -88,7 +90,10 @@ Page({
   searchlist(){
   searchlist(){
     this.setData({
     this.setData({
       searchlist:true,
       searchlist:true,
-      searchshow:false
+      searchshow:false,
+      page:1,
+      searchlistarr:[]
+
     })
     })
     this.getlist()
     this.getlist()
   },
   },
@@ -103,7 +108,7 @@ Page({
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
       console.log(res);
       console.log(res);
       that.setData({
       that.setData({
-        searchlistarr:res.list
+        searchlistarr: that.data.searchlistarr.concat(res.list)
       })
       })
 
 
       // let newsearchlistarr = that.data.searchlistarr;
       // let newsearchlistarr = that.data.searchlistarr;
@@ -181,13 +186,10 @@ Page({
           }
           }
         }
         }
       }
       }
-
       that.setData({
       that.setData({
         searchlistarr: newsearchlistarr
         searchlistarr: newsearchlistarr
       })
       })
 
 
-
-
     }).catch((err) => {
     }).catch((err) => {
 
 
     })
     })
@@ -206,9 +208,6 @@ Page({
       that.setData({
       that.setData({
         searchlist:res.list
         searchlist:res.list
       })
       })
-
-
-
     }).catch((err) => {
     }).catch((err) => {
       this.setData({
       this.setData({
         searchshow: false,
         searchshow: false,
@@ -229,7 +228,21 @@ Page({
       keyword:e.detail.value
       keyword:e.detail.value
     })
     })
 
 
-    this.getkeyword()
+    
+
+    if (this.data.keyword!=''){
+      this.getkeyword()
+    }else{
+      this.setData({
+        searchshow: false,
+        recordshow: true,
+        searchlist: false,
+        keyword: e.detail.value
+      })
+
+    }
+
+    
   },
   },
 
 
   searchhistory(e){
   searchhistory(e){
@@ -285,7 +298,7 @@ Page({
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
   onShow: function () {
   onShow: function () {
-    this.getlist()
+    // this.getlist()
     
     
   },
   },
 
 
@@ -314,7 +327,13 @@ Page({
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
   onReachBottom: function () {
   onReachBottom: function () {
+      let page=this.data.page;
+      page++;
+      this.setData({
+        page:page
+      })
 
 
+    this.getlist()
   },
   },
 
 
   /**
   /**

@@ -48,8 +48,8 @@
     <view class="seahead">
     <view class="seahead">
 
 
       <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterwine" data-id="{{item.id}}" wx:if="{{select==1}}">{{item.name}}</view>
       <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterwine" data-id="{{item.id}}" wx:if="{{select==1}}">{{item.name}}</view>
-       <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
-        <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
+      <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
+      <view class="searword" wx:for="{{list}}" wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
 
 
     </view>
     </view>
 
 
@@ -76,8 +76,8 @@
 
 
     <view class="seahead">
     <view class="seahead">
       <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterwine" data-id="{{item.id}}" wx:if="{{select==1}}">{{item.name}}</view>
       <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterwine" data-id="{{item.id}}" wx:if="{{select==1}}">{{item.name}}</view>
-       <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
-        <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
+      <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterpinpai" data-id="{{item.id}}" wx:if="{{select==2}}">{{item.name}}</view>
+      <view class="searword" wx:for="{{favorite}}" wx:key='' wx:key="" bindtap="enterjiuqi" data-id="{{item.id}}" wx:if="{{select==3}}">{{item.name}}</view>
 
 
     </view>
     </view>
 
 
@@ -88,87 +88,105 @@
 
 
   <view class="jiupin" wx:if="{{select==1}}">
   <view class="jiupin" wx:if="{{select==1}}">
 
 
-    <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
-      <view class="searchitemleft">
-        <view class="itemleftimg">
-          <image src="{{item.logo}}"></image>
-        </view>
+    <view class="nodataimg" wx:if="{{searchlistarr.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
+    <block wx:else>
 
 
-        <view class="itemiddle">
-          <view class="itemidelename">{{item.name}}</view>
-          <view class="nambottom">
-            <text class="namebottomitem">{{item.degree_name}}</text>
-            <text class="namebottomitem">{{item.odor_name}}</text>
-            <text class="namebottomitem">{{item.price}}</text>
-            <text class="namebottomitem">{{item.ml}}</text>
+      <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
+        <view class="searchitemleft">
+          <view class="itemleftimg">
+            <image src="{{item.logo}}"></image>
           </view>
           </view>
-        </view>
-      </view>
 
 
-      <view class="starimg" catchtap="collect" data-id="{{item.id}}">
-        <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
-        <image src="{{url}}aicon_09x.png" wx:else></image>
+          <view class="itemiddle">
+            <view class="itemidelename">{{item.name}}</view>
+            <view class="nambottom">
+              <text class="namebottomitem">{{item.degree_name}}</text>
+              <text class="namebottomitem">{{item.odor_name}}</text>
+              <text class="namebottomitem">{{item.price}}</text>
+              <text class="namebottomitem">{{item.ml}}</text>
+            </view>
+          </view>
+        </view>
 
 
-      </view>
+        <view class="starimg" catchtap="collect" data-id="{{item.id}}">
+          <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
+          <image src="{{url}}aicon_09x.png" wx:else></image>
 
 
-    </view>
+        </view>
 
 
+      </view>
+    </block>
   </view>
   </view>
 
 
   <view class="brand" wx:if="{{select==2}}">
   <view class="brand" wx:if="{{select==2}}">
 
 
-    <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
-      <view class="searchitemleft">
-        <view class="branditemleftimg">
-          <image src="{{url}}aicon_12@2x.png"></image>
-        </view>
+    <view class="nodataimg" wx:if="{{searchlistarr.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
+
+    <block wx:else>
 
 
-        <view class="itemiddle">
-          <view class="itemidelename">{{item.name}}</view>
-          <view class="nambottom">
-            <text class="namebottomitem">{{item.sort_name}}</text>
-            <text class="namebottomitem">{{item.country}}</text>
-            <text class="namebottomitem">{{item.city}}</text>
-            <text class="namebottomitem">{{item.odor_name}}</text>
+      <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpbrand" data-id="{{item.id}}">
+        <view class="searchitemleft">
+          <view class="branditemleftimg">
+            <image src="{{url}}aicon_12@2x.png"></image>
+          </view>
+
+          <view class="itemiddle">
+            <view class="itemidelename">{{item.name}}</view>
+            <view class="nambottom">
+              <text class="namebottomitem">{{item.sort_name}}</text>
+              <text class="namebottomitem">{{item.country}}</text>
+              <text class="namebottomitem">{{item.city}}</text>
+              <text class="namebottomitem">{{item.odor_name}}</text>
+            </view>
           </view>
           </view>
         </view>
         </view>
-      </view>
 
 
-      <view class="starimg" catchtap="collect" data-id="{{item.id}}">
+        <view class="starimg" catchtap="collect" data-id="{{item.id}}">
 
 
 
 
-        <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
-        <image src="{{url}}aicon_09x.png" wx:else></image>
+          <image src="{{url}}aicon_10x.png" wx:if="{{item.is_favorite==1}}"></image>
+          <image src="{{url}}aicon_09x.png" wx:else></image>
+        </view>
+
       </view>
       </view>
 
 
-    </view>
+    </block>
 
 
   </view>
   </view>
 
 
   <view class="brand" wx:if="{{select==3}}">
   <view class="brand" wx:if="{{select==3}}">
+    <view class="nodataimg" wx:if="{{searchlistarr.length==0}}">
+      <image src="/img/wushuju.png"></image>
+    </view>
 
 
-    <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpcompany" data-id="{{item.id}}">
-      <view class="searchitemleft">
-        <view class="jiuqiimg">
-          <image src="{{url}}aicon_13@2x.png"></image>
-        </view>
+    <block>
 
 
-        <view class="itemiddle">
-          <view class="itemidelename">{{item.name}}</view>
-          <view class="nambottom">
-            <text class="namebottomitem">{{item.country}}</text>
-            <text class="namebottomitem">{{item.city}}</text>
-            <text class="namebottomitem">{{item.sort_name}}</text>
-            <text class="namebottomitem">{{item.concern_count}}关注</text>
+      <view class="searchitem" wx:for="{{searchlistarr}}" wx:key='' bindtap="jumpcompany" data-id="{{item.id}}">
+        <view class="searchitemleft">
+          <view class="jiuqiimg">
+            <image src="{{item.logo}}"></image>
           </view>
           </view>
-        </view>
-      </view>
 
 
-      <view class="atten" wx:if="{{item.is_concern==1}}" data-id="{{item.id}}" catchtap="attention">取消关注</view>
-      <view class="atten" data-id="{{item.id}}" wx:else catchtap="attention">关注</view>
+          <view class="itemiddle">
+            <view class="itemidelename">{{item.name}}</view>
+            <view class="nambottom">
+              <text class="namebottomitem">{{item.country}}</text>
+              <text class="namebottomitem">{{item.city}}</text>
+              <text class="namebottomitem">{{item.sort_name}}</text>
+              <text class="namebottomitem">{{item.concern_count}}关注</text>
+            </view>
+          </view>
+        </view>
 
 
-    </view>
+        <view class="atten" wx:if="{{item.is_concern==1}}" data-id="{{item.id}}" catchtap="attention">取消关注</view>
+        <view class="atten" data-id="{{item.id}}" wx:else catchtap="attention">关注</view>
 
 
+      </view>
+    </block>
   </view>
   </view>
 
 
 </view>
 </view>

 <view class="containerbox">
 <view class="containerbox">
+
+<view class="nodataimg" wx:if="{{shipaiarr.length==0}}">
+    <image src="/img/wushuju.png"></image>
+  </view>
+  <block wx:else>
   <view class="boxitem" wx:for="{{shipaiarr}}" wx:key='' >
   <view class="boxitem" wx:for="{{shipaiarr}}" wx:key='' >
-    <view class="itemimg" bindtap='viewImg' data-index="{{index}}">
-      <image src="{{item.url}}"></image>
+    <view class="itemimg" bindtap='viewImg' data-index="{{index}}" >
+      <image src="{{item.url}}" ></image>
     </view>
     </view>
 
 
     <view class="itembottom">
     <view class="itembottom">
@@ -21,5 +26,5 @@
 
 
     </view>
     </view>
   </view>
   </view>
- 
+ </block>
 </view>
 </view>

@@ -87,9 +87,6 @@ Page({
     }
     }
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
       console.log(res);
       console.log(res);
-
-
-
     }).catch((err) => {
     }).catch((err) => {
 
 
     })
     })

@@ -4,7 +4,7 @@
   <image src="{{video.video_image}}"></image>
   <image src="{{video.video_image}}"></image>
 
 
   <view class="boimg">
   <view class="boimg">
-      <image src="{{url}}/aicon_70x.png"></image>
+    <image src="{{url}}/aicon_70x.png"></image>
   </view>
   </view>
 </view>
 </view>
 
 
@@ -21,22 +21,39 @@
 
 
 <view class="biaozhuantitle xiaovideo">小视频</view>
 <view class="biaozhuantitle xiaovideo">小视频</view>
 <view class="shortvideobox">
 <view class="shortvideobox">
-  <view class="videoitem" wx:for='{{list}}' wx:key=''>
 
 
-  <view class="itemvid" bindtap="shortentervideo" data-url="{{item.video}}" data-id="{{item.id}}">
-    <image src="{{item.video_image}}"></image>
-    <view class="boimg">
-      <image src="{{url}}/aicon_70x.png"></image>
-  </view>
+<view class="nodataimg" wx:if="{{list.length==0}}">
+    <image src="/img/wushuju.png"></image>
   </view>
   </view>
+  <block wx:else>
+  <view class="videoitem" wx:for='{{list}}' wx:key=''>
+
+    <view class="itemvid" bindtap="shortentervideo" data-url="{{item.video}}" data-id="{{item.id}}">
+      <image src="{{item.video_image}}"></image>
+      <view class="boimg">
+        <image src="{{url}}/aicon_70x.png"></image>
+      </view>
+    </view>
     <!-- <video src="{{item.video}}" class="itemvid" controls object-fit="fill"></video> -->
     <!-- <video src="{{item.video}}" class="itemvid" controls object-fit="fill"></video> -->
 
 
     <view class="videoittitle">{{item.content}}</view>
     <view class="videoittitle">{{item.content}}</view>
+    <view class="bofanglist">
+      <view class="bofangleft">
+        {{item.video_count}}次播放
+      </view>
+      <view class="bofangright">
+        <view class="bofangrightimg">
+          <image src="/img/zan.png"></image>
+        </view>
+
+        <view class="zanshu">{{item.good_count}}</view>
+      </view>
+    </view>
     <view class="">
     <view class="">
 
 
     </view>
     </view>
   </view>
   </view>
- 
+</block>
 
 
 
 
 
 

@@ -75,4 +75,33 @@ page{
   top:50%;
   top:50%;
   left:50%;
   left:50%;
   transform: translate(-50%,-50%)
   transform: translate(-50%,-50%)
+}
+.bofanglist{
+  width:338rpx;
+  margin:0 auto;
+  padding: 0 12rpx;
+  box-sizing: border-box;
+  display:flex;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute;
+  bottom:14rpx;
+}
+.bofangrightimg{
+  width:30rpx;
+  height:30rpx;
+  font-size:0
+}
+.bofangright{
+  display:flex;
+  align-items: cnter
+}
+.zanshu{
+  color:#FFFFFF;
+  font-size: 28rpx;
+  margin-left:10rpx;
+}
+.nodataimg {
+  margin:200rpx auto 0;
+
 }
 }

@@ -9,7 +9,7 @@ Page({
     url: '',
     url: '',
     user_list: [],
     user_list: [],
     list: [],
     list: [],
-    type: 1,
+    type: 2,
     arr: []
     arr: []
   },
   },
 
 
@@ -150,6 +150,18 @@ Page({
       user_list: newuser_list
       user_list: newuser_list
     })
     })
   },
   },
+  //长按显示叉号
+  xianshicha(){
+    this.setData({
+      type:3
+    })
+  },
+  //编辑事件
+  edit(){
+    this.setData({
+      type:3
+    })
+  },
 
 
   //完成事件
   //完成事件
   finish() {
   finish() {
@@ -200,8 +212,11 @@ Page({
         })
         })
 
 
         setTimeout(function() {
         setTimeout(function() {
-          wx.navigateBack({
-            checked: true
+          // wx.navigateBack({
+          //   checked: true
+          // })
+          that.setData({
+            type:2
           })
           })
         }, 1500)
         }, 1500)
 
 

-<view class="clear" wx:if="{{type==1}}" bindtap="qingchu">清除</view>
-<view class="clear" wx:if="{{type==2}}">编辑</view>
+<!-- <view class="clear" wx:if="{{type==1}}" bindtap="qingchu">清除</view> -->
+<view class="clear" wx:if="{{type==2}}" bindtap="edit">编辑</view>
 <view class="clear" wx:if="{{type==3}}" bindtap="finish">完成</view>
 <view class="clear" wx:if="{{type==3}}" bindtap="finish">完成</view>
 
 
 <view class="morenshu">
 <view class="morenshu">
@@ -7,11 +7,11 @@
   <view class="longan">长按可拖动排序</view>
   <view class="longan">长按可拖动排序</view>
 </view>
 </view>
 
 
-<view class="shubox">
-  <view class="shuitem" wx:for="{{user_list}}" wx:key="">
+<view class="shubox" >
+  <view class="shuitem" wx:for="{{user_list}}" wx:key="" bindlongpress="xianshicha">
     {{item.name}}
     {{item.name}}
 
 
-    <view class="cancelmg" wx:if="{{type!=1}}" bindtap="shanchu" data-id="{{item.id}}">
+    <view class="cancelmg" wx:if="{{type!=2&&item.id>0}}" bindtap="shanchu" data-id="{{item.id}}">
       <image src="{{url}}/bicon_09x.png"></image>
       <image src="{{url}}/bicon_09x.png"></image>
     </view>
     </view>
   </view>
   </view>

@@ -3,6 +3,7 @@ const app = getApp()
 Page({
 Page({
 
 
   /**
   /**
+   * 
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
@@ -43,6 +44,8 @@ Page({
     zhinengwrap: false,
     zhinengwrap: false,
     citychose: false,
     citychose: false,
     pricechose:false,
     pricechose:false,
+    morechose:false,
+    fenchose:false,
     use_id: '',
     use_id: '',
     odor_id: '',
     odor_id: '',
     package_id: '',
     package_id: '',
@@ -55,7 +58,47 @@ Page({
     zhinenglist: [],
     zhinenglist: [],
     page:1,
     page:1,
     priceyuan:'0元',
     priceyuan:'0元',
-    pricevalue:0
+    pricevalue:'',
+
+
+    leftMin: '', //左边滑块最小值
+    rightMax:'', //右边滑块最大值
+    leftValue: '', //左边滑块默认值
+    rightValue: '', //右边滑块默认值
+    min:'',
+    max:'',
+    morelist:[],
+    morecan:[],
+    conetentarr:[],
+    low: 0,
+    heigh: 100,
+    number:'',
+    fenleftMin:'',
+    fenrightMax:'',
+    fenmin:'',
+    fenmax:'',
+    fennumber:'',
+    score:'',
+    pricezhi:'',
+    selectinfo:'',
+
+    // 智能筛选默认值
+    min: 0,
+    rmax: 100,
+    leftValue: 0,
+    rightValue: 100,
+    ppvalue: 100,
+    ppleft: 0,
+    totalLength: 0,
+    bigLength: 0,
+    ratio: 0.5,
+    sliderLength: 20,
+    containerLeft: 0, //标识整个组件，距离屏幕左边的距离
+    hideOption: '', //初始状态为显示组件
+    maxValue:0
+
+
+    
   },
   },
 
 
   /**
   /**
@@ -68,10 +111,572 @@ Page({
     })
     })
 
 
 
 
-    this.getshaicontent()
+    // this.getshaicontent();
     this.getmorenconetent();
     this.getmorenconetent();
 
 
+    // this.propertyLeftValueChange();
+
+    
+   
+  },
+
+  _propertyLeftValueChange: function () {
+    console.log(this.data.minValue);
+    console.log(this.data.max);
+    console.log(this.data.bigLength)
+
+    let minValue = this.data.minValue / this.data.max * this.data.bigLength;
+    console.log(minValue)
+    let min = this.data.min / this.data.max * this.data.bigLength;
+    console.log(min)
+    this.setData({
+      leftValue: minValue - min,
+      ppleft: minValue - min
+    })
+
+    console.log(this.data.ppleft)
+  },
+
+  /**
+   * 设置右边滑块的值
+   */
+  _propertyRightValueChange: function () {
+    let right = this.data.maxValue / this.data.max * this.data.bigLength + this.data.sliderLength
+    this.setData({
+      rightValue: right,
+      ppvalue: right
+    })
+
+    console.log(this.data.rightValue)
+  },
+
+ 
+
+
+  //获取筛选内容
+  getshaicontent() {
+    let that = this;
+    let url = 'index/Filter/filter',
+      params = {
+
+      }
+    app.post(url, params).then((res) => {
+      console.log(res);
+      that.setData({
+        selectinfo: res
+      })
+      let newselectinfo=that.data.selectinfo
+      newselectinfo.price[0].realmin = newselectinfo.price[0].min;
+      newselectinfo.price[0].realmax = newselectinfo.price[0].max;
+      newselectinfo.score_list[0].realmin = newselectinfo.score_list[0].min;
+      newselectinfo.score_list[0].realmax = newselectinfo.score_list[0].max
+
+      that.setData({
+        selectinfo: newselectinfo
+      })
+      console.log(that.data.selectinfo)
+     
+     
+      
+
+
+    
+
+      // that._propertyLeftValueChange()
+      // that._propertyRightValueChange()
+
+    }).catch((err) => {
+
+    })
+  },
+  //显示更多选项
+
+  mores(){
+    let that=this;
+    this.setData({
+      morechose:true,
+      citychose: false,
+      zhinengwrap: false,
+      pricechose: false, 
+      conetentarr:[],
+      page:1,
+      zhinenglist:[]
+    })
+
+    let newmorelist = that.data.morelist;
+    for (var obj of newmorelist) {
+      obj.sel = false;
+      obj.contentarr = []
+      if (obj.basic_sort == 1) {
+        for (var p of obj.value_list) {
+          p.twsel = false;
+
+        }
+      } else if (obj.basic_sort == 2) {
+        
+        obj.zmin = parseInt(obj.min) - parseInt(obj.number);
+        obj.zmax = parseInt(obj.max) + parseInt(obj.number);
+        obj.between = obj.realmin + '-' + obj.realmax + obj.unit;
+
+      }
+    }
+    that.setData({
+      morelist: newmorelist
+    })
+    console.log(that.data.morelist)
+
+    
+
+    // this.getmorecan()
+  },
+  //隐藏更多选项
+  hidemorechose(){
+    this.setData({
+      morechose: false,
+      citychose: false,
+      zhinengwrap: false,
+      pricechose: false,
+      fenchose: false
+    })
+
+    let newnavarr = this.data.navarr;
+    for (var obj of newnavarr) {
+      obj.sel = false
+    }
+
+    this.setData({
+      navarr: newnavarr
+    })
+
+    this.getmorenconetent()
+  },
+ 
+  //隐藏评分
+  hidefen(){
+    this.setData({
+      morechose: false,
+      citychose: false,
+      zhinengwrap: false,
+      pricechose: false,
+      fenchose:false,
+      page: 1,
+      zhinenglist: []
+    })
+    console.log(9099090)
+    console.log(this.data.zhinenglist)
+
+    let newnavarr = this.data.navarr;
+    newnavarr[5].name = this.data.score
+    for (var obj of newnavarr) {
+      obj.sel = false
+    }
+
+    this.setData({
+      navarr: newnavarr,
+      
+    })
+
+    this.getmorenconetent()
+  },
+
+  //获取更多参数
+  getmorecan(){
+    let that = this;
+    let url = 'index/Filter/more', params = {
+      
+
+    }
+    app.post(url, params).then((res) => {
+      console.log(res);
+      that.setData({
+        morelist:res.list
+      })
+
+      let newmorelist = that.data.morelist;
+      for (var obj of newmorelist) {
+        obj.sel = false;
+        obj.contentarr = []
+        if (obj.basic_sort == 1) {
+          for (var p of obj.value_list) {
+            p.twsel = false;
+
+          }
+        } else if (obj.basic_sort == 2) {
+          obj.realmin = obj.min;
+          obj.realmax = obj.max;
+          obj.zmin = parseInt(obj.min) - parseInt(obj.number);
+          obj.zmax = parseInt(obj.max) + parseInt(obj.number);
+          obj.between = obj.realmin + '-' + obj.realmax + obj.unit;
+
+        }
+      }
+      that.setData({
+        morelist: newmorelist
+      })
+
+
+    }).catch((err) => {
+
+    })
   },
   },
+
+  //更多参数向左滑动效果
+  lowValueChangeAction1(e){
+    let that = this;
+    let index = e.currentTarget.dataset.parindex;
+    console.log(index)
+    let id=e.currentTarget.dataset.id;
+    let basic_sort = e.currentTarget.dataset.basic_sort;
+
+   
+    let newmorelist=that.data.morelist;
+    // newmorelist[index].min = e.detail.lowValue;
+    newmorelist[index].realmin = e.detail.lowValue
+    
+    
+   
+
+    if (e.detail.lowValue < newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max <= newmorelist[index].zmax - newmorelist[index].number) {
+
+      newmorelist[index].between = '<' + newmorelist[index].realmax + newmorelist[index].unit;
+      newmorelist[index].chuanbetween = 0 + '-' + newmorelist[index].realmax
+      
+
+    } else if (e.detail.lowValue < newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max > newmorelist[index].zmax - newmorelist[index].number) {
+      newmorelist[index].between = '不限';
+      newmorelist[index].chuanbetween = 0 + '-' +0
+      
+    } else if (e.detail.lowValue >= newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max <= newmorelist[index].zmax - newmorelist[index].number) {
+
+      newmorelist[index].between = newmorelist[index].realmin + newmorelist[index].unit + '-' + newmorelist[index].realmax + newmorelist[index].unit
+      newmorelist[index].chuanbetween = newmorelist[index].realmin + '-' + newmorelist[index].realmax
+
+      
+    } else if (e.detail.lowValue >= newmorelist[index].zmin + newmorelist[index].number && newmorelist[index].max > newmorelist[index].zmax - newmorelist[index].number) {
+
+      newmorelist[index].between = ">" + newmorelist[index].realmin + newmorelist[index].unit;
+      newmorelist[index].chuanbetween =  newmorelist[index].realmax + '-'+0
+
+      
+    }
+
+    this.setData({
+      morelist: newmorelist
+    })
+
+   
+
+    let chuanobj = {};
+    let chuancontent = newmorelist[index].chuanbetween;
+
+    chuanobj.id = id;
+    chuanobj.basic_sort = basic_sort;
+    chuanobj.content = chuancontent;
+    let newmorecan = this.data.morecan;
+    newmorecan[index] = chuanobj;
+    // for (var i = 0; i < newmorecan.length;i++){
+    //   if (newmorecan[i]==undefined){
+    //     newmorecan.splice(i,1)
+    //   }
+      
+    // }
+    that.setData({
+      morecan: newmorecan
+    })
+
+   console.log(that.data.morecan)
+
+   
+    
+  },
+
+  //更多参数向右滑动
+  heighValueChangeAction1(e){
+    let that=this;
+    let index = e.currentTarget.dataset.parindex;
+    console.log(index)
+    let id = e.currentTarget.dataset.id;
+    let basic_sort = e.currentTarget.dataset.basic_sort;
+    console.log(index)
+    let newmorelist = that.data.morelist;
+    newmorelist[index].realmax = e.detail.heighValue
+
+    if (newmorelist[index].min < newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue <= newmorelist[index].zmax - newmorelist[index].number) {
+
+      newmorelist[index].between = '<' + newmorelist[index].realmax + newmorelist[index].unit;
+      newmorelist[index].chuanbetween = 0 + '-' + newmorelist[index].realmax
+     
+    } else if (newmorelist[index].min < newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue > newmorelist[index].zmax - newmorelist[index].number) {
+
+      newmorelist[index].between = '不限';
+      newmorelist[index].chuanbetween = 0 + '-' + 0
+      
+    } else if (newmorelist[index].min >= newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue <= newmorelist[index].zmax - newmorelist[index].number) {
+      newmorelist[index].between = newmorelist[index].realmin + newmorelist[index].unit + '-' + newmorelist[index].realmax + newmorelist[index].unit;
+      newmorelist[index].chuanbetween = newmorelist[index].realmin + '-' + newmorelist[index].realmax
+      
+    } else if (newmorelist[index].min >= newmorelist[index].zmin + newmorelist[index].number && e.detail.heighValue > newmorelist[index].zmax - newmorelist[index].number) {
+      newmorelist[index].between = ">" + newmorelist[index].realmin + newmorelist[index].unit,
+        newmorelist[index].chuanbetween = newmorelist[index].realmin + '-' + 0
+    }
+
+    that.setData({
+      morelist:newmorelist
+    })
+
+
+    let chuanobj = {};
+    let chuancontent = newmorelist[index].chuanbetween;
+
+    chuanobj.id = id;
+    chuanobj.basic_sort = basic_sort;
+    chuanobj.content = chuancontent;
+    let newmorecan = this.data.morecan;
+    newmorecan[index] = chuanobj;
+    that.setData({
+      morecan: newmorecan
+    })
+    console.log(that.data.morecan.length)
+  },
+
+  //获取更多参数的文字
+  selectmoreitem(e){
+    console.log(e)
+    let id=e.currentTarget.dataset.id;
+    let basic_sort = e.currentTarget.dataset.basic_sort;
+    let content=e.currentTarget.dataset.content;
+    let parentindex = e.currentTarget.dataset.parindex;
+    let childindex = e.currentTarget.dataset.childindex;
+    
+     let conetentarr = this.data.conetentarr;
+    let newmorelist=this.data.morelist;
+    // let conetentarr = newmorelist[parentindex].contentarr;
+    console.log(conetentarr)
+    newmorelist[parentindex].value_list[childindex].twsel = !newmorelist[parentindex].value_list[childindex].twsel
+    this.setData({
+      morelist:newmorelist
+    })
+
+    if (newmorelist[parentindex].value_list[childindex].twsel==true){
+      conetentarr.push(content);
+      let newlsit = newmorelist[parentindex].value_list;
+      
+      newmorelist[parentindex].contentarr.push(content);
+     
+      // for (var i = 0; i < newlsit.length;i++){
+      //   for (var j = 0; j < conetentarr.length;j++){
+      //     if (newlsit[i].content != conetentarr[j]){
+      //       conetentarr.splice(j,1)
+      //     }
+      //   }
+      // }
+    }else{
+      console.log(334)
+      let newconetentarr = this.data.conetentarr;
+      console.log(childindex)
+      for (var i = 0; i < newmorelist[parentindex].contentarr.length;i++){
+        if (newmorelist[parentindex].value_list[childindex].content == newmorelist[parentindex].contentarr[i]){
+          newmorelist[parentindex].contentarr.splice(i, 1)
+        }
+      }
+     
+      // this.setData({
+      //   conetentarr: newconetentarr
+      // })
+
+      // console.log(this.data.conetentarr)
+    }
+
+    let chuancontent = '';
+    if (newmorelist[parentindex].contentarr.length>0){
+      
+        newmorelist[parentindex].sel=true,
+          chuancontent = newmorelist[parentindex].contentarr.join(",")
+      
+    }else{
+      chuancontent=''
+      newmorelist[parentindex].sel = false;
+      
+    }
+    this.setData({
+      morelist: newmorelist
+    })
+    
+    console.log(this.data.morelist)
+    let chuanobj={};
+
+    chuanobj.id=id;
+    chuanobj.basic_sort = basic_sort;
+    chuanobj.content = chuancontent;
+    let newmorecan=this.data.morecan;
+    newmorecan[parentindex] = chuanobj;
+
+    if (chuancontent==''){
+      console.log(newmorecan)
+      for (var i = 0; i < newmorecan.length;i++){
+        console.log(newmorecan[i])
+        if (newmorecan[i]!=undefined){
+          if (newmorecan[i].id == id) {
+            newmorecan.splice(i, 1)
+          }
+        }
+       
+      }
+    }
+  
+    this.setData({
+      morecan: newmorecan
+    })
+    console.log(this.data.morecan);
+    
+
+  },
+
+  
+
+  //向左移动
+
+  lowValueChangeAction: function (e) {
+    
+    let newselectinfo=this.data.selectinfo
+    newselectinfo.price[0].realmin = e.detail.lowValue
+    let that=this;
+    this.setData({
+      leftMin: e.detail.lowValue,
+      selectinfo: newselectinfo
+    })
+
+    if (e.detail.lowValue < that.data.min + that.data.number && that.data.rightMax <= that.data.max - that.data.number) {
+      that.setData({
+        priceyuan: '<' + that.data.rightMax + '元',
+        pricevalue: 0 + '-' + that.data.rightMax
+      })
+    } else if (e.detail.lowValue < that.data.min + that.data.number && that.data.rightMax > that.data.max - that.data.number) {
+      that.setData({
+        priceyuan: '不限',
+        pricevalue: 0 + '-' + 0
+      })
+    } else if (e.detail.lowValue >= that.data.min + that.data.number && that.data.rightMax <= that.data.max - that.data.number) {
+      that.setData({
+        priceyuan: that.data.leftMin + '元' + '-' + that.data.rightMax + '元',
+        pricevalue: that.data.leftMin + '-' + that.data.rightMax
+      })
+    } else if (e.detail.lowValue >= that.data.min + that.data.number && that.data.rightMax > that.data.max - that.data.number) {
+      that.setData({
+        priceyuan: ">" + that.data.leftMin + '元',
+        pricevalue: that.data.rightMax + '-' + 0
+      })
+    }
+
+  
+  },
+//向右移动
+  heighValueChangeAction: function (e) {
+    let that=this;
+    let newselectinfo = this.data.selectinfo
+    newselectinfo.price[0].realmax = e.detail.heighValue
+    this.setData({
+      rightMax: e.detail.heighValue,
+      selectinfo:newselectinfo
+    })
+
+    console.log(e.detail.heighValue);
+    console.log(that.data.min + that.data.number);
+    console.log(that.data.max - that.data.number)
+    if (that.data.leftMin < that.data.min + that.data.number && e.detail.heighValue <= that.data.max-that.data.number) {
+      that.setData({
+        priceyuan: '<' + that.data.rightMax + '元',
+        pricevalue: 0 + '-' + that.data.rightMax
+      })
+    } else if (that.data.leftMin < that.data.min + that.data.number && e.detail.heighValue > that.data.max-that.data.number) {
+      that.setData({
+        priceyuan: '不限',
+        pricevalue: 0 + '-' + 0
+      })
+    } else if (that.data.leftMin >= that.data.min + that.data.number && e.detail.heighValue <= that.data.max-that.data.number) {
+      that.setData({
+        priceyuan: that.data.leftMin + '元' + '-' + that.data.rightMax + '元',
+        pricevalue: that.data.leftMin + '-' + that.data.rightMax
+      })
+    } else if (that.data.leftMin >= that.data.min + that.data.number && e.detail.heighValue > that.data.max-that.data.number) {
+      that.setData({
+        priceyuan: ">" + that.data.leftMin + '元',
+        pricevalue: that.data.leftMin + '-' + 0
+      })
+    }
+  },
+
+  //评分向左移动
+  fenlowValueChangeAction(e){
+    let that = this;
+    let newselectinfo = that.data.selectinfo
+    newselectinfo.score_list[0].realmin = e.detail.lowValue
+    that.setData({
+      fenleftMin: e.detail.lowValue,
+      selectinfo:newselectinfo
+    })
+   
+
+    if (e.detail.lowValue < that.data.fenmin + that.data.fennumber && that.data.fenrightMax <= that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: '<' + that.data.fenrightMax + '分',
+        chuanscore: 0 + '-' + that.data.fenrightMax
+      })
+    } else if (e.detail.lowValue < that.data.fenmin + that.data.fennumber && that.data.fenrightMax > that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: '不限',
+        chuanscore: 0 + '-' + 0
+      })
+    } else if (e.detail.lowValue >= that.data.fenmin + that.data.fennumber && that.data.fenrightMax <= that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: that.data.fenleftMin + '分' + '-' + that.data.fenrightMax + '分',
+        chuanscore: that.data.fenleftMin + '-' + that.data.fenrightMax
+      })
+    } else if (e.detail.lowValue >= that.data.fenmin + that.data.fennumber && that.data.fenrightMax > that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: ">" + that.data.fenleftMin + '分',
+        chuanscore: that.data.fenrightMax + '-' + 0
+      })
+    }
+  },
+
+  //评分向右移动
+  fenheighValueChangeAction: function (e) {
+    let that = this;
+    
+    let newselectinfo = that.data.selectinfo
+    newselectinfo.score_list[0].realmax = e.detail.heighValue
+    this.setData({
+      fenrightMax: e.detail.heighValue,
+      selectinfo:newselectinfo
+    })
+
+   
+
+    if (that.data.fenleftMin < that.data.fenmin + that.data.fennumber && e.detail.fenheighValue <= that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: '<' + that.data.fenrightMax + '分',
+        chuanscore: 0 + '-' + that.data.fenrightMax
+      })
+    } else if (that.data.fenleftMin < that.data.fenmin + that.data.fennumber && e.detail.heighValue > that.data.fenmax - that.data.fennumber) {
+      
+      that.setData({
+        score: '不限',
+        chuanscore: 0 + '-' + 0
+      })
+    } else if (that.data.fenleftMin >= that.data.fenmin + that.data.fennumber && e.detail.heighValue <= that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: that.data.fenleftMin + '分' + '-' + that.data.fenrightMax + '分',
+        chuanscore: that.data.fenleftMin + '-' + that.data.fenrightMax
+      })
+    }  else if (that.data.fenleftMin >= that.data.fenmin + that.data.fennumber && e.detail.heighValue > that.data.fenmax - that.data.fennumber) {
+      that.setData({
+        score: ">" + that.data.fenleftMin + '分',
+        chuanscore: that.data.fenleftMin + '-' + 0
+      })
+    }
+  },
+
   select(e) {
   select(e) {
 
 
     let that = this;
     let that = this;
@@ -80,11 +685,16 @@ Page({
     let type = e.currentTarget.dataset.type;
     let type = e.currentTarget.dataset.type;
     this.setData({
     this.setData({
       type: type,
       type: type,
+      // page:1,
+      // zhinenglist:[]
 
 
     })
     })
 
 
+    console.log(that.data.zhinenglist)
+
 
 
     let newnavarr = this.data.navarr;
     let newnavarr = this.data.navarr;
+    
     for (var i = 0; i < newnavarr.length; i++) {
     for (var i = 0; i < newnavarr.length; i++) {
       if (i == index) {
       if (i == index) {
         newnavarr[i].sel = !newnavarr[i].sel;
         newnavarr[i].sel = !newnavarr[i].sel;
@@ -95,25 +705,56 @@ Page({
             this.setData({
             this.setData({
               citychose: true,
               citychose: true,
               zhinengwrap: false,
               zhinengwrap: false,
-              pricechose: false
+              pricechose: false,
+              morechose:false,
+              fenchose:false
             })
             })
 
 
           } else {
           } else {
             this.setData({
             this.setData({
               citychose: false,
               citychose: false,
               zhinengwrap: false,
               zhinengwrap: false,
-              pricechose: false
+              pricechose: false,
+              morechose: false,
+              fenchose: false
 
 
 
 
             })
             })
           }
           }
         }else if(type==2){
         }else if(type==2){
           if (newnavarr[i].sel == true) {
           if (newnavarr[i].sel == true) {
+           
+            this.setData({
+              citychose: false,
+              zhinengwrap: false,
+              pricechose:true,
+              morechose: false,
+              fenchose: false
+
+            })
+
+          } else {
+            this.setData({
+              citychose: false,
+              zhinengwrap: false,
+              pricechose:false,
+              morechose: false,
+              fenchose: false
+
+            })
+          }
+
+         
+
+        }else if(type==6){
+          if (newnavarr[i].sel == true) {
             console.log(999)
             console.log(999)
             this.setData({
             this.setData({
               citychose: false,
               citychose: false,
               zhinengwrap: false,
               zhinengwrap: false,
-              pricechose:true
+              pricechose: false,
+              morechose: false,
+              fenchose: true
 
 
             })
             })
 
 
@@ -121,7 +762,9 @@ Page({
             this.setData({
             this.setData({
               citychose: false,
               citychose: false,
               zhinengwrap: false,
               zhinengwrap: false,
-              pricechose:false
+              pricechose: false,
+              morechose: false,
+              fenchose: false
 
 
             })
             })
           }
           }
@@ -131,7 +774,9 @@ Page({
             this.setData({
             this.setData({
               citychose: false,
               citychose: false,
               zhinengwrap: true,
               zhinengwrap: true,
-              pricechose: false
+              pricechose: false,
+              morechose: false,
+              fenchose: false
 
 
 
 
             })
             })
@@ -140,7 +785,9 @@ Page({
             this.setData({
             this.setData({
               citychose: false,
               citychose: false,
               zhinengwrap: false,
               zhinengwrap: false,
-              pricechose: false
+              pricechose: false,
+              morechose: false,
+              fenchose: false
 
 
 
 
             })
             })
@@ -159,244 +806,242 @@ Page({
     })
     })
 
 
 
 
+    //筛选
 
 
-    this.getshaicontent();
-    this.getmorenconetent();
+    console.log(that.data.selectinfo)
+    
 
 
-    let newzhinengarr1 = that.data.zhinengarr;
-    console.log(342347)
-    console.log(that.data.type);
-    console.log(newzhinengarr1)
-    // for (var obj of newzhinengarr1) {
-    //   if (that.data.type == 1) {
-    //     console.log(this.data.use_id)
-    //     if (obj.id = this.data.use_id) {
-    //       obj.sel = true
-    //     }
-    //     this.setData({
-    //       zhinengarr: newzhinengarr1
-    //     })
-    //   } else if (that.data.type == 3) {
-    //     if (obj.id = this.data.package_id) {
-    //       obj.sel = true
-    //     }
-    //     this.setData({
-    //       zhinengarr: newzhinengarr1
-    //     })
-    //   } else if (that.data.type == 4) {
-    //     if (obj.city = this.data.city) {
-    //       obj.sel = true
-    //     }
-    //     this.setData({
-    //       zhinengarr: newzhinengarr1
-    //     })
-    //   } else if (that.data.type == 5) {
-    //     if (obj.id = this.data.odor_id) {
-    //       obj.sel = true
-    //     }
-    //     this.setData({
-    //       zhinengarr: newzhinengarr1
-    //     })
-    //   }
-    // }
+    if (that.data.type == 1) {
+      that.setData({
+        zhinengarr:that.data.selectinfo.use
+      })
 
 
-  },
-  //隐藏智能筛选
-  hidezhineng() {
-    this.setData({
-      zhinengwrap: false
-    })
+      let newzhinengarr = that.data.zhinengarr;
+      for (var obj of newzhinengarr) {
+        obj.sel = false
+      }
 
 
-    let newnavarr = this.data.navarr;
-    for (var obj of newnavarr) {
-      obj.sel = false
-    }
+      that.setData({
+        zhinengarr: newzhinengarr
+      })
 
 
-    this.setData({
-      navarr: newnavarr
-    })
+      let newzhinengarr1 = that.data.zhinengarr;
+      for (var obj of newzhinengarr1) {
+        if (obj.id == that.data.use_id) {
+          obj.sel = true
+        }
+      }
 
 
-  },
-  hide() {
-    this.setData({
-      citychose: false
-    })
 
 
-    let newnavarr = this.data.navarr;
-    for (var obj of newnavarr) {
-      obj.sel = false
-    }
+      that.setData({
+        zhinengarr: newzhinengarr1
+      })
 
 
-    this.setData({
-      navarr: newnavarr
-    })
-  },
-  //获取筛选内容
-  getshaicontent() {
-    let that = this;
-    let url = 'index/Filter/filter',
-      params = {
 
 
-      }
-    app.post(url, params).then((res) => {
-      console.log(res);
+    } else if (that.data.type == 2) {
+      console.log(that.data.selectinfo)
 
 
-    
-      if (that.data.type == 1) {
-        that.setData({
+      let middlevalue = '';
 
 
-          zhinengarr: res.use
-        })
 
 
-        let newzhinengarr = that.data.zhinengarr;
-        for (var obj of newzhinengarr) {
-          obj.sel = false
-        }
 
 
-        that.setData({
-          zhinengarr: newzhinengarr
-        })
+      that.setData({
 
 
-        let newzhinengarr1 = that.data.zhinengarr;
-        for (var obj of newzhinengarr1) {
-          if (obj.id == that.data.use_id) {
-            obj.sel = true
-          }
-        }
+        leftMin: parseInt(that.data.selectinfo.price[0].realmin),
+        rightMax: parseInt(that.data.selectinfo.price[0].realmax),
 
 
+        min: parseInt(that.data.selectinfo.price[0].min) - parseInt(that.data.selectinfo.price[0].number),
+        max: parseInt(that.data.selectinfo.price[0].max) + parseInt(that.data.selectinfo.price[0].number),
+        priceyuan: that.data.selectinfo.price[0].realmin + '元' + '-' + that.data.selectinfo.price[0].realmax + '元',
+        pricevalue: that.data.selectinfo.price[0].realmin + '-' + that.data.selectinfo.price[0].realmax,
+        number: that.data.selectinfo.price[0].number
+      })
+      console.log(909080807070)
 
 
-        that.setData({
-          zhinengarr: newzhinengarr1
-        })
+      console.log(that.data.leftMin);
+      console.log(that.data.rightMax);
+      console.log(that.data.min)
+      console.log(that.data.max)
 
 
-       
-      } else if (that.data.type == 2) {
-        that.setData({
-          zhinengarr: res.price
-        })
-
-        let newzhinengarr = that.data.zhinengarr;
-        for (var obj of newzhinengarr) {
-          obj.sel = false
-        }
+      that.setData({
+        zhinengarr: that.data.selectinfo.price
+      })
 
 
-        that.setData({
-          zhinengarr: newzhinengarr
-        })
+      let newzhinengarr = that.data.zhinengarr;
+      for (var obj of newzhinengarr) {
+        obj.sel = false
+      }
 
 
-        
+      that.setData({
+        zhinengarr: newzhinengarr
+      })
 
 
+    } else if (that.data.type == 3) {
+      that.setData({
 
 
-      } else if (that.data.type == 3) {
-        that.setData({
-         
-          zhinengarr: res.packages
-        })
+        zhinengarr: that.data.selectinfo.packages
+      })
 
 
-        let newzhinengarr = that.data.zhinengarr;
-        for (var obj of newzhinengarr) {
-          obj.sel = false
-        }
+      let newzhinengarr = that.data.zhinengarr;
+      for (var obj of newzhinengarr) {
+        obj.sel = false
+      }
 
 
-        that.setData({
-          zhinengarr: newzhinengarr
-        })
+      that.setData({
+        zhinengarr: newzhinengarr
+      })
 
 
 
 
-        let newzhinengarr1 = that.data.zhinengarr;
-        for (var obj of newzhinengarr1) {
-          if (obj.id == that.data.package_id) {
-            obj.sel = true
-          }
+      let newzhinengarr1 = that.data.zhinengarr;
+      for (var obj of newzhinengarr1) {
+        if (obj.id == that.data.package_id) {
+          obj.sel = true
         }
         }
+      }
 
 
 
 
-        that.setData({
-          zhinengarr: newzhinengarr1
-        })
-      } else if (that.data.type == 4) {
-        that.setData({
-          zhinengarr: res.city
-        })
+      that.setData({
+        zhinengarr: newzhinengarr1
+      })
+    } else if (that.data.type == 4) {
+     
+      that.setData({
+        zhinengarr: that.data.selectinfo.city
+      })
 
 
 
 
-        let newzhinengarr = that.data.zhinengarr;
-        for (var obj of newzhinengarr) {
-          obj.sel = false
-        }
+      let newzhinengarr = that.data.zhinengarr;
+      for (var obj of newzhinengarr) {
+        obj.sel = false
+      }
 
 
-        that.setData({
-          zhinengarr: newzhinengarr
-        })
+      that.setData({
+        zhinengarr: newzhinengarr
+      })
 
 
 
 
-        let newzhinengarr1 = that.data.zhinengarr;
-        for (var obj of newzhinengarr1) {
-          if (obj.city == that.data.city) {
-            obj.sel = true
-          }
+      let newzhinengarr1 = that.data.zhinengarr;
+      for (var obj of newzhinengarr1) {
+        if (obj.city == that.data.city) {
+          obj.sel = true
         }
         }
+      }
 
 
 
 
-        that.setData({
-          zhinengarr: newzhinengarr1
-        })
+      that.setData({
+        zhinengarr: newzhinengarr1
+      })
 
 
 
 
-      } else if (that.data.type == 5) {
-        that.setData({
-         
-          zhinengarr: res.odor
-        })
 
 
-        let newzhinengarr = that.data.zhinengarr;
-        for (var obj of newzhinengarr) {
-          obj.sel = false
-        }
 
 
-        that.setData({
-          zhinengarr: newzhinengarr
-        })
+    } else if (that.data.type == 5) {
+      that.setData({
+
+        zhinengarr: that.data.selectinfo.odor
+      })
 
 
+      let newzhinengarr = that.data.zhinengarr;
+      for (var obj of newzhinengarr) {
+        obj.sel = false
+      }
 
 
-        let newzhinengarr1 = that.data.zhinengarr;
-        for (var obj of newzhinengarr1) {
-          if (obj.id == that.data.odor_id) {
-            obj.sel = true
-          }
+      that.setData({
+        zhinengarr: newzhinengarr
+      })
+
+
+      let newzhinengarr1 = that.data.zhinengarr;
+      for (var obj of newzhinengarr1) {
+        if (obj.id == that.data.odor_id) {
+          obj.sel = true
         }
         }
+      }
 
 
 
 
-        that.setData({
-          zhinengarr: newzhinengarr1
-        })
+      that.setData({
+        zhinengarr: newzhinengarr1
+      })
 
 
-      } else if (that.data.type == 6) {
-        that.setData({
-          
-          zhinengarr: res.score_list
-        })
-      }
+    } else if (that.data.type == 6) {
+      console.log(that.data.selectinfo)
 
 
-      
+      that.setData({
+        zhinengarr: that.data.selectinfo.score_list
+      })
 
 
 
 
+      that.setData({
 
 
+        fenleftMin: parseInt(that.data.selectinfo.score_list[0].realmin),
+        fenrightMax: parseInt(that.data.selectinfo.score_list[0].realmax),
 
 
+        fenmin: parseInt(that.data.selectinfo.score_list[0].min) - parseInt(that.data.selectinfo.score_list[0].number),
+        fenmax: parseInt(that.data.selectinfo.score_list[0].max) + parseInt(that.data.selectinfo.score_list[0].number),
+        score: that.data.selectinfo.score_list[0].realmin + that.data.selectinfo.score_list[0].unit + '-' + that.data.selectinfo.score_list[0].realmax + that.data.selectinfo.score_list[0].unit,
+        chuanscore: that.data.selectinfo.score_list[0].realmin + '-' + that.data.selectinfo.score_list[0].realmax,
+        fennumber: that.data.selectinfo.score_list[0].number
+      })
 
 
+      console.log(that.data.fenmax)
 
 
+      console.log(that.data.fenleftMin);
+      console.log(that.data.fenrightMax)
+    }
 
 
 
 
-    }).catch((err) => {
 
 
+    this._propertyLeftValueChange();
+    this._propertyRightValueChange()
+    // that.getshaicontent();
+   
+   
+    // this.getmorenconetent();
+
+    // let newzhinengarr1 = that.data.zhinengarr;
+  },
+  //隐藏智能筛选
+  hidezhineng() {
+    this.setData({
+      zhinengwrap: false
+    })
+
+    let newnavarr = this.data.navarr;
+    for (var obj of newnavarr) {
+      obj.sel = false
+    }
+
+    this.setData({
+      navarr: newnavarr
+    })
+
+  },
+  hide() {
+    this.setData({
+      citychose: false
+    })
+
+    let newnavarr = this.data.navarr;
+    for (var obj of newnavarr) {
+      obj.sel = false
+    }
+
+    this.setData({
+      navarr: newnavarr,
+      // page:1,
+      // zhinenglist:[]
     })
     })
   },
   },
+ 
   //选择种类
   //选择种类
   shosekind(e) {
   shosekind(e) {
     let id = e.currentTarget.dataset.id;
     let id = e.currentTarget.dataset.id;
     console.log(this.data.type)
     console.log(this.data.type)
 
 
-
+    this.setData({
+       zhinenglist:[],
+       page:1
+    })
 
 
     let newzhinengarr = this.data.zhinengarr;
     let newzhinengarr = this.data.zhinengarr;
     for (var obj of newzhinengarr) {
     for (var obj of newzhinengarr) {
@@ -404,6 +1049,7 @@ Page({
 
 
 
 
         if (this.data.type == 1) {
         if (this.data.type == 1) {
+          console.log(111)
           obj.sel = !obj.sel;
           obj.sel = !obj.sel;
           if (obj.sel == true) {
           if (obj.sel == true) {
             this.setData({
             this.setData({
@@ -419,10 +1065,17 @@ Page({
             this.setData({
             this.setData({
               use_id: ''
               use_id: ''
             })
             })
+
+            let newnavarr = this.data.navarr;
+            newnavarr[0].name = '用途';
+            this.setData({
+              navarr: newnavarr
+            })
           }
           }
 
 
-          this.getmorenconetent()
+           
         } else if (this.data.type == 3) {
         } else if (this.data.type == 3) {
+          console.log(333)
           obj.sel = !obj.sel;
           obj.sel = !obj.sel;
           if (obj.sel == true) {
           if (obj.sel == true) {
             this.setData({
             this.setData({
@@ -438,10 +1091,17 @@ Page({
             this.setData({
             this.setData({
               package_id: ''
               package_id: ''
             })
             })
+
+            let newnavarr = this.data.navarr;
+            newnavarr[2].name = '包装';
+            this.setData({
+              navarr: newnavarr
+            })
           }
           }
 
 
-          this.getmorenconetent()
+        
         } else if (this.data.type == 5) {
         } else if (this.data.type == 5) {
+          console.log(555)
           obj.sel = !obj.sel;
           obj.sel = !obj.sel;
           if (obj.sel == true) {
           if (obj.sel == true) {
             this.setData({
             this.setData({
@@ -457,48 +1117,62 @@ Page({
             this.setData({
             this.setData({
               odor_id: ''
               odor_id: ''
             })
             })
+            let newnavarr = this.data.navarr;
+            newnavarr[4].name = '香型';
+            this.setData({
+              navarr: newnavarr
+            })
           }
           }
 
 
-          this.getmorenconetent()
-        }
+           
+        } else if (this.data.type == 4) {
+          console.log(444)
+          let cityname = e.currentTarget.dataset.name;
 
 
 
 
-      } else {
-        obj.sel = false
-      }
 
 
-      if (this.data.type == 4) {
-        let cityname = e.currentTarget.dataset.name;
+          if (obj.city == cityname) {
+            obj.sel = !obj.sel
+            if (obj.sel == true) {
+              this.setData({
+                city: obj.city,
 
 
+              })
 
 
+              let newnavarr = this.data.navarr;
+              newnavarr[3].name = obj.city;
+              this.setData({
+                navarr: newnavarr
+              })
+            } else {
+              this.setData({
+                city: ''
+              })
 
 
-        if (obj.city == cityname) {
-          obj.sel = !obj.sel
-          if (obj.sel == true) {
-            this.setData({
-              city: obj.city,
+              let newnavarr = this.data.navarr;
+              newnavarr[3].name = '产区';
+              this.setData({
+                navarr: newnavarr
+              })
 
 
-            })
-
-            let newnavarr = this.data.navarr;
-            newnavarr[3].name = obj.city;
-            this.setData({
-              navarr: newnavarr
-            })
+            }
           } else {
           } else {
-            this.setData({
-              city: ''
-            })
-
+            obj.sel = false
           }
           }
-        } else {
-          obj.sel = false
-        }
 
 
-        this.getmorenconetent()
+         
+        } 
+
+
+      } else {
+        obj.sel = false
       }
       }
+
+      
     }
     }
 
 
+    this.getmorenconetent()
+
     this.setData({
     this.setData({
       zhinengarr: newzhinengarr
       zhinengarr: newzhinengarr
     })
     })
@@ -507,33 +1181,55 @@ Page({
   },
   },
   //获取默认数据
   //获取默认数据
   getmorenconetent() {
   getmorenconetent() {
+    
     let that = this;
     let that = this;
-    console.log(that.data.pricevalues)
+   
+    let nemore='';
+    let canarr=[];
+    if(that.data.morecan.length==0){
+      console.log(99000)
+      nemore=''
+    }else{
+      console.log(98000)
+      let pp = that.data.morecan
+      
+      // console.log(nemore.length)
+      for (var i = 0; i < pp.length;i++){
+        console.log(typeof (pp[i]))
+        if (typeof (pp[i]) == 'object'){
+          canarr.push(pp[i])
+          // nemore.splice(i,1)
+        }
+      }
+      nemore = canarr
+
+    }
+    console.log(nemore)
+   
     let url = 'index/Filter/index',
     let url = 'index/Filter/index',
       params = {
       params = {
         use_id: that.data.use_id,
         use_id: that.data.use_id,
         odor_id: that.data.odor_id,
         odor_id: that.data.odor_id,
-        price: that.data.pricevalues,
+        price: that.data.pricevalue,
         package_id: that.data.package_id,
         package_id: that.data.package_id,
         city: that.data.city,
         city: that.data.city,
-        score: that.data.score,
-        more: that.data.more,
+        score: that.data.chuanscore,
+        more: nemore,
         page: that.data.page
         page: that.data.page
 
 
       }
       }
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
       console.log(res);
       console.log(res);
       that.setData({
       that.setData({
-        zhinenglist: res.list
+        zhinenglist: this.data.zhinenglist.concat(res.list) 
       })
       })
-
-
-
+      
     }).catch((err) => {
     }).catch((err) => {
 
 
     })
     })
   },
   },
 
 
+
   //收藏
   //收藏
   collect(e) {
   collect(e) {
     let that = this;
     let that = this;
@@ -543,7 +1239,6 @@ Page({
       params = {
       params = {
         sort: 1,
         sort: 1,
         id: id
         id: id
-
       }
       }
     app.post(url, params).then((res) => {
     app.post(url, params).then((res) => {
 
 
@@ -551,7 +1246,22 @@ Page({
         title: res,
         title: res,
         icon: 'none'
         icon: 'none'
       })
       })
-      that.getmorenconetent()
+
+      let newzhinenglist = that.data.zhinenglist;
+      for(var obj of newzhinenglist){
+        if(obj.id==id){
+          if (obj.is_favorite==0){
+            obj.is_favorite=1
+            }else{
+            obj.is_favorite = 0
+            }
+        }
+      }
+
+      that.setData({
+        zhinenglist:newzhinenglist
+      })
+      // that.getmorenconetent()
 
 
 
 
     }).catch((err) => {
     }).catch((err) => {
@@ -559,7 +1269,7 @@ Page({
     })
     })
   },
   },
   changing(e){
   changing(e){
-    console.log(e);
+   
     this.setData({
     this.setData({
       priceyuan:e.detail.value+'元',
       priceyuan:e.detail.value+'元',
       pricevalue:e.detail.value
       pricevalue:e.detail.value
@@ -568,7 +1278,9 @@ Page({
 
 
   hideprice(){
   hideprice(){
    this.setData({
    this.setData({
-     pricechose:false
+     pricechose:false,
+     page:1,
+     zhinenglist:[]
    })
    })
     let newnavarr = this.data.navarr;
     let newnavarr = this.data.navarr;
     for (var obj of newnavarr) {
     for (var obj of newnavarr) {
@@ -581,6 +1293,14 @@ Page({
 
 
     this.getmorenconetent()
     this.getmorenconetent()
   },
   },
+
+  jumpbrand(e) {
+    let id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: '/pages/homeblock/jiuzidian/jiuzidian?id=' + id,
+    })
+
+  },
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
@@ -592,6 +1312,9 @@ Page({
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
   onShow: function() {
   onShow: function() {
+    this.getshaicontent()
+    this.getmorecan()
+    // this.getshaicontent();
 
 
   },
   },
 
 
@@ -620,7 +1343,12 @@ Page({
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
   onReachBottom: function() {
   onReachBottom: function() {
-
+    let page=this.data.page;
+    page++;
+    this.setData({
+      page:page
+    })
+    this.getmorenconetent()
   },
   },
 
 
   /**
   /**

 {
 {
-  "navigationBarTitleText": "智能筛选"
+  "usingComponents": {
+    "zy-slider": "../../../component/zyslider"
+  },
+  "navigationBarTitleText": "智能选择"
 }
 }

 <!-- 筛选内容 -->
 <!-- 筛选内容 -->
 
 
-<view class="register" wx:if="{{zhinengwrap}}" bindtap="hidezhineng">
+<view class="register" wx:if="{{zhinengwrap}}" bindtap="hidezhineng" catchtouchmove='true'>
   <view class="registerwrap" catchtap="">
   <view class="registerwrap" catchtap="">
     <view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==1}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.use_name}}</view>
     <view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==1}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.use_name}}</view>
-    <view class="registeritem" wx:if="{{type==2}}" wx:for="{{zhinengarr}}" wx:key="">浓香型</view>
+
     <view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==3}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.package_name}}</view>
     <view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==3}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.package_name}}</view>
 
 
     <view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==5}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.odor_name}}</view>
     <view class="registeritem {{item.sel==true?'choseactive':''}}" wx:if="{{type==5}}" wx:for="{{zhinengarr}}" wx:key="" catchtap="shosekind" data-id="{{item.id}}">{{item.odor_name}}</view>
-    <view class="registeritem" wx:if="{{type==6}}" wx:for="{{zhinengarr}}" wx:key="">浓香型</view>
+
 
 
   </view>
   </view>
 </view>
 </view>
 <!-- 城市筛选 -->
 <!-- 城市筛选 -->
-<view class="register" wx:if="{{citychose}}" bindtap="hide">
+<view class="register" wx:if="{{citychose}}" bindtap="hide" catchtouchmove='true'>
   <view class="registerwrap">
   <view class="registerwrap">
     <view class="citylist" catchtap="shosekind" data-id="{{item.id}}" wx:for="{{zhinengarr}}" wx:key="" data-name="{{item.city}}">
     <view class="citylist" catchtap="shosekind" data-id="{{item.id}}" wx:for="{{zhinengarr}}" wx:key="" data-name="{{item.city}}">
       <view class="cityitem">{{item.city}}</view>
       <view class="cityitem">{{item.city}}</view>
@@ -24,21 +24,95 @@
   </view>
   </view>
 </view>
 </view>
 <!-- 价格 -->
 <!-- 价格 -->
-<view class="register" wx:if="{{pricechose}}" bindtap="hideprice">
-  <view class="registerwrap">
-
-    <view class="section section_gap">
+<view class="register" wx:if="{{pricechose}}" bindtap="hideprice" catchtouchmove='true'>
+  <view class="pregisterwrap">
 
 
     <view class="pyuan">{{priceyuan}}</view>
     <view class="pyuan">{{priceyuan}}</view>
 
 
-      <view class="body-view">
-        <slider bindchange="slider2change" step="5" backgroundColor="#f5f5f5"  activeColor="red" block-size="8" step="1" bindchanging="changing" value="{{pricevalue}}" max="{{zhinengarr[0].max}}" min="{{zhinengarr[0].min}}"/>
+    <view class="zy-slider" catchtap='pingbi'>
+      <zy-slider id="zy-slider1" minValue="{{leftMin}}" maxValue="{{rightMax}}" min="{{min}}" max="{{max}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="lowValueChangeAction" bind:heighValueChange="heighValueChangeAction"
+      />
+<!-- style="left:{{ppleft}}rpx; width:{{ppvalue-ppleft}}rpx" -->
+      <view class="pp" style="width:95%;background:red;height:10rpx;margin:50rpx auto 0">
+        <view class="ppitem"></view>
+        <view class="ppitem"></view>
+        <view class="ppitem"></view>
+        <view class="ppitem"></view>
       </view>
       </view>
+
+
+
+
+
+
+
+
     </view>
     </view>
 
 
+
+
+
   </view>
   </view>
 </view>
 </view>
 
 
+<!-- 评分 -->
+<view class="register" wx:if="{{fenchose}}" bindtap="hidefen" catchtouchmove='true'>
+  <view class="pregisterwrap">
+    <view class="pyuan">{{score}}</view>
+
+    <view class="zy-slider">
+      <zy-slider id="zy-slider1" minValue="{{fenleftMin}}" maxValue="{{fenrightMax}}" min="{{fenmin}}" max="{{fenmax}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="fenlowValueChangeAction" bind:heighValueChange="fenheighValueChangeAction"
+      />
+    </view>
+
+  </view>
+</view>
+
+<!-- 更多筛选 -->
+<view class="register" wx:if="{{morechose}}" bindtap="hidemorechose">
+  <view class="moreregisterwrap">
+
+
+    <view wx:for="{{morelist}}" wx:key="" wx:for-index="par">
+
+      <view class="selectbox" wx:if="{{item.basic_sort==1}}">
+        <view class="selecttop">
+          <view class="selectopname {{item.sel==true?'selactive':''}}">{{item.name}}</view>
+          <view class="selectrow">
+            <image src="{{url}}/aicon_16@2x.png" wx:if="{{item.sel==true}}"></image>
+            <image src="{{url}}/aicon_14x.png" wx:else></image>
+          </view>
+        </view>
+        <view class="valuebox">
+          <view class="registeritem {{itema.twsel==true?'actitem':''}}" wx:for="{{item.value_list}}" wx:for-item="itema" wx:key="" catchtap='selectmoreitem' data-childindex="{{child}}" wx:for-index="child" data-parindex="{{par}}" data-id="{{item.id}}" data-basic_sort="{{item.basic_sort}}"
+            data-content="{{itema.content}}">{{itema.content}}</view>
+        </view>
+
+      </view>
+
+      <view class='sliderHCon' wx:if="{{item.basic_sort==2}}">
+        <view class='tiaohead'>
+          <view class="tiaoleft">{{item.name}}</view>
+          <view class="tiaoright">{{item.between}}</view>
+        </view>
+        <!-- <view class='twoSlider'>
+          <slider min='{{leftMin}}' max='{{leftMax}}' value='{{leftValue}}' activeColor='#cecacb' backgroundColor='#E81825' block-size='8' step='1' style='width:{{leftWidth}}%;margin-right:0rpx;' bindchange="leftChange" />
+          <slider min='{{rightMin}}' max='{{rightMax}}' value='{{rightValue}}' activeColor='#E81825' backgroundColor='#cecacb' block-size='8' step='1' style='width:{{rightWidth}}%;margin-left:0rpx;' bindchange="rightChange" />
+        </view> -->
+
+        <view class="zy-slider">
+          <zy-slider id="zy-slider1" minValue="{{item.realmin}}" maxValue="{{item.realmax}}" min="{{item.zmin}}" max="{{item.zmax}}" blockColor="#0099FF" backgroundColor="#B0C4DE" selectedColor="#FF1493" bind:lowValueChange="lowValueChangeAction1" data-id="{{item.id}}"
+            data-basic_sort="{{item.basic_sort}}" bind:heighValueChange="heighValueChangeAction1" data-parindex="{{par}}" />
+        </view>
+      </view>
+
+    </view>
+
+
+
+
+  </view>
+</view>
 <view class="shaisel">
 <view class="shaisel">
   <view class="kind">
   <view class="kind">
     <view class="shaikind" wx:for="{{navarr}}" wx:key='' bindtap="select" data-idx="{{index}}" data-type="{{item.type}}">
     <view class="shaikind" wx:for="{{navarr}}" wx:key='' bindtap="select" data-idx="{{index}}" data-type="{{item.type}}">
@@ -49,17 +123,20 @@
     </view>
     </view>
 
 
   </view>
   </view>
-  <view class="more">
+  <view class="more" bindtap="mores">
     <image src="{{url}}aicon_15x.png"></image>
     <image src="{{url}}aicon_15x.png"></image>
   </view>
   </view>
 
 
 </view>
 </view>
 
 
 <view class="zhinengbox">
 <view class="zhinengbox">
+  <view class="nodataimg" wx:if="{{zhinenglist.length==0}}">
+    <image src="/img/wushuju.png"></image>
+  </view>
+
 
 
-  <view class="nodata" wx:if="{{zhinenglist.length==0}}">暂无数据</view>
   <block wx:else>
   <block wx:else>
-    <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="">
+    <view class="searchitem" wx:for="{{zhinenglist}}" wx:key="" bindtap="jumpbrand" data-id="{{item.id}}">
       <view class="searchitemleft">
       <view class="searchitemleft">
         <view class="itemleftimg">
         <view class="itemleftimg">
           <image src="{{item.logo}}"></image>
           <image src="{{item.logo}}"></image>
@@ -87,4 +164,6 @@
     </view>
     </view>
   </block>
   </block>
 
 
+
+
 </view>
 </view>