Skip to content

Commit 43d3ad2

Browse files
author
myxingke
committed
商户中心路由更改为动态加载 和一堆JS结尾没有加分号
1 parent bba9bd7 commit 43d3ad2

File tree

37 files changed

+1164
-580
lines changed

37 files changed

+1164
-580
lines changed

‎src/libs/methodMap.js‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,28 @@ const methodMap = {
99
EditMaterialType: {url: '/admin/common_api/edit_material_type', method: 'get'},
1010
/** 编辑器素材列表接口 **/
1111
EditMaterialList: {url: '/admin/common_api/edit_material_list', method: 'get'},
12-
1312
/** 登陆接口 **/
1413
Login: {url: '/admin/login/index', method: 'post'},
1514
/** 退出接口 **/
1615
LoginOut: {url: '/admin/login/out', method: 'post'},
1716
/** 持续验证登陆 **/
1817
VerifyLogin: {url: '/admin/login/verify_login', method: 'post'},
1918
/** 权限节点接口 **/
20-
GetRule: {url: '/admin/role_auth/rule', method: 'get'},
19+
AdminGetRule: {url: '/admin/role_auth/rule', method: 'get'},
2120
/** 添加节点接口 **/
22-
AddRule: {url: '/admin/role_auth/add_rule', method: 'post'},
21+
AdminAddRule: {url: '/admin/role_auth/add_rule', method: 'post'},
2322
/** 编辑节点接口 **/
24-
EditRule: {url: '/admin/role_auth/edit_rule', method: 'post'},
23+
AdminEditRule: {url: '/admin/role_auth/edit_rule', method: 'post'},
2524
/** 删除节点接口 **/
26-
DelRule: {url: '/admin/role_auth/delete_rule', method: 'post'},
25+
AdminDelRule: {url: '/admin/role_auth/delete_rule', method: 'post'},
2726
/** 角色列表 **/
28-
GetRole: {url: '/admin/role_auth/role', method: 'get'},
27+
AdminGetRole: {url: '/admin/role_auth/role', method: 'get'},
2928
/** 添加角色 **/
3029
AdminAddRole: {url: '/admin/role_auth/add_role', method: 'post'},
3130
/** 编辑角色 **/
32-
EditRole: {url: '/admin/role_auth/edit_role', method: 'post'},
31+
AdminEditRole: {url: '/admin/role_auth/edit_role', method: 'post'},
3332
/** 删除角色 **/
34-
DelRole: {url: '/admin/role_auth/delete_role', method: 'post'},
33+
AdminDelRole: {url: '/admin/role_auth/delete_role', method: 'post'},
3534
/** 角色授权列表 **/
3635
Authorize: {url: '/admin/role_auth/authorize', method: 'get'},
3736
/** 保存角色授权 **/
@@ -58,6 +57,10 @@ const methodMap = {
5857
AdminMerchantRule: {url: '/admin/merchant_auth/rule', method: 'get'},
5958
/** 商户添加权限节点 **/
6059
AdminMerchantAddRule: {url: '/admin/merchant_auth/add_rule', method: 'post'},
60+
/** 商户修改权限节点 **/
61+
AdminMerchantEditRule: {url: '/admin/merchant_auth/edit_rule', method: 'post'},
62+
/** 商户删除权限节点 **/
63+
AdminMerchantDeleteRule: {url: '/admin/merchant_auth/delete_rule', method: 'post'},
6164
/** 编辑器素材列表 **/
6265
EditorMaterial: {url: '/admin/editor_material/index', method: 'get'},
6366
/** 添加编辑器素材 **/
@@ -104,21 +107,33 @@ const methodMap = {
104107
AdminWebsiteLock: {url: '/admin/website/lock', method: 'post'},
105108
/** 银行帐号设置 **/
106109
AdminSystemBank: {url: '/admin/system/bank_account', method: 'post'},
107-
108110
// /** 以下接口为商户平台接口 以下接口地址没有走后台验证 **/
109111
/** 商户平台登陆中心 **/
110112
MerchantLogin: {url: '/merchants/passport/login', method: 'post'},
111113
/** 商户注册 **/
112114
MerchantRegister: {url: '/merchants/passport/register', method: 'post'},
113115
/** 商户退出 **/
114116
MerchantSignOut: {url: '/merchants/passport/sign_out', method: 'post'},
117+
//todo 后台过滤某些公共节点
115118
/** 获取某个用户详情 notice:未添加到节点**/
116-
MerchantUserView: {url: '/merchants/user/view', method: 'get'},
119+
MerchantUserDetail: {url: '/merchants/user/detail', method: 'get'},
117120
/** 商户用户个人资料修改 notice:未添加到节点**/
118121
MerchantUserEdit: {url: '/merchants/user/edit', method: 'post'},
119-
/** 获取商户详情资料 notice:未添加到节点**/
122+
/** 商户用户角色 **/
123+
MerchantAuthRole: {url: '/merchants/user/role', method: 'get'},
124+
/** 商户添加用户角色 **/
125+
MerchantAuthAddRole: {url: '/merchants/user/add_role', method: 'post'},
126+
/** 商户修改用户角色 **/
127+
MerchantAuthEditRole: {url: '/merchants/user/edit_role', method: 'post'},
128+
/** 商户删除用户角色 **/
129+
MerchantAuthDeleteRole: {url: '/merchants/user/delete_role', method: 'post'},
130+
/** 商户角色授权列表 **/
131+
MerchantAuthorize: {url: '/merchants/user/authorize', method: 'get'},
132+
/** 商户保存角色授权 **/
133+
MerchantSaveAuth: {url: '/merchants/user/save_authorize', method: 'post'},
134+
/** 获取商户详情资料 **/
120135
MerchantDetail: {url: '/merchants/merchant/detail', method: 'get'},
121-
/** 保存商户资料 notice:未添加到节点**/
136+
/** 保存商户资料 **/
122137
MerchantInfoSave: {url: '/merchants/merchant/save', method: 'post'},
123138
/** 商户公众号列表 **/
124139
MerchantPublicList: {url: '/merchants/public_signal/index', method: 'get'},
@@ -166,14 +181,12 @@ const methodMap = {
166181
ArchivesEdit: {url: '/merchants/archives/edit', method: 'post'},
167182
/** 保存同步文章（图文消息）notice:未添加到节点**/
168183
ArchivesSaveSyncMaterialNews: {url: '/merchants/archives/sync_material', method: 'post'},
169-
170-
171184
/** 平台商户微网站站点获取 **/
172185
MerchantWebsite: {url: '/merchants/website/plat_form_website', method: 'get'},
173186
/** 平台商户微网站站点分类获取 **/
174187
MerchantWebsiteCate: {url: '/merchants/website/category', method: 'get'},
175188
/** 平台商户微站数据保存 **/
176189
MerchantWebsiteSave: {url: '/merchants/website/save', method: 'post'},
177-
}
190+
};
178191

179-
export default methodMap
192+
export default methodMap;

‎src/module/manage/manage.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
import Vue from 'vue'
2-
import App from './App'
3-
import Router from './router.js' //路由地址
1+
import Vue from 'vue';
2+
import App from './App';
3+
import Router from './router.js'; //路由地址
44
import Store from './vuex/store/index'
55
import IView from 'iview' //Iview
6-
import 'iview/dist/styles/iview.css' // 使用 IVIEW CSS
7-
import './assets/style/common/common.less' // 定制公共 less
8-
import Toast from '../../libs/toast/' // 定制吐司
9-
import Util from '../../libs/util' // 工具
10-
import Http from '../../libs/http' //请求工具
11-
import Plugin from '../../libs/plugin/formatDate' //插件
12-
import '../../libs/filter' //过滤器
13-
import Api from '../../libs/api'
6+
import 'iview/dist/styles/iview.css'; // 使用 IVIEW CSS
7+
import './assets/style/common/common.less'; // 定制公共 less
8+
import Toast from '../../libs/toast/'; // 定制吐司
9+
import Util from '../../libs/util'; // 工具
10+
import Http from '../../libs/http'; //请求工具
11+
import Plugin from '../../libs/plugin/formatDate'; //插件
12+
import '../../libs/filter'; //过滤器
13+
import Api from '../../libs/api';
1414

15-
Vue.use(Toast)
16-
Vue.use(Http)
17-
Vue.use(IView)
18-
Vue.use(Plugin)
19-
Vue.config.productionTip = false
20-
window.Api = Api
15+
Vue.use(Toast);
16+
Vue.use(Http);
17+
Vue.use(IView);
18+
Vue.use(Plugin);
19+
Vue.config.productionTip = false;
20+
window.Api = Api;
2121

2222
Router.beforeEach(({meta, path}, from, next) => {
2323
Util.title(meta.title);
24-
let auth = meta.routeAuth == false ? false : true
24+
let auth = meta.routeAuth == false ? false : true;
2525
//获取用户是否登陆
2626
let token = window.localStorage.getItem('token');
2727
if (auth && !token && path != '/login') {
28-
next({path: '/login'})
28+
next({path: '/login'});
2929
} else if (path == '/login' && token) {
30-
next({path: '/'})
30+
next({path: '/'});
3131
}
32-
next()
32+
next();
3333
})
3434

3535
new Vue({
@@ -38,4 +38,4 @@ new Vue({
3838
store: Store,
3939
template: '<App/>',
4040
components: {App}
41-
})
41+
});

‎src/module/manage/pages/article/add.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</template>
5050

5151
<script>
52-
import UEditor from '@/components/editor'
52+
import UEditor from '@/components/editor';
5353
5454
export default {
5555
data () {
@@ -118,13 +118,13 @@
118118
})
119119
},
120120
handleReset (name) {
121-
this.$refs[name].resetFields()
121+
this.$refs[name].resetFields();
122122
},
123123
//获得分类数据
124124
getCate() {
125125
this.request('AdminCategoryList', {type: 1}, true).then((res) => {
126126
if(res.status) {
127-
this.cate = res.data
127+
this.cate = res.data;
128128
}
129129
})
130130
},
@@ -137,15 +137,15 @@
137137
},
138138
//后退海阔天空
139139
goBack() {
140-
this.$router.go(-1)
140+
this.$router.go(-1);
141141
},
142142
//上传成功要执行的方法
143143
uploadSuccess() {
144144
145145
}
146146
},
147147
mounted() {
148-
this.getCate()
148+
this.getCate();
149149
},
150150
components: {
151151
UEditor

‎src/module/manage/pages/article/category.vue‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
align: 'center',
123123
render: (h, params) => {
124124
const row = params.row;
125-
const color = row.status == 1 ? 'green' : row.status == 0 ? 'yellow' : 'red'
126-
const text = row.status == 1 ? '正常' : row.status == 0 ? '锁定' : '删除'
125+
const color = row.status == 1 ? 'green' : row.status == 0 ? 'yellow' : 'red';
126+
const text = row.status == 1 ? '正常' : row.status == 0 ? '锁定' : '删除';
127127
return h('Tag', {
128128
props: {
129129
type: 'dot',
@@ -137,15 +137,15 @@
137137
width: 135,
138138
align: 'center',
139139
render: (h, params) => {
140-
return h('div',this.$formatDate(params.row.create_time, 'yyyy-MM-dd h:m'))
140+
return h('div',this.$formatDate(params.row.create_time, 'yyyy-MM-dd h:m'));
141141
}
142142
},
143143
{
144144
title: '更新时间',
145145
width: 135,
146146
align: 'center',
147147
render: (h, params) => {
148-
return h('div',this.$formatDate(params.row.update_time, 'yyyy-MM-dd h:m'))
148+
return h('div',this.$formatDate(params.row.update_time, 'yyyy-MM-dd h:m'));
149149
}
150150
},
151151
{
@@ -165,7 +165,7 @@
165165
},
166166
on: {
167167
click: () => {
168-
this.edit(params.index)
168+
this.edit(params.index);
169169
}
170170
}
171171
}, '查看'),
@@ -176,7 +176,7 @@
176176
},
177177
on: {
178178
click: () => {
179-
this.remove(params.index, params.row.id)
179+
this.remove(params.index, params.row.id);
180180
}
181181
}
182182
}, '删除')
@@ -222,54 +222,54 @@
222222
methods: {
223223
//取消 modal
224224
modalCancel() {
225-
this.editModal = false
225+
this.editModal = false;
226226
},
227227
//重置表单数据
228228
handleReset (name) {
229229
this.$refs[name].resetFields();
230230
},
231231
//获取数据
232232
getData (params) {
233-
if (!params) params = {page: 1}
233+
if (!params) params = {page: 1};
234234
this.request('AdminCategoryList', params, true).then((res) => {
235235
if(res.status) {
236236
//列表数据
237-
this.list = res.data
237+
this.list = res.data;
238238
if(this.tally == 0) {
239-
this.cate = res.data
240-
this.tally++
239+
this.cate = res.data;
240+
this.tally++;
241241
}
242242
} else {
243243
//列表数据
244-
this.list = []
244+
this.list = [];
245245
}
246246
})
247247
},
248248
//添加数据
249249
addSubmit (name) {
250250
this.$refs[name].validate((valid) => {
251251
if (valid) {
252-
this.save("AdminCategoryAdd", this.addForm)
252+
this.save("AdminCategoryAdd", this.addForm);
253253
} else {
254-
this.$Message.error('表单验证失败!')
254+
this.$Message.error('表单验证失败!');
255255
}
256256
})
257257
},
258258
//修改数据
259259
editSubmit (name) {
260260
this.$refs[name].validate((valid) => {
261261
if (valid) {
262-
this.save("AdminCategoryEdit", this.editForm)
262+
this.save("AdminCategoryEdit", this.editForm);
263263
} else {
264-
this.$Message.error('表单验证失败!')
264+
this.$Message.error('表单验证失败!');
265265
}
266266
})
267267
},
268268
edit(index) {
269269
//打开 modal 窗口
270-
this.editModal = true
270+
this.editModal = true;
271271
//获取原数据
272-
this.editForm = this.list[index]
272+
this.editForm = this.list[index];
273273
},
274274
//删除分类数据
275275
remove (index, id) {
@@ -281,11 +281,11 @@
281281
onOk: () => {
282282
this.request('AdminCategoryDelete', {id, id}).then((res) => {
283283
if(res.status) {
284-
this.$Message.info(res.msg)
284+
this.$Message.info(res.msg);
285285
this.$Modal.remove();
286286
this.list.splice(index, 1);
287287
} else {
288-
this.$Message.error(res.msg)
288+
this.$Message.error(res.msg);
289289
this.$Modal.remove();
290290
}
291291
})
@@ -294,32 +294,32 @@
294294
},
295295
//表单搜索
296296
search() {
297-
let page = 1
298-
this.pageNumber = page
299-
let search = this.formSearch
300-
this.getData({ params : search })
297+
let page = 1;
298+
this.pageNumber = page;
299+
let search = this.formSearch;
300+
this.getData({ params : search });
301301
},
302302
//保存数据方法
303303
save(url, data) {
304304
this.request(url, data).then((res) => {
305305
if (res.status) {
306-
this.addModal = false
307-
this.editModal = false
308-
this.$Message.success(res.msg)
306+
this.addModal = false;
307+
this.editModal = false;
308+
this.$Message.success(res.msg);
309309
//重置数据
310-
this.$refs['addForm'].resetFields()
311-
this.$refs['editForm'].resetFields()
310+
this.$refs['addForm'].resetFields();
311+
this.$refs['editForm'].resetFields();
312312
//重新拉取服务端数据
313-
this.getData()
313+
this.getData();
314314
} else {
315-
this.$Message.error(res.msg)
315+
this.$Message.error(res.msg);
316316
}
317317
})
318318
}
319319
},
320320
mounted() {
321321
//服务端获取数据
322-
this.getData()
322+
this.getData();
323323
}
324324
}
325325
</script>

0 commit comments

Comments
 (0)