From 92fdd2df8e0379c828a04ec05e0020e60f2853b5 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 11 Apr 2023 16:57:00 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=98=E5=8C=96pc=E7=AB=AF=E6=89=93?=
=?UTF-8?q?=E5=BC=80h5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/public/mobile.html | 23 ++++++++++++
crmeb/route/route.php | 12 +++++-
template/uni-app/App.vue | 8 ----
template/uni-app/static/html/pc.html | 55 ----------------------------
4 files changed, 33 insertions(+), 65 deletions(-)
create mode 100644 crmeb/public/mobile.html
delete mode 100644 template/uni-app/static/html/pc.html
diff --git a/crmeb/public/mobile.html b/crmeb/public/mobile.html
new file mode 100644
index 000000000..f4d9b5be2
--- /dev/null
+++ b/crmeb/public/mobile.html
@@ -0,0 +1,23 @@
+
+
+
+
+ =$siteName?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/crmeb/route/route.php b/crmeb/route/route.php
index ccdf6de23..65503abc0 100644
--- a/crmeb/route/route.php
+++ b/crmeb/route/route.php
@@ -24,8 +24,16 @@ Route::miss(function () {
case 'pages':
return view(app()->getRootPath() . 'public' . DS . 'index.html');
default:
- if (!request()->isMobile() && is_dir(app()->getRootPath() . 'public' . DS . 'home') && !request()->get('type')) {
- return view(app()->getRootPath() . 'public' . DS . 'home' . DS . 'index.html');
+ if (!request()->isMobile()) {
+ if (is_dir(app()->getRootPath() . 'public' . DS . 'home') && !request()->get('type')) {
+ return view(app()->getRootPath() . 'public' . DS . 'home' . DS . 'index.html');
+ } else {
+ if (request()->get('type')) {
+ return view(app()->getRootPath() . 'public' . DS . 'index.html');
+ } else {
+ return view(app()->getRootPath() . 'public' . DS . 'mobile.html', ['siteName' => sys_config('site_name'), 'siteUrl' => sys_config('site_url') . '/pages/index/index']);
+ }
+ }
} else {
return view(app()->getRootPath() . 'public' . DS . 'index.html');
}
diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue
index 85cba6b6d..bb19b2424 100644
--- a/template/uni-app/App.vue
+++ b/template/uni-app/App.vue
@@ -246,14 +246,6 @@
// #endif
// #ifdef H5
- uni.getSystemInfo({
- success(e) {
- /* 窗口宽度大于420px且不在PC页面且不在移动设备时跳转至 PC.html 页面 */
- if (e.windowWidth > 420 && !window.top.isPC && !/iOS|Android/i.test(e.system)) {
- window.location.pathname = '/static/html/pc.html';
- }
- }
- });
if (option.query.hasOwnProperty('type') && option.query.type == "iframeWindow") {
this.globalData.isIframe = true;
} else {
diff --git a/template/uni-app/static/html/pc.html b/template/uni-app/static/html/pc.html
deleted file mode 100644
index 89a13f10c..000000000
--- a/template/uni-app/static/html/pc.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
- crmeb-PC端
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 4dbd1268d19f6f19dac74657607468bb5638a4a1 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 11 Apr 2023 17:02:55 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
crmeb/public/index.html | 2 +-
crmeb/public/static/html/pc.html | 55 -------------------
crmeb/public/static/js/index.468ab3a7.js | 1 +
crmeb/public/static/js/index.8f27223f.js | 1 -
...pecial-index~pages-index-index.1c07f80a.js | 1 +
...pecial-index~pages-index-index.e640922e.js | 1 -
.../js/pages-annex-vip_paid-index.6862c7d0.js | 1 -
.../js/pages-annex-vip_paid-index.9dd16dfa.js | 1 +
...tails-index~pages-goo~3d1fee3b.8bc08658.js | 1 -
.../js/pages-annex-web_view-index.6ef08ef8.js | 1 +
.../js/pages-annex-web_view-index.a1fa9330.js | 1 -
.../js/pages-goods-cashier-index.8ed73bb7.js | 1 -
.../js/pages-goods-cashier-index.a905cbb2.js | 1 +
...ages-goods-order_confirm-index.5b3df756.js | 1 +
...ages-goods-order_confirm-index.bf6b6cd1.js | 1 -
...ages-goods-order_details-index.2c9c5692.js | 1 +
...ages-goods-order_details-index.3eae97c0.js | 1 -
...ll-integral_order~pag~4439065e.d8a54078.js | 1 +
...ages-goods-order_details-index.dfbfa70d.js | 1 +
...ages-goods-order_details-index.e730e8b1.js | 1 -
.../pages-goods-order_list-index.333f0fea.js | 1 -
.../pages-goods-order_list-index.b17e0009.js | 1 +
...ges-points_mall-integral_order.706feed8.js | 1 -
...ges-points_mall-integral_order.acb01ecf.js | 1 +
...ts_mall-integral_order_details.8452b486.js | 1 -
...ts_mall-integral_order_details.ca67015b.js | 1 +
...-users-payment_on_behalf-index.00a4134d.js | 1 +
...-users-payment_on_behalf-index.1fbc1f9e.js | 1 -
...users-user_invoice_order-index.28c6d57a.js | 1 +
...users-user_invoice_order-index.705385bd.js | 1 -
...pages-users-user_payment-index.b5affb79.js | 1 +
...pages-users-user_payment-index.d4675b4f.js | 1 -
32 files changed, 16 insertions(+), 71 deletions(-)
delete mode 100644 crmeb/public/static/html/pc.html
create mode 100644 crmeb/public/static/js/index.468ab3a7.js
delete mode 100644 crmeb/public/static/js/index.8f27223f.js
create mode 100644 crmeb/public/static/js/pages-annex-special-index~pages-index-index.1c07f80a.js
delete mode 100644 crmeb/public/static/js/pages-annex-special-index~pages-index-index.e640922e.js
delete mode 100644 crmeb/public/static/js/pages-annex-vip_paid-index.6862c7d0.js
create mode 100644 crmeb/public/static/js/pages-annex-vip_paid-index.9dd16dfa.js
delete mode 100644 crmeb/public/static/js/pages-annex-vip_paid-index~pages-goods-order_confirm-index~pages-goods-order_details-index~pages-goo~3d1fee3b.8bc08658.js
create mode 100644 crmeb/public/static/js/pages-annex-web_view-index.6ef08ef8.js
delete mode 100644 crmeb/public/static/js/pages-annex-web_view-index.a1fa9330.js
delete mode 100644 crmeb/public/static/js/pages-goods-cashier-index.8ed73bb7.js
create mode 100644 crmeb/public/static/js/pages-goods-cashier-index.a905cbb2.js
create mode 100644 crmeb/public/static/js/pages-goods-order_confirm-index.5b3df756.js
delete mode 100644 crmeb/public/static/js/pages-goods-order_confirm-index.bf6b6cd1.js
create mode 100644 crmeb/public/static/js/pages-goods-order_confirm-index~pages-goods-order_details-index.2c9c5692.js
delete mode 100644 crmeb/public/static/js/pages-goods-order_confirm-index~pages-goods-order_details-index.3eae97c0.js
create mode 100644 crmeb/public/static/js/pages-goods-order_confirm-index~pages-goods-order_details-index~pages-points_mall-integral_order~pag~4439065e.d8a54078.js
create mode 100644 crmeb/public/static/js/pages-goods-order_details-index.dfbfa70d.js
delete mode 100644 crmeb/public/static/js/pages-goods-order_details-index.e730e8b1.js
delete mode 100644 crmeb/public/static/js/pages-goods-order_list-index.333f0fea.js
create mode 100644 crmeb/public/static/js/pages-goods-order_list-index.b17e0009.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_order.706feed8.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_order.acb01ecf.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_order_details.8452b486.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_order_details.ca67015b.js
create mode 100644 crmeb/public/static/js/pages-users-payment_on_behalf-index.00a4134d.js
delete mode 100644 crmeb/public/static/js/pages-users-payment_on_behalf-index.1fbc1f9e.js
create mode 100644 crmeb/public/static/js/pages-users-user_invoice_order-index.28c6d57a.js
delete mode 100644 crmeb/public/static/js/pages-users-user_invoice_order-index.705385bd.js
create mode 100644 crmeb/public/static/js/pages-users-user_payment-index.b5affb79.js
delete mode 100644 crmeb/public/static/js/pages-users-user_payment-index.d4675b4f.js
diff --git a/crmeb/public/index.html b/crmeb/public/index.html
index 758521b9d..003e57d0d 100644
--- a/crmeb/public/index.html
+++ b/crmeb/public/index.html
@@ -1,2 +1,2 @@
加载中
\ No newline at end of file
+ document.write('')