Merge branch 'master' into jenkins

src/school/approval-manage/course-adjust.tsx

@@ -151,12 +151,12 @@ export default defineComponent({
           state.dialogStatus = true
           state.dialogMessage = res.message
         } else {
-          setTimeout(() => {
-            showSuccessToast('调整成功')
-          }, 100)
-          setTimeout(() => {
-            reset()
-          }, 1100)
+          // setTimeout(() => {
+          //   showSuccessToast('调整成功')
+          // }, 100)
+          // setTimeout(() => {
+          reset()
+          // }, 1100)
         }
       } catch (e: any) {
         showToast(e.message)
@@ -314,7 +314,7 @@ export default defineComponent({
             message={state.dialogMessage}
             confirmButtonText="确定"
             onConfirm={() => {
-              router.back()
+              reset()
             }}
           />
         </div>

src/school/train-planning/component/course-preview/index.tsx

@@ -200,18 +200,18 @@ export default defineComponent({
           state.dialogMessage = res.message
           return
         }
-        setTimeout(() => {
-          showToast(state.type === 'change' || state.type === 'native' ? '调整成功' : '排课成功')
-        }, 100)
-        setTimeout(() => {
-          state.isClick = false
-          // 伴学指导交接
-          if (route.query.type === 'unbind') {
-            router.replace('/companion-teacher')
-          } else {
-            postMessage({ api: 'back', content: {} })
-          }
-        }, 1100)
+        // setTimeout(() => {
+        //   showToast(state.type === 'change' || state.type === 'native' ? '调整成功' : '排课成功')
+        // }, 100)
+        // setTimeout(() => {
+        state.isClick = false
+        // 伴学指导交接
+        if (route.query.type === 'unbind') {
+          router.replace('/companion-teacher')
+        } else {
+          postMessage({ api: 'back', content: {} })
+        }
+        // }, 1100)
       } catch {
         //
         state.isClick = false

src/school/train-planning/component/standard/index.module.less

@@ -4,7 +4,7 @@
 
 .tips {
   display: flex;
-  align-items: center;
+  // align-items: center;
   margin: 12px 13px;
   background: #ffebdd;
   border-radius: 10px;

src/school/train-planning/component/standard/index.tsx

@@ -366,8 +366,9 @@ export default defineComponent({
 
         <Dialog
           v-model:show={forms.status}
-          message={`您有${forms.classList.length}个班级尚未指定伴学指导，请完成指定后再进行训练规划。`}
+          message={`您有<span style="color: #F44541;">${forms.classList.length}个</span>班级尚未指定伴学指导，请完成指定后再进行训练规划。`}
           messageAlign="left"
+          allowHtml
           confirmButtonText="去设置"
           cancelButtonText="暂不设置"
           teleport={'body'}

src/school/train-planning/modal/class-list/index.tsx

@@ -46,15 +46,9 @@ export default defineComponent({
           data: tempList
         })
 
-        setTimeout(() => {
-          showToast('设置成功')
-        }, 100)
-
-        setTimeout(() => {
-          state.isClick = false
-          emit('confirm')
-          emit('close')
-        }, 1100)
+        state.isClick = false
+        emit('confirm')
+        emit('close')
       } catch {
         //
         state.isClick = false

src/student/coupons/item.tsx

@@ -39,14 +39,11 @@ export default defineComponent({
       >
         {/* 可使用的优惠券 & 有选择按钮的 */}
         {item.useState === 'USABLE' && this.isSelect && (
-          <img
-            class={styles['img-icon']}
-            src={item.checked ? activeIcon : inactiveIcon}
-          />
+          <img class={styles['img-icon']} src={item.checked ? activeIcon : inactiveIcon} />
         )}
         <div class={styles.top}>
           <div class={styles.price}>
-            <span class={styles.suffix}>￥</span>
+            <span class={styles.suffix}>￥ </span>
             <span class={styles.number}>{item.discountPrice}</span>
           </div>
 

src/student/download/transfer.tsx

@@ -50,12 +50,12 @@ export default defineComponent({
     if (!url && !action) {
       return
     }
-    str +=
-      url +
-      qs.stringify({
-        ...rest
-      })
 
+    // 处理参数
+    const formatParams = qs.stringify({
+      ...rest
+    })
+    str += url + (formatParams ? '?' + formatParams : '')
     const query = {
       url: str,
       action: action || 'h5', // app, h5

src/student/member-center/index.module.less

@@ -43,7 +43,7 @@
     background: url('./images/member_bg.png') no-repeat center #534754;
     background-size: cover;
     width: auto;
-    border-radius: 10px;
+    border-radius: 19px;
     padding: 20px 12px 30px;
 
     &.purchaseMember {
@@ -288,8 +288,10 @@
     justify-content: space-between;
     border-top: 1px solid #f0f0f0;
     .btn {
-      padding: 0 22px;
+      line-height: 38px;
+      height: 38px;
       color: #7a3104 !important;
+      padding: 0 17px;
     }
 
     .priceSection {

src/student/music-group/goods-detail/index.tsx

@@ -190,10 +190,10 @@ export default defineComponent({
               title: () => (
                 <div class={styles.priceGroup}>
                   <span class={styles.price}>
-                    <i>¥</i>
+                    <i>¥ </i>
                     {moneyFormat(this.groupPrice)}
                   </span>
-                  <del class={styles.delPrice}>¥{moneyFormat(product.originalPrice)}</del>
+                  <del class={styles.delPrice}>¥ {moneyFormat(product.originalPrice)}</del>
                 </div>
               )
               // default: () => <div class={styles.stock}>销量4件</div>

src/student/music-group/pre-apply/component/payment.tsx

@@ -357,14 +357,14 @@ export default defineComponent({
                           <p class={styles.price}>
                             团购价：
                             <span class={styles.numFont}>
-                              <span class={styles.numPrefix}>¥</span>
+                              <span class={styles.numPrefix}>¥ </span>
                               {moneyFormat(state.goodsInfo.currentPrice)}
                             </span>
                           </p>
                           <p class={styles.originPrice}>
                             原价：
                             <del class={styles.numFont}>
-                              ¥{moneyFormat(state.goodsInfo.originalPrice)}
+                              ¥ {moneyFormat(state.goodsInfo.originalPrice)}
                             </del>
                           </p>
                         </div>
@@ -463,7 +463,7 @@ export default defineComponent({
                           <p class={styles.originPrice}>
                             原价：
                             <del class={styles.numFont}>
-                              ¥{moneyFormat(state.vipInfo.originalPrice)}
+                              ¥ {moneyFormat(state.vipInfo.originalPrice)}
                             </del>
                           </p>
                         </div>
@@ -562,7 +562,7 @@ export default defineComponent({
                             >
                               {state.textBookInfo.currentPrice > 0 ? (
                                 <>
-                                  <span class={styles.numPrefix}>¥</span>
+                                  <span class={styles.numPrefix}>¥ </span>
                                   {moneyFormat(state.textBookInfo.currentPrice)}
                                 </>
                               ) : (
@@ -573,7 +573,7 @@ export default defineComponent({
                           <p class={styles.originPrice}>
                             原价：
                             <del class={styles.numFont}>
-                              ¥{moneyFormat(state.textBookInfo.originalPrice)}
+                              ¥ {moneyFormat(state.textBookInfo.originalPrice)}
                             </del>
                           </p>
                         </div>
@@ -591,13 +591,13 @@ export default defineComponent({
               <p class={styles.needPrice}>
                 支付金额：
                 <span class={styles.numFont}>
-                  <span>¥</span>
+                  <span>¥ </span>
                   <i style="font-style: normal" id="needPrice"></i>
                 </span>
               </p>
               <p class={styles.allPrice}>
                 <del class={styles.numFont}>
-                  总原价：¥{moneyFormat(state.orderInfo.originalPrice)}
+                  总原价：¥ {moneyFormat(state.orderInfo.originalPrice)}
                 </del>
               </p>
             </div>

src/student/music-group/pre-apply/order-detail.tsx

@@ -409,7 +409,7 @@ export default defineComponent({
                           >
                             {goods.paymentCashAmount > 0 ? (
                               <>
-                                <span class={styles.numPrefix}>¥</span>
+                                <span class={styles.numPrefix}>¥ </span>
                                 {moneyFormat(goods.paymentCashAmount)}
                               </>
                             ) : (
@@ -446,7 +446,7 @@ export default defineComponent({
           <div class={styles.paymentContainer}>
             <div class={styles.payemntPrice}>
               <p class={styles.needPrice}>
-                支付金额：<span>¥{moneyFormat(state.orderInfo.currentPrice)}</span>
+                支付金额：<span>¥ {moneyFormat(state.orderInfo.currentPrice)}</span>
               </p>
             </div>
             <div class={styles.paymentBtn}>

src/student/payment-result/index.tsx

@@ -197,7 +197,7 @@ export default defineComponent({
                   <span>{formatOrderStatus(state.orders.status)}</span>
                   {state.orders.status === 'PAID' || state.orders.status === 'REFUNDING' ? (
                     <div class={styles.orderPrice}>
-                      实付金额：￥{moneyFormat(state.orders.paymentCashAmount)}
+                      实付金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
                     </div>
                   ) : (
                     ''
@@ -205,7 +205,7 @@ export default defineComponent({
 
                   {state.orders.status === 'REFUNDED' && (
                     <div class={styles.orderPrice}>
-                      退款金额：￥{moneyFormat(state.orders.paymentCashAmount)}
+                      退款金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
                     </div>
                   )}
                 </div>

src/student/trade-record/component/paid-list.tsx

@@ -204,7 +204,7 @@ export default defineComponent({
                         title: () => <span class={styles.name}>{orderType[item.orderType]}</span>,
                         value: () => (
                           <div class={styles.price}>
-                            <span>¥</span>
+                            <span>¥ </span>
                             {moneyFormat(item.paymentCashAmount)}
                           </div>
                         )

src/student/trade-record/component/refund-list.tsx

@@ -193,7 +193,7 @@ export default defineComponent({
                         title: () => <span class={styles.name}>{orderType[item.orderType]}</span>,
                         value: () => (
                           <div class={styles.price}>
-                            <span>¥</span>
+                            <span>¥ </span>
                             {moneyFormat(item.paymentCashAmount)}
                           </div>
                         )

src/student/trade-record/component/wait-pay.tsx

@@ -235,7 +235,7 @@ export default defineComponent({
                         title: () => <span class={styles.name}>{orderType[item.orderType]}</span>,
                         value: () => (
                           <div class={styles.price}>
-                            <span>¥</span>
+                            <span>¥ </span>
                             {moneyFormat(item.paymentCashAmount)}
                           </div>
                         )

src/student/trade-record/index.tsx

@@ -2,6 +2,7 @@ import OSticky from '@/components/o-sticky'
 import { useRect } from '@vant/use'
 import { Cell, CellGroup, Image, Tab, Tabs } from 'vant'
 import { defineComponent, onMounted, reactive, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import PaidList from './component/paid-list'
 import RefundList from './component/refund-list'
 import WaitPay from './component/wait-pay'
@@ -10,9 +11,10 @@ import styles from './index.module.less'
 export default defineComponent({
   name: 'trade-record',
   setup() {
+    const route = useRoute()
     const tabs = sessionStorage.getItem('tradeRecordTabs')
     const state = reactive({
-      tabValue: (tabs || 'wait_pay') as 'wait_pay' | 'paid' | 'refund',
+      tabValue: (route.query.tab || tabs || 'wait_pay') as 'wait_pay' | 'paid' | 'refund',
       height: 50
     })
     const tabsRef = ref()

src/views/adapay/pay-define/index.tsx

@@ -168,7 +168,7 @@ export default defineComponent({
         {state.browserStatus && (
           <div class={styles.container}>
             <div class={styles.amount}>
-              <span>￥</span>
+              <span>￥ </span>
               {moneyFormat(state.price)}
             </div>
             <CellGroup inset>
@@ -177,7 +177,7 @@ export default defineComponent({
                 title="支付方式"
                 value={state.pay_channel === 'wx_pub' ? '微信' : '支付宝'}
               ></Cell>
-              <Cell title="实付金额" value={`￥${moneyFormat(state.price)}元`}></Cell>
+              <Cell title="实付金额" value={`￥ ${moneyFormat(state.price)}元`}></Cell>
             </CellGroup>
 
             <Button type="primary" block size="large" onClick={getPayment} round>

src/views/adapay/pay-result/index.tsx

@@ -191,7 +191,7 @@ export default defineComponent({
           <>
             <div class={styles.container}>
               <CellGroup border={false}>
-                <Cell title={'订单金额'} value={'￥' + moneyFormat(state.price)}></Cell>
+                <Cell title={'订单金额'} value={'￥ ' + moneyFormat(state.price)}></Cell>
                 <Cell title={'订单信息'} value={state.body}></Cell>
               </CellGroup>
             </div>

src/views/adapay/payment/index.tsx

@@ -82,7 +82,7 @@ export default defineComponent({
         <div class={styles.payAmount}>
           <p>应付金额</p>
           <div class={styles.amount}>
-            <span>￥</span>
+            <span>￥ </span>
             {moneyFormat(props.paymentConfig.currentPrice)}
           </div>
         </div>

src/views/adapay/use-coupons/index.tsx

@@ -164,7 +164,7 @@ export default defineComponent({
                   {/* 判断是否有选择优惠券 */}
                   {this.couponCount > 0 ? (
                     <span class={styles.couponCount}>
-                      <i>-￥</i>
+                      <i>-￥ </i>
                       {this.couponCount}
                     </span>
                   ) : (

src/views/bind-wechat/index.tsx

@@ -34,7 +34,15 @@ export default defineComponent({
         // 判断是否有微信appId
         if (data) {
           closeToast()
-          goAuth(data, url)
+          const replaceUrl =
+            'https://online.lexiaoya.cn/api-backend/open/agent/wx/oauth2?appId=' +
+            data +
+            '&redirectUrl=' +
+            url
+          console.log(data, 'aaaa')
+          console.log(replaceUrl)
+          // window.location.replace(replaceUrl)
+          // goAuth(data, url)
         }
       } catch {
         //

src/views/preview-protocol/index.module.less

@@ -0,0 +1,20 @@
+.mProtocol {
+  // font-size: 14px;padding: 12px;color: #333;line-height: 1.4;
+  padding: 0 12px 12px;
+  font-size: 14px;
+  line-height: 1.5;
+  text-align: justify;
+  word-break: break-all;
+
+  strong {
+    display: block;
+    font-size: 16px;
+    font-weight: bold;
+    padding-top: 12px;
+  }
+
+  p:last-child {
+    padding-top: 12px;
+    text-align: right;
+  }
+}

src/views/preview-protocol/index.tsx

@@ -1,6 +1,7 @@
 import request from '@/helpers/request'
 import { state } from '@/state'
 import { defineComponent } from 'vue'
+import styles from './index.module.less'
 
 // 预览协议 - 原生实名认证使用
 export default defineComponent({
@@ -31,10 +32,7 @@ export default defineComponent({
   render() {
     return (
       <div id="mProtocol">
-        <div
-          style="font-size: 14px;padding: 12px;color: #333;line-height: 1.4;"
-          v-html={this.protocolHTML}
-        ></div>
+        <div class={styles.mProtocol} v-html={this.protocolHTML}></div>
       </div>
     )
   }