diff --git a/fuintAdmin/src/api/order/oilnumgun.js b/fuintAdmin/src/api/order/oilnumgun.js
index f67264c26..e965a9ed1 100644
--- a/fuintAdmin/src/api/order/oilnumgun.js
+++ b/fuintAdmin/src/api/order/oilnumgun.js
@@ -44,6 +44,14 @@ export function getOilNameList() {
})
}
+// 查询所有油号
+export function oilNumberList() {
+ return request({
+ url: '/business/petrolStationManagement/oilNumber/getList',
+ method: 'get',
+ // data: data
+ })
+}
// 查询所有油号
export function oilNumbers() {
diff --git a/fuintAdmin/src/api/setting/message.js b/fuintAdmin/src/api/setting/message.js
new file mode 100644
index 000000000..1f74cd23f
--- /dev/null
+++ b/fuintAdmin/src/api/setting/message.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getListApi(query) {
+ return request({
+ url: 'messageTemplate',
+ method: 'get',
+ params: query
+ })
+}
+
+//
+export function deleteApi(ids) {
+ return request({
+ url: 'messageTemplate?idList=' + ids,
+ method: 'delete'
+ })
+}
+//
+export function saveApi(data) {
+ return request({
+ url: 'messageTemplate',
+ method: 'post',
+ data: data
+ })
+}
+
+// 保存修改信息
+export function updateApi(data) {
+ return request({
+ url: 'messageTemplate',
+ method: 'put',
+ data: data
+ })
+}
+
+
diff --git a/fuintAdmin/src/api/staff/user/user.js b/fuintAdmin/src/api/staff/user/user.js
index c780ce0fd..d91e93b2f 100644
--- a/fuintAdmin/src/api/staff/user/user.js
+++ b/fuintAdmin/src/api/staff/user/user.js
@@ -84,3 +84,11 @@ export function exportUsers() {
method: 'get'
})
}
+
+//注销用户
+export function logOffUsers(id) {
+ return request({
+ url: '/business/userManager/userbalance/'+id,
+ method: 'get'
+ })
+}
diff --git a/fuintAdmin/src/assets/images/wenhao.png b/fuintAdmin/src/assets/images/wenhao.png
new file mode 100644
index 000000000..f17b032f4
Binary files /dev/null and b/fuintAdmin/src/assets/images/wenhao.png differ
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index 8084630ca..ab65bdca4 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -64,7 +64,7 @@
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index fb7ffeeb6..ee6971aec 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -69,7 +69,7 @@
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index b09689e9f..1b84207d8 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -1,233 +1,290 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 至
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
搜索
-
重置
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+ 新增
-
+ >新增会员
+
+
批量新增
+
+
会员群发
+
+
-
+
-
+
-
-
-
-
-
-
激活会员总数
-
{{total}}
-

-
+
+
+
+
+
+
+
+
-
-
今日新增/昨日新增
-
{{ addNum }}/{{ yesterdayAddNum }}
-

-
-
-
充值总人数
-
{{rechargeTotal || 0}}
-

-
-
-
储值总余额
-
{{balance}}
-

-
-
-
积分总余额
-
{{point}}
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.name ? scope.row.name : "--" }}
-
-
-
-
- {{ scope.row.mobile ? scope.row.mobile : '-' }}
-
-
-
-
- {{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '-' }}
-
-
-
-
- {{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}
-
-
-
-
- {{ scope.row.points ? scope.row.points : '0.00' }}
-
-
-
-
- {{ scope.row.consumeNum ? scope.row.consumeNum : '0' }}
-
-
-
-
-
-
- 启用
- 禁用
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
+
+
+
+
+
+
+ {{ scope.row.name ? scope.row.name : "--" }}
+
+
+
+
+
+ {{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '--' }}
+
+
+
+
+ {{ scope.row.userLabelId || '--' }}
+
+
+
+
+ {{ scope.row.carNo || '--' }}
+
+
+
+
+ {{ scope.row.mobile ? scope.row.mobile : '-' }}
+
+
+
+
+ {{ scope.row.birthday || '--' }}
+
+
+
+
+ 使用中
+ 已注销
+
+
+
+
+ {{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}
+
+
+
+
+ {{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}
+
+
+
+
+ {{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}
+
+
+
+
+ {{ scope.row.points ? scope.row.points : '0.00' }}
+
+
+
+
+ {{ scope.row.points ? scope.row.points : '0.00' }}
+
+
+
+
+ {{ scope.row.growthValue || '0' }}
+
+
+
+
+
+ 修改
+
+ 会员注销
+
+ 删除
+
+
+
+
+
-
+
- {{item}}
+ {{ item }}
录入单个会员
+ icon="el-icon-edit-outline" @click="addOne" round>录入单个会员
+
批量导入会员
+ icon="el-icon-connection" @click="addMult" round>批量导入会员
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -296,24 +330,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -326,49 +401,38 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 启用
- 禁用
-
+
+
+
+
+
+
+
+
+
+
@@ -382,10 +446,65 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 200
+
+
+
+
+
+
-
第一步: 下载示例模板,按照模板填写会员数据,手机号为必填项
+
第一步: 下载示例模板,按照模板填写会员数据,手机号为必填项
会员示例模板.xlsx
@@ -403,24 +522,24 @@
点击上传
只能上传xls/xlsx文件,单次最大5000行会员数据且不超过1M 超出请分文件处理
-
+
-
+
- 会员总数:{{result.total}} 人
+ 会员总数:{{ result.total }} 人
- 成功人数:{{result.success}} 人
+ 成功人数:{{ result.success }} 人
- 失败人数:{{result.error}} 人
+ 失败人数:{{ result.error }} 人
手机号不可为空
- 重复人数:{{result.repeat}} 人
+ 重复人数:{{ result.repeat }} 人
@@ -433,54 +552,52 @@