Merge remote-tracking branch 'origin/development' into development

src/assets/json/authMenuList.json

@@ -359,7 +359,7 @@
       "name": "financialManagement",
       "redirect": "/financialManagement/index",
       "meta": {
-        "icon": "CreditCard",
+        "icon": "Wallet",
         "title": "财务管理",
         "isLink": "",
         "isHide": false,
@@ -373,7 +373,7 @@
           "name": "financialManagementIndex",
           "component": "/financialManagement/index",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "DataAnalysis",
             "title": "账户总览",
             "isLink": "",
             "isHide": false,
@@ -387,7 +387,7 @@
           "name": "realName",
           "component": "/financialManagement/realName",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "UserFilled",
             "title": "实名认证",
             "isLink": "",
             "isHide": true,
@@ -401,7 +401,7 @@
           "name": "cashApply",
           "component": "/financialManagement/cashApply",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "Money",
             "title": "提现申请",
             "isLink": "",
             "isHide": true,
@@ -415,7 +415,7 @@
           "name": "todayIncomeList",
           "component": "/financialManagement/todayIncomeList",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "TrendCharts",
             "title": "今日收益",
             "isLink": "",
             "isHide": true,
@@ -429,7 +429,7 @@
           "name": "reconciled",
           "component": "/financialManagement/reconciled",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "CircleCheck",
             "title": "已到账期金额",
             "isLink": "",
             "isHide": true,
@@ -443,7 +443,7 @@
           "name": "unposted",
           "component": "/financialManagement/unposted",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "Clock",
             "title": "未到账期金额",
             "isLink": "",
             "isHide": true,
@@ -457,7 +457,7 @@
           "name": "withdrawaRecord",
           "component": "/financialManagement/withdrawaRecord",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "Document",
             "title": "提现记录",
             "isLink": "",
             "isHide": false,
@@ -471,7 +471,7 @@
           "name": "withdrawaRequest",
           "component": "/financialManagement/withdrawaRequest",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "Money",
             "title": "提现申请",
             "isLink": "",
             "isHide": true,
@@ -485,7 +485,7 @@
           "name": "realName",
           "component": "/financialManagement/realName",
           "meta": {
-            "icon": "CreditCard",
+            "icon": "Setting",
             "title": "支付设置",
             "isLink": "",
             "isHide": false,

src/views/home/components/go-flow.vue

@@ -2,7 +2,9 @@
   <div class="form-container">
     <div>
       <!-- 进度条 -->
-      <el-button class="back-btn" @click="handleBack"> 返回 </el-button>
+      <el-button class="back-btn" @click="handleBack" v-if="storeApplicationStatus == 2 && storeApplicationStatus == 1">
+        返回
+      </el-button>
       <div class="progress-container">
         <el-steps :active="currentStep" style="max-width: 1500px" align-center>
           <el-step v-for="(item, index) in entryList" :key="index">
@@ -43,7 +45,7 @@
             <!-- 左列 -->
             <div class="form-col">
               <el-form-item label="店铺名称" prop="storeName">
-                <el-input v-model="step2Form.storeName" placeholder="请输入店铺名称" />
+                <el-input v-model="step2Form.storeName" placeholder="请输入店铺名称" maxlength="30" />
               </el-form-item>
 
               <el-form-item label="容纳人数" prop="storeCapacity">
@@ -66,11 +68,11 @@
               </el-form-item>
 
               <el-form-item label="详细地址" prop="storeDetailAddress">
-                <el-input v-model="step2Form.storeDetailAddress" type="textarea" :rows="3" placeholder="请输入" />
+                <el-input v-model="step2Form.storeDetailAddress" type="textarea" :rows="3" placeholder="请输入" maxlength="255" />
               </el-form-item>
 
               <el-form-item label="门店简介" prop="storeBlurb">
-                <el-input v-model="step2Form.storeBlurb" type="textarea" :rows="3" placeholder="请输入" />
+                <el-input v-model="step2Form.storeBlurb" type="textarea" :rows="3" placeholder="请输入" maxlength="300" />
               </el-form-item>
 
               <el-form-item label="经营板块" prop="businessSection">
@@ -917,12 +919,20 @@ const handleExceed = () => {
     border-color: #dcdfe6;
   }
   .progress-container {
+    margin-top: 120px;
     margin-bottom: 40px;
     :deep(.el-step__head.is-process .el-step__icon) {
       color: #909399;
       border-color: #909399 !important; /* 设置圆圈边框为灰色 */
     }
     :deep(.el-steps) {
+      .is-finish {
+        .el-step__icon {
+          color: #ffffff;
+          background-color: #6c8ff8 !important; /* 设置已完成步骤的圆圈背景色 */
+          border-color: #6c8ff8 !important; /* 设置已完成步骤的圆圈边框色 */
+        }
+      }
       .el-step__head {
         .el-step__icon {
           width: 30px;