From 70d02391bf7cae7828b17f9a8758cc1bb7b07abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Thu, 27 Feb 2025 17:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cs-bottom-wrapper/index.vue |  2 +-
 components/cs-dict-tag/index.vue       |  6 ++--
 components/cs-emty/index.vue           | 50 ++++++++++++++++++++++++++
 components/cs-text-more/index.vue      |  4 +--
 config.js                              | 15 ++++----
 pages/enterprise.vue                   | 39 ++++++++++----------
 pages/index.vue                        | 41 +++++++++++++--------
 pages/login.vue                        |  2 +-
 pages/owner.vue                        |  6 ++--
 pages/task.vue                         | 29 +++++++--------
 sub/enterprise/detail.vue              |  5 ++-
 sub/task/detail.vue                    |  2 ++
 sub/task/record.vue                    |  6 ++--
 13 files changed, 136 insertions(+), 71 deletions(-)
 create mode 100644 components/cs-emty/index.vue

diff --git a/components/cs-bottom-wrapper/index.vue b/components/cs-bottom-wrapper/index.vue
index 5ecdfeb..3af6bdf 100644
--- a/components/cs-bottom-wrapper/index.vue
+++ b/components/cs-bottom-wrapper/index.vue
@@ -29,7 +29,7 @@ export default {
   z-index: 99;
   border-top: 1px solid #f1f1f4;
   .safe {
-    height: 20px;
+    height: 40rpx;
   }
 }
 </style>
diff --git a/components/cs-dict-tag/index.vue b/components/cs-dict-tag/index.vue
index 519a4f8..be22cb7 100644
--- a/components/cs-dict-tag/index.vue
+++ b/components/cs-dict-tag/index.vue
@@ -97,9 +97,9 @@ export default {
   color: #99a1b7;
 }
 .dict-tag {
-  min-width: 100px;
+  min-width: 200rpx;
   text-align: center;
-  font-size: 12px;
-  padding: 4px 20px;
+  font-size: 24rpx;
+  padding: 16rpx 40rpx;
 }
 </style>
diff --git a/components/cs-emty/index.vue b/components/cs-emty/index.vue
new file mode 100644
index 0000000..fb7cf69
--- /dev/null
+++ b/components/cs-emty/index.vue
@@ -0,0 +1,50 @@
+<template>
+  <view class="cs-empty" :style="{ marginTop: marginTop + 'rpx' }">
+    <image
+      class="empty-image"
+      src="/static/images/emty.png"
+      mode="aspectFit"
+    />
+    <text class="empty-text">{{ text }}</text>
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'cs-empty',
+  props: {
+    // 显示的文字
+    text: {
+      type: String,
+      default: '暂无数据'
+    },
+    // 上边距
+    marginTop: {
+      type: Number,
+      default: 0
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.cs-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background-color: #fff;
+  height: 856rpx;
+  border-radius: 24rpx;
+  gap: 24rpx;
+  .empty-image {
+    width: 158rpx;
+    height: 158rpx;
+  }
+  .empty-text {
+    font-size: 32rpx;
+    color: #99a1b7;
+  }
+}
+</style>
diff --git a/components/cs-text-more/index.vue b/components/cs-text-more/index.vue
index b63fff0..bb90a7a 100644
--- a/components/cs-text-more/index.vue
+++ b/components/cs-text-more/index.vue
@@ -2,7 +2,7 @@
   <view :style="{ color }">
     <view
       style="
-        font-size: 13px;
+        font-size: 26rpx;
         line-height: 160%;
         position: relative;
         transform: 0.2s all;
@@ -15,7 +15,7 @@
     <view
       v-else
       style="
-        font-size: 13px;
+        font-size: 26rpx;
         line-height: 160%;
         position: relative;
         transform: 0.2s all;
diff --git a/config.js b/config.js
index 2c2a87c..d098f7a 100644
--- a/config.js
+++ b/config.js
@@ -1,21 +1,22 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'http://188.188.3.166:48080',
+	// baseUrl: 'http://188.188.5.188:48080',
 	// baseUrl: 'https://hb.jzce.com',
 	baseUrl: 'http://188.188.3.232:48080',
+	// baseUrl: 'http://localhost:48080',
 	baseApi: '/admin-api',
 	imgUrl: 'https://hb.jzce.com',
 	// 应用信息
 	appInfo: {
 		// 应用名称
-		name: "nature-secure-miniapp",
+		name: 'nature-secure-miniapp',
 		// 应用版本
-		version: "1.0.0",
+		version: '1.0.0',
 		// 应用logo
-		logo: "/static/logo.png",
+		logo: '/static/logo.png',
 		// 官方网站
-		site_url: "",
+		site_url: '',
 		// 政策协议
-		agreements: []
-	}
+		agreements: [],
+	},
 }
\ No newline at end of file
diff --git a/pages/enterprise.vue b/pages/enterprise.vue
index d8e7267..671aefe 100644
--- a/pages/enterprise.vue
+++ b/pages/enterprise.vue
@@ -116,8 +116,9 @@
           :status="load"
           marginTop="12"
           marginBottom="12"
-          v-if="load == 'nomore'"
+          v-if="load !== 'nomore'"
         />
+        <cs-emty v-if="list.length == 0"></cs-emty>
       </scroll-view>
     </view>
   </cs-page>
@@ -320,18 +321,18 @@ export default {
 .list {
   display: flex;
   flex-flow: column nowrap;
-  gap: 12px;
-  padding: 0 12px;
+  gap: 24rpx;
+  padding: 0 24rpx;
 }
 .enterprise {
-  padding: 12px;
+  padding: 24rpx;
   background-color: #fff;
   border-radius: $cs-border-radius;
-  gap: 12px;
-  margin-top: 12px;
+  gap: 24rpx;
+  margin-top: 24rpx;
   position: relative;
   overflow: hidden;
-  font-size: 12px;
+  font-size: 24rpx;
   .address {
     color: $uni-text-color-grey;
   }
@@ -339,40 +340,40 @@ export default {
     background-color: $cs-color-touch;
   }
   .tagList {
-    margin-top: 8px;
+    margin-top: 16rpx;
     display: flex;
-    gap: 4px;
+    gap: 8rpx;
     color: $uni-text-color-grey;
     flex-flow: row wrap;
     .tag {
-      font-size: 12px;
+      font-size: 24rpx;
       display: flex;
-      padding: 2px 6px;
+      padding: 4rpx 12rpx;
       justify-content: center;
       align-items: center;
-      border-radius: 2px;
+      border-radius: 4rpx;
       background: #f9f9f9;
     }
   }
   .audit {
     position: absolute;
-    right: -19px;
-    top: 6px;
+    right: -38rpx;
+    top: 12rpx;
     transform: rotateZ(45deg);
     transform-origin: 50% 50%;
-    padding: 4px 20px;
-    font-size: 12px;
+    padding: 8rpx 40rpx;
+    font-size: 24rpx;
     text-align: center;
   }
 }
 ::v-deep .van-dropdown-menu {
   box-shadow: none;
-  height: 35px;
-  font-size: 13px;
+  height: 70rpx;
+  font-size: 26rpx;
   border-bottom: 1px solid #f1f1f4;
 }
 
 ::v-deep .u-list {
-  padding: 12px;
+  padding: 24rpx;
 }
 </style>
diff --git a/pages/index.vue b/pages/index.vue
index d53cdac..682c208 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -287,8 +287,12 @@ export default {
       const res = await HomeApi.getPieData(this.queryParams)
       this.detail = res.data
       let curIndex = 0
+      const split = 1 / this.detail.completionRate.length
       const data = this.detail.completionRate.map((item, index) => {
-        const res = { ...item, color: this.color[curIndex] }
+        const res = {
+          ...item,
+          color: `rgba(4, 180, 64,${split * (index + 1)})`
+        }
         curIndex > this.color.length ? 0 : curIndex++
         return res
       })
@@ -384,6 +388,13 @@ export default {
       } else {
         e.detail.callback(true)
       }
+    },
+    numFilter(value) {
+      // 先保留三位小数
+      let tempVal = parseFloat(value).toFixed(3)
+      // 然后截取前两位小数
+      let realVal = tempVal.substring(0, tempVal.length - 1)
+      return realVal
     }
   }
 }
@@ -394,25 +405,25 @@ export default {
   height: 100%;
 }
 .view {
-  padding: 0 12px;
-  padding-bottom: 12px;
+  padding: 0 24rpx;
+  padding-bottom: 24rpx;
   display: flex;
-  gap: 12px;
+  gap: 24rpx;
   flex-flow: column nowrap;
   .box {
-    padding: 12px;
+    padding: 24rpx;
     background-color: #fff;
-    border: 1px solid #f9f9f9;
-    border-radius: 12px;
-    margin-top: 12px;
+    border: 2rpx solid #f9f9f9;
+    border-radius: 24rpx;
+    margin-top: 24rpx;
     &:last-child {
-      margin-bottom: 12px;
+      margin-bottom: 24rpx;
     }
   }
   .row-1 {
     display: flex;
     flex-flow: column nowrap;
-    gap: 12px;
+    gap: 24rpx;
   }
   .people-name {
     max-width: 4rem;
@@ -423,7 +434,7 @@ export default {
   }
   .tab {
     position: relative;
-    padding: 4px 16px;
+    padding: 16rpx 32rpx;
     .name {
       z-index: 2;
       position: inherit;
@@ -434,7 +445,7 @@ export default {
       position: absolute;
       inset: 0;
       background-color: #fff;
-      border-radius: 2px;
+      border-radius: 4rpx;
       transform: translateX(calc(var(--index) * 100%));
       transition: 0.2s all;
       z-index: 1;
@@ -443,8 +454,8 @@ export default {
 }
 ::v-deep .van-dropdown-menu {
   box-shadow: none;
-  height: 35px !important;
-  font-size: 13px;
-  border-bottom: 1px solid #f1f1f4;
+  height: 70rpx !important;
+  font-size: 26rpx;
+  border-bottom: 2rpx solid #f1f1f4;
 }
 </style>
diff --git a/pages/login.vue b/pages/login.vue
index 2f68d56..8149689 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -131,7 +131,7 @@ export default {
   justify-content: center;
   align-items: center;
   flex-flow: column nowrap;
-  gap: 20px;
+  gap: 40rpx;
   background: var(--LightMode-Success-Success, #17c653);
 
   .title {
diff --git a/pages/owner.vue b/pages/owner.vue
index 20b5cf0..785e66c 100644
--- a/pages/owner.vue
+++ b/pages/owner.vue
@@ -221,14 +221,14 @@ export default {
 .header {
   display: flex;
   flex-flow: row nowrap;
-  gap: 10px;
+  gap: 20rpx;
   align-items: center;
   .title {
-    font-size: 16px;
+    font-size: 32rpx;
   }
 }
 .owner-container {
-  padding: 10px;
+  padding: 20rpx;
   height: 100%;
   .section {
     border-radius: $cs-border-radius;
diff --git a/pages/task.vue b/pages/task.vue
index f444d5f..676c005 100644
--- a/pages/task.vue
+++ b/pages/task.vue
@@ -128,8 +128,9 @@
           :status="load"
           marginTop="12"
           marginBottom="12"
-          v-if="load == 'nomore'"
+          v-if="load !== 'nomore'"
         />
+        <cs-emty v-if="list.length == 0"></cs-emty>
       </scroll-view>
     </view>
   </cs-page>
@@ -307,17 +308,17 @@ export default {
   overflow: hidden;
 }
 .list {
-  padding: 0 12px;
+  padding: 0 24rpx;
 }
 .enterprise {
-  padding: 12px;
+  padding: 24rpx;
   background-color: #fff;
   border-radius: $cs-border-radius;
-  gap: 12px;
-  margin-top: 12px;
+  gap: 24rpx;
+  margin-top: 24rpx;
   position: relative;
   overflow: hidden;
-  font-size: 12px;
+  font-size: 24rpx;
   &:active {
     background-color: $cs-color-touch;
   }
@@ -325,18 +326,18 @@ export default {
     color: $uni-text-color-grey;
   }
   .tagList {
-    margin-top: 8px;
+    margin-top: 16rpx;
     display: flex;
-    gap: 4px;
+    gap: 8rpx;
     color: $uni-text-color-grey;
     display: flex;
     .tag {
-      font-size: 12px;
+      font-size: 24rpx;
       display: flex;
-      padding: 2px 6px;
+      padding: 4rpx 12rpx;
       justify-content: center;
       align-items: center;
-      border-radius: 2px;
+      border-radius: 4rpx;
       background: #f9f9f9;
     }
   }
@@ -353,13 +354,13 @@ export default {
 }
 ::v-deep .van-dropdown-menu {
   box-shadow: none;
-  height: 35px !important;
-  font-size: 13px;
+  height: 70rpx !important;
+  font-size: 26rpx;
   border-bottom: 1px solid #f1f1f4;
 }
 
 ::v-deep .u-list {
-  padding: 12px;
+  padding: 24rpx;
 }
 
 ::v-deep .u-count-num {
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index 715e1ee..8831542 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -126,10 +126,9 @@
       </view>
     </cs-bottom-wrapper>
 
-    <cs-bottom-wrapper v-else>
+    <cs-bottom-wrapper v-if="isChange">
       <view class="operation">
-        <view class="btn green" v-if="isChange">认领该企业</view>
-        <view class="btn red" v-else>删除该企业</view>
+        <view class="btn green" >认领该企业</view>
       </view>
     </cs-bottom-wrapper>
 
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index 9ecead9..6b5b4c9 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -170,6 +170,8 @@
         marginBottom="12"
         v-if="load != 'nomore'"
       />
+      <cs-emty v-if="list.length == 0"></cs-emty>
+
       <view class="btn-box" v-if="isSelect.length > 0">
         <view class="confirm-btn" @tap="replay">
           已选择({{ isSelect.length }})
diff --git a/sub/task/record.vue b/sub/task/record.vue
index 37f7811..ad187ec 100644
--- a/sub/task/record.vue
+++ b/sub/task/record.vue
@@ -34,7 +34,7 @@
       </view>
       <view
         style="
-          font-size: 13px;
+          font-size: 26rpx;
           line-height: 160%;
           position: relative;
           transform: 0.2s all;
@@ -46,7 +46,7 @@
       <view
         v-else
         style="
-          font-size: 13px;
+          font-size: 26rpx;
           line-height: 160%;
           position: relative;
           transform: 0.2s all;
@@ -58,7 +58,7 @@
             ? detail.description
             : `${detail.description.slice(1, 20)}...`
         }}
-        <text style="color: #17c653; padding-left: 4px">
+        <text style="color: #17c653; padding-left: 8rpx">
           {{ isShowAllText ? '收起' : '展开' }}
         </text>
       </view>