lhl 3 giorni fa
parent
commit
8678a650bd

+ 0 - 27
package-lock.json

@@ -2764,15 +2764,12 @@
       "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",
@@ -4542,15 +4539,12 @@
       "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",
@@ -7864,8 +7858,6 @@
       "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",
@@ -7876,7 +7868,6 @@
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
       }
->>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "destroy": {
       "version": "1.2.0",
@@ -10052,8 +10043,6 @@
       "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",
@@ -10064,7 +10053,6 @@
         "inherits": "^2.0.3",
         "minimalistic-assert": "^1.0.1"
       }
->>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "hawk": {
       "version": "3.1.3",
@@ -10094,8 +10082,6 @@
       "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",
@@ -10107,7 +10093,6 @@
         "minimalistic-assert": "^1.0.0",
         "minimalistic-crypto-utils": "^1.0.1"
       }
->>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
     },
     "hoek": {
       "version": "2.16.3",
@@ -12373,15 +12358,12 @@
       "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",
@@ -13313,15 +13295,12 @@
       "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",
@@ -14421,8 +14400,6 @@
       "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"
       },
@@ -14439,7 +14416,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"
       },
@@ -20071,15 +20047,12 @@
       "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",

+ 0 - 4
src/api/system/points.js

@@ -13,7 +13,6 @@ export function getCzBill(params) {
     method: 'get',
     params: params,
   })
-<<<<<<< HEAD
 }
 
 /**
@@ -46,6 +45,3 @@ export function fahuo(data) {
     data
   })
 }
-=======
-}
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5

+ 2 - 447
src/components/system/points/list.vue

@@ -33,35 +33,20 @@
 					<span v-text="row.order_id" style="display: block;"></span>
 				</template>
 				<template slot-scope="{ row, index }" slot="uid">
-<<<<<<< HEAD
 					<div>{{row.nickname || '微信用户'}}[UID:{{row.uid}}]</div>
 					<div>{{row.mobile || '未绑定手机号'}}</div>
 				</template>
 				<template slot-scope="{ row, index }" slot="imgs">
-					<div v-if="row.imgs.length>0" style="display: flex;">
-						<img v-for="item in row.imgs" v-lazy="item" :src="item" v-image-preview
-=======
-					<div>{{ row.nickname || '微信用户' }}[UID:{{ row.uid }}]</div>
-					<div>{{ row.mobile || '未绑定手机号' }}</div>
-				</template>
-				<template slot-scope="{ row, index }" slot="imgs">
-					<div  style="display: flex;">
-						<img v-lazy="row.image" :src="row.image" v-image-preview
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
+					<div  >
+						<img  v-lazy="row.image" :src="row.image" v-image-preview
 							style="width: 60px;cursor: pointer" />
 					</div>
 				</template>
 
 				<template slot-scope="{ row, index }" slot="handle">
-<<<<<<< HEAD
-					<div><el-button plain size="mini" @click="">查看评论</el-button></div>
-					<br />
-					<div><el-button plain size="mini" @click="">删除</el-button></div>
-=======
 					<div><el-button plain size="mini" @click="editGood(row)">编辑</el-button></div>
 					<br />
 					<div><el-button plain size="mini" @click="delGood(row.id)">删除</el-button></div>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				</template>
 			</Table>
 			<div class="acea-row row-right page">
@@ -71,13 +56,6 @@
 
 		<Modal v-model="sendModel" title="添加商品" @on-ok="sendOk('sendFormValidate')" @on-cancel="sendCancel" width="900">
 			<Form :model="sendData" :label-width="labelWidth" :rules="ruleValidate" ref="sendFormValidate">
-<<<<<<< HEAD
-				<FormItem label="商品名称" prop="name">
-					<Input v-model="sendData.name" type="text" placeholder="请输入商品名称"></Input>
-				</FormItem>
-				<FormItem label="兑换积分" prop="points">
-					<Input v-model="sendData.name" type="number" placeholder="请输入兑换积分"></Input>
-=======
 				<FormItem label="商品名称" prop="store_name">
 					<Input v-model="sendData.store_name" type="text" placeholder="请输入商品名称"></Input>
 				</FormItem>
@@ -89,21 +67,16 @@
 				</FormItem>
 				<FormItem label="兑换积分" prop="price">
 					<Input v-model="sendData.price" type="number" placeholder="请输入兑换积分"></Input>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				</FormItem>
 				<FormItem label="商品库存" prop="stock">
 					<Input v-model="sendData.stock" type="number" placeholder="请输入商品库存"></Input>
 				</FormItem>
-<<<<<<< HEAD
-=======
-				<!-- unit_name -->
 				<FormItem label="商品单位" prop="unit_name">
 					<Input v-model="sendData.unit_name" type="text" placeholder="请输入商品单位"></Input>
 				</FormItem>
 				<FormItem label="商品销量" prop="sales">
 					<Input v-model="sendData.sales" type="number" placeholder="请输入商品销量"></Input>
 				</FormItem>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				<FormItem label="封面图片" prop="image">
 					<div class="clearfix">
 						<div class="upimg-item fx-r fx-bc fx-ac" style="" v-if="sendData.image">
@@ -111,14 +84,6 @@
 							<i class="el-icon-error img-remove-btn" @click="removeImg(index)"></i>
 						</div>
 						<ui-upload style="float: left;" :upUrl="upUrl" fileName="上传图片" :headers="upHeaders"
-<<<<<<< HEAD
-							:updata="{isz:0,code:'goods'}" @onUpload="onUpload" v-if="sendData.image == ''"></ui-upload>
-					</div>
-				</FormItem>
-				<FormItem label="图片" prop="imgs">
-					<div class="clearfix">
-						<div class="upimg-item fx-r fx-bc fx-ac" style="" v-for="(item,index) in sendData.imgs"
-=======
 							:updata="{ isz: 0, code: 'goods' }" @onUpload="onUpload"
 							v-if="sendData.image == ''"></ui-upload>
 					</div>
@@ -126,19 +91,13 @@
 				<FormItem label="轮播图片" prop="slider_image">
 					<div class="clearfix">
 						<div class="upimg-item fx-r fx-bc fx-ac" style="" v-for="(item, index) in sendData.slider_image"
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 							:key="index">
 							<img v-lazy="item" :src="item" v-image-preview />
 							<i class="el-icon-error img-remove-btn" @click="removeImgs(index)"></i>
 						</div>
 						<ui-upload style="float: left;" :upUrl="upUrl" fileName="上传图片" :headers="upHeaders"
-<<<<<<< HEAD
-							:updata="{isz:0,code:'goods'}" @onUpload="onUploads"
-							v-if="sendData.imgs.length<6"></ui-upload>
-=======
 							:updata="{ isz: 0, code: 'goods' }" @onUpload="onUploads"
 							v-if="sendData.slider_image.length < 6"></ui-upload>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 					</div>
 				</FormItem>
 				<FormItem label="商品详情" prop="content">
@@ -148,15 +107,12 @@
 						:defaultConfig="editorConfig" v-model="sendData.content" @onChange="onChange"
 						@onCreated="onCreated" />
 				</FormItem>
-<<<<<<< HEAD
-=======
 				<FormItem label="是否上架" prop="status">
 					<el-radio-group v-model="sendData.is_show">
 						<el-radio :label="1">上架</el-radio>
 						<el-radio :label="0">下架</el-radio>
 					</el-radio-group>
 				</FormItem>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 			</Form>
 			<div slot="footer">
 				<Button size="large" :loading="modal_loading" @click="sendCancel">取消</Button>
@@ -167,406 +123,7 @@
 	</div>
 </template>
 <script>
-<<<<<<< HEAD
-	import axios from 'axios'
-	import {
-		DomEditor
-	} from '@wangeditor/editor'
-	import {
-		Editor,
-		Toolbar
-	} from '@wangeditor/editor-for-vue'
-	import IPageHeader from "../../../layouts/system/page-header/index";
-	import {
-		SystemShowTemplateList
-	} from "../../../api/system/user";
-	import Setting from '@/setting';
-	import UiUpload from "@/ui/upload/index";
-	import {
-		upLoad
-	} from '../../../api/system/sys'
-
-	export default {
-		name: "pointsList",
-		components: {
-			SystemShowTemplateList,
-			IPageHeader,
-			UiUpload,
-			Editor,
-			Toolbar
-		},
-		computed: {},
-		data() {
-			return {
-				editor: null,
-				toolbarConfig: {
-					// toolbarKeys: [ /* 显示哪些菜单,如何排序、分组 */ ],
-					excludeKeys: ['group-video', 'emotion', 'fullScreen'],
-				},
-				editorConfig: {
-					placeholder: "请输入内容...",
-					// autoFocus: false,
-
-					// 所有的菜单配置,都要在 MENU_CONF 属性下
-					MENU_CONF: {
-						uploadImage: {
-
-						},
-					},
-				},
-				modal_loading: false,
-				ruleValidate: {
-					name: [{
-						required: true,
-						message: '请输入商品名称',
-						trigger: 'blur'
-					}],
-					content: [{
-						required: true,
-						message: '请输入商品详情',
-						trigger: 'blur'
-					}],
-					stock: [{
-						required: true,
-						message: '请输入商品库存',
-						trigger: 'blur'
-					}],
-					image: [{
-						required: true,
-						message: '请上传封面图片'
-					}],
-					imgs: [{
-						required: true,
-						message: '请上传轮播图片'
-					}],
-					points: [{
-						required: true,
-						message: '请输入兑换积分',
-						trigger: 'blur'
-					}],
-				},
-				labelWidth: 120,
-				upHeaders: {},
-				upUrl: '',
-				sendData: {
-					points: '',
-					stock: '',
-					name: '',
-					content: '',
-					image: '',
-					imgs: []
-				},
-				sendModel: false,
-				pageTitle: "积分商品",
-				options: {
-					shortcuts: [{
-							text: '今天',
-							value() {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date()
-									.getDate()));
-								return [start, end];
-							}
-						},
-						{
-							text: '昨天',
-							value() {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(),
-									new Date().getDate() - 1)));
-								end.setTime(end.setTime(new Date(new Date().getFullYear(), new Date().getMonth(),
-									new Date().getDate())));
-								return [start, end];
-							}
-						},
-						{
-							text: '最近7天',
-							value() {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(),
-									new Date().getDate() - 6)));
-								return [start, end];
-							}
-						},
-						{
-							text: '最近30天',
-							value() {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(),
-									new Date().getDate() - 29)));
-								return [start, end];
-							}
-						},
-						{
-							text: '本月',
-							value() {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(),
-									1)));
-								return [start, end];
-							}
-						},
-						{
-							text: '本年',
-							value() {
-								const end = new Date();
-								const start = new Date();
-								start.setTime(start.setTime(new Date(new Date().getFullYear(), 0, 1)));
-								return [start, end];
-							}
-						}
-					]
-				},
-
-				orderData: {
-					uid: "",
-					status: "all",
-					time: [],
-					mobile: "",
-					show_template_id: "",
-				},
-				columns: [{
-						title: 'ID',
-						align: 'center',
-						key: 'id',
-						align: 'center'
-					},
-					{
-						title: '商品封面',
-						align: 'center',
-						slot: 'imgs',
-						align: 'center'
-					},
-					{
-						title: '商品名',
-						key: 'name',
-						align: 'center'
-					},
-					{
-						title: '积分',
-						align: 'center',
-						key: 'points',
-						align: 'left'
-					},
-
-					{
-						title: '时间',
-						align: 'center',
-						key: 'add_time',
-						align: 'left'
-					},
-					{
-						title: '操作',
-						align: 'center',
-						slot: 'handle',
-						align: 'left'
-					},
-				],
-				loading: false,
-				orderList: [],
-				orderDatalist: {},
-				orderId: 0,
-				page: {
-					total: 0, // 总条数
-					page: 1, // 当前页
-					pageSize: 10 // 每页显示条数
-				},
-			}
-		},
-
-		created() {
-			if (this.$route.query.title) {
-				this.pageTitle = this.$route.query.title;
-			}
-			if (this.$route.query.uid) {
-				this.orderData.uid = parseInt(this.$route.query.uid);
-			}
-			if (this.$route.query.show_template_id) {
-				this.orderData.show_template_id = parseInt(this.$route.query.show_template_id);
-			}
-			this.initView();
-		},
-		methods: {
-			onCreated(editor) {
-				this.editor = Object.seal(editor); // 【注意】一定要用 Object.seal() 否则会报错
-				console.log(this.editor.getMenuConfig());
-
-			},
-			onChange(editor) {
-				console.log("onChange", editor.getHtml()); // onChange 时获取编辑器最新内容
-			},
-			getEditorText() {
-				const editor = this.editor;
-				if (editor == null) return;
-
-				console.log(editor.getText()); // 执行 editor API
-			},
-			printEditorHtml() {
-				const editor = this.editor;
-				if (editor == null) return;
-
-				console.log(editor.getHtml()); // 执行 editor API
-			},
-			initView: function() {
-				let that = this
-				var upHeaders = {};
-				this.upUrl = Setting.apiBaseURL + "/systemv1/upload/index";
-				const token = this.$utils.util.cookies.get('system_token');
-				if (token) {
-					upHeaders['SYSTEM-ACC-TOKEN'] = token;
-				}
-				this.upHeaders = upHeaders;
-
-				this.editorConfig.MENU_CONF['uploadImage'] = {
-					async customUpload(file, insertFn) {
-						const formData = new FormData()
-						formData.append('file', file)
-						formData.append('code', 'good')
-						formData.append('isz', '0')
-						// formData.append('sign', this.generateSign(file.name)) // 自定义签名
 
-						try {
-							// const response = await axios.post(that.upUrl, formData, {
-							// 	headers: {
-							// 		'SYSTEM-ACC-TOKEN': token
-							// 	}
-							// })
-							upLoad(formData).then(res => {
-								insertFn(res.data.img)
-							})
-							
-							// if (response.data.success) {
-							// 	 // 插入图片到编辑器
-							// }
-						} catch (error) {
-							console.error('上传失败:', error)
-						}
-					}
-				}
-			},
-			onUpload: function(res) {
-				if (res.code == -1) {
-					Notice.error({
-						title: "系统提示",
-						content: res.msg
-					});
-				} else {
-					this.sendData.image = res.data.img;
-				}
-			},
-			onUploads: function(res) {
-				if (res.code == -1) {
-					Notice.error({
-						title: "系统提示",
-						content: res.msg
-					});
-				} else {
-					this.sendData.imgs.push(res.data.img);
-				}
-			},
-			removeImgs: function(index) {
-				// this.$delete(this.sendData.imgs, index);
-			},
-			removeImg: function(index) {
-				// this.$delete(this.sendData.imgs, index);
-				this.sendData.image = ''
-			},
-			sendOpen() {
-				this.sendModel = true
-			},
-			sendCancel() {
-				this.sendModel = false
-				this.sendData = {
-					content: '',
-					imgs: []
-				}
-				console.log('sendCancel');
-			},
-			sendOk(name) {
-				console.log(this.sendData.content);
-				this.$refs[name].validate((valid) => {
-					if (valid) {
-						this.sendCancel()
-						this.$Message.success('发布成功!');
-					} else {}
-				})
-			},
-			tabsHandleClick: function(tab, event) {
-				this.page.page = 1;
-				this.getData();
-			},
-			orderSearch: function() {
-				this.page.page = 1;
-				this.getData();
-			},
-			/**
-			 * 分页
-			 */
-			tapPage: function(index) {
-				this.page.page = index;
-				this.getData();
-			},
-			/**
-			 * 获取数据
-			 */
-			getData: function() {
-				var that = this;
-				// this.loading = true;
-				var data = {
-					page: that.page.page,
-					...that.orderData
-				};
-				// SystemShowTemplateList(data)
-				//     .then(res=>{
-				//         that.loading = false;
-				//         if(res.code == 200) {
-				//             that.orderList = res.data.list;
-				//             that.page.pageSize = res.data.pageSize;
-				//             that.page.count = res.data.pageCount;
-				//         } else {
-				//             that.$alert(res.msg);
-				//         }
-				//     })
-				//     .catch(err=>{
-				//         that.loading = false;
-				//         that.$alert("网络繁忙,加载失败,请稍等片刻在尝试!", '系统提示');
-				//     });
-			},
-
-		}
-	}
-</script>
-<style src="@wangeditor/editor/dist/css/style.css"></style>
-<style scoped>
-	@import "~vue2-editor/dist/vue2-editor.css";
-
-	.upimg-item {
-		width: 82px;
-		height: 82px;
-		margin-right: 5px;
-		overflow: hidden;
-		float: left;
-		margin-bottom: 5px;
-		position: relative;
-	}
-
-	.upimg-item img {
-		width: 82px;
-		cursor: pointer;
-	}
-
-	.img-remove-btn {
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		font-size: 24px;
-	}
-=======
 import { getGoodsCate, getGoodsList, saveProduct,delProduct } from "../../../api/system/goods";
 
 import axios from 'axios'
@@ -747,7 +304,6 @@ export default {
 				title: '商品封面',
 				align: 'center',
 				slot: 'imgs',
-				align: 'center'
 			},
 			{
 				title: '商品名',
@@ -1038,5 +594,4 @@ export default {
 	right: 0px;
 	font-size: 24px;
 }
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 </style>

+ 0 - 129
src/components/system/points/order.vue

@@ -36,7 +36,6 @@
 					<div>{{row.nickname || '微信用户'}}[UID:{{row.uid}}]</div>
 					<div>{{row.mobile || '未绑定手机号'}}</div>
 				</template>
-<<<<<<< HEAD
 				<template slot-scope="{ row, index }" slot="product">
 					<div v-for="item in row.cart_info">
 						<div>
@@ -62,8 +61,6 @@
 					<el-link type="danger" v-if="row.status == 0">未支付</el-link>
 					<el-link type="info" v-if="row.status == -1">已取消</el-link>
 				</template>
-=======
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				<template slot-scope="{ row, index }" slot="imgs">
 					<div v-if="row.imgs.length>0" style="display: flex;">
 						<img v-for="item in row.imgs" v-lazy="item" :src="item" v-image-preview
@@ -72,15 +69,9 @@
 				</template>
 
 				<template slot-scope="{ row, index }" slot="handle">
-<<<<<<< HEAD
 					<div><el-button plain size="mini" @click="sendOpen(row)" v-if="row.status == 1">发货</el-button></div>
 					<!--<br />
 					<div><el-button plain size="mini" @click="">删除</el-button></div> -->
-=======
-					<div><el-button plain size="mini" @click="">查看评论</el-button></div>
-					<br />
-					<div><el-button plain size="mini" @click="">删除</el-button></div>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				</template>
 			</Table>
 			<div class="acea-row row-right page">
@@ -88,7 +79,6 @@
 			</div>
 		</Card>
 
-<<<<<<< HEAD
 		<Modal v-model="sendModel" title="发货" @on-ok="sendOk('sendFormValidate')" @on-cancel="sendCancel" width="800">
 			<Form :model="sendData" :label-width="labelWidth" :rules="ruleValidate" ref="sendFormValidate">
 				<FormItem label="快递公司名称" prop="express_code">
@@ -106,31 +96,6 @@
 				<Button type="primary" size="large" :loading="modal_loading"
 					@click="sendOk('sendFormValidate')">提交</Button>
 			</div>
-=======
-		<Modal v-model="sendModel" title="发布贴子" @on-ok="sendOk('sendFormValidate')" @on-cancel="sendCancel" width="800">
-			<Form :model="sendData" :label-width="labelWidth" :rules="ruleValidate" ref="sendFormValidate">
-				<FormItem label="贴子文本" prop="content">
-					<Input v-model="sendData.content" type="textarea" :autosize="{minRows: 5,maxRows: 5}"
-						placeholder="请输入贴子内容"></Input>
-				</FormItem>
-				<FormItem label="图片">
-					<div class="clearfix">
-						<div class="upimg-item fx-r fx-bc fx-ac" style="" v-for="(item,index) in sendData.imgs"
-							:key="index">
-							<img v-lazy="item" :src="item" v-image-preview />
-							<i class="el-icon-error img-remove-btn" @click="removeImgs(index)"></i>
-						</div>
-						<ui-upload style="float: left;" :upUrl="upUrl" fileName="上传图片" :headers="upHeaders"
-							:updata="{isz:0,code:'goods'}" @onUpload="onUpload"
-							v-if="sendData.imgs.length<6"></ui-upload>
-					</div>
-				</FormItem>
-			</Form>
-			<div slot="footer">
-				<Button  size="large"  :loading="modal_loading" @click="sendCancel">取消</Button>
-			            <Button type="primary" size="large"  :loading="modal_loading" @click="sendOk('sendFormValidate')">提交</Button>
-			        </div>
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 		</Modal>
 	</div>
 </template>
@@ -141,14 +106,10 @@
 	} from "../../../api/system/user";
 	import Setting from '@/setting';
 	import UiUpload from "@/ui/upload/index";
-<<<<<<< HEAD
 	import {
 		getOrderList,
 		fahuo
 	} from '../../../api/system/points.js'
-=======
-
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 	export default {
 		name: "pointsList",
 		components: {
@@ -159,7 +120,6 @@
 		computed: {},
 		data() {
 			return {
-<<<<<<< HEAD
 				kdList: [{
 						val: 'ZTO',
 						lab: '中通快递'
@@ -252,30 +212,15 @@
 						message: '请输入快递单号',
 						trigger: 'blur'
 					}],
-=======
-				modal_loading: false,
-				ruleValidate: {
-					content: [{
-						required: true,
-						message: '请输入贴子内容',
-						trigger: 'blur'
-					}],
-
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				},
 				labelWidth: 120,
 				upHeaders: {},
 				upUrl: '',
 				sendData: {
-<<<<<<< HEAD
 					express_type: '',
 					express_code: '',
 					express_num: '',
 					id: ''
-=======
-					content: '',
-					imgs: []
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				},
 				sendModel: false,
 				pageTitle: "积分订单",
@@ -345,20 +290,11 @@
 				},
 
 				orderData: {
-<<<<<<< HEAD
-					pageSize: 20
-					// uid: "",
-					// status: "all",
-					// time: [],
-					// mobile: "",
-					// show_template_id: "",
-=======
 					uid: "",
 					status: "all",
 					time: [],
 					mobile: "",
 					show_template_id: "",
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				},
 				columns: [{
 						title: 'ID',
@@ -367,19 +303,11 @@
 						align: 'center'
 					},
 					{
-<<<<<<< HEAD
 						title: '订单ID',
 						align: 'center',
 						key: 'order_id',
 						align: 'center'
 					},
-=======
-							title: '订单ID',
-							align: 'center',
-							key: 'order_id',
-							align: 'center'
-						},
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 					{
 						title: '用户',
 						align: 'center',
@@ -388,21 +316,13 @@
 					},
 					{
 						title: '商品名',
-<<<<<<< HEAD
 						slot: 'product',
-=======
-						key: 'name',
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 						align: 'center'
 					},
 					{
 						title: '支付积分',
 						align: 'center',
-<<<<<<< HEAD
 						key: 'pay_price',
-=======
-						key: 'points',
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 						align: 'left'
 					},
 					{
@@ -412,7 +332,6 @@
 						align: 'left'
 					},
 					{
-<<<<<<< HEAD
 						title: '状态',
 						align: 'center',
 						slot: 'status',
@@ -422,11 +341,6 @@
 						title: '时间',
 						align: 'center',
 						key: 'create_time',
-=======
-						title: '时间',
-						align: 'center',
-						key: 'add_time',
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 						align: 'left'
 					},
 					{
@@ -461,13 +375,10 @@
 			this.initView();
 		},
 		methods: {
-<<<<<<< HEAD
 			selectKd(e) {
 				let kd = this.kdList.find(item => item.val == e)
 				this.sendData.express_type = kd.lab
 			},
-=======
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 			initView: function() {
 				var upHeaders = {};
 				this.upUrl = Setting.apiBaseURL + "/systemv1/upload/index";
@@ -476,10 +387,7 @@
 					upHeaders['SYSTEM-ACC-TOKEN'] = token;
 				}
 				this.upHeaders = upHeaders;
-<<<<<<< HEAD
 				this.getData();
-=======
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 			},
 			onUpload: function(res) {
 				if (res.code == -1) {
@@ -494,7 +402,6 @@
 			removeImgs: function(index) {
 				this.$delete(this.sendData.imgs, index);
 			},
-<<<<<<< HEAD
 			sendOpen(row) {
 				this.sendData = {
 					express_type: '',
@@ -502,15 +409,11 @@
 					express_num: '',
 					id: row.id
 				}
-=======
-			sendOpen() {
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				this.sendModel = true
 			},
 			sendCancel() {
 				this.sendModel = false
 				this.sendData = {
-<<<<<<< HEAD
 					express_type: '',
 					express_code: '',
 					express_num: '',
@@ -534,20 +437,6 @@
 						})
 						
 					} else {}
-=======
-					content: '',
-					imgs: []
-				}
-				console.log('sendCancel');
-			},
-			sendOk(name) {
-				this.$refs[name].validate((valid) => {
-					if (valid) {
-						this.sendCancel()
-						this.$Message.success('发布成功!');
-					} else {
-					}
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 				})
 			},
 			tabsHandleClick: function(tab, event) {
@@ -575,7 +464,6 @@
 					page: that.page.page,
 					...that.orderData
 				};
-<<<<<<< HEAD
 				getOrderList(data)
 					.then(res => {
 						that.loading = false;
@@ -591,23 +479,6 @@
 						that.loading = false;
 						that.$alert("网络繁忙,加载失败,请稍等片刻在尝试!", '系统提示');
 					});
-=======
-				// SystemShowTemplateList(data)
-				//     .then(res=>{
-				//         that.loading = false;
-				//         if(res.code == 200) {
-				//             that.orderList = res.data.list;
-				//             that.page.pageSize = res.data.pageSize;
-				//             that.page.count = res.data.pageCount;
-				//         } else {
-				//             that.$alert(res.msg);
-				//         }
-				//     })
-				//     .catch(err=>{
-				//         that.loading = false;
-				//         that.$alert("网络繁忙,加载失败,请稍等片刻在尝试!", '系统提示');
-				//     });
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 			},
 
 		}

+ 1 - 332
src/components/system/showTemplate/code.vue

@@ -1,197 +1,4 @@
 <template>
-<<<<<<< HEAD
-    <div>
-        <i-page-header :title="pageTitle"></i-page-header>
-        <Card :bordered="false" dis-hover class="ivu-mt">
-            <div style="padding: 20px 0;">
-				<!-- <el-select v-model="detial.is_hot" placeholder="是否热门" style="margin:0px 10px 10px 0px;width: 140px;">
-					<el-option label="选择是否热门" value=""></el-option>
-				    <el-option label="热门" value="1"></el-option>
-					<el-option label="常规" value="0"></el-option>
-				</el-select>
-				<el-select v-model="detial.is_recommend" placeholder="是否推荐" style="margin:0px 10px 10px 0px;width: 140px;">
-					<el-option label="选择是否推荐" value=""></el-option>
-				    <el-option label="推荐" value="1"></el-option>
-					<el-option label="常规" value="0"></el-option>
-				</el-select>
-				<Input placeholder="请输入标题"  style="width:140px;" class="mr10" v-model="detial.title"/>
-				<DatePicker style="width: 250px" format="yyyy-MM-dd HH:mm:ss" v-model="detial.time" type="datetimerange" placement="bottom-start" placeholder="更新时间范围" :options="options"></DatePicker>
-				<el-button type="primary" style="margin-left: 6px;" @click="tapSeach">查询</el-button> -->
-                <el-button type="danger" style="margin-top: 10px;" @click="tapAdd">添加激活码</el-button>
-            </div>
-			
-			<!-- <div class="muser-tab-continer">
-			    <a class="muser-tab-a" :class="detial.status==''   ? 'active':''" @click="statusChange('')">全部</a>
-			    <a class="muser-tab-a" :class="detial.status=='1'  ? 'active':''" @click="statusChange('1')">上线</a>
-			    <a class="muser-tab-a" :class="detial.status=='0'  ? 'active':''" @click="statusChange('0')">下架</a>
-			</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="激活码" width="200"></el-table-column>
-				<el-table-column prop="show_template_id"  label="模板ID" width="100"></el-table-column>
-				<el-table-column prop="use_uid"     label="领取用户UID" min-width="160" align="center"></el-table-column>
-				<el-table-column prop="times" label="剩余次数" width="150">
-					<template slot-scope="scope">
-						{{scope.row.use_times}}/{{scope.row.times}}
-					</template>
-				</el-table-column>
-				<el-table-column prop="status" label="状态" width="150">
-					<template slot-scope="scope">
-						<el-link :type="scope.row.status ==0 ? 'primary': (scope.row.status == 1 ?'success': 'danger')" :underline="false">{{scope.row.status ==0 ? '待使用': (scope.row.status == 1 ?'己使用': '己失效')}}</el-link>
-					</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" width="800">
-		<div>
-			<el-form ref="form" :model="form" label-width="120px">
-				<el-tabs v-model="formActiveName">
-				    <el-tab-pane label="基础信息" name="tab_base">
-						
-						<el-form-item label="模板ID" prop="show_template_id" :rules="[{ required: true, message: '请输入模板ID'}]">
-							<el-input placeholder="请输入模板ID" autocomplete="off" v-model="form.show_template_id" :disabled="(form.id && form.id>0)?true:false"></el-input>
-						</el-form-item>
-						<el-form-item label="数量" prop="num" :rules="[{ required: true, message: '请输入数量'}]">
-							<el-input placeholder="请输入数量" autocomplete="off" v-model="form.num"></el-input>
-						</el-form-item>
-					</el-tab-pane>
-				</el-tabs>
-			</el-form>
-			
-		</div>
-		<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 {SystemShowTemplateList,SystemShowTemplateAdd,getCodeList,addCode} from "../../../api/system/showTemplate";
-	
-    import IPageHeader from "../../../layouts/system/page-header/index";
-	import UiUpload from "@/ui/upload/index";
-	import Setting from '@/setting';
-    export default {
-        name: "system_showTemplate_list",
-        components: {UiUpload,IPageHeader},
-        computed: {},
-        data() {
-            return {
-				pageTitle:'激活码',
-				upHeaders:{},
-				upUrl:"",
-				cateData:[],
-                detial: {
-					is_hot       : "",
-					is_recommend : "",
-					title        : "",
-					time         : "",
-					status       : "",
-					
-					data         : [],
-                    page        : 1,
-					loading     : true,
-                    pageSize    : 0,
-                    pageCount   : 0,
-                },
-				
-				options: {
-				    shortcuts: [
-				        {
-				            text: '今天',
-				            value() {
-				                const end = new Date();
-				                const start = new Date();
-				                start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()));
-				                return [start, end];
-				            }
-				        },
-				        {
-				            text: '昨天',
-				            value() {
-				                const end = new Date();
-				                const start = new Date();
-				                start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 1)));
-				                end.setTime(end.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate())));
-				                return [start, end];
-				            }
-				        },
-				        {
-				            text: '最近7天',
-				            value() {
-				                const end = new Date();
-				                const start = new Date();
-				                start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 6)));
-				                return [start, end];
-				            }
-				        },
-				        {
-				            text: '最近30天',
-				            value() {
-				                const end = new Date();
-				                const start = new Date();
-				                start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 29)));
-				                return [start, end];
-				            }
-				        },
-				        {
-				            text: '本月',
-				            value() {
-				                const end = new Date();
-				                const start = new Date();
-				                start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), 1)));
-				                return [start, end];
-				            }
-				        },
-				        {
-				            text: '本年',
-				            value() {
-				                const end = new Date();
-				                const start = new Date();
-				                start.setTime(start.setTime(new Date(new Date().getFullYear(), 0, 1)));
-				                return [start, end];
-				            }
-				        }
-				    ]
-				},
-				dialogVisible:false,
-				title:"",
-				add_parms_name:"",
-				formActiveName:"tab_base",
-				form:{
-					show_template_id: '',
-					num: ''
-				},
-				defaultParms:[],
-            }
-        },
-        created() {
-            this.initView();
-        },
-        methods: {
-			/**
-			 * 添加
-			 */
-			tapAdd:function(sassid){
-				var that = this;
-			    this.dialogVisible = true;
-				that.add_parms_name="",
-				that.formActiveName="tab_base",
-			    this.$refs['form'].resetFields();
-			    this.form = this.$utils.resetFields(this.form, {
-				    show_template_id: '',
-					num: ''
-				});
-				
-			},
-            initView:function(){
-=======
 	<div>
 		<i-page-header class="product_tabs" title="模版激活码">
 		</i-page-header>
@@ -330,35 +137,11 @@
 					.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;
-                this.getData();
-            },
-			removeParms:function(index){
-				this.$delete(this.form.data,index);
-			},
-			addParms:function(){
-				var name = this.add_parms_name;
-				if(this.add_parms_name){
-					this.form.data.push({
-						title:name,
-						content:"",
-					})
-					this.add_parms_name="";
-				}
-			},
-			statusChange:function(status){
-				this.detial.status = status;
-				this.detial.page = 1
-				this.getData()
-=======
+
 					upHeaders['SYSTEM-ACC-TOKEN'] = token;
 				}
 				this.upHeaders = upHeaders;
@@ -446,124 +229,11 @@
 							});
 					}
 				});
->>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
 			},
 			/**
 			 * 上传文件
 			 * @param res
 			 */
-<<<<<<< HEAD
-			onUpload:function (res) {
-			    if(res.code == -1) {
-			        Notice.error({ title : "系统提示", content:res.msg});
-			    } else {
-			        this.form.imgs.push(res.data.img);
-			    }
-			},
-			onUploadDescs:function(res){
-				if(res.code == -1) {
-				    Notice.error({ title : "系统提示", content:res.msg});
-				} else {
-				    this.form.descs.push(res.data.img);
-				}
-			},
-			tapEdit:function(row){
-				this.formActiveName="tab_base";
-				this.form = JSON.parse(JSON.stringify(row));
-				this.dialogVisible = true;
-				this.title = "编辑模板";
-			},
-			//关闭
-			editClose:function(){
-			    this.dialogVisible = false;
-			},
-			removeImgs:function(index){
-				this.$delete(this.form.imgs,index);
-			},
-			removeDescs:function(index){
-				this.$delete(this.form.descs,index);
-			},
-			/**
-			 * 修改数据
-			 */
-			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];
-			            }
-			            addCode(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("网络繁忙,加载失败,请稍等片刻在尝试!", '系统提示');
-			                });
-			        }
-			    });
-			},
-			
-			
-            //搜索栏目
-            tapSeach:function () {
-                this.detial.page = 1;
-                this.getData();
-            },
-            //分页
-            tapPage:function (page) {
-                this.detial.page = page;
-                this.getData();
-            },
-            getData: function () {
-                var data = {};
-				var that = this;
-                this.detial.loading = true;
-				data.page        = this.detial.page;
-				data.status      = this.detial.status;
-				data.is_hot      = this.detial.is_hot;
-				data.is_recommend = this.detial.is_recommend;
-				data.title       = this.detial.title;
-				data.time        = this.detial.time;
-                getCodeList(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;
-						// if(that.defaultParms.length<=0 && res.data.defaultParms){
-						// 	that.defaultParms = res.data.defaultParms;
-						// }
-                }).catch(err => {
-                    this.detial.loading = false;
-                    this.$alert('网络繁忙,加载失败,请稍等片刻在尝试!', '系统提示');
-                });
-            },
-        }
-    }
-</script>
-<style scoped>
-iframe.videoIframe{border: 0px;padding: 0px;}
-.el-dialog__body{padding: 0px;}
-.el-dialog__body iframe body{padding: 0px;}
-
-	.muser-tab-continer{border:1px solid #EEEEEE}
-    a.muser-tab-a{display: inline-block;padding: 0px 28px;height:42px;line-height: 42px;border-bottom:3px solid transparent;font-size: 17px;color:#595959;}
-    a.muser-tab-a.active{border-bottom:3px solid #EA312B;color:#EA312B}
-	
-	.upimg-item{width: 82px;height: 82px;margin-right: 5px;overflow: hidden;float: left;margin-bottom: 5px;position: relative;}
-	.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({
@@ -620,4 +290,3 @@ iframe.videoIframe{border: 0px;padding: 0px;}
 		width: 100%;
 	}
 </style>
->>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7

+ 81 - 516
src/router/routes.js

@@ -1,109 +1,20 @@
 const system = [{
-	path: '/system',
-	name: "system",
-	meta: {
-		title: '后台系统'
-	},
-	component: () => import('@/layouts/system/index.vue'),
-	children: [{
 		path: '/system',
-		name: 'system_index',
-		meta: {
-			title: '首页',
-			auth: false
-		},
-<<<<<<< HEAD
-		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',
+		name: "system",
 		meta: {
-			title: '用户登录',
-			auth: true
+			title: '后台系统'
 		},
-		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')
-=======
 		component: () => import('@/layouts/system/index.vue'),
 		children: [{
+				path: '/system',
+				name: 'system_index',
+				meta: {
+					title: '首页',
+					auth: false
+				},
+				component: () => import('@/layouts/system/index.vue'),
+			},
+			{
 				path: '/system',
 				name: 'system_index',
 				meta: {
@@ -199,7 +110,24 @@ const system = [{
 				},
 				component: () => import('@/components/system/user/workerList')
 			},
-
+			// {
+			//   path: '/system/audit/userAudit',
+			//   name: 'system_audit_userAudit',
+			//   meta: {
+			//     title: '用户审核',
+			//     auth: true
+			//   },
+			//   component: () => import('@/components/system/audit/userAudit')
+			// },
+			{
+				path: '/system/showTemplate/code',
+				name: 'system_showTemplate_code',
+				meta: {
+					title: '模版激活码',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/code')
+			},
 			{
 				path: '/system/user/showTemplateList',
 				name: 'system_user_showTemplateList',
@@ -264,15 +192,6 @@ const system = [{
 				},
 				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',
@@ -300,6 +219,15 @@ const system = [{
 				},
 				component: () => import('@/components/system/showTemplate/serviceLabel')
 			},
+			{
+				path: '/system/showTemplate/code',
+				name: 'system_showTemplate_code',
+				meta: {
+					title: '激活码',
+					auth: true
+				},
+				component: () => import('@/components/system/showTemplate/code')
+			},
 			{
 				path: '/system/user/workType',
 				name: 'system_user_workType',
@@ -367,7 +295,7 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/article/list.vue')
-			
+
 			},
 			{
 				path: '/system/article/detail',
@@ -377,7 +305,7 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/article/detail.vue')
-			
+
 			},
 			{
 				path: '/system/eduction/list',
@@ -387,7 +315,7 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/eduction/list.vue')
-			
+
 			},
 			{
 				path: '/system/eduction/cate',
@@ -397,7 +325,7 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/eduction/cate.vue')
-			
+
 			},
 			{
 				path: '/system/eduction/detail',
@@ -407,7 +335,7 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/eduction/detail.vue')
-			
+
 			},
 			{
 				path: '/system/eduction/grlists',
@@ -464,7 +392,6 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/task/paytrade')
-<<<<<<< HEAD
 			},
 			{
 				path: '/system/signing/list',
@@ -528,8 +455,26 @@ const system = [{
 					auth: true
 				},
 				component: () => import('@/components/system/points/list')
-      },
-      {
+			},
+			{
+				path: '/system/goods/cate',
+				name: 'system_goods_cate',
+				meta: {
+					title: '商品分类',
+					auth: true
+				},
+				component: () => import('@/components/system/goods/cate')
+			},
+			{
+				path: '/system/goods/list',
+				name: 'system_goods_list',
+				meta: {
+					title: '商品列表',
+					auth: true
+				},
+				component: () => import('@/components/system/goods/list')
+			},
+			{
 				path: '/system/points/czlist',
 				name: 'system_points_czlist',
 				meta: {
@@ -556,424 +501,44 @@ const system = [{
 				},
 				component: () => import('@/components/system/points/bill')
 			},
-=======
-			}
->>>>>>> cb1d49f18e1de41493a5367d7dbd57ab75e95ea5
 		]
->>>>>>> 00cdb012347f8de7a2fb45a11f3a68c07563a0d7
 	},
 
 	{
-		path: '/system/user/showTemplateList',
-		name: 'system_user_showTemplateList',
+		path: '/system/widget/images/index.html',
+		name: `images`,
 		meta: {
-			title: '用户模板',
-			auth: true
+			auth: ['admin-user-user-index'],
+			title: '上传图片'
 		},
-		component: () => import('@/components/system/user/showTemplateList')
+		component: () => import('@/components/system/uploadPictures/widgetImg')
 	},
 	{
-		path: '/system/audit/infoAudit',
-		name: 'system_audit_infoAudit',
+		path: '/system/login',
+		name: "system_login",
 		meta: {
-			title: '信息审核',
-			auth: true
+			title: '总用户登录'
 		},
-		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')
+		component: () => import('@/components/system/login/index')
 	},
 	// {
-	//   path: '/system/audit/userAudit',
-	//   name: 'system_audit_userAudit',
+	//   path: '/index',
+	//   name: "system_index_index",
 	//   meta: {
-	//     title: '用户审核',
-	//     auth: true
+	//     title: '首页'
 	//   },
-	//   component: () => import('@/components/system/audit/userAudit')
+	//   component: () => import('@/components/system/index/index')
 	// },
 
-	{
-		path: '/system/showTemplate/list',
-		name: 'system_showTemplate_list',
-		meta: {
-			title: '模板列表',
-			auth: true
-		},
-		component: () => import('@/components/system/showTemplate/list')
-	},
-	{
-		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/showTemplate/code',
-		name: 'system_showTemplate_code',
-		meta: {
-			title: '激活码',
-			auth: true
-		},
-		component: () => import('@/components/system/showTemplate/code')
-	},
-	{
-		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')
-	},
-	{
-		path: '/system/signing/list',
-		name: 'system_signing_list',
-		meta: {
-			title: '预约列表',
-			auth: true
-		},
-		component: () => import('@/components/system/signing/list')
-	},
-	{
-		path: '/system/signing/lists',
-		name: 'system_signing_lists',
+		path: '/',
+		name: "system_login2",
 		meta: {
-			title: '合同模板列表',
-			auth: true
+			title: '总用户登录'
 		},
-		component: () => import('@/components/system/signing/lists')
-	},
-	{
-		path: '/system/signing/createContract',
-		name: 'system_signing_createContract',
-		meta: {
-			title: '创建合同模板',
-			auth: true
-		},
-		component: () => import('@/components/system/signing/createContract')
-	},
-	{
-		path: '/system/chat/index',
-		name: 'system_chat_index',
-		meta: {
-			title: '聊天记录',
-			auth: true
-		},
-		component: () => import('@/components/system/chat/index')
-	},
-	{
-		path: '/system/forum/index',
-		name: 'system_forum_index',
-		meta: {
-			title: '发布者',
-			auth: true
-		},
-		component: () => import('@/components/system/forum/index')
-	},
-	{
-		path: '/system/forum/list',
-		name: 'system_forum_list',
-		meta: {
-			title: '贴子管理',
-			auth: true
-		},
-		component: () => import('@/components/system/forum/list')
-	},
-	{
-		path: '/system/points/list',
-		name: 'system_points_list',
-		meta: {
-			title: '积分商品',
-			auth: true
-		},
-		component: () => import('@/components/system/points/list')
-	},
-	{
-		path: '/system/goods/cate',
-		name: 'system_goods_cate',
-		meta: {
-			title: '商品分类',
-			auth: true
-		},
-		component: () => import('@/components/system/goods/cate')
-	},
-	{
-		path: '/system/goods/list',
-		name: 'system_goods_list',
-		meta: {
-			title: '商品列表',
-			auth: true
-		},
-		component: () => import('@/components/system/goods/list')
-	},
-	{
-		path: '/system/points/czlist',
-		name: 'system_points_czlist',
-		meta: {
-			title: '充值记录',
-			auth: true
-		},
-		component: () => import('@/components/system/points/czList')
-	},
-	{
-		path: '/system/points/order',
-		name: 'system_points_order',
-		meta: {
-			title: '积分订单',
-			auth: true
-		},
-		component: () => import('@/components/system/points/order')
-	},
-	{
-		path: '/system/points/bill',
-		name: 'system_points_bill',
-		meta: {
-			title: '积分流水',
-			auth: true
-		},
-		component: () => import('@/components/system/points/bill')
-	},
-	]
-},
-
-{
-	path: '/system/widget/images/index.html',
-	name: `images`,
-	meta: {
-		auth: ['admin-user-user-index'],
-		title: '上传图片'
-	},
-	component: () => import('@/components/system/uploadPictures/widgetImg')
-},
-{
-	path: '/system/login',
-	name: "system_login",
-	meta: {
-		title: '总用户登录'
-	},
-	component: () => import('@/components/system/login/index')
-},
-// {
-//   path: '/index',
-//   name: "system_index_index",
-//   meta: {
-//     title: '首页'
-//   },
-//   component: () => import('@/components/system/index/index')
-// },
-
-
-{
-	path: '/',
-	name: "system_login2",
-	meta: {
-		title: '总用户登录'
-	},
-	component: () => import('@/components/system/login/index')
-}
+		component: () => import('@/components/system/login/index')
+	}
 
 
 ];