소스 검색

花材分类 与 列表

shish 5 년 전
부모
커밋
b31eabd98a

+ 1 - 1
ghs/src/assets/iconfont/iconfont.json

@@ -210,7 +210,7 @@
     },
     {
       "icon_id": "12321926",
-      "name": "工作台",
+      "name": "首页",
       "font_class": "gongzuotai",
       "unicode": "e76c",
       "unicode_decimal": 59244

+ 1 - 1
ghs/src/mock/userInfo.js

@@ -147,7 +147,7 @@ let menu = {
 		{
 			id: '1',
 			parentId: null,
-			name: '工作台',
+			name: '首页',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 1,

+ 20 - 0
ghs/src/service/item-class/index.js

@@ -3,5 +3,25 @@ import { BaseService, Service } from '@/cool';
 @Service('item-class')
 export class ItemClassService extends BaseService {
 
+	addClass(data) {
+		return this.request({
+			url: '/add',
+			method: 'POST',
+			data: data
+		});
+	}
+	updateClass(data) {
+		return this.request({
+			url: '/update',
+			method: 'POST',
+			data: data
+		});
+	}
+	deleteClass(data) {
+		return this.request({
+			url: '/delete',
+			params: data
+		});
+	}
 }
 export default new ItemClassService();

+ 99 - 7
ghs/src/views/item-class/list.vue

@@ -26,6 +26,14 @@
 				>{{ scope.row.num }}</el-link>
 			</template>
 
+			<template #table-column-name="{scope}">
+				<el-link
+					:underline="true"
+					@click="getItemList(scope.row)"
+					style="font-size:12px;display:inline-block;color:#409EFF"
+				>{{ scope.row.name }}</el-link>
+			</template>
+
 			<template #table-column-inTurn="{scope}">
 				<span v-if="!sort.status">{{ scope.row.inTurn }}</span>
 				<el-input-number
@@ -58,19 +66,46 @@
 			</template>
 
 			<!-- 添加分类 -->
-			<template #slot-add-goods-btn="{scope}">
-				<el-button type="primary" size="mini" @click="getItemList(scope.row)">添加</el-button>
+			<template #slot-add-goods-btn>
+				<el-button type="primary" size="mini" @click="replaceBtnFn(0)">添加</el-button>
 			</template>
 
 			<template #slot-item-list="{scope}">
-				<el-button type="text" @click="getItemList(scope.row)">花材列表</el-button>
+				<el-button type="text" @click="getItemList(scope.row)">查看花材</el-button>
 			</template>
 
 			<template #slot-modify="{scope}">
-				<el-button type="text" @click="getItemList(scope.row)">修改</el-button>
+				<el-button type="text" @click="replaceBtnFn(scope.row.id,scope.row.name)">修改</el-button>
+			</template>
+
+			<template #slot-delete="{scope}">
+				<el-button type="text" @click="deleteFn(scope.row.id)">删除</el-button>
 			</template>
 
 		</x-crud>
+
+
+		<!-- 新增弹窗 -->
+		<el-dialog
+			:title="`${id == 0 ? '添加' : '修改'}花材`"
+			:visible.sync="replaceDialog"
+			:close-on-click-modal="false"
+			width="600px"
+		>
+			<div class="ad-modal-content">
+				<el-form :model="replaceForm" :rules="ruleForm" ref="replaceForm" label-width="100px" class="demo-form">
+					<el-form-item label="分类名称" prop="name">
+						<el-input v-model="replaceForm.name" placeholder="请输入名称" size="small"></el-input>
+					</el-form-item>
+				</el-form>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button size="small" @click="resetForm">取 消</el-button>
+				<el-button type="primary" size="small" @click="submitForm('replaceForm')">确认</el-button>
+			</div>
+		</el-dialog>
+
+
 	</div>
 </template>
 
@@ -86,19 +121,76 @@ export default {
 			tabIndex: '0',
 			tabsData: [
 				{
-					text: '分类',
+					text: '花材分类',
 					key: '0'
 				}
 			],
 			selects: {},
 			sort: {
 				status: false
-			}
+			},
+			replaceDialog:false,
+			id:0,
+			replaceForm: {
+				name: ''
+			},
+			ruleForm: {
+				name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+			},
 		};
 	},
 	computed: {
 	},
 	methods: {
+		deleteFn(id){
+			let self = this
+			this.$confirm('确认删除?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.$service.itemClass.deleteClass({id:id}).then(res => {
+					self.replaceDialog = false
+					self.app.refresh();
+				});
+			});
+		},
+		resetForm(){
+			this.$refs['replaceForm'].resetFields();
+			this.replaceDialog = false
+		},
+		replaceFn() {
+			let replaceForm = JSON.parse(JSON.stringify(this.replaceForm));
+			let self = this
+			if (self.id == 0) {
+				this.$service.itemClass.addClass(replaceForm).then(res => {
+					self.replaceDialog = false
+					self.resetForm();
+					self.app.refresh();
+				});
+			} else {
+				this.$service.itemClass.updateClass({id:self.id,...replaceForm}).then(res => {
+					self.replaceDialog = false
+					self.resetForm();
+					self.app.refresh();
+				});
+			}
+		},
+		submitForm(formName) {
+			this.$refs[formName].validate(valid => {
+				if (valid) {
+					this.replaceFn();
+				} else {
+					console.log('error submit!!');
+					return false;
+				}
+			});
+		},
+		replaceBtnFn(id,name) {
+			this.id = id
+			this.replaceForm.name = name
+			this.replaceDialog = true
+		},
 		handleClick(tab, e) {
 			this.app.refresh({ type: this.tabIndex });
 		},
@@ -153,7 +245,7 @@ export default {
 							fixed: 'right',
 							label: '操作'
 						},
-						layout: ['slot-item-list','slot-modify','delete',]
+						layout: ['slot-item-list','slot-modify','slot-delete',]
 					}
 				})
 				.set('dict', {

+ 1 - 1
ghs/src/views/item/list.vue

@@ -81,7 +81,7 @@ export default {
 			tabIndex: '0',
 			tabsData: [
 				{
-					text: '列表',
+					text: '花材列表',
 					key: '0'
 				}
 			],

+ 4 - 3
ghs/src/views/my-invite/index.vue

@@ -10,7 +10,7 @@
 					></cl-avatar>
 				</div>
 				<div class="avatar-wrap-right">
-					<div class="app-size-32 avatar-name">{{ shopInfo.name }}</div>
+					<div class="app-size-32 avatar-name">{{ shopInfo.shopName }}</div>
 					<el-tag size="mini">普通代理</el-tag>
 				</div>
 			</div>
@@ -89,11 +89,11 @@ export default {
 			// 用户数据
 			userData: [
 				{
-					name: '邀请商家',
+					name: '邀请',
 					value: 0
 				},
 				{
-					name: '付费商家',
+					name: '付费',
 					value: 0
 				},
 				{
@@ -130,6 +130,7 @@ export default {
 		...mapGetters(['shopInfo', 'userInfo'])
 	},
 	mounted() {
+		console.log(123456789)
 		console.log(this.shopInfo);
 		this._getDet();
 	},

+ 1 - 36
ghs/src/views/shop/list.vue

@@ -1,26 +1,6 @@
 <template>
 	<div class="shop-list">
 		<x-crud @load="onLoad">
-			<template #table-column-gatheringCode="{scope}">
-				<el-link
-					type="primary"
-					@click="download('gatheringCode', scope.row.id)"
-				>下载</el-link>
-			</template>
-			<template #table-column-gatheringMiniCode="{scope}">
-				<el-link
-					type="primary"
-					@click="download('gatheringMiniCode', scope.row.id)"
-				>下载</el-link>
-			</template>
-
-			<template #table-column-applyMemberCode="{scope}">
-				<el-link
-					type="primary"
-					@click="download('applyMemberCode', scope.row.id)"
-				>下载</el-link>
-			</template>
-
 			<template #slot-top-add>
 				<el-button size="mini" @click="shopAdd">添加门店</el-button>
 			</template>
@@ -91,7 +71,7 @@ export default {
 							align: 'center'
 						},
 						{
-							label: '门店名称',
+							label: '名称',
 							prop: 'shopName',
 							align: 'center'
 						},
@@ -114,21 +94,6 @@ export default {
 							label: '地址',
 							prop: 'fullAddress',
 							align: 'center'
-						},
-						{
-							label: '微信支付宝收款',
-							prop: 'gatheringCode',
-							align: 'center'
-						},
-						{
-							label: '小程序收款',
-							prop: 'gatheringMiniCode',
-							align: 'center'
-						},
-						{
-							label: '会员注册码',
-							prop: 'applyMemberCode',
-							align: 'center'
 						}
 					]
 				})

+ 21 - 68
ghs/src/views/staff/list.vue

@@ -35,26 +35,19 @@
 				></el-switch>
 			</template>
 
-			<!-- 权限设置 -->
-			<!-- <template #slot-auth="{scope}">
+			<template #slot-auth="{scope}">
 				<el-button type="text" @click="authBtnFn(scope.row)">权限设置</el-button>
 			</template>-->
-			<!-- 编辑 -->
-			<!--
+
 			<template #slot-modify="{scope}">
 				<el-button type="text" @click="modifyBtnFn(scope.row)">编辑</el-button>
 			</template>
-			-->
 
-			<!-- 删除 -->
-			<!--
 			<template #slot-del="{scope}">
 				<el-button type="text" @click="delBtnFn(scope.row)">删除</el-button>
 			</template>
-			-->
 
-			<!-- 添加 -->
-			<template #slot-add-ad-btn="{scope}">
+			<template #slot-add-ad-btn>
 				<el-button type="primary" size="mini" @click="addBtnFn">添加</el-button>
 			</template>
 		</x-crud>
@@ -90,30 +83,6 @@
 							>{{ item.roleName }}</el-option>
 						</el-select>
 					</el-form-item>
-					<!--
-					<el-form-item label="绑定小程序" prop="userId">
-						<div>
-							<div class="member-wrap flex-center" v-if="!$util.isEmpty(memberData)">
-								<div class="member-img">
-									<cl-avatar
-										shape="circle"
-										:size="40"
-										:src="memberData.avatarUrl | default_avatar"
-									></cl-avatar>
-								</div>
-								<div class="member-det">
-									<div class="app-size-28">{{ memberData.userName }}</div>
-									<div>{{ memberData.mobile }}</div>
-								</div>
-							</div>
-							<div>
-								<el-button type="primary" size="small" @click="selGoods"
-									>请选择</el-button
-								>
-							</div>
-						</div>
-					</el-form-item>
-					-->
 					<el-form-item label="登陆密码" prop="password">
 						<el-input v-model="adForm.password" placeholder="请输入登录密码" type="password" size="small"></el-input>
 					</el-form-item>
@@ -349,83 +318,67 @@ export default {
 							prop: 'id',
 							label: 'id',
 							align: 'center',
-							width: 60
+							width: 110
 						},
 						{
 							prop: 'avatar',
 							label: '头像',
 							align: 'center',
-							width: 90,
-							formatter: row => {
-								return row.adminBaseInfo.avatarUrl;
-							}
+							width: 130
 						},
 						{
 							prop: 'adminName',
 							label: '姓名',
-							align: 'center',
-							formatter: row => {
-								return row.adminBaseInfo.adminName;
-							}
+							align: 'center'
 						},
 						{
 							prop: 'mobile',
 							label: '手机号',
 							align: 'center',
-							formatter: row => {
-								return row.adminBaseInfo.mobile;
-							}
+							width: 200
 						},
 						{
 							prop: 'roleName',
 							label: '角色',
-							align: 'center'
+							align: 'center',
+							width: 150
 						},
 						{
 							prop: 'userId',
 							label: '绑定小程序',
 							align: 'center',
-							'min-width': 80
+							width: 150
 						},
 						{
 							prop: 'incomeNotice',
 							label: '收款通知',
-							align: 'center'
-						},
-						{
-							prop: 'addDate',
-							label: '添加时间',
-							align: 'center'
-						},
-						{
-							prop: 'lastLoginTime',
-							label: '最后登录',
 							align: 'center',
-							formatter: row => {
-								if (row.loginTime == '0') {
-									return '-';
-								}
-								return row.lastLoginTime;
-							}
+							width: 150
 						},
 						{
 							prop: 'status',
 							label: '启用状态',
-							align: 'center'
+							align: 'center',
+							width: 150
+						},
+						{
+							prop: 'addDate',
+							label: '添加时间',
+							align: 'center',
+							width: 150
 						}
 					],
 					// 操作列
 					op: {
 						visible: true, // 是否显示
-						// 同 element-ui Table-column Attributes
 						props: {
-							width: 120,
+							width: 250,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'
 						},
 						// 布局,请移步 `layout`
-						layout: ['slot-auth', 'slot-modify', 'slot-del']
+						layout: ['slot-modify', 'slot-del','slot-auth']
 					}
 				})
 				.set('layout', [