Merge branch 'master' of http://8.136.199.33:3000/jwyu/hongze_yb_pc into yb5.1

src/api/common.js

@@ -140,4 +140,11 @@ export const apiReadOneNotice=params=>{
  */
 export const apiFICCPermissionList=()=>{
     return get('/company/permission/tree',{})
+}
+
+/**
+ * 获取标签树
+ */
+ export const apiGetTagTree = params=>{
+    return get('/public/get_variety_tag_tree',params)
 }

src/views/priceDriven/detail.vue

@@ -11,7 +11,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useStore } from 'vuex';
 import moment from "moment";
 import * as priceApi from "@/api/priceDriven.js";
-import { apiGetWechatQRCode } from "@/api/common";
+import { apiGetWechatQRCode,apiGetTagTree } from "@/api/common";
 import { apiApplyPermission } from "@/api/user";
 import SharePoster from '@/components/SharePoster.vue'
 
@@ -30,10 +30,20 @@ const select_classify_subtitle = ref(""); //选中分类名称
 const isSlideClassify = ref(false);
 /* 获取分类 */
 const getClassify = async () => {
-  const { code, data } = await priceApi.tabList();
-
+  //const { code, data } = await priceApi.tabList();
+  const {code, data } = await apiGetTagTree()
   if (code === 200) {
-    const { permission_list } = data;
+    //const { permission_list } = data;
+    const result = data
+    const permission_list = result.map((item,index)=>{
+      let obj = {}
+      obj.classify_name = item.classify_name
+      obj.id = index
+      obj.list = item.tags.map((i)=>{
+        return {chart_permission_id:i.tag_id,chart_permission_name:i.tag_name,pirce_driven_state:i.price_driven_state}
+      })
+      return obj
+    })
     permission_list.forEach(_ => {
       _.isShow = _.list ? _.list.some(sub_item => sub_item.pirce_driven_state) : false
     })
@@ -97,7 +107,7 @@ const info = ref({});
 const getDetail = async () => {
   showData.value = false;
   const { code, data } = await priceApi.priceDrivenDetail({
-    chart_permission_id: select_classify_sub.value,
+    variety_tag_id: select_classify_sub.value,
   });
 
   if (code !== 200) return;

src/views/video/List.vue

@@ -2,7 +2,7 @@
 import {ref,reactive,onMounted,onActivated} from 'vue'
 import { useElementSize } from '@vueuse/core'
 
-import {apiFICCPermissionList,apiGetWechatQRCode} from '@/api/common'
+import {apiFICCPermissionList,apiGetWechatQRCode,apiGetTagTree} from '@/api/common'
 import {apiVideoList,apiVideoPlayLog} from '@/api/video'
 
 import SelfList from '@/components/SelfList.vue'
@@ -26,8 +26,24 @@ const getFICCPermissionList=async ()=>{
         handelChangeFirstNav(res.data[0])
     }
 }
-getFICCPermissionList()
+//getFICCPermissionList()
 
+const getTagTreeList = async ()=>{
+    const res = await apiGetTagTree()
+    if(res.code===200){
+        const result = res.data
+        permissionState.firstNavList = result.map((item)=>{
+            let obj = {}
+            obj.ClassifyName = item.classify_name
+            obj.Items = item.tags.map((i)=>{
+                return {PermissionId:i.tag_id,PermissionName:i.tag_name}
+            })
+            return obj
+        })
+        handelChangeFirstNav(permissionState.firstNavList[0])
+    }
+}
+getTagTreeList()
 //点击一级分类
 const handelChangeFirstNav=(item)=>{
     permissionState.sFirst=item.ClassifyName
@@ -54,7 +70,7 @@ const getVideoList=async ()=>{
         page_index:Number(listState.page),
         page_size:20,
         video_id:0,
-        chart_permission_id:Number(permissionState.sSecond)
+        variety_tag_id:Number(permissionState.sSecond)
     })
     listState.loading=false
     if(res.code===200){