Merge branch 'iteration-20231012'

src/tenant/member-center/index.tsx

@@ -323,10 +323,7 @@ export default defineComponent({
         </div>
         {this.memberList.length > 0 && (
           <TheSticky position="bottom">
-            <div
-              class={styles.bottom_function}
-              style={{ visibility: 'hidden' }}
-            >
+            <div class={styles.bottom_function}>
               <div class={styles.memberMeal}>
                 <div class={styles.titleMeal}>
                   <span>会员套餐</span>
@@ -372,15 +369,25 @@ export default defineComponent({
               </div>
               <div class={styles.btnGroup}>
                 <Button round block class={styles.btn} onClick={this.onSubmit}>
-                  <span class={styles.unit}>¥</span>
-                  {(this as any).$filters.moneyFormat(
-                    this.calcSalePrice(this.selectMember) || 0
+                  {this.userInfo.isVip ? (
+                    <div>立即续费</div>
+                  ) : !this.userInfo.isVip &&
+                    this.userInfo.membershipEndTime ? (
+                    <div>立即续费</div>
+                  ) : (
+                    <>
+                      <span class={styles.unit}>¥</span>
+                      {(this as any).$filters.moneyFormat(
+                        this.calcSalePrice(this.selectMember) || 0
+                      )}
+                      元立即开通
+                    </>
                   )}
-                  元立即开通
                 </Button>
               </div>
             </div>
-            <div
+
+            {/* <div
               class={styles.bottom_function}
               style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
             >
@@ -418,9 +425,6 @@ export default defineComponent({
                         this.selectMember = item
                       }}
                     >
-                      {/* <div class={styles.discountItem}>
-                        {item.discount == 1 && <img src={iconDiscount} />}
-                      </div> */}
                       <p class={styles.title}>{item.title}</p>
                       <p class={styles.price}>
                         <span>￥</span>
@@ -434,22 +438,6 @@ export default defineComponent({
                 </div>
               </div>
               <div class={styles.btnGroup}>
-                {/* <div class={styles.priceSection}>
-                  支付金额：
-                  <div class={styles.price}>
-                    <span class={styles.priceUnit}>￥</span>
-                    <span class={styles.priceNum}>
-                      {(this as any).$filters.moneyFormat(
-                        this.calcSalePrice(this.selectMember) || 0
-                      )}
-                    </span>
-                  </div>
-                  {this.selectMember?.discount == 1 && (
-                    <div class={[styles.discountItem, styles.discountBuy]}>
-                      <img src={iconDiscount} />
-                    </div>
-                  )}
-                </div> */}
                 <Button round block class={styles.btn} onClick={this.onSubmit}>
                   <span class={styles.unit}>¥</span>
                   {(this as any).$filters.moneyFormat(
@@ -458,7 +446,7 @@ export default defineComponent({
                   元立即开通
                 </Button>
               </div>
-            </div>
+            </div> */}
           </TheSticky>
         )}
 

src/tenant/ranking-list/index.tsx

@@ -67,7 +67,7 @@ export default defineComponent({
     const forms = reactive({
       ...formatWeekDays(),
       studentIds: baseState.user.data?.userId,
-      name: 0,
+      orderType: 0,
       page: 1,
       rows: 20
     })
@@ -136,9 +136,9 @@ export default defineComponent({
                       v-model:active={state.tabActive}
                       onChange={(val: string) => {
                         if (val === 'dayBill') {
-                          forms.name = 2
+                          forms.orderType = 2
                         } else {
-                          forms.name = 0
+                          forms.orderType = 0
                         }
 
                         getList()

src/views/member-center/index.tsx

@@ -376,7 +376,13 @@ export default defineComponent({
             class={styles.btn}
             onClick={this.onSubmit}
           >
-            立即支付
+            {this.userInfo.isVip ? (
+              <>立即续费</>
+            ) : !this.userInfo.isVip && this.userInfo.membershipEndTime ? (
+              <>立即续费</>
+            ) : (
+              <>立即支付</>
+            )}
           </Button>
         </div>