diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml
index 2ebacac..0f529da 100644
--- a/components/activity/activity.wxml
+++ b/components/activity/activity.wxml
@@ -12,7 +12,7 @@
       <view class="user-state" wx:if="{{item.actCurrentState=='4'}}">已结束</view>
       <view class="user-state" wx:if="{{item.actCurrentState=='5'}}">已取消</view>
     </view>
-    <view class="infos">
+    <view class="infos"><view class="infos-flex">
       <view class="infos_title">{{item.title}}</view>
       <view class="infos_times">
         <view>
@@ -29,9 +29,10 @@
     
         <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
         <span wx:else class="total">活动名额 {{item.actQuota}}人</span>
-        <span class="signed">已报名 {{item.signupNum}}人</span>
+        <!-- <span class="signed">已报名 {{item.signupNum}}人</span> -->
+        <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/20/rBAB718X06CAfNqkAABIcXHcQv0363.png" />
       </view>
-    </view>
+    </view></view>
   </view>
   <image class="signed-logo" wx:if="{{item.signupFlag=='1'}}" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A-CAIEeKAABSBTxj8ns662.png" />
 </view>
diff --git a/components/activity/activity.wxss b/components/activity/activity.wxss
index 497826d..c0662df 100644
--- a/components/activity/activity.wxss
+++ b/components/activity/activity.wxss
@@ -86,10 +86,15 @@
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
 }
-
+.infos .infos-flex {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;  
+}
 .infos .infos_times {
   font-size: 24rpx;
-  height: 90rpx;
+  height: 98rpx;
   overflow: hidden;
   color: #a8a8a8;
 }
@@ -125,7 +130,13 @@
 .infos .infos_nums {
   height: 40rpx;
   width: 100%;
-  display: table;
+  display: flex;
+  justify-content: space-between;
+  margin: 10rpx 0rpx;
+}
+.infos_nums image {
+  width: 150rpx;
+  height: 42rpx;
 }
 
 .loadmore {
@@ -145,7 +156,7 @@
   height: 40rpx;
   line-height: 40rpx;
   border-radius: 20rpx;
-  margin: 10rpx 20rpx 0rpx 0rpx;
+  /* margin: 10rpx 20rpx 0rpx 0rpx; */
   float: left;
 }
 
diff --git a/images/mine/bg-mine.png b/images/mine/bg-mine.png
index 931e887..211d5e4 100644
Binary files a/images/mine/bg-mine.png and b/images/mine/bg-mine.png differ
diff --git a/pages/discussion/components/projectItem/projectItem.wxml b/pages/discussion/components/projectItem/projectItem.wxml
index aa8df4e..2e93211 100644
--- a/pages/discussion/components/projectItem/projectItem.wxml
+++ b/pages/discussion/components/projectItem/projectItem.wxml
@@ -6,7 +6,7 @@
       <view class="name">{{projectObj.nickname}}</view>
       <image class="dang" wx:if="{{projectObj.partyFlag == '1'}}" src="../../../../images/mine/ic_dangbiaoqian.png" />
     </view>
-    <view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#2CD0B7' : '#FFC438'}}">{{projectObj.stateName}}</view>
+    <view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#4E9BF2' : '#FFC438'}}">{{projectObj.stateName}}</view>
   </view>
 
   <view class="content">{{projectObj.itemContent}}</view>
diff --git a/pages/discussion/components/projectItem/projectItem.wxss b/pages/discussion/components/projectItem/projectItem.wxss
index f773c85..a11a348 100644
--- a/pages/discussion/components/projectItem/projectItem.wxss
+++ b/pages/discussion/components/projectItem/projectItem.wxss
@@ -23,7 +23,7 @@
 .project-item .header .info .avatar {
   width: 64rpx;
   height: 64rpx;
-  border-radius: 8rpx;
+  border-radius: 50%;
   object-fit: cover;
 }
 .project-item .header .info .name {
@@ -44,7 +44,7 @@
   font-size: 22rpx;
   border-radius: 16rpx;
   text-align: center;
-  padding: 0 10rpx;
+  padding: 0 8rpx;
 }
 
 .project-item .content {
diff --git a/pages/discussion/discussion.wxml b/pages/discussion/discussion.wxml
index 8bfffdd..9f5512b 100644
--- a/pages/discussion/discussion.wxml
+++ b/pages/discussion/discussion.wxml
@@ -24,9 +24,13 @@
     <project-list id="projectlist" bind:getProjectComponent="getProjectComponent"></project-list>
   </view>
 
-  <view class="addIssue" bindtap="addIssue">
-    <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717LnkmAK5OyAAF05Azead8157.png" />
-  </view>
+<movable-area class="movable-area">
+   <movable-view class="movable-view" direction="all" inertia="true" friction="10">
+      <view class="addIssue" bindtap="addIssue">
+        <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717LnkmAK5OyAAF05Azead8157.png" />
+      </view>
+   </movable-view>
+ </movable-area>
 </view>
 
 <completeInfo-dialog
diff --git a/pages/discussion/discussion.wxss b/pages/discussion/discussion.wxss
index fdbe04e..b7212f3 100644
--- a/pages/discussion/discussion.wxss
+++ b/pages/discussion/discussion.wxss
@@ -103,9 +103,9 @@ page {
 .addIssue {
   width: 196rpx;
   height: 232rpx;
-  position: fixed;
+  /* position: fixed;
   bottom: 30%;
-  right: 14rpx;
+  right: 14rpx; */
 }
 
 .addIssue image {
@@ -159,4 +159,27 @@ button::after {
 
 .tab-v2 .hover-btn {
   box-shadow: 0px 0px 10px 0px rgba(188, 0, 5, 0.22);
+}
+
+.movable-area{
+  pointer-events:none;
+  z-index: 100;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.movable-view{ 
+  pointer-events:auto;
+  width: 196rpx;
+  height: 232rpx;
+  transform: translateX(560rpx) translateY(680rpx) translateZ(0rpx) scale(1);
+  transform-origin: center center;
+  will-change: auto;
+  position: absolute;
+  top: 650rpx;
+  left: 560rpx;
 }
\ No newline at end of file
diff --git a/pages/heartNew/components/volunteer/volunteer.wxss b/pages/heartNew/components/volunteer/volunteer.wxss
index 4f5eae1..56a2ccd 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxss
+++ b/pages/heartNew/components/volunteer/volunteer.wxss
@@ -30,6 +30,7 @@
   /* font-weight:500; */
   color:rgba(193,193,193,1);
   padding: 0 20rpx;
+  text-align: center;
 }
 
 .show {
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index cac9cbc..32f6485 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -35,6 +35,7 @@ Page({
     listLength:0,//数据长度判断是否需要加载
     getImgUrl:"",
     ifClickImage:false,//因为志友多多点击图片查看大图，会出现列表刷新的bug，所以加这个字段进行控制
+    tabFixed: false
   },
 
   /**
@@ -364,5 +365,24 @@ Page({
         }
       }
     })
+  },
+  onPageScroll: function (ev) {
+    var _this = this;
+    if (ev.scrollTop <= 0) {
+      ev.scrollTop = 0;
+    } else if (ev.scrollTop > wx.getSystemInfoSync().windowHeight) {
+      ev.scrollTop = wx.getSystemInfoSync().windowHeight;
+    }
+    if (ev.scrollTop > 210 || ev.scrollTop == wx.getSystemInfoSync().windowHeight) {
+      //向下滚动
+      this.setData({
+        tabFixed: true
+      })
+    } else {
+      //向上滚动
+      this.setData({
+        tabFixed: false
+      })
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index 26cd795..15c6845 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -54,7 +54,7 @@
   </view>
 </view>
 <view class="tab-all">
-  <view class="tab-bar">
+  <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">
       订单多多
     </view>
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index 527694f..de938dd 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -307,7 +307,10 @@ button:last-child {
   align-items: center;
   position: relative;
 }
-
+.tab-bar-fixed {
+  position: fixed;
+  top: 0rpx;
+}
 .tab-bar .tab {
   font-size: 34rpx;
   font-weight: 500;
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index f52e880..3d891c5 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -83,7 +83,7 @@ Page({
         this.loadGridList()
         this.getBannerList()
         this.getFirstInfo()
-        this.getNoticeList()
+        // this.getNoticeList() //wxml 未启用
         this.getIssueList()
         this.getProjectList()
         this.setData({
@@ -129,9 +129,9 @@ Page({
     }, 700)
     // 检查版本更新
     checkoutVersion()
-
-    // 获取默认网格
-    this.getResidentConfig()
+  },
+  //获取首页电话
+  getHomePhone () {
     api.getHomePhone().then( res => {
       if (res.code === 0 && res.msg === "success") {
         this.data.homePagePhone = res.data[0]
@@ -353,14 +353,16 @@ Page({
                     })
                   }
                   wx.removeStorageSync("shareObj")
-                }
-                  that.loadGridList()
-                  that.getBannerList()
-                  that.getFirstInfo()
-                  that.getNoticeList()
-                  that.getNewsList()
-                  that.getIssueList()
-                  that.getProjectList()
+                }    
+                that.getResidentConfig()
+                that.getHomePhone()
+                that.loadGridList()
+                that.getBannerList()
+                that.getFirstInfo()
+                // that.getNoticeList()
+                that.getNewsList()
+                that.getIssueList()
+                that.getProjectList()
               }
             }
           })
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 89b3998..27124e0 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -98,7 +98,7 @@
         <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BqiAGT25AADji64eXU8518.png'></image>
       </button>
       <button bindtap="dqhd" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
-        <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169FteAZi7IAACvNYI5st0319.png'></image>
+        <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/20/rBAB718WnlCAPHjJAAColqHIvEM767.png'></image>
         <!-- <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161Bt2ALFoDAADqKvNuMrQ441.png'></image> -->
       </button>
     </view>
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 58786de..413660d 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -20,8 +20,8 @@
           <view class="complete-info" bindtap="navigateToComplete">
             <image class="complete-image" src="../../images/mine/wanshanxinxi.png" />
             <view class="complete-content">
-              <view wx:if="{{changeName}}" class="tip">完善个人信息</view>
-              <view wx:else class="tip">更改个人信息</view>
+              <view wx:if="{{changeName}}" class="tip">完善信息</view>
+              <view wx:else class="tip">更改信息</view>
               <image class="rightsword" src="../../images/mine/mine-rightsword.png" />
             </view>
           </view>
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 7b04f38..3a2ac28 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -53,7 +53,7 @@ page {
 .personal-info .box .content .top {
   margin-top: 30rpx;
   box-sizing: border-box;
-  padding-left: 30rpx;
+  padding-left: 40rpx;
   width: 100%;
   height: 100rpx;
   display: flex;
@@ -112,9 +112,10 @@ page {
   object-fit: cover;
 }
 .personal-info .box .content .top .complete-info {
-  width: 190rpx;
+  width: 142rpx;
   height: 46rpx;
   position: relative;
+  margin-right: 14rpx;
 }
 .personal-info .box .content .top .complete-info .complete-image {
   position: absolute;
@@ -137,12 +138,13 @@ page {
   color: #fff;
   height: 46rpx;
   line-height: 46rpx;
+  margin-left: 10rpx;
 }
 .personal-info .box .content .top .complete-info .complete-content .rightsword {
   width: 14rpx;
   height: 18rpx;
   object-fit: cover;
-  margin-left: 9rpx;
+  margin-left: 8rpx;
 }
 .personal-info .box .content .bottom {
   margin-top: 30rpx;
@@ -193,15 +195,15 @@ page {
   background: #f3f3f3;
 }
 .tab-bar .type.selected-issue {
-  color: #F82525;
+  color: #C81408;
   font-weight: bolder;
 }
 .tab-bar .type.selected-project {
-  color: #F82525;
+  color: #C81408;
   font-weight: bolder;
 }
 .tab-bar .type.selected-topic {
-  color: #F82525;
+  color: #C81408;
   font-weight: bolder;
 }
 .tab-bar .select-bar {
@@ -210,7 +212,7 @@ page {
   left: 0;
   width: 80rpx;
   height: 6rpx;
-  background: #f95454;
+  background: #C81408;
   border-radius: 4rpx;
   transition: left 0.5s ease;
 }
@@ -277,7 +279,7 @@ page {
   border: 0;
   color: #fff;
   font-size: 22rpx;
-  background: linear-gradient(to right, #f51111, #ff4b4b);
+  background: linear-gradient(to right, #C81408, #f51111);
 }
 .issue-list .issue-nodata .add-issue button::after {
   border: 0;
@@ -336,7 +338,7 @@ page {
   border: 0;
   color: #fff;
   font-size: 22rpx;
-  background: linear-gradient(to right, #f51111, #ff4b4b);
+  background: linear-gradient(to right, #C81408, #f51111);
 }
 .project-list .project-nodata .add-issue button::after {
   border: 0;
diff --git a/project.config.json b/project.config.json
index 289ecc3..4351ed7 100644
--- a/project.config.json
+++ b/project.config.json
@@ -10,22 +10,22 @@
 		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
-		"autoAudits": false,
 		"coverView": true,
+		"autoAudits": false,
 		"showShadowRootInWxmlPanel": true,
 		"scopeDataCheck": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"compileHotReLoad": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
index 6c1f0ac..c40d107 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxml
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -65,10 +65,14 @@
 <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 <no-data isShow="{{nodata}}"></no-data>
 <!-- 是否禁言 0：否 1：是 -->
-<view wx:if="{{bannedFlag == '0'}}" class="addIssue" bindtap="navigateToAddTopic">
-	<image wx:if="{{topicType == '0'}}" src="../../images/new_topic.png" />
-	<image wx:else src="../../images/new_topic.png" />
-</view>
 
+<movable-area class="movable-area">
+   <movable-view class="movable-view" direction="all" inertia="true" friction="10">
+		<view wx:if="{{bannedFlag == '0'}}" class="addIssue" bindtap="navigateToAddTopic">
+			<image wx:if="{{topicType == '0'}}" src="../../images/new_topic.png" />
+			<image wx:else src="../../images/new_topic.png" />
+		</view>
+   </movable-view>
+ </movable-area>
 <completeInfo-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}">
 </completeInfo-dialog>
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
index a7f1411..dfd7310 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxss
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -11,7 +11,7 @@ page {
 }
 
 .user-info {
-  width: calc(100% - 58rpx);
+  /* width: calc(100% - 58rpx); */
   height: 64rpx;
   display: flex;
   align-items: center;
@@ -32,7 +32,7 @@ page {
 
 .user-info .name-date .name {
   font-size: 28rpx;
-  font-weight: bold;
+  /* font-weight: bold; */
   color: rgba(51, 51, 51, 1);
   display: flex;
   align-items: center;
@@ -52,11 +52,9 @@ page {
 }
 
 .details-info {
-  width: calc(100% - 58rpx);
-  font-size: 36rpx;
-  font-weight: 500;
+  /* width: calc(100% - 58rpx); */
+  font-size: 32rpx;
   color: rgba(51, 51, 51, 1);
-  line-height: 54rpx;
   word-break: break-all;
 }
 
@@ -76,14 +74,13 @@ page {
 }
 
 .attitude {
-  width: calc(100% - 300rpx);
+  /* width: calc(100% - 300rpx); */
   margin: 21rpx 0rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
   /* justify-content: center; */
   height: 28rpx;
-  padding: 0 50rpx;
 }
 
 .attitude .all {
@@ -139,7 +136,7 @@ page {
 }
 
 .likes {
-  width: calc(100% - 98rpx);
+  /* width: calc(100% - 98rpx); */
   padding: 24rpx 20rpx 12rpx 20rpx;
   background: #F2F2F2;
   border-radius: 8rpx;
@@ -157,7 +154,7 @@ page {
 }
 
 .comment {
-  width: calc(100% - 98rpx);
+  /* width: calc(100% - 98rpx); */
   padding: 12rpx 20rpx 24rpx 20rpx;
   background: #F2F2F2;
   border-radius: 8rpx;
@@ -262,9 +259,9 @@ page {
 .addIssue {
   width: 178rpx;
   height: 178rpx;
-  position: fixed;
+  /* position: fixed;
   bottom: 30%;
-  right: 14rpx;
+  right: 14rpx; */
 }
 
 .addIssue image {
@@ -284,7 +281,7 @@ page {
   font-size: 32rpx;
   font-family: PingFang SC;
   font-weight: bold;
-  color: rgba(51, 51, 51, 1);
+  color: rgba(255, 51, 51, 1);
   line-height: 94rpx;
   position: absolute;
   left: 29rpx;
@@ -303,4 +300,26 @@ page {
   margin: 0;
   position: absolute;
   top: 30rpx;
+}
+.movable-area{
+  pointer-events:none;
+  z-index: 100;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.movable-view{ 
+  pointer-events:auto;
+  width: 178rpx;
+  height: 178rpx;
+  transform: translateX(560rpx) translateY(680rpx) translateZ(0rpx) scale(1);
+  transform-origin: center center;
+  will-change: auto;
+  position: absolute;
+  top: 650rpx;
+  left: 560rpx;
 }
\ No newline at end of file
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index 953bd3b..32d8470 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -101,7 +101,7 @@ button::after {
     width: 100%;
     box-sizing: border-box;
     background: #fff;
-    margin-top: 17rpx;
+    margin-top: 4rpx;
     /* padding: 0 30rpx; */
 }
 .padding{