diff --git a/fuintAdmin_zt/src/api/indexBanner/index.js b/fuintAdmin_zt/src/api/indexBanner/index.js index 1675de68b..1b21a9460 100644 --- a/fuintAdmin_zt/src/api/indexBanner/index.js +++ b/fuintAdmin_zt/src/api/indexBanner/index.js @@ -17,3 +17,12 @@ export function storeAmountIndex(query) { params: query }) } + +// 查询首页店铺金额信息 +export function selectStoreAmount(query) { + return request({ + url: '/backendApi/store/selectStoreAmount', + method: 'get', + params: query + }) +} diff --git a/fuintAdmin_zt/src/api/service/service.js b/fuintAdmin_zt/src/api/service/service.js index 14d1d2d91..1dd70a9f1 100644 --- a/fuintAdmin_zt/src/api/service/service.js +++ b/fuintAdmin_zt/src/api/service/service.js @@ -101,3 +101,12 @@ export function getOrderNumApi(query) { }) } + +// 查询店铺列表 +export function getStorelist(query) { + return request({ + url: '/business/storeInformation/store/selectListDept', + method: 'get', + params: query + }) +} diff --git a/fuintAdmin_zt/src/api/setting/hardware.js b/fuintAdmin_zt/src/api/setting/hardware.js new file mode 100644 index 000000000..184e70d9c --- /dev/null +++ b/fuintAdmin_zt/src/api/setting/hardware.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 分页查询所有的订单信息 +export function getListApi(query) { + return request({ + url: 'hardwareStore', + method: 'get', + params: query + }) +} + +// +export function deleteApi(ids) { + return request({ + url: 'hardwareStore?idList=' + ids, + method: 'delete' + }) +} +// +export function saveApi(data) { + return request({ + url: 'hardwareStore', + method: 'post', + data: data + }) +} + +// 保存修改信息 +export function updateApi(data) { + return request({ + url: 'hardwareStore', + method: 'put', + data: data + }) +} + + diff --git a/fuintAdmin_zt/src/api/setting/message.js b/fuintAdmin_zt/src/api/setting/message.js new file mode 100644 index 000000000..1f74cd23f --- /dev/null +++ b/fuintAdmin_zt/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_zt/src/components/ImagePreview/index.vue b/fuintAdmin_zt/src/components/ImagePreview/index.vue index 743d8d51d..b2d4c7a52 100644 --- a/fuintAdmin_zt/src/components/ImagePreview/index.vue +++ b/fuintAdmin_zt/src/components/ImagePreview/index.vue @@ -32,6 +32,7 @@ export default { }, computed: { realSrc() { + let real_src = this.src.split(",")[0]; if (isExternal(real_src)) { return real_src; diff --git a/fuintAdmin_zt/src/components/ImageUpload/index.vue b/fuintAdmin_zt/src/components/ImageUpload/index.vue index 8192c87cf..841f91589 100644 --- a/fuintAdmin_zt/src/components/ImageUpload/index.vue +++ b/fuintAdmin_zt/src/components/ImageUpload/index.vue @@ -88,8 +88,10 @@ export default { value: { handler(val) { if (val) { + console.log(91111) // 首先将值转为数组 const list = Array.isArray(val) ? val : this.value.split(','); + console.log(9333) // 然后将数组转为对象数组 this.fileList = list.map(item => { if (typeof item === "string") { @@ -127,7 +129,8 @@ export default { }, // 上传成功回调 handleUploadSuccess(res) { - this.uploadList.push({ name: res.fileName, url: res.fileName }); + console.log(res,132) + this.uploadList.push({ name: res.data.fileName, url: res.data.fileName }); if (this.uploadList.length === this.number) { this.fileList = this.fileList.concat(this.uploadList); this.uploadList = []; @@ -185,6 +188,7 @@ export default { listToString(list, separator) { let strs = ""; separator = separator || ","; + console.log(list,190) for (let i in list) { strs += list[i].url.replace(this.baseUrl, "") + separator; } diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue index 5a6088ce4..1fab8e120 100644 --- a/fuintAdmin_zt/src/layout/components/Navbar.vue +++ b/fuintAdmin_zt/src/layout/components/Navbar.vue @@ -37,8 +37,8 @@ - - 布局设置 + + 修改密码 退出登录 @@ -59,6 +59,7 @@ import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' import FuintDoc from '@/components/Fuint/Doc' +import confirmLog from "@/views/coupon/confirmLog/index.vue"; export default { components: { @@ -95,6 +96,9 @@ export default { } }, methods: { + prsswrod(){ + console.log('方法') + }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, diff --git a/fuintAdmin_zt/src/views/Service/details.vue b/fuintAdmin_zt/src/views/Service/details.vue index 193a7cf2e..268366cea 100644 --- a/fuintAdmin_zt/src/views/Service/details.vue +++ b/fuintAdmin_zt/src/views/Service/details.vue @@ -9,8 +9,8 @@ - - + + @@ -66,7 +66,7 @@ }, { name:'way', - title:'支付方式', + title:'付费方式', component:way }, { diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue index 4cd4ca4ed..2b37e6226 100644 --- a/fuintAdmin_zt/src/views/Service/index.vue +++ b/fuintAdmin_zt/src/views/Service/index.vue @@ -3,40 +3,50 @@
- - + + - + v-for="item in deptListSelect" + :key="item.deptId" + :label="item.deptName" + :value="item.deptId+''" + > - + - + v-for="dict in dict.type.zhzt" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> - - - + + + + + + + + value-format="yyyy-MM-dd" + placeholder="开始日期"> + + 至 +
- 搜索 - 重置 + 搜索 + 重置
@@ -51,52 +61,66 @@ width="50"> + + + @@ -111,7 +137,7 @@ @@ -123,8 +149,8 @@ label="操作"> @@ -29,26 +43,31 @@ export default {
机构名称：
-
百业兴连锁加油站
+
{{ storeDeptInfo.deptName || "--" }}
负责人姓名：
-
xxxx
+
{{ storeDeptInfo.leaderName || "--" }}
负责人电话：
-
15012345678
+
{{ storeDeptInfo.leaderPhone || "--" }}
机构类型：
-
连锁店
+
代理商
+
连锁店
+
基本门店
+
三方机构
计费方式：
-
年付费
-
预付费
-
后付费
-
无限制
+
无限制
+
时间限制
+
预付费
+
后付费
+
年付费
+
可创建油站站点数量
- + +
+
开始时间：
+
{{ storeDeptInfo.turnoverStartTime }}
+
结束时间：
+
{{ storeDeptInfo.turnoverEndTime }}
+
机构状态：
-
- +
+ +
备注：
-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
--
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue index 1d5a659b1..a2055f0af 100644 --- a/fuintAdmin_zt/src/views/homeComponents/agent.vue +++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue @@ -1,8 +1,14 @@