2023-3-14

会员列表
2 years ago · 4a8a92f8c5
3 changed files with 819 additions and 748 deletions
--- a/mallplusui-web-admin/src/views/oms/order/index1.vue
+++ b/mallplusui-web-admin/src/views/oms/order/index1.vue
@ -69,7 +69,7 @@
 				</div>
 				<div style="margin-top: 15px">
 					<el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-						<el-form-item label="输入搜索：">
+						<el-form-item label="订单编号：">
 							<el-input v-model="listQuery.id" class="input-width" placeholder="编号"></el-input>
 						</el-form-item>
 						<!-- <el-form-item label="订单分类：">
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductDetail.vue
@ -5,26 +5,13 @@
 			<el-step title="商品展示"></el-step>
 			<el-step title="图片及详情"></el-step>
 		</el-steps>
-    <product-info-detail
-      v-show="showStatus[0]"
-      v-model="productParam"
-      :is-edit="isEdit"
-      @nextStep="nextStep">
+		<product-info-detail v-show="showStatus[0]" v-model="productParam" :is-edit="isEdit" @nextStep="nextStep">
 		</product-info-detail>
-    <product-sale-detail
-      v-show="showStatus[1]"
-      v-model="productParam"
-      :is-edit="isEdit"
-      @nextStep="nextStep"
+		<product-sale-detail v-show="showStatus[1]" v-model="productParam" :is-edit="isEdit" @nextStep="nextStep"
 			@prevStep="prevStep">
 		</product-sale-detail>
-    <product-attr-detail
-      v-show="showStatus[2]"
-      v-model="productParam"
-      :is-edit="isEdit"
-      @finishCommit="finishCommit"
-      @nextStep="nextStep"
-      @prevStep="prevStep">
+		<product-attr-detail v-show="showStatus[2]" v-model="productParam" :is-edit="isEdit"
+			@finishCommit="finishCommit" @nextStep="nextStep" @prevStep="prevStep">
 		</product-attr-detail>
 		<!--    <product-relation-detail
      v-show="showStatus[3]"
@ -40,7 +27,11 @@
 	import ProductSaleDetail from './ProductSaleDetail';
 	import ProductAttrDetail from './ProductAttrDetail';
 	// import ProductRelationDetail from './ProductRelationDetail';
-  import {createProduct,getProduct,updateProduct} from '@/api/product';
+	import {
+		createProduct,
+		getProduct,
+		updateProduct
+	} from '@/api/product';

 	const defaultProductParam = {
 		albumPics: '',
@ -71,9 +62,16 @@
 		//会员价格{memberLevelId: 0,memberPrice: 0,memberLevelName: null}
 		memberPriceList: [],
 		//商品满减
-    productFullReductionList: [{fullPrice: 0, reducePrice: 0}],
+		productFullReductionList: [{
+			fullPrice: 0,
+			reducePrice: 0
+		}],
 		//商品阶梯价格
-    productLadderList: [{count: 0,discount: 0,price: 0}],
+		productLadderList: [{
+			count: 0,
+			discount: 0,
+			price: 0
+		}],
 		previewStatus: 0,
 		price: 0,
 		productAttributeCategoryId: null,
@ -113,7 +111,10 @@
 	};
 	export default {
 		name: 'ProductDetail',
-    components: {ProductInfoDetail, ProductSaleDetail, ProductAttrDetail
+		components: {
+			ProductInfoDetail,
+			ProductSaleDetail,
+			ProductAttrDetail
 			// , ProductRelationDetail
 		},
 		props: {
@ -198,5 +199,3 @@
 		width: 800px;
 	}
 </style>
-
-
--- a/mallplusui-web-admin/src/views/ums/member/index.vue
+++ b/mallplusui-web-admin/src/views/ums/member/index.vue
@ -1,38 +1,41 @@
 <template>
-	<div class="app-container">
+	<div class="app-container" style="margin-right: 10px;">
 		<el-card class="filter-container" shadow="never">
 			<div>
 				<i class="el-icon-search"></i>
 				<span>筛选搜索</span>
-				<el-button style="float: right" @click="searchMemberList()" type="primary" size="small">查询结果</el-button>
-				<el-button style="float: right" @click="updateOrderInfo()" type="primary" size="small">同步订单统计</el-button>
+				<!-- <el-button style="float: right" @click="searchMemberList()" type="primary" size="small">查询结果</el-button>
+				<el-button style="float: right; margin-right: 15px" @click="updateOrderInfo()" type="primary"
+					size="small">同步订单统计
+				</el-button> -->
+				<el-button style="float:right" type="primary" @click="handleSearchList()" size="small">查询搜索
+				</el-button>
+				<el-button style="float:right;margin-right: 15px" @click="handleResetSearch()" size="small">重置
+				</el-button>
 			</div>
 			<div style="margin-top: 15px">
 				<el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-					<el-form-item label="输入搜索："><el-input style="width: 203px" v-model="listQuery.keyword" placeholder="会员名称/关键字"></el-input></el-form-item>
+					<el-form-item label="用户昵称：">
+						<el-input style="width: 203px" v-model="listQuery.nickname" placeholder="会员名称/关键字"></el-input>
+					</el-form-item>
 				</el-form>
 			</div>
 		</el-card>
+		<div class="listconadd">
+
 			<el-card class="operate-container" shadow="never">
 				<i class="el-icon-tickets"></i>
 				<span>数据列表</span>
-			<el-button
-			  type="primary"
-							class="btn-add"
-							@click="sendMessageToAll()"
-							size="mini">
+				<el-button type="primary" class="btn-add" @click="sendMessageToAll()" size="mini">
 					发送全员信息
 				</el-button>
-			<el-button
-			  type="primary"
-							class="btn-add"
-							@click="sendMessageToSelect()"
-							size="mini">
+				<el-button type="primary" class="btn-add" @click="sendMessageToSelect()" size="mini">
 					向选择会员发送信息
 				</el-button>
 			</el-card>
 			<div class="table-container">
-			<el-table ref="brandTable" :data="list" style="width: 100%" @selection-change="handleSelectionChange" v-loading="listLoading" border>
+				<el-table ref="brandTable" :data="list" style="width: 100%" @selection-change="handleSelectionChange"
+					v-loading="listLoading" border>
 					<el-table-column type="selection" width="50" align="center"></el-table-column>
 					<el-table-column label="编号" width="80" align="center">
 						<template slot-scope="scope">
@ -93,26 +96,23 @@
 					</el-table-column>
 					<el-table-column label="操作" width="250" align="center">
 						<template slot-scope="scope">
-						<el-button size="mini" type="primary" @click="sendMessageToOne(scope.$index, scope.row)">发送信息</el-button>
+							<el-button size="mini" type="primary" @click="sendMessageToOne(scope.$index, scope.row)">
+								发送信息
+							</el-button>
 							<!-- <el-button size="mini" type="danger" @click="addBlacne(scope.$index, scope.row)">余额充值</el-button> -->
 							<!-- <el-button size="mini" type="danger" @click="addIntegration(scope.$index, scope.row)">积分充值</el-button> -->
-						<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+							<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除
+							</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 			</div>
 			<div class="batch-operate-container"></div>
 			<div class="pagination-container">
-			<el-pagination
-				background
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				layout="total, sizes,prev, pager, next,jumper"
-				:page-size="listQuery.pageSize"
-				:page-sizes="[5, 10, 15]"
-				:current-page.sync="listQuery.pageNum"
-				:total="total"
-			></el-pagination>
+				<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+					layout="total, sizes,prev, pager, next,jumper" :page-size="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]" :current-page.sync="listQuery.pageNum" :total="total"></el-pagination>
+			</div>
 		</div>
 		<el-dialog title="积分记录" :visible.sync="dialogVisible1" width="40%">
 			<el-table style="width: 100%;margin-top: 20px" :data="integrationList" border>
@ -184,7 +184,9 @@
 		</el-dialog>
 		<el-dialog title="余额充值" :visible.sync="blance.dialogVisible" width="40%">
 			<el-form :model="blance" ref="brandFrom" label-width="150px">
-				<el-form-item label="充值金额：" prop="detail"><el-input v-model="blance.blance"></el-input></el-form-item>
+				<el-form-item label="充值金额：" prop="detail">
+					<el-input v-model="blance.blance"></el-input>
+				</el-form-item>

 				<el-form-item>
 					<el-button @click="blance.dialogVisible = false">取 消</el-button>
@ -195,7 +197,9 @@

 		<el-dialog title="积分充值" :visible.sync="integration.dialogVisible" width="40%">
 			<el-form :model="integration" ref="brandFrom" label-width="150px">
-				<el-form-item label="充值积分：" prop="detail"><el-input v-model="integration.integration"></el-input></el-form-item>
+				<el-form-item label="充值积分：" prop="detail">
+					<el-input v-model="integration.integration"></el-input>
+				</el-form-item>

 				<el-form-item>
 					<el-button @click="integration.dialogVisible = false">取 消</el-button>
@ -209,11 +213,16 @@
 				<el-form-item label="会员：">向账号为 {{msgOne.membername}} 的会员发送信息</el-form-item>
 				<el-form-item label="信息类型：" prop="code">
 					<el-select v-model="msgOne.code" placeholder="请选择">
-						<el-option  v-for="item in messageCodeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+						<el-option v-for="item in messageCodeOptions" :key="item.value" :label="item.label"
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="标题：" prop="params"><el-input v-model="msgOne.params"></el-input></el-form-item>
-				<el-form-item label="信息内容：" prop="content"><el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input></el-form-item>
+				<el-form-item label="标题：" prop="params">
+					<el-input v-model="msgOne.params"></el-input>
+				</el-form-item>
+				<el-form-item label="信息内容：" prop="content">
+					<el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input>
+				</el-form-item>

 				<el-form-item>
 					<el-button @click="sendMessageToOneReset">取 消</el-button>
@ -227,11 +236,16 @@
 				<el-form-item label="">&nbsp;向所选择的会员发送信息!</el-form-item>
 				<el-form-item label="信息类型：" prop="code">
 					<el-select v-model="msgOne.code" placeholder="请选择">
-						<el-option  v-for="item in messageCodeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+						<el-option v-for="item in messageCodeOptions" :key="item.value" :label="item.label"
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="标题：" prop="params"><el-input v-model="msgOne.params"></el-input></el-form-item>
-				<el-form-item label="信息内容：" prop="content"><el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input></el-form-item>
+				<el-form-item label="标题：" prop="params">
+					<el-input v-model="msgOne.params"></el-input>
+				</el-form-item>
+				<el-form-item label="信息内容：" prop="content">
+					<el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input>
+				</el-form-item>

 				<el-form-item>
 					<el-button @click="sendMessageToSelectReset">取 消</el-button>
@ -245,11 +259,16 @@
 				<el-form-item label="">&nbsp;向所有的会员发送信息!</el-form-item>
 				<el-form-item label="信息类型：" prop="code">
 					<el-select v-model="msgOne.code" placeholder="请选择">
-						<el-option  v-for="item in messageCodeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+						<el-option v-for="item in messageCodeOptions" :key="item.value" :label="item.label"
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="标题：" prop="params"><el-input v-model="msgOne.params"></el-input></el-form-item>
-				<el-form-item label="信息内容：" prop="content"><el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input></el-form-item>
+				<el-form-item label="标题：" prop="params">
+					<el-input v-model="msgOne.params"></el-input>
+				</el-form-item>
+				<el-form-item label="信息内容：" prop="content">
+					<el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input>
+				</el-form-item>

 				<el-form-item>
 					<el-button @click="sendMessageToAllReset">取 消</el-button>
@ -260,11 +279,29 @@
 	</div>
 </template>
 <script>
-import { formatDate } from '@/utils/date'
-import { fetchList, updateShowStatus, updateFactoryStatus, deleteMember, updateMemberOrderInfo, handleEditIntegration, handleEditBlance } from '@/api/ums/member'
-import { fetchList as fetchBlanceList } from '@/api/ums/memberBlanceLog'
-import { fetchList as fetchIntegrationList } from '@/api/ums/memberIntegration'
-import { sendToOne, sendToAll, sendToSelect } from '@/api/ums/sysMessage'
+	import {
+		formatDate
+	} from '@/utils/date'
+	import {
+		fetchList,
+		updateShowStatus,
+		updateFactoryStatus,
+		deleteMember,
+		updateMemberOrderInfo,
+		handleEditIntegration,
+		handleEditBlance
+	} from '@/api/ums/member'
+	import {
+		fetchList as fetchBlanceList
+	} from '@/api/ums/memberBlanceLog'
+	import {
+		fetchList as fetchIntegrationList
+	} from '@/api/ums/memberIntegration'
+	import {
+		sendToOne,
+		sendToAll,
+		sendToSelect
+	} from '@/api/ums/sysMessage'

 	export default {
 		name: 'memberList',
@ -286,9 +323,21 @@ export default {
 					membername: ''
 				},
 				msgOneRules: {
-          code: [{required: true, message: '请选择信息类型', trigger: 'blur'}],
-          params: [ {required: true, message: '请输入信息标题', trigger: 'blur'} ],
-          content: [ {required: true, message: '信息内容不能为空', trigger: 'blur'}]
+					code: [{
+						required: true,
+						message: '请选择信息类型',
+						trigger: 'blur'
+					}],
+					params: [{
+						required: true,
+						message: '请输入信息标题',
+						trigger: 'blur'
+					}],
+					content: [{
+						required: true,
+						message: '信息内容不能为空',
+						trigger: 'blur'
+					}]
 				},
 				dialogVisibleMessSelect: false,
 				msgSelect: {
@ -312,8 +361,7 @@ export default {
 					dialogVisible: false,
 					id: null
 				},
-			operates: [
-				{
+				operates: [{
 						label: '显示会员',
 						value: 'showMember'
 					},
@ -324,7 +372,7 @@ export default {
 				],
 				operateType: null,
 				listQuery: {
-				keyword: null,
+					nickname: null,
 					pageNum: 1,
 					pageSize: 10
 				},
@ -598,13 +646,17 @@ export default {
 			},
 			handleShowVeriyEditDialog(index, row) {
 				this.dialogVisible = true
-			fetchBlanceList({ memberId: row.id }).then(response => {
+				fetchBlanceList({
+					memberId: row.id
+				}).then(response => {
 					this.blanceList = response.data.records
 				})
 			},
 			handleShowIntegrationDialog(index, row) {
 				this.dialogVisible1 = true
-			fetchIntegrationList({ memberId: row.id }).then(response => {
+				fetchIntegrationList({
+					memberId: row.id
+				}).then(response => {
 					this.integrationList = response.data.records
 				})
 			},
@ -635,7 +687,12 @@ export default {
 				this.multipleSelection = val
 			},
 			handleUpdate(index, row) {
-			this.$router.push({ path: '/ums/updateMember', query: { id: row.id } })
+				this.$router.push({
+					path: '/ums/updateMember',
+					query: {
+						id: row.id
+					}
+				})
 			},
 			handleDelete(index, row) {
 				this.$confirm('是否要删除该会员', '提示', {
@ -722,6 +779,19 @@ export default {
 					})
 				})
 			},
+			handleResetSearch() {
+
+				this.listQuery = {
+					nickname: null,
+					pageNum: 1,
+					pageSize: 10
+				};
+			},
+			handleSearchList() {
+				this.listQuery.pageNum = 1;
+				this.getList();
+			},
+
 			handleBatchOperate() {
 				console.log(this.multipleSelection)
 				if (this.multipleSelection < 1) {
@ -762,7 +832,9 @@ export default {
 				})
 			},
 			addMember() {
-			this.$router.push({ path: '/pms/addMember' })
+				this.$router.push({
+					path: '/pms/addMember'
+				})
 			}
 		}
 	}