修改地址

src/utils/auth.js

@@ -1,5 +1,5 @@
 import Cookies from "js-cookie";
-import {Session,Local} from './storage'
+import { Session, Local } from "./storage";
 const TokenKey = getKeyWordKey();
 // const CrossTokenKey = 'Admin-Token'
 const CrossTokenKey = "Admin-Token";
@@ -23,13 +23,17 @@ function getCookieDomain() {
 // 获取token关键字
 function getKeyWordKey() {
   const origin = window.location.origin;
-  return origin.indexOf("online.") >= 0
+  return origin.indexOf("online.") >= 0 || origin === "gym.lexiaoya.cn"
     ? "dy_admin_token"
     : "dy_admin_token_test";
 }
 
 export function getToken() {
-  return Cookies.get(TokenKey, { domain: getCookieDomain() }) ||  Local.get('token') ||  Session.get('token');
+  return (
+    Cookies.get(TokenKey, { domain: getCookieDomain() }) ||
+    Local.get("token") ||
+    Session.get("token")
+  );
 }
 
 export function getTenantId() {
@@ -39,14 +43,14 @@ export function getTenantId() {
 }
 
 export function setToken(token) {
-  Session.set('token',token)
-  Local.set('token',token)
+  Session.set("token", token);
+  Local.set("token", token);
   return Cookies.set(TokenKey, token, { domain: getCookieDomain() });
 }
 
 export function removeToken() {
-  Session.set('token','')
-  Local.set('token','')
+  Session.set("token", "");
+  Local.set("token", "");
   Cookies.set(TokenKey, "");
   return Cookies.remove(TokenKey);
 }

src/utils/validate.js

@@ -37,6 +37,22 @@ export function vaildStudentUrl() {
   return returnUrl;
 }
 
+// 基础地址
+export function vaildUrl() {
+  let url = window.location.hostname;
+  let returnUrl = "";
+  if (/dev/.test(url)) {
+    // dev 环境
+    returnUrl = "https://dev.gym.lexiaoya.cn";
+  } else if (/test/.test(url)) {
+    // dev 环境
+    returnUrl = "https://test.gym.lexiaoya.cn";
+  } else {
+    returnUrl = "https://gym.lexiaoya.cn";
+  }
+  return returnUrl;
+}
+
 // 老师地址
 export function vaildTeacherUrl() {
   let url = window.location.hostname;

src/views/liveClassManager/liveClassTwo/components/courseAdjust.vue

@@ -92,9 +92,11 @@
                     style="width: 100px"
                     v-if="
                       scope.row.id &&
-                      !scope.row.isSettlement &&
-                      scope.row.status != 'UNDERWAY' &&
-                      $helpers.permission('courseSchedule/classStartDateAdjust/liveReset')
+                        !scope.row.isSettlement &&
+                        scope.row.status != 'UNDERWAY' &&
+                        $helpers.permission(
+                          'courseSchedule/classStartDateAdjust/liveReset'
+                        )
                     "
                     @click.native="resetClass(scope.row)"
                   >
@@ -113,17 +115,23 @@
                     "
                     v-if="
                       scope.row.id &&
-                      $helpers.permission('courseSchedule/updateCourseScheduleShareMode')
+                        $helpers.permission(
+                          'courseSchedule/updateCourseScheduleShareMode'
+                        )
                     "
                   >
-                    <el-button type="text" :disabled="scope.row.status == 'OVER'"
+                    <el-button
+                      type="text"
+                      :disabled="scope.row.status == 'OVER'"
                       >分享</el-button
                     >
                   </el-dropdown-item>
                   <el-dropdown-item
                     v-if="
                       scope.row.id &&
-                      $helpers.permission('courseSchedule/classStartDateAdjust/liveReset')
+                        $helpers.permission(
+                          'courseSchedule/classStartDateAdjust/liveReset'
+                        )
                     "
                     @click.native="
                       () => {
@@ -141,7 +149,8 @@
                     <el-button
                       type="text"
                       :disabled="
-                        scope.row.status == 'OVER' || scope.row.shareMode == 'NO_SHARE'
+                        scope.row.status == 'OVER' ||
+                          scope.row.shareMode == 'NO_SHARE'
                       "
                       >二维码</el-button
                     >
@@ -150,7 +159,9 @@
                   <el-dropdown-item
                     v-if="
                       scope.row.id &&
-                      $helpers.permission('courseShare/queryCourseSharedStudent')
+                        $helpers.permission(
+                          'courseShare/queryCourseSharedStudent'
+                        )
                     "
                     @click.native="
                       () => {
@@ -168,7 +179,8 @@
                     <el-button
                       type="text"
                       :disabled="
-                        scope.row.status == 'OVER' || scope.row.shareMode !== 'PRIVATE'
+                        scope.row.status == 'OVER' ||
+                          scope.row.shareMode !== 'PRIVATE'
                       "
                       >分享列表</el-button
                     >
@@ -178,7 +190,9 @@
                     @click.native="lookViedoList(scope.row)"
                     v-if="
                       scope.row.videoNum > 0 &&
-                      $helpers.permission('courseShare/queryCourseSharedStudent')
+                        $helpers.permission(
+                          'courseShare/queryCourseSharedStudent'
+                        )
                     "
                   >
                     <el-button type="text">回放</el-button>
@@ -193,7 +207,11 @@
       </el-table>
     </div>
 
-    <el-dialog :title="adjustmentName" width="800px" :visible.sync="adjustmentVisible">
+    <el-dialog
+      :title="adjustmentName"
+      width="800px"
+      :visible.sync="adjustmentVisible"
+    >
       <el-form
         :model="adjustmentForm"
         label-position="right"
@@ -227,7 +245,9 @@
             value-format="yyyy-MM-dd"
             placeholder="选择日期"
           ></el-date-picker>
-          <el-checkbox style="margin-left: 10px" v-model.trim="adjustmentForm.checked"
+          <el-checkbox
+            style="margin-left: 10px"
+            v-model.trim="adjustmentForm.checked"
             >是否跳过节假日</el-checkbox
           >
         </el-form-item>
@@ -261,14 +281,14 @@
               placeholder
               v-model.trim="item.startClassTime"
               @change="
-                (val) => {
+                val => {
                   changeStartTimes(val, item);
                 }
               "
               format="HH:mm"
               value-format="HH:mm"
               :picker-options="{
-                selectableRange: '06:00:00 - 21:00:00',
+                selectableRange: '06:00:00 - 21:00:00'
               }"
             ></el-time-picker>
             <span style="margin-left: 10px">结束时间</span>
@@ -280,7 +300,7 @@
               value-format="HH:mm"
               disabled
               :picker-options="{
-                selectableRange: '06:00:00 - 21:00:00',
+                selectableRange: '06:00:00 - 21:00:00'
               }"
             ></el-time-picker>
             <el-button
@@ -332,7 +352,7 @@
             format="HH:mm"
             value-format="HH:mm"
             :picker-options="{
-              selectableRange: `${nowTime} - 23:30:00`,
+              selectableRange: `${nowTime} - 23:30:00`
             }"
           ></el-time-picker>
         </el-form-item>
@@ -461,24 +481,28 @@
 <script>
 import { resetCourse } from "@/api/buildTeam";
 import { vipCourseAdjust } from "@/api/vipSeting";
-import { liveCourseList, createLiveGroupShare, getCourseVideoList } from "../../api";
+import {
+  liveCourseList,
+  createLiveGroupShare,
+  getCourseVideoList
+} from "../../api";
 import { diffTimerFormMinute, addTimerFormMinute } from "@/utils/date";
 import { shareLiveTypeList } from "@/utils/searchArray";
-import { vaildStudentUrl } from "@/utils/validate";
+import { vaildUrl } from "@/utils/validate";
 import dayjs from "dayjs";
 import qrCode from "@/components/QrCode/index";
 import videoPlace from "../../images/video-place.png";
 import HLSCore from "@core-player/playcore-hls";
 export default {
   components: {
-    qrCode,
+    qrCode
   },
   data() {
     return {
       shareModeList: shareLiveTypeList,
       searchForm: {
         id: this.$route.query.id,
-        shareMode: "",
+        shareMode: ""
       },
       adjustmentName: "",
       tableList: [],
@@ -487,7 +511,7 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       chioseVipList: [],
       activeList: [],
@@ -499,14 +523,14 @@ export default {
         addCount: "",
         courseType: "ONLINE",
         fee: "",
-        address: "",
+        address: ""
       },
       adjustmentRules: {
         courseTime: [{ required: true, message: "请选择开始时间" }],
         addCount: [{ required: true, message: "请输入加课次数" }],
         courseType: [{ required: true, message: "请选择课程类型" }],
         fee: [{ required: true, message: "请输入费用" }],
-        address: [{ required: true, message: "请选择教学地点" }],
+        address: [{ required: true, message: "请选择教学地点" }]
       },
       weekDateList: [
         { value: "1", label: "星期一" },
@@ -515,15 +539,15 @@ export default {
         { value: "4", label: "星期四" },
         { value: "5", label: "星期五" },
         { value: "6", label: "星期六" },
-        { value: "7", label: "星期日" },
+        { value: "7", label: "星期日" }
       ],
       weekList: [
         {
           dayOfWeek: "",
           startTime: "",
           endTime: "",
-          moid: new Date().getTime(),
-        },
+          moid: new Date().getTime()
+        }
       ],
       courseVisible: false,
       maskForm: {
@@ -532,15 +556,15 @@ export default {
         endTime: "",
         id: "",
         address: "",
-        teachMode: "",
+        teachMode: ""
       },
       maskRules: {
-        date: [{ required: true, message: "请选择上课时间", trigger: "blur" }],
+        date: [{ required: true, message: "请选择上课时间", trigger: "blur" }]
       },
       startTime: "",
       shareModeForm: {
         shareMode: "OPEN",
-        courseId: "",
+        courseId: ""
       },
       shareModeVisible: false,
       codeStatus: false,
@@ -550,7 +574,7 @@ export default {
       videoVisible: false,
       videoList: [],
       videoPlace,
-      HLSCore,
+      HLSCore
     };
   },
   mounted() {
@@ -560,13 +584,13 @@ export default {
     lookCode(row) {
       this.actvieRow = row;
       this.qrCodeUrl =
-        vaildStudentUrl() + `/mlive/?courseId=${row.id}&isLogin=true#/login`;
+        vaildUrl() + `/mlive/?courseId=${row.id}&isLogin=true#/login`;
       this.codeStatus = true;
     },
     gotoShareList(row) {
       this.$router.push({
         path: "/business/liveShareStudentList",
-        query: { ...this.$route.query, courseId: row.id },
+        query: { ...this.$route.query, courseId: row.id }
       });
     },
     search() {
@@ -583,7 +607,7 @@ export default {
           liveGroupId: this.searchForm.id,
           rows: this.rules.limit,
           page: this.rules.page,
-          ...this.searchForm,
+          ...this.searchForm
         });
         this.tableList = data.list;
         // this.rules.total = data.pageInfo.total;
@@ -603,7 +627,7 @@ export default {
         dayOfWeek: "",
         startClassTime: "",
         endClassTime: "",
-        id: new Date(),
+        id: new Date()
       });
     },
     // 删除循环周
@@ -631,9 +655,9 @@ export default {
       let self = this;
       return {
         firstDayOfWeek: 1,
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() + 86400000 <= new Date().getTime();
-        },
+        }
       };
     },
     pickerOptions(dateStr) {
@@ -641,7 +665,7 @@ export default {
         firstDayOfWeek: 1,
         disabledDate(time) {
           return time.getTime() + 86400000 <= new Date().getTime();
-        },
+        }
       };
     },
     resetClass(row) {
@@ -667,7 +691,7 @@ export default {
         endTime: "",
         id: "",
         address: "",
-        teachMode: "",
+        teachMode: ""
       };
       this.$refs["maskForm"].resetFields();
     },
@@ -677,7 +701,9 @@ export default {
         this.$message.error("请填写修改时间");
         return;
       }
-      let classTime = this.maskForm.date ? new Date(this.maskForm.date) : new Date();
+      let classTime = this.maskForm.date
+        ? new Date(this.maskForm.date)
+        : new Date();
       let ymd =
         classTime.getFullYear() +
         "-" +
@@ -695,9 +721,9 @@ export default {
         classDate: this.maskForm.date,
         schoolId: this.maskForm.address || null,
         teachMode: this.maskForm.teachMode || null,
-        groupType: "LIVE",
+        groupType: "LIVE"
       };
-      resetCourse(obj).then((res) => {
+      resetCourse(obj).then(res => {
         if (res.code == 200) {
           this.$message.success("修改成功");
           this.courseVisible = false;
@@ -708,7 +734,7 @@ export default {
       });
     },
     submitAdjustment() {
-      this.$refs["adjustmentForm"].validate((item) => {
+      this.$refs["adjustmentForm"].validate(item => {
         if (item) {
           let week = this.weekList;
           if (!week[0] || !week[0].startClassTime || !week[0].dayOfWeek) {
@@ -718,7 +744,7 @@ export default {
           // 开始
           let obj = {};
           obj.courseCreateStartTime = this.adjustmentForm.courseTime;
-          let idArr = this.activeList.map((item) => {
+          let idArr = this.activeList.map(item => {
             return item.id;
           });
 
@@ -730,7 +756,7 @@ export default {
           obj.groupType = "LIVE";
           obj.vipGroupId = this.searchForm.id;
           obj.schoolId = this.adjustmentForm.address || null;
-          vipCourseAdjust(obj).then((res) => {
+          vipCourseAdjust(obj).then(res => {
             if (res.code == 200) {
               this.$message.success("恭喜您修改成功");
               this.adjustmentVisible = false;
@@ -741,7 +767,7 @@ export default {
       });
     },
     changeStartTime(val) {
-      this.$nextTick((res) => {
+      this.$nextTick(res => {
         if (val) {
           this.$set(
             this.maskForm,
@@ -757,10 +783,14 @@ export default {
       });
     },
     changeStartTimes(val, item) {
-      this.$nextTick((res) => {
+      this.$nextTick(res => {
         if (val) {
           let str = dayjs(new Date()).format("YYYY-MM-DD");
-          this.$set(item, "endClassTime", addTimerFormMinute(str, val, this.courseTime));
+          this.$set(
+            item,
+            "endClassTime",
+            addTimerFormMinute(str, val, this.courseTime)
+          );
         } else {
           this.$set(item, "endClassTime", "");
         }
@@ -784,7 +814,7 @@ export default {
       try {
         const res = await createLiveGroupShare({
           ...this.shareModeForm,
-          shareMode: this.shareModeForm.shareMode,
+          shareMode: this.shareModeForm.shareMode
         });
 
         this.shareModeVisible = false;
@@ -813,7 +843,7 @@ export default {
       } catch (e) {
         console.log(e);
       }
-    },
+    }
   },
   computed: {
     nowTime() {
@@ -824,7 +854,7 @@ export default {
       }
 
       return str;
-    },
+    }
   },
   filters: {
     formatterTime(val) {
@@ -837,10 +867,18 @@ export default {
       return result;
     },
     formatterStatus(val) {
-      let arr = ["未开始", "报名中", "进行中", "取消", "已结束", "报名结束", "暂停"];
+      let arr = [
+        "未开始",
+        "报名中",
+        "进行中",
+        "取消",
+        "已结束",
+        "报名结束",
+        "暂停"
+      ];
       return arr[val];
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/liveClassManager/modals/shareDetail.vue

@@ -10,7 +10,10 @@
       <el-form-item label="分享方式" v-if="form.shareTarget == 2">
         <el-radio v-model="form.shareType" label="1">链接分享</el-radio>
         <el-radio v-model="form.shareType" label="2">二维码分享</el-radio>
-        <el-radio v-model="form.shareType" label="3" v-if="row.viewMode != 'VISITOR'"
+        <el-radio
+          v-model="form.shareType"
+          label="3"
+          v-if="row.viewMode != 'VISITOR'"
           >群聊分享</el-radio
         >
       </el-form-item>
@@ -25,14 +28,20 @@
           <p>直播内容：{{ row.liveRemark }}</p>
           <!-- 为1是主讲人的 -->
           <template v-if="this.row.os == 'client'">
-            <p v-if="form.shareTarget == 1">下载地址：https://www.dayaedu.com</p>
+            <p v-if="form.shareTarget == 1">
+              下载地址：https://www.dayaedu.com
+            </p>
             <p v-else>直播地址：{{ url }}</p>
-            <p v-if="form.shareTarget == 1">请在电脑浏览器中打开以上链接进行下载</p>
+            <p v-if="form.shareTarget == 1">
+              请在电脑浏览器中打开以上链接进行下载
+            </p>
           </template>
           <template v-else>
             <p v-if="form.shareTarget == 1">直播地址：{{ Teacherurl }}</p>
             <p v-else>直播地址：{{ url }}</p>
-            <p v-if="form.shareTarget == 1">请在电脑浏览器中打开以上链接进行直播</p>
+            <p v-if="form.shareTarget == 1">
+              请在电脑浏览器中打开以上链接进行直播
+            </p>
           </template>
         </div>
         <div
@@ -78,7 +87,7 @@ import Clipboard from "clipboard";
 import preview from "./preview";
 import groupChat from "./groupChat";
 import { shareGroup } from "../api";
-import { vaildStudentUrl } from "@/utils/validate";
+import { vaildUrl } from "@/utils/validate";
 export default {
   props: ["row"],
   components: { preview, groupChat },
@@ -86,12 +95,12 @@ export default {
     return {
       form: {
         shareTarget: "1",
-        shareType: "1",
+        shareType: "1"
       },
       content: "",
       url: "",
       Teacherurl: "",
-      clipboard: null,
+      clipboard: null
     };
   },
   mounted() {
@@ -99,13 +108,17 @@ export default {
     console.log(this.row);
     if (this.row.viewMode == "VISITOR") {
       this.url =
-        vaildStudentUrl() +
-        `/mlive/?roomUid=${this.row.roomUid}&speakerId=${this.row.speakerId}&isLogin=false#/live`;
+        vaildUrl() +
+        `/mlive/?roomUid=${this.row.roomUid}&speakerId=${
+          this.row.speakerId
+        }&isLogin=false#/live`;
     } else {
       this.url =
-        vaildStudentUrl() +
-        `/mlive/?roomUid=${this.row.roomUid}&speakerId=${this.row.speakerId}&isLogin=true#/login`;
-      // this.url = vaildStudentUrl() + `/#/liveClassTransfer?roomUid=${this.row.roomUid}`;
+        vaildUrl() +
+        `/mlive/?roomUid=${this.row.roomUid}&speakerId=${
+          this.row.speakerId
+        }&isLogin=true#/login`;
+      // this.url = vaildUrl() + `/#/liveClassTransfer?roomUid=${this.row.roomUid}`;
     }
 
     let domain = window.location.origin;
@@ -131,39 +144,37 @@ export default {
       let text = "";
       if (this.form.shareTarget == 1) {
         if (this.row.os == "client") {
-          text = `乐团老师邀请您参与直播课！\n${this.row.roomTitle || ""}\n开播时间：${
-            this.row.liveStartTime || ""
-          }\n直播内容：${
-            this.row.liveRemark || ""
-          }\n下载地址：https://www.dayaedu.com\n请在电脑浏览器中打开以上链接进行下载`;
+          text = `乐团老师邀请您参与直播课！\n${this.row.roomTitle ||
+            ""}\n开播时间：${this.row.liveStartTime || ""}\n直播内容：${this.row
+            .liveRemark ||
+            ""}\n下载地址：https://www.dayaedu.com\n请在电脑浏览器中打开以上链接进行下载`;
         } else {
-          text = `乐团老师邀请您参与直播课！\n${this.row.roomTitle || ""}\n开播时间：${
-            this.row.liveStartTime || ""
-          }\n直播内容：${this.row.liveRemark || ""}\n直播地址：${
+          text = `乐团老师邀请您参与直播课！\n${this.row.roomTitle ||
+            ""}\n开播时间：${this.row.liveStartTime || ""}\n直播内容：${this.row
+            .liveRemark || ""}\n直播地址：${
             this.Teacherurl
           }\n请在电脑浏览器中打开以上链接进行直播`;
         }
       } else {
-        text = `乐团老师邀请您参与直播课！\n${this.row.roomTitle || ""}\n主讲人：${
-          this.row.speakerName
-        }\n开播时间：${this.row.liveStartTime || ""}\n直播内容：${
-          this.row.liveRemark || ""
-        }\n直播地址：${this.url}\n`;
+        text = `乐团老师邀请您参与直播课！\n${this.row.roomTitle ||
+          ""}\n主讲人：${this.row.speakerName}\n开播时间：${this.row
+          .liveStartTime || ""}\n直播内容：${this.row.liveRemark ||
+          ""}\n直播地址：${this.url}\n`;
       }
 
       var clipboard = new Clipboard(".shareText", {
-        text: function (trigger) {
+        text: function(trigger) {
           // console.log(trigger,text)
           return text;
-        },
+        }
       });
-      clipboard.on("success", (e) => {
+      clipboard.on("success", e => {
         this.$message.success("复制成功");
         this.$emit("close");
         // 释放内存
         clipboard.destroy();
       });
-      clipboard.on("error", (e) => {
+      clipboard.on("error", e => {
         // 不支持复制
         console.log("该浏览器不支持自动复制");
         // 释放内存
@@ -191,7 +202,7 @@ export default {
       }
       var node = document.getElementById("preview");
       toPng(node)
-        .then((dataUrl) => {
+        .then(dataUrl => {
           var img = new Image();
           img.src = dataUrl;
           // 在这里下载
@@ -203,7 +214,7 @@ export default {
           link.click();
           this.$emit("close");
         })
-        .catch(function (error) {
+        .catch(function(error) {
           console.error("oops, something went wrong!", error);
         });
     },
@@ -219,7 +230,7 @@ export default {
       try {
         let obj = {
           groupIds: checkList.join(","),
-          roomUid: this.row.roomUid,
+          roomUid: this.row.roomUid
         };
         const res = await shareGroup(obj);
         this.$message.success("分享成功");
@@ -235,8 +246,8 @@ export default {
       if (val == 1) {
         this.form.shareType = "1";
       }
-    },
-  },
+    }
+  }
 };
 </script>