Browse Source

Merge branch 'online' into jenkins-test

lex 1 year ago
parent
commit
cfa0761da7
2 changed files with 5 additions and 5 deletions
  1. 2 2
      src/views/tenantAllData/index.tsx
  2. 3 3
      src/views/tenantAllData/tenantDataSchool.tsx

+ 2 - 2
src/views/tenantAllData/index.tsx

@@ -309,7 +309,7 @@ export default defineComponent({
                 </div>
                 <div class={styles.cardInfo}>
                   <img src={memberIcon} class={styles.cardInfoImg} alt="" />
-                  会员人数
+                  会员人数占比
                 </div>
                 <div class={styles.cardLine}></div>
               </div>
@@ -391,7 +391,7 @@ export default defineComponent({
                           ).format('0.0')}
                           %{/* {} */}
                         </p>
-                        <p class={styles.title}>会员占比</p>
+                        <p class={styles.title}>会员人数占比</p>
                       </div>
                       <div
                         onClick={() => {

+ 3 - 3
src/views/tenantAllData/tenantDataSchool.tsx

@@ -235,11 +235,11 @@ export default defineComponent({
                       forms.statObj.registerNum,
                       forms.statObj.registerMemberShipNum
                     )
-                  ).format('0,0')}
+                  ).format('0.0')}
                 </div>
                 <div class={styles.cardInfo}>
                   <img src={memberRateIcon} class={styles.cardInfoImg} alt="" />
-                  会员占比
+                  会员人数占比
                 </div>
                 <div class={styles.cardLine}></div>
               </div>
@@ -341,7 +341,7 @@ export default defineComponent({
                           ).format('0.0')}
                           %
                         </p>
-                        <p class={styles.title}>会员占比</p>
+                        <p class={styles.title}>会员人数占比</p>
                       </div>
                       {/* <img class={[styles.arrow]} src={arrowIcon} alt="" /> */}
                     </div>