From ca781a1e9dcd687390f112c971ea362da5a37144 Mon Sep 17 00:00:00 2001
From: liuyongli <1598631486@qq.com>
Date: Mon, 12 Dec 2022 14:33:54 +0800
Subject: [PATCH] no message

---
 pages/brandCrisis/crisiSet/index.js      |  2 +-
 pages/brandCrisis/crisiSet/index.wxml    |  2 +-
 pages/brandCrisis/index.wxml             |  2 +-
 pages/varComm/index.wxml                 | 32 ++++++++++++------------
 subPackages/logs/PushSettings/index.wxml |  4 +--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pages/brandCrisis/crisiSet/index.js b/pages/brandCrisis/crisiSet/index.js
index a0f0b88..5f65d4c 100644
--- a/pages/brandCrisis/crisiSet/index.js
+++ b/pages/brandCrisis/crisiSet/index.js
@@ -10,7 +10,7 @@ Page({
   },
   onLoad() {
     wx.setNavigationBarTitle({
-      title: '危机消息推送设置'
+      title: '危机消息预警设置'
     })
     let pages = getCurrentPages();
     let currentPage = pages[pages.length - 1]
diff --git a/pages/brandCrisis/crisiSet/index.wxml b/pages/brandCrisis/crisiSet/index.wxml
index 0462ef9..76a34f3 100644
--- a/pages/brandCrisis/crisiSet/index.wxml
+++ b/pages/brandCrisis/crisiSet/index.wxml
@@ -17,7 +17,7 @@
     </view>
     <view class="cs-d1">
         <view class="cs-dd">
-            <view class="cs-d1-title">是否推送消息</view>
+            <view class="cs-d1-title">是否预警消息</view>
             <van-switch size="20px" checked="{{ checked }}" bind:change="onChange1" />
         </view>
     </view>
diff --git a/pages/brandCrisis/index.wxml b/pages/brandCrisis/index.wxml
index 39268ca..3a352c4 100644
--- a/pages/brandCrisis/index.wxml
+++ b/pages/brandCrisis/index.wxml
@@ -124,7 +124,7 @@
             <view slot="title">
                 <view class="bc-ws-dd">
                     <image class="bc-ws-m1" src="{{imageUrl}}/setting-one.png" />
-                    <text style="font-weight: 600;">危机推送设置</text>
+                    <text style="font-weight: 600;">危机预警设置</text>
                 </view>
             </view>
         </van-cell>
diff --git a/pages/varComm/index.wxml b/pages/varComm/index.wxml
index a242a64..f6d700f 100644
--- a/pages/varComm/index.wxml
+++ b/pages/varComm/index.wxml
@@ -1,18 +1,18 @@
 <view class="container">
-  <!-- <c-echars showChart="{{showChart}}" canvasId="eventbar-canvas" chartId="eventbar" chartOption="{{chartOption}}" height="100%"></c-echars> -->
-  <!-- sticky="true" -->
-  <van-tabs class="menu-tabs"  active="{{ active }}" ellipsis="{{false}}" animated="{{true}}" bind:change="changeTab">
-    <van-tab title="品牌对比">
-      <brand-child wx:if="{{active==0 && brandshow}}" bind:hide="brandHide"></brand-child>
-    </van-tab>
-    <van-tab title="车型对比">
-      <model-child wx:if="{{active===1 && modelshow}} " bind:hide="modelHide"></model-child>
-    </van-tab>
-    <van-tab title="事件对比">
-      <event-child wx:if="{{active===2}} "></event-child>
-    </van-tab>
-    <van-tab title="主题对比">
-      <theme-child wx:if="{{active===3 && wshow}}" bind:hide="themeHide"></theme-child>
-    </van-tab>
-  </van-tabs>
+    <!-- <c-echars showChart="{{showChart}}" canvasId="eventbar-canvas" chartId="eventbar" chartOption="{{chartOption}}" height="100%"></c-echars> -->
+    <!-- sticky="true" -->
+    <van-tabs class="menu-tabs" active="{{ active }}" ellipsis="{{false}}" animated="{{true}}" bind:change="changeTab">
+        <van-tab title="品牌对比">
+            <brand-child wx:if="{{active==0 && brandshow}}"></brand-child>
+        </van-tab>
+        <van-tab title="车型对比">
+            <model-child wx:if="{{active===1 && modelshow}} "></model-child>
+        </van-tab>
+        <van-tab title="事件对比">
+            <event-child wx:if="{{active===2}} "></event-child>
+        </van-tab>
+        <van-tab title="主题对比">
+            <theme-child wx:if="{{active===3 && wshow}}" bind:hide="themeHide"></theme-child>
+        </van-tab>
+    </van-tabs>
 </view>
\ No newline at end of file
diff --git a/subPackages/logs/PushSettings/index.wxml b/subPackages/logs/PushSettings/index.wxml
index 39434a9..e047264 100644
--- a/subPackages/logs/PushSettings/index.wxml
+++ b/subPackages/logs/PushSettings/index.wxml
@@ -18,13 +18,13 @@
     <view class="cs-d1-title">自定义接收时间</view>
     <view class="range-style mar-top">
       <view class="picker_group">
-        <picker mode="time" value="{{time}}" start="{{start}}" bindchange="bindTimeChange">
+        <picker mode="time" value="{{time}}"  bindchange="bindTimeChange">
           <view class="picker">
             开始时间: {{time}}
           </view>
         </picker>
         <text class="text-style1">-</text>
-        <picker mode="time" value="{{time2}}" end="{{end}}" bindchange="bindDateChange2">
+        <picker mode="time" value="{{time2}}"  bindchange="bindDateChange2">
           <view class="picker">
             结束时间: {{time2}}
           </view>