gx

src/api/livingCircle.js

-
+import { api, formatParams } from "@/utils/axios";
+// 生活地图--商家、居民申请列表
+export function applyList(params) {
+  return api(
+    Object.assign(formatParams("POST", params), {
+      url: "/admin-api/living-circle/shopList",
+    })
+  );
+}
+// 生活地图--商家、居民申请  审核
+export function applyReview(params) {
+  return api(
+    Object.assign(formatParams("POST", params), {
+      url: "/admin-api/living-circle/review",
+    })
+  );
+}
+// 邻里互助--商家、居民申请列表
+export function helpList(params) {
+  return api(
+    Object.assign(formatParams("POST", params), {
+      url: "/admin-api/living-circle-mutual-aid/list",
+    })
+  );
+}
+// 邻里互助--商家、居民申请  审核
+export function helpReview(params) {
+  return api(
+    Object.assign(formatParams("POST", params), {
+      url: "/admin-api/living-circle-mutual-aid/review",
+    })
+  );
+}
+// 类别
+export function categoryList() {
+  return api(
+    Object.assign(formatParams("GET"), {
+      url: "/admin-api/living-circle-mutual-aid/category",
+    })
+  );
+}

src/views/livingCircle/enter.vue

@@ -62,14 +62,14 @@
               type="success"
               size="mini"
               round
-              @click="pass(scope.row)"
+              @click="reviewHandle('pass', scope.row)"
               class="btn"
               >通过
             </el-button>
 
             <el-popconfirm
               title="确定拒绝此申请吗？"
-              @confirm="deny(scope.row)"
+              @confirm="reviewHandle('refuse', scope.row)"
             >
               <el-button type="danger" size="mini" round slot="reference"
                 >拒绝
@@ -84,6 +84,7 @@
 
 <script>
 import tableTemplate from "@/components/Table";
+import { applyList, applyReview } from "@/api/livingCircle";
 export default {
   name: "enter",
   components: { tableTemplate },
@@ -110,7 +111,7 @@ export default {
           label: "商家名称",
         },
         {
-          key: "type",
+          key: "category",
           label: "经营类型",
         },
 
@@ -146,12 +147,50 @@ export default {
       rules: {
         name: [{ required: true, message: "请输入活动名称", trigger: "blur" }],
       },
+      userName: "",
     };
   },
+  mounted() {
+    this.userName = localStorage.getItem("userName");
+
+    this.init();
+  },
   methods: {
-    init() {},
-    pass() {},
-    deny() {},
+    init() {
+      applyList({
+        // state:'',
+        type: 0,
+        pageNum: this.pagination.currentPage,
+        pageSize: this.pagination.pageSize,
+      }).then((res) => {
+        this.tableData = res.data.list;
+        this.pagination.total = res.data.total;
+      });
+    },
+
+    reviewHandle(type, row) {
+      let params = {};
+      if (type === "pass") {
+        params = {
+          id: row.id,
+          state: 0,
+          user: this.userName,
+        };
+      } else {
+        params = {
+          id: row.id,
+          state: 1,
+          user: this.userName,
+        };
+      }
+      applyReview(params).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("审核成功");
+          this.init();
+        }
+      });
+    },
+
     view() {},
     handleClick() {
       this.loading = true;

src/views/livingCircle/helpInfo.vue

@@ -11,18 +11,17 @@
           <el-input
             v-model="searchForm.name"
             placeholder="请输入用户名称"
-            @keyup.enter.native="onSubmit"
           ></el-input>
         </el-form-item>
         <el-form-item label="需求类型">
           <el-select
-            v-model="searchForm.typeId"
+            v-model="searchForm.categoryId"
+            clearable
             placeholder="请选择需求类型"
-            @change="onSubmit"
             size="medium"
           >
             <el-option
-              v-for="item in TypeList"
+              v-for="item in typeList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
@@ -30,6 +29,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
       </el-form>
     </div>
     <div class="table-wrapper">
@@ -98,14 +100,18 @@
 
 <script>
 import TableTemplate from "@/components/Table";
+import { helpList, categoryList } from "@/api/livingCircle";
 
 export default {
   components: { TableTemplate },
 
   data() {
     return {
-      searchForm: {},
-      TypeList: [],
+      searchForm: {
+        categoryId: "",
+        name: "",
+      },
+      typeList: [],
       loading: false,
       tableData: [
         {
@@ -117,20 +123,22 @@ export default {
       ],
       tableColumns: [
         {
-          key: "name",
+          key: "userName",
           label: "用户名称",
         },
         {
-          key: "type",
+          key: "categoryName",
           label: "需求类型",
         },
         {
-          key: "desc",
+          key: "content",
           label: "需求描述",
+          width: 220,
         },
         {
           key: "address",
           label: "详细地址",
+          width: 220,
         },
         {
           key: "icon",
@@ -141,10 +149,10 @@ export default {
           key: "phone",
           label: "联系电话",
         },
-        {
-          key: "wx",
-          label: "微信号",
-        },
+        // {
+        //   key: "wx",
+        //   label: "微信号",
+        // },
       ],
       pagination: {
         total: 0,
@@ -166,11 +174,36 @@ export default {
     },
   },
   created() {
+    this.getCategoryList();
     this.init();
   },
   methods: {
-    init() {},
-    onSubmit() {},
+    getCategoryList() {
+      categoryList().then((res) => {
+        if (res.code == 200) {
+          this.typeList = res.data;
+        }
+      });
+    },
+    init() {
+      let params = {
+        address: "",
+        categoryId: this.searchForm.categoryId,
+        // state: "0",
+        userName: this.searchForm.name,
+        pageNum: this.pagination.currentPage,
+        pageSize: this.pagination.pageSize,
+      };
+      helpList(params).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.list;
+          this.pagination.total = res.data.total;
+        }
+      });
+    },
+    onSubmit() {
+      this.init();
+    },
     jumpPage() {
       this.init();
     },

src/views/livingCircle/report.vue

@@ -83,6 +83,8 @@
 </template>
 
 <script>
+import { applyList, applyReview } from "@/api/livingCircle";
+
 import tableTemplate from "@/components/Table";
 export default {
   name: "enter",
@@ -110,7 +112,7 @@ export default {
           label: "商家名称",
         },
         {
-          key: "type",
+          key: "category",
           label: "经营类型",
         },
 
@@ -146,12 +148,49 @@ export default {
       rules: {
         name: [{ required: true, message: "请输入活动名称", trigger: "blur" }],
       },
+      userName: "",
     };
   },
+  mounted() {
+    this.userName = localStorage.getItem("userName");
+
+    this.init();
+  },
   methods: {
-    init() {},
-    pass() {},
-    deny() {},
+    init() {
+      applyList({
+        // state:'',
+        type: 1,
+        pageNum: this.pagination.currentPage,
+        pageSize: this.pagination.pageSize,
+      }).then((res) => {
+        this.tableData = res.data.list;
+        this.pagination.total = res.data.total;
+      });
+    },
+
+    reviewHandle(type, row) {
+      let params = {};
+      if (type === "pass") {
+        params = {
+          id: row.id,
+          state: 0,
+          user: this.userName,
+        };
+      } else {
+        params = {
+          id: row.id,
+          state: 1,
+          user: this.userName,
+        };
+      }
+      applyReview(params).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("审核成功");
+          this.init();
+        }
+      });
+    },
     view() {},
     handleClick() {
       this.loading = true;

src/views/livingCircle/searchTerms.vue

@@ -11,9 +11,11 @@
           <el-input
             v-model="searchForm.name"
             placeholder="请输入推荐搜索词"
-            @keyup.enter.native="onSubmit"
           ></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
       </el-form>
     </div>
     <div class="table-wrapper">

src/views/livingCircle/serviceInfo.vue

@@ -11,10 +11,11 @@
           <el-input
             v-model="searchForm.name"
             placeholder="请输入地点名称"
-            @keyup.enter.native="onSubmit"
           ></el-input>
         </el-form-item>
-
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
         <el-form-item>
           <el-upload
             action="#"

src/views/livingCircle/serviceType.vue

@@ -11,14 +11,12 @@
           <el-input
             v-model="searchForm.name"
             placeholder="请输入服务名称"
-            @keyup.enter.native="onSubmit"
           ></el-input>
         </el-form-item>
         <el-form-item label="服务类型">
           <el-select
             v-model="searchForm.typeId"
             placeholder="请选择服务类型"
-            @change="onSubmit"
             size="medium"
           >
             <el-option
@@ -30,6 +28,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
       </el-form>
     </div>
     <div class="table-wrapper">