Merge branch 'master' into bzkf30

src/pages/jsd/wdkc/jtjy/detail.vue

@@ -241,7 +241,10 @@ function changeChapter(item) {
 if (route.params.tjz_id) {
   tjz_id = route.params.tjz_id;
   tjk_id = route.params.tjk_id;
-  shareLink = window.location.href;
+  let a = window.location.href.indexOf("#");
+  let link = window.location.href.substring(0, a);
+  shareLink = `${link}#/home_jtjy/detail/${route.params.tjk_id}/${route.params.tjz_id}`;
+  console.log(shareLink,444);
   getChapterDetail();
   getChapterList();
 }

src/pages/jsd/wdkc/mszy/detail.vue

@@ -32,7 +32,7 @@
             <!--              <span class="align-middle" :class="chapter_info.is_like == '1'?'selected':''"></span>-->
             <!--              <i class="ml-5px text-16px color-blue inline-block align-middle not-italic">{{ chapter_info.tmz_dzl}}</i>-->
             <!--            </div>-->
-            <div class="relative align-middle share cursor-pointer">
+            <!-- <div class="relative align-middle share cursor-pointer">
               <span class="align-middle"></span>
               <i
                 class="ml-5px text-16px color-blue inline-block align-middle not-italic"
@@ -71,7 +71,7 @@
                   </div>
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
         </div>
         <div class="mt-20px" id="player-con"></div>
@@ -381,7 +381,19 @@ function changeNav(item) {
 if (route.params.tmz_id) {
   tmz_id = route.params.tmz_id;
   tmk_id = route.params.tmk_id;
-  shareLink = window.location.href;
+    // shareLink = window.location.href;
+
+
+//   let a = window.location.href.indexOf("#");
+//   let link = window.location.href.substring(0, a);
+// if(){
+//   shareLink = `${link}#/home_mszy/detail/${route.params.tmk_id}/${route.params.tmz_id}`;
+// }
+// if(){
+//   shareLink = `${link}#/home_tjkc/detail/${route.params.tmk_id}/${route.params.tmz_id}`;
+// }
+
+  console.log(shareLink, 444);
   getChapterDetail();
   getChapterList();
 }

src/pages/jsd/wdkc/tskc/detail.vue

@@ -241,7 +241,10 @@ function changeChapter(item) {
 if (route.params.ttz_id) {
   ttz_id = route.params.ttz_id;
   ttk_id = route.params.ttk_id;
-  shareLink = window.location.href;
+  // shareLink = window.location.href;
+    let a = window.location.href.indexOf("#");
+  let link = window.location.href.substring(0, a);
+  shareLink = `${link}#/home_tskc/detail/${route.params.ttk_id}/${route.params.ttz_id}`;
   getChapterDetail();
   getChapterList();
 }

src/pages/jsd/wdkc/zbkc/detail.vue

@@ -265,7 +265,10 @@ function changeChapter(item) {
 if (route.params.tz_id) {
   tz_id = route.params.tz_id;
   tzk_id = route.params.tzk_id;
-  shareLink = window.location.href;
+  // shareLink = window.location.href;
+  let a = window.location.href.indexOf("#");
+  let link = window.location.href.substring(0, a);
+  shareLink = `${link}#/home_zbkc/home_zbkc_detail/${route.params.tz_id}/${route.params.tzk_id}`;
   getChapterDetail();
   getChapterList();
 }

src/pages/jsd/wdkc/zyfd/detail.vue

@@ -238,7 +238,10 @@ function changeDetail(item) {
 
 if (route.params.tz_id) {
   tz_id = route.params.tz_id;
-  shareLink = window.location.href;
+  // shareLink = window.location.href;
+  let a = window.location.href.indexOf("#");
+  let link = window.location.href.substring(0, a);
+  shareLink = `${link}#/home_zyfd/detail/${route.params.tz_id}`;
   getDetail();
   getList();
 }

src/pages/manage/jcxxgl/xxgl/index_xj.vue

@@ -72,10 +72,7 @@
           <el-input class="rank" v-model="ruleForm.sm_email" />
         </el-form-item>
         <el-form-item label="详细地址" prop="detail_area">
-          <el-input
-            class="rank"
-            v-model="ruleForm.detail_area"
-          />
+          <el-input class="rank" v-model="ruleForm.detail_area" />
         </el-form-item>
       </div>
       <el-form-item label="学校风采" prop="sm_brief">
@@ -111,10 +108,10 @@ let ruleForm = $ref({
   sm_address: [],
   sm_period: "",
   detail_area: "",
-  sm_email:'',
-  sm_brief:''
+  sm_email: "",
+  sm_brief: "",
+  sm_address_detail: '',
 });
-
 request({
   url:'/school/main/detail',
   data:{
@@ -125,9 +122,21 @@ request({
     Object.keys(ruleForm).forEach((key, item)=>{
       ruleForm[key] = res.data.one_info[key]
     })
-    ruleForm.sm_address = [res.data.one_info.sm_area_id1,res.data.one_info.sm_area_id2,res.data.one_info?.sm_area_id3];
+   if (res.data.one_info.sm_area_id1 * 1 >= 32 && res.data.one_info.sm_area_id1 * 1 <= 36) {
+      ruleForm.sm_address = [
+        res.data.one_info.sm_area_id1,
+        res.data.one_info.sm_area_id2
+      ];
+    } else {
+      ruleForm.sm_address = [
+        res.data.one_info.sm_area_id1,
+        res.data.one_info.sm_area_id2,
+        res.data.one_info?.sm_area_id3 == 0 ? '' : res.data.one_info?.sm_area_id3,
+      ];
+    }
     ruleForm.detail_area = res.data.one_info.sm_address;
     ruleForm.sm_brief = res.data.one_info.sm_brief;
+    handleChange(ruleForm.sm_address)
   }
 })
 
@@ -177,18 +186,29 @@ request({
   }
 });
 
-function handleChange(val) {
-  console.log(val);
-  val.forEach((item) => {
-    request({
-      url: "/common/district/search",
+let address_name = [];
+
+async function handleChange(val) {
+  console.log(ruleForm.sm_address, 'rule');
+  console.log(val, 'val');
+  address_name = [];
+  let name = '';
+  for (var key in val) {
+    await request({
+      url: "/common/district/detail",
       data: {
-        id: item,
+        id: val[key],
       },
-    }).then((res) => {});
-  });
+    }).then((res) => {
+      if (res.code == "1") {
+        address_name.push(res.data.one_info.name);
+        console.log(address_name);
+      }
+    }).catch(err => {
+      console.log(err);
+    });
+  }
 }
-
 // 地址级联
 let address = $ref("");
 let props = {
@@ -241,25 +261,25 @@ let props = {
 
 
 let isButton = $ref(false);
-let isEdit;
 // 提交
 function submitForm(formName) {
   if (!formName) return;
   formName.validate((valid) => {
     let data = {
-      id:'10025',
+      id: user.value.sm_id,
+      // id: '10001',
       school_main: {
-        ..._.omit(ruleForm, "sm_address", "detail_area"),
-        sm_ms_lat: latitude,
-        sm_ms_lng: longitude,
+        ..._.omit(ruleForm, "sm_address", "detail_area", 'sm_address_detail'),
         sm_address: ruleForm.detail_area,
         sm_area_id1: ruleForm.sm_address[0],
+        sm_area_id1_name: address_name[0],
         sm_area_id2: ruleForm.sm_address[1],
+        sm_area_id2_name: address_name[1],
         sm_area_id3: ruleForm?.sm_address[2],
+        sm_area_id3_name: address_name[2],
       },
     };
     if (valid) {
-      if (!isEdit) {
         isButton = true;
         request({
           url: "/school/main/edit",
@@ -274,9 +294,6 @@ function submitForm(formName) {
             isButton = false;
           }
         });
-      } else {
-        isButton = false;
-      }
     } else {
       isButton = false;
     }

src/pages/manage/jcxxgl/xxgl/xj_detail.vue

@@ -27,13 +27,14 @@
 </template>
 <script setup>
 import { useRouter } from "vue-router";
+import { user } from '@/store/index'
 const router = useRouter();
 let detailData = $ref({});
 let https = window.GLOBAL_CONFIG.api;
 request({
   url: "/school/main/detail",
   data: {
-    id: "10025",
+    id: user.value.sm_id,
   },
 }).then((res) => {
   if (res.code == "1") {

src/pages/manage/yhxx/jsgl/rolePermission.vue

@@ -368,6 +368,7 @@ const handleSubmit = async (formEl) => {
   border-radius: 8px;
   margin: 30px auto 50px;
 }
+
 :deep() .el-dialog__body {
   padding-left: 60px;
   border-top: 1px solid #f3f3f3;

src/pages/zbkc/chat.vue

@@ -155,7 +155,7 @@ function JCText(item) {
           <div class="flex flex-col flex-auto">
             <div class="flex justify-between items-center">
               <span class="text-14px mb-5px font-bold">{{ item.name }}</span>
-              <div v-if="user.user_role_id === '72'" class="">
+              <div v-if="user.user_role_id === '75'" class="">
                 <img v-if="!item.bannedN" @click="banText(item)" :src="text" alt="">
                 <img v-else :src="notext" @click="JCText(item)" alt="">
               </div>