Jelajahi Sumber

feature:修改木鱼的下拉菜单组件UI

zeng.chen 1 tahun lalu
induk
melakukan
c324f0ca15

+ 0 - 137
pages/piano/components/dropdownmenu/dropdownmenu.js

@@ -45,126 +45,19 @@ Component({
     selected_filter_name: ''
   },
   methods: {
-
-    tapDistrictNav: function(e) {
-      if (this.data.district_open) {
-        this.setData({
-          district_open: false,
-          source_open: false,
-          style_open: false,
-          filter_open: false,
-          shownavindex: 0
-        })
-      } else {
-        this.setData({
-          district_open: true,
-          style_open: false,
-          source_open: false,
-          filter_open: false,
-          shownavindex: e.currentTarget.dataset.nav
-        })
-      }
-
-    },
     tapSourceNav: function(e) {
       if (this.data.source_open) {
         this.setData({
           source_open: false,
-          style_open: false,
-          district_open: false,
-          filter_open: false,
           shownavindex: 0
         })
       } else {
         this.setData({
           source_open: true,
-          style_open: false,
-          district_open: false,
-          filter_open: false,
           shownavindex: e.currentTarget.dataset.nav
         })
       }
     },
-    tapStyleNav: function(e) {
-      if (this.data.style_open) {
-        this.setData({
-          source_open: false,
-          style_open: false,
-          district_open: false,
-          filter_open: false,
-          shownavindex: 0
-        })
-      } else {
-        this.setData({
-          source_open: false,
-          style_open: true,
-          filter_open: false,
-          district_open: false,
-          shownavindex: e.currentTarget.dataset.nav
-        })
-      }
-      console.log(e.target)
-    },
-    tapFilterNav: function(e) {
-      if (this.data.filter_open) {
-        this.setData({
-          source_open: false,
-          style_open: false,
-          district_open: false,
-          filter_open: false,
-          shownavindex: 0
-        })
-      } else {
-        this.setData({
-          source_open: false,
-          style_open: false,
-          district_open: false,
-          filter_open: true,
-          shownavindex: e.currentTarget.dataset.nav
-        })
-      }
-    },
-
-
-    selectDefaltDistrictLeft(model) {
-      if (!model) {
-        return
-      }
-      var model = model.childModel;
-      var selectedId = model.id
-      var selectedTitle = model.title;
-      this.setData({
-        dropDownMenuDistrictDataRight: model ? model : '',
-        district_left_select: selectedId,
-        district_right_select: '',
-      })
-    },
-
-    selectDistrictLeft: function(e) {
-      var model = e.target.dataset.model.childModel;
-      var selectedId = e.target.dataset.model.id
-      var selectedTitle = e.target.dataset.model.title;
-      this.setData({
-        dropDownMenuDistrictDataRight: model ? model : '',
-        district_left_select: selectedId,
-        district_right_select: '',
-      })
-    },
-
-    selectDistrictRight: function(e) {
-      var selectedId = e.target.dataset.model.id
-      var selectedTitle = e.target.dataset.model.title;
-      this.closeHyFilter();
-      this.setData({
-        district_right_select: selectedId,
-        district_right_select_name: selectedTitle
-      })
-      this.triggerEvent("selectedItem", {
-        index: this.data.shownavindex,
-        selectedId: selectedId,
-        selectedTitle: selectedTitle
-      })
-    },
 
     selectSourceItem: function(e) {
       var selectedId = e.target.dataset.model.id
@@ -181,36 +74,6 @@ Component({
       })
     },
 
-    selectFilterItem: function(e) {
-      var selectedId = e.target.dataset.model.id
-      var selectedTitle = e.target.dataset.model.title;
-      this.closeHyFilter();
-      this.setData({
-        selected_filter_id: selectedId,
-        selected_filter_name: selectedTitle
-      })
-      this.triggerEvent("selectedItem", {
-        index: this.data.shownavindex,
-        selectedId: selectedId,
-        selectedTitle: selectedTitle
-      })
-    },
-
-    selectStyleItem: function(e) {
-      var selectedId = e.target.dataset.model.id
-      var selectedTitle = e.target.dataset.model.title;
-      this.closeHyFilter();
-      this.setData({
-        selected_style_id: selectedId,
-        selected_style_name: selectedTitle
-      })
-      this.triggerEvent("selectedItem", {
-        index: this.data.shownavindex,
-        selectedId: selectedId,
-        selectedTitle: selectedTitle
-      })
-    },
-
     /**关闭筛选 */
     closeHyFilter: function() {
       if (this.data.district_open) {

+ 2 - 45
pages/piano/components/dropdownmenu/dropdownmenu.wxml

@@ -1,37 +1,11 @@
 <view class="nav">
-  <view class="nav-child {{district_open? 'active' : ''}}" bindtap="tapDistrictNav" hidden='{{dropDownMenuDistrictData.length > 0 ? false :true}}' data-nav="1">
-    <view class="nav-title">{{district_right_select_name.length > 0 ?district_right_select_name : dropDownMenuTitle[0]}}</view>
-    <view class="icon"></view>
-  </view>
   <view class="nav-child borders {{source_open? 'active' : ''}}" bindtap="tapSourceNav" hidden='{{dropDownMenuSourceData.length > 0 ? false : true}}' data-nav="2">
-    <view class="nav-title">{{selected_source_name.length > 0 ?selected_source_name : dropDownMenuTitle[1]}}</view>
+    <view class="nav-title">{{selected_source_name.length > 0 ?selected_source_name : dropDownMenuTitle[0]}}</view>
     <view class="flexEmpty"></view>
     <view class="icon"></view>
   </view>
-  <view class="nav-child borders-right {{style_open? 'active' : ''}}" bindtap="tapStyleNav" hidden='{{dropDownMenuStyleData.length > 0 ? false : true}}' data-nav="3">
-    <view class="nav-title">{{selected_style_name.length > 0 ?selected_style_name : dropDownMenuTitle[2]}}</view>
-    <view class="icon"></view>
-  </view>
-  <view class="nav-child {{filter_open ? 'active' : ''}}" bindtap="tapFilterNav" hidden='{{dropDownMenuFilterData.length > 0 ? false : true}}' data-nav="4">
-    <view class="nav-title">{{selected_filter_name.length > 0 ?selected_filter_name : dropDownMenuTitle[3]}}</view>
-    <view class="icon"></view>
-  </view>
-</view>
 
-<view class="district {{district_open ? 'show' : 'disappear'}} ">
-  <view class="half half-left">
-    <view class="{{district_left_select == item.id ? 'current_left_select' : ''}}" wx:for="{{dropDownMenuDistrictData}}" bindtap="selectDistrictLeft" data-model='{{item}}' wx:key="unique">
-      {{item.title}}
-    </view>
-  </view>
-  <view class="half half-right">
-    <view class="{{district_right_select == item.id ? 'current_right_select' : ''}}" wx:for="{{dropDownMenuDistrictDataRight}}" bindtap="selectDistrictRight" data-model='{{item}}' wx:key="unique">
-      {{item.title}}
-    </view>
-  </view>
-</view>
-
-<view class="container container_hd {{source_open ? 'show' : 'disappear'}} ">
+  <view class="container container_hd {{source_open ? 'show' : 'disappear'}} ">
   <view class='z-height'>
     <view>
       <block wx:for="{{dropDownMenuSourceData}}" wx:key="unique">
@@ -40,21 +14,4 @@
     </view>
   </view>
 </view>
-<view class="container container_hd {{style_open ? 'show' : 'disappear'}} ">
-  <view class='z-height'>
-    <view>
-      <block wx:for="{{dropDownMenuStyleData}}" wx:key="unique">
-        <view class="sortitem {{selected_style_id==item.id ? ' active ' : ' '}}" data-model='{{item}}' bindtap='selectStyleItem'> {{item.title}}</view>
-      </block>
-    </view>
-  </view>
 </view>
-<view class="container container_hd {{filter_open ? 'show' : 'disappear'}} ">
-  <view class='z-height'>
-    <view>
-      <block wx:for="{{dropDownMenuFilterData}}" wx:key="unique">
-        <view class="sortitem {{selected_filter_id==item.id ? ' active ' : ' '}}" data-model='{{item}}' bindtap='selectFilterItem'> {{item.title}}</view>
-      </block>
-    </view>
-  </view>
-</view>

+ 2 - 4
pages/piano/components/dropdownmenu/dropdownmenu.wxss

@@ -219,7 +219,7 @@
 
 .sortitem {
   border-bottom: solid #f7f7f7 1rpx;
-  justify-content: space-between;
+    justify-content: space-between;
   padding: 20rpx 30rpx;
 }
 
@@ -229,9 +229,7 @@
 
 .container_hd {
   width: 100%;
-  height: 100%;
-  flex: 1;
-  margin-right: 0;
+  margin-top: 88rpx;
   position: absolute;
   overflow-y: scroll;
   background-color: rgba(0, 0, 0, 0.5);

+ 2 - 2
pages/piano/woodenfish/woodenfish.js

@@ -13,9 +13,9 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '木鱼', //导航栏 中间的标题
     },
+    use_date_arr:['2024-3-1','2024-4-2','2024-4-3','2024-4-5','20234-4-8'],
     selTypeList: [{"url":"","name":"木鱼1"},{"url":"","name":"木鱼2"},{"url":"","name":"木鱼3"}],
-    dropDownMenuTitle: ['区域', '来源', '租售', '排序'],
-
+    dropDownMenuTitle: ['来源'],
     data2: [{
         id: 1,
         title: '个人房源'

+ 3 - 1
pages/piano/woodenfish/woodenfish.json

@@ -1,6 +1,8 @@
 {
   "usingComponents": {
     "nav-bar": "../../components/navbar/navbar",
-    "dropdownmenu": "../components/dropdownmenu/dropdownmenu"
+    "dropdownmenu": "../components/dropdownmenu/dropdownmenu",
+    "xx-calendar": "../components/xx-calendar/xx-calendar"
+
   }
 }

+ 2 - 2
pages/piano/woodenfish/woodenfish.wxml

@@ -13,8 +13,8 @@
         </span>
       </view>
 
-<view class="calender_c"></view>
-      <!-- <calendar class="calender_c" id="calendar" bindload="handleLoad"  /> -->
+<!-- <view class="calender_c"></view> -->
+<xx-calendar use_date_arr="{{use_date_arr}}"></xx-calendar>
 
       <view class="detail_c">
         <text class="detail_time">2024-04-23</text>