diff --git a/app.json b/app.json
index 2f7390c..0e6fd24 100644
--- a/app.json
+++ b/app.json
@@ -115,17 +115,13 @@
         "pages/myApply/myApply",
         "pages/myApplyList/myApplyList",
         "pages/myApplyDetail/myApplyDetail",
-        "pages/bannerDetail/bannerDetail"
-      ]
-    },
-    {
-      "root": "subpages/understandJs",
-      "pages": [
-        "pages/index/index",
-        "pages/impression/impression",
-        "pages/delicious/delicious",
-        "pages/sclerotia/sclerotia",
-        "pages/noticeDetail/noticeDetail"
+        "pages/bannerDetail/bannerDetail",
+        "pages/groupBuyList/groupBuyList",
+        "pages/dropByList/dropByList",
+        "pages/groupBuyPublish/groupBuyPublish",
+        "pages/dropByPublish/dropByPublish",
+        "pages/noticeNewDetail/noticeNewDetail",
+        "pages/noticeNewList/noticeNewList"
       ]
     },
     {
@@ -136,12 +132,7 @@
         "pages/archives/archives",
         "pages/archivesDept/archivesDept",
         "pages/archivesDetail/archivesDetail",
-        "pages/warning/warning",
-        "pages/policyList/policyList",
         "pages/noticeDetail/noticeDetail",
-        "pages/search/search",
-        "pages/laobingzaixian/laobingzaixian",
-        "pages/laobingzaixianDict/laobingzaixianDict",
         "pages/moduleList/moduleList",
         "pages/reportIssue/reportIssue",
         "pages/reportIssueList/reportIssueList",
diff --git a/components/DateTimePicker/index.js b/components/DateTimePicker/index.js
index 3400efd..b14d87f 100644
--- a/components/DateTimePicker/index.js
+++ b/components/DateTimePicker/index.js
@@ -101,11 +101,11 @@ Component({
     },
     lifetimes: {
         attached: function () {
-            var year = this.data.years[0];
-            var month = this.data.months[0];
-            var day = this.data.days[0];
-            var hour = this.data.hours[0];
-            var minute = this.data.minutes[0];
+            var year = this.data.years[this.data.timevalue[0]||0];
+            var month = this.data.months[this.data.timevalue[1]||0];
+            var day = this.data.days[this.data.timevalue[2]||0];
+            var hour = this.data.hours[this.data.timevalue[3]||0];
+            var minute = this.data.minutes[this.data.timevalue[4]||0];
             this.setData({
                 year: year,
                 month: month,
diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml
index 87902be..e5debe5 100644
--- a/components/activity/activity.wxml
+++ b/components/activity/activity.wxml
@@ -1,5 +1,6 @@
 <view class="layout" wx:for="{{activityList}}" wx:key="index">
-  <view data-id="{{item.id}}" 
+  <view class="activity-box"
+        data-id="{{item.id}}" 
         data-actCurrentState="{{item.actCurrentState}}" 
         data-signupFlag="{{item.signupFlag}}" 
         bindtap="toActDetail">
@@ -15,22 +16,20 @@
     <view class="infos"><view class="infos-flex">
       <view class="infos_title">{{item.title}}</view>
       <view class="infos_times">
-        <view>
           <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A6WAcS1lAAABQRNkl7Y828.png" />
-          活动时间：{{item.actStartTime}}至
-        </view>
-        <view class="endtime">{{item.actEndTime}}</view>
-        <view>
-          <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A7-AKfhbAAABTg-ZMDk458.png" />
-          <text>活动地点：{{item.actAddress}}</text>
-        </view>
+          <text >时间：{{item.actStartTime}}至</text>
+          <view class="endtime">{{item.actEndTime}}</view>
+      </view>
+      <view class="infos_addr">
+        <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A7-AKfhbAAABTg-ZMDk458.png" />
+        <text>地点：{{item.actAddress}}</text>
       </view>
       <view class="infos_nums" wx:if="{{!(state==2)}}">
     
         <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
         <span wx:else class="total">活动名额 {{item.actQuota}}人</span>
         <!-- <span class="signed">已报名 {{item.signupNum}}人</span> -->
-        <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/20/rBAB718X06CAfNqkAABIcXHcQv0363.png" />
+        <!-- <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/20/rBAB718X06CAfNqkAABIcXHcQv0363.png" /> -->
       </view>
     </view></view>
   </view>
diff --git a/components/activity/activity.wxss b/components/activity/activity.wxss
index 59f397a..9dc234c 100644
--- a/components/activity/activity.wxss
+++ b/components/activity/activity.wxss
@@ -1,21 +1,21 @@
 .layout {
-  display: table;
-  width: 100%;
-  /* width: calc(100% - 40rpx); */
-  height: 276rpx;
-  /* border-radius: 10rpx; */
-  background: #fff;
-  margin: 20rpx 0rpx 0rpx 0rpx;
-  /* flex-direction: column;
-  justify-content: space-between;
-  box-sizing: border-box;  */
+
+}
+.activity-box {
+  width: 750rpx;
+  height: 286rpx;
+  background-color: #ffffff;
+  margin-bottom: 14rpx;
+  display: flex;
+  align-items: center;
+  position: relative;
 }
 
 .img {
-  display: table-cell;
   width: 190rpx;
-  padding: 20rpx 20rpx 10rpx 20rpx;
   height: 246rpx;
+  margin-left: 30rpx;
+  position: relative;
 }
 
 .img .imgsrc {
@@ -23,18 +23,13 @@
   height: 246rpx;
   background: #f1f1f1;
   border-radius: 16rpx;
-  position: absolute;
 }
 
 .left {
-  display: table-cell;
-  padding: 20rpx 20rpx 10rpx 20rpx;
   width: 190rpx;
   height: 246rpx;
   border-radius: 16rpx;
   overflow: hidden;
-  margin-right: 20rpx;
-  position: relative;
 }
 
 .activity-image {
@@ -45,6 +40,8 @@
 
 .user-state {
   position: absolute;
+  left: 0;
+  top: 0;
   z-index: 955;
   font-size: 24rpx;
   color: #fff;
@@ -68,19 +65,19 @@
 }
 
 .infos {
-  display: table-cell;
-  padding: 20rpx 20rpx 10rpx 0rpx;
   height: 246rpx;
-  vertical-align: top;
+  overflow: hidden;
+  margin-left: 18rpx;
+  margin-right: 28rpx;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
 .infos .infos_title {
-  font-size: 36rpx;
-  line-height: 50rpx;
-  height: 100rpx;
+  font-size: 34rpx;
+  line-height: 40rpx;
+  height: 80rpx;
   overflow: hidden;
   color: #333;
   display: -webkit-box;
@@ -94,32 +91,36 @@
   justify-content: space-around;  
 }
 .infos .infos_times {
+  height: 56rpx;
+  line-height: 28rpx;
   font-size: 24rpx;
-  /* height: 98rpx; */
   overflow: hidden;
   color: #a8a8a8;
+  margin-top: 20rpx;
 }
-
-.infos .infos_times view {
+.infos .infos_addr {
   height: 28rpx;
-  padding-top: 4rpx;
+  line-height: 28rpx;
+  font-size: 24rpx;
+  overflow: hidden;
+  color: #a8a8a8;
   display: flex;
-  align-items: center;
+  margin-top: 8rpx;
 }
-
-.infos .infos_times view text {
+.infos .infos_addr text {
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
 }
 
 .endtime {
-  text-indent: 145rpx;
+  text-indent: 100rpx;
 }
 
 .imgsize {
   width: 24rpx;
   height: 24rpx;
+  margin-right: 4rpx;
 }
 
 .infos .infos_nums {
@@ -133,7 +134,7 @@
   width: 100%;
   display: flex;
   justify-content: space-between;
-  margin: 10rpx 0rpx;
+  margin-top: 18rpx;
 }
 .infos_nums image {
   width: 150rpx;
diff --git a/dist/dialog/index.wxml b/dist/dialog/index.wxml
index 528b307..6b859cc 100644
--- a/dist/dialog/index.wxml
+++ b/dist/dialog/index.wxml
@@ -25,7 +25,7 @@
         </view>
     </view>
     <view slot="footer" class="{{ classes.buttons }}">
-        <block wx:for="{{ buttons }}" wx:for-item="button" wx:key="">
+        <block wx:for="{{ buttons }}" wx:for-item="button" wx:key="index">
             <button
                 class="{{ classes.button[index].wrap }}"
                 disabled="{{ button.disabled }}"
diff --git a/images/mine/submit-bk.png b/images/mine/submit-bk.png
new file mode 100644
index 0000000..c081477
Binary files /dev/null and b/images/mine/submit-bk.png differ
diff --git a/images/wyss-bk.png b/images/wyss-bk.png
new file mode 100644
index 0000000..401916f
Binary files /dev/null and b/images/wyss-bk.png differ
diff --git a/pages/complete/components/personalInfo/personalInfo.wxml b/pages/complete/components/personalInfo/personalInfo.wxml
index d434b3e..786807f 100644
--- a/pages/complete/components/personalInfo/personalInfo.wxml
+++ b/pages/complete/components/personalInfo/personalInfo.wxml
@@ -89,10 +89,16 @@
   <view class="note">*请填写您的真实信息，我们会严格保密，请您放心</view>
 
   <view class="submit-button" wx:if="{{unionIdStatus === '1'}}">
-    <button bindtap="submitPersonalInfo" hover-class="hover-submit" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">提交</button>
+    <button bindtap="submitPersonalInfo" hover-class="hover-submit" disabled="{{lock}}">
+      <image src="../../../../images/mine/submit-bk.png" />
+      <text >提交</text>
+    </button>
   </view>
   <view class="submit-button" wx:if="{{unionIdStatus === '0'}}">
-    <button hover-class="hover-submit" open-type="getUserInfo" bindgetuserinfo="getUserInfo" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">提交</button>
+    <button hover-class="hover-submit" open-type="getUserInfo" bindgetuserinfo="getUserInfo" disabled="{{lock}}">
+      <image src="../../../../images/mine/submit-bk.png" />
+      <text >提交</text>      
+    </button>
   </view>
 
 </view>
\ No newline at end of file
diff --git a/pages/complete/components/personalInfo/personalInfo.wxss b/pages/complete/components/personalInfo/personalInfo.wxss
index 743845e..2cd4647 100644
--- a/pages/complete/components/personalInfo/personalInfo.wxss
+++ b/pages/complete/components/personalInfo/personalInfo.wxss
@@ -73,12 +73,12 @@
 }
 .basic-info .list-item .right .get-code {
   padding: 0 15rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  background: linear-gradient(to right, #F40C0C, #FF4E4E);
+  height: 50rpx;
+  line-height: 50rpx;
+  background: linear-gradient(to right, #db1a1f, #e95027);
   color: #fff;
   font-size: 24rpx;
-  border-radius: 6rpx;
+  border-radius: 50rpx;
   margin: 0;
   margin-left: 25rpx;
 }
@@ -204,7 +204,7 @@
   margin: 30rpx 0 65rpx;
 }
 .submit-button button {
-  height: 84rpx;
+  height: 100rpx;
   line-height: 84rpx;
   width: 560rpx;
   padding: 0;
@@ -212,8 +212,22 @@
   color: #fff;
   font-size: 33rpx;
   border-radius: 16rpx;
-  background: linear-gradient(to right, #F40C0C, #FF4E4E);
+  /* background: linear-gradient(to right, #F40C0C, #FF4E4E); */
+  background-color: transparent;
 }
 .submit-button .hover-submit {
-  background: rgb(175, 1, 1);
+  /* background: rgb(175, 1, 1); */
+}
+button image {
+  width: 100%;
+  height: 100%;
+}
+button text {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+}
+button::after {
+  border: none;
 }
\ No newline at end of file
diff --git a/pages/discussion/components/issueItem/issueItem.wxss b/pages/discussion/components/issueItem/issueItem.wxss
index 1b38b2c..ef7cc49 100644
--- a/pages/discussion/components/issueItem/issueItem.wxss
+++ b/pages/discussion/components/issueItem/issueItem.wxss
@@ -49,7 +49,7 @@
 
 .issue-item .content {
   color: #333;
-  font-size: 36rpx;
+  font-size: 34rpx;
   line-height: 52rpx;
   margin-top: 27rpx;
   display: -webkit-box;
diff --git a/pages/discussion/components/projectItem/projectItem.wxss b/pages/discussion/components/projectItem/projectItem.wxss
index 9691021..b6c568b 100644
--- a/pages/discussion/components/projectItem/projectItem.wxss
+++ b/pages/discussion/components/projectItem/projectItem.wxss
@@ -58,7 +58,7 @@
 }
 .project-item .content {
   color: #333;
-  font-size: 36rpx;
+  font-size: 32rpx;
   line-height: 52rpx;
   margin-top: 27rpx;
   display: -webkit-box;
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index ac5cdec..594dcef 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -40,6 +40,7 @@ Page({
     searchName: '',
     infoCompleted: 0, //是否完善了用户信息
     completeInfoDialogVisible: false,
+    tabRightList: [], //拼团购和顺道捎
   },
 
   /**
@@ -331,6 +332,11 @@ Page({
         getImgUrl: res.data[0]
       })
     })
+    api.getImgUrl("5").then(function (res) {
+      that.setData({
+        tabRightList: res.data
+      })
+    })
   },
   /**
    * 页面上拉触底事件的处理函数
@@ -456,4 +462,17 @@ Page({
       url: `/subpages/heart/pages/bannerDetail/bannerDetail?id=${e.currentTarget.dataset.id}`
     })
   },
+
+  //跳转
+  toJumpPage (e) {
+    if (e.currentTarget.dataset.code == 'ptg') {
+      wx.navigateTo({
+        url: `/subpages/heart/pages/groupBuyList/groupBuyList`
+      })      
+    } else if (e.currentTarget.dataset.code == 'sds') {
+      wx.navigateTo({
+        url: `/subpages/heart/pages/dropByList/dropByList`
+      })      
+    }
+  },
 })
\ No newline at end of file
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index 190e7df..c862cfd 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -53,6 +53,9 @@
     </view>
   </view>
 </view>
+<view class="tab-right">
+  <image wx:for="{{tabRightList}}" wx:key="index" src="{{item.imgUrl}}" data-code="{{item.imgCode}}" bindtap="toJumpPage"/>
+</view>
 <view class="tab-all">
   <view class="tab-bar {{tabFixed ? 'tab-bar-fixed' : ''}}" style="margin-top: {{tabFixed ? statusHeight + navigationHeight : '278r'}}px">
     <view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange">
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index f898731..7c562a8 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -290,6 +290,20 @@ button:last-child {
 
 /* banner end */
 
+.tab-right {
+  position: fixed;
+  right: 0;
+  bottom: 80rpx;
+  z-index: 997;
+  margin-top: 100rpx;
+  display: flex;
+  flex-direction: column;
+}
+.tab-right image {
+  width: 156rpx;
+  height: 78rpx;
+}
+
 .tab-all {
   position: absolute;
   width: 100%;
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 23dc4f5..c50bcaa 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -424,9 +424,6 @@ Page({
                     url: "/pages/heartNew/heartNew"
                   })
                 } else if (that.data.sceneFrom == 'module_ma_code_lbzx') {
-                  // wx.navigateTo({
-                  //   url: "/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian?modulecode=notice_yjfu_lbzx"
-                  // })
                   that.toLaoBingZaiXian(1)
                 } 
                 if (wx.getStorageSync("shareObj")) {
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 3b0f0f7..153e33b 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -84,7 +84,10 @@
       <view class="tip">您还未发布议题，快点击我有事说发布吧</view>
       <view class="add-issue">
         <image class="issue-trigger" src="../../images/mine/issue-trigger.png" />
-        <button hover-class="hover-add-issue" bindtap="addIssue">我有事说</button>
+        <button hover-class="hover-add-issue" bindtap="addIssue">
+          <image src="../../images/wyss-bk.png" />
+          <text >我有事说</text>
+        </button>
       </view>
     </view>
   </view>
@@ -103,7 +106,10 @@
       <view class="tip">快来点击“我有事说”发布吧</view>
       <view class="add-issue">
         <image class="issue-trigger" src="../../images/mine/issue-trigger.png" />
-        <button hover-class="hover-add-issue" bindtap="addIssue">我有事说</button>
+        <button hover-class="hover-add-issue" bindtap="addIssue">
+          <image src="../../images/wyss-bk.png" />
+          <text >我有事说</text>
+        </button>
       </view>
     </view>
   </view>
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 0d505a9..15b7026 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -282,13 +282,24 @@ page {
   border: 0;
   color: #fff;
   font-size: 22rpx;
-  background: linear-gradient(to right, #C81408, #f51111);
+  /* background: linear-gradient(to right, #C81408, #f51111); */
+  background-color: transparent;
+}
+button image {
+  width: 100%;
+  height: 100%;
+}
+button text {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
 }
 .issue-list .issue-nodata .add-issue button::after {
   border: 0;
 }
 .issue-list .issue-nodata .add-issue .hover-add-issue {
-  background: red;
+  /* background: red; */
 }
 
 .project-list {
@@ -341,13 +352,14 @@ page {
   border: 0;
   color: #fff;
   font-size: 22rpx;
-  background: linear-gradient(to right, #C81408, #f51111);
+  /* background: linear-gradient(to right, #C81408, #f51111); */
+  background-color: transparent;
 }
 .project-list .project-nodata .add-issue button::after {
   border: 0;
 }
 .project-list .project-nodata .add-issue .hover-add-issue {
-  background: red;
+  /* background: red; */
 }
 
 .topic-list {
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index c303a4a..47578eb 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.6"
+    const versionNum = "1.6.7"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/subpages/associationNew/images/submit-bk.png b/subpages/associationNew/images/submit-bk.png
new file mode 100644
index 0000000..c081477
Binary files /dev/null and b/subpages/associationNew/images/submit-bk.png differ
diff --git a/subpages/associationNew/pages/addTopic/addTopic.wxml b/subpages/associationNew/pages/addTopic/addTopic.wxml
index 4fb833d..49f13cc 100644
--- a/subpages/associationNew/pages/addTopic/addTopic.wxml
+++ b/subpages/associationNew/pages/addTopic/addTopic.wxml
@@ -24,7 +24,10 @@
     </view>
   </view>
   <view class="topic-button">
-    <button bindtap="addTopic" type="default" size="defaultSize" hover-class="hover-button" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">发起话题</button>
+    <button bindtap="addTopic" type="default" size="defaultSize" hover-class="hover-button" disabled="{{lock}}">
+      <image src="../../images/submit-bk.png" />
+      <text >发起话题</text>
+    </button>
   </view>
 </view>
 
diff --git a/subpages/associationNew/pages/addTopic/addTopic.wxss b/subpages/associationNew/pages/addTopic/addTopic.wxss
index e19cf0a..b1188db 100644
--- a/subpages/associationNew/pages/addTopic/addTopic.wxss
+++ b/subpages/associationNew/pages/addTopic/addTopic.wxss
@@ -125,16 +125,30 @@ page {
 }
 .add-topic .topic-button button {
   width: 560rpx;
-  height: 85rpx;
+  height: 100rpx;
   line-height: 85rpx;
   text-align:center;
   color: #fff;
   font-size: 36rpx;
   border-radius: 16rpx;
-  background: linear-gradient(to right, #F40C0C, #FF4E4E)
+  /* background: linear-gradient(to right, #F40C0C, #FF4E4E) */
+  background-color: transparent;
 }
 .add-topic .topic-button .hover-button {
-  background: red;
+  /* background: red; */
+}
+button image {
+  width: 100%;
+  height: 100%;
+}
+button text {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+}
+button::after {
+  border: none;
 }
 
 .wux-actionsheet__button {
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
index a7425bc..fc491c8 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxss
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -59,7 +59,8 @@ page {
 
 .details-info {
   /* width: calc(100% - 58rpx); */
-  font-size: 32rpx;
+  font-size: 34rpx;
+  line-height: 52rpx;
   color: rgba(51, 51, 51, 1);
   word-break: break-all;
   margin-top: 10rpx;
diff --git a/subpages/discussion/images/submit-bk.png b/subpages/discussion/images/submit-bk.png
new file mode 100644
index 0000000..c081477
Binary files /dev/null and b/subpages/discussion/images/submit-bk.png differ
diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml
index 480d4c0..083f9d5 100644
--- a/subpages/discussion/pages/addIssue/addIssue.wxml
+++ b/subpages/discussion/pages/addIssue/addIssue.wxml
@@ -47,7 +47,10 @@
   </view>
 
   <view class="publish-issue">
-    <button hover-class="hover-publish" bindtap="throttlePublisgIssue" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">发布</button>
+    <button hover-class="hover-publish" bindtap="throttlePublisgIssue" disabled="{{lock}}">
+      <image src="../../images/submit-bk.png" />
+      <text >发布</text>
+    </button>
   </view>
 </view>
 
diff --git a/subpages/discussion/pages/addIssue/addIssue.wxss b/subpages/discussion/pages/addIssue/addIssue.wxss
index 298937f..63bc12b 100644
--- a/subpages/discussion/pages/addIssue/addIssue.wxss
+++ b/subpages/discussion/pages/addIssue/addIssue.wxss
@@ -1,6 +1,7 @@
 page {
   width: 100%;
   height: 100vh;
+  background: #f7f7f7;
 }
 
 .add-issue {
@@ -142,20 +143,34 @@ page {
 
 .add-issue .publish-issue button {
   width: 560rpx;
-  height: 84rpx;
+  height: 100rpx;
   line-height: 84rpx;
   text-align: center;
   margin: 0;
   padding: 0;
   outline: 0;
-  background: linear-gradient(to right, #f40f0f, #ff4c4c);
+  /* background: linear-gradient(to right, #f40f0f, #ff4c4c); */
+  background-color: transparent;
   color: #fff;
   font-size: 36rpx;
   border-radius: 16rpx;
 }
 
+button image {
+  width: 100%;
+  height: 100%;
+}
+button text {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+}
+button::after {
+  border: none;
+}
 .add-issue .publish-issue .hover-publish {
-  background: red;
+  /* background: red; */
 }
 
 .wux-actionsheet__button {
diff --git a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
index a5d89fd..867176a 100644
--- a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
+++ b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
@@ -75,7 +75,7 @@
 
 .detail-content .issue-content {
   color: #333;
-  font-size: 38rpx;
+  font-size: 34rpx;
   line-height: 50rpx;
   margin: 25rpx 0 30rpx;
 }
diff --git a/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml b/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml
index 7be7c69..6e7c0c6 100644
--- a/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml
+++ b/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml
@@ -12,6 +12,9 @@
     </view>
   </view>
   <view class="reply-btn">
-    <button hover-class="hover-button" bindtap="remarkOrReply" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">发布</button>
+    <button hover-class="hover-button" bindtap="remarkOrReply" disabled="{{lock}}">
+      <image src="../../images/submit-bk.png" />
+      <text >发布</text>
+    </button>
   </view>
 </view>
\ No newline at end of file
diff --git a/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxss b/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxss
index 68d0591..1e3c328 100644
--- a/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxss
+++ b/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxss
@@ -47,7 +47,7 @@ page {
 }
 .reply-btn button {
   width: 560rpx;
-  height: 84rpx;
+  height: 100rpx;
   line-height: 84rpx;
   text-align: center;
   color: #fff;
@@ -55,8 +55,22 @@ page {
   padding: 0;
   outline: 0;
   border-radius: 16rpx;
-  background: linear-gradient(to right, #f40f0f, #ff4c4c);
+  /* background: linear-gradient(to right, #f40f0f, #ff4c4c); */
+  background-color: transparent;
 }
 .reply-btn .hover-button {
-  background:red;
+  /* background:red; */
+}
+button image {
+  width: 100%;
+  height: 100%;
+}
+button text {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+}
+button::after {
+  border: none;
 }
\ No newline at end of file
diff --git a/subpages/heart/components/notice/notice.wxml b/subpages/heart/components/notice/notice.wxml
index 351156f..4ea9a43 100644
--- a/subpages/heart/components/notice/notice.wxml
+++ b/subpages/heart/components/notice/notice.wxml
@@ -1,7 +1,7 @@
 <cover-view class="notice" wx:if="{{visible}}" catchmove="catchmove">
   <cover-view class="box">
     <cover-view class="close">
-      <cover-image bindtap="close" src="../../images/delete.png" />
+      <!-- <cover-image bindtap="close" src="../../images/delete.png" /> -->
     </cover-view>
     <cover-view class="title">{{title}}</cover-view>
     <cover-view class="content">
diff --git a/subpages/heart/components/noticeNew/noticeNew.js b/subpages/heart/components/noticeNew/noticeNew.js
new file mode 100644
index 0000000..ef5a43f
--- /dev/null
+++ b/subpages/heart/components/noticeNew/noticeNew.js
@@ -0,0 +1,55 @@
+Component({
+  properties: {
+    type: Number,
+    list: Array
+  },
+  data: {
+    list: [],
+    nomore: false
+  },
+  attached: function () {},
+  ready: function () {},
+  pageLifetimes: {
+    show: function () {},
+  },
+  methods: {
+    toNoticeDetail (e) {
+      const id = e.currentTarget.dataset.id
+      wx.navigateTo({
+        url: `/subpages/heart/pages/noticeNewDetail/noticeNewDetail?id=${id}&type=${this.data.type}`
+      })
+    },
+    toModify (e) {
+      const id = e.currentTarget.dataset.id
+      console.log(id)
+      if (this.data.type == 2) {
+        wx.navigateTo({
+          url: `/subpages/heart/pages/dropByPublish/dropByPublish?id=${id}`
+        })
+      } else {
+        wx.navigateTo({
+          url: `/subpages/heart/pages/groupBuyPublish/groupBuyPublish?id=${id}`
+        })
+      }
+    },
+    toDelete (e) {
+      let that = this
+      const id = e.currentTarget.dataset.id
+      wx.showModal({
+        title: "确认删除该条发布内容？",
+        showCancel: true,
+        cancelText: "否",
+        confirmText: "是",
+        // confirmColor: "#000000",
+        success: (res) => {
+          if (res.confirm) {
+            console.log("确认删除")
+            that.triggerEvent("delete",{id})
+          } else if (res.cancel) {
+            console.log("取消删除")
+          }
+        }
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.json b/subpages/heart/components/noticeNew/noticeNew.json
similarity index 100%
rename from subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.json
rename to subpages/heart/components/noticeNew/noticeNew.json
diff --git a/subpages/heart/components/noticeNew/noticeNew.wxml b/subpages/heart/components/noticeNew/noticeNew.wxml
new file mode 100644
index 0000000..d992678
--- /dev/null
+++ b/subpages/heart/components/noticeNew/noticeNew.wxml
@@ -0,0 +1,48 @@
+<!-- 0 顺道捎列表 -->
+<block  wx:if="{{type == 0}}">
+  <view class="notice" wx:for="{{list}}" wx:key="index">
+      <view class="notice-title">{{item.departure}} 到 {{item.destination}}</view>
+      <view class="notice-bottom">
+        <view class="notice-time">出发时间：{{item.departureTime}}</view>
+        <view class="notice-detail" data-id="{{item.id}}" bindtap="toNoticeDetail">查看{{">"}}</view>
+      </view>       
+  </view>
+</block>
+<!-- 1 拼团购列表 -->
+<block wx:elif="{{type == 1}}">
+  <view class="notice" wx:for="{{list}}" wx:key="index">
+      <view class="notice-title">{{item.groupBuyTitle}}</view>
+      <view class="notice-bottom">
+        <view class="notice-time">团购时间：{{item.groupBuyTime}}</view>
+        <view class="notice-detail" data-id="{{item.id}}" bindtap="toNoticeDetail">查看{{">"}}</view>
+      </view>    
+  </view>
+</block>
+<!-- 2 顺道捎 我的列表 -->
+<block wx:elif="{{type == 2}}">
+  <view class="notice" wx:for="{{list}}" wx:key="index">
+    <view class="notice-title">{{item.departure}} 到 {{item.destination}}</view>
+    <view class="notice-bottom">
+      <view class="notice-detail" data-id="{{item.id}}" bindtap="toNoticeDetail">查看{{" >"}}</view>
+      <view class="notice-option">
+        <view class="btn" data-id="{{item.id}}" bindtap="toModify">修改</view>
+        <view class="notice-line"></view>
+        <view class="btn" data-id="{{item.id}}" bindtap="toDelete">删除</view>
+      </view>
+    </view>
+  </view>  
+</block>
+<!-- 3 拼团购 我的列表 -->
+<block wx:else>
+  <view class="notice" wx:for="{{list}}" wx:key="index">
+    <view class="notice-title">{{item.groupBuyTitle}}</view>
+    <view class="notice-bottom">
+      <view class="notice-detail" data-id="{{item.id}}" bindtap="toNoticeDetail">查看{{" >"}}</view>
+      <view class="notice-option">
+        <view class="btn" data-id="{{item.id}}" bindtap="toModify">修改</view>
+        <view class="notice-line"></view>
+        <view class="btn" data-id="{{item.id}}" bindtap="toDelete">删除</view>
+      </view>
+    </view>
+  </view>
+</block>
diff --git a/subpages/heart/components/noticeNew/noticeNew.wxss b/subpages/heart/components/noticeNew/noticeNew.wxss
new file mode 100644
index 0000000..86dfa0f
--- /dev/null
+++ b/subpages/heart/components/noticeNew/noticeNew.wxss
@@ -0,0 +1,61 @@
+.notice {
+  width: 750rpx;
+  background-color: #fff;
+  margin-top: 14rpx;
+  padding: 40rpx 10rpx 0rpx 30rpx;
+  box-sizing: border-box;
+}
+.notice-title {
+  font-size: 34rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  /* overflow: hidden;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  white-space: normal !important;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical; */
+}
+.notice-bottom {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 80rpx;
+}
+.notice-time {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #999999;
+}
+.notice-detail {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #F1551B;
+  width: 100rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.notice-option {
+  width: 240rpx;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #D60000;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.notice-option .btn {
+  text-align: center;
+  width: 100rpx;
+}
+.notice-line {
+  width: 1px;
+  height: 30rpx;
+  background: #BFBFBF;
+}
\ No newline at end of file
diff --git a/subpages/heart/images/call.png b/subpages/heart/images/call.png
new file mode 100644
index 0000000..f3c7755
Binary files /dev/null and b/subpages/heart/images/call.png differ
diff --git a/subpages/heart/images/my-publish.png b/subpages/heart/images/my-publish.png
new file mode 100644
index 0000000..ffda8a2
Binary files /dev/null and b/subpages/heart/images/my-publish.png differ
diff --git a/subpages/heart/images/publish.png b/subpages/heart/images/publish.png
new file mode 100644
index 0000000..df892fd
Binary files /dev/null and b/subpages/heart/images/publish.png differ
diff --git a/subpages/heart/pages/clockIn/clockIn.wxml b/subpages/heart/pages/clockIn/clockIn.wxml
index 19a89e0..989f8a9 100644
--- a/subpages/heart/pages/clockIn/clockIn.wxml
+++ b/subpages/heart/pages/clockIn/clockIn.wxml
@@ -41,5 +41,9 @@
     <view class="clear"></view>
   </view>
 
-  <view class="button" bindtap="submission" style="{{submissionDisabled?'background:grey;':''}}" disabled="{{submissionDisabled}}">提交打卡</view>
+  <!-- <view class="button" bindtap="submission" style="{{submissionDisabled?'background:grey;':''}}" disabled="{{submissionDisabled}}">提交打卡</view> -->
+  <view class="submit" bindtap="submission">
+      <image class="submit-bk" src="../../images/submit-bk.png" />
+      <view class="submit-text">提交打卡</view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/subpages/heart/pages/clockIn/clockIn.wxss b/subpages/heart/pages/clockIn/clockIn.wxss
index 54708e3..79c1379 100644
--- a/subpages/heart/pages/clockIn/clockIn.wxss
+++ b/subpages/heart/pages/clockIn/clockIn.wxss
@@ -167,3 +167,25 @@ button::after{
   border: none !important;
 }
 
+.submit {
+  width: 592rpx;
+  height: 116rpx;
+  position: relative;    
+  margin: 78rpx auto;
+}
+.submit .submit-bk {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: -1;
+}
+.submit .submit-text {
+  font-size: 34rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+}
+
diff --git a/subpages/heart/pages/dropByList/dropByList.js b/subpages/heart/pages/dropByList/dropByList.js
new file mode 100644
index 0000000..fae073c
--- /dev/null
+++ b/subpages/heart/pages/dropByList/dropByList.js
@@ -0,0 +1,187 @@
+// subpages/heart/pages/dropByList/dropByList.js
+const api = require("../../utils/api")
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pageIndex: 1,
+    pageSize: 10,
+    nodata: false,
+    loadMoreType: 'none',
+    loadMoreVisible: false,
+    dropbylist: [],
+    selectedTab: "tab0",
+    type: '0', //查询类型 0 : 我需要捎 1：我可以捎 2：我的发布
+    dialogVisible: false,
+    dialogTitle: "",
+    dialogContent: "",
+    dialogConfirmText: "",
+    dialogCancelText: "",
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // this.getSdsList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.setData({
+      pageIndex: 1,
+      dropbylist: []
+    })
+    this.getSdsList()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  // onShareAppMessage: function () {
+
+  // }
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({
+      loadMoreVisible: true
+    })
+    if (this.data.loadMoreType === "loading") {
+      this.setData({
+        pageIndex: this.data.pageIndex + 1
+      })
+      this.getSdsList()
+    }
+  },
+
+  // tab 切换
+  tabBarChange (e) {
+    this.setData({
+      loadMoreVisible: false,
+      loadMoreType: "none",
+      pageIndex: 1,
+    })
+    if (e.currentTarget.dataset.tab == "tab0") {
+      this.setData({
+        type: '0',
+        dropbylist: []
+      })
+      this.getSdsList()
+    } else if (e.currentTarget.dataset.tab == "tab1") {
+      this.setData({
+        type: '1',
+       dropbylist: []
+      })
+     this.getSdsList()
+    }
+    this.setData({
+      selectedTab: e.currentTarget.dataset.tab
+    })
+  },
+
+  getSdsList () {
+    const para = {
+      type: this.data.type,
+      pageIndex: this.data.pageIndex,
+      pageSize: this.data.pageSize
+    }
+    api.getSdsList(para).then(res => {
+      console.log(res)
+      this.setData({
+        dropbylist: [...this.data.dropbylist,...res.data],
+        loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
+        loadMoreVisible: res.data.length === this.data.pageSize ? false : true,
+        nodata: false,
+      })
+      if (this.data.dropbylist.length == 0) {
+        this.setData({
+          nodata: true,
+          loadMoreType: 'none',
+          loadMoreVisible: false,
+        })
+      }
+    }).catch(err => {
+      this.setData({
+        dropbylist: [],
+        nodata: true,
+        loadMoreType: 'none',
+        loadMoreVisible: false,
+      })
+      console.log(err)
+    })
+  },
+
+  // 跳转发布
+  toPublish () {
+    console.log('发布')
+    api.getVolunteerVerify().then(res => {
+      if (res.code == 0) {
+        if (res.data && res.data.id) {
+          wx.navigateTo({
+            url: `/subpages/heart/pages/dropByPublish/dropByPublish`
+          })
+        } else {
+          this.setData({
+            dialogVisible: !this.data.dialogVisible,
+            dialogTitle: "志愿者认证",
+            dialogContent: ["是否认证志愿者,完成发布"],
+            dialogConfirmText: "是",
+            dialogCancelText: "否"
+          })
+        } 
+      }
+    }).catch(err => {   
+      console.log(err)
+    })
+  },
+  // 跳转我的发布
+  toNoticeNewList () {
+    console.log('我的发布')    
+    wx.navigateTo({
+      url: `/subpages/heart/pages/noticeNewList/noticeNewList?type=0`
+    })
+  },
+
+  //志愿者认证
+  confirmDialog () {
+    wx.navigateTo({
+      url: "/subpages/heart/pages/volunteer/volunteer"
+    })
+  }
+})
\ No newline at end of file
diff --git a/subpages/heart/pages/dropByList/dropByList.json b/subpages/heart/pages/dropByList/dropByList.json
new file mode 100644
index 0000000..3649e6f
--- /dev/null
+++ b/subpages/heart/pages/dropByList/dropByList.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "顺道捎",
+  "usingComponents": {
+    "notice": "../../components/noticeNew/noticeNew",
+    "coverview-dialog": "../../components/coverViewDialog/coverViewDialog",
+    "load-more": "/components/loadMore/loadMore",
+    "no-data": "/components/nodata/nodata"
+  }
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/dropByList/dropByList.wxml b/subpages/heart/pages/dropByList/dropByList.wxml
new file mode 100644
index 0000000..9453740
--- /dev/null
+++ b/subpages/heart/pages/dropByList/dropByList.wxml
@@ -0,0 +1,37 @@
+<!--subpages/heart/pages/dropByList/dropByList.wxml-->
+<view class="drop-by-list">
+  <view class="tab-all">
+    <view class="tab-bar">
+      <view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange">
+        需要捎
+      </view>
+      <view class="tab tab1 {{selectedTab === 'tab1' ? 'select' : ''}}" data-tab="tab1" bindtap="tabBarChange">
+        可以捎
+      </view>
+      <view class="select-bar {{selectedTab}}"></view>
+    </view>
+  </view>
+  <view class="my-publish" bindtap="toNoticeNewList" wx:if="{{dropbylist.length > 0}}">
+    <image src="../../images/my-publish.png" />
+  </view>
+  <view class="item-list">
+    <notice list="{{dropbylist}}" type="{{0}}"></notice>
+  </view>
+</view>
+
+<movable-area class="movable-area">
+  <movable-view class="movable-view" direction="all" inertia="true" friction="10">
+    <view class="img-box" bindtap="toPublish">
+      <image src="../../images/publish.png" />
+    </view>
+  </movable-view>
+</movable-area>
+
+
+<coverview-dialog bind:confirm="confirmDialog" dialogVisible="{{dialogVisible}}" title="{{dialogTitle}}"
+  content="{{dialogContent}}" confirmText="{{dialogConfirmText}}" cancelText="{{dialogCancelText}}">
+</coverview-dialog>
+
+<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
+
+<no-data isShow="{{nodata}}"></no-data>
diff --git a/subpages/heart/pages/dropByList/dropByList.wxss b/subpages/heart/pages/dropByList/dropByList.wxss
new file mode 100644
index 0000000..20f3c58
--- /dev/null
+++ b/subpages/heart/pages/dropByList/dropByList.wxss
@@ -0,0 +1,117 @@
+/* subpages/heart/pages/dropByList/dropByList.wxss */
+page {
+    width: 100%;
+    height: auto;
+    overflow-y: auto;
+    background: #f7f7f7;
+}
+.drop-by-list {
+  position: relative;
+  overflow: hidden;
+}
+/* 悬浮按钮 start */
+.movable-area{
+    pointer-events:none;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0rpx;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+  .movable-view{ 
+    pointer-events:auto;
+    width: 208rpx;
+    height: 122rpx;
+    transform: translateX(560rpx) translateY(680rpx) translateZ(0rpx) scale(1);
+    transform-origin: center center;
+    will-change: auto;
+    position: absolute;
+    top: 850rpx;
+    left: 520rpx;
+  }
+  .img-box {
+    width: 178rpx;
+    height: 148rpx;
+  }
+  .img-box image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+  /* 悬浮按钮 end */
+
+  /* tab start */
+  .tab-all {
+    width: 100%;
+    height: 90rpx;
+    background-color: #fff;
+  }
+  
+  
+  .tab-bar {
+    width: 100%;
+    height: 90rpx;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    position: relative;
+  }
+  .tab-bar-fixed {
+    position: fixed;
+    top: 0rpx;
+  }
+  .tab-bar .tab {
+    font-size: 34rpx;
+    font-weight: 500;
+    color: rgba(171, 171, 171, 1);
+    width: 50%;
+    height: 100%;
+    line-height: 92rpx;
+    /* text-indent: 20rpx; */
+    text-align: center;
+    position: relative;
+    z-index: 10;
+  }
+  
+  .tab-bar .tab.select {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: rgba(229, 15, 0, 1);
+  }
+  
+  .tab-bar .select-bar {
+    position: absolute;
+    left: 14rpx;
+    bottom: 0rpx;
+    width: 30rpx;
+    height: 8rpx;
+    border-radius: 4rpx;
+    background: #fc5555;
+    z-index: 1;
+  }
+  
+  .tab-bar .tab0.select-bar {
+    left: calc(25% - 15rpx);
+    transition: left 0.3s linear;
+  }
+  
+  .tab-bar .tab1.select-bar {
+    left: calc(75% - 15rpx);
+    transition: left 0.3s linear;
+  }
+  /*  tab end */
+
+  .my-publish {
+    height: 76rpx;
+    width: 164rpx;
+    position: fixed;
+    right: -10rpx;
+    top: 70rpx;
+  }
+  .my-publish image {
+    height: 100%;
+    width: 100%;
+  }
\ No newline at end of file
diff --git a/subpages/heart/pages/dropByPublish/dropByPublish.js b/subpages/heart/pages/dropByPublish/dropByPublish.js
new file mode 100644
index 0000000..552e55b
--- /dev/null
+++ b/subpages/heart/pages/dropByPublish/dropByPublish.js
@@ -0,0 +1,287 @@
+// subpages/heart/pages/dropByPublish/dropByPublish.js
+const api = require("../../utils/api")
+import { getTimestamp } from '../../../../utils/common'
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    dialogVisible: false, //提示框
+    showPicker: false,  //是否显示底部时间选择器插件
+    dataForm: {
+      departure: '',      //目的地
+      destination: '',    //出发地
+      departureTime: '',  //出发时间
+      mobile: '',         //手机
+      carryContent: '',   //携带内容
+      carryStatus: '',    //捎带状态 0：我需要捎  1：我可以捎 
+      id: '',             //主键 更新时携带
+    },
+    violationsCount: 0,   //内容审核计数
+    isConReview: false,   //内容审核标志
+    lock: false, //锁定发布按钮状态，防止连击
+    selectedTab: 'tab0', 
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      'dataForm.id': options.id || ''
+    })
+    if (options.id) {
+      this.initDataForm()
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  // onShareAppMessage: function () {
+
+  // }
+  
+  onInputDeparture (e) {
+    this.setData({
+      'dataForm.departure': e.detail.value
+    })
+  },
+  onInputDestination (e) {
+    this.setData({
+      'dataForm.destination': e.detail.value
+    })
+  },
+  onInputMobile (e) {
+    this.setData({
+      'dataForm.mobile': e.detail.value
+    })
+  },
+  onInputContent (e) {
+    this.setData({
+      'dataForm.carryContent': e.detail.value
+    })
+  },
+  pickerCancel () {
+    console.log('取消日期选择')
+    this.setData({
+      showPicker: false,
+      'dataForm.departureTime': ''
+    })
+  },
+  pickerConfirm (e) {
+    console.log('选择日期', e.detail.time)
+    if (e.detail.time < getTimestamp()) {
+      this.showToast("出发时间应该大于当前时间")
+    } else {
+      this.setData({
+        showPicker: false,
+        'dataForm.departureTime': e.detail.time
+      })      
+    }
+  },
+  //日期选择插件显示入口
+  selectTime (e) {
+    this.data.showPicker = !this.data.showPicker
+    this.setData({
+      showPicker: this.data.showPicker,
+      'dataForm.departureTime': this.data.dataForm.departureTime || getTimestamp()
+    })
+  },
+
+  //发布
+  submitApply () {
+    if (this.data.lock) {
+      return false
+    }
+    if (!this.data.dataForm.departure) {
+      this.showToast("请填出发地")
+      return false
+    }
+    if (this.data.dataForm.departure.length>100) {
+      this.showToast("出发地请在100字以内")
+      return false
+    }
+    if (!this.data.dataForm.destination) {
+      this.showToast("请填写目的地")
+      return false
+    }
+    if (this.data.dataForm.destination.length>100) {
+      this.showToast("目的地请在100字以内")
+      return false
+    }
+    if (!this.data.dataForm.departureTime) {
+      this.showToast("请填写出发时间")
+      return false
+    }
+    if (!this.data.dataForm.mobile) {
+      this.showToast("请填写联系电话")
+      return false
+    }
+    if (this.data.dataForm.mobile.length>20) {
+      this.showToast("联系电话请在20字以内")
+      return false
+    }
+    if (!this.data.dataForm.carryContent) {
+      this.showToast("请填写携带内容")
+      return false
+    }
+    if (this.data.dataForm.carryContent.length>500) {
+      this.showToast("携带内容请在500字以内")
+      return false
+    }
+    if (this.data.selectedTab == 'tab0') {
+      this.data.dataForm.carryStatus = '0'
+    } else if(this.data.selectedTab == 'tab1') {
+      this.data.dataForm.carryStatus = '1'
+    }
+    wx.showLoading({
+      title: "发布中",
+    })
+    this.setData({
+      lock: true
+    })
+    const para = { ...this.data.dataForm }
+    para.isConReview = this.data.isConReview
+    console.log('submit', para)
+    let that = this
+    api.sdsUpdate(para).then(res => {
+      this.setData({
+        lock: false
+      })
+      if(res.code == 0) {
+        wx.hideLoading()
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          'dataForm.departure': '',
+          violationsCount: 0,
+          isConReview: false
+        })
+      } else if (res.code == 533) {
+        wx.hideLoading()
+        this.data.violationsCount++
+        console.log(this.data.violationsCount)
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.hideLoading()
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.submitApply()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
+    }).catch(err => {
+      console.log('err',err)
+      wx.hideLoading()
+      this.setData({
+        lock: false
+      })
+    })
+  },
+
+  //简化提示
+  showToast (title) {
+    wx.showToast({
+      title: title,
+      icon: "none",
+      duration: 2000
+    })
+  },
+
+  // 关闭弹框
+  closeDialog () {
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  // 弹框确定按钮
+  confirmDialog () {
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+
+  // tab 切换
+  tabBarChange (e) {
+    this.setData({
+      selectedTab: e.currentTarget.dataset.tab
+    })
+  },
+
+  initDataForm () {
+    wx.showLoading({
+      title: '加载中...'
+    })
+    api.getSdsDetail(this.data.dataForm.id).then(res => {
+      wx.hideLoading()
+      this.data.dataForm = { ...res.data }
+      let tab = 'tab' + this.data.dataForm.carryStatus
+      this.setData({
+        selectedTab: tab,
+        dataForm: this.data.dataForm
+      })
+    })
+  }
+})
\ No newline at end of file
diff --git a/subpages/heart/pages/dropByPublish/dropByPublish.json b/subpages/heart/pages/dropByPublish/dropByPublish.json
new file mode 100644
index 0000000..3bc6e8c
--- /dev/null
+++ b/subpages/heart/pages/dropByPublish/dropByPublish.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "顺道捎",
+  "usingComponents": {
+    "date-time-picker": "../../../../components/DateTimePicker/index",
+    "notice": "../../components/notice/notice"
+  }
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/dropByPublish/dropByPublish.wxml b/subpages/heart/pages/dropByPublish/dropByPublish.wxml
new file mode 100644
index 0000000..643bce9
--- /dev/null
+++ b/subpages/heart/pages/dropByPublish/dropByPublish.wxml
@@ -0,0 +1,46 @@
+<!--subpages/heart/pages/dropByPublish/dropByPublish.wxml-->
+<view class="my-apply">
+    <view class="tab-all">
+        <view class="tab-bar">
+            <view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange">
+            我需要捎
+            </view>
+            <view class="tab tab1 {{selectedTab === 'tab1' ? 'select' : ''}}" data-tab="tab1" bindtap="tabBarChange">
+            我可以捎
+            </view>
+            <view class="select-bar {{selectedTab}}"></view>
+        </view>
+    </view>
+    <view class="content">
+        <view class="apply-item">
+            <view class="item-title">出发地</view>
+            <input type="text" class="item-content" maxlength="100" placeholder="请输入出发地" value="{{dataForm.departure}}" bindinput="onInputDeparture"></input>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">目的地</view>
+            <input type="text" class="item-content" maxlength="100" placeholder="请输入目的地" value="{{dataForm.destination}}" bindinput="onInputDestination"></input>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">出发时间</view>
+            <view class="select-time" bindtap="selectTime">{{dataForm.departureTime||'请选择时间'}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">联系电话</view>
+            <input type="text" class="item-content" maxlength="20" placeholder="请输入联系电话" value="{{dataForm.mobile}}" bindinput="onInputMobile"></input>
+        </view>
+        <view class="apply-item text-item">
+            <view class="item-title" style="margin-top:20rpx">携带内容</view>
+            <textarea class="item-content text-content" maxlength="500" placeholder="请描述携带内容，如：2个人，1本书" value="{{dataForm.carryContent}}" bindinput="onInputContent"><span class="text-length">{{dataForm.carryContent.length}}/500</span></textarea>
+        </view>
+    </view> 
+    <view class="submit" bindtap="submitApply">
+        <image class="submit-bk" src="../../images/submit-bk.png" />
+        <view class="submit-text">发布</view>
+    </view>
+</view>
+
+<view wx:if="{{showPicker}}">
+    <date-time-picker bind:cancel="pickerCancel" bind:confirm="pickerConfirm" init-time="{{dataForm.departureTime}}"></date-time-picker>
+</view>
+
+<notice bind:close="closeDialog" bind:confirm="confirmDialog" dialogVisible="{{dialogVisible}}" title="发布成功" content="" confirmText="知道了"></notice> 
diff --git a/subpages/heart/pages/dropByPublish/dropByPublish.wxss b/subpages/heart/pages/dropByPublish/dropByPublish.wxss
new file mode 100644
index 0000000..44b6289
--- /dev/null
+++ b/subpages/heart/pages/dropByPublish/dropByPublish.wxss
@@ -0,0 +1,173 @@
+/* subpages/heart/pages/dropByPublish/dropByPublish.wxss */
+page {
+    width: 100%;
+    overflow-y: auto;
+    background: #f7f7f7;
+}
+/* tab start */
+.tab-all {
+    width: 100%;
+    height: 90rpx;
+    background-color: #fff;
+}
+
+
+.tab-bar {
+    width: 100%;
+    height: 90rpx;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    position: relative;
+}
+.tab-bar-fixed {
+    position: fixed;
+    top: 0rpx;
+}
+.tab-bar .tab {
+    font-size: 34rpx;
+    font-weight: 500;
+    color: rgba(171, 171, 171, 1);
+    width: 50%;
+    height: 100%;
+    line-height: 92rpx;
+    /* text-indent: 20rpx; */
+    text-align: center;
+    position: relative;
+    z-index: 10;
+}
+
+.tab-bar .tab.select {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: rgba(229, 15, 0, 1);
+}
+
+.tab-bar .select-bar {
+    position: absolute;
+    left: 14rpx;
+    bottom: 0rpx;
+    width: 30rpx;
+    height: 8rpx;
+    border-radius: 4rpx;
+    background: #fc5555;
+    z-index: 1;
+}
+
+.tab-bar .tab0.select-bar {
+    left: calc(25% - 15rpx);
+    transition: left 0.3s linear;
+}
+
+.tab-bar .tab1.select-bar {
+    left: calc(75% - 15rpx);
+    transition: left 0.3s linear;
+}
+/*  tab end */
+.content {
+    position: relative;
+    overflow: hidden;
+}
+.content .my-apply-img {
+    position: absolute;
+    right: -10rpx;
+    top: 16rpx;
+}
+.content .my-apply-img image {
+    width: 208rpx;
+    height: 76rpx;
+}
+.content .apply-item {
+    width: 100%;
+    height: 170rpx;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    padding: 0rpx 30rpx;
+    margin-top: 16rpx;
+    box-sizing: border-box;
+}
+.content .text-item {
+    height: 298rpx;
+}
+.content .apply-item .item-title {
+    height: 50rpx;
+    line-height: 50rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 28rpx;
+}
+.content .apply-item .item-content, .select-time {
+    width: 100%;
+    height: 44rpx;
+    line-height: 44rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #666666;
+}
+.content .apply-item .text-content {
+    font-weight: 400;
+    height: 280rpx;
+    margin-bottom: 40rpx;
+}
+.text-length {
+    position: absolute;
+    right: 0rpx;
+    bottom: -40rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #999999;
+}
+.submit {
+    width: 592rpx;
+    height: 116rpx;
+    position: relative;    
+    margin: 78rpx auto 0rpx;
+}
+.submit .submit-bk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    z-index: -1;
+}
+.submit .submit-text {
+    font-size: 34rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+}
+
+.time-group {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;      
+}
+.time-group .select-time {
+    width: 304rpx;
+    height: 50rpx;
+    /* background: #F7F7F7; */
+    border-radius: 25rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 24rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+}
+.time-group .select-time image {
+    width: 26rpx;
+    height: 26rpx;
+    opacity: 0.76;
+    margin-right: 20rpx;
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.js b/subpages/heart/pages/groupBuyList/groupBuyList.js
new file mode 100644
index 0000000..b331014
--- /dev/null
+++ b/subpages/heart/pages/groupBuyList/groupBuyList.js
@@ -0,0 +1,160 @@
+// subpages/heart/pages/groupBuyList/groupBuyList.js
+const api = require("../../utils/api")
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pageIndex: 1,
+    pageSize: 10,
+    nodata: false,
+    loadMoreType: 'none',
+    loadMoreVisible: false,
+    groupbuylist: [],
+    dialogVisible: false,
+    dialogTitle: "",
+    dialogContent: "",
+    dialogConfirmText: "",
+    dialogCancelText: "",
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // this.getGroupBuyList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.setData({
+      pageIndex: 1,
+      groupbuylist: []
+    })
+    this.getGroupBuyList()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  // onShareAppMessage: function () {
+
+  // }
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({
+      loadMoreVisible: true
+    })
+    if (this.data.loadMoreType === "loading") {
+      this.setData({
+        pageIndex: this.data.pageIndex + 1
+      })
+      this.getGroupBuyList()
+    }
+  },
+
+  getGroupBuyList () {
+    const para = {
+      isMe: '0',
+      pageIndex: this.data.pageIndex,
+      pageSize: this.data.pageSize
+    }
+    api.getGroupBuyList(para).then(res => {
+      console.log(res)
+      this.setData({
+        groupbuylist: [...this.data.groupbuylist,...res.data],
+        loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
+        loadMoreVisible: res.data.length === this.data.pageSize ? false : true,
+        nodata: false,
+      })
+      if (this.data.groupbuylist.length == 0) {
+        this.setData({
+          nodata: true,
+          loadMoreType: 'none',
+          loadMoreVisible: false,
+        })
+      }
+    }).catch(err => {
+      this.setData({
+        groupbuylist: [],
+        nodata: true,
+        loadMoreType: 'none',
+        loadMoreVisible: false,
+      })
+      console.log(err)
+    })
+  },
+
+  // 跳转发布
+  toPublish () {
+    console.log('发布')
+    api.getVolunteerVerify().then(res => {
+      if (res.code == 0) {
+        if (res.data && res.data.id) {
+          wx.navigateTo({
+            url: `/subpages/heart/pages/groupBuyPublish/groupBuyPublish`
+          })
+        } else {
+          this.setData({
+            dialogVisible: !this.data.dialogVisible,
+            dialogTitle: "志愿者认证",
+            dialogContent: ["是否认证志愿者,完成发布"],
+            dialogConfirmText: "是",
+            dialogCancelText: "否"
+          })
+        } 
+      }
+    }).catch(err => {   
+      console.log(err)
+    })
+  },
+  // 跳转我的发布
+  toNoticeNewList () {
+    console.log('我的发布')    
+    wx.navigateTo({
+      url: `/subpages/heart/pages/noticeNewList/noticeNewList?type=1`
+    })
+  },
+
+  //志愿者认证
+  confirmDialog () {
+    wx.navigateTo({
+      url: "/subpages/heart/pages/volunteer/volunteer"
+    })
+  }
+})
\ No newline at end of file
diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.json b/subpages/heart/pages/groupBuyList/groupBuyList.json
new file mode 100644
index 0000000..3f0b40f
--- /dev/null
+++ b/subpages/heart/pages/groupBuyList/groupBuyList.json
@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "拼团购",
+  "usingComponents": {
+    "notice": "../../components/noticeNew/noticeNew",
+    "coverview-dialog": "../../components/coverViewDialog/coverViewDialog",
+    "load-more": "/components/loadMore/loadMore",
+    "no-data": "/components/nodata/nodata"
+  }
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxml b/subpages/heart/pages/groupBuyList/groupBuyList.wxml
new file mode 100644
index 0000000..a6197c6
--- /dev/null
+++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxml
@@ -0,0 +1,25 @@
+<!--subpages/heart/pages/groupBuyList/groupBuyList.wxml-->
+<view class="group-buy-list">
+  <view class="my-publish" bindtap="toNoticeNewList" wx:if="{{groupbuylist.length > 0}}">
+    <image src="../../images/my-publish.png" />
+  </view>
+  <view class="item-list">
+    <notice list="{{groupbuylist}}" type="{{1}}"></notice>
+  </view>
+</view>
+
+<movable-area class="movable-area">
+  <movable-view class="movable-view" direction="all" inertia="true" friction="10">
+    <view class="img-box" bindtap="toPublish">
+      <image src="../../images/publish.png" />
+    </view>
+  </movable-view>
+</movable-area>
+
+<coverview-dialog bind:confirm="confirmDialog" dialogVisible="{{dialogVisible}}" title="{{dialogTitle}}"
+  content="{{dialogContent}}" confirmText="{{dialogConfirmText}}" cancelText="{{dialogCancelText}}">
+</coverview-dialog>
+
+<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
+
+<no-data isShow="{{nodata}}"></no-data>
diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxss b/subpages/heart/pages/groupBuyList/groupBuyList.wxss
new file mode 100644
index 0000000..3157486
--- /dev/null
+++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxss
@@ -0,0 +1,56 @@
+/* subpages/heart/pages/groupBuyList/groupBuyList.wxss */
+page {
+  width: 100%;
+  height: auto;
+  overflow-y: auto;
+  background: #f7f7f7;
+}
+.group-buy-list {
+  position: relative;
+  overflow: hidden;
+}
+/* 悬浮按钮 start */
+.movable-area{
+  pointer-events:none;
+  z-index: 999;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0rpx;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.movable-view{ 
+  pointer-events:auto;
+  width: 208rpx;
+  height: 122rpx;
+  transform: translateX(560rpx) translateY(680rpx) translateZ(0rpx) scale(1);
+  transform-origin: center center;
+  will-change: auto;
+  position: absolute;
+  top: 850rpx;
+  left: 520rpx;
+}
+.img-box {
+  width: 178rpx;
+  height: 148rpx;
+}
+.img-box image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+/* 悬浮按钮 end */
+
+.my-publish {
+  height: 76rpx;
+  width: 164rpx;
+  position: fixed;
+  right: -10rpx;
+  top: 0rpx;
+}
+.my-publish image {
+  height: 100%;
+  width: 100%;
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
new file mode 100644
index 0000000..0c1c3b6
--- /dev/null
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
@@ -0,0 +1,255 @@
+// subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
+const api = require("../../utils/api")
+import { getTimestamp } from '../../../../utils/common'
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    dialogVisible: false, //提示框
+    showPicker: false,  //是否显示底部时间选择器插件
+    dataForm: {
+      groupBuyTitle: '',      //标题
+      groupBuyContent: '',    //内容
+      groupBuyTime: '',       //团购时间
+      groupBuyMobile: '',     //手机
+      id: '',                 //主键 更新时携带
+    },
+    violationsCount: 0,   //内容审核计数
+    isConReview: false,   //内容审核标志
+    lock: false, //锁定发布按钮状态，防止连击
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      'dataForm.id': options.id || ''
+    })
+    if (options.id) {
+      this.initDataForm()
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  // onShareAppMessage: function () {
+
+  // }
+  
+  onInputGroupBuyTitle (e) {
+    this.setData({
+      'dataForm.groupBuyTitle': e.detail.value
+    })
+  },
+  onInputGroupBuyMobile (e) {
+    this.setData({
+      'dataForm.groupBuyMobile': e.detail.value
+    })
+  },
+  onInputContent (e) {
+    this.setData({
+      'dataForm.groupBuyContent': e.detail.value
+    })
+  },
+  pickerCancel () {
+    console.log('取消日期选择')
+    this.setData({
+      showPicker: false,
+      'dataForm.groupBuyTime': ''
+    })
+  },
+  pickerConfirm (e) {
+    console.log('选择日期', e.detail.time)      
+    if (e.detail.time < getTimestamp()) {
+      this.showToast("团购时间应该大于当前时间")
+    } else {
+      this.setData({
+        showPicker: false,
+        'dataForm.groupBuyTime': e.detail.time
+      })      
+    }
+  },
+  //日期选择插件显示入口
+  selectTime (e) {
+    this.data.showPicker = !this.data.showPicker
+    this.setData({
+      showPicker: this.data.showPicker,
+      'dataForm.groupBuyTime': this.data.dataForm.groupBuyTime || getTimestamp()
+    })
+  },
+  //发布
+  submitApply () {
+    if (this.data.lock) {
+      return false
+    }
+    if (!this.data.dataForm.groupBuyTitle) {
+      this.showToast("请填标题")
+      return false
+    }
+    if (this.data.dataForm.groupBuyTitle.length>50) {
+      this.showToast("标题限制在50字以内")
+      return false
+    }
+    if (!this.data.dataForm.groupBuyTime) {
+      this.showToast("请填写团购时间")
+      return false
+    }
+    if (!this.data.dataForm.groupBuyContent) {
+      this.showToast("请填写团购内容")
+      return false
+    }
+    if (this.data.dataForm.groupBuyContent.length>500) {
+      this.showToast("团购内容限制在500字以内")
+      return false
+    }
+    if (!this.data.dataForm.groupBuyMobile) {
+      this.showToast("请填写联系电话")
+      return false
+    }
+    if (this.data.dataForm.groupBuyMobile.length>20) {
+      this.showToast("联系电话限制在20字以内")
+      return false
+    }
+    wx.showLoading({
+      title: "发布中",
+    })
+    this.setData({
+      lock: true
+    })
+    const para = { ...this.data.dataForm }
+    para.isConReview = this.data.isConReview
+    console.log('submit', para)
+    let that = this
+    api.groupBuyUpdate(para).then(res => {
+      this.setData({
+        lock: false
+      })
+      if(res.code == 0) {
+        wx.hideLoading()
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          'dataForm.groupBuyTitle': '',
+          violationsCount: 0,
+          isConReview: false
+        })
+      } else if (res.code == 533) {
+        wx.hideLoading()
+        this.data.violationsCount++
+        console.log(this.data.violationsCount)
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.hideLoading()
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.submitApply()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
+    }).catch(err => {
+      console.log('err',err)
+      wx.hideLoading()
+      this.setData({
+        lock: false
+      })
+    })
+  },
+
+  initDataForm () {
+    wx.showLoading({
+      title: '加载中...'
+    })
+    api.getGroupBuyDetail(this.data.dataForm.id).then(res => {
+      wx.hideLoading()
+      this.setData({
+        dataForm: res.data
+      })
+    })
+  },
+
+  //简化提示
+  showToast (title) {
+    wx.showToast({
+      title: title,
+      icon: "none",
+      duration: 2000
+    })
+  },
+
+  // 关闭弹框
+  closeDialog () {
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  // 弹框确定按钮
+  confirmDialog () {
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+})
\ No newline at end of file
diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json
new file mode 100644
index 0000000..295eb1d
--- /dev/null
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "拼团购发布",
+  "usingComponents": {
+    "date-time-picker": "../../../../components/DateTimePicker/index",
+    "notice": "../../components/notice/notice"
+  }
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
new file mode 100644
index 0000000..d59f1b5
--- /dev/null
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
@@ -0,0 +1,31 @@
+<!--subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml-->
+<view class="my-apply">
+    <view class="content">
+        <view class="apply-item">
+            <view class="item-title">标题</view>
+            <input type="text" class="item-content" placeholder="请输入标题" value="{{dataForm.groupBuyTitle}}" bindinput="onInputGroupBuyTitle"></input>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">团购时间</view>
+            <view class="select-time" bindtap="selectTime">{{dataForm.groupBuyTime||'请选择时间'}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title" style="margin-top:20rpx">内容</view>
+            <textarea class="item-content text-content" maxlength="500" placeholder="请描述团购内容" value="{{dataForm.groupBuyContent}}" bindinput="onInputContent"><span class="text-length">{{dataForm.groupBuyContent.length}}/500</span></textarea>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">联系电话</view>
+            <input type="text" class="item-content" maxlength="20" placeholder="请输入联系电话" value="{{dataForm.groupBuyMobile}}" bindinput="onInputGroupBuyMobile"></input>
+        </view>
+    </view> 
+    <view class="submit" bindtap="submitApply">
+        <image class="submit-bk" src="../../images/submit-bk.png" />
+        <view class="submit-text">发布</view>
+    </view>
+</view>
+
+<view wx:if="{{showPicker}}">
+    <date-time-picker bind:cancel="pickerCancel" bind:confirm="pickerConfirm" init-time="{{dataForm.groupBuyTime}}"></date-time-picker>
+</view>
+
+<notice bind:close="closeDialog" bind:confirm="confirmDialog" dialogVisible="{{dialogVisible}}" title="发布成功" content="" confirmText="知道了"></notice> 
diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss
new file mode 100644
index 0000000..1ebfacb
--- /dev/null
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss
@@ -0,0 +1,113 @@
+/* subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss */
+page {
+    width: 100%;
+    overflow-y: auto;
+    background: #f7f7f7;
+}
+.content {
+    position: relative;
+    overflow: hidden;
+}
+.content .my-apply-img {
+    position: absolute;
+    right: -10rpx;
+    top: 16rpx;
+}
+.content .my-apply-img image {
+    width: 208rpx;
+    height: 76rpx;
+}
+.content .apply-item {
+    width: 100%;
+    min-height: 170rpx;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    padding: 0rpx 30rpx;
+    margin-top: 16rpx;
+    box-sizing: border-box;
+}
+.content .text-item {
+    height: 220rpx;
+}
+.content .apply-item .item-title {
+    height: 50rpx;
+    line-height: 50rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 28rpx;
+}
+.content .apply-item .item-content, .select-time {
+    width: 100%;
+    height: 44rpx;
+    line-height: 44rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #666666;
+}
+.content .apply-item .text-content {
+    font-weight: 400;
+    height: 280rpx;
+    margin-bottom: 80rpx;
+}
+.text-length {
+    position: absolute;
+    right: 0rpx;
+    bottom: -60rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #999999;
+}
+.submit {
+    width: 592rpx;
+    height: 116rpx;
+    position: relative;    
+    margin: 78rpx auto 0rpx;
+}
+.submit .submit-bk {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    z-index: -1;
+}
+.submit .submit-text {
+    font-size: 34rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+}
+
+.time-group {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;      
+}
+.time-group .select-time {
+    width: 304rpx;
+    height: 50rpx;
+    /* background: #F7F7F7; */
+    border-radius: 25rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 24rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #333333;
+}
+.time-group .select-time image {
+    width: 26rpx;
+    height: 26rpx;
+    opacity: 0.76;
+    margin-right: 20rpx;
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/myApply/myApply.js b/subpages/heart/pages/myApply/myApply.js
index 29c6f49..79848f1 100644
--- a/subpages/heart/pages/myApply/myApply.js
+++ b/subpages/heart/pages/myApply/myApply.js
@@ -218,7 +218,7 @@ Page({
       if(res.code == 0) {
         this.setData({
           dialogVisible: !this.data.dialogVisible,
-          'dataForm.Title': '',
+          'dataForm.actTitle': '',
           violationsCount: 0,
           isConReview: false
         })
@@ -239,7 +239,7 @@ Page({
               if (res.confirm) {
                 console.log('用户点击确定')
                 that.data.isConReview = true
-                that.addTopic()
+                that.submitApply()
               } else if (res.cancel) {
                 console.log('用户点击取消')
                 that.setData({
diff --git a/subpages/heart/pages/myApply/myApply.wxss b/subpages/heart/pages/myApply/myApply.wxss
index 1abe692..0c7e589 100644
--- a/subpages/heart/pages/myApply/myApply.wxss
+++ b/subpages/heart/pages/myApply/myApply.wxss
@@ -39,7 +39,7 @@ page {
     font-family: PingFang SC;
     font-weight: bold;
     color: #333333;
-    margin-bottom: 28rpx;
+    margin-bottom: 26rpx;
 }
 .apply-list .apply-item .item-content {
     width: 100%;
@@ -47,7 +47,7 @@ page {
     line-height: 44rpx;
     font-size: 32rpx;
     font-family: PingFang SC;
-    font-weight: 500;
+    font-weight: 400;
     color: #666666;
 }
 .apply-list .apply-item .text-content {
diff --git a/subpages/heart/pages/myApplyList/myApplyList.js b/subpages/heart/pages/myApplyList/myApplyList.js
index 0c7f608..47c0cd5 100644
--- a/subpages/heart/pages/myApplyList/myApplyList.js
+++ b/subpages/heart/pages/myApplyList/myApplyList.js
@@ -1,5 +1,4 @@
 // subpages/heart/pages/myApplyList/myApplyList.js
-const { checkWxUnionId } = require("../../../../utils/api")
 const api = require("../../../../utils/api")
 
 Page({
diff --git a/subpages/heart/pages/noticeNewDetail/noticeNewDetail.js b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.js
new file mode 100644
index 0000000..b22d74a
--- /dev/null
+++ b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.js
@@ -0,0 +1,130 @@
+// subpages/heart/pages/noticeNewDetail/noticeNewDetail.js
+const api = require("../../utils/api")
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    noticeId: '',
+    noticeType: '',     //0,2 顺道捎   1,3 拼团购
+    details: {}
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      noticeId: options.id,
+      noticeType: options.type
+    })
+    this.getNoticeDetail()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  // onShareAppMessage: function () {
+
+  // },
+
+  getNoticeDetail () {
+    wx.showLoading({
+      title: '加载中...'
+    })
+    if (this.data.noticeType == 0 || this.data.noticeType == 2) {
+      api.getSdsDetail(this.data.noticeId).then(res => {
+        // console.log(res.data)
+        wx.hideLoading()
+        this.setData({
+          details: res.data
+        })
+      })
+    } else {
+      api.getGroupBuyDetail(this.data.noticeId).then(res => {
+        // console.log(res.data)
+        wx.hideLoading()
+        this.setData({
+          details: res.data
+        })
+      })
+    }
+  },
+  callNumber () {
+    let mobile = (this.data.noticeType == 0 || this.data.noticeType == 2) ? this.data.details.mobile : this.data.details.groupBuyMobile
+    console.log('拨打电话', mobile)
+    let that = this
+    wx.showModal({
+      title: "拨打电话",
+      content: "",
+      cancelColor: "#29B9A5",
+      confirmColor: "#29B9A5",
+      success: (res) => {
+        if (res.confirm) {
+          console.log("用户点击确定")
+          that.countCall()
+          wx.makePhoneCall({
+            phoneNumber: mobile
+          })
+        } else if (res.cancel) {
+          console.log("用户点击取消")
+        }
+      }
+    })
+  },
+  countCall () {
+    if (this.data.noticeType == 0 || this.data.noticeType == 2) {
+      api.sdsCall(this.data.noticeId).then(res => {
+        console.log(res.data)
+      })
+    } else {
+      api.groupBuyCall(this.data.noticeId).then(res => {
+        console.log(res.data)
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/heart/pages/noticeNewDetail/noticeNewDetail.json b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.json
new file mode 100644
index 0000000..61f0f4a
--- /dev/null
+++ b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "详情",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxml b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxml
new file mode 100644
index 0000000..48c2251
--- /dev/null
+++ b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxml
@@ -0,0 +1,52 @@
+<!--subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxml-->
+<view class="notice-new">
+    <view class="notice-detail" wx:if="{{noticeType == 0 || noticeType == 2}}">
+        <!-- <view class="apply-item">
+            <view class="item-title">{{details.carryStatus==0?'我需要捎':'我可以捎'}}</view>
+        </view> -->
+        <view class="apply-item">
+            <view class="item-title">出发地</view>
+            <view class="item-content">{{details.departure}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">目的地</view>
+            <view class="item-content">{{details.destination}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">出发时间</view>
+            <view class="item-content">{{details.departureTime}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">联系电话</view>
+            <view class="item-content item-mobile">
+                <view >{{details.mobile}}</view>
+                <view class="call-img" bindtap="callNumber"><image src="../../images/call.png" /></view>
+            </view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">携带内容</view>
+            <view class="item-content">{{details.carryContent}}</view>
+        </view>
+    </view>
+    <view class="notice-detail" wx:else>
+        <view class="apply-item">
+            <view class="item-title">标题</view>
+            <view class="item-content">{{details.groupBuyTitle}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">团购时间</view>
+            <view class="item-content">{{details.groupBuyTime}}</view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">联系电话</view>
+            <view class="item-content item-mobile">
+                <view >{{details.groupBuyMobile}}</view>
+                <view class="call-img" bindtap="callNumber"><image src="../../images/call.png" /></view>
+            </view>
+        </view>
+        <view class="apply-item">
+            <view class="item-title">内容</view>
+            <view class="item-content">{{details.groupBuyContent}}</view>
+        </view>
+    </view>
+</view>
diff --git a/subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxss b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxss
new file mode 100644
index 0000000..dedefbb
--- /dev/null
+++ b/subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxss
@@ -0,0 +1,55 @@
+/* subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxss */
+page {
+    width: 100%;
+    height: auto;
+    overflow-y: auto;
+    background: #f7f7f7;
+}
+.notice-detail {
+    margin-bottom: 60rpx;
+}
+.notice-detail .apply-item {
+    width: 100%;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    padding: 40rpx 30rpx;
+    margin-top: 16rpx;
+    box-sizing: border-box;
+}
+.notice-detail .apply-item .item-title {
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+}
+.notice-detail .apply-item .item-content {
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #666666;
+    margin-top: 28rpx;
+}
+.notice-detail .apply-item .item-mobile {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.notice-detail .apply-item .item-mobile .call-img {
+    width: 176rpx;
+    height: 76rpx;
+}
+.notice-detail .apply-item .item-mobile .call-img image{
+    width: 100%;
+    height: 100%;
+}
+.notice-detail .apply-item .line {
+    width: 100%;
+    height: 1px;
+    background: #F2F2F2;
+    border-radius: 1px;
+    margin: 28rpx 0rpx;
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/noticeNewList/noticeNewList.js b/subpages/heart/pages/noticeNewList/noticeNewList.js
new file mode 100644
index 0000000..fefc1c6
--- /dev/null
+++ b/subpages/heart/pages/noticeNewList/noticeNewList.js
@@ -0,0 +1,178 @@
+// subpages/heart/pages/noticeNewList/noticeNewList.js
+const api = require("../../utils/api")
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pageIndex: 1,
+    pageSize: 10,
+    nodata: false,
+    loadMoreType: 'none',
+    loadMoreVisible: false,
+    sdslist: [],
+    groupbuylist: [],
+    type: '0' //0 顺道捎  1 拼团购
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      type: options.type
+    })
+    this.getMyList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  // onShareAppMessage: function () {
+
+  // }
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({
+      loadMoreVisible: true
+    })
+    if (this.data.loadMoreType === "loading") {
+      this.setData({
+        pageIndex: this.data.pageIndex + 1
+      })
+      this.getMyList()
+    }
+  },
+
+  getMyList () {
+    if (this.data.type == '0') {
+      this.getSdsList()
+    } else {
+      this.getGroupBuyList()
+    }
+  },
+  getSdsList () {
+    const para = {
+      type: '2',
+      pageIndex: this.data.pageIndex,
+      pageSize: this.data.pageSize
+    }
+    api.getSdsList(para).then(res => {
+      console.log(res)
+      this.setData({
+        sdslist: [...this.data.sdslist,...res.data],
+        loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
+        loadMoreVisible: res.data.length === this.data.pageSize ? false : true
+      })
+      if (this.data.sdslist.length == 0) {
+        this.setData({
+          nodata: true,
+          loadMoreType: 'none',
+          loadMoreVisible: false,
+        })
+      }
+    }).catch(err => {
+      this.setData({
+        sdslist: [],
+        nodata: true,
+        loadMoreType: 'none',
+        loadMoreVisible: false,
+      })
+      console.log(err)
+    })
+  },
+  getGroupBuyList () {
+    const para = {
+      isMe: '1',
+      pageIndex: this.data.pageIndex,
+      pageSize: this.data.pageSize
+    }
+    api.getGroupBuyList(para).then(res => {
+      console.log(res)
+      this.setData({
+        groupbuylist: [...this.data.groupbuylist,...res.data],
+        loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
+        loadMoreVisible: res.data.length === this.data.pageSize ? false : true
+      })
+      if (this.data.groupbuylist.length == 0) {
+        this.setData({
+          nodata: true,
+          loadMoreType: 'none',
+          loadMoreVisible: false,
+        })
+      }
+    }).catch(err => {
+      this.setData({
+        groupbuylist: [],
+        nodata: true,
+        loadMoreType: 'none',
+        loadMoreVisible: false,
+      })
+      console.log(err)
+    })
+  },
+
+  deleteSds (e) {
+    console.log('删除', e.detail.id)
+    api.sdsDelete(e.detail.id).then(res => {
+      console.log(res.data)
+      this.setData({
+        pageIndex: 1,
+        sdslist: []
+      })
+      this.getMyList()
+    })
+  },
+
+  deleteGroupBuy (e) {
+    console.log('删除', e.detail.id)
+    api.groupBuyDelete(e.detail.id).then(res => {
+      console.log(res.data)
+      this.setData({
+        pageIndex: 1,
+        groupbuylist: []
+      })
+      this.getMyList()
+    })
+  }
+})
\ No newline at end of file
diff --git a/subpages/heart/pages/noticeNewList/noticeNewList.json b/subpages/heart/pages/noticeNewList/noticeNewList.json
new file mode 100644
index 0000000..c2b4b7c
--- /dev/null
+++ b/subpages/heart/pages/noticeNewList/noticeNewList.json
@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "我的发布",
+  "usingComponents": {
+    "notice": "../../components/noticeNew/noticeNew",
+    "load-more": "/components/loadMore/loadMore",
+    "no-data": "/components/nodata/nodata"
+  }
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/noticeNewList/noticeNewList.wxml b/subpages/heart/pages/noticeNewList/noticeNewList.wxml
new file mode 100644
index 0000000..170506e
--- /dev/null
+++ b/subpages/heart/pages/noticeNewList/noticeNewList.wxml
@@ -0,0 +1,13 @@
+<!--subpages/heart/pages/noticeNewList/noticeNewList.wxml-->
+<view class="drop-by-list">
+  <view class="item-list" wx:if="{{type == '0'}}">
+    <notice list="{{sdslist}}" type="{{2}}" bind:delete="deleteSds"></notice>
+  </view>
+  <view class="item-list" wx:else>
+    <notice list="{{groupbuylist}}" type="{{3}}" bind:delete="deleteGroupBuy"></notice>
+  </view>
+</view>
+
+<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
+
+<no-data isShow="{{nodata}}"></no-data>
diff --git a/subpages/heart/pages/noticeNewList/noticeNewList.wxss b/subpages/heart/pages/noticeNewList/noticeNewList.wxss
new file mode 100644
index 0000000..6b26bd0
--- /dev/null
+++ b/subpages/heart/pages/noticeNewList/noticeNewList.wxss
@@ -0,0 +1,7 @@
+/* subpages/heart/pages/noticeNewList/noticeNewList.wxss */
+page {
+    width: 100%;
+    height: auto;
+    overflow-y: auto;
+    background: #f7f7f7;
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index d1fb424..d806705 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -156,11 +156,17 @@
     </view> -->
 
     <view class="submit-btn" wx:if="{{unionIdStatus === '1'}}">
-      <button hover-class="hover-button" bindtap="submission" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">提交认证</button>
+      <button hover-class="hover-button" bindtap="submission" disabled="{{lock}}">
+        <image src="../../images/submit-bk.png" />
+        <text >提交认证</text>
+      </button>
     </view>
 
     <view class="submit-btn" wx:elif="{{unionIdStatus === '0'}}">
-      <button hover-class="hover-button" open-type="getUserInfo" bindgetuserinfo="getUserInfo" style="{{lock?'background:grey;':''}}" disabled="{{lock}}">提交认证</button>
+      <button hover-class="hover-button" open-type="getUserInfo" bindgetuserinfo="getUserInfo" disabled="{{lock}}">
+        <image src="../../images/submit-bk.png" />
+        <text >提交认证</text>      
+      </button>
     </view>
 
   </view>
diff --git a/subpages/heart/pages/volunteer/volunteer.wxss b/subpages/heart/pages/volunteer/volunteer.wxss
index 6c3c819..070bece 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxss
+++ b/subpages/heart/pages/volunteer/volunteer.wxss
@@ -197,9 +197,10 @@ textarea {
 }
 
 .submit-btn button {
-  background: linear-gradient(to right, #f51010, #ff4c4c);
+  /* background: linear-gradient(to right, #f51010, #ff4c4c);  */
+  background-color: transparent;
   width: 560rpx;
-  height: 85rpx;
+  height: 100rpx;
   border-radius: 16rpx;
   line-height: 85rpx;
   font-size: 36rpx;
@@ -209,12 +210,23 @@ textarea {
   padding: 0;
   outline: 0;
 }
-
+button image {
+  width: 100%;
+  height: 100%;
+}
+button text {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+}
+button::after {
+  border: none;
+}
 .submit-btn .hover-button {
-  background: red;
+  
 }
 
-
 .basic-info {
   width: 100%;
   background: #fff;
@@ -283,12 +295,12 @@ textarea {
 
 .basic-info .list-item .right .get-code {
   padding: 0 15rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  background: linear-gradient(to right, #F40C0C, #FF4E4E);
+  height: 50rpx;
+  line-height: 50rpx;
+  background: linear-gradient(to right, #db1a1f, #e95027);
   color: #fff;
   font-size: 24rpx;
-  border-radius: 6rpx;
+  border-radius: 50rpx;
   margin: 0;
   margin-left: 25rpx;
 }
diff --git a/subpages/heart/utils/api.js b/subpages/heart/utils/api.js
new file mode 100644
index 0000000..1913e5a
--- /dev/null
+++ b/subpages/heart/utils/api.js
@@ -0,0 +1,83 @@
+var fly = require("../../../utils/request.js")
+module.exports = {
+    getSdsList,
+    getSdsDetail,
+    sdsUpdate,
+    sdsDelete,
+    sdsCall,
+    getGroupBuyList,
+    getGroupBuyDetail,
+    groupBuyUpdate,
+    groupBuyDelete,
+    groupBuyCall,
+    getImgUrl,
+    getVolunteerVerify,
+}
+
+//顺道捎-首页列表
+function getSdsList ({ type, pageIndex, pageSize }) {
+    return fly.get("custom/sds/getSdsList", {
+        type,
+        pageIndex,
+        pageSize
+    })
+}
+
+//顺道捎-我需要捎我可以捎详情接口
+function getSdsDetail (id) {
+    return fly.get(`custom/sds/getSdsDetail/${id}`)
+}
+
+//顺道捎-发布/修改
+function sdsUpdate (para) {
+    return fly.post("custom/sds/publishOrUpdate", para)
+}
+
+//顺道捎-删除
+function sdsDelete (id) {
+    return fly.get(`custom/sds/delete/${id}`)
+}
+
+//顺道捎-拨打电话次数
+function sdsCall (id) {
+    return fly.get(`custom/sds/callMobile/${id}`)
+}
+
+//拼团购-首页列表
+function getGroupBuyList ({ isMe, pageIndex, pageSize }) {
+    return fly.get("custom/groupBuy/getGroupBuyList", {
+        isMe,
+        pageIndex,
+        pageSize
+    })
+}
+
+//拼团购-详情接口
+function getGroupBuyDetail (id) {
+    return fly.get(`custom/groupBuy/getGroupBuyDetail/${id}`)
+}
+
+//拼团购-发布/修改
+function groupBuyUpdate (para) {
+    return fly.post("custom/groupBuy/publishOrUpdate", para)
+}
+
+//拼团购-删除
+function groupBuyDelete (id) {
+    return fly.get(`custom/groupBuy/delete/${id}`)
+}
+
+//拼团购-拨打电话次数
+function groupBuyCall (id) {
+    return fly.get(`custom/groupBuy/callMobile/${id}`)
+}
+
+// 获取配置图片
+function getImgUrl (imgType) {
+    return fly.get(`imgConfig/getImgUrl/${imgType}`)
+}
+
+// 获取志愿者认证标志
+function getVolunteerVerify () {
+    return fly.get(`app-user/user/volunteerVerify`)
+}
\ No newline at end of file
diff --git a/subpages/mine/images/timg.jpg b/subpages/mine/images/timg.jpg
deleted file mode 100644
index 52332af..0000000
Binary files a/subpages/mine/images/timg.jpg and /dev/null differ
diff --git a/subpages/mine/images/timg2.jpg b/subpages/mine/images/timg2.jpg
deleted file mode 100644
index 2e3b7f0..0000000
Binary files a/subpages/mine/images/timg2.jpg and /dev/null differ
diff --git a/subpages/mine/images/timg3.jpg b/subpages/mine/images/timg3.jpg
deleted file mode 100644
index a12e9e9..0000000
Binary files a/subpages/mine/images/timg3.jpg and /dev/null differ
diff --git a/subpages/mine/pages/eventDetail/eventDetail.js b/subpages/mine/pages/eventDetail/eventDetail.js
index a59a848..1a59116 100644
--- a/subpages/mine/pages/eventDetail/eventDetail.js
+++ b/subpages/mine/pages/eventDetail/eventDetail.js
@@ -2,7 +2,7 @@ import { getMyEventDetail } from "../../utils/api"
 
 Page({
   data: {
-    imageList: ["../../images/timg.jpg", "../../images/timg2.jpg", "../../images/timg3.jpg"],
+    // imageList: ["../../images/timg.jpg", "../../images/timg2.jpg", "../../images/timg3.jpg"],
     eventId: "",
     eventType: "待审核",
     eventObj: {
diff --git a/subpages/oneKeyService/pages/images/ic_yueduliang.png b/subpages/oneKeyService/images/ic_yueduliang.png
similarity index 100%
rename from subpages/oneKeyService/pages/images/ic_yueduliang.png
rename to subpages/oneKeyService/images/ic_yueduliang.png
diff --git a/subpages/oneKeyService/images/jsda.png b/subpages/oneKeyService/images/jsda.png
deleted file mode 100644
index ae74c98..0000000
Binary files a/subpages/oneKeyService/images/jsda.png and /dev/null differ
diff --git a/subpages/oneKeyService/images/jswd.png b/subpages/oneKeyService/images/jswd.png
deleted file mode 100644
index e39f3a8..0000000
Binary files a/subpages/oneKeyService/images/jswd.png and /dev/null differ
diff --git a/subpages/oneKeyService/images/jsyh.png b/subpages/oneKeyService/images/jsyh.png
deleted file mode 100644
index d9352f4..0000000
Binary files a/subpages/oneKeyService/images/jsyh.png and /dev/null differ
diff --git a/subpages/oneKeyService/images/jsyx.png b/subpages/oneKeyService/images/jsyx.png
deleted file mode 100644
index bde35af..0000000
Binary files a/subpages/oneKeyService/images/jsyx.png and /dev/null differ
diff --git a/subpages/oneKeyService/images/test.jpg b/subpages/oneKeyService/images/test.jpg
deleted file mode 100644
index f6508f2..0000000
Binary files a/subpages/oneKeyService/images/test.jpg and /dev/null differ
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js
deleted file mode 100644
index 8d77221..0000000
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js
+++ /dev/null
@@ -1,166 +0,0 @@
-// subpages/understandJs/pages/archives/archives.js
-const api = require('../../../../utils/understandJs')
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    deptList: [],
-    nodata: false,
-    loadMoreType: 'none',
-    loadMoreVisible: false,
-    swiperBannerList: [],
-    indicatorDots: false, //指示点
-    autoplay: true, //true,//自动播放
-    circular: true, //衔接滑动
-    interval: 5000, //自动播放间隔时长(ms)
-    duration: 500, //幻灯片切换时长(ms)
-    currentSwiper: 0,
-    showTitle: true, //视频标题
-    dictType: 'notice_yjfu_lbzx', // 居务公开，老兵在线
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      dictType: options.modulecode
-    })
-    if (options.modulecode == 'notice_jwgk') {
-      wx.setNavigationBarTitle({
-        title: '居务公开' 
-      })
-      this.getBannerList('8')
-    } else if (options.modulecode == 'notice_yjfu_lbzx') {
-      wx.setNavigationBarTitle({
-        title: '老兵在线' 
-      })
-      this.getBannerList('7')
-    }
-    this.getFullDictInfo()
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-    this.setData({
-      searchContent: ''
-    })
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === 'loading') {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.getFullDictInfo()
-    }
-  },
-
-  getFullDictInfo () {
-    const dictType = this.data.dictType
-    api.modulelist(dictType).then(res => {
-      this.setData({
-        deptList: res.data,
-      })
-      if (this.data.deptList.length == 0) {
-        this.setData({
-          nodata: true
-        })
-      }
-    }).catch(err => {
-      this.setData({
-        deptList: [],
-        nodata: true
-      })
-      console.log(err)
-    })
-    // api.getFullDictInfo(dictType).then(res => {
-    //   console.log(res)
-    //   this.setData({
-    //     deptList: [...this.data.deptList,...res.data],
-    //     loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
-    //     loadMoreVisible: res.data.length === this.data.pageSize ? false : true
-    //   })
-    //   if (this.data.deptList.length == 0) {
-    //     this.setData({
-    //       nodata: true,
-    //       loadMoreType: 'none',
-    //       loadMoreVisible: false,
-    //     })
-    //   }
-    // }).catch(err => {
-    //   this.setData({
-    //     deptList: [],
-    //     nodata: true,
-    //     loadMoreType: 'none',
-    //     loadMoreVisible: false,
-    //   })
-    //   console.log(err)
-    // })
-  },
-  getBannerList: function(bannerNum) {
-    let that = this
-    api.bannerList(bannerNum).then(function(res) {
-      // console.log('res==', res.data)
-      that.setData({
-        swiperBannerList: res.data
-      })
-    })
-  },
-  swiperChange: function(e) {
-    wx.createVideoContext('video'+this.data.currentSwiper).pause()
-    this.setData({
-      currentSwiper: e.detail.current,
-      autoplay: true
-    })
-  },
-  bindplay() {
-    this.setData({
-      autoplay: false
-    })
-    wx.getNetworkType({
-      success (res) {
-        const networkType = res.networkType
-        if (res.networkType != 'wifi') {
-          wx.showToast({
-            title: '当前为非WI-FI环境，请注意流量消耗',
-            icon: 'none',
-            duration: 3000
-          })
-        }
-      }
-    })
-  },
-  bindended() {
-    this.setData({
-      autoplay: true
-    })    
-  },
-  bindcontrolstoggle(e) {
-    this.setData({
-      showTitle: e.detail.show
-    })
-  },
-  /**
-   * 跳转页面
-   */
-  navigateToDict (e) {
-    console.log(e.currentTarget.dataset.dict)
-    wx.navigateTo({
-      url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.name}&dictType=${this.data.dictType}&dictValue=${e.currentTarget.dataset.dict.moduleCode}`
-    })
-  }
-})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json
deleted file mode 100644
index 8db8a6b..0000000
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  }
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml
deleted file mode 100644
index f789592..0000000
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml
+++ /dev/null
@@ -1,48 +0,0 @@
-<view class="dept-list">
-    <!-- banner swiperBannerList -->
-    <view class="banner" wx:if="{{swiperBannerList.length>0}}">
-    <view class="page-section page-section-spacing swiper">
-        <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
-        <block wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-            <swiper-item>
-            <view data-banner="{{item}}">
-                <view class="swiper-item" data-id="{{item.id}}">
-                <!-- <view class="altitle">
-                    <view class="altitle-name">{{item.title}}</view>
-                </view> -->
-                <image wx:if="{{item.imgUrl}}" class="banner" src='{{item.imgUrl}}' mode="aspectFill" />
-                <block wx:elif="{{item.videoUrl}}">
-                    <video id="video{{index}}" class="banner" src="{{item.videoUrl}}" title="{{item.title}}" bindcontrolstoggle="bindcontrolstoggle" bindpause="bindended" bindplay='bindplay' bindended='bindended'/>
-                    <view class="video-title" hidden="{{!showTitle}}">{{item.title}}</view>              
-                </block>
-                </view>
-            </view>
-            </swiper-item>
-        </block>
-        </swiper>
-        <!-- 重置小圆点的样式 -->
-        <view class="dots">
-        <block wx:for="{{ swiperBannerList }}" wx:key="index">
-            <view class="dot {{index == currentSwiper ? ' active' : '' }}"></view>
-        </block>
-        </view>
-    </view>
-    </view>
-
-    <view 
-        wx:for="{{deptList}}"
-        wx:for-index="index"
-        wx:for-item="item"
-        wx:key="index" 
-        class="list-item" bindtap="navigateToDict" data-dict="{{item}}">
-        <view class="list-name">
-            <image src="{{item.imgUrl}}" class="list-icon"/>{{item.name}}
-        </view>
-        <image src="../../images/right.png" class="list-arrow"></image>
-    </view>           
-</view>
-
-<!-- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more> -->
-
-<no-data isShow="{{nodata}}"></no-data>
-
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss
deleted file mode 100644
index f8b7726..0000000
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss
+++ /dev/null
@@ -1,265 +0,0 @@
-page {
-    background: #f7f7f7;
-    height: auto;
-}
-
-/* .top {
-    margin-top: 3rpx;
-    width: 100%;
-    height: 94rpx;
-    background: #fff;
-    display: flex;
-    justify-content: center;
-}
-.topbk {
-    position: absolute;
-    width: 100%;
-    height: 376rpx;
-    top: 0rpx;
-}
-.search {
-    width: calc(100% - 60rpx);
-    height: 66rpx;
-    background: rgba(255, 255, 255, 1);
-    border-radius: 33rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: absolute;
-}
-
-.search .item-all {
-    height: 30rpx;
-    width: 100%;
-    width: calc(100% - 60rpx);
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.search .item-all .item-left {
-    width: calc(100% - 73rpx);
-    height: 30rpx;
-    border-right: 1rpx solid #BFBFBF;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.search .item-all .item-left image {
-    width: 30rpx;
-    height: 28rpx;
-}
-
-.search .item-all .item-left input {
-    width: calc(100% - 41rpx);
-    height: 30rpx;
-    font-size: 28rpx;
-    color: #333;
-}
-
-.placeholder-style {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: rgba(168, 168, 168, 1);
-}
-
-.search .item-all .item-right {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: rgba(51, 51, 51, 1);
-    background-color: #fff;
-}
-
-button {
-    width: 100rpx;
-    height: 58rpx;
-    padding: 0;
-    border-radius: 0;
-    line-height: 58rpx;
-}
-
-button::after {
-    border-radius: 0px;
-    border: none;
-} */
-
-/* 列表 */
-.dept-list {
-    display: grid;
-    grid-template-columns: 1fr;
-    place-items: center;
-    gap: 24rpx 0;
-    width: 690rpx;
-    padding: 20rpx 0;
-    margin: 0rpx auto;
-    position: relative;
-    z-index: 999;
-}
-.dept-list .list-item:nth-of-type(1) {
-    margin-top: 12rpx;
-}
-.list-item {
-    width: 100%;
-    height: 160rpx;
-    background: #fff;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border-radius: 14rpx;
-}
-
-.list-item .list-name {
-    font-size:32rpx;
-    font-family:PingFang SC;
-    font-weight:bold;
-    color:rgba(51,51,51,1);
-    margin-left: 42rpx;    
-    display: flex;
-    align-items: center;
-}
-.list-item .list-arrow {
-    width: 16rpx;
-    height: 26rpx;
-    margin-right: 42rpx;
-}
-.list-item .list-name .list-icon {
-    width: 106rpx;
-    height: 106rpx;
-    margin-right: 14rpx;
-}
-
-/* 轮播图start */
-
-.altitle {
-    position: absolute;
-    width: 100%;
-    height: 66rpx;
-    background-color: black;
-    margin-top: 237rpx;
-    border-bottom-right-radius: 16rpx;
-    border-bottom-left-radius: 16rpx;
-    opacity: 0.5;
-    font-size: 22rpx;
-    font-weight: 500;
-    color: rgba(255, 255, 255, 1);
-  }
-  
-  .altitle-name {
-    margin: 10rpx 20rpx;
-  }
-  
-  .container {
-    width: 100vw;
-  }
-  
-  .page-body {
-    padding-top: 30rpx;
-    background: #fff;
-    height: 350rpx;
-  }
-  
-  .page-section {
-    width: 100%;
-    margin-bottom: 60rpx;
-  }
-  
-  .page-section_center {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  
-  .page-section:last-child {
-    margin-bottom: 0;
-  }
-  
-  .page-section-gap {
-    box-sizing: border-box;
-    padding: 0 30rpx;
-  }
-  
-  .page-section-spacing {
-    box-sizing: border-box;
-    /* padding: 0 20rpx; */
-    height: 350rpx;
-    background-color: #fff;
-  }
-  
-  .page-section-title {
-    font-size: 28rpx;
-    color: #999;
-    margin-bottom: 10rpx;
-    padding-left: 30rpx;
-    padding-right: 30rpx;
-  }
-  
-  .page-section-gap .page-section-title {
-    padding-left: 0;
-    padding-right: 0;
-  }
-  
-  .swiper-item {
-    display: block;
-    height: 350rpx;
-  }
-  
-  .banner {
-    overflow: hidden;
-    height: 350rpx;
-    display: flex;
-    width: 100%;
-    border-radius: 16rpx;
-    margin-bottom: 8rpx;
-  }
-  
-  .dots {
-    display: flex;
-    justify-content: center;
-    margin-top: -16rpx;
-    z-index: 999;
-    position: relative;
-  }
-  
-  .dots .dot {
-    width: 8rpx;
-    height: 8rpx;
-    border-radius: 8rpx;
-    margin-left: 10rpx;
-    background: #d2d5da;
-    transition: all 0.3s;
-  }
-  
-  .dots .dot.active {
-    width: 24rpx;
-    background: #fff;
-  }
-  
-  .page-section-title {
-    margin-top: 60rpx;
-    position: relative;
-  }
-  
-  swiper {
-    width: 710rpx;
-    height: 350rpx;
-    box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
-    border-radius: 16rpx;
-    overflow: hidden;
-    -webkit-backface-visibility: hidden;
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  
-  .video-title {
-    width: 100%;
-    height: 50rpx;
-    line-height: 50rpx;
-    padding-left: 40rpx;
-    color: white;
-    background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
-    background: -webkit-linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
-    position: absolute;
-    top: 0;
-  }
-  /* 轮播图end */
-
diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js
deleted file mode 100644
index 9b4701c..0000000
--- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// subpages/understandJs/pages/sclerotia/sclerotia.js
-const api = require("../../../../utils/understandJs")
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    sclerotialist: [],
-    nodata: false,
-    loadMoreType: "none",
-    loadMoreVisible: false,
-    dictType: '',
-    dictValue: '',
-    dictName: '',
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    wx.setNavigationBarTitle({
-      title: options.dictName
-    })
-    this.setData({
-      dictName: options.dictName,
-      dictType: options.dictType,
-      dictValue: options.dictValue
-    })
-    console.log(options)
-    this.getSclerotiaList()
-  },
-  
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === 'loading') {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.getSclerotiaList()
-    }
-  },
-
-  getSclerotiaList: function() {
-    let that = this
-    let para = {
-      pageIndex: this.data.pageIndex,
-      pageSize: this.data.pageSize,
-      noticeCategory: this.data.dictValue
-    }
-    api.noticelist(para).then(function(res) {
-      that.setData({
-        sclerotialist: that.data.sclerotialist.concat(res.data),
-        loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
-      })
-      if (that.data.sclerotialist.length == 0) {
-        that.setData({
-          nodata: true,
-          loadMoreType: 'none',
-          loadMoreVisible: false
-        })
-      }
-    }).catch(() => {
-      that.setData({
-        nodata: true,
-        loadMoreType: "none",
-        loadMoreVisible: false,
-        sclerotialist: []
-      })
-    })
-  },
-
-  toDetail (e) {
-    wx.navigateTo({
-      url: `../noticeDetail/noticeDetail?modulename=${this.data.dictName}&modulecode=${this.data.dictType}&modulevalue=${this.data.dictValue}&id=${e.currentTarget.dataset.id}`
-    })
-  }
-})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.json b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.json
deleted file mode 100644
index 8db8a6b..0000000
--- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  }
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml
deleted file mode 100644
index 132b478..0000000
--- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml
+++ /dev/null
@@ -1,32 +0,0 @@
-<wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
-<!-- 列表 -->
-<view class="list-all" wx:if="{{dictType == 'notice_yjfu_lbzx'}}">
-    <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" data-id="{{item.id}}" bindtap="toDetail">
-        <image src="{{item.imgUrl}}"></image>
-        <view class="item-info">
-        <view class="item-info-name">{{item.noticeTitle}}</view>
-        <view class="item-info-time">
-            <text>{{item.deptName}}</text>
-            <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
-        </view>
-        </view>
-    </view>
-</view>
-<view class="list-all" wx:else>
-    <view class="list-item-2" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" bindtap="toDetail" data-id="{{item.id}}">
-        <view class="name">{{item.noticeTitle}}</view>
-        <view class="info">
-            <text>{{common.getStr(item.noticeContent)}}</text>
-        </view>
-    </view>
-</view>
- <!--加载更多提示-->
-<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
-
-<no-data isShow="{{nodata}}"></no-data>
-
-<wxs module="common">
-    module.exports.getStr = function(content) {
-        return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
-    }
-</wxs>
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss b/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss
deleted file mode 100644
index 7542295..0000000
--- a/subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss
+++ /dev/null
@@ -1,120 +0,0 @@
-page {
-    background: #f7f7f7;
-}
-
-/* 列表样式 */
-
-.list-all {
-    /* width: calc(100% - 48rpx);
-    margin-left: 21rpx; 
-    margin-top: 50rpx;*/
-    width: 100%;
-    background-color: #fff;
-  }
-  
-  .list-all .list-item {
-    border-bottom: 1rpx solid #eaeaea;
-    margin-top: 16rpx;
-    padding: 40rpx 18rpx 30rpx 16rpx;
-    display: flex;
-    /* align-items: center; */
-  }
-  
-  .list-all .list-item:first-child {
-    border-top: 1rpx solid #eaeaea;
-  }
-  
-  .list-all .list-item:last-child {
-    border-bottom: none;
-  }
-  
-  .list-all .list-item .item-info {
-    width: calc(100% - 220rpx);
-    height: 146rpx;
-    position: relative;
-  }
-  
-  .list-all .list-item .item-info .item-info-name {
-    width: calc(100% - 47rpx);
-    font-size: 32rpx;
-    font-weight: 500;
-    color: rgba(63, 63, 63, 1);
-    line-height: 50rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    margin: 0 auto;
-  }
-  
-  .list-all .list-item .item-info .item-info-time {
-    width: calc(100% - 47rpx);
-    height: 22rpx;
-    position: absolute;
-    bottom: 5rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    left: 22rpx;
-  }
-  
-  .list-all .list-item .item-info .item-info-time text {
-    font-size: 22rpx;
-    font-weight: 500;
-    color: rgba(170, 170, 170, 1);
-    line-height: 22rpx;
-  }
-  
-  .list-all .list-item image {
-    width: 220rpx;
-    height: 146rpx;
-    border-radius: 10rpx;
-  }
-  
-  .list-all .list-item .label {
-    position: absolute;
-    z-index: 999;
-    width: 34rpx;
-    height: 34rpx;
-    right: 45rpx;
-  }
-  
-  .list-all .list-item .label image {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-  }
-
-  .list-all .list-item-2 {
-    width: 100%;
-    padding: 40rpx 28rpx;
-    margin-top: 16rpx;
-    background: #fff;
-    box-sizing: border-box;
-  }
-  
-  .list-all .list-item-2 .name {
-    font-size: 34rpx;
-    font-weight: 500;
-    color: rgba(51, 51, 51, 1);
-    line-height: 50rpx;
-  }
-  
-  .list-all .list-item-2 .info {
-    margin-top: 15rpx;
-    font-size: 28rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    color: rgba(153, 153, 153, 1);
-  }
-  
-  .list-all .list-item-2 .info text {
-    line-height: 46rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    word-wrap: break-word;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    font-size: 30rpx;
-  }
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.js b/subpages/oneKeyService/pages/moduleList/moduleList.js
index a36c519..1f10de2 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.js
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.js
@@ -54,7 +54,7 @@ Page({
       wx.navigateTo({
         url: `../noticeDetail/noticeDetail?pid=${this.data.moduleInfo.pid}&bannerflag=${this.data.moduleInfo.bannerflag}&categorycode=${this.data.moduleInfo.categorycode}&modulestyle=${this.data.moduleInfo.modulestyle}&categoryname=${this.data.moduleInfo.categoryname}`
       })   
-    }else if (this.getModuleStyleType() == 'notice_list_2') {
+    } else if (this.getModuleStyleType() == 'notice_tab_list') {
       this.getModuleCategoryList().then(() => {
         this.getNoticelist(this.data.newsCategoryList[0].value)
       })
@@ -85,7 +85,7 @@ Page({
         this.getNoticelist()
       } else if (this.getModuleStyleType() == 'module_list') {
         this.getModuleCategory()
-      }else if (this.getModuleStyleType() == 'notice_list_2') {
+      }else if (this.getModuleStyleType() == 'notice_tab_list') {
         this.getNoticelist(this.data.newsCategoryList[0].value)
       } 
     }
@@ -98,7 +98,7 @@ Page({
     } else if (moduleStyle == '2') {
       return 'module_list'
     } else if (moduleStyle == '8') {
-      return 'notice_list_2'
+      return 'notice_tab_list'
     }
     return 'notice_list'
   },
diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml
index a5a9995..d89615b 100644
--- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml
+++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml
@@ -37,7 +37,7 @@
       </view>
       <view class="right">
         <view class="readNum">
-          <image src="../images/ic_yueduliang.png" />
+          <image src="../../images/ic_yueduliang.png" />
         </view>
         <view class="num">{{noticeObj.readingAmount}}</view>
       </view>
diff --git a/subpages/oneKeyService/pages/policyList/policyList.js b/subpages/oneKeyService/pages/policyList/policyList.js
deleted file mode 100644
index 9ef0a48..0000000
--- a/subpages/oneKeyService/pages/policyList/policyList.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// subpages/home/pages/noticeNew/noticeNew.js
-const api = require('../../../../utils/understandJs')
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    noticeCategory: 'notice_navigation_hot',// 通知：notice_navigation_new
-    noticelist: [],
-    // selectTab: 'tab1',
-    nodata: false,
-    loadMoreType: 'none',
-    loadMoreVisible: false,
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      noticeCategory: options.modulecode
-    })
-    wx.setNavigationBarTitle({
-      title: options.modulecode == 'notice_navigation_hot' ? '最热政策' : options.modulecode == 'notice_navigation_new' ? '最新通知' : ''
-    })
-    this.noticelist();
-  },
-
-  // 加载网格长管辖的网格列表
-  noticelist() {
-    let that = this
-
-    let params = {
-      pageIndex: that.data.pageIndex,
-      pageSize: that.data.pageSize,
-      noticeCategory: that.data.noticeCategory
-    }
-
-    api.noticelist(params).then(res => {
-      that.setData({
-        noticelist: that.data.noticelist.concat(res.data),
-        loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
-        loadMoreVisible: res.data.length === that.data.pageSize ? false : true
-      })
-      if (that.data.noticelist.length == 0) {//没有值
-        that.setData({
-          nodata: true,
-          loadMoreType: 'none',
-          loadMoreVisible: false,
-        })
-      }
-    }).catch(err => {
-      that.setData({
-        noticelist: [],
-        nodata: true,
-        loadMoreType: 'none',
-        loadMoreVisible: false,
-      })
-      console.log(err)
-    })
-  },
-
-  // tab 切换
-  //模块编码（政策导航-最热政策：notice_navigation_hot、了解锦水-印象：notice_impression、了解锦水-味道：notice_taste、政策导航-最新通知：  notice_navigation_new、了解锦水-警示：notice_warning）
-  // onTabChange(e) {
-  //   if (e.currentTarget.dataset.tab == 'tab1') {
-  //     this.setData({
-  //       noticeCategory: 'notice_navigation_hot',
-  //     })
-  //   } else {
-  //     this.setData({
-  //       noticeCategory: 'notice_navigation_new',
-  //     })
-  //   }
-  //   this.setData({
-  //     selectTab: e.currentTarget.dataset.tab,
-  //     pageIndex: 1,
-  //     pageSize: 10,
-  //     noticelist: [],
-  //     loadMoreType: 'loading',
-  //     loadMoreVisible: true,
-  //     nodata: false,
-  //   })
-
-  //   this.noticelist();
-  // },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === 'loading') {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.noticelist();
-    }
-  },
-
-  toDetail(e) {
-    console.log(e.currentTarget.dataset.id)
-    wx.navigateTo({ url: '/subpages/home/pages/noticeDetail/noticeDetail?id=' + e.currentTarget.dataset.id +'&code=' + this.data.noticeCategory })
-  }
-})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/policyList/policyList.json b/subpages/oneKeyService/pages/policyList/policyList.json
deleted file mode 100644
index 6f1be8c..0000000
--- a/subpages/oneKeyService/pages/policyList/policyList.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  },
-  "navigationBarTitleText": ""
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/policyList/policyList.wxml b/subpages/oneKeyService/pages/policyList/policyList.wxml
deleted file mode 100644
index 43f43de..0000000
--- a/subpages/oneKeyService/pages/policyList/policyList.wxml
+++ /dev/null
@@ -1,25 +0,0 @@
-  <!-- tabbar -->
-  <!-- <view class="tab-bar">
-    <view class="tab tab1 {{selectTab === 'tab1' ? 'select-tab' : ''}}" data-tab="tab1" bindtap="onTabChange">最热政策
-    </view>
-    <view class="tab tab2 {{selectTab === 'tab2' ? 'select-tab' : ''}}" data-tab="tab2" bindtap="onTabChange">最新通知
-    </view>
-    <view class="select-bar {{selectTab === 'tab1' ? 'tab1' : 'tab2'}}"></view>
-  </view> -->
-  <!-- 列表 -->
-  <view class="list-lu" wx:if="{{noticelist.length > 0}}">
-    <view class="list-li" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{noticelist}}"
-      bindtap="toDetail" data-id="{{item.id}}">
-      <view class="item-name">{{item.noticeTitle}}</view>
-      <view class="item-info">
-        <image src="../../images/ic_zhengce.png" />
-        <view class="street">{{item.deptName}}</view>
-        <view class="time">{{item.noticeTime}}</view>
-      </view>
-    </view>
-  </view>
-
-   <!--加载更多提示-->
- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
-
- <no-data isShow="{{nodata}}"></no-data>
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/policyList/policyList.wxss b/subpages/oneKeyService/pages/policyList/policyList.wxss
deleted file mode 100644
index 18d34d6..0000000
--- a/subpages/oneKeyService/pages/policyList/policyList.wxss
+++ /dev/null
@@ -1,96 +0,0 @@
-page {
-  background: #f7f7f7;
-}
-
-.tab-bar {
-  width: 100%;
-  height: 80rpx;
-  background: #fff;
-  display: flex;
-  justify-content: space-around;
-  position: relative;
-}
-
-.tab-bar .tab {
-  flex: 1;
-  height: 80rpx;
-  line-height: 80rpx;
-  text-align: center;
-  width: 50%;
-  font-size: 32rpx;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-}
-
-.tab-bar .select-tab {
-  color: #b20004;
-  font-size: 32rpx;
-  font-weight: bold;
-}
-
-.tab-bar .select-bar {
-  width: 40rpx;
-  height: 8rpx;
-  border-radius: 5rpx;
-  background: #b20004;
-  position: absolute;
-  bottom: 0rpx;
-}
-
-.tab-bar .select-bar.tab1 {
-  left: calc(25% - 15rpx);
-  transition: left linear 0.4s;
-}
-
-.tab-bar .select-bar.tab2 {
-  left: calc(75% - 15rpx);
-  transition: left linear 0.4s;
-}
-
-/* 列表样式 */
-.list-lu .list-li:first-child {
-  margin-top: 27rpx;
-}
-
-.list-li {
-  width: 100%;
-  background: #fff;
-  padding: 38rpx 30rpx;
-  margin-top: 16rpx;
-  box-sizing: border-box;
-}
-
-.list-li .item-name {
-  width: 100%;
-  font-size: 34rpx;
-  font-weight: 500;
-  color: rgba(51, 51, 51, 1);
-  line-height: 52rpx;
-}
-
-.list-li .item-info {
-  width: calc(100% - 60rpx);
-  height: 28rpx;
-  margin-top: 30rpx;
-  display: flex;
-  align-items: center;
-}
-
-.list-li .item-info image {
-  width: 28rpx;
-  height: 28rpx;
-}
-
-.list-li .item-info .street {
-  margin-left: 11rpx;
-  font-size: 24rpx;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-}
-
-.list-li .item-info .time {
-  margin-left: 22rpx;
-  font-size: 24rpx;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.js b/subpages/oneKeyService/pages/reportIssue/reportIssue.js
index aa3ea59..5f797d2 100644
--- a/subpages/oneKeyService/pages/reportIssue/reportIssue.js
+++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.js
@@ -139,6 +139,7 @@ Page({
     const para = { ...this.data.dataForm }
     para.isConReview = this.data.isConReview
     console.log('submit issue', para)
+    let that = this
     api.reportIssue(para).then(res => {
       wx.hideLoading()
       this.setData({
@@ -172,7 +173,7 @@ Page({
               if (res.confirm) {
                 console.log('用户点击确定')
                 that.data.isConReview = true
-                that.addTopic()
+                that.submitIssue()
               } else if (res.cancel) {
                 console.log('用户点击取消')
                 that.setData({
diff --git a/subpages/oneKeyService/pages/search/search.js b/subpages/oneKeyService/pages/search/search.js
deleted file mode 100644
index 25d9f6b..0000000
--- a/subpages/oneKeyService/pages/search/search.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// subpages/oneKeyService/pages/search/search.js
-const api = require('../../../../utils/understandJs')
-Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    searchContent: '',
-    deptId: '',
-    historylist: [
-      {
-        label: '就业',
-        hot: true
-      },
-      {
-        label: '创业',
-        hot: false
-      }
-    ]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    console.log(options)
-    this.setData({
-      searchContent: options.searchContent,
-      deptId: options.deptId
-    })
-  },
-
-  bindInputValue (e) {
-    this.setData({
-      searchContent: e.detail.value
-    })
-  },
-
-  searchFile () {
-
-  }
-})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/search/search.json b/subpages/oneKeyService/pages/search/search.json
deleted file mode 100644
index 5b5073d..0000000
--- a/subpages/oneKeyService/pages/search/search.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-  },
-  "navigationBarTitleText": "搜索"
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/search/search.wxml b/subpages/oneKeyService/pages/search/search.wxml
deleted file mode 100644
index 36e55d8..0000000
--- a/subpages/oneKeyService/pages/search/search.wxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--subpages/oneKeyService/pages/search/search.wxml-->
-<view class="top">
-    <view class="search">
-        <view class="item-all">
-            <view class="item-left">
-                <image src="../../images/search.png"></image>
-                <input placeholder-class="placeholder-style" placeholder="输入档案关键字" bindinput="bindInputValue" value="{{searchContent}}"></input>
-            </view>
-            <button class="item-right" bindtap="searchFile" hover-class="none">搜索</button>
-        </view>
-    </view>
-</view>
-<view class="history">
-    <view 
-        class="history-label {{item.hot?'hot-label':''}}" 
-        wx:for="{{historylist}}"
-        wx:for-index="index"
-        wx:for-item="item"
-        wx:key="index">
-        {{item.label}}
-    </view>
-</view>
diff --git a/subpages/oneKeyService/pages/search/search.wxss b/subpages/oneKeyService/pages/search/search.wxss
deleted file mode 100644
index 4271104..0000000
--- a/subpages/oneKeyService/pages/search/search.wxss
+++ /dev/null
@@ -1,96 +0,0 @@
-/* subpages/oneKeyService/pages/search/search.wxss */
-page {
-    background: #fff;
-}
-
-.top {
-    margin-top: 3rpx;
-    width: 100%;
-    height: 94rpx;
-    background: #fff;
-    display: flex;
-    align-items: center;
-}
-
-.search {
-    /* margin-top: 17rpx; */
-    width: calc(100% - 60rpx);
-    height: 66rpx;
-    margin-left: 30rpx;
-    background: rgba(242, 242, 242, 1);
-    border-radius: 33rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.search .item-all {
-    height: 30rpx;
-    width: 100%;
-    width: calc(100% - 60rpx);
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.search .item-all .item-left {
-    /* background: red; */
-    width: calc(100% - 73rpx);
-    height: 30rpx;
-    border-right: 1rpx solid #BFBFBF;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.search .item-all .item-left image {
-    width: 30rpx;
-    height: 28rpx;
-}
-
-.search .item-all .item-left input {
-    width: calc(100% - 41rpx);
-    height: 30rpx;
-    font-size: 28rpx;
-    color: #333;
-}
-
-.placeholder-style {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: rgba(168, 168, 168, 1);
-}
-
-.search .item-all .item-right {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: rgba(51, 51, 51, 1);
-    background-color: rgba(242, 242, 242, 1);
-}
-
-button {
-    width: 100rpx;
-    height: 58rpx;
-    padding: 0;
-    border-radius: 0;
-    line-height: 58rpx;
-}
-
-button::after {
-    border-radius: 0px;
-    border: none;
-}
-
-.history {
-    padding-left: 30rpx;
-}
-.history-label {
-    width: 100rpx;
-    border-radius: 25rpx;
-    text-align: center;
-    height: 50rpx;
-    background-color: lightgray;
-}
-.hot-label {
-    background-color: lightblue;
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js
deleted file mode 100644
index 23cecbf..0000000
--- a/subpages/oneKeyService/pages/warning/warning.js
+++ /dev/null
@@ -1,196 +0,0 @@
-// subpages/understandJs/pages/warning/warning.js
-const api = require('../../../../utils/understandJs')
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    noticelist: [],
-    nodata: false,
-    loadMoreType: 'none',
-    loadMoreVisible: false,
-    noticeCategory: '',//模块编码（政策导航-最热政策：notice_navigation_hot、了解锦水-印象：notice_impression、了解锦水-味道：notice_taste、政策导航-最新通知：  notice_navigation_new、了解锦水-警示：notice_warning）
-    noticeContentNew:'',
-    swiperBannerList: [],
-    indicatorDots: false, //指示点
-    autoplay: true, //true,//自动播放
-    circular: true, //衔接滑动
-    interval: 5000, //自动播放间隔时长(ms)
-    duration: 500, //幻灯片切换时长(ms)
-    currentSwiper: 0,
-    showTitle: true, //视频标题
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      noticeCategory:options.modulecode
-    })
-    if(options.modulecode == 'notice_impression'){
-      wx.setNavigationBarTitle({
-        title: '锦水印象' 
-      })
-    }else if(options.modulecode == 'notice_zcwsc'){
-      this.getBannerList('4')
-      wx.setNavigationBarTitle({
-        title: '众创卫生城' 
-      })
-    }else if(options.modulecode == 'notice_aq'){
-      this.getBannerList('5')
-      wx.setNavigationBarTitle({
-        title: '安全365' 
-      })
-    }else if(options.modulecode == 'notice_cgjj'){
-      this.getBannerList('6')
-      wx.setNavigationBarTitle({
-        title: '城管聚焦'
-      })
-    }else if(options.modulecode == 'notice_jwgk'){
-      // this.getBannerList('6')
-      wx.setNavigationBarTitle({
-        title: '居务公开'
-      })
-    }else{
-      this.getBannerList('2')
-      wx.setNavigationBarTitle({
-        title: '锦水警事' 
-      })
-    }
-
-    this.noticelist()
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === 'loading') {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.noticelist();
-    }
-  },
-
-  noticelist() {
-    let that = this;
-    let params = {
-      pageIndex: that.data.pageIndex,
-      pageSize: that.data.pageSize,
-      noticeCategory: that.data.noticeCategory,
-    }
-    api.noticelist(params).then(function (res) { //了解锦水-模块管理接口
-      let noticelistObj = {}
-      let noticelistItem = []
-      for(var i = 0; i < res.data.length; i++){
-        noticelistObj= res.data[i]
-        noticelistObj.noticeContentNew = res.data[i].noticeContent.replace(/<img/gi, '<img style="display:none" ');
-        noticelistItem.push(noticelistObj)
-      }
-      that.setData({
-        noticelist: that.data.noticelist.concat(noticelistItem),
-        loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
-        loadMoreVisible: res.data.length === that.data.pageSize ? false : true
-      })
-      if (that.data.noticelist.length == 0) {//没有值
-        that.setData({
-          nodata: true,
-          loadMoreType: 'none',
-          loadMoreVisible: false,
-        })
-      }
-    }).catch(err => {
-      that.setData({
-        noticelist: [],
-        nodata: true,
-        loadMoreType: 'none',
-        loadMoreVisible: false,
-      })
-      console.log(err)
-    })
-  },
-
-  //跳转倒详情页面
-  toDetail(e){    
-    wx.navigateTo({
-      url: `../noticeDetail/noticeDetail?id=${e.currentTarget.dataset.id}&modulecode=${this.data.noticeCategory}`
-    })
-  },
-
-  getBannerList: function(bannerNum) {
-    let that = this
-    api.bannerList(bannerNum).then(function(res) {
-      // console.log('res==', res.data)
-      that.setData({
-        swiperBannerList: res.data
-      })
-    })
-  },
-  swiperChange: function(e) {
-    wx.createVideoContext('video'+this.data.currentSwiper).pause()
-    this.setData({
-      currentSwiper: e.detail.current,
-      autoplay: true
-    })
-  },
-  bindplay() {
-    this.setData({
-      autoplay: false
-    })
-    wx.getNetworkType({
-      success (res) {
-        const networkType = res.networkType
-        if (res.networkType != 'wifi') {
-          wx.showToast({
-            title: '当前为非WI-FI环境，请注意流量消耗',
-            icon: 'none',
-            duration: 3000
-          })
-        }
-      }
-    })
-  },
-  bindended() {
-    this.setData({
-      autoplay: true
-    })    
-  },
-  bindcontrolstoggle(e) {
-    this.setData({
-      showTitle: e.detail.show
-    })
-  },
-  // swiperChange2: function(e) {
-  //   this.setData({
-  //     'options2.currentSwiper': e.detail.current,
-  //     currentIndex: e.detail.current
-  //   })
-  // },
-  // 跳转到banner详情
-  //navigatetoBannerDetail(e) {
-    // const {
-    //   id,
-    //   url,
-    //   newsflag
-    // } = e.currentTarget.dataset
-    // console.log(id, url, newsflag)
-    // if (newsflag == '0') {
-    //   wx.navigateTo({
-    //     url: `/subpages/home/pages/webview/webview?url=${url}`
-    //   })
-    // } else if (newsflag == '1') {
-    //   wx.navigateTo({
-    //     url: `/subpages/home/pages/newsDetail/newsDetail?id=${id}`
-    //   })
-    // }
-  //}
-})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/warning/warning.json b/subpages/oneKeyService/pages/warning/warning.json
deleted file mode 100644
index 8db8a6b..0000000
--- a/subpages/oneKeyService/pages/warning/warning.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  }
-}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/warning/warning.wxml b/subpages/oneKeyService/pages/warning/warning.wxml
deleted file mode 100644
index c8715f5..0000000
--- a/subpages/oneKeyService/pages/warning/warning.wxml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- banner swiperBannerList -->
-<view class="banner" wx:if="{{swiperBannerList.length>0}}">
-  <view class="page-section page-section-spacing swiper">
-    <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
-      <block wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-        <swiper-item>
-          <view data-banner="{{item}}">
-            <view class="swiper-item" data-id="{{item.id}}">
-              <!-- <view class="altitle">
-                <view class="altitle-name">{{item.title}}</view>
-              </view> -->
-              <image wx:if="{{item.imgUrl}}" class="banner" src='{{item.imgUrl}}' mode="aspectFill" />
-              <block wx:elif="{{item.videoUrl}}">
-                <video id="video{{index}}" class="banner" src="{{item.videoUrl}}" title="{{item.title}}" bindcontrolstoggle="bindcontrolstoggle" bindpause="bindended" bindplay='bindplay' bindended='bindended'/>
-                <view class="video-title" hidden="{{!showTitle}}">{{item.title}}</view>              
-              </block>
-            </view>
-          </view>
-        </swiper-item>
-      </block>
-    </swiper>
-    <!-- 重置小圆点的样式 -->
-    <view class="dots">
-      <block wx:for="{{ swiperBannerList }}" wx:key="index">
-        <view class="dot {{index == currentSwiper ? ' active' : '' }}"></view>
-      </block>
-    </view>
-  </view>
-</view>
-<view class="list-item" 
-    wx:if="{{noticelist.length > 0}}" 
-    wx:for-index="index" 
-    wx:for-item="item" 
-    wx:key="index" 
-    wx:for="{{noticelist}}"
-    bindtap="toDetail"
-    data-id="{{item.id}}">
-    <view class="name">{{item.noticeTitle}}</view>
-    <view class="info">
-        <!-- <rich-text space="nbsp" nodes="{{item.noticeContentNew}}"></rich-text> -->
-        <text>{{common.getStr(item.noticeContentNew)}}</text>
-    </view>
-</view>
-
-
- <!--加载更多提示-->
- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
-
-<no-data isShow="{{nodata}}"></no-data>
-<wxs module="common">
-    module.exports.getStr = function(content) {
-        return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
-    }
-</wxs>
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/warning/warning.wxss b/subpages/oneKeyService/pages/warning/warning.wxss
deleted file mode 100644
index f41938b..0000000
--- a/subpages/oneKeyService/pages/warning/warning.wxss
+++ /dev/null
@@ -1,195 +0,0 @@
-page {
-  background: #f7f7f7;
-}
-
-.list-item {
-  width: 100%;
-  padding: 40rpx 28rpx;
-  margin-top: 16rpx;
-  background: #fff;
-  box-sizing: border-box;
-}
-
-.list-item .name {
-  /* width: calc(100% - 56rpx); */
-  font-size: 34rpx;
-  font-weight: 500;
-  color: rgba(51, 51, 51, 1);
-  line-height: 50rpx;
-}
-
-.list-item .info {
-  /* margin-top: 15rpx;
-  width: calc(100% - 56rpx);
-  font-size: 28rpx;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-  line-height: 44rpx;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden; */
-
-  margin-top: 15rpx;
-  /* width: calc(100% - 56rpx); */
-  /* height: 75rpx; */
-  font-size: 28rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-}
-
-.list-item .info rich-text {
-  /* width:100%; */
-  line-height: 44rpx;
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-wrap: break-word;
-  white-space: normal !important;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-
-.list-item .info text {
-  line-height: 46rpx;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-wrap: break-word;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  font-size: 30rpx;
-}
-/* 轮播图start */
-
-.altitle {
-  position: absolute;
-  width: 100%;
-  height: 66rpx;
-  background-color: black;
-  margin-top: 237rpx;
-  border-bottom-right-radius: 16rpx;
-  border-bottom-left-radius: 16rpx;
-  opacity: 0.5;
-  font-size: 22rpx;
-  font-weight: 500;
-  color: rgba(255, 255, 255, 1);
-}
-
-.altitle-name {
-  margin: 10rpx 20rpx;
-}
-
-.container {
-  width: 100vw;
-}
-
-.page-body {
-  padding-top: 30rpx;
-  background: #fff;
-  height: 300rpx;
-}
-
-.page-section {
-  width: 100%;
-  margin-bottom: 60rpx;
-}
-
-.page-section_center {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.page-section:last-child {
-  margin-bottom: 0;
-}
-
-.page-section-gap {
-  box-sizing: border-box;
-  padding: 0 30rpx;
-}
-
-.page-section-spacing {
-  box-sizing: border-box;
-  padding: 0 20rpx;
-  height: 300rpx;
-  background-color: #fff;
-}
-
-.page-section-title {
-  font-size: 28rpx;
-  color: #999;
-  margin-bottom: 10rpx;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-}
-
-.page-section-gap .page-section-title {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.swiper-item {
-  display: block;
-  height: 300rpx;
-}
-
-.banner {
-  overflow: hidden;
-  height: 300rpx;
-  display: flex;
-  width: 100%;
-  border-radius: 16rpx;
-}
-
-.dots {
-  display: flex;
-  justify-content: center;
-  margin-top: -16rpx;
-  z-index: 999;
-  position: relative;
-}
-
-.dots .dot {
-  width: 8rpx;
-  height: 8rpx;
-  border-radius: 8rpx;
-  margin-left: 10rpx;
-  background: #d2d5da;
-  transition: all 0.3s;
-}
-
-.dots .dot.active {
-  width: 24rpx;
-  background: #fff;
-}
-
-.page-section-title {
-  margin-top: 60rpx;
-  position: relative;
-}
-
-swiper {
-  width: 710rpx;
-  height: 300rpx;
-  box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
-  border-radius: 16rpx;
-  overflow: hidden;
-  -webkit-backface-visibility: hidden;
-  -webkit-transform: translate3d(0, 0, 0);
-}
-
-.video-title {
-  width: 100%;
-  height: 50rpx;
-  line-height: 50rpx;
-  padding-left: 40rpx;
-  color: white;
-  background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
-  background: -webkit-linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
-  position: absolute;
-  top: 0;
-}
-/* 轮播图end */
\ No newline at end of file
diff --git a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.js b/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.js
deleted file mode 100644
index 52adafe..0000000
--- a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.js
+++ /dev/null
@@ -1,8 +0,0 @@
-Component({
-  data: {
-
-  },
-  methods: {
-    
-  }
-})
\ No newline at end of file
diff --git a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.wxml b/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.wxml
deleted file mode 100644
index 282742a..0000000
--- a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.wxml
+++ /dev/null
@@ -1,3 +0,0 @@
-<view class="preload-archives-detail">
-  <view class="detail-item" wx:for="{{[1,2,3,4,5,6]}}"></view>
-</view>
\ No newline at end of file
diff --git a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.wxss b/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.wxss
deleted file mode 100644
index 51095f2..0000000
--- a/subpages/understandJs/compontents/preLoadArchivesDetail/preLoadArchivesDetail.wxss
+++ /dev/null
@@ -1,30 +0,0 @@
-.preload-archives-detail {
-  width: 100%;
-  background: #fff;
-  box-sizing: border-box;
-  border-radius: 16rpx;
-  padding: 0 24rpx;
-  overflow: hidden;
-  margin-bottom: 20rpx;
-}
-
-.preload-archives-detail .detail-item {
-  width: 100%;
-  height: 80rpx;
-  border-radius: 8rpx;
-  background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
-  animation: loading 1.4s ease infinite;
-  background-size: 400% 100%;
-  margin-top: 20rpx;
-}
-
-
-@keyframes loading {
-  0% {
-    background-position: 100% 50%
-  }
-
-  100% {
-    background-position: 0 50%
-  }
-}
\ No newline at end of file
diff --git a/subpages/understandJs/images/jsda.png b/subpages/understandJs/images/jsda.png
deleted file mode 100644
index ae74c98..0000000
Binary files a/subpages/understandJs/images/jsda.png and /dev/null differ
diff --git a/subpages/understandJs/images/jswd.png b/subpages/understandJs/images/jswd.png
deleted file mode 100644
index e39f3a8..0000000
Binary files a/subpages/understandJs/images/jswd.png and /dev/null differ
diff --git a/subpages/understandJs/images/jsyh.png b/subpages/understandJs/images/jsyh.png
deleted file mode 100644
index d9352f4..0000000
Binary files a/subpages/understandJs/images/jsyh.png and /dev/null differ
diff --git a/subpages/understandJs/images/jsyx.png b/subpages/understandJs/images/jsyx.png
deleted file mode 100644
index bde35af..0000000
Binary files a/subpages/understandJs/images/jsyx.png and /dev/null differ
diff --git a/subpages/understandJs/images/phone.png b/subpages/understandJs/images/phone.png
deleted file mode 100644
index 92ece29..0000000
Binary files a/subpages/understandJs/images/phone.png and /dev/null differ
diff --git a/subpages/understandJs/images/right.png b/subpages/understandJs/images/right.png
deleted file mode 100644
index 2af42d7..0000000
Binary files a/subpages/understandJs/images/right.png and /dev/null differ
diff --git a/subpages/understandJs/images/search.png b/subpages/understandJs/images/search.png
deleted file mode 100644
index c6e6a6c..0000000
Binary files a/subpages/understandJs/images/search.png and /dev/null differ
diff --git a/subpages/understandJs/images/test.jpg b/subpages/understandJs/images/test.jpg
deleted file mode 100644
index f6508f2..0000000
Binary files a/subpages/understandJs/images/test.jpg and /dev/null differ
diff --git a/subpages/understandJs/images/wenjian.png b/subpages/understandJs/images/wenjian.png
deleted file mode 100644
index 49a85b8..0000000
Binary files a/subpages/understandJs/images/wenjian.png and /dev/null differ
diff --git a/subpages/understandJs/pages/delicious/delicious.js b/subpages/understandJs/pages/delicious/delicious.js
deleted file mode 100644
index 30b0275..0000000
--- a/subpages/understandJs/pages/delicious/delicious.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// subpages/understandJs/pages/delicious/delicious.js
-const api = require("../../../../utils/understandJs")
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    noticelist: [],
-    nodata: false,
-    loadMoreType: "none",
-    loadMoreVisible: false,
-    noticeCategory: "",
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      noticeCategory:options.modulecode
-    })
-    if(options.modulecode == 'notice_taste'){
-      wx.setNavigationBarTitle({
-        title: '锦水味道' 
-      })
-    }else if(options.modulecode == 'notice_jssq'){
-      wx.setNavigationBarTitle({
-        title: '锦水社区' 
-      })
-    }
-    this.noticelist();
-  },
-  noticelist () {
-    let that = this;
-    let params = {
-      pageIndex: that.data.pageIndex,
-      pageSize: that.data.pageSize,
-      noticeCategory: that.data.noticeCategory
-    }
-    api.noticelist(params).then(function (res) { //了解锦水-模块管理接口
-      console.log(JSON.stringify(res))
-      that.setData({
-        noticelist: that.data.noticelist.concat(res.data),
-        loadMoreType: res.data.length === that.data.pageSize ? "loading" : "none",
-        loadMoreVisible: res.data.length === that.data.pageSize ? false : true
-      })
-      if (that.data.noticelist.length == 0) {//没有值
-        that.setData({
-          nodata: true,
-          loadMoreType: "none",
-          loadMoreVisible: false,
-        })
-      }
-    }).catch(err => {
-      that.setData({
-        noticelist: [],
-        nodata: true,
-        loadMoreType: "none",
-        loadMoreVisible: false,
-      })
-      console.log(err)
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === "loading") {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.noticelist();
-    }
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  //跳转倒详情页面
-  toDetail (e){
-    wx.navigateTo({
-      url: `../noticeDetail/noticeDetail?id=${e.currentTarget.dataset.id}&modulecode=${this.data.noticeCategory}`
-    })
-  }
-})
\ No newline at end of file
diff --git a/subpages/understandJs/pages/delicious/delicious.json b/subpages/understandJs/pages/delicious/delicious.json
deleted file mode 100644
index 8db8a6b..0000000
--- a/subpages/understandJs/pages/delicious/delicious.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  }
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/delicious/delicious.wxml b/subpages/understandJs/pages/delicious/delicious.wxml
deleted file mode 100644
index f5387a1..0000000
--- a/subpages/understandJs/pages/delicious/delicious.wxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<view class="box" wx:if="{{noticelist.length > 0}}">
-  <view class="item"
-        wx:for-index="index" 
-        wx:for-item="item" 
-        wx:key="index" 
-        wx:for="{{noticelist}}"
-        bindtap="toDetail"
-        data-id="{{item.id}}">
-    <image src="{{item.imgUrl}}"></image>
-    <view class="name">
-      {{item.noticeTitle}}
-    </view>
-  </view>
-</view>
-
- <!--加载更多提示-->
- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
-
-<no-data isShow="{{nodata}}"></no-data>
\ No newline at end of file
diff --git a/subpages/understandJs/pages/delicious/delicious.wxss b/subpages/understandJs/pages/delicious/delicious.wxss
deleted file mode 100644
index a8afaa8..0000000
--- a/subpages/understandJs/pages/delicious/delicious.wxss
+++ /dev/null
@@ -1,44 +0,0 @@
-page{
-  background: #f7f7f7;
-}
-.box {
-  background: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  border-top: 1rpx solid #F4F4F4;
-  padding: 50rpx 30rpx;
-}
-
-.box .item:first-child {
-  margin-top: 0rpx;
-}
-
-.box .item:nth-child(2) {
-  margin-top: 0rpx;
-}
-
-.box .item {
-  margin-top: 40rpx;
-  width: calc(50% - 10rpx);
-  height: 257rpx;
-}
-
-.box .item image {
-  width: 100%;
-  height: 206rpx;
-  border-radius: 10rpx;
-}
-
-.box .item .name {
-  width: 100%;
-  height: 51rpx;
-  line-height: 60.5rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-  color: rgba(36, 36, 36, 1);
-  overflow: hidden;    
-  text-overflow:ellipsis;    
-  white-space: nowrap;
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/images/ic_yueduliang.png b/subpages/understandJs/pages/images/ic_yueduliang.png
deleted file mode 100644
index 7d6f21f..0000000
Binary files a/subpages/understandJs/pages/images/ic_yueduliang.png and /dev/null differ
diff --git a/subpages/understandJs/pages/impression/impression.js b/subpages/understandJs/pages/impression/impression.js
deleted file mode 100644
index 10c3882..0000000
--- a/subpages/understandJs/pages/impression/impression.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// subpages/understandJs/pages/delicious/delicious.js
-const api = require("../../../../utils/understandJs")
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    noticelist: [],
-    nodata: false,
-    loadMoreType: "none",
-    loadMoreVisible: false,
-    noticeCategory: "",//模块编码（政策导航-最热政策：notice_navigation_hot、了解锦水-印象：notice_impression、了解锦水-味道：notice_taste、政策导航-最新通知：  notice_navigation_new、了解锦水-警示：notice_warning）
-    noticeContentNew:"",
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      noticeCategory:options.modulecode
-    })
-    if(options.modulecode == "notice_impression"){
-      wx.setNavigationBarTitle({
-        title: "锦水印象" 
-      })
-    }else{
-      wx.setNavigationBarTitle({
-        title: "锦水警事" 
-      })
-    }
-
-    this.noticelist();
-  },
-  noticelist () {
-    let that = this;
-    let params = {
-      pageIndex: that.data.pageIndex,
-      pageSize: that.data.pageSize,
-      noticeCategory: that.data.noticeCategory,
-    }
-    api.noticelist(params).then(function (res) { //了解锦水-模块管理接口
-      let noticelistObj = {}
-      let noticelistItem = []
-      for(var i = 0; i < res.data.length; i++){
-        noticelistObj= res.data[i]
-        noticelistObj.noticeContentNew = res.data[i].noticeContent.replace(/<img/gi, "<img style=\"display:none\" ");
-        noticelistItem.push(noticelistObj)
-      }
-      that.setData({
-        noticelist: that.data.noticelist.concat(noticelistItem),
-        loadMoreType: res.data.length === that.data.pageSize ? "loading" : "none",
-        loadMoreVisible: res.data.length === that.data.pageSize ? false : true
-      })
-      if (that.data.noticelist.length == 0) {//没有值
-        that.setData({
-          nodata: true,
-          loadMoreType: "none",
-          loadMoreVisible: false,
-        })
-      }
-    }).catch(err => {
-      that.setData({
-        noticelist: [],
-        nodata: true,
-        loadMoreType: "none",
-        loadMoreVisible: false,
-      })
-      console.log(err)
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === "loading") {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.noticelist();
-    }
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  //跳转倒详情页面
-  toDetail (e){    
-    wx.navigateTo({
-      url: `../noticeDetail/noticeDetail?id=${e.currentTarget.dataset.id}&modulecode=${this.data.noticeCategory}`
-    })
-  }
-})
\ No newline at end of file
diff --git a/subpages/understandJs/pages/impression/impression.json b/subpages/understandJs/pages/impression/impression.json
deleted file mode 100644
index ade164d..0000000
--- a/subpages/understandJs/pages/impression/impression.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "锦水印象",
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  }
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/impression/impression.wxml b/subpages/understandJs/pages/impression/impression.wxml
deleted file mode 100644
index 5e3e4b5..0000000
--- a/subpages/understandJs/pages/impression/impression.wxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<view class="list-item" 
-    wx:if="{{noticelist.length > 0}}" 
-    wx:for-index="index" 
-    wx:for-item="item" 
-    wx:key="index" 
-    wx:for="{{noticelist}}"
-    bindtap="toDetail"
-    data-id="{{item.id}}">
-    <view class="name">{{item.noticeTitle}}</view>
-    <view class="info">
-        <rich-text space="nbsp" nodes="{{item.noticeContentNew}}"></rich-text>
-    </view>
-</view>
-
-
- <!--加载更多提示-->
- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
-
-<no-data isShow="{{nodata}}"></no-data>
\ No newline at end of file
diff --git a/subpages/understandJs/pages/impression/impression.wxss b/subpages/understandJs/pages/impression/impression.wxss
deleted file mode 100644
index 7a2244f..0000000
--- a/subpages/understandJs/pages/impression/impression.wxss
+++ /dev/null
@@ -1,52 +0,0 @@
-page {
-  background: #f7f7f7;
-}
-
-.list-item {
-  width: 100%;
-  padding: 40rpx 28rpx;
-  margin-top: 16rpx;
-  background: #fff;
-  box-sizing: border-box;
-}
-
-.list-item .name {
-  /* width: calc(100% - 56rpx); */
-  font-size: 34rpx;
-  font-weight: 500;
-  color: rgba(51, 51, 51, 1);
-  line-height: 50rpx;
-}
-
-.list-item .info {
-  /* margin-top: 15rpx;
-  width: calc(100% - 56rpx);
-  font-size: 28rpx;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-  line-height: 44rpx;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden; */
-
-  margin-top: 15rpx;
-  /* width: calc(100% - 56rpx); */
-  /* height: 75rpx; */
-  font-size: 28rpx;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: rgba(153, 153, 153, 1);
-}
-
-.list-item .info rich-text {
-  /* width:100%; */
-  line-height: 44rpx;
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-wrap: break-word;
-  white-space: normal !important;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/index/index.js b/subpages/understandJs/pages/index/index.js
deleted file mode 100644
index b7b345b..0000000
--- a/subpages/understandJs/pages/index/index.js
+++ /dev/null
@@ -1,98 +0,0 @@
-const api = require('../../../../utils/understandJs')
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    moduleCategory: 'module_type_jmjs',  //module_type_jmjs (解码锦水) //module_type_service (一键服务) //'' (旧版)
-    modulelist: []
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.modulelist()
-  },
-  modulelist() {
-    let that = this;
-    api.modulelist(that.data.moduleCategory).then(function (res) {
-      that.setData({
-        modulelist: res.data,
-      })
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  goDetails(e) {//模块编码（印象，味道，硬核）
-    console.log(JSON.stringify(e.currentTarget.dataset) + e.currentTarget.dataset.modulecode)
-    if (e.currentTarget.dataset.modulecode == 'notice_impression') {
-      wx.navigateTo({
-        url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}`
-      })
-    } else if (e.currentTarget.dataset.modulecode == 'notice_taste') {
-      wx.navigateTo({
-        url: `../delicious/delicious?modulecode=${e.currentTarget.dataset.modulecode}`
-      })
-    } else if (e.currentTarget.dataset.modulecode == 'notice_yh') {
-      wx.navigateTo({
-        url: `../sclerotia/sclerotia?modulecode=${e.currentTarget.dataset.modulecode}`
-      })
-    } else if (e.currentTarget.dataset.modulecode == 'notice_jsdh') {
-      wx.navigateTo({
-        url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}`
-      })
-    } else if (e.currentTarget.dataset.modulecode == 'notice_jssq') {
-      wx.navigateTo({
-        url: `../delicious/delicious?modulecode=${e.currentTarget.dataset.modulecode}`
-      })
-    }
-  }
-})
\ No newline at end of file
diff --git a/subpages/understandJs/pages/index/index.json b/subpages/understandJs/pages/index/index.json
deleted file mode 100644
index c476201..0000000
--- a/subpages/understandJs/pages/index/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "解码锦水"
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/index/index.wxml b/subpages/understandJs/pages/index/index.wxml
deleted file mode 100644
index 38e9d13..0000000
--- a/subpages/understandJs/pages/index/index.wxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<button class="index top" 
-        hover-class="hover-btn"  
-        bindtap="goDetails"  
-        wx:for-item="item" 
-        wx:key="index" 
-        wx:for-index="index" 
-        wx:for="{{modulelist}}"
-        data-moduleCode="{{item.moduleCode}}">
-  <image class="img-bj" src="{{item.imgUrl}}"></image>
-  <!-- <view class="shadow">
-    <image class="img-name" src="../../images/jsyx.png"></image>
-  </view> -->
-</button>
\ No newline at end of file
diff --git a/subpages/understandJs/pages/index/index.wxss b/subpages/understandJs/pages/index/index.wxss
deleted file mode 100644
index ae41edd..0000000
--- a/subpages/understandJs/pages/index/index.wxss
+++ /dev/null
@@ -1,53 +0,0 @@
-.index {
-  width: calc(100% - 60rpx);
-  /* margin-top: 28rpx; */
-  height: 300rpx;
-  margin-left: 30rpx;
-  border-radius: 10rpx;
-  position: relative;
-  margin-bottom: 28rpx;
-  padding: 0;
-  background: #fff;
-  box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4);
-}
-
-button::after {
-  border: none;
-}
-
-.hover-btn {
-  box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
-}
-
-.index.top {
-  margin-top: 28rpx;
-}
-
-.index .img-bj {
-  border-radius: 10rpx;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 10;
-}
-
-.index .shadow {
-  border-radius: 10rpx;
-  position: relative;
-  width: 100%;
-  height: 100%;
-  z-index: 999;
-  /* background: rgba(0, 0, 0, 1); */
-  background: rgba(0, 0, 0, 0.6);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.index .shadow .img-name {
-  width: 210rpx;
-  height: 58rpx;
-  opacity: 1;
-}
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js
deleted file mode 100644
index fb65aa5..0000000
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js
+++ /dev/null
@@ -1,209 +0,0 @@
-const api = require('../../../../utils/understandJs')
-import util from '../../../../utils/util'
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    noticeObj: {},
-    noticeObjContent: "",
-    pageIndex:1,
-    pageSize:10,
-    noticeCategory:'',
-    preloadVisible: true,
-    isNeedBanner: false,
-    bannerList: [],
-    indicatorDots: false, //指示点
-    autoplay: true, //true,//自动播放
-    circular: true, //衔接滑动
-    interval: 5000, //自动播放间隔时长(ms)
-    duration: 500, //幻灯片切换时长(ms)
-    currentSwiper: 0,
-    nodata: false,
-    showTitle: true
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      noticeCategory:options.modulecode
-    })
-    if (options.modulecode == 'notice_taste'){
-      wx.setNavigationBarTitle({
-        title: "锦水味道" 
-      })
-      this.noticeDetail(options.id)
-    } else if(options.modulecode == 'notice_jssq'){
-      wx.setNavigationBarTitle({
-        title: "锦水社区" 
-      })
-      this.noticeDetail(options.id)
-    } else if(options.modulecode == "notice_impression"){
-      wx.setNavigationBarTitle({
-        title: "锦水印象" 
-      })
-      this.setData({
-        isNeedBanner: true
-      })
-      if (this.data.isNeedBanner) {
-        this.videoBannerList()
-      }
-      this.noticelist()
-    } else if(options.modulecode == 'notice_yh'){
-      wx.setNavigationBarTitle({
-        title: '锦水硬核' 
-      })
-      this.noticeDetail(options.id)
-    } else if(options.modulecode == 'notice_jsdh'){
-      wx.setNavigationBarTitle({
-        title: '锦水导航' 
-      })
-      this.setData({
-        isNeedBanner: false
-      })
-      this.noticelist()
-    } else if(options.modulecode == 'notice_warning'){
-      wx.setNavigationBarTitle({
-        title: "锦水警事" 
-      })
-      this.noticeDetail(options.id)
-    } else if(options.modulecode == 'notice_points_rule'){
-      wx.setNavigationBarTitle({
-        title: '积分规则' 
-      })
-      this.noticelist()
-    }
-  },
-
-  swiperChange: function(e) {
-    wx.createVideoContext('video'+this.data.currentSwiper).pause()
-    this.setData({
-      currentSwiper: e.detail.current,
-      autoplay: true
-    })
-  },  
-  bindplay() {
-    this.setData({
-      autoplay: false
-    })
-    wx.getNetworkType({
-      success (res) {
-        const networkType = res.networkType
-        if (res.networkType != 'wifi') {
-          wx.showToast({
-            title: '当前为非WI-FI环境，请注意流量消耗',
-            icon: 'none',
-            duration: 3000
-          })
-        }
-      }
-    })
-  },
-  bindended() {
-    this.setData({
-      autoplay: true
-    })    
-  },
-  bindcontrolstoggle(e) {
-    this.setData({
-      showTitle: e.detail.show
-    })
-  },
-  videoBannerList () {
-    api.videoBannerList('3').then( res => {
-      this.setData({
-        bannerList: res.data
-      })
-    }).catch(err => {
-      console.log(err)
-    })
-  },
-  noticelist () {
-    let that = this;
-    let params = {
-      pageIndex: that.data.pageIndex,
-      pageSize: that.data.pageSize,
-      noticeCategory: that.data.noticeCategory
-    }
-    api.noticelist(params).then(function (res) {
-      if (res.data.length == 0) {
-        that.setData({
-          nodata: true
-        })
-      } else {
-        that.setData({
-          nodata: false
-        })
-        that.noticeDetail(res.data[0].id)
-      }
-    }).catch(err => {
-      console.log(err)
-    })
-  },
-  noticeDetail (noticeId){
-    let that = this;
-    api.noticeDetail(noticeId).then(function (res) {
-      that.setData({
-        noticeObj: res.data,
-        noticeObjContent: util.formatRichText(res.data.noticeContent),
-        preloadVisible: false
-      })
-
-      console.log(that.data.noticeObj)
-    }).catch(err => {
-      console.log(err)
-    })
-  },
- 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.json b/subpages/understandJs/pages/noticeDetail/noticeDetail.json
deleted file mode 100644
index a93c426..0000000
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "no-data": "../../../../components/nodata/nodata",
-    "parser": "../../../../components/parser/parser"
-  },
-  "navigationBarTitleText": ""
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
deleted file mode 100644
index a5a9995..0000000
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
+++ /dev/null
@@ -1,56 +0,0 @@
-<wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
-<view class="notice-detail" hidden="{{nodata}}">
-  <view class="banner" wx:if="{{isNeedBanner && bannerList.length>0}}">
-    <view class="page-section page-section-spacing swiper">
-      <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
-        <block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-          <swiper-item>
-            <view data-banner="{{item}}">
-              <view class="swiper-item" data-id="{{item.id}}">
-                <!-- <view class="altitle">
-                <view class="altitle-name">{{item.title}}</view>
-              </view>  -->
-                <image wx:if="{{item.imgUrl}}" class="banner" src='{{item.imgUrl}}' mode="aspectFill" />
-                <block wx:elif="{{item.videoUrl}}">
-                  <video id="video{{index}}" src="{{item.videoUrl}}" show-center-play-btn='{{true}}' title="{{item.title}}"  bindcontrolstoggle="bindcontrolstoggle" bindpause="bindended" bindplay='bindplay' bindended='bindended'></video>
-                  <view class="video-title" hidden="{{!showTitle}}">{{item.title}}</view>                
-                </block>
-              </view>
-            </view>
-          </swiper-item>
-        </block>
-      </swiper>
-      <!-- 重置小圆点的样式 -->
-      <view class="dots">
-        <block wx:for="{{ bannerList }}" wx:key="index">
-          <view class="dot {{index == currentSwiper ? ' active' : '' }}"></view>
-        </block>
-      </view>
-    </view>
-  </view>
-  <view class="selfContent" wx:if="{{!preloadVisible}}">
-    <view class="detail-title">{{noticeObj.noticeTitle}}</view>
-    <view class="detail-subtitle">
-      <view class="left">
-        <span>{{noticeObj.deptName}}</span>
-        <span>{{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}</span>
-      </view>
-      <view class="right">
-        <view class="readNum">
-          <image src="../images/ic_yueduliang.png" />
-        </view>
-        <view class="num">{{noticeObj.readingAmount}}</view>
-      </view>
-    </view>
-    <view class="richContent">
-      <!-- <rich-text space="nbsp" nodes="{{noticeObjContent}}"></rich-text> -->
-      <parser html="{{noticeObjContent}}"></parser>
-    </view>
-  </view>
-  <view class="preload" wx:else>
-    <view class="preload-title"></view>
-    <view class="preload-content"></view>
-  </view>
-</view>
-
-<no-data isShow="{{nodata}}"></no-data>
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
deleted file mode 100644
index 62380f9..0000000
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
+++ /dev/null
@@ -1,267 +0,0 @@
-page{
-  background: #f7f7f7;
-}
-.notice-detail {
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  padding: 20rpx;
-  background: #f7f7f7;
-}
-.richContent img{
-  width: 100%!important;
-  height: auto;
-}
-.selfContent {
-  width: 100%;
-  /* display: table; */
-  background: #ffffff;
-  border-radius: 16rpx;
-  box-sizing: border-box;
-  padding: 0 25rpx 38rpx;
-}
-.detail-title {
-  font-family: PingFang-SC-Bold;
-  font-size: 48rpx;
-  font-weight: bold;
-  line-height: 68rpx;
-  color: #333333;
-  padding-top: 40rpx;
-}
-.detail-subtitle {
-  display: flex;
-  width: 100%;
-  justify-content: space-between;
-  font-size: 22rpx;
-  color: #999999;
-  margin-top:45rpx;
-}
-.detail-subtitle .left span:nth-child(1){
-  margin-right: 32rpx;
-}
-.detail-subtitle .right{
-  display: flex;
-  height: 32rpx;
-  line-height: 32rpx;
-}
-.detail-subtitle .right .readNum {
-  /* display: inline-block; */
-  width: 32rpx;
-  height: 32rpx;
-  margin-right: 10rpx;
-}
-.detail-subtitle .right .readNum image{
-  width: 100%;
-  height: 100%;
-  float:left;
-  object-fit: cover;
-}
-.banner {
-  width: 100%;
-  height: 400rpx;
-  margin: 39rpx 0 19rpx 0;
-}
-.banner image{
-  width: 100%;
-  height: 100%;
-  float:left;
-  object-fit: cover;
-  border-radius: 16rpx;
-  overflow: hidden;
-}
-.paragraph {
-  font-size: 38rpx;
-  line-height: 58rpx;
-  color: #333333;
-  text-indent: 76rpx;
-  margin-top:22rpx;
-}
-
-.default {
-  border: 1px solid #eaeaea;
-}
-.default span {
-  color: #999999;
-}
-.active {
-  border: 1px solid #ffab00;
-}
-.active span {
-  color: #ffb700;
-}
-
-/* preload start */
-.preload {
-  width: 100%;
-  background: #fff;
-  box-sizing: border-box;
-  border-radius: 16rpx;
-  padding: 0 24rpx;
-  overflow: hidden;
-  margin-bottom: 20rpx;
-}
-.preload-title {
-  width: 100%;
-  height: 80rpx;
-  border-radius: 8rpx;
-  background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
-  animation: loading 1.4s ease infinite;
-  background-size: 400% 100%;
-  margin-top: 20rpx;
-}
-.preload-content {
-  width: 100%;
-  height: 200rpx;
-  border-radius: 8rpx;
-  background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
-  animation: loading 1.4s ease infinite;
-  background-size: 400% 100%;
-  margin-top: 20rpx;
-}
-@keyframes loading {
-  0% {
-    background-position: 100% 50%
-  }
-
-  100% {
-    background-position: 0 50%
-  }
-}
-/* preload end */
-
-/* 轮播图start */
-
-.altitle {
-  position: absolute;
-  width: 100%;
-  height: 66rpx;
-  background-color: black;
-  margin-top: 237rpx;
-  border-bottom-right-radius: 16rpx;
-  border-bottom-left-radius: 16rpx;
-  opacity: 0.5;
-  font-size: 22rpx;
-  font-weight: 500;
-  color: rgba(255, 255, 255, 1);
-}
-
-.altitle-name {
-  margin: 10rpx 20rpx;
-}
-
-.container {
-  width: 100vw;
-}
-
-.page-body {
-  padding-top: 30rpx;
-  background: #fff;
-  height: 340rpx;
-}
-
-.page-section {
-  width: 100%;
-  margin-bottom: 60rpx;
-}
-
-.page-section_center {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.page-section:last-child {
-  margin-bottom: 0;
-}
-
-.page-section-gap {
-  box-sizing: border-box;
-  padding: 0 30rpx;
-}
-
-.page-section-spacing {
-  box-sizing: border-box;
-  height: 340rpx;
-  background-color: #fff;
-}
-
-.page-section-title {
-  font-size: 28rpx;
-  color: #999;
-  margin-bottom: 10rpx;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-}
-
-.page-section-gap .page-section-title {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.swiper-item {
-  display: block;
-  height: 340rpx;
-}
-
-.swiper-item video {
-  height: 340rpx;
-  width: 100%;
-}
-
-.notice-detail .banner {
-  overflow: hidden;
-  height: 340rpx !important;
-  display: flex;
-  width: 100%;
-  border-radius: 16rpx !important;
-  margin: 0rpx 0rpx 20rpx 0rpx;
-}
-
-.dots {
-  display: flex;
-  justify-content: center;
-  margin-top: -16rpx;
-  z-index: 999;
-  position: relative;
-}
-
-.dots .dot {
-  width: 8rpx;
-  height: 8rpx;
-  border-radius: 8rpx;
-  margin-left: 10rpx;
-  background: #d2d5da;
-  transition: all 0.3s;
-}
-
-.dots .dot.active {
-  width: 24rpx;
-  background: #fff;
-}
-
-.page-section-title {
-  margin-top: 60rpx;
-  position: relative;
-}
-
-swiper {
-  height: 340rpx;
-  box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
-  border-radius: 16rpx;
-  overflow: hidden;
-  -webkit-backface-visibility: hidden;
-  -webkit-transform: translate3d(0, 0, 0);
-}
-
-.video-title {
-  width: 100%;
-  height: 50rpx;
-  line-height: 50rpx;
-  padding-left: 40rpx;
-  color: white;
-  background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
-  background: -webkit-linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
-  position: absolute;
-  top: 0;
-}
-/* 轮播图end */
\ No newline at end of file
diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.js b/subpages/understandJs/pages/sclerotia/sclerotia.js
deleted file mode 100644
index 13eb6a6..0000000
--- a/subpages/understandJs/pages/sclerotia/sclerotia.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// subpages/understandJs/pages/sclerotia/sclerotia.js
-const api = require("../../../../utils/understandJs")
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    pageIndex: 1,
-    pageSize: 10,
-    sclerotialist: [],
-    nodata: false,
-    loadMoreType: "none",
-    loadMoreVisible: false,
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.getSclerotiaList()
-  },
-  
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.setData({
-      loadMoreVisible: true
-    })
-    if (this.data.loadMoreType === 'loading') {
-      this.setData({
-        pageIndex: this.data.pageIndex + 1,
-        pageSize: this.data.pageSize,
-      })
-      this.getSclerotiaList()
-    }
-  },
-
-  getSclerotiaList: function() {
-    let that = this
-    let para = {
-      pageIndex: this.data.pageIndex,
-      pageSize: this.data.pageSize,
-      noticeCategory: 'notice_yh'
-    }
-    api.noticelist(para).then(function(res) {
-      that.setData({
-        sclerotialist: that.data.sclerotialist.concat(res.data),
-        loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
-      })
-      if (that.data.sclerotialist.length == 0) {
-        that.setData({
-          nodata: true,
-          loadMoreType: 'none',
-          loadMoreVisible: false
-        })
-      }
-    }).catch(() => {
-      that.setData({
-        nodata: true,
-        loadMoreType: "none",
-        loadMoreVisible: false,
-        sclerotialist: []
-      })
-    })
-  },
-
-  toDetail (e) {
-    wx.navigateTo({
-      url: '../noticeDetail/noticeDetail?modulecode=notice_yh&id=' + e.currentTarget.dataset.id
-    })
-  }
-})
\ No newline at end of file
diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.json b/subpages/understandJs/pages/sclerotia/sclerotia.json
deleted file mode 100644
index 53f3504..0000000
--- a/subpages/understandJs/pages/sclerotia/sclerotia.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "锦水硬核",
-  "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore",
-    "no-data":"../../../../components/nodata/nodata"
-  }
-}
\ No newline at end of file
diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxml b/subpages/understandJs/pages/sclerotia/sclerotia.wxml
deleted file mode 100644
index a44cd86..0000000
--- a/subpages/understandJs/pages/sclerotia/sclerotia.wxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
-<!-- 列表 -->
-<view class="list-all">
-    <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" data-id="{{item.id}}" bindtap="toDetail">
-        <image src="{{item.imgUrl}}"></image>
-        <view class="item-info">
-        <view class="item-info-name">{{item.noticeTitle}}
-        </view>
-        <view class="item-info-time">
-            <text>{{item.deptName}}</text>
-            <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
-        </view>
-        </view>
-    </view>
-</view>
- <!--加载更多提示-->
-<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
-
-<no-data isShow="{{nodata}}"></no-data>
\ No newline at end of file
diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxss b/subpages/understandJs/pages/sclerotia/sclerotia.wxss
deleted file mode 100644
index 84488fe..0000000
--- a/subpages/understandJs/pages/sclerotia/sclerotia.wxss
+++ /dev/null
@@ -1,86 +0,0 @@
-page {
-    background: #f7f7f7;
-}
-
-/* 列表样式 */
-
-.list-all {
-    /* width: calc(100% - 48rpx);
-    margin-left: 21rpx; 
-    margin-top: 50rpx;*/
-    width: 100%;
-    background-color: #fff;
-  }
-  
-  .list-all .list-item {
-    border-bottom: 1rpx solid #eaeaea;
-    margin-top: 16rpx;
-    padding: 40rpx 18rpx 30rpx 16rpx;
-    display: flex;
-    /* align-items: center; */
-  }
-  
-  .list-all .list-item:first-child {
-    border-top: 1rpx solid #eaeaea;
-  }
-  
-  .list-all .list-item:last-child {
-    border-bottom: none;
-  }
-  
-  .list-all .list-item .item-info {
-    width: calc(100% - 220rpx);
-    height: 146rpx;
-    position: relative;
-  }
-  
-  .list-all .list-item .item-info .item-info-name {
-    width: calc(100% - 47rpx);
-    font-size: 32rpx;
-    font-weight: 500;
-    color: rgba(63, 63, 63, 1);
-    line-height: 50rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    margin: 0 auto;
-  }
-  
-  .list-all .list-item .item-info .item-info-time {
-    width: calc(100% - 47rpx);
-    height: 22rpx;
-    position: absolute;
-    bottom: 5rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    left: 22rpx;
-  }
-  
-  .list-all .list-item .item-info .item-info-time text {
-    font-size: 22rpx;
-    font-weight: 500;
-    color: rgba(170, 170, 170, 1);
-    line-height: 22rpx;
-  }
-  
-  .list-all .list-item image {
-    width: 220rpx;
-    height: 146rpx;
-    border-radius: 10rpx;
-  }
-  
-  .list-all .list-item .label {
-    position: absolute;
-    z-index: 999;
-    width: 34rpx;
-    height: 34rpx;
-    right: 45rpx;
-  }
-  
-  .list-all .list-item .label image {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-  }
\ No newline at end of file
diff --git a/utils/config.js b/utils/config.js
index 7f4183f..08b329f 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -8,7 +8,7 @@ module.exports = {
 function BASEURL() {
   // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
-  // return 'http://10.211.55.2:9094/epdc-api/api/'
+  // return 'http://192.168.43.8:9094/epdc-api/api/'
 }
 
 function WEBROOT() {