更新

src/school/school-detail/index.tsx

@@ -46,7 +46,8 @@ export default defineComponent({
         const { data } = await request.post(`/api-school/teacher/page`, {
           data: {
             page: 1,
-            rows: 9999
+            rows: 9999,
+            delFlag: false
           }
         })
         state.list = data.rows

src/school/school-detail/modals/teacher-item.module.less

@@ -49,6 +49,7 @@
         display: flex;
         flex-direction: row;
         align-items: center;
+        flex-wrap: wrap;
         margin-top: 1px;
         .statusTag {
           font-size: 12px;

src/school/train-planning/modal/calendar/index.tsx

@@ -13,6 +13,9 @@ dayjs.extend(isSameOrBefore)
 export default defineComponent({
   name: 'calendar',
   props: {
+    /**
+     * @description 选中的日期
+     */
     calendarDate: {
       type: String,
       default: ''

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

@@ -136,8 +136,8 @@ export default defineComponent({
           state.check.includes(item.goodsId) &&
           !state.paymentOrderDetails.includes(item.goodsType)
         ) {
-          tempPrice.needPrice += parseFloat(item.currentPrice)
-          tempPrice.originalPrice += parseFloat(item.originalPrice)
+          tempPrice.needPrice += parseFloat(item.currentPrice || 0)
+          tempPrice.originalPrice += parseFloat(item.originalPrice || 0)
         }
       })
 

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

@@ -49,9 +49,9 @@ export default defineComponent({
           const img = item.goodsUrl ? item.goodsUrl.split(',')[0] : ''
           item.goodsUrl = img
 
-          if (item.goodsType === 'REPAIR') {
+          if (item.goodsType === 'INSTRUMENTS') {
             hasInstrument = true
-          } else if (item.goodsType === 'INSTRUMENTS') {
+          } else if (item.goodsType === 'TEXTBOOK') {
             hasTextbook = true
           }
         })
@@ -63,6 +63,7 @@ export default defineComponent({
 
         // 判断运费状态
         // 如果没有购买商品，有购买教材则『到付』 其它则免运费
+        console.log(hasInstrument, hasTextbook)
         if (!hasInstrument && hasTextbook) {
           state.freight = '到付'
         } else {