From b414db310d318d0d5f19a6af5fe47eb82b714248 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 29 Oct 2024 10:45:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
http/yskApi/http.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index b3305c5..abded03 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -17,13 +17,13 @@ import infoBox from "@/commons/utils/infoBox.js"
import go from '@/commons/utils/go.js';
import { reject } from 'lodash';
// 测试服
-// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+let baseUrl = 'https://admintestpapi.sxczgkj.cn'
//预发布
// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
//正式
-let baseUrl = 'https://cashieradmin.sxczgkj.cn'
+// let baseUrl = 'https://cashieradmin.sxczgkj.cn'
// 王伟本地测
// let baseUrl = '/ww'
From 764c9461ae20a070a87ade0a2ce2fd25891276e8 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 29 Oct 2024 15:46:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=82?=
=?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 2 +-
pageConsumables/addConsumables.vue | 49 ++++----
pageConsumables/addType.vue | 35 +++---
pageConsumables/addsupplier.vue | 26 ++---
pageConsumables/editConsumables.vue | 26 ++---
pageConsumables/editsupplier.vue | 38 +++----
pageConsumables/index.vue | 30 ++---
pageConsumables/inventoryCheck.vue | 32 +++---
pageConsumables/outbound.vue | 58 +++++-----
pageConsumables/paymentSettlement.vue | 51 ++++-----
pageConsumables/supplier.vue | 44 ++++----
pageConsumables/viewrecords.vue | 15 +--
pageConsumables/warehouseEntry.vue | 65 +++++++----
pageLineUp/callRecord.vue | 20 ++--
pageLineUp/index.vue | 9 +-
pageSalesSummary/index.vue | 135 ++++++++++++++++++++---
pageSalesSummary/productSalesRanking.vue | 92 ++++++++++++++-
pageUser/index/index.vue | 13 ++-
pages/index/components/statistics.vue | 13 +--
19 files changed, 478 insertions(+), 275 deletions(-)
diff --git a/manifest.json b/manifest.json
index 41fb573..19e7f8b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -130,7 +130,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wxcbff1cfb27c1066c",
+ "appid" : "wxcf0fe8cdba153fd6",
"setting" : {
"urlCheck" : false,
"minified" : true,
diff --git a/pageConsumables/addConsumables.vue b/pageConsumables/addConsumables.vue
index a45814b..f15bd26 100644
--- a/pageConsumables/addConsumables.vue
+++ b/pageConsumables/addConsumables.vue
@@ -3,40 +3,40 @@
耗材信息
-
+
耗材名称
-
-
+
+
耗材价格
-
-
+
+
预警值
-
-
+
+
耗材类型
@@ -44,8 +44,8 @@
{{datas.typelist[datas.nowStatusIndex]}}
-
-
+
+
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageSalesSummary/productSalesRanking.vue b/pageSalesSummary/productSalesRanking.vue
index 229ccec..a4b1fc9 100644
--- a/pageSalesSummary/productSalesRanking.vue
+++ b/pageSalesSummary/productSalesRanking.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+
+ 商品名称
+ 总数量
+ 金额
+
+
+ {{item.productName}}
+ {{item.num}}
+ {{item.salesAmount || '无'}}
+
+
+
+
+
+
+