From 20455490f88e016513df7df28509f993b5b95016 Mon Sep 17 00:00:00 2001
From: cbb <1055026847@qq.com>
Date: Sat, 27 Dec 2025 10:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 | 160 +++++----
 pages.json                                    |   7 +
 pages/discover/discover.vue                   |   4 +
 pages/discover/punch.vue                      |  31 ++
 pages/discover/ranking-list.vue               | 172 ++++++----
 pages/discover/styles/index.scss              |  34 ++
 static/images/discover/grade1.png             | Bin 0 -> 4079 bytes
 static/images/discover/grade2.png             | Bin 0 -> 4110 bytes
 static/images/discover/grade3.png             | Bin 0 -> 3834 bytes
 .../images/{ranking-list => discover}/hat.png | Bin
 .../{ranking-list => discover}/title-icon.png | Bin
 uni_modules/uni-row/changelog.md              |  10 +
 .../uni-row/components/uni-col/uni-col.vue    | 317 ++++++++++++++++++
 .../uni-row/components/uni-row/uni-row.vue    | 190 +++++++++++
 uni_modules/uni-row/package.json              |  87 +++++
 uni_modules/uni-row/readme.md                 |  10 +
 16 files changed, 891 insertions(+), 131 deletions(-)
 create mode 100644 pages/discover/punch.vue
 create mode 100644 pages/discover/styles/index.scss
 create mode 100644 static/images/discover/grade1.png
 create mode 100644 static/images/discover/grade2.png
 create mode 100644 static/images/discover/grade3.png
 rename static/images/{ranking-list => discover}/hat.png (100%)
 rename static/images/{ranking-list => discover}/title-icon.png (100%)
 create mode 100644 uni_modules/uni-row/changelog.md
 create mode 100644 uni_modules/uni-row/components/uni-col/uni-col.vue
 create mode 100644 uni_modules/uni-row/components/uni-row/uni-row.vue
 create mode 100644 uni_modules/uni-row/package.json
 create mode 100644 uni_modules/uni-row/readme.md

diff --git a/manifest.json b/manifest.json
index c86e108..b8d4719 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,73 +1,89 @@
 {
-    "name" : "uniapp-imitate-wx",
-    "appid" : "__UNI__9EFDC69",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3",
-    "fallbackLocale" : "zh-Hans"
-}
+	"name": "uniapp-imitate-wx",
+	"appid": "__UNI__9EFDC69",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"safearea": {
+			"background": "#ffffff",
+			"backgroundDark": "#2f0508",
+			"bottom": {
+				"offset": "none"
+			}
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {}
+		}
+	},
+	"app-harmony": {
+		"safearea": { // HarmonyOS 平台的安全区域
+			"background": "#ffffff",
+			"backgroundDark": "#2f0508",
+			"bottom": {
+				"offset": "none" // 在没有 tabBar 时，底部区域是否需要占位
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "3",
+	"fallbackLocale": "zh-Hans"
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b5a9618..1308fd7 100644
--- a/pages.json
+++ b/pages.json
@@ -121,6 +121,13 @@
 				"navigationBarTitleText": "排行榜",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/discover/punch",
+			"style": {
+				"navigationBarTitleText": "签到",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue
index 837476c..688bec7 100644
--- a/pages/discover/discover.vue
+++ b/pages/discover/discover.vue
@@ -16,6 +16,10 @@
       navigateTo('/pages/discover/ranking-list')
       return
     }
+    if (item === 'sign') {
+      navigateTo('/pages/discover/punch')
+      return
+    }
     if (item === 'mall') {
       navigateTo('/pages/mall/list')
       return
diff --git a/pages/discover/punch.vue b/pages/discover/punch.vue
new file mode 100644
index 0000000..0c0521b
--- /dev/null
+++ b/pages/discover/punch.vue
@@ -0,0 +1,31 @@
+<script setup></script>
+
+<template>
+  <view class="punch">
+    <nav-bar>
+      <template #back>
+        <image
+          src="/static/images/public/return-icon.png"
+          mode="heightFix"
+          class="top-left-icon"
+        ></image>
+      </template>
+    </nav-bar>
+    <view class="public-header—box">
+      <!-- <image
+        src="/static/images/ranking-list/title-icon.png"
+        mode="aspectFit"
+        class="left-icon"
+      ></image>
+      <image
+        src="/static/images/ranking-list/hat.png"
+        mode="aspectFit"
+        class="right-icon"
+      ></image> -->
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+  @import './styles/index.scss';
+</style>
diff --git a/pages/discover/ranking-list.vue b/pages/discover/ranking-list.vue
index a8d125e..f7c30e0 100644
--- a/pages/discover/ranking-list.vue
+++ b/pages/discover/ranking-list.vue
@@ -5,20 +5,20 @@
     <nav-bar>
       <template #back>
         <image
-          src="/static/images/public/white-arrow.png"
+          src="/static/images/public/return-icon.png"
           mode="heightFix"
           class="top-left-icon"
         ></image>
       </template>
     </nav-bar>
-    <view class="top-box">
+    <view class="public-header—box">
       <image
-        src="/static/images/ranking-list/title-icon.png"
+        src="/static/images/discover/title-icon.png"
         mode="aspectFit"
         class="left-icon"
       ></image>
       <image
-        src="/static/images/ranking-list/hat.png"
+        src="/static/images/discover/hat.png"
         mode="aspectFit"
         class="right-icon"
       ></image>
@@ -27,68 +27,122 @@
     <!-- 表格 -->
     <view class="table-box">
       <!-- 表头 -->
-      <view class="table-head">
-        <view class="table-item">
-          <text class="item-text">排行</text>
-        </view>
-        <view class="table-item">
-          <text class="item-text">用户</text>
-        </view>
-        <view class="table-item">
-          <text class="item-text">积分</text>
-        </view>
-      </view>
+      <uni-row class="table-head">
+        <uni-col :span="6">
+          <view class="grade-box">
+            <text class="item-text">排行</text>
+          </view>
+        </uni-col>
+        <uni-col :span="12">
+          <view class="name">
+            <text class="item-text">用户</text>
+          </view>
+        </uni-col>
+        <uni-col :span="6">
+          <view class="table-right">
+            <text class="item-text">积分</text>
+          </view>
+        </uni-col>
+      </uni-row>
       <!-- 列表内容 -->
-      <view v-for="item in 4" class="table-content">
-        <view class="table-item">
-          <text class="item-text">1</text>
-        </view>
-        <view class="table-item">
-          <text class="item-text">张三</text>
-        </view>
-        <view class="table-item">
-          <text class="item-text">100</text>
-        </view>
-      </view>
+      <uni-row
+        v-for="(item, index) in 19"
+        :key="index"
+        class="table-content"
+      >
+        <uni-col :span="6">
+          <view class="grade-box">
+            <image
+              v-if="index < 3"
+              :src="`/static/images/discover/grade${index + 1}.png`"
+              mode="heightFix"
+              class="grade"
+            ></image>
+            <text v-else class="item-text">1</text>
+          </view>
+        </uni-col>
+        <uni-col :span="12">
+          <view class="table-name">
+            <image
+              src="/static/images/public/random2.png"
+              mode="aspectFit"
+              class="left-icon"
+            ></image>
+            <view class="name">
+              <text>张三</text>
+              <text>158****98874</text>
+            </view>
+          </view>
+        </uni-col>
+        <uni-col :span="6">
+          <view class="table-right">
+            <text class="item-text">100</text>
+          </view>
+        </uni-col>
+      </uni-row>
     </view>
   </view>
 </template>
 
 <style lang="scss" scoped>
-  .top-left-icon {
-    height: 42rpx;
-  }
-  .top-box {
-    position: relative;
-    height: 466rpx;
-    background: linear-gradient(0deg, #00d993 0%, #00d9c5 100%);
-    &::after {
-      content: '';
-      position: absolute;
-      width: 100%;
-      height: 38rpx;
-      left: 0;
-      bottom: 0;
-      background: #ffffff;
-      border-radius: 32rpx 32rpx 0rpx 0rpx;
-    }
-    .left-icon {
-      width: 354rpx;
-      height: 166rpx;
-      position: absolute;
-      bottom: 42rpx;
-      left: 48rpx;
-    }
-    .right-icon {
-      width: 450rpx;
-      height: 218rpx;
-      position: absolute;
-      bottom: 10rpx;
-      right: -60rpx;
-    }
-  }
+  @import './styles/index.scss';
 
   .table-box {
-    
+    font-family: PingFang SC, PingFang SC;
+    font-style: normal;
+    text-transform: none;
+    .grade-box {
+      text-align: center;
+      .grade {
+        height: 64rpx;
+      }
+    }
+    .table-right {
+      text-align: center;
+    }
+    .table-head {
+      font-weight: bold;
+      font-size: 28rpx;
+      color: #999999;
+
+      .name {
+        padding-left: 18rpx;
+      }
+    }
+    .table-content {
+      margin-top: 36rpx;
+      display: flex;
+      align-items: center;
+
+      .table-name {
+        display: flex;
+        align-items: center;
+        .left-icon {
+          width: 64rpx;
+          height: 64rpx;
+          margin-right: 8rpx;
+        }
+        .name {
+          display: flex;
+          flex-direction: column;
+          text {
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #333333;
+            line-height: 1;
+            &:last-child {
+              margin-top: 8rpx;
+              font-size: 24rpx;
+              color: #999999;
+            }
+          }
+        }
+      }
+      .table-right {
+        font-weight: bold;
+        font-size: 32rpx;
+        color: #333333;
+      }
+    }
   }
 </style>
diff --git a/pages/discover/styles/index.scss b/pages/discover/styles/index.scss
new file mode 100644
index 0000000..1d7dfc2
--- /dev/null
+++ b/pages/discover/styles/index.scss
@@ -0,0 +1,34 @@
+// 通用头部
+.public-header—box {
+  position: relative;
+  height: 416rpx;
+  background: linear-gradient(0deg, #00d993 0%, #00d9c5 100%);
+  &::after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 38rpx;
+    left: 0;
+    bottom: 0;
+    background: #ffffff;
+    border-radius: 32rpx 32rpx 0rpx 0rpx;
+  }
+  .left-icon {
+    width: 354rpx;
+    height: 166rpx;
+    position: absolute;
+    bottom: 42rpx;
+    left: 48rpx;
+  }
+  .right-icon {
+    width: 450rpx;
+    height: 218rpx;
+    position: absolute;
+    bottom: 10rpx;
+    right: -60rpx;
+  }
+}
+
+.top-left-icon {
+  height: 42rpx;
+}
diff --git a/static/images/discover/grade1.png b/static/images/discover/grade1.png
new file mode 100644
index 0000000000000000000000000000000000000000..144a8f1e0c3a714a89695f27d7bda5578349ff6d
GIT binary patch
literal 4079
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

literal 0
HcmV?d00001

diff --git a/static/images/discover/grade2.png b/static/images/discover/grade2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9286473073e9c8bd8c55bd1e400400e99a35ca68
GIT binary patch
literal 4110
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
M07*qoM6N<$f+GmqHUIzs

literal 0
HcmV?d00001

diff --git a/static/images/discover/grade3.png b/static/images/discover/grade3.png
new file mode 100644
index 0000000000000000000000000000000000000000..edfac62961d6b0ab725b65cbc3c7524fec74cebe
GIT binary patch
literal 3834
zcmV<W4h8XvP)<h;3K|Lk000e1NJLTq001fg002M;1^@s6Y^>#H00001b5ch_0Itp)
z=>Px@v`IukRA@uhntQNaRei@l>%4DrAGtTr8ZbbiK@y+=XJ~agQ>s%6f`f`m8BlBo
zT9S6qT5PL!hE|kVl@ta9iC{t~mMZO(np6x8imiWil2D#`Lx>4UZtf%Zea~a>)%mW+
zx%*y{coVQQ-7|O2Is5Fr*LQt?-{1H5TkBlI+jtCZx4&a8cUZ%|8r(GZTr>1`J>I+>
z4;tES=h-@|%SApoUIQ$Y%TTX!YugfY&)YG^TLNmWHAAoPSqoo_U@Q<Hn$JTcWgwsD
zkJ=WS$KMLzQwBQlvb_#?D4(a&Xq*^AsR*?O&lK`}y7gT1!l?j0X`q8U?72yu$4dn+
zsMRMAX$nwkhqM9p!DGNN*qq_f?h-ehbB?K=4B%-4?S96#7Upn&YYW#8k7kB2KGeky
zD7FG=h`oVoA2h<Xy2i=EK)D3<gg@yx&)hd%u+swC_oDs0P5ELjM~k(fKMkmn3p1cJ
zD}2@|p$UhsN$W7)54JIJpROqsAW3-16j;%Do_Y2c0X`wnf&a0WH4NX%=UJ2_nMYa3
zm7v@Sxk5M}vM4g==?gUGpgsz<{x`#Esla%Z4W_~J&Wp_J#{+y!p#87dMM;e{l`_9Q
zK1E3;2jy8%sCW=DoEjj@W|md=UKi$|Iso-y|7~+p{`<t_x%*I_zgn`y$mAv+lYm-l
z^F7aTpX?+}{j-}7v`}jE$ujB4`q3|nUnD>Ea!AHAUIyfIkfiiuSw8n7^N-obHGy_-
zv7a)AZyH0z=`b^6u_qRDxi=$eN-{gE$Y7l1WIRoF8{<$t3O1P-Pq!%9s&)P|UtmSo
z`QFY<&ldZx#PUz&GD~Z<$pEFlN+;w?nQV?&j|Hrm+A+m5ugAL&sE>F_OpSF*8Ahu-
zHg7kdFo(C;by%*SBp3sgb||)GV;{gCBk~#InsPa2*iN7tMN#b5$0m!nBr9w1QM3PN
zc7LJB!bnDO2DEf#k|g+~CgLO^lg}!9szx*R)D-x!w0j(FJ3H%hT6IUxKw|k@v+t*N
ztk^<DR7itu3o||$K}O2LY|>0l#_>!ZiWNxeAnldge1&REagC-2A1CqjJb@iK;tA1^
zNrP{j*MDlqN)==_$a>mO3%Uwb#4#D)XU-*6p9H#R|7LjM3E1%zRENF!=Zi4^JUH)4
zxa6h~(i6EthG796J~B~68VL`Xz0cb5QVV4lO#z(`s@WRMh7h|dl+EDqS=DCamtgCo
zP$(Z8g_BDPfBZDe2$E`AN=8Ll#V8WP-4j5QR6u{?fjS%pX3q0;=PTjDKz|mr^KJuA
ze;J-z=SNe>7c7B=%RJzt`(fusD9!Mnl_a0p>X|<75m<FV75Z=_2@gA<#YzC0hqgH(
zY4FvjSt0|Yk=>&Q;K55LzW?xjaOQg<k$yF~9H?mA8_xm1ag+a>RKWtcETf9lP`8h;
zu`aQ`V_y4l2B?y0t`C(Hy{;|!#-mv-gO=BS4z~TkPx-=Y;r)N@J0<Bh9vWo#PhkCD
zc<`l}aLY6P`Nus%bX+n;MjNa#dp6l>xdmCen?VE`4KcN#PTjR|O$6|z1yFAH^0;lA
zXV6KY>RF9;r(&_{B7a?V2tKzBQYB%0Rwjues|x*4&%`xp${O?PCR;7GP>Pw|J_iKO
zF(_8!YtDns<^B1CF9dMFf~6ja!0J0?tpMvd_#%A&W<LoPk(+-M7|phWK~_zm2@Lmy
zUPGZzSSv=oMuU&G3TO<?RKOw0R1}(-E19TPr(Ume443I*&A`J~!N36z`s%-j)89QM
z)w5+c09IlS_xgLBuQqtZ0WFj!?5S;b5PM)UYO~q7YeHIbw0gD?$Z+lW5R9ow29E6Z
zw$;7ehkD_KpoDYG3xK3@j4Gz@v<4gQ3(*wNgh$Nor){-Zq2$6W9~ID$OihpxbXaES
zy1bG@rWOVpAAy&iglF#ZjA=5GiC*7#8@%gs54c%8GM!jcra`z)qkWlV63|^6CxE&V
zDpL-?oQ-5;AniIQkX~~hNTUYTQGb5hQ?ThSKVkh9O8!}M&w(rc2HF<*!Cm5oFuU;T
z=2%>Os2R)vb&LvVp)`^8?Oj2m8GXjYipeFj*H|?*zNrtV&gnWezhZZ^A9nl)Y<<E{
zs5Szh{4R8zF|qiIwcG_If>kmm9%z(rlJbbz`IM~|%OUF{qcQYiGsCV6QTWbvQDHLq
zP^kpAS#C9xJnVcHo(|g+Dzi5~8QdXWn_)A`qN&l)XE>lcp7M-3=1mBF04N~NszUgk
z8-(`?t9ze9I_5Q-1?mQsJj!tYhrG8cq<{DXw9J~!sv9~0cEcrJqp@te(C_%6t>(*=
zTnLp+of(a0lFBiw&nXNYhVL);4_9k<{llQesJyc_3gwwlZ1DrBvaSBOul2h3#_#&(
zqzO!V4#g&>k5;@xamA`7w}5W{ch6|dyrxE{f(+g$oyvwDyCGzD0dDvQNVKvHNhPAC
z%bD|ibMwH}zG)FtfABc8bY{FXlUPoZ9vFlDp@Z|%d&F$pFp*5Uu&vW4lS`Z+0fpby
zXGtN1`>`8+gRFB)uYhI0H_^;AR|6LIY=Qp{9hRPX%fET;Mn+?{$IN$|76EAdE=^fy
zURfW2hTV_0SsqL*ow1*6T2+|D!I$7icTCKB$)&LDgOCs2S|5k!e+VycoJg?u-VEno
z6#|@PGU_wDI*lsyA(^aYoq72OwpJ)nj7cJ(G1Ifj6d8?6TZZ9h_rsp&CV&WB>ue81
zC9o*a!5?S86F&S6$Q7sfs59nJ2m<(86-Fhc*q|%xUwYEkizNz8a6n}S6pIsnng!`x
z;4m--S|@GU055Fx9e&fA0%^LhUWN027cRI08g=M6-ERds4~?sc09Ln+Y3oOl$}}pe
zH2VBM+qB$*aiPtWN+m<3#T&TOtp3y#@AsC}?D+lehSTDay)ZiHyLfd<a~Hv)i+w+!
zXE=E`pwa~$XJ%Fq+UlwKLg8R!mp}%_MtIab@DXd5ybtD{<=eBS!3Qmh*|MxgmEsMs
za`%j;qF=gF7?Q-bdZEJTyqjo9lK5E?n7h<BCu1Y7mGk8;vp!SAw*MIRJ<nQm?^X8e
z<2`(~>nynNa?gb8(lchCKLDlikSGyk&{Y(?(^+Ux1S)O|IflYMRyHvOzB&do7eOWH
zx>@fFaBw?peG*2GGBoQnu6Fnz{D@sL*vndKTztkQu=uyaprcUO6Ihm}3O+&95oPPM
zYpTT9M8o6WN3bzU?)wz9Q!VWZY|?<1dC+mT_g=MkTmKb$_CmgeHK#9Q`Nvk7vF3_E
z&$#<C`>DnV_vVVsxcE0=u2_v(89E|YZSrAx96}W}72C^6j0WvX3JR|PO4Ci<hn7LM
zcDNh%ZGp7FE5%l>{nHKR#W?p#Ky~u=+imImO$?V(iduTiU+foU4vfO9zmTy?8rRCj
zwlw&jBQDB7xuoo`xjiJG0|J^^;tY1f;oTlm?*Qxme6#sPCOFxSaPsM$m)U`V8tvT;
zm$0<XgV|?#4|JV*@H_Y3K%qFXY;J-Mp|9zOhx&wmBa^yM4$-~GZ~OH1!M<HkY2%(d
z51L!21$4({cEBdIOHW4{pdMBl>|6x1P77>_y%>5`HOV2Exxh9Q=CF;KZN%N`r4EN*
zgOPqei5=TucmN7HXzk*jJKvZ-(4#h?!>xxT{swgCU^MUdO6Qyv8VhMSvKtIq9as{3
zSm#+@8ak(=e?MsRLfU`zHF$lW_v&J36WdM(=<e(6kz|NDb|{EGtSE;|a7f^_^zDE-
zzX~R9(PXkdn^dleQJDLo`?b&}4#I&~;f(?B6zXLQrvh}>b+(6;+3MmOdYFDI5_4tu
zlOero8ba8m->!E~t|-oi#H0b$e_74guwPvs+ULV8hPy}ot7?c?6<~#a<#a>ufF{hA
z@vD>3j{;WPH92Tls7nqB^efE4Qw4TrX7fT|73P5+zZmR01pP-mu)6e{z>zVpcg<P)
z)C!^fWJ15|_oo2Wk6GH7?ST3&zw#7V`QnHgX*DETbylEbp--ZIZ8}&O9fAJCK4~04
z>zP%uIiT9OQ0N0tX>{6*?!4Canv^avs>-28LO_$Vee+P?3-;%JPyyD!<6>4lK}ags
z{Pw{3sF#Za8D0f40(Cnq+V~BjKPjMDMw>ueAvp)CRT!`PSNkg1-T*epAuW5RwOq*p
zYrfBb?i~rq6g28WKbyN(9x$JtmXA6{6S|x^%k*W~8AkQb0|Kj8{feCbx!15*6MHqW
z92pE@&H|ObHJKjiKCCR<hQ`SP-Su(XOG=l*r?59e9~sR6b$z5tV-FM$c^O1GIB){0
z*G$;s_q|$~Dw#5&Z|`K)%7f<5rpM^VY_G9&IgkP?M%y!?p8~WR*cHg)VYZq9ey!1<
z)q%`t(*X<_FYtXKnPf{*qqF9-{wuGWE2j^1YBC)MsDAAepphE;>xNI>@;$RjgM53b
zy`w(D7plhtns}g*QDwdSwDVWk@a4Vc1JeWgQJ?j0_f2{dqaAN%RF*SZV?2T7*RD0+
znfmaxE9~sSjjSFY;X~4G)UYO|_ebT=A@tFnW-VaDohJdb&!luZkTLWbpbE7nF;e3%
zFMoi)Gsf+d9`{&%iM^or5Nm2<EOQJ8d+HaXp@hcJcg$z~%4vuG8rx?qos*I&02TP5
zD)%+o`QoLwo1-TJIQ6@)F1FVU_p_>2<1}UdQ2~`cGbOZR9_v@`o2Ev0U1R%5>2&s_
z{rD8}v!Hf1->W6u`tGlogC_%U>b0MLhg~r`%v}Scek;jUrqGmhDVe4Vbf*{%q1U!f
zE#(bnaKn<2C~pO1ym#|vTYT{Stf~*QBHEK`zOw$L7|mHalLmunj?bL?FXrL51KhEm
z@wNBZd3#>uAzS52HRsakSEtM9o*V7HWSG@Gr}OpqtTOrq{g-~+c82}+(O$mwj>Y`f
w7dB7R@PFy3PGNvItwK-X8UH7@{J#PEzpAnKfN>Vzj{pDw07*qoM6N<$f&_eV`v3p{

literal 0
HcmV?d00001

diff --git a/static/images/ranking-list/hat.png b/static/images/discover/hat.png
similarity index 100%
rename from static/images/ranking-list/hat.png
rename to static/images/discover/hat.png
diff --git a/static/images/ranking-list/title-icon.png b/static/images/discover/title-icon.png
similarity index 100%
rename from static/images/ranking-list/title-icon.png
rename to static/images/discover/title-icon.png
diff --git a/uni_modules/uni-row/changelog.md b/uni_modules/uni-row/changelog.md
new file mode 100644
index 0000000..5b465bc
--- /dev/null
+++ b/uni_modules/uni-row/changelog.md
@@ -0,0 +1,10 @@
+## 1.0.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-row](https://uniapp.dcloud.io/component/uniui/uni-row)
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增uni-row组件
diff --git a/uni_modules/uni-row/components/uni-col/uni-col.vue b/uni_modules/uni-row/components/uni-col/uni-col.vue
new file mode 100644
index 0000000..84e2deb
--- /dev/null
+++ b/uni_modules/uni-row/components/uni-col/uni-col.vue
@@ -0,0 +1,317 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view :class="['uni-col', sizeClass, pointClassList]" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<!-- 在nvue上，类名样式不生效，换为style -->
+	<!-- 设置right正值失效，设置 left 负值 -->
+	<view :class="['uni-col']" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+		width:`${nvueWidth}rpx`,
+		position:'relative',
+		marginLeft:`${marginLeft}rpx`,
+		left:`${right === 0 ? left : -right}rpx`
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * Col	布局-列
+	 * @description	搭配uni-row使用，构建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{span} type = Number 栅格占据的列数
+	 * 						默认 24
+	 * @property	{offset} type = Number 栅格左侧的间隔格数
+	 * @property	{push} type = Number 栅格向右移动格数
+	 * @property	{pull} type = Number 栅格向左移动格数
+	 * @property	{xs} type = [Number, Object] <768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{sm} type = [Number, Object] ≥768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{md} type = [Number, Object] ≥992px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{lg} type = [Number, Object] ≥1200px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{xl} type = [Number, Object] ≥1920px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 */
+	const ComponentClass = 'uni-col';
+
+	// -1 默认值，因为在微信小程序端只给Number会有默认值0
+	export default {
+		name: 'uniCol',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现
+		},
+		// #endif
+		props: {
+			span: {
+				type: Number,
+				default: 24
+			},
+			offset: {
+				type: Number,
+				default: -1
+			},
+			pull: {
+				type: Number,
+				default: -1
+			},
+			push: {
+				type: Number,
+				default: -1
+			},
+			xs: [Number, Object],
+			sm: [Number, Object],
+			md: [Number, Object],
+			lg: [Number, Object],
+			xl: [Number, Object]
+		},
+		data() {
+			return {
+				gutter: 0,
+				sizeClass: '',
+				parentWidth: 0,
+				nvueWidth: 0,
+				marginLeft: 0,
+				right: 0,
+				left: 0
+			}
+		},
+		created() {
+			// 字节小程序中，在computed中读取$parent为undefined
+			let parent = this.$parent;
+
+			while (parent && parent.$options.componentName !== 'uniRow') {
+				parent = parent.$parent;
+			}
+
+			this.updateGutter(parent.gutter)
+			parent.$watch('gutter', (gutter) => {
+				this.updateGutter(gutter)
+			})
+
+			// #ifdef APP-NVUE
+			this.updateNvueWidth(parent.width)
+			parent.$watch('width', (width) => {
+				this.updateNvueWidth(width)
+			})
+			// #endif
+		},
+		computed: {
+			sizeList() {
+				let {
+					span,
+					offset,
+					pull,
+					push
+				} = this;
+
+				return {
+					span,
+					offset,
+					pull,
+					push
+				}
+			},
+			// #ifndef APP-NVUE
+			pointClassList() {
+				let classList = [];
+
+				['xs', 'sm', 'md', 'lg', 'xl'].forEach(point => {
+					const props = this[point];
+					if (typeof props === 'number') {
+						classList.push(`${ComponentClass}-${point}-${props}`)
+					} else if (typeof props === 'object' && props) {
+						Object.keys(props).forEach(pointProp => {
+							classList.push(
+								pointProp === 'span' ?
+								`${ComponentClass}-${point}-${props[pointProp]}` :
+								`${ComponentClass}-${point}-${pointProp}-${props[pointProp]}`
+							)
+						})
+					}
+				});
+
+				// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+				return classList.join(' ');
+			}
+			// #endif
+		},
+		methods: {
+			updateGutter(parentGutter) {
+				parentGutter = Number(parentGutter);
+				if (!isNaN(parentGutter)) {
+					this.gutter = parentGutter / 2
+				}
+			},
+			// #ifdef APP-NVUE
+			updateNvueWidth(width) {
+				// 用于在nvue端，span，offset，pull，push的计算
+				this.parentWidth = width;
+				['span', 'offset', 'pull', 'push'].forEach(size => {
+					const curSize = this[size];
+					if ((curSize || curSize === 0) && curSize !== -1) {
+						let RPX = 1 / 24 * curSize * width
+						RPX = Number(RPX);
+						switch (size) {
+							case 'span':
+								this.nvueWidth = RPX
+								break;
+							case 'offset':
+								this.marginLeft = RPX
+								break;
+							case 'pull':
+								this.right = RPX
+								break;
+							case 'push':
+								this.left = RPX
+								break;
+						}
+					}
+				});
+			}
+			// #endif
+		},
+		watch: {
+			sizeList: {
+				immediate: true,
+				handler(newVal) {
+					// #ifndef APP-NVUE
+					let classList = [];
+					for (let size in newVal) {
+						const curSize = newVal[size];
+						if ((curSize || curSize === 0) && curSize !== -1) {
+							classList.push(
+								size === 'span' ?
+								`${ComponentClass}-${curSize}` :
+								`${ComponentClass}-${size}-${curSize}`
+							)
+						}
+					}
+					// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+					this.sizeClass = classList.join(' ');
+					// #endif
+					// #ifdef APP-NVUE
+					this.updateNvueWidth(this.parentWidth);
+					// #endif
+				}
+			}
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	/* breakpoints */
+	$--sm: 768px !default;
+	$--md: 992px !default;
+	$--lg: 1200px !default;
+	$--xl: 1920px !default;
+
+	$breakpoints: ('xs' : (max-width: $--sm - 1),
+	'sm' : (min-width: $--sm),
+	'md' : (min-width: $--md),
+	'lg' : (min-width: $--lg),
+	'xl' : (min-width: $--xl));
+
+	$layout-namespace: ".uni-";
+	$col: $layout-namespace+"col";
+
+	@function getSize($size) {
+		/* TODO 1/24 * $size * 100 * 1%; 使用计算后的值，为了解决 vue3 控制台报错 */
+		@return 0.04166666666 * $size * 100 * 1%;
+	}
+
+	@mixin res($key, $map:$breakpoints) {
+		@if map-has-key($map, $key) {
+			@media screen and #{inspect(map-get($map,$key))} {
+				@content;
+			}
+		}
+
+		@else {
+			@warn "Undeinfed point: `#{$key}`";
+		}
+	}
+
+	/* #ifndef APP-NVUE */
+	#{$col} {
+		float: left;
+		box-sizing: border-box;
+	}
+
+	#{$col}-0 {
+		/* #ifdef APP-NVUE */
+		width: 0;
+		height: 0;
+		margin-top: 0;
+		margin-right: 0;
+		margin-bottom: 0;
+		margin-left: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: none;
+		/* #endif */
+	}
+
+	@for $i from 0 through 24 {
+		#{$col}-#{$i} {
+			width: getSize($i);
+		}
+
+		#{$col}-offset-#{$i} {
+			margin-left: getSize($i);
+		}
+
+		#{$col}-pull-#{$i} {
+			position: relative;
+			right: getSize($i);
+		}
+
+		#{$col}-push-#{$i} {
+			position: relative;
+			left: getSize($i);
+		}
+	}
+
+	@each $point in map-keys($breakpoints) {
+		@include res($point) {
+			#{$col}-#{$point}-0 {
+				display: none;
+			}
+
+			@for $i from 0 through 24 {
+				#{$col}-#{$point}-#{$i} {
+					width: getSize($i);
+				}
+
+				#{$col}-#{$point}-offset-#{$i} {
+					margin-left: getSize($i);
+				}
+
+				#{$col}-#{$point}-pull-#{$i} {
+					position: relative;
+					right: getSize($i);
+				}
+
+				#{$col}-#{$point}-push-#{$i} {
+					position: relative;
+					left: getSize($i);
+				}
+			}
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-row/components/uni-row/uni-row.vue b/uni_modules/uni-row/components/uni-row/uni-row.vue
new file mode 100644
index 0000000..f8e8542
--- /dev/null
+++ b/uni_modules/uni-row/components/uni-row/uni-row.vue
@@ -0,0 +1,190 @@
+<template>
+	<view :class="[ 'uni-row', typeClass , justifyClass, alignClass, ]" :style="{
+		marginLeft:`${Number(marginValue)}rpx`,
+		marginRight:`${Number(marginValue)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	const ComponentClass = 'uni-row';
+	const modifierSeparator = '--';
+	/**
+	 * Row	布局-行
+	 * @description	流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{gutter} type = Number 栅格间隔
+	 * @property	{justify} type = String flex 布局下的水平排列方式
+	 * 						可选	start/end/center/space-around/space-between	start
+	 * 						默认值	start
+	 * @property	{align} type = String flex 布局下的垂直排列方式
+	 * 						可选	top/middle/bottom
+	 * 						默认值	top
+	 * @property	{width} type = String|Number nvue下需要自行配置宽度用于计算
+	 * 						默认值 750
+	 */
+
+
+	export default {
+		name: 'uniRow',
+		componentName: 'uniRow',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现，可使用flex布局
+		},
+		// #endif
+		props: {
+			type: String,
+			gutter: Number,
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			align: {
+				type: String,
+				default: 'top'
+			},
+			// nvue如果使用span等属性，需要配置宽度
+			width: {
+				type: [String, Number],
+				default: 750
+			}
+		},
+		created() {
+			// #ifdef APP-NVUE
+			this.type = 'flex';
+			// #endif
+		},
+		computed: {
+			marginValue() {
+				// #ifndef APP-NVUE
+				if (this.gutter) {
+					return -(this.gutter / 2);
+				}
+				// #endif
+				return 0;
+			},
+			typeClass() {
+				return this.type === 'flex' ? `${ComponentClass + modifierSeparator}flex` : '';
+			},
+			justifyClass() {
+				return this.justify !== 'start' ? `${ComponentClass + modifierSeparator}flex-justify-${this.justify}` : ''
+			},
+			alignClass() {
+				return this.align !== 'top' ? `${ComponentClass + modifierSeparator}flex-align-${this.align}` : ''
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$layout-namespace: ".uni-";
+	$row:$layout-namespace+"row";
+	$modifier-separator: "--";
+
+	@mixin utils-clearfix {
+		$selector: &;
+
+		@at-root {
+
+			/* #ifndef APP-NVUE */
+			#{$selector}::before,
+			#{$selector}::after {
+				display: table;
+				content: "";
+			}
+
+			#{$selector}::after {
+				clear: both;
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	@mixin utils-flex ($direction: row) {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: $direction;
+	}
+
+	@mixin set-flex($state) {
+		@at-root &-#{$state} {
+			@content
+		}
+	}
+
+	#{$row} {
+		position: relative;
+		flex-direction: row;
+
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+
+		// 非nvue使用float布局
+		@include utils-clearfix;
+
+		// 在QQ、字节、百度小程序平台，编译后使用shadow dom，不可使用flex布局，使用float
+		@at-root {
+
+			/* #ifndef MP-QQ || MP-TOUTIAO || MP-BAIDU */
+			&#{$modifier-separator}flex {
+				@include utils-flex;
+				flex-wrap: wrap;
+				flex: 1;
+
+				&:before,
+				&:after {
+					/* #ifndef APP-NVUE */
+					display: none;
+					/* #endif */
+				}
+
+				@include set-flex(justify-center) {
+					justify-content: center;
+				}
+
+				@include set-flex(justify-end) {
+					justify-content: flex-end;
+				}
+
+				@include set-flex(justify-space-between) {
+					justify-content: space-between;
+				}
+
+				@include set-flex(justify-space-around) {
+					justify-content: space-around;
+				}
+
+				@include set-flex(align-middle) {
+					align-items: center;
+				}
+
+				@include set-flex(align-bottom) {
+					align-items: flex-end;
+				}
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	// 字节、QQ配置后不生效
+	// 此处用法无法使用scoped
+	/* #ifdef MP-WEIXIN || MP-TOUTIAO || MP-QQ */
+	:host {
+		display: block;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-row/package.json b/uni_modules/uni-row/package.json
new file mode 100644
index 0000000..3f52fa6
--- /dev/null
+++ b/uni_modules/uni-row/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-row",
+  "displayName": "uni-row 布局-行",
+  "version": "1.0.0",
+  "description": "流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "栅格",
+    "布局",
+    "layout"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-row/readme.md b/uni_modules/uni-row/readme.md
new file mode 100644
index 0000000..3c9c8b9
--- /dev/null
+++ b/uni_modules/uni-row/readme.md
@@ -0,0 +1,10 @@
+## Layout 布局
+
+> **组件名 uni-row、uni-col**
+> 代码块： `uRow`、`uCol`
+
+
+流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-row)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file