From 70eab7ed7131f72305743e9bbcd384bda6243fa7 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 17 Oct 2023 17:57:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E6=8A=BC?=
=?UTF-8?q?=E9=87=91=E5=85=85=E5=80=BC=E5=87=AD=E8=AF=81,=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF=E8=B4=A2=E5=8A=A1?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=97=A0=E6=B3=95=E5=88=B7=E6=96=B0=E7=9A=84?=
=?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/company.js | 9 +
components/company/company.vue | 3 +-
components/companyFinance/companyFinance.vue | 21 +-
manifest.json | 4 +-
pages.json | 1274 +++++++++---------
subpkg/companyInfo/companyInfo.vue | 5 +-
subpkg/topUpDeposit/topUpDeposit.vue | 259 ++++
7 files changed, 927 insertions(+), 648 deletions(-)
create mode 100644 subpkg/topUpDeposit/topUpDeposit.vue
diff --git a/api/company.js b/api/company.js
index e690c09..44681dc 100644
--- a/api/company.js
+++ b/api/company.js
@@ -66,3 +66,12 @@ export const postsms = (data) => oahttp.post('/company/postsms', data)
*/
export const sss = (data) => oahttp.post('/company/postsms', data)
+/**
+ * 查询甲方公司信息
+ */
+export const getPartyACompany = (data) => oahttp.get('/company/getPartyACompany', data)
+
+/**
+ * 查询押金凭证记录
+ */
+export const getDepositRechargeTransferVoucherList = (data) => oahttp.get('/company/getDepositRechargeTransferVoucherList', data)
diff --git a/components/company/company.vue b/components/company/company.vue
index 33baf6e..8dd7781 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -318,7 +318,7 @@
-
+
+
+
\ No newline at end of file
From e203b2bdd52298ff7eca5b7104cf283356cf3bfc Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 18 Oct 2023 09:04:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifest.json b/manifest.json
index 193af11..4e7797f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "里海社区",
"appid" : "__UNI__B5B1EDD",
"description" : "",
- "versionName" : "1.2.3",
- "versionCode" : 123,
+ "versionName" : "1.2.4",
+ "versionCode" : 124,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
From 6580c6f7cdd93e8b4d6bc0921eaefec6b4637af8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 18 Oct 2023 09:05:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=9F=E5=90=8D?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/app.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/config/app.js b/config/app.js
index 7991a47..667bd25 100644
--- a/config/app.js
+++ b/config/app.js
@@ -5,6 +5,7 @@ let httpApiTwo; // 物流系统域名
// const env = 'dev'; // 开发
const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
+// const env = 'local'; // 本地
switch (env) {
case 'prod':
@@ -17,6 +18,11 @@ switch (env) {
httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
break;
+ case 'local':
+ httpApi = 'http://192.168.1.12:8001' //预上线
+ httpApiThree = 'http://192.168.1.12:8001' //预上线
+ httpApiTwo = 'http://192.168.1.12:8001' //预上线
+ break;
default:
httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试