Merge branch 'cygx_14.3' into debug

src/api/cygx/api.js

@@ -107,15 +107,15 @@ export const getUserChoose = (params) => {
 };
 //提交用户的选择详情接口
 export const postChooseSubmit = (params) => {
-  return post("/user/choose/submit", params);
+  return post("/report/choose/submit", params);
 };
 
 //提交用户的选择详情接口
 export const postChooseSubmitPush = (params) => {
-  return post("/user/choose/submit_push", params);
+  return post("/report/choose/submit_push", params);
 };
 
 //提交用户的选择详情接口
 export const postChooseSubmitType = (params) => {
-  return post("/user/choose/submit_follow_type", params);
+  return post("/report/choose/submit_follow_type", params);
 };

src/views/cygx/pushrulesPages.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { reactive, toRefs, onMounted, ref, unref, watch } from "vue";
 import { getUserChoose, getUser, postChooseSubmitPush, postChooseSubmitType } from "@/api/cygx/api.js";
-import { Toast, Checkbox, CheckboxGroup } from "vant";
+import { Toast, Checkbox, CheckboxGroup,Switch } from "vant";
 
 import { useRouter, useRoute } from "vue-router";
 import "vant/es/toast/style";
@@ -129,9 +129,6 @@ const btnConfirm = async (item) => {
       });
     }
   });
-  console.log(List);
-  return;
-
   const res = await postChooseSubmitType({
     FollowType: item.key,
     List,
@@ -188,7 +185,7 @@ onMounted(() => {
             <span>推送更新内容</span>
             <span>(重点关注+接受推送) </span>
           </div>
-          <van-switch v-model="IsRefuse" :active-value="1" :inactive-value="0" @change="pushHandle" />
+          <Switch v-model="IsRefuse" :active-value="1" :inactive-value="0" @change="pushHandle" />
         </div>
         <div class="distinguish" v-show="IsRefuse">
           <div class="distinguish-content">