소스 검색

修改样式

lex 2 년 전
부모
커밋
c214634386

+ 7 - 7
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>

+ 12 - 12
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

+ 2 - 1
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'}

+ 3 - 9
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

+ 5 - 5
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

+ 3 - 1
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()

+ 9 - 1
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 {
         //