From 11cd6a5e6c32aec653216485bc5601e1f56fee46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com>
Date: Tue, 27 May 2025 09:23:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sub-operation-service/src/layouts/component/Main/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sub-operation-service/src/layouts/component/Main/index.vue b/sub-operation-service/src/layouts/component/Main/index.vue
index 09c10b8..9f89710 100644
--- a/sub-operation-service/src/layouts/component/Main/index.vue
+++ b/sub-operation-service/src/layouts/component/Main/index.vue
@@ -1,5 +1,5 @@
 <!--
- * @Description: 
+ * @Description:
  * @Author: zenghua.wang
  * @Date: 2023-06-20 14:29:45
  * @LastEditors: zenghua.wang
@@ -34,7 +34,7 @@ const isReload = computed(() => SettingStore.isReload);
   flex: 1;
   display: flex;
   width: 100%;
-  height: 100%;
+  height: fit-content;
   @include scrollable;
 
   box-sizing: border-box;

From 7c40a85242984dd3aafc13cee7839fabc83b8612 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Tue, 27 May 2025 09:32:12 +0800
Subject: [PATCH 2/4] xiabin

---
 main/src/micro/app.js                          | 4 ++--
 main/src/views/index.vue                       | 8 +++++++-
 new-digital-agriculture-screen/components.d.ts | 1 -
 sub-operation-service/components.d.ts          | 1 -
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index 9e29066..d0af37c 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -21,7 +21,7 @@ export const leftApps = [
     name: 'sub-app',
     entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
-    title: 'APP',
+    title: 'APP2',
     icon: 'images/platform/icon-app.png',
   },
   {
@@ -52,7 +52,7 @@ export const rightApps = [
     name: 'sub-app',
     entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
-    title: 'APP',
+    title: 'APP1',
     icon: 'images/platform/icon-app.png',
   },
   {
diff --git a/main/src/views/index.vue b/main/src/views/index.vue
index fd39627..558f472 100644
--- a/main/src/views/index.vue
+++ b/main/src/views/index.vue
@@ -36,7 +36,13 @@ import { getAssetsFile } from '@/utils';
 
 const gotoPage = (row) => {
   // window.history.pushState({}, row.name, row.activeRule);
-  window.location.href = row.activeRule;
+  if (row.title == 'APP1') {
+    window.location.href = 'https://www.pgyer.com/MXd3uUrO';
+  } else if (row.title == 'APP2') {
+    window.location.href = 'https://www.pgyer.com/4SVVtpob';
+  } else {
+    window.location.href = row.activeRule;
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/new-digital-agriculture-screen/components.d.ts b/new-digital-agriculture-screen/components.d.ts
index ca0fa36..694dcaa 100644
--- a/new-digital-agriculture-screen/components.d.ts
+++ b/new-digital-agriculture-screen/components.d.ts
@@ -12,7 +12,6 @@ declare module 'vue' {
     'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default']
     CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
     Components: typeof import('./src/components/index.js')['default']
-    copy: typeof import('./src/components/centerMap copy.vue')['default']
     CurrentTime: typeof import('./src/components/currentTime.vue')['default']
     CustomBack: typeof import('./src/components/customBack.vue')['default']
     CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']
diff --git a/sub-operation-service/components.d.ts b/sub-operation-service/components.d.ts
index 69e9674..1ffa191 100644
--- a/sub-operation-service/components.d.ts
+++ b/sub-operation-service/components.d.ts
@@ -9,7 +9,6 @@ declare module 'vue' {
   export interface GlobalComponents {
     CenterMap: typeof import('./src/components/centerMap.vue')['default']
     CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
-    copy: typeof import('./src/components/custom-scroll-title copy/index.vue')['default']
     CostomImg: typeof import('./src/components/costomImg.vue')['default']
     CustomBack: typeof import('./src/components/customBack.vue')['default']
     CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']

From f0370105156783f5991e0c9ee31329f54543afa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BF=8A=E6=97=AD?= <398847134@qq.com>
Date: Tue, 27 May 2025 09:39:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=95=86=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=A0=B7=E5=BC=8F=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sub-operation-service/src/layouts/index.vue              | 2 +-
 .../src/views/ecommerce/components/purchaserPopup.vue    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sub-operation-service/src/layouts/index.vue b/sub-operation-service/src/layouts/index.vue
index dd707f2..28215da 100644
--- a/sub-operation-service/src/layouts/index.vue
+++ b/sub-operation-service/src/layouts/index.vue
@@ -14,7 +14,7 @@ import Main from './component/Main';
 .basic-layout {
   width: 100%;
   min-width: 1200px;
-  height: 100%;
+  height: fit-content;
   &-container {
     position: relative;
     margin-left: 210px;
diff --git a/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue b/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue
index 881ddb7..c64511c 100644
--- a/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue
+++ b/sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue
@@ -85,8 +85,8 @@
         </div>
         <div style="display: flex; justify-content: flex-start; text-align: left; margin-top: 20px">
           <div class="inputs" style="width: 100%">
-            <span class="labels" style="width: 14%">收货地址：</span>
-            <el-input v-model="formData.address" maxlength="30" style="width: 100%" placeholder="请输入" show-word-limit type="textarea" />
+            <span class="labels" style="padding-right: 12px">收货地址：</span>
+            <el-input v-model="formData.address" maxlength="30" style="width: 87%" placeholder="请输入" show-word-limit type="textarea" />
           </div>
         </div>
       </el-form>
@@ -193,7 +193,7 @@ defineExpose({
 .unit::after {
   content: 'kg';
   position: absolute;
-  right: 10px; /* 调整单位与输入框的距离 */
+  right: 65px; /* 调整单位与输入框的距离 */
   color: #000; /* 单位颜色 */
   pointer-events: none; /* 防止单位遮挡输入框 */
 }
@@ -207,8 +207,7 @@ defineExpose({
   display: flex;
   align-items: center;
   .labels {
-    width: 25%;
-    margin-right: 10px;
+    padding-right: 12px;
   }
   input {
     width: calc(74% - 20px);

From 20e36a0f5aeef8b7a4c7b36cb62e72a3c0cd1116 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Tue, 27 May 2025 09:40:19 +0800
Subject: [PATCH 4/4] xiabin

---
 main/src/micro/app.js    | 8 ++++----
 main/src/views/index.vue | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index d0af37c..09a389f 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -18,10 +18,10 @@ export const leftApps = [
     icon: 'images/platform/icon-admin.png',
   },
   {
-    name: 'sub-app',
+    name: 'sub-app2',
     entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
-    title: 'APP2',
+    title: 'APP',
     icon: 'images/platform/icon-app.png',
   },
   {
@@ -49,10 +49,10 @@ export const rightApps = [
     icon: 'images/platform/icon-admin.png',
   },
   {
-    name: 'sub-app',
+    name: 'sub-app1',
     entry: VITE_APP_SUB_GAS,
     activeRule: '/sub-app',
-    title: 'APP1',
+    title: 'APP',
     icon: 'images/platform/icon-app.png',
   },
   {
diff --git a/main/src/views/index.vue b/main/src/views/index.vue
index 558f472..d2557a2 100644
--- a/main/src/views/index.vue
+++ b/main/src/views/index.vue
@@ -36,9 +36,9 @@ import { getAssetsFile } from '@/utils';
 
 const gotoPage = (row) => {
   // window.history.pushState({}, row.name, row.activeRule);
-  if (row.title == 'APP1') {
+  if (row.name == 'sub-app1') {
     window.location.href = 'https://www.pgyer.com/MXd3uUrO';
-  } else if (row.title == 'APP2') {
+  } else if (row.name == 'sub-app2') {
     window.location.href = 'https://www.pgyer.com/4SVVtpob';
   } else {
     window.location.href = row.activeRule;