细节

Component/selectDate_two/selectDate_two.js

@@ -123,11 +123,12 @@ Component({
             return new Date(ydm).getTime()
           }
           let timeC = (tsTamp(this.data.customIndOn) - tsTamp(this.data.customIndTw)) / (60 * 60 * 24 * 1000)
+          console.log(timeC)
           if(timeC > 0){
             app.globalData.showToast("开始时间不能大于结束时间")
             return
           }
-          if(Math.abs(timeC) > 31) {
+          if(Math.abs(timeC) > 30) {
             app.globalData.showToast("自定义事件区间不能大于一个月")
             return
           }

pages/deploy/integralRule/integralRule.axml

@@ -14,29 +14,32 @@
     </view>
   </view>
   <scroll-view a:if="{{isItem}}" class="main" scroll-y="{{true}}" style="{{terr.length>1? 'height: calc(100vh - 206rpx)':'height: calc(100vh - 142rpx)'}}">
-    <view class="margin-bottom tree" a:if="{{rule_tree.length}}">
-      <view a:for="{{rule_tree}}" class="flex-box flex-v-ce tree-item" data-item="{{item}}" catchTap="activeTree">
-        <view class="rule-name flex-1">{{item.name}}</view>
-        <image mode="scaleToFill" src="../../../image/right.png" style="width:24rpx;height:24rpx;"/>
+    <view a:if="{{rule_tree.length>0||item_list.length>0}}">
+      <view class="margin-bottom tree" a:if="{{rule_tree.length}}">
+        <view a:for="{{rule_tree}}" class="flex-box flex-v-ce tree-item" data-item="{{item}}" catchTap="activeTree">
+          <view class="rule-name flex-1">{{item.name}}</view>
+          <image mode="scaleToFill" src="../../../image/right.png" style="width:24rpx;height:24rpx;"/>
+        </view>
       </view>
-    </view>
-    <view class="item-list">
-      <view a:for="{{item_list}}" class="list-items">
-        <view class="remark">{{item.remark}}</view>
-        <view class="flex-box flex-v-ce">
-          <view class="red num flex-1" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
-            <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+      <view class="item-list">
+        <view a:for="{{item_list}}" class="list-items">
+          <view class="remark">{{item.remark}}</view>
+          <view class="flex-box flex-v-ce">
+            <view class="red num flex-1" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
+              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+            </view>
+            <view class="green num flex-1" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
+              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
+            </view>
+            <view class="item-type fontColorF num">{{item.typeName.name}}</view>
           </view>
-          <view class="green num flex-1" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+'～'+item.max_point)}}
-            <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
-          </view>
-          <view class="item-type fontColorF num">{{item.typeName.name}}</view>
         </view>
       </view>
     </view>
+    <no-data a:else content="暂无数据"></no-data>
   </scroll-view>
   <scroll-view a:else class="main" scroll-y="{{true}}" style="height: calc(100vh - 142rpx)">
-    <view class="item-list">
+    <view class="item-list" a:if="{{selectItem.length>0}}">
       <view a:for="{{selectItem}}" class="list-items">
         <view class="remark">{{item.remark}}</view>
         <view class="flex-box flex-v-ce">
@@ -50,5 +53,6 @@
         </view>
       </view>
     </view>
+    <no-data a:else content="暂无数据"></no-data>
   </scroll-view>
 </view>

pages/deploy/integralRule/integralRule.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+    "no-data": "/Component/noData/noData"
+  }
+}