From 2e75ce3ae34259077e616cf10d08904c27b52ccc Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Thu, 29 Aug 2024 18:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http.interceptor.js | 6 +-
manifest.json | 2 +-
pages.json | 9 +
pages_admin/admin_index.vue | 7 +-
pages_admin/admin_worke.vue | 7 +-
pages_adminSet/financialStatement.vue | 660 ++++++++++++++++++++++++++
6 files changed, 680 insertions(+), 11 deletions(-)
create mode 100644 pages_adminSet/financialStatement.vue
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 74d0787..2d6606f 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,15 +1,15 @@
const install = (Vue, vm) => {
- uni.setStorageSync('deptId', 100);
+ uni.setStorageSync('deptId', 101);
Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://61.174.243.28:15861',
// baseUrl: 'http://192.168.2.46:8080',
// baseUrl: 'https://che.chuangtewl.com/prod-api',
// 测试环境
- // baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
+ baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
// 俞山岛
- baseUrl: 'https://dche.ccttiot.com/prod-api',
+ // baseUrl: 'https://dche.ccttiot.com/prod-api',
// 创特
loadingText: '努力加载中~',
loadingTime: 10000,
diff --git a/manifest.json b/manifest.json
index 3106710..5b8abf7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
/* 小程序特有相关 */
"mp-weixin" : {
"libVersion" : "latest",
- "appid" : "wx3428c498d5061192",
+ "appid" : "wx4d178f8c80348214",
"setting" : {
"urlCheck" : false,
"minified" : true
diff --git a/pages.json b/pages.json
index 7a1ffdf..9bd2c87 100644
--- a/pages.json
+++ b/pages.json
@@ -266,6 +266,15 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "financialStatement",
+ "style" :
+ {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
}
diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue
index 94f1c00..617860d 100644
--- a/pages_admin/admin_index.vue
+++ b/pages_admin/admin_index.vue
@@ -23,14 +23,14 @@
:circles="circles" :show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap"
@regionchange="onMapRegionChange">
-
+
-
+
@@ -248,8 +248,7 @@
this.getArea()
}
- appMap = uni.createMapContext("map", this).$getAppMap();
- appMap.showUserLocation(true);
+
let that = this
uni.getLocation({
type: 'wgs84',
diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue
index 8aee703..b56dd61 100644
--- a/pages_admin/admin_worke.vue
+++ b/pages_admin/admin_worke.vue
@@ -54,7 +54,7 @@
车辆绑定
-
+
账户明细
@@ -86,7 +86,8 @@
list: [],
show: false,
info:{},
- userinfo:{}
+ userinfo:{},
+ deptId:null
}
},
@@ -248,7 +249,7 @@
})
}else if(num==8){
uni.navigateTo({
- url:'/page_vip/financialStatement'
+ url:'/pages_adminSet/financialStatement'
})
}
}
diff --git a/pages_adminSet/financialStatement.vue b/pages_adminSet/financialStatement.vue
new file mode 100644
index 0000000..9985f3c
--- /dev/null
+++ b/pages_adminSet/financialStatement.vue
@@ -0,0 +1,660 @@
+
+
+
+
+
+ 时间范围
+
+
+
+ {{firsTime}}
+
+ -
+
+ {{lasTime}}
+
+
+
+
+
+ 今日
+
+
+ 昨日
+
+
+ 本月
+
+
+ 上个月
+
+
+
+
+
+
+ 库存现金余额
+
+
+
+
+ ￥{{info.income.accountSurplus}}
+
+
+
+
+
+ 订单明细
+
+
+
+
+ 主营业务收入
+
+
+
+ ￥{{info.income.orderPaid }}
+
+
+ 订单收入：{{info.income.orderPaid }}
+
+
+
+
+
+ 主营业务成本
+
+
+
+ ￥{{info.income.businessCost}}
+
+
+ 订单退款：{{info.income.orderRefund}}
+
+
+ 订单支付手续费：{{info.income.handlingFee}}
+
+
+
+
+
+ 净利润
+
+
+
+ ￥ {{info.income.operatingIncome }}
+
+
+ 押金明细
+
+
+
+ 押金收入：{{info.income.depositPaid }}
+
+
+ 押金抵扣转订单收入：{{info.income.deductionAmount }}
+
+
+ 押金支出：{{info.income.depositRefund }}
+
+
+ 押金收入手续费：{{info.income.depositHandlingCharge }}
+
+
+
+
+ 应退押金余额
+
+
+
+ ￥{{info.income.depositBalance}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{tiptit}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file