From 57b010a37495f645db06754e484b436e7a2c5dd0 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Tue, 1 Apr 2025 13:45:03 +0800
Subject: [PATCH] 最新1
---
admin-web-master/dist.zip | Bin 6410799 -> 0 bytes
admin-web-master/src/utils/request.js | 4 ++--
admin-web-master/src/utils/request2.js | 2 +-
admin-web-master/src/views/customer/yixiang/index.vue | 7 ++++++-
admin-web-master/src/views/online/transaction/index.vue | 967 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
admin-web-master/src/views/serve/salesStatistics.vue | 38 ++++++++++++++++++++++++++++----------
admin-web-master/src/views/shopbus/businessList/index.vue | 8 +++++---
admin-web-master/src/views/shopbus/settlement/addSettlement.vue | 6 +++---
ceres-uniapp-master/config/api.js | 14 +++++++-------
ceres-uniapp-master/pages_category_page1/customer/chatBox.vue | 2 +-
ceres-uniapp-master/unpackage/dist/build/web.zip | Bin 2110467 -> 0 bytes
ceres-uniapp-master/unpackage/dist/build/web/index.html | 2 +-
ceres-uniapp-master/unpackage/dist/build/web/static/js/index.1413974e.js | 1 +
ceres-uniapp-master/unpackage/dist/build/web/static/js/index.fabaab73.js | 1 -
ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-customer-chatBox.4fcbfa8d.js | 1 -
ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-customer-chatBox.8da01376.js | 1 +
ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.45d5824b.js | 1 +
ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.8b4a01a3.js | 1 -
lvdao-miniapp/pages/business/businessDetail/businessDetail.vue | 7 ++++---
lvdao-miniapp/pages/mycreated/mycreated.vue | 4 ++--
lvdao-miniapp/pages/participation/participation.vue | 4 ++--
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue | 14 ++++++++++----
merchant-web-master/dist.zip | Bin 2927247 -> 0 bytes
merchant-web-master/src/api/account.js | 2 +-
merchant-web-master/src/assets/images/uptis.png | Bin 0 -> 6651 bytes
merchant-web-master/src/utils/request.js | 2 +-
merchant-web-master/src/utils/request2.js | 2 +-
merchant-web-master/src/views/commodity/commoditySystem/index.vue | 3 ++-
merchant-web-master/src/views/customerService/kefuMsg/index.vue | 7 +++++--
merchant-web-master/src/views/login/index.vue | 16 +++++++++-------
30 files changed, 610 insertions(+), 507 deletions(-)
create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.1413974e.js
delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.fabaab73.js
delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-customer-chatBox.4fcbfa8d.js
create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-customer-chatBox.8da01376.js
create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.45d5824b.js
delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.8b4a01a3.js
create mode 100644 merchant-web-master/src/assets/images/uptis.png
diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
index 232f0e7..7c4a96f 100644
Binary files a/admin-web-master/dist.zip and b/admin-web-master/dist.zip differ
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 97e23ec..2fabf35 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL = ''
if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
// baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
- baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+ // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
// baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
- // baseURL = 'http://128.10.249.25:9003';
+ baseURL = 'http://128.10.249.46:9003';
} else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 4d617b6..6a7d760 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
// baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
// baseURL = 'http://172.16.61.125:9004';
// baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
- baseURL = 'http://128.10.249.25';
+ baseURL = 'http://128.10.249.46:9004';
} else {
console.error('---------------------')
console.error(hostall)
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index 97bd66f..b3192a4 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -28,6 +28,9 @@