feat:合并分支

.env

@@ -4,12 +4,17 @@ VITE_OUTPUT_DIR=./dist
 VITE_BASE_LOGIN_URL=//u-pre.boe.com/m/loginuser?returnUrl=
 VITE_PROXY_URL=http://43.143.139.204/manageApi
 
-
+# 在线
 VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id=
+# 不用 案例
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
+# 测评  不用
 VITE_BOE_TEST_DETAIL_URL=//u-pre.boe.com/web/quizsummary?detailId=
+# 测评 不用
 VITE_BOE_TEST_OUT_DETAIL_URL=//u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
+# 考试
 VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
+# 不用
 VITE_BOE_PATH_DETAIL_URL=//u-pre.boe.com/pc/forward?to=/student-h5
 
 VITE_BOE_API_URL=https://u-pre.boe.com
@@ -21,3 +26,7 @@ VITE_BOE_BASE_URL=//u-pre.boe.com
 VITE_IMG=/manageApi
 VITE_BASE_FILE_PATH=/fe-student-h5/upload
 VITE_FILE_PATH=/upload/
+
+
+#h5的基本url
+VITE_BOE_HOME=//u-pre.boe.com/mobile/pages/index/index

.env.prod

@@ -16,3 +16,6 @@ VITE_TASK_WHITE_TYPE=-22-
 VITE_BOE_BASE_URL=//u.boe.com
 
 VITE_IMG=/manageApi
+
+#h5的基本url
+VITE_BOE_HOME=//u.boe.com/mobile/pages/index/index

.env.release

@@ -2,14 +2,17 @@ VITE_BASE=/student-h5-release
 VITE_BASE_API=/manageApi-release
 VITE_BASE_LOGIN_URL=//u.boe.com/web?returnUrl=
 
-VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc-release/mobile/pages/study/courseStudy?id=
+VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/mobile-release/pages/study/courseStudy?id=
 VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=//u.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=//u.boe.com/api/b1/tale/do-quiz?quizKid=
-VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc-release/mobile/pages/exam/exam?id=
+VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id=
 VITE_BOE_PATH_DETAIL_URL=//u.boe.com/pc-release/forward?to=/student-h5-release
 
 VITE_BOE_API_URL=https://u.boe.com
 VITE_BOE_BASE_URL=//u.boe.com
 
 VITE_IMG=/manageApi-release
+
+#h5的基本url
+VITE_BOE_HOME=//u.boe.com/mobile-release/pages/index/index

src/App.vue

@@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi";
 import { getCookie } from "@/api/utils";
 
 import { USER_INFO } from "@/api/api";
-console.log("版本1.3.7------------");
+console.log("版本1.3.8------------");
 const store = useStore();
 const router = useRouter();
 

src/views/discuss/DiscussDetail.vue

@@ -314,7 +314,7 @@
 </template>
 
 <script setup>
-import { reactive, ref, computed } from "vue";
+import { reactive, ref, computed, watch } from "vue";
 import ReturnHead from "@/components/ReturnHead.vue";
 import px from "@/assets/image/discuss/px.jpg";
 import { request, useRequest } from "@/api/request";
@@ -624,6 +624,19 @@ function send() {
     submitComment();
   }
 }
+
+watch(disDetail, () => {
+  console.log(" disDetail.value.content", disDetail.value.content);
+  if (disDetail.value.content) {
+    let obj = disDetail.value.content;
+    let regex = new RegExp("<img", "gi");
+    let deleteStyle = /(?<=\" )style=\".*?\"/gi;
+    obj = obj.replace(deleteStyle, "");
+    obj = obj.replace(regex, '<img style="max-width: 100%;height:auto"');
+    disDetail.value.content = obj;
+    console.log("disDetail.value.content", disDetail.value.content);
+  }
+});
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/discuss/DiscussPage.vue

@@ -189,6 +189,17 @@ function getPostList(discussId) {
   })
     .then((e) => {
       console.log("我是当前讨论下的帖子", e);
+      if (e.data.records) {
+        let arr = e.data.records;
+        for (let i = 0; i < arr.length; i++) {
+          let obj = arr[i].content;
+          let regex = new RegExp("<img", "gi");
+          let deleteStyle = /(?<=\" )style=\".*?\"/gi;
+          obj = obj.replace(deleteStyle, "");
+          obj = obj.replace(regex, '<img style="max-width: 100%;height:auto"');
+          arr[i].content = obj;
+        }
+      }
       state.postList = state.postList.concat(e.data.records);
       state.total = Number(e.data.total);
       if (e.data.records.length === 0 || e.data.records.length < 10) {
@@ -260,6 +271,19 @@ function handleCurrentChange(e, k) {
   state.pageNo = state.pageNo + 1;
   getPostList(state.info.discussDtoList[0].id);
 }
+
+watch(state.postList, () => {
+  console.log("state.postList", state.postList);
+  // if (data.value.offcourseDto && data.value.offcourseDto.outline) {
+  //   let obj = data.value.offcourseDto.outline;
+  //   let regex = new RegExp("<img", "gi");
+  //   let deleteStyle = /(?<=\" )style=\".*?\"/gi;
+  //   obj = obj.replace(deleteStyle, "");
+  //   obj = obj.replace(regex, '<img style="max-width: 100%;height:auto"');
+  //   data.value.offcourseDto.outline = obj;
+  //   console.log("data.offcourseDto.outline", data.value.offcourseDto.outline);
+  // }
+});
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/faceteach/FaceTeachNoCommon.vue

@@ -73,6 +73,7 @@
               <div class="work">
                 <div style="display: flex; align-items: center">
                   <div
+                    id="faceteachnocommon_img_id"
                     style="padding: 5px"
                     class="content"
                     v-html="data.offcourseDto?.outline"
@@ -147,7 +148,7 @@
 
 <script setup>
 import ReturnHead from "@/components/ReturnHead.vue";
-import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
+import { computed, reactive, toRefs, watch, onUnmounted, onMounted } from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { request, useRequest } from "@/api/request";
 import { STU_OFFCOURSE_DETAIL, FACETEACH_SIGNUP } from "@/api/api";
@@ -209,6 +210,19 @@ function formateArr(strs) {
   console.log("112233", arrs);
   return arrs;
 }
+
+watch(data, () => {
+  console.log("data.offcourseDto", data.value.offcourseDto);
+  if (data.value.offcourseDto && data.value.offcourseDto.outline) {
+    let obj = data.value.offcourseDto.outline;
+    let regex = new RegExp("<img", "gi");
+    let deleteStyle = /(?<=\" )style=\".*?\"/gi;
+    obj = obj.replace(deleteStyle, "");
+    obj = obj.replace(regex, '<img style="max-width: 100%;height:auto"');
+    data.value.offcourseDto.outline = obj;
+    console.log("data.offcourseDto.outline", data.value.offcourseDto.outline);
+  }
+});
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/faceteach/FaceTeachNoCourse.vue

@@ -213,6 +213,18 @@ function formateArr(strs) {
   console.log("112233", arrs);
   return arrs;
 }
+watch(data, () => {
+  console.log("data.offcourseDto", data.value.offcourseDto);
+  if (data.value.offcourseDto && data.value.offcourseDto.outline) {
+    let obj = data.value.offcourseDto.outline;
+    let regex = new RegExp("<img", "gi");
+    let deleteStyle = /(?<=\" )style=\".*?\"/gi;
+    obj = obj.replace(deleteStyle, "");
+    obj = obj.replace(regex, '<img style="max-width: 100%;height:auto"');
+    data.value.offcourseDto.outline = obj;
+    console.log("data.offcourseDto.outline", data.value.offcourseDto.outline);
+  }
+});
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/faceteach/FaceTeachSignUp.vue

@@ -88,6 +88,7 @@
               <div class="work">
                 <div style="display: flex; align-items: center">
                   <div
+                    id="face_img_id"
                     style="padding: 10px"
                     class="content"
                     v-html="data.offcourseDto?.outline"
@@ -165,7 +166,7 @@
 
 <script setup>
 import ReturnHead from "@/components/ReturnHead.vue";
-import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
+import { computed, reactive, toRefs, watch, onUnmounted, onMounted } from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { request, useRequest } from "@/api/request";
 import { STU_OFFCOURSE_DETAIL, FACETEACH_SIGNUP } from "@/api/api";
@@ -223,6 +224,58 @@ function formateArr(strs) {
   console.log("112233", arrs);
   return arrs;
 }
+watch(data, () => {
+  console.log("data.offcourseDto", data.value.offcourseDto);
+  if (data.value.offcourseDto && data.value.offcourseDto.outline) {
+    let obj = data.value.offcourseDto.outline;
+    let regex = new RegExp("<img", "gi");
+    let deleteStyle = /(?<=\" )style=\".*?\"/gi;
+    obj = obj.replace(deleteStyle, "");
+    obj = obj.replace(regex, '<img style="max-width: 100%;height:auto"');
+    data.value.offcourseDto.outline = obj;
+    console.log("data.offcourseDto.outline", data.value.offcourseDto.outline);
+  }
+});
+// onMounted(() => {
+//   console.log("data.offcourseDto?.outline", data.value);
+//   // console.log("document", document.getElementById("face_img_id"));
+//   let imgs = document.getElementById("face_img_id").getElementsByTagName("img");
+//   console.log("imgs", imgs, imgs.length);
+//   let timer = setInterval(() => {
+//     if (imgs && imgs.length !== 0) {
+//       clearInterval(timer);
+//       for (let i = 0; i < imgs.length; i++) {
+//         console.log("11111", imgs[i], i);
+//         // console.log(
+//         //   "document.body.clientWidth",
+//         //   document.body.clientWidth,
+//         //   imgs[i].width
+//         // );
+//         // if (document.body.clientWidth <= imgs[i].width) {
+//         //   imgs[i].style.width = "100%";
+//         // }
+//         getImgInfo(imgs[i].src, i, imgs);
+//       }
+//     }
+//   }, 1000);
+// });
+function getImgInfo(url, i, imgs) {
+  console.log("url_i", url, i);
+  let image = new Image();
+  let w, h;
+  image.src = url;
+  console.log("dj", image.width);
+  image.onload = function () {
+    w = image.width;
+    console.log("image.width", image.width);
+    h = image.height;
+    console.log("document.body.clientWidth", document.body.clientWidth);
+    if (document.body.clientWidth <= w) {
+      imgs[i].style.width = "100%";
+    }
+    image.onload = null;
+  };
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/nottask/NotPath.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-03-01 20:41:06
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-03-01 21:32:29
+ * @LastEditTime: 2023-03-05 19:39:54
  * @FilePath: /stu_h5/src/views/nottask/NotTask.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -19,6 +19,6 @@
 </template>
 <script setup>
 function toIndex() {
-  window.location.href = import.meta.env.VITE_BOE_API_URL;
+  window.location.href = import.meta.env.VITE_BOE_HOME;
 }
 </script>