Просмотр исходного кода

Merge branch 'dev' of http://git.dayaedu.com/huangqiyong/classroom

黄琪勇 1 год назад
Родитель
Сommit
39d414d159

+ 7 - 1
.env.staging → .env.devProd

@@ -1,4 +1,4 @@
-# 测试环境
+# 开发打包
 
 VUE_APP_URL = "https://dev.resource.colexiu.com/cbs-app"
 VUE_APP_URL_GYM = "https://dev.dayaedu.com"
@@ -6,3 +6,9 @@ VUE_APP_URL_GYT = "https://dev.lexiaoya.cn"
 
 # 标注画板地址
 VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
+
+#管乐团 云教练
+VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
+
+#管乐迷 云教练
+VUE_APP_TEACH_GYM ="https://mantest.dayaedu.com/accompany/"

+ 14 - 0
.env.stagProd

@@ -0,0 +1,14 @@
+# 测试环境
+
+VUE_APP_URL = "https://test.resource.colexiu.com/cbs-app"
+VUE_APP_URL_GYM = "https://test..dayaedu.com"
+VUE_APP_URL_GYT = "https://test..lexiaoya.cn"
+
+# 标注画板地址
+VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
+
+#管乐团 云教练
+VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
+
+#管乐迷 云教练
+VUE_APP_TEACH_GYM ="https://mantest.dayaedu.com/accompany/"

+ 2 - 1
package.json

@@ -5,7 +5,8 @@
    "scripts": {
       "dev": "vue-cli-service serve",
       "build:prod": "vue-cli-service build",
-      "build:staging": "vue-cli-service build --mode staging",
+      "build:stagProd": "vue-cli-service build --mode stagProd",
+      "build:devProd": "vue-cli-service build --mode devProd",
       "lint": "vue-cli-service lint",
       "tsc": "vue-tsc --noEmit"
    },

+ 1 - 1
src/config/index.ts

@@ -10,6 +10,6 @@ export const URL_MAC_GYM_SECUREANTH = process.env.VUE_APP_MAC_GYM_SECUREANTH as
 export const URL_MAC_GYT_SECUREANTH = process.env.VUE_APP_MAC_GYT_SECUREANTH as string
 export const URL_WIN_SECUREANTH = process.env.VUE_APP_WIN_SECUREANTH as string
 
-// 云练地址
+// 云练地址
 export const URL_TEACH_GYT = process.env.VUE_APP_TEACH_GYT as string
 export const URL_TEACH_GYM = process.env.VUE_APP_TEACH_GYM as string

+ 2 - 2
src/config/menus.ts

@@ -15,7 +15,7 @@ export const menus_gyt: menuType[] = [
    {
       path: "/cloudTextbooks",
       component: "cloudTextbooks",
-      title: "云教材",
+      title: "云课堂",
       icon: "",
       meta: {
          routeType: "layout"
@@ -59,7 +59,7 @@ export const menus_gym: menuType[] = [
    {
       path: "/cloudTextbooks",
       component: "cloudTextbooks",
-      title: "云教材",
+      title: "云课堂",
       icon: "",
       meta: {
          routeType: "layout"

+ 1 - 1
src/router/modules.ts

@@ -1,6 +1,6 @@
 export default {
    homePage: () => import("@/views/homePage/homePage.vue"), // 首页
-   cloudTextbooks: () => import("@/views/cloudTextbooks"), // 云教材
+   cloudTextbooks: () => import("@/views/cloudTextbooks"), // 云课堂
    coursewarePlay: () => import("@/views/coursewarePlay"), // 播放器
    curriculum: () => import("@/views/curriculum") // 课表
 }

+ 2 - 2
src/views/cloudTextbooks/cloudTextbooks.vue

@@ -1,5 +1,5 @@
 <!--
-* @FileDescription: 云教材
+* @FileDescription: 云课堂
 * @Author: 黄琪勇
 * @Date:2024-03-21 15:11:49
 -->
@@ -74,7 +74,7 @@ const navs = [
       url: "/"
    },
    {
-      name: userStoreHook.roles === "GYM" ? "云教程" : "云教材"
+      name: "云课堂"
    }
 ]
 const classType = ref("")

+ 1 - 1
src/views/cloudTextbooks/useData.ts

@@ -163,7 +163,7 @@ export const useDataDetailList = () => {
                   name: item.coursewareDetailName,
                   id: item.lessonCoursewareDetailId,
                   useNum: item.useNum,
-                  lockFlag: false // 云教材默认不锁
+                  lockFlag: false // 云课堂默认不锁
                }
             })
             listData.value = chunkArray(chunkArray(data, 7), 2)

+ 3 - 3
src/views/homePage/homePage.vue

@@ -101,12 +101,12 @@ const classTypes_gym = [
    },
    {
       img: require("@/img/homePage/yjl.png"),
-      name: "云练",
+      name: "云练",
       url: ""
    },
    {
       img: require("@/img/homePage/yjc.png"),
-      name: "云教程",
+      name: "云课堂",
       url: "/cloudTextbooks"
    }
 ]
@@ -138,7 +138,7 @@ const classTypes_gyt = [
    },
    {
       img: require("@/img/homePage/yjc.png"),
-      name: "云教材",
+      name: "云课堂",
       url: "/cloudTextbooks"
    }
 ]