order-1

package-lock.json

@@ -2764,12 +2764,15 @@
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
       "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="
     },
+<<<<<<< HEAD
     "acorn-import-phases": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
       "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
       "dev": true
     },
+=======
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     "acorn-jsx": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
@@ -4539,12 +4542,15 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+<<<<<<< HEAD
     },
     "baseline-browser-mapping": {
       "version": "2.9.9",
       "resolved": "https://registry.npmmirror.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.9.tgz",
       "integrity": "sha512-V8fbOCSeOFvlDj7LLChUcqbZrdKD9RU/VR260piF1790vT0mfLSwGc/Qzxv3IqiTukOpNtItePa0HBpMAj7MDg==",
       "dev": true
+=======
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "batch": {
       "version": "0.6.1",
@@ -7858,6 +7864,19 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+<<<<<<< HEAD
+=======
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "destroy": {
       "version": "1.2.0",
@@ -10033,6 +10052,19 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA=="
+<<<<<<< HEAD
+=======
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "hawk": {
       "version": "3.1.3",
@@ -10062,6 +10094,20 @@
       "version": "10.7.3",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
       "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="
+<<<<<<< HEAD
+=======
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "hoek": {
       "version": "2.16.3",
@@ -12327,6 +12373,15 @@
       "requires": {
         "launch-editor": "^2.6.0"
       }
+<<<<<<< HEAD
+=======
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
+      "dev": true
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "lcid": {
       "version": "1.0.0",
@@ -13258,6 +13313,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+<<<<<<< HEAD
+=======
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+      "dev": true
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "minimatch": {
       "version": "3.1.2",
@@ -14357,6 +14421,25 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+<<<<<<< HEAD
+=======
+      "requires": {
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+        }
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
       "requires": {
         "callsites": "^3.0.0"
       },
@@ -18552,6 +18635,21 @@
         }
       }
     },
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "requires": {
+        "kind-of": "^6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+        }
+      }
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -19973,6 +20071,15 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
       "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+<<<<<<< HEAD
+=======
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
+      "dev": true
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "tunnel-agent": {
       "version": "0.6.0",

src/api/system/serviceLabel.js

@@ -31,3 +31,21 @@ export function  SystemServiceLabelDel(data = {}) {
   });
 }
 
+// 激活码列表
+export function  codeList(data = {}) {
+  return request({
+    url: '/systemv1/code/list',
+    method: 'post',
+    data : data
+  });
+}
+
+// 添加激活码
+export function  codeAdd(data = {}) {
+  return request({
+    url: '/systemv1/code/add',
+    method: 'post',
+    data : data
+  });
+}
+

src/components/system/showTemplate/code.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
     <div>
         <i-page-header :title="pageTitle"></i-page-header>
         <Card :bordered="false" dis-hover class="ivu-mt">
@@ -190,10 +191,151 @@
 				
 			},
             initView:function(){
+=======
+	<div>
+		<i-page-header class="product_tabs" title="模版激活码">
+		</i-page-header>
+		<Card :bordered="false" dis-hover class="ivu-mt">
+			<div class="fx-r" style="padding: 20px 0;">
+				<el-select v-model="detial.status" @change="tapSeach" placeholder="请选择是否显示">
+					<el-option label="全部" value=""></el-option>
+					<el-option label="待使用" value="0"></el-option>
+					<el-option label="已使用" value="1"></el-option>
+					<el-option label="已失效" value="-1"></el-option>
+				</el-select>
+
+				<div class="fx-g1"></div>
+				<el-button type="danger" style="margin-left: 6px;" @click="tapAdd">添加激活码</el-button>
+			</div>
+			<el-table :data="detial.data" v-loading="detial.loading" :stripe="true" :border="true">
+				<el-table-column prop="id" label="ID" width="80" align="center">
+				</el-table-column>
+				<el-table-column prop="code" label="激活码">
+				</el-table-column>
+				<el-table-column prop="status" label="绑定模版" align="left">
+					<template slot-scope="scope">
+						{{isTemplate(scope.row.show_template_id)}}(ID:{{scope.row.show_template_id}})
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="状态" width="80">
+					<template slot-scope="scope">
+						<span v-if="scope.row.status==0">待使用</span>
+						<span v-else-if="scope.row.status==1">已使用</span>
+						<!-- <span v-else-if="scope.row.status==-1">已失效</span> -->
+					</template>
+				</el-table-column>
+				<!-- <el-table-column  align="center" label="操作"     prop="handle" width="150">
+	  	    <template slot-scope="scope">
+	  			<div><el-button plain size="mini" @click="tapEdit(scope.row)">编辑</el-button></div>
+	  	    </template>
+	  	</el-table-column> -->
+			</el-table>
+			<div class="acea-row row-right page">
+				<Page :total="detial.pageCount" show-elevator show-total @on-change="tapPage"
+					:page-size="detial.pageSize" />
+			</div>
+		</Card>
+		<Modal v-model="dialogVisible" :title="title" @on-cancel="editClose">
+			<el-form ref="form" :model="form" label-width="120px">
+				<el-form-item label="模版ID" prop="show_template_id" :rules="[{ required: true, message: '请输入模版ID'}]">
+					<el-select v-model="form.show_template_id" placeholder="请选择是否显示">
+						<el-option v-for="ls in modelList" :label="ls.title" :value="ls.id"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="数量" prop="num" :rules="[{ required: true, message: '请输入生成数量'}]">
+					<el-input placeholder="请输入要生成的数量" v-model="form.num"></el-input>
+				</el-form-item>
+			</el-form>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="subAdmin">确 定</el-button>
+			</span>
+		</Modal>
+
+	</div>
+</template>
+
+<script>
+	import IPageHeader from "@/layouts/system/page-header/index";
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	import UiUpload from "@/ui/upload/index";
+	import Setting from "@/setting";
+	import util from "@/libs/util";
+	import {
+		codeList,
+		codeAdd,
+		SystemServiceLabelDel
+	} from "../../../api/system/serviceLabel";
+	import {
+		SystemShowTemplateList
+	} from "../../../api/system/showTemplate";
+	export default {
+		name: "codeList",
+		components: {
+			UiUpload,
+			IPageHeader
+		},
+		data() {
+			return {
+				title: "添加激活码",
+				dialogVisible: false,
+				upHeaders: {},
+				upUrl: "",
+				detial: {
+					data: [],
+					title: "",
+					status: "",
+					page: 1,
+					loading: true,
+					pageSize: 0,
+					pageCount: 0,
+				},
+				form: {
+					num: 1,
+					show_template_id: '',
+				},
+				// 模版列表
+				modelList: []
+			}
+		},
+		mounted() {
+			this.initView();
+			this.SystemShowTemplateList()
+		},
+		methods: {
+			isTemplate(id){
+				for(let i = 0; i < this.modelList.length; i++) {
+					let item = this.modelList[i]
+					if(item.id ==id){
+						return item.title
+					}
+				}
+				return "模版已失效"
+			},
+			SystemShowTemplateList() {
+				SystemShowTemplateList({
+						is_hot: "",
+						is_recommend: "",
+						page: 1,
+						status: "",
+						time: "",
+						title: ""
+					})
+					.then(res => {
+						this.modelList = res.data.list;
+					})
+					.catch(err => {});
+			},
+			initView: function() {
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
 				var upHeaders = {};
 				this.upUrl = Setting.apiBaseURL + "/systemv1/upload/index";
 				const token = this.$utils.util.cookies.get('system_token');
 				if (token) {
+<<<<<<< HEAD
 				    upHeaders['SYSTEM-ACC-TOKEN'] = token;
 				}
 				this.upHeaders = upHeaders;
@@ -216,11 +358,101 @@
 				this.detial.status = status;
 				this.detial.page = 1
 				this.getData()
+=======
+					upHeaders['SYSTEM-ACC-TOKEN'] = token;
+				}
+				this.upHeaders = upHeaders;
+				this.getData();
+			},
+
+
+			/**
+			 * 获取数据
+			 */
+			getData: function() {
+				var data = {};
+				this.detial.loading = true;
+				data.page = this.detial.page;
+				data.title = this.detial.title;
+				data.status = this.detial.status;
+				codeList(data)
+					.then(res => {
+						this.detial.loading = false;
+						this.detial.data = res.data.list;
+						this.detial.pageSize = res.data.pageSize;
+						this.detial.pageCount = res.data.pageCount;
+					})
+					.catch(err => {
+						this.detial.loading = false;
+						this.$alert('网络繁忙，加载失败，请稍等片刻在尝试!', '系统提示');
+					});
+
+			},
+			//搜索栏目
+			tapSeach: function() {
+				this.detial.page = 1;
+				this.getData();
+			},
+
+			//关闭
+			editClose: function() {
+				this.dialogVisible = false;
+			},
+			/**
+			 * 添加分类
+			 */
+			tapAdd: function(sassid) {
+				this.dialogVisible = true;
+				this.$refs['form'].resetFields();
+				this.form = this.$utils.resetFields(this.form, {
+					status: 0,
+					seq: 0
+				});
+			},
+
+			/**
+			 * 分页
+			 */
+			tapPage: function(index) {
+				this.page.page = index;
+				this.getData();
+			},
+			/**
+			 * 修改数据
+			 */
+			subAdmin: function(e) {
+				this.$refs['form'].validate((valid) => {
+					if (valid) {
+						let loading = this.$loading("提交数据中...");
+						var data = {};
+						for (var i in this.form) {
+							data[i] = this.form[i];
+						}
+						data['data'] = JSON.stringify(this.dataAr);
+						codeAdd(data)
+							.then(res => {
+								loading.close();
+								if (res.code == 200) {
+									this.dialogVisible = false;
+									this.$Message.success("操作成功");
+									this.getData();
+								} else {
+									this.$alert(res.msg, '系统提示');
+								}
+							})
+							.catch(err => {
+								loading.close();
+								this.$alert("网络繁忙，加载失败，请稍等片刻在尝试!", '系统提示');
+							});
+					}
+				});
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
 			},
 			/**
 			 * 上传文件
 			 * @param res
 			 */
+<<<<<<< HEAD
 			onUpload:function (res) {
 			    if(res.code == -1) {
 			        Notice.error({ title : "系统提示", content:res.msg});
@@ -331,3 +563,61 @@ iframe.videoIframe{border: 0px;padding: 0px;}
 	.upimg-item img{width: 82px;cursor: pointer;}
 	.img-remove-btn{position: absolute;top: 0px;right: 0px;font-size: 24px;}
 </style>
+=======
+			onUpload: function(res) {
+				if (res.code == -1) {
+					Notice.error({
+						title: "系统提示",
+						content: res.msg
+					});
+				} else {
+					this.form.img = res.data.img;
+				}
+			},
+			tapEdit: function(row) {
+				this.form = JSON.parse(JSON.stringify(row));
+				this.dialogVisible = true;
+				this.title = "编辑标签";
+			},
+			// 删除
+			tapDel(row) {
+				this.$confirm('此操作将永久删除该标签, 是否继续?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.$utils.loading(this, "删除数据中...");
+					SystemServiceLabelDel({
+							id: row.id
+						})
+						.then(res => {
+							this.$utils.loadingClose();
+							this.loading = true;
+							if (res.code == 200) {
+								this.getData();
+							} else {
+								this.$alert(res.msg);
+							}
+						})
+						.catch(err => {
+							this.$utils.loadingClose();
+							this.$alert("网络繁忙，加载失败，请稍等片刻在尝试!", '系统提示');
+						});
+				}).catch((e) => {});
+			},
+		}
+	}
+</script>
+<style scoped>
+	.platform-img {
+		width: 20px;
+		height: 20px;
+		background: #f2f2f2;
+		margin-right: 4px;
+	}
+
+	.platform-img img {
+		width: 100%;
+	}
+</style>
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7

src/router/routes.js

@@ -12,6 +12,7 @@ const system = [{
 			title: '首页',
 			auth: false
 		},
+<<<<<<< HEAD
 		component: () => import('@/components/system/index/index')
 	},
 	{
@@ -100,6 +101,372 @@ const system = [{
 			auth: true
 		},
 		component: () => import('@/components/system/user/workerList')
+=======
+		component: () => import('@/layouts/system/index.vue'),
+		children: [{
+				path: '/system',
+				name: 'system_index',
+				meta: {
+					title: '首页',
+					auth: false
+				},
+				component: () => import('@/components/system/index/index')
+			},
+			{
+				path: '/system/index',
+				name: 'system_index',
+				meta: {
+					title: '首页',
+					auth: false
+				},
+				component: () => import('@/components/system/index/index')
+			},
+			{
+				path: '/system/user/index',
+				name: 'system_user_index',
+				meta: {
+					title: '个人设置',
+					auth: true
+				},
+				component: () => import('@/components/system/setting/user/index')
+			},
+			{
+				path: '/system/role/index',
+				name: 'system_role_index',
+				meta: {
+					title: '角色管理'
+				},
+				component: () => import('@/components/system/setting/role/index')
+			},
+			{
+				path: '/system/role/permissions',
+				name: 'system_role_permissions',
+				meta: {
+					title: '权限配置'
+				},
+				component: () => import('@/components/system/setting/role/permissions')
+			},
+			{
+				path: '/system/role/seting',
+				name: 'system_role_seting',
+				meta: {
+					title: '角色设置'
+				},
+				component: () => import('@/components/system/setting/role/seting')
+			},
+			{
+				path: '/system/admin/index',
+				name: 'system_admin_index',
+				meta: {
+					title: '账号管理',
+					auth: true
+				},
+				component: () => import('@/components/system/setting/admin/index')
+			},
+			{
+				path: '/system/setting/log/index',
+				name: 'system_setting_log_index',
+				meta: {
+					title: '日志管理',
+					auth: true
+				},
+				component: () => import('@/components/system/setting/log/index')
+			},
+			{
+				path: '/system/setting/log/login',
+				name: 'system_setting_log_login',
+				meta: {
+					title: '用户登录',
+					auth: true
+				},
+				component: () => import('@/components/system/setting/log/login')
+			},
+			{
+				path: '/system/user/list',
+				name: 'system_user_list',
+				meta: {
+					title: '用户列表',
+					auth: true
+				},
+				component: () => import('@/components/system/user/list')
+			},
+			{
+				path: '/system/user/workerList',
+				name: 'system_user_workerList',
+				meta: {
+					title: '从业人员',
+					auth: true
+				},
+				component: () => import('@/components/system/user/workerList')
+			},
+
+			{
+				path: '/system/user/showTemplateList',
+				name: 'system_user_showTemplateList',
+				meta: {
+					title: '用户模板',
+					auth: true
+				},
+				component: () => import('@/components/system/user/showTemplateList')
+			},
+			{
+				path: '/system/audit/infoAudit',
+				name: 'system_audit_infoAudit',
+				meta: {
+					title: '信息审核',
+					auth: true
+				},
+				component: () => import('@/components/system/audit/infoAudit')
+			},
+			{
+				path: '/system/audit/infoAuditItem',
+				name: 'system_audit_infoAuditItem',
+				meta: {
+					title: '信息审核详情',
+					auth: true
+				},
+				component: () => import('@/components/system/audit/infoAuditItem')
+			},
+			{
+				path: '/system/audit/typeAudit',
+				name: 'system_audit_typeAudit',
+				meta: {
+					title: '平台认证',
+					auth: true
+				},
+				component: () => import('@/components/system/audit/typeAudit')
+			},
+			{
+				path: '/system/audit/typeAuditItem',
+				name: 'system_audit_typeAuditItem',
+				meta: {
+					title: '平台认证详情',
+					auth: true
+				},
+				component: () => import('@/components/system/audit/typeAuditItem')
+			},
+			// {
+			//   path: '/system/audit/userAudit',
+			//   name: 'system_audit_userAudit',
+			//   meta: {
+			//     title: '用户审核',
+			//     auth: true
+			//   },
+			//   component: () => import('@/components/system/audit/userAudit')
+			// },
+
+			{
+				path: '/system/showTemplate/list',
+				name: 'system_showTemplate_list',
+				meta: {
+					title: '模板列表',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/list')
+			},
+			{
+				path: '/system/showTemplate/code',
+				name: 'system_showTemplate_code',
+				meta: {
+					title: '模版激活码',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/code')
+			},
+			{
+				path: '/system/showTemplate/serviceType',
+				name: 'system_showTemplate_serviceType',
+				meta: {
+					title: '服务内容',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/serviceType')
+			},
+			{
+				path: '/system/showTemplate/serviceTimeType',
+				name: 'system_showTemplate_serviceTimeType',
+				meta: {
+					title: '收费时长类型',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/serviceTimeType')
+			},
+			{
+				path: '/system/showTemplate/serviceLabel',
+				name: 'system_showTemplate_serviceLabel',
+				meta: {
+					title: '标签列表',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/serviceLabel')
+			},
+			{
+				path: '/system/user/workType',
+				name: 'system_user_workType',
+				meta: {
+					title: '职业类别',
+					auth: true
+				},
+				component: () => import('@/components/system/user/workType')
+			},
+
+
+			{
+				path: '/system/user/moneyDetail',
+				name: 'system_user_moneyDetail',
+				meta: {
+					title: '余额明细',
+					auth: true
+				},
+				component: () => import('@/components/system/user/moneyDetail')
+			},
+			{
+				path: '/system/sys/index',
+				name: 'system_sys_index',
+				meta: {
+					title: '网站基本管理',
+					auth: true
+				},
+				component: () => import('@/components/system/setting/sys/index')
+			},
+
+			{
+				path: '/system/menu/sys',
+				name: 'system_menu_sys',
+				meta: {
+					title: '菜单管理',
+					auth: true
+				},
+				component: () => import('@/components/system/setting/menu/sys')
+			},
+
+			{
+				path: '/system/adver/page',
+				name: 'system_adver_page',
+				meta: {
+					title: '广告类别',
+					auth: true
+				},
+				component: () => import('@/components/system/adver/page.vue')
+			},
+			{
+				path: '/system/adver/index',
+				name: 'system_adver_index',
+				meta: {
+					title: '广告中心',
+					auth: true
+				},
+				component: () => import('@/components/system/adver/index.vue')
+
+			},
+			{
+				path: '/system/article/list',
+				name: 'system_article_list',
+				meta: {
+					title: '文章列表',
+					auth: true
+				},
+				component: () => import('@/components/system/article/list.vue')
+			
+			},
+			{
+				path: '/system/article/detail',
+				name: 'system_article_detail',
+				meta: {
+					title: '文章详情',
+					auth: true
+				},
+				component: () => import('@/components/system/article/detail.vue')
+			
+			},
+			{
+				path: '/system/eduction/list',
+				name: 'system_eduction_list',
+				meta: {
+					title: '课程列表',
+					auth: true
+				},
+				component: () => import('@/components/system/eduction/list.vue')
+			
+			},
+			{
+				path: '/system/eduction/cate',
+				name: 'system_eduction_cate',
+				meta: {
+					title: '课程分类',
+					auth: true
+				},
+				component: () => import('@/components/system/eduction/cate.vue')
+			
+			},
+			{
+				path: '/system/eduction/detail',
+				name: 'system_eduction_detail',
+				meta: {
+					title: '课程详情',
+					auth: true
+				},
+				component: () => import('@/components/system/eduction/detail.vue')
+			
+			},
+			{
+				path: '/system/eduction/grlists',
+				name: 'system_eduction_grlists',
+				meta: {
+					title: '分组列表',
+					auth: true
+				},
+				component: () => import('@/components/system/eduction/grlists.vue')
+			},
+			{
+				path: '/system/eduction/addGrlists',
+				name: 'system_eduction_addGrlists',
+				meta: {
+					title: '分组详情',
+					auth: true
+				},
+				component: () => import('@/components/system/eduction/addGrlists.vue')
+			},
+			{
+				path: '/system/eduction/teachList',
+				name: 'system_eduction_teachList',
+				meta: {
+					title: '讲师列表',
+					auth: true
+				},
+				component: () => import('@/components/system/eduction/teachList.vue')
+			},
+			{
+				path: '/system/adver/upsource',
+				name: 'system_adver_upsource',
+				meta: {
+					title: '图片资源',
+					auth: true
+				},
+				component: () => import('@/components/system/adver/upsource.vue')
+
+			},
+
+			{
+				path: '/system/order/showTemplate',
+				name: 'system_order_showTemplate',
+				meta: {
+					title: '模板订单',
+					auth: true
+				},
+				component: () => import('@/components/system/order/showTemplate')
+			},
+			{
+				path: '/system/task/paytrade',
+				name: 'system_task_paytrade',
+				meta: {
+					title: '支付记录',
+					auth: true
+				},
+				component: () => import('@/components/system/task/paytrade')
+			}
+		]
+>>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
 	},
 
 	{