From 87e5571b8f4cb9aa81fbb13d416cf2bc12837b3c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 28 Feb 2022 14:45:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E9=97=A8=E5=BA=97=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=202.=E5=AF=B9=E6=8E=A5=E5=95=86=E6=88=B7=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Utils/Api.js | 31 +-
Utils/js/date.js | 5 +-
pages.json | 56 ++
pages/index/addService/addService.vue | 95 ++++
pages/index/addStore/addStore.vue | 520 +++++++++++++++++-
pages/index/collectNotes/collectNotes.vue | 62 +++
pages/index/doorManage/doorManage.vue | 136 +++++
pages/index/mcc-list/mcc-list.vue | 2 +-
.../merchant-details/merchant-details.vue | 2 +-
.../merchant-incoming-parts.vue | 17 +-
.../merchant-management.vue | 2 +-
pages/index/serviceBuild/serviceBuild.vue | 145 +++++
pages/index/store-details/store-details.vue | 2 +-
pages/tabBar/home/home.vue | 183 +++---
pages/tabBar/user/user.vue | 14 +-
static/img/addser.png | Bin 0 -> 3473 bytes
static/img/home1.png | Bin 0 -> 2879 bytes
static/img/home2.png | Bin 0 -> 2671 bytes
static/img/home3.png | Bin 0 -> 3820 bytes
static/img/home4.png | Bin 0 -> 4299 bytes
unpackage/dist/build/h5/index.html | 2 +-
unpackage/dist/build/h5/static/img/addser.png | Bin 0 -> 3473 bytes
unpackage/dist/build/h5/static/img/home1.png | Bin 0 -> 2879 bytes
unpackage/dist/build/h5/static/img/home2.png | Bin 0 -> 2671 bytes
unpackage/dist/build/h5/static/img/home3.png | Bin 0 -> 3820 bytes
unpackage/dist/build/h5/static/img/home4.png | Bin 0 -> 4299 bytes
.../dist/build/h5/static/js/index.2ecf215f.js | 1 -
.../dist/build/h5/static/js/index.33a4581c.js | 1 +
...es-index-addService-addService.7d63d754.js | 1 +
.../pages-index-addStore-addStore.4e56f7b9.js | 1 -
.../pages-index-addStore-addStore.e1c484c6.js | 1 +
...-parts-merchant-incoming-parts.69532adf.js | 1 +
...ess-category-business-category.419f4ccf.js | 1 -
...ess-category-business-category.79f7d97a.js | 1 +
...ndex-collectNotes-collectNotes.463c09a7.js | 1 +
...es-index-doorManage-doorManage.a6bb0c24.js | 1 +
.../pages-index-mcc-list-mcc-list.26c35bd1.js | 1 +
.../pages-index-mcc-list-mcc-list.9f281e51.js | 1 -
...-parts-merchant-incoming-parts.57723673.js | 1 -
...-parts-merchant-incoming-parts.9c345664.js | 1 +
...chant-details-merchant-details.1a79b526.js | 1 +
...chant-details-merchant-details.94b63118.js | 1 -
...ex-merchant-list-merchant-list.48183921.js | 1 -
...-parts-merchant-incoming-parts.b064705c.js | 1 -
...-parts-merchant-incoming-parts.d3845289.js | 1 +
...ex-merchant-list-merchant-list.cb0d3f82.js | 1 +
...ex-merchant-list-merchant-list.d72cdcd2.js | 1 -
...management-merchant-management.0bbd6db6.js | 1 +
...management-merchant-management.2d5bce70.js | 1 -
...ndex-serviceBuild-serviceBuild.77be670b.js | 1 +
...ex-store-details-store-details.3c5dd9e8.js | 1 +
...ex-store-details-store-details.44ed2054.js | 1 -
...-login~pages-tabBar-user-user.180513cc.js} | 2 +-
.../js/pages-tabBar-home-home.b5ddd2de.js | 1 -
.../js/pages-tabBar-home-home.e3c0b14c.js | 1 +
.../js/pages-tabBar-user-user.255be470.js | 1 -
.../js/pages-tabBar-user-user.35b49c84.js | 1 +
unpackage/dist/build/h5/归档.zip | Bin 2093517 -> 2168444 bytes
58 files changed, 1184 insertions(+), 122 deletions(-)
create mode 100644 pages/index/addService/addService.vue
create mode 100644 pages/index/collectNotes/collectNotes.vue
create mode 100644 pages/index/doorManage/doorManage.vue
create mode 100644 pages/index/serviceBuild/serviceBuild.vue
create mode 100644 static/img/addser.png
create mode 100644 static/img/home1.png
create mode 100644 static/img/home2.png
create mode 100644 static/img/home3.png
create mode 100644 static/img/home4.png
create mode 100644 unpackage/dist/build/h5/static/img/addser.png
create mode 100644 unpackage/dist/build/h5/static/img/home1.png
create mode 100644 unpackage/dist/build/h5/static/img/home2.png
create mode 100644 unpackage/dist/build/h5/static/img/home3.png
create mode 100644 unpackage/dist/build/h5/static/img/home4.png
delete mode 100644 unpackage/dist/build/h5/static/js/index.2ecf215f.js
create mode 100644 unpackage/dist/build/h5/static/js/index.33a4581c.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-addService-addService.7d63d754.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.4e56f7b9.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.e1c484c6.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-addStore-addStore~pages-index-merchant-incoming-parts-merchant-incoming-parts.69532adf.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-business-category-business-category.419f4ccf.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-business-category-business-category.79f7d97a.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-collectNotes-collectNotes.463c09a7.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-doorManage-doorManage.a6bb0c24.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-mcc-list-mcc-list.26c35bd1.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-mcc-list-mcc-list.9f281e51.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-mcc-list-mcc-list~pages-index-merchant-incoming-parts-merchant-incoming-parts.57723673.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-mcc-list-mcc-list~pages-index-merchant-incoming-parts-merchant-incoming-parts.9c345664.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-details-merchant-details.1a79b526.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-details-merchant-details.94b63118.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-details-merchant-details~pages-index-merchant-list-merchant-list.48183921.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-incoming-parts-merchant-incoming-parts.b064705c.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-incoming-parts-merchant-incoming-parts.d3845289.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-list-merchant-list.cb0d3f82.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-list-merchant-list.d72cdcd2.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-management-merchant-management.0bbd6db6.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-merchant-management-merchant-management.2d5bce70.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-serviceBuild-serviceBuild.77be670b.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-index-store-details-store-details.3c5dd9e8.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-store-details-store-details.44ed2054.js
rename unpackage/dist/build/h5/static/js/{pages-login-login~pages-tabBar-user-user.6e3ca38b.js => pages-login-login~pages-tabBar-user-user.180513cc.js} (95%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-tabBar-home-home.b5ddd2de.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-tabBar-home-home.e3c0b14c.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-tabBar-user-user.255be470.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-tabBar-user-user.35b49c84.js
diff --git a/Utils/Api.js b/Utils/Api.js
index 32639d6..73f6763 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -69,8 +69,35 @@ export const getStoreListByMer = params => {
export const getStoreDetailById = params => {
return POST('GET', `${base}/store/getStoreDetailById`, params).then(res => res.data);
}
-
-//手机查询统计
+//商户添加门店
+export const configStore = params => {
+ return POST('POST', `${base}/store/configStore`, params).then(res => res.data);
+}
+//门店添加设备
+export const configStoreDevice = params => {
+ return POST('POST', `${base}/storeDevice/configStoreDevice`, params).then(res => res.data);
+}
+//门店删除设备
+export const delStoreDevice = params => {
+ return POST('POST', `${base}/storeDevice/delStoreDevice`, params).then(res => res.data);
+}
+//门店查看设备列表
+export const getStoreDeviceList = params => {
+ return POST('GET', `${base}/storeDevice/getStoreDeviceList`, params).then(res => res.data);
+}
+//业务员查询统计
export const moveHomeCount = params => {
return POST('POST', `${base}/salesman/moveHomeCount`, params).then(res => res.data);
}
+//商户查询统计
+export const mermoveHomeCount = params => {
+ return POST('POST', `${base}/mer/moveHomeCount`, params).then(res => res.data);
+}
+//门店查询统计
+export const storemoveHomeCount = params => {
+ return POST('POST', `${base}/store/moveHomeCount`, params).then(res => res.data);
+}
+// 查询交易订单列表
+export const getTradeOrderList = params => {
+ return POST('GET', `${base}/tradeOrder/getTradeOrderList`, params).then(res => res.data);
+}
\ No newline at end of file
diff --git a/Utils/js/date.js b/Utils/js/date.js
index b13cba8..ba60f83 100644
--- a/Utils/js/date.js
+++ b/Utils/js/date.js
@@ -20,12 +20,9 @@ const timeFormat = (value, format) => {
h < 10 ? "0" + h : h
}:${min < 10 ? "0" + min : min}:${s < 10 ? "0" + s : s}`;
}
- if (format == "yyyy-mm-dd hh:mm") {
+ if (format == "yyyy-mm-dd") {
result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} `;
}
- if (format == "yyyy-mm-dd") {
- result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
- }
if (format == "yyyy-mm") {
result = `${y}-${m < 10 ? "0" + m : m}`;
}
diff --git a/pages.json b/pages.json
index 0d148d8..2647a65 100644
--- a/pages.json
+++ b/pages.json
@@ -162,6 +162,62 @@
}
}
+ ,{
+ "path" : "pages/index/collectNotes/collectNotes",
+ "style" :
+ {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "收款记录",
+ "onReachBottomDistance": 50,
+ "app-plus": {
+ "titleNView": false, //禁用原生导航栏
+ "softinputNavBar": "none"
+ }
+ }
+
+ }
+ ,{
+ "path" : "pages/index/doorManage/doorManage",
+ "style" :
+ {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "门店管理",
+ "onReachBottomDistance": 50,
+ "app-plus": {
+ "titleNView": false, //禁用原生导航栏
+ "softinputNavBar": "none"
+ }
+ }
+
+ }
+ ,{
+ "path" : "pages/index/serviceBuild/serviceBuild",
+ "style" :
+ {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "绑定设备",
+ "onReachBottomDistance": 50,
+ "app-plus": {
+ "titleNView": false, //禁用原生导航栏
+ "softinputNavBar": "none"
+ }
+ }
+
+ }
+ ,{
+ "path" : "pages/index/addService/addService",
+ "style" :
+ {
+ "navigationBarTextStyle": "white",
+ "navigationBarTitleText": "绑定设备",
+ "onReachBottomDistance": 50,
+ "app-plus": {
+ "titleNView": false, //禁用原生导航栏
+ "softinputNavBar": "none"
+ }
+ }
+
+ }
],
"subpackages": [{
"root": "subPages",
diff --git a/pages/index/addService/addService.vue b/pages/index/addService/addService.vue
new file mode 100644
index 0000000..e312a89
--- /dev/null
+++ b/pages/index/addService/addService.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/addStore/addStore.vue b/pages/index/addStore/addStore.vue
index 832f0b0..bf8e9ad 100644
--- a/pages/index/addStore/addStore.vue
+++ b/pages/index/addStore/addStore.vue
@@ -1,22 +1,86 @@
-
- 门店账号
- 营业执照
+
+
+
+
+
+
+ 公司名称
+
-
- 门店密码
-
+ 公司名称应与营业执照一致
+
+
+ 营业执照号
+
+
+
+ 注册地址
+
+
+
+ 营业期限
+
+ 选择时间
+
+
+ 长期有效
+
+
+
+
+ {{start_date}}
+
+ 至
+
+ {{end_date}}
+
+ 长期有效
+
+
+ 行业类目
+
+
+
+
+ 经营地区
+
+
+ {{regionName}}
+
+ 请选择经营地区
+
+
+
+
+ 详情地址
+
+
+
+ 门店账号
+
-
+
门店名称
-
+
门店电话
@@ -27,56 +91,474 @@
-
+
+
-
+
+
-
+
+
-
+ 提交
+
diff --git a/pages/index/doorManage/doorManage.vue b/pages/index/doorManage/doorManage.vue
new file mode 100644
index 0000000..5644f77
--- /dev/null
+++ b/pages/index/doorManage/doorManage.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.createTime | timeFormat('yyyy-mm-dd')}}
+ {{item.createTime | timeFormat('hh:mm')}}
+
+
+
+ 正常
+
+
+ 停用
+
+
+
+
+ {{item.account.telephone}}
+
+
+
+ {{item.telephone}}
+
+
+
+ {{item.storeRegion.address}}
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/mcc-list/mcc-list.vue b/pages/index/mcc-list/mcc-list.vue
index 22d3620..0709b46 100644
--- a/pages/index/mcc-list/mcc-list.vue
+++ b/pages/index/mcc-list/mcc-list.vue
@@ -5,7 +5,7 @@
-
+
{{item.maccCode}}
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 31650a4..6cc3a42 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -51,7 +51,7 @@
{{item.name}}
- {{item.updateTime | timeFormat('yyyy-mm-dd hh:mm')}}
+ {{item.updateTime | timeFormat('yyyy-mm-dd')}}
{{item.updateTime | timeFormat('hh:mm')}}
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index e7b9a66..e957018 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -1007,7 +1007,10 @@
this.businnum = this.businessLicenselist.creditCode;
this.regaddress = this.businessLicenselist.businessAddress;
this.start_date = this.businessLicenselist.RegistrationDate;
- let times = this.businessLicenselist.validPeriod.split('至');
+ let times = this.businessLicenselist.validPeriod.split('至');
+ if (times == '长期') {
+ this.timetype = '2';
+ }
if (times[1] == '永久') {
this.timetype = '2';
}
@@ -1178,9 +1181,15 @@
this.companyname = res.return_data.blisName;
this.businnum = res.return_data.blisNo
this.regaddress = res.return_data.blisRegAddress;
- this.start_date = res.return_data.blisPeriodStart
- this.timetype = res.return_data.blisPeriodType;
- this.end_date = res.return_data.blisPeriodEnd;
+ if(res.return_data.blisPeriodStart){
+ this.start_date = res.return_data.blisPeriodStart;
+ }
+ if(res.return_data.blisPeriodType){
+ this.timetype = res.return_data.blisPeriodType;
+ }
+ if(res.return_data.blisPeriodEnd){
+ this.end_date = res.return_data.blisPeriodEnd;
+ }
this.inducateid = res.return_data.merIndustry.childId;
this.industrycategory = res.return_data.merIndustry.childName;
this.detailsaddress = res.return_data.merRegion.address;
diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index 97906b7..56d3335 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -17,7 +17,7 @@
{{item.regPhone}}
- {{item.createTime | timeFormat('yyyy-mm-dd hh:mm')}}
+ {{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
diff --git a/pages/index/serviceBuild/serviceBuild.vue b/pages/index/serviceBuild/serviceBuild.vue
new file mode 100644
index 0000000..aeec664
--- /dev/null
+++ b/pages/index/serviceBuild/serviceBuild.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+ {{item.deviceSn}}
+ 绑定时间: {{item.createTime | timeFormat('yyyy-mm-dd')}}
+ {{item.createTime | timeFormat('hh:mm')}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/store-details/store-details.vue b/pages/index/store-details/store-details.vue
index 1be6a77..5c31d6b 100644
--- a/pages/index/store-details/store-details.vue
+++ b/pages/index/store-details/store-details.vue
@@ -32,7 +32,7 @@
创建时间
- {{storeDesInfo.updateTime | timeFormat('yyyy-mm-dd hh:mm')}}
+ {{storeDesInfo.updateTime | timeFormat('yyyy-mm-dd')}}
{{storeDesInfo.updateTime | timeFormat('hh:mm')}}
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index aec439b..896e1c4 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -2,16 +2,19 @@
- {{userInfo.secUser.userName}}
+ {{userInfo.secUser.userName}}
+
- 总收益
+ 总收益
+ ¥0.00
-
- ¥ 0.00
+ 今日总收入
+ ¥{{auditnum.tradePrice}}
-
+
进件成功数量
{{auditnum.contractSuccess}}
@@ -22,16 +25,16 @@
-
+
@@ -44,86 +47,124 @@
-
- {{item.title}}
+
+ {{item.title}}
-