Merge branch 'feature-xxx' into dev

pages/projectModule/applyCode/applyCode.js

@@ -88,7 +88,6 @@ Page({
             icon: 'success',
             duration: 1000
           });
-          wx.hideLoading()
           setTimeout(() => {
             wx.navigateBack();
           }, 1000);
@@ -97,7 +96,6 @@ Page({
             title: res.data.message || '申请失败',
             icon: 'none'
           });
-          wx.hideLoading()
         }
       },
       fail: () => {

pages/projectModule/projectList/projectList.js

@@ -64,4 +64,31 @@ Page({
       url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0`
     });
   },
+
+/**
+* 页面相关事件处理函数--监听用户下拉动作
+*/
+onPullDownRefresh: function () {
+  this.onRefresh();
+},
+onRefresh:function(){
+  //导航条加载动画
+  wx.showNavigationBarLoading()
+  //loading 提示框
+  wx.showLoading({
+    title: '加载中...',
+  })
+  console.log("下拉刷新啦");
+  this.onLoad()
+  setTimeout(function () {
+    wx.hideLoading();
+    wx.hideNavigationBarLoading();
+    //停止下拉刷新
+    wx.stopPullDownRefresh();
+  }, 1000)
+},
+
+
+
+
 });

pages/projectModule/projectList/projectList.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "接单列表",
-  "usingComponents": {}
+  "usingComponents": {},
+  "enablePullDownRefresh": true
 }

pages/projectModule/subSettlement/subSettlement.js

@@ -32,7 +32,7 @@ Page({
   fetchSettlementData() {
     const token = wx.getStorageSync('token');  // 从本地存储获取 token
     const data = {
-      id: 5
+      id: this.data.id
     };
     wx.request({
       url: baseUrl + '/projectSettlement/query/settle',

pages/projectModule/userProject/userProject.wxss

@@ -5,15 +5,12 @@
   margin-left: 5.63rpx;
 }
 .page {
-  background-color: #f5f5f5;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.list {
   padding: 54.38rpx 37.5rpx 200.63rpx;
   background-image: linear-gradient(180deg, #ff8d1a -24.5%, #ff8d1a00 57.4%);
+  background-color: #f5f5f5;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 .list-item {
   padding: 30rpx 26.25rpx;