Merge remote-tracking branch 'origin/main'

gan-ui/src/views/app/dynamic/detail.vue

@@ -13,74 +13,71 @@
 <script>
 import {listDynamic, getDynamic, treeDynamic} from "@/api/app/dynamic";
 
+export default {
 
-// export default {
+  data() {
-//
+    return {
-//   data() {
+      id: '',
-//     return {
+      // 遮罩层
-//       id: '',
+      loading: true,
-//       // 遮罩层
+      // 选中数组
-//       loading: true,
+      ids: [],
-//       // 选中数组
+      // 非单个禁用
-//       ids: [],
+      single: true,
-//       // 非单个禁用
+      // 非多个禁用
-//       single: true,
+      multiple: true,
-//       // 非多个禁用
+      // 显示搜索条件
-//       multiple: true,
+      showSearch: true,
-//       // 显示搜索条件
+      // 总条数
-//       showSearch: true,
+      total: 0,
-//       // 总条数
+      // App用户动态表格数据
-//       total: 0,
+      dynamicList: [],
-//       // App用户动态表格数据
+      // 弹出层标题
-//       dynamicList: [],
+      title: "",
-//       // 弹出层标题
+      // 是否显示弹出层
-//       title: "",
+      open: false,
-//       // 是否显示弹出层
+
-//       open: false,
+
-//
+      created() {
-//
+        this.getList();
-//       created() {
+        this.getDynamic(this.id);
-//         this.getList();
+      },
-//         this.getDynamic(this.id);
+
-//       },
+      mounted: function () {
-//
+      this.id =   this.$route().params.id;
-//       mounted: function () {
+      },
-//       this.id =   this.$route().params.dynamicId;
+      methods: {
-//       },
+
-//       methods: {
+        getList() {
-//
+          this.loading = true;
-//         getList() {
+          listDynamic(this.queryParams).then(response => {
-//           this.loading = true;
+            this.registerList = response.rows;
-//           listDynamic(this.queryParams).then(response => {
+            this.total = response.total;
-//             this.registerList = response.rows;
+            this.loading = false;
-//             this.total = response.total;
+          });
-//             this.loading = false;
+        },
-//           });
+        handleDetail(row) {
-//         },
+          const id = row.id || row.ids;
-//         handleDetail(row) {
+          this.queryParams.dynamicId = id;
-//           const id = row.id || row.ids;
+
-//
+          treeDynamic(this.queryParams).then(response => {
-//           this.$router.push({path: '/app/dynamic/detail'});
+            this.form = response.data;
-//           this.queryParams.dynamicId = id;
+            this.open = true;
-//
+            this.title = "App用户动态详情";
-//           treeDynamic(this.queryParams).then(response => {
+
-//             this.form = response.data;
+            // Access the data here
-//             this.open = true;
+            console.log(this.form); // Or use the data in any way you need
-//             this.title = "App用户动态详情";
+          });
-//
+        },
-//             // Access the data here
+        getDynamic(id){
-//             console.log(this.form); // Or use the data in any way you need
+          getDynamic(id).then(response => {
-//           });
+            console.log(response.data);
-//         },
+          })
-//         getDynamic(id){
+        }
-//           getDynamic(id).then(response => {
+
-//             console.log(response.data);
+      }
-//           })
+
-//         }
+    }
-//
+  }
-//       }
+}
-//
-//     }
-//   }
-// }
 </script>

gan-ui/src/views/app/dynamic/index.vue

@@ -262,7 +262,7 @@ export default {
     /** 详情按钮操作  跳转到新页面*/
     handleDetail(row) {
       const id = row.id || 0;
-      this.$router.push({path: '/dynamic/detail'+ id})
+      this.$router.push({path: '/app/content/dynamic_detail?id='+ id})
      },
     /** 新增按钮操作 */
     handleAdd() {