lex 11 months ago
parent
commit
3f439a93aa

+ 7 - 1
src/teacher/piano-room/class-arrangement/create-class/index.tsx

@@ -197,7 +197,13 @@ export default defineComponent({
           confirmShow.value = false
           confirmShow.value = false
           if (data) {
           if (data) {
             setTimeout(() => {
             setTimeout(() => {
-              Toast(data)
+              Toast({
+                message: data,
+                duration: 1500,
+                onClose: () => {
+                  router.back()
+                }
+              })
             }, 100)
             }, 100)
           } else {
           } else {
             setTimeout(() => {
             setTimeout(() => {

+ 131 - 121
src/views/member-center/index.tsx

@@ -513,138 +513,148 @@ export default defineComponent({
               </div>
               </div>
             ) : null}
             ) : null}
 
 
-            {/* 判断是否有推荐老师 */}
-            {state.discountTeacher.discount == 1 && (
-              <div class={styles.memberDiscount}>
-                <Image
-                  src={state.discountTeacher.avatar || iconTeacher}
-                  class={styles.discountAvatar}
-                />
-
-                <span class={styles.discountName}>
-                  {state.discountTeacher.username}老师的<span>专属优惠~</span>
-                </span>
-
-                <Image src={iconGift} class={styles.discountGift} />
-              </div>
-            )}
-
             {/* 选择会员模式 */}
             {/* 选择会员模式 */}
             {(vipList.value.length > 0 || svipList.value.length > 0) && (
             {(vipList.value.length > 0 || svipList.value.length > 0) && (
-              <div class={styles.system_list_section}>
-                <div
-                  class={[
-                    styles['system-list'],
-                    state.tabActive === 'VIP' ? styles.system_list_vip : '',
-                    memberInfos.value.memberLength === 2 ? styles.list_two : '',
-                    memberInfos.value.memberLength === 1 ? styles.list_one : ''
-                  ]}
-                >
-                  {memberInfos.value.memberLength >= 2 ? (
-                    <>
-                      {state.memberShowList.map((member: any) => (
-                        <div
-                          class={[
-                            styles['system-item'],
-                            member.id === state.selectMember.id
-                              ? styles.active
-                              : '',
-                            member.discount === 1 ? styles.discountItem : ''
-                          ]}
-                          onClick={() => {
-                            state.selectMember = member
-                          }}
-                        >
-                          {/* 只有永久才会有数量提示 */}
-                          {member.period === 'PERPETUAL' && (
-                            <span class={[styles.iconPermanent]}></span>
-                          )}
+              <>
+                {/* 判断是否有推荐老师 一个会员都没有配置不显示优惠信息 */}
+                {state.discountTeacher.discount == 1 && (
+                  <div class={styles.memberDiscount}>
+                    <Image
+                      src={state.discountTeacher.avatar || iconTeacher}
+                      class={styles.discountAvatar}
+                    />
+
+                    <span class={styles.discountName}>
+                      {state.discountTeacher.username}老师的
+                      <span>专属优惠~</span>
+                    </span>
 
 
-                          <p class={styles.s_title}>{member.title}</p>
-                          {member.discount === 1 && (
-                            <span class={styles.discountTag}></span>
-                          )}
-                          <p class={styles.price}>
-                            <span>¥</span>
-                            {moneyFormat(calcSalePrice(member), '0,0[.]00')}
-                          </p>
-                          <del
+                    <Image src={iconGift} class={styles.discountGift} />
+                  </div>
+                )}
+                <div class={styles.system_list_section}>
+                  <div
+                    class={[
+                      styles['system-list'],
+                      state.tabActive === 'VIP' ? styles.system_list_vip : '',
+                      memberInfos.value.memberLength === 2
+                        ? styles.list_two
+                        : '',
+                      memberInfos.value.memberLength === 1
+                        ? styles.list_one
+                        : ''
+                    ]}
+                  >
+                    {memberInfos.value.memberLength >= 2 ? (
+                      <>
+                        {state.memberShowList.map((member: any) => (
+                          <div
                             class={[
                             class={[
-                              styles.originalPrice,
-                              calcSalePrice(member) >= member.originalPrice ||
-                              member.desc
-                                ? styles.originalPriceHide
-                                : ''
+                              styles['system-item'],
+                              member.id === state.selectMember.id
+                                ? styles.active
+                                : '',
+                              member.discount === 1 ? styles.discountItem : ''
                             ]}
                             ]}
+                            onClick={() => {
+                              state.selectMember = member
+                            }}
                           >
                           >
-                            ¥{moneyFormat(member.originalPrice, '0,0[.]00')}
-                          </del>
-
-                          {member.desc && (
-                            <p class={styles.extraTip}>{member.desc}</p>
-                          )}
-                        </div>
-                      ))}
-                    </>
-                  ) : (
-                    <>
-                      {/* 一条数据的样式 */}
-                      {state.memberShowList.map((member: any) => (
-                        <div class={[styles['system-item']]}>
-                          {/* 只有永久才会有数量提示 */}
-                          {member.period === 'PERPETUAL' && (
-                            <span class={[styles.iconPermanent]}></span>
-                          )}
+                            {/* 只有永久才会有数量提示 */}
+                            {member.period === 'PERPETUAL' && (
+                              <span class={[styles.iconPermanent]}></span>
+                            )}
 
 
-                          {member.discount === 1 && (
-                            <span class={styles.discountTag}></span>
-                          )}
-                          <div class={styles.oneInfo}>
-                            <div class={styles.priceS}>
-                              <p class={styles.price}>
-                                <span>¥</span>
-                                {moneyFormat(calcSalePrice(member), '0,0[.]00')}
-                              </p>
-                              <p class={styles.s_title}>{member.title}</p>
-                            </div>
+                            <p class={styles.s_title}>{member.title}</p>
+                            {member.discount === 1 && (
+                              <span class={styles.discountTag}></span>
+                            )}
+                            <p class={styles.price}>
+                              <span>¥</span>
+                              {moneyFormat(calcSalePrice(member), '0,0[.]00')}
+                            </p>
+                            <del
+                              class={[
+                                styles.originalPrice,
+                                calcSalePrice(member) >= member.originalPrice ||
+                                member.desc
+                                  ? styles.originalPriceHide
+                                  : ''
+                              ]}
+                            >
+                              ¥{moneyFormat(member.originalPrice, '0,0[.]00')}
+                            </del>
+
+                            {member.desc && (
+                              <p class={styles.extraTip}>{member.desc}</p>
+                            )}
+                          </div>
+                        ))}
+                      </>
+                    ) : (
+                      <>
+                        {/* 一条数据的样式 */}
+                        {state.memberShowList.map((member: any) => (
+                          <div class={[styles['system-item']]}>
                             {/* 只有永久才会有数量提示 */}
                             {/* 只有永久才会有数量提示 */}
-                            {member.period === 'PERPETUAL' ? (
-                              <div class={styles.oneMaxNum}>限量1000份</div>
-                            ) : (
-                              <div
-                                class={[
-                                  styles.oneMaxNum,
-                                  styles.oneMaxNumPrice
-                                ]}
-                              >
-                                ¥{member.originalPrice}
-                              </div>
+                            {member.period === 'PERPETUAL' && (
+                              <span class={[styles.iconPermanent]}></span>
+                            )}
+
+                            {member.discount === 1 && (
+                              <span class={styles.discountTag}></span>
                             )}
                             )}
+                            <div class={styles.oneInfo}>
+                              <div class={styles.priceS}>
+                                <p class={styles.price}>
+                                  <span>¥</span>
+                                  {moneyFormat(
+                                    calcSalePrice(member),
+                                    '0,0[.]00'
+                                  )}
+                                </p>
+                                <p class={styles.s_title}>{member.title}</p>
+                              </div>
+                              {/* 只有永久才会有数量提示 */}
+                              {member.period === 'PERPETUAL' ? (
+                                <div class={styles.oneMaxNum}>限量1000份</div>
+                              ) : (
+                                <div
+                                  class={[
+                                    styles.oneMaxNum,
+                                    styles.oneMaxNumPrice
+                                  ]}
+                                >
+                                  ¥{member.originalPrice}
+                                </div>
+                              )}
+                            </div>
+                            <span
+                              class={[
+                                styles.oneBtn,
+                                ['EXPIREVIP', 'VIP', 'PERMANENT'].includes(
+                                  userMemberStatus.value
+                                )
+                                  ? styles.onBtnRenew
+                                  : '',
+                                userMemberStatus.value === 'PERMANENT'
+                                  ? styles.onBtnDisbled
+                                  : ''
+                              ]}
+                              onClick={() => {
+                                if (userMemberStatus.value === 'PERMANENT')
+                                  return
+                                onSubmit()
+                              }}
+                            ></span>
+                            <i class={styles.itemBg}></i>
                           </div>
                           </div>
-                          <span
-                            class={[
-                              styles.oneBtn,
-                              ['EXPIREVIP', 'VIP', 'PERMANENT'].includes(
-                                userMemberStatus.value
-                              )
-                                ? styles.onBtnRenew
-                                : '',
-                              userMemberStatus.value === 'PERMANENT'
-                                ? styles.onBtnDisbled
-                                : ''
-                            ]}
-                            onClick={() => {
-                              if (userMemberStatus.value === 'PERMANENT') return
-                              onSubmit()
-                            }}
-                          ></span>
-                          <i class={styles.itemBg}></i>
-                        </div>
-                      ))}
-                    </>
-                  )}
+                        ))}
+                      </>
+                    )}
+                  </div>
                 </div>
                 </div>
-              </div>
+              </>
             )}
             )}
 
 
             {/* 是选择会员 会员天数大于0 */}
             {/* 是选择会员 会员天数大于0 */}