Browse Source

添加伴学老师乐团相册功能

lex 1 year ago
parent
commit
20fd37e3d3

+ 24 - 2
src/router/routes-teacher.ts

@@ -166,9 +166,31 @@ export default [
         meta: {
           title: '补助明细'
         }
+      },
+      {
+        path: '/school-photo',
+        name: 'school-photo',
+        component: () => import('@/school/orchestra/compontent/photo'),
+        meta: {
+          title: '乐团相册'
+        }
+      },
+      {
+        path: '/photo-detail',
+        name: 'photo-detail',
+        component: () => import('@/school/orchestra/compontent/photo-detail'),
+        meta: {
+          title: '相册详情'
+        }
+      },
+      {
+        path: '/orchestra-photo-create',
+        name: 'orchestra-photo-create',
+        component: () => import('@/school/orchestra/compontent/photo-create'),
+        meta: {
+          title: '创建相册'
+        }
       }
-
-      //unitDetail 选择阶段自测
     ]
   },
   ...rootRouter,

+ 10 - 14
src/school/orchestra/compontent/photo-create.tsx

@@ -4,31 +4,27 @@ import {
   ActionSheet,
   Button,
   closeToast,
-  Dialog,
   Field,
-  Image,
   List,
-  Popover,
   Popup,
   showConfirmDialog,
   showLoadingToast,
   showToast,
-  Space,
-  Sticky,
   Uploader
 } from 'vant'
 import { defineComponent, onMounted, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import styles from './photo.module.less'
-import iconPhoneDefaut from '../images/icon-photo-default.png'
+// import iconPhoneDefaut from '../images/icon-photo-default.png'
 import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import { getOssUploadUrl } from '@/state'
-import umiRequest from 'umi-request'
+// import umiRequest from 'umi-request'
 import { getUploadSign, onOnlyFileUpload } from '@/helpers/oss-file-upload'
+import { state as baseState } from '@/state'
 
 export default defineComponent({
-  name: 'phone',
+  name: 'phone-create',
   props: {
     height: {
       type: [String, Number],
@@ -68,7 +64,7 @@ export default defineComponent({
           return
         }
         if (state.selectType === 'add') {
-          await request.post('/api-school/orchestraPhotoAlbum/save', {
+          await request.post(baseState.platformApi + '/orchestraPhotoAlbum/save', {
             data: {
               orchestraId: route.query.orchestraId,
               name: state.photoName,
@@ -82,7 +78,7 @@ export default defineComponent({
           state.photoName = null
           onSearch()
         } else {
-          await request.post('/api-school/orchestraPhotoAlbum/update', {
+          await request.post(baseState.platformApi + '/orchestraPhotoAlbum/update', {
             data: {
               id: state.selectItem.id,
               orchestraId: route.query.orchestraId,
@@ -121,7 +117,7 @@ export default defineComponent({
       try {
         if (state.isLoading) return
         state.isLoading = true
-        const res = await request.post('/api-school/orchestraPhotoAlbum/page', {
+        const res = await request.post(baseState.platformApi + '/orchestraPhotoAlbum/page', {
           data: {
             ...state.params,
             orchestraId: route.query.orchestraId,
@@ -168,7 +164,7 @@ export default defineComponent({
         message: '您确认删除该相册吗?'
       }).then(async () => {
         try {
-          await request.post('/api-school/orchestraPhotoAlbum/remove', {
+          await request.post(baseState.platformApi + '/orchestraPhotoAlbum/remove', {
             requestType: 'form',
             data: {
               id: state.selectItem.id
@@ -220,7 +216,7 @@ export default defineComponent({
         console.log(files, 'files')
         const file = files.file
         // 获取签名
-        // const signUrl = '/api-school/open/getUploadSign'
+        // const signUrl = baseState.platformApi + '/open/getUploadSign'
         // const tempName = file.name || ''
         // const fileName = '/orchestra/' + (tempName && tempName.replace(/ /gi, '_'))
         // const key = new Date().getTime() + fileName
@@ -291,7 +287,7 @@ export default defineComponent({
         })
         console.log(files, 'onSubmitPhoto')
 
-        await request.post('/api-school/orchestraPhoto/save', {
+        await request.post(baseState.platformApi + '/orchestraPhoto/save', {
           data: {
             orchestraId: route.query.orchestraId,
             orchestraPhotoAlbumId: route.query.parentId,

+ 7 - 6
src/school/orchestra/compontent/photo-detail.tsx

@@ -14,7 +14,7 @@ import {
   Popup,
   showDialog,
   showFailToast,
-  showImagePreview,
+  // showImagePreview,
   showLoadingToast,
   showSuccessToast,
   showToast,
@@ -24,14 +24,15 @@ import { computed, defineComponent, onMounted, reactive } from 'vue'
 import { useRoute } from 'vue-router'
 import styles from './photo-detail.module.less'
 import iconDelete from '../images/icon-delete.png'
-import umiRequest from 'umi-request'
+// import umiRequest from 'umi-request'
 import { getOssUploadUrl } from '@/state'
 import checkboxCheck from '../images/icon-red-active.png'
 import checkboxDefault from '../images/icon-red-default.png'
 import iconDown from '../images/icon-down.png'
-import html2canvas from 'html2canvas'
+// import html2canvas from 'html2canvas'
 import { promisefiyPostMessage } from '@/helpers/native-message'
 import { getUploadSign, onOnlyFileUpload } from '@/helpers/oss-file-upload'
+import { state as baseState } from '@/state'
 
 export default defineComponent({
   name: 'photo-detail',
@@ -62,7 +63,7 @@ export default defineComponent({
       try {
         if (state.isLoading) return
         state.isLoading = true
-        const res = await request.post('/api-school/orchestraPhoto/page', {
+        const res = await request.post(baseState.platformApi + '/orchestraPhoto/page', {
           data: {
             ...state.params,
             orchestraPhotoAlbumId: route.query.photoId
@@ -171,7 +172,7 @@ export default defineComponent({
         })
         console.log(files, 'onSubmitPhoto')
 
-        await request.post('/api-school/orchestraPhoto/save', {
+        await request.post(baseState.platformApi + '/orchestraPhoto/save', {
           data: {
             orchestraPhotoAlbumId: route.query.photoId,
             fileUrl: files.join(',')
@@ -290,7 +291,7 @@ export default defineComponent({
       }).then(async () => {
         console.log(state.check, 'check')
         try {
-          await request.post('/api-school/orchestraPhoto/remove', {
+          await request.post(baseState.platformApi + '/orchestraPhoto/remove', {
             requestType: 'form',
             data: {
               ids: state.check.join(',')

+ 6 - 5
src/school/orchestra/compontent/photo.tsx

@@ -23,6 +23,7 @@ import iconPhoneDefaut from '../images/icon-photo-default.png'
 import iconOrchestra from '@/views/mine-orchestra/images/icon-or.png'
 import OSticky from '@/components/o-sticky'
 import OHeader from '@/components/o-header'
+import { state as baseState } from '@/state'
 
 export default defineComponent({
   name: 'phone',
@@ -65,7 +66,7 @@ export default defineComponent({
           return
         }
         if (state.selectType === 'add') {
-          await request.post('/api-school/orchestraPhotoAlbum/save', {
+          await request.post(baseState.platformApi + '/orchestraPhotoAlbum/save', {
             data: {
               name: state.photoName
             }
@@ -77,7 +78,7 @@ export default defineComponent({
           state.photoName = null
           onSearch()
         } else {
-          await request.post('/api-school/orchestraPhotoAlbum/update', {
+          await request.post(baseState.platformApi + '/orchestraPhotoAlbum/update', {
             data: {
               id: state.selectItem.id,
               orchestraId: route.query.id,
@@ -117,7 +118,7 @@ export default defineComponent({
       try {
         if (state.isLoading) return
         state.isLoading = true
-        const res = await request.post('/api-school/orchestraPhotoAlbum/page', {
+        const res = await request.post(baseState.platformApi + '/orchestraPhotoAlbum/page', {
           data: {
             ...state.params,
             schoolId: state.school.id
@@ -144,7 +145,7 @@ export default defineComponent({
 
     // const getSchoolList = async () => {
     //   try {
-    //     const res = await request.post('/api-school/school/page', {
+    //     const res = await request.post(baseState.platformApi + '/school/page', {
     //       data: {
     //         page: 1,
     //         rows: 999
@@ -194,7 +195,7 @@ export default defineComponent({
         message: '您确认删除该相册吗?'
       }).then(async () => {
         try {
-          await request.post('/api-school/orchestraPhotoAlbum/remove', {
+          await request.post(baseState.platformApi + '/orchestraPhotoAlbum/remove', {
             requestType: 'form',
             data: {
               id: state.selectItem.id