Sākums
Pierakstīties
872880485
/
nml_mobile
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Merge branch 'master' into houxq

houxq 1 gadu atpakaļ
vecāks
bc2e82c322 4bb8b5a935
revīzija
1ea4d2e9af
12 mainītis faili ar 1835 papildinājumiem un 243 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 6 1
      index.html
  2. 1 0
      package.json
  3. 1781 225
      pnpm-lock.yaml
  4. 0 3
      src/components.d.ts
  5. 8 5
      src/main.js
  6. 1 1
      src/pages/_home/index.vue
  7. 1 1
      src/pages/stxk/jz/index.vue
  8. 6 2
      src/pages/stxk/jz/kcxq.vue
  9. 1 1
      src/pages/stxk/jz/wd/index.vue
  10. 2 2
      src/store/children.js
  11. 1 1
      src/utils/request.js
  12. 27 1
      vite.config.js

+ 6 - 1
index.html
Parādīt failu 

@@ -11,7 +11,12 @@
 
   </head>
 
 
   <body>
 
-    <div id="app"></div>
 
+    <div id="app">
 
+      加载中...
 
+    </div>
 
+    <noscript>
 
+      <div>Please enable JavaScript to use this application.</div>
 
+    </noscript>
 
     <script src="/config.js"></script>
 
     <script type="module" src="/src/main.js"></script>
 
     <script src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>

+ 1 - 0
package.json
Parādīt failu 

@@ -19,6 +19,7 @@
 
   },
 
   "devDependencies": {
 
     "@iconify/json": "^2.1.98",
 
+    "@vitejs/plugin-legacy": "^4.1.1",
 
     "@vitejs/plugin-vue": "^3.0.3",
 
     "sass": "^1.54.5",
 
     "unplugin-auto-import": "^0.11.2",

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1781 - 225
pnpm-lock.yaml


+ 0 - 3
src/components.d.ts
Parādīt failu 

@@ -41,14 +41,11 @@ declare module '@vue/runtime-core' {
 
     VanRadio: typeof import('vant/es')['Radio']
 
     VanRadioGroup: typeof import('vant/es')['RadioGroup']
 
     VanRate: typeof import('vant/es')['Rate']
 
-<<<<<<< HEAD
 
-=======
 
     VanSkeleton: typeof import('vant/es')['Skeleton']
 
     VanStep: typeof import('vant/es')['Step']
 
     VanSteps: typeof import('vant/es')['Steps']
 
     VanSticky: typeof import('vant/es')['Sticky']
 
     VanSubmitBar: typeof import('vant/es')['SubmitBar']
 
->>>>>>> master
 
     VanSwipe: typeof import('vant/es')['Swipe']
 
     VanSwipeItem: typeof import('vant/es')['SwipeItem']
 
     VanTab: typeof import('vant/es')['Tab']

+ 8 - 5
src/main.js
Parādīt failu 

@@ -2,21 +2,24 @@ import { createApp } from 'vue'
 
 import user from '~/store/user'
 
 import 'default-passive-events'
 
 import 'virtual:windi.css';
 
+import VConsole from 'vconsole';
 
+
 
+if (window.debug) {
 
+  const vConsole = new VConsole();
 
+}
 
 
-// import VConsole from 'vconsole';
 
-// const vConsole = new VConsole();
 
 
 import App from './App.vue'
 
 import router from './router/index';
 
 
 router.beforeEach((to, from, next) => {
 
-    console.log(to);
 
+  console.log(to);
 
   if (to.meta?.loginRequest) { // 如果路由meta中loginRequest为true，进行拦截
 
     if (user.token) {
 
       next()
 
     } else {
 
-        window.location.href =
 
-          "https://nmlm.bozedu.net/login.html?redirect=" + to.fullPath;
 
+      window.location.href =
 
+        "https://nmlm.bozedu.net/login.html?redirect=" + to.fullPath;
 
     }
 
   } else {
 
     next() // 直接进入页面

+ 1 - 1
src/pages/_home/index.vue
Parādīt failu 

@@ -120,7 +120,7 @@ function initData() {
 
   }).then((res) => {
 
     if (res.code == "1") {
 
       childrenList = res.data.info;
 
-      sessionStorage.setItem("children", JSON.stringify(res.data.info));
 
+      localStorage.setItem("children", JSON.stringify(res.data.info));
 
       // setChild(res.data.info[0]);
 
     }
 
   });

+ 1 - 1
src/pages/stxk/jz/index.vue
Parādīt failu 

@@ -5,7 +5,7 @@ import { child } from '~/store/child';
 
 // import { children } from '~/store/children';
 
 import getTeamInfo from '~/store/team';
 
 
-const children = JSON.parse(sessionStorage.getItem('children'))
 
+const children = JSON.parse(localStorage.getItem('children'))
 
 console.log('children :>> ', children);
 
 
 function handleNavLeftClick() {

+ 6 - 2
src/pages/stxk/jz/kcxq.vue
Parādīt failu 

@@ -11,7 +11,7 @@ const props = defineProps({
 
   },
 
 });
 
 let child = $ref(childInfo);
 
-const children = JSON.parse(sessionStorage.getItem('children'))
 
+const children = JSON.parse(localStorage.getItem('children'))
 
 let childrenCols = $ref([])
 
 const router = useRouter();
 
 function handleNavLeftClick() {
 
@@ -66,7 +66,9 @@ function handleSubmitbarClick() {
 
   console.log("handleSubmitbarClick", orderStatus, child);
 
   // const grades = (detailInfo.kk_grade_id).split(',').filter(item => item !== '')
 
   const grades = (detailInfo?.kk_grade_id)?.split(',')?.filter(item => item !== '') ?? []
 
-  if (grades.indexOf(child.cm_info[0].grade) === -1) {
 
+  console.log('grades : ', grades)
 
+  console.log('child.cm_info[0].grade : ', child.cm_info[0].grade)
 
+  if (child.cm_info[0].grade && grades.indexOf(child.cm_info[0].grade) === -1) {
 
     showFailToast('该学生不在可报名年级范围内')
 
     return
 
   }
 
@@ -97,6 +99,8 @@ function handleSubmitbarClick() {
 
         location.replace(
 
           `http://wx.bozedu.net/get-weixin-code.html?appid=${window.GLOBAL_CONFIG.appid}&redirect_uri=${_href}&state=1`
 
         );
 
+      } else {
 
+        orderStatus = 2;
 
       }
 
     }
 
   });

+ 1 - 1
src/pages/stxk/jz/wd/index.vue
Parādīt failu 

@@ -1,6 +1,6 @@
 
 <script setup>
 
 import { child } from '~/store/child';
 
-const children = JSON.parse(sessionStorage.getItem('children'))
 
+const children = JSON.parse(localStorage.getItem('children'))
 
 
 const handleNavLeftClick = () => {
 
   router.back()

+ 2 - 2
src/store/children.js
Parādīt failu 

@@ -5,7 +5,7 @@ await request({
 
   url: '/user/main/my_child',
 
 }).then(res => {
 
   if (res.code === '1') {
 
-    sessionStorage.setItem('children', JSON.stringify(res.data.info))
 
+    localStorage.setItem('children', JSON.stringify(res.data.info))
 
   }
 
 })
 
-export const children = JSON.parse(sessionStorage.getItem('children'))
 
+export const children = JSON.parse(localStorage.getItem('children'))

+ 1 - 1
src/utils/request.js
Parādīt failu 

@@ -37,7 +37,7 @@ _request.interceptors.request.use(
 
 _request.interceptors.response.use(
 
   (response) => {
 
     response.data.code = response.data?.code?.toString()
 
-    response.data.msg = response.data.msg.replaceAll(/<.*?>/g, ' ')
 
+    response.data.msg = response.data.msg.replace(/<.*?>/g, ' ')
 
     const { code, msg } = response.data
 
     if (code !== '1' && code !== '0') {
 
       showFailToast(msg)

+ 27 - 1
vite.config.js
Parādīt failu 

@@ -7,10 +7,13 @@ import Components from 'unplugin-vue-components/vite'
 
 import { VantResolver } from 'unplugin-vue-components/resolvers'
 
 import Icons from 'unplugin-icons/vite'
 
 import IconsResolver from 'unplugin-icons/resolver'
 
+import legacy from '@vitejs/plugin-legacy'
 
 
 // https://vitejs.dev/config/
 
 export default defineConfig({
 
-  base:'/page/new/',
 
+
 
+
 
+  base: '/page/new/',
 
   resolve: {
 
     alias: {
 
       '@': path.resolve(__dirname, 'src'),
 
@@ -31,6 +34,29 @@ export default defineConfig({
 
     }
 
   },
 
   plugins: [
 
+    legacy({
 
+      targets: ['defaults', 'ie >= 11', 'chrome 52'],  //需要兼容的目标列表，可以设置多个
 
+      additionalLegacyPolyfills: ['regenerator-runtime/runtime'],
 
+      renderLegacyChunks: true,
 
+      polyfills: [
 
+        'es.symbol',
 
+        'es.array.filter',
 
+        'es.promise',
 
+        'es.promise.finally',
 
+        'es/map',
 
+        'es/set',
 
+        'es.array.for-each',
 
+        'es.object.define-properties',
 
+        'es.object.define-property',
 
+        'es.object.get-own-property-descriptor',
 
+        'es.object.get-own-property-descriptors',
 
+        'es.object.keys',
 
+        'es.object.to-string',
 
+        'web.dom-collections.for-each',
 
+        'esnext.global-this',
 
+        'esnext.string.match-all'
 
+      ]
 
+    }),
 
     vue({
 
       reactivityTransform: true
 
     }),