Skip to content

Z
zj-manage
Commit becc8fc5 by swl
Options

gx

parent 0a020f36
Showing with 223 additions and 44 deletions
.DS_Store
No preview for this file type
src/config/index.js
const domain = { const domain = {
// dev: "http://192.168.3.87:8881", // 姚镇接口 // dev: "http://192.168.3.87:8881", // 姚镇接口
// dev: "http://81.69.231.72:8881", // 姚镇接口 // dev: "http://81.69.231.72:8881", // 姚镇接口
dev: "http://81.69.231.72:8881", // 测试接口 // dev: "http://81.69.231.72:8881", // 测试接口
// dev: "https://exam.smart-zj.cn:9100/smartExam/", // 新正式接口 dev: "https://exam.smart-zj.cn:9100/smartExam/", // 新正式接口
}; };
// 腾讯地图 key // 腾讯地图 key
const map = { const map = {
......
src/utils/request.js
...@@ -5,9 +5,9 @@ import { TokenKey } from "@/utils/auth"; ...@@ -5,9 +5,9 @@ import { TokenKey } from "@/utils/auth";
const config = { const config = {
// proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址 // proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址
proxy: "http://81.69.231.72:8881", // 测试地址 // proxy: "http://81.69.231.72:8881", // 测试地址
// proxy: "http://192.168.3.87:8881", //本地 // proxy: "http://192.168.3.87:8881", //本地
// proxy: "https://exam.smart-zj.cn:9100/smartExam", // 新正式接口zs proxy: "https://exam.smart-zj.cn:9100/smartExam", // 新正式接口zs
// proxy: "http://81.69.231.72:9089/", // 测试地址 // proxy: "http://81.69.231.72:9089/", // 测试地址
// proxy1: "http://81.69.231.72:8881/admin-api", // 测试地址 // proxy1: "http://81.69.231.72:8881/admin-api", // 测试地址
// proxy1: "https://exam.smart-zj.cn:9100/smartExam/admin-api", // 新正式接口 // proxy1: "https://exam.smart-zj.cn:9100/smartExam/admin-api", // 新正式接口
......
src/views/livingCircle/enter.vue
<template> <template>
<div> <div>
<el-tabs v-model="activeName" @tab-click="handleClick"> <div class="search-wrapper">
<el-form
:inline="true"
:model="searchForm"
class="search_form"
style="text-align: left"
>
<el-form-item label="入驻名称">
<el-input
v-model="searchForm.name"
placeholder="请输入入驻名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="入驻名称">
<el-input
v-model="searchForm.categoryId"
placeholder="请输入入驻名称"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
<br />
<el-form-item label="状态" style="margin-top: 10px">
<el-radio-group v-model="searchForm.state" @change="onSubmit">
<el-radio label="">全部</el-radio>
<el-radio :label="0">未审核</el-radio>
<el-radio :label="1">通过</el-radio>
<el-radio :label="4">拒绝</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane <el-tab-pane
:label="`我的待办 ( ${taskData.myTask} )`" :label="`我的待办 ( ${taskData.myTask} )`"
name="1" name="1"
...@@ -13,7 +49,7 @@ ...@@ -13,7 +49,7 @@
:label="`所有任务 ( ${taskData.allTask} )`" :label="`所有任务 ( ${taskData.allTask} )`"
name="3" name="3"
></el-tab-pane> ></el-tab-pane>
</el-tabs> </el-tabs> -->
<div class="table-wrapper"> <div class="table-wrapper">
<table-template <table-template
...@@ -58,18 +94,22 @@ ...@@ -58,18 +94,22 @@
<el-button type="primary" size="mini" round @click="view(scope.row)" <el-button type="primary" size="mini" round @click="view(scope.row)"
>查看</el-button >查看</el-button
> >
<el-button <el-popconfirm
type="success" title="确定通过此申请吗？"
size="mini" style="margin-left: 10px"
round @confirm="reviewHandle('pass', scope.row)"
@click="reviewHandle('pass', scope.row)" v-if="scope.row.state == 0 && scope.row.state != 1"
class="btn" >
<el-button type="success" size="mini" round slot="reference"
>通过 >通过
</el-button> </el-button>
</el-popconfirm>
<el-popconfirm <el-popconfirm
title="确定拒绝此申请吗？" title="确定拒绝此申请吗？"
@confirm="reviewHandle('refuse', scope.row)" @confirm="reviewHandle('refuse', scope.row)"
v-if="scope.row.state == 0 && scope.row.state != 4"
style="margin-left: 10px"
> >
<el-button type="danger" size="mini" round slot="reference" <el-button type="danger" size="mini" round slot="reference"
>拒绝 >拒绝
...@@ -90,12 +130,16 @@ export default { ...@@ -90,12 +130,16 @@ export default {
components: { tableTemplate }, components: { tableTemplate },
data() { data() {
return { return {
taskData: { searchForm: {
myTask: 1, name: "",
finishedTask: 2, state: "",
allTask: 3,
}, },
activeName: "1", // taskData: {
// myTask: 1,
// finishedTask: 2,
// allTask: 3,
// },
// activeName: "1",
loading: false, loading: false,
tableData: [ tableData: [
{ {
...@@ -158,12 +202,13 @@ export default { ...@@ -158,12 +202,13 @@ export default {
methods: { methods: {
init() { init() {
applyList({ applyList({
// state:'', name: this.searchForm.name,
state: this.searchForm.state,
type: 0, type: 0,
pageNum: this.pagination.currentPage, pageNum: this.pagination.currentPage,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
}).then((res) => { }).then((res) => {
this.tableData = res.data.list; this.tableData = res.data.list ? res.data.list : [];
this.pagination.total = res.data.total; this.pagination.total = res.data.total;
}); });
}, },
...@@ -173,13 +218,13 @@ export default { ...@@ -173,13 +218,13 @@ export default {
if (type === "pass") { if (type === "pass") {
params = { params = {
id: row.id, id: row.id,
state: 0, state: 1,
user: this.userName, user: this.userName,
}; };
} else { } else {
params = { params = {
id: row.id, id: row.id,
state: 1, state: 4,
user: this.userName, user: this.userName,
}; };
} }
...@@ -201,6 +246,9 @@ export default { ...@@ -201,6 +246,9 @@ export default {
jumpPage() { jumpPage() {
this.init(); this.init();
}, },
onSubmit() {
this.init();
},
}, },
}; };
</script> </script>
......
src/views/livingCircle/help.vue
<template> <template>
<div> <div>
<el-tabs v-model="activeName" @tab-click="handleClick"> <div class="search-wrapper">
<el-form
:inline="true"
:model="searchForm"
class="search_form"
style="text-align: left"
>
<el-form-item label="用户名称">
<el-input
v-model="searchForm.userName"
placeholder="请输入用户名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="详细地址">
<el-input
v-model="searchForm.address"
placeholder="请输入详细地址"
clearable
></el-input>
</el-form-item>
<el-form-item label="需求类型">
<el-select
v-model="searchForm.categoryId"
clearable
placeholder="请选择需求类型"
size="medium"
>
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
<br />
<el-form-item label="状态" style="margin-top: 10px">
<el-radio-group v-model="searchForm.state" @change="onSubmit">
<el-radio label="">全部</el-radio>
<el-radio :label="0">未审核</el-radio>
<el-radio :label="1">通过</el-radio>
<el-radio :label="4">拒绝</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane <el-tab-pane
:label="`我的待办 ( ${taskData.myTask} )`" :label="`我的待办 ( ${taskData.myTask} )`"
name="1" name="1"
...@@ -13,7 +65,7 @@ ...@@ -13,7 +65,7 @@
:label="`所有任务 ( ${taskData.allTask} )`" :label="`所有任务 ( ${taskData.allTask} )`"
name="3" name="3"
></el-tab-pane> ></el-tab-pane>
</el-tabs> </el-tabs> -->
<div class="table-wrapper"> <div class="table-wrapper">
<table-template <table-template
...@@ -58,18 +110,22 @@ ...@@ -58,18 +110,22 @@
<el-button type="primary" size="mini" round @click="view(scope.row)" <el-button type="primary" size="mini" round @click="view(scope.row)"
>查看</el-button >查看</el-button
> >
<el-button <el-popconfirm
type="success" title="确定通过此申请吗？"
size="mini" style="margin-left: 10px"
round @confirm="reviewHandle('pass', scope.row)"
@click="pass(scope.row)" v-if="scope.row.state == 0 && scope.row.state != 1"
class="btn" >
<el-button type="success" size="mini" round slot="reference"
>通过 >通过
</el-button> </el-button>
</el-popconfirm>
<el-popconfirm <el-popconfirm
title="确定拒绝此申请吗？" title="确定拒绝此申请吗？"
@confirm="deny(scope.row)" @confirm="reviewHandle('refuse', scope.row)"
v-if="scope.row.state == 0 && scope.row.state != 4"
style="margin-left: 10px"
> >
<el-button type="danger" size="mini" round slot="reference" <el-button type="danger" size="mini" round slot="reference"
>拒绝 >拒绝
...@@ -84,17 +140,27 @@ ...@@ -84,17 +140,27 @@
<script> <script>
import tableTemplate from "@/components/Table"; import tableTemplate from "@/components/Table";
import { categoryList, helpList, helpReview } from "@/api/livingCircle";
export default { export default {
name: "enter", name: "enter",
components: { tableTemplate }, components: { tableTemplate },
data() { data() {
return { return {
taskData: { typeList: [],
myTask: 1,
finishedTask: 2, searchForm: {
allTask: 3, userName: "",
state: "",
address: "",
categoryId: "",
}, },
activeName: "1", // taskData: {
// myTask: 1,
// finishedTask: 2,
// allTask: 3,
// },
// activeName: "1",
loading: false, loading: false,
tableData: [ tableData: [
{ {
...@@ -104,13 +170,14 @@ export default { ...@@ -104,13 +170,14 @@ export default {
wx: "1", wx: "1",
}, },
], ],
userName: "",
tableColumns: [ tableColumns: [
{ {
key: "name", key: "userName",
label: "商家名称", label: "用户名称",
}, },
{ {
key: "type", key: "categoryName",
label: "经营类型", label: "经营类型",
}, },
...@@ -148,11 +215,60 @@ export default { ...@@ -148,11 +215,60 @@ export default {
}, },
}; };
}, },
created() {
this.userName = localStorage.getItem("userName");
this.getCategoryList();
this.init();
},
methods: { methods: {
init() {}, init() {
pass() {}, let params = {
deny() {}, address: "",
categoryId: this.searchForm.categoryId,
state: this.searchForm.state,
userName: this.searchForm.userName,
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;
}
});
},
reviewHandle(type, row) {
let params = {};
if (type === "pass") {
params = {
id: row.id,
state: 1,
user: this.userName,
};
} else {
params = {
id: row.id,
state: 4,
user: this.userName,
};
}
helpReview(params).then((res) => {
if (res.code == 200) {
this.$message.success("审核成功");
this.init();
}
});
},
view() {}, view() {},
getCategoryList() {
categoryList().then((res) => {
if (res.code == 200) {
this.typeList = res.data;
}
});
},
handleClick() { handleClick() {
this.loading = true; this.loading = true;
this.init(); this.init();
...@@ -162,6 +278,9 @@ export default { ...@@ -162,6 +278,9 @@ export default {
jumpPage() { jumpPage() {
this.init(); this.init();
}, },
onSubmit() {
this.init();
},
}, },
}; };
</script> </script>
......
src/views/livingCircle/helpInfo.vue
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<script> <script>
import TableTemplate from "@/components/Table"; import TableTemplate from "@/components/Table";
import { helpList, categoryList } from "@/api/livingCircle"; import { helpList, categoryList, helpReview } from "@/api/livingCircle";
export default { export default {
components: { TableTemplate }, components: { TableTemplate },
...@@ -214,6 +214,18 @@ export default { ...@@ -214,6 +214,18 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
}, },
del() {}, del() {},
reviewHandle(row, state) {
let params = {
id: row.id,
state: state,
user: localStorage.getItem("userName"),
};
helpReview(params).then((res) => {
if (res.code == 200) {
this.$message.success("审核成功");
}
});
},
}, },
}; };
</script> </script>
......
vue.config.js
const env = process.env.NODE_ENV === "production"; const env = process.env.NODE_ENV === "production";
// const publicPath = env ? "/manage-h5/" : "/"; //正式 const publicPath = env ? "/manage-h5/" : "/"; //正式
const publicPath = env ? "/smartExam-h5/" : "/"; //测试 // const publicPath = env ? "/smartExam-h5/" : "/"; //测试
module.exports = { module.exports = {
publicPath, publicPath,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment