diff --git a/fuintAdmin/src/assets/images/scimg.png b/fuintAdmin/src/assets/images/scimg.png new file mode 100644 index 000000000..2fd5c34c4 Binary files /dev/null and b/fuintAdmin/src/assets/images/scimg.png differ diff --git a/fuintAdmin/src/assets/styles/element-ui.scss b/fuintAdmin/src/assets/styles/element-ui.scss index 577629a03..7a437847a 100644 --- a/fuintAdmin/src/assets/styles/element-ui.scss +++ b/fuintAdmin/src/assets/styles/element-ui.scss @@ -117,3 +117,10 @@ font-weight: bold; } } + +.el-pagination.is-background .el-pager li:not(.disabled).active{ + background-color: #FF9655 !important; +} +.el-pagination.is-background .el-pager li:hover{ + color: #FF9655 !important;/*hover时候的文字颜色*/ +} diff --git a/fuintAdmin/src/views/member/fixingLevel.vue b/fuintAdmin/src/views/member/fixingLevel.vue index 7b8b963b8..17fbe58cc 100644 --- a/fuintAdmin/src/views/member/fixingLevel.vue +++ b/fuintAdmin/src/views/member/fixingLevel.vue @@ -371,18 +371,46 @@ + placeholder="请输入会员手机号，多个手机号用中文或英文 ‘或’ 隔开!单次最大支持1000个会员手机号认证">
-
- 多个会员手机号换行操作,每行为一个会员手机号，单次最大支持1000个会员手机号认证,请确保用户手机号已注册为油站会员(在会员列表已显示),否则无法添加认证信息 -
+ + +
+
+ +
+
+ +
点击导入 文件
+
+
+ 导入模板下载.xlsx +
+
+ +
+ 只能上传xls/xlsx文件，单次最大支持1000个会员手机号认证且不超过1M 超出请分文件处理,请确保用户手机号已注册为油站会员(在会员列表已显示),否则无法添加认证信息 + 批星导入会员手机号，单次最大支持5000个会员手机号认证，请确保用户手机号已注册为油站会员(在会员列表已显示)，否则无法添加认证官享 +
+ + +
确 定 @@ -841,6 +869,9 @@ export default { headers: { 'Access-Token': getToken(), }, + uploading: false, + // 文件上传信息 + fileList: [], result:{}, isEdit:false, // 上传图片信息 @@ -1316,6 +1347,20 @@ export default { } }); }, + // 批量导入 + handleChange(file, fileList) { + this.uploading = true; + if(file.status === 'success'){ + this.uploading = false; + this.fileList.splice(0,1) + this.openMembers = false; + this.openResult = true; + this.title = "会员认证结果"; + this.result = file.response.data; + this.reset2(); + this.getListMember(); + } + }, // 提交按钮 批量认证会员信息 submitFormMembers: function() { this.$refs["form2"].validate(valid => { diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 236ebe6d6..206c9d9b9 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -49,7 +49,7 @@ @@ -58,7 +58,7 @@ @@ -92,7 +92,7 @@
充值总人数
-
{{balance}}
+
{{rechargeTotal || 0}}
@@ -477,6 +477,7 @@ export default { addNum:'', // 昨日新增 yesterdayAddNum:'', + rechargeTotal:"", // 遮罩层 loading: true, uploading: false, @@ -612,6 +613,7 @@ export default { listStatistic(this.addDateRange(this.queryParams, dateRange)).then( response => { this.addNum = response.data.addNum; this.yesterdayAddNum = response.data.yesterdayAddNum; + this.rechargeTotal = response.data.rechargeTotal; if (!response.data.balance) { this.balance = 0 }else { diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue index fac497df0..9b299f460 100644 --- a/fuintAdmin/src/views/order/order_Added.vue +++ b/fuintAdmin/src/views/order/order_Added.vue @@ -91,7 +91,7 @@
- 统计 + 挂账订单统计
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index f8d365a84..1a0e575cd 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -51,7 +51,7 @@
- + 收银台订单统计
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index 744a3ab77..ec1877430 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -81,7 +81,7 @@
- + 商品交易订单统计
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue index 784167710..d393832ca 100644 --- a/fuintAdmin/src/views/order/order_Vip.vue +++ b/fuintAdmin/src/views/order/order_Vip.vue @@ -77,7 +77,7 @@
- + 会员充值订单统计
diff --git a/fuintAdmin_zt/src/api/indexBanner/index.js b/fuintAdmin_zt/src/api/indexBanner/index.js new file mode 100644 index 000000000..1675de68b --- /dev/null +++ b/fuintAdmin_zt/src/api/indexBanner/index.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询首页店铺数量信息 +export function storeTotalIndex(query) { + return request({ + url: '/backendApi/store/getStoreTotal', + method: 'get', + params: query + }) +} + +// 查询首页店铺金额信息 +export function storeAmountIndex(query) { + return request({ + url: '/business/allOrderInfo/getAmount', + method: 'get', + params: query + }) +} diff --git a/fuintAdmin_zt/src/assets/images/add.png b/fuintAdmin_zt/src/assets/images/add.png new file mode 100644 index 000000000..766a9aded Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/add.png differ diff --git a/fuintAdmin_zt/src/assets/images/detele.png b/fuintAdmin_zt/src/assets/images/detele.png new file mode 100644 index 000000000..48aa88592 Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/detele.png differ diff --git a/fuintAdmin_zt/src/assets/images/pcin.png b/fuintAdmin_zt/src/assets/images/pcin.png new file mode 100644 index 000000000..22d7fad61 Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/pcin.png differ diff --git a/fuintAdmin_zt/src/assets/images/qp.png b/fuintAdmin_zt/src/assets/images/qp.png new file mode 100644 index 000000000..07832f1be Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/qp.png differ diff --git a/fuintAdmin_zt/src/assets/images/tzzx.png b/fuintAdmin_zt/src/assets/images/tzzx.png new file mode 100644 index 000000000..08685a99c Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/tzzx.png differ diff --git a/fuintAdmin_zt/src/assets/images/xz.png b/fuintAdmin_zt/src/assets/images/xz.png new file mode 100644 index 000000000..82de82d98 Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/xz.png differ diff --git a/fuintAdmin_zt/src/assets/styles/element-ui.scss b/fuintAdmin_zt/src/assets/styles/element-ui.scss index 577629a03..f69dc5743 100644 --- a/fuintAdmin_zt/src/assets/styles/element-ui.scss +++ b/fuintAdmin_zt/src/assets/styles/element-ui.scss @@ -117,3 +117,17 @@ font-weight: bold; } } +.el-switch.is-checked .el-switch__core{ + background-color: #0DC291 !important; + border-color: #0DC291 !important; +} +.el-switch__core{ + background-color: #FF4347 !important; + border-color: #FF4347 !important; +} +.el-pagination.is-background .el-pager li:not(.disabled).active{ + background-color: #FF9655 !important; +} +.el-pagination.is-background .el-pager li:hover{ + color: #FF9655 !important;/*hover时候的文字颜色*/ +} diff --git a/fuintAdmin_zt/src/layout/components/AppMain.vue b/fuintAdmin_zt/src/layout/components/AppMain.vue index 7247b0da4..e4eba1834 100644 --- a/fuintAdmin_zt/src/layout/components/AppMain.vue +++ b/fuintAdmin_zt/src/layout/components/AppMain.vue @@ -43,7 +43,7 @@ export default { } .fixed-header+.app-main { - padding-top: 130px; + padding-top: 90px; } } diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue index f1fe76bb9..5a6088ce4 100644 --- a/fuintAdmin_zt/src/layout/components/Navbar.vue +++ b/fuintAdmin_zt/src/layout/components/Navbar.vue @@ -1,19 +1,38 @@ @@ -101,6 +114,16 @@ export default { diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index 11753c5b1..04b0a8aed 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -85,24 +85,42 @@ - - 搜索 - 重置 - - + + + + + + - 新增 + + 搜索 + 重置 + 新增用户 + + + + + + + + + + + + + + + @@ -392,24 +410,11 @@ - - - - - - - - - - - - - - - -
@@ -1804,19 +1796,23 @@ export default { let isAdd = data.deptType == '3' return ( - + +
{node.label} - + {!isAdd ? - this.append(data)}>新增 + + + < img alt="" src="http://47.95.206.185:83/add.png" style=" width: 20px;height: 20px; " on-click={() => this.append(data)}/> : null } {node.level !== 1 ? - this.remove(node, data)}>删除 + < img alt="" src="http://47.95.206.185:83/del.png" style=" width: 20px;height: 20px; " on-click={() => this.remove(node, data)}/> + : null } - - ); + +
); }, @@ -1911,7 +1907,7 @@ export default { handleStatusChange(row) { let text = row.status === "0" ? "启用" : "停用"; this.$modal.confirm('确认要"' + text + '""' + row.realName + '"用户吗？').then(function () { - return changeUserStatus(row.userId, row.status); + return updateUser(row); }).then(() => { this.$modal.msgSuccess(text + "成功"); }).catch(function () { @@ -2222,6 +2218,7 @@ export default { } .custom-tree-box{ margin-right: 10px; + } diff --git a/fuintAdmin_zt/src/views/index.vue b/fuintAdmin_zt/src/views/index.vue index 8d5f272e5..b78183d0c 100644 --- a/fuintAdmin_zt/src/views/index.vue +++ b/fuintAdmin_zt/src/views/index.vue @@ -10,7 +10,7 @@
-
568
+
{{ storeTotal.allTotal || 0 }}
合作油站总数
@@ -19,8 +19,8 @@
-
568
-
合作油站总数
+
{{ storeTotal.weekTotal || 0 }}
+
7日活跃油站汇总数
@@ -28,8 +28,8 @@
-
568
-
合作油站总数
+
{{ storeTotal.monthTotal || 0 }}
+
本月新增油站数
@@ -104,28 +104,67 @@
-
+
活跃油站
-
- +
+
+
+
+
活跃油站
+
+
+
+
- +
硬件设备
+
+
+ +
+
容大(RT RONGTA)RP76II针式76mm小票打印机加油站二三联票据 RP76II/USB口
+
+
+
数据统计
+
+
+ {{item}} +
+ + +
+
+ +
+