From a515ed3d37d978a264cccda608b5907c6a62c7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=90=A6?= <liqiworkers@gmail.com>
Date: Mon, 1 Jun 2026 13:24:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E5=88=86=E5=8C=85?=
 =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E4=B8=BB=E5=8C=85=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E4=BA=862m?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/utils.js                               |  2 +-
 pages.json                                    | 49 +++++++++----------
 pages/my/index.vue                            |  2 +-
 pages/workbench/index.vue                     |  2 +-
 store/index.js                                |  1 -
 .../sub_my}/prescriptionDetail.vue            |  0
 .../sub_my}/prescriptionList.vue              |  4 +-
 .../sub_online_reception/pages/chat.vue       |  6 +--
 subPackages/sub_patient/patient_detail.vue    |  2 +-
 subPackages/sub_patient/patient_label.vue     |  2 +-
 .../sub_workbench}/prescriptionDetail.vue     |  0
 .../sub_workbench}/prescriptionList.vue       |  4 +-
 .../uni_modules}/lime-painter/changelog.md    |  0
 .../components/common/relation.js             |  0
 .../l-painter-image/l-painter-image.vue       |  0
 .../l-painter-qrcode/l-painter-qrcode.vue     |  0
 .../l-painter-text/l-painter-text.vue         |  0
 .../l-painter-view/l-painter-view.vue         |  0
 .../components/l-painter/l-painter.vue        |  0
 .../lime-painter/components/l-painter/nvue.js |  0
 .../components/l-painter/painter.js           |  0
 .../components/l-painter/props.js             |  0
 .../components/l-painter/utils.js             |  0
 .../components/lime-painter/index.vue         |  0
 .../uni_modules}/lime-painter/package.json    |  0
 .../uni_modules}/lime-painter/readme.md       |  0
 .../lime-painter/static/index.html            |  0
 .../lime-painter/static/painter.js            |  0
 .../lime-painter/static/uni.webview.1.5.3.js  |  0
 subPackages/sub_workbench/workbench_code.vue  |  5 ++
 .../sub_workbench/workbench_infoPatient.vue   |  2 +-
 31 files changed, 42 insertions(+), 39 deletions(-)
 rename {pages/my => subPackages/sub_my}/prescriptionDetail.vue (100%)
 rename {pages/my => subPackages/sub_my}/prescriptionList.vue (96%)
 rename {pages/workbench => subPackages/sub_workbench}/prescriptionDetail.vue (100%)
 rename {pages/workbench => subPackages/sub_workbench}/prescriptionList.vue (93%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/changelog.md (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/common/relation.js (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter-image/l-painter-image.vue (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter-text/l-painter-text.vue (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter-view/l-painter-view.vue (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter/l-painter.vue (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter/nvue.js (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter/painter.js (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter/props.js (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/l-painter/utils.js (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/components/lime-painter/index.vue (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/package.json (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/readme.md (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/static/index.html (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/static/painter.js (100%)
 rename {uni_modules => subPackages/sub_workbench/uni_modules}/lime-painter/static/uni.webview.1.5.3.js (100%)

diff --git a/common/utils.js b/common/utils.js
index a56bbc9..29bbb4b 100644
--- a/common/utils.js
+++ b/common/utils.js
@@ -1,6 +1,6 @@
 
 import $store from '@/store/index.js';
-import pinyin from './getPingYin.js';
+// import pinyin from './getPingYin.js';
 class utils {
 	constructor(arg) {
 
diff --git a/pages.json b/pages.json
index 2fadc11..d039a5b 100644
--- a/pages.json
+++ b/pages.json
@@ -48,31 +48,6 @@
         "navigationStyle": "custom"
       }
     },
-    {
-      "path": "pages/my/prescriptionList",
-      "style": {
-        "navigationBarTitleText": "我的处方"
-      }
-    },
-    {
-      "path": "pages/workbench/prescriptionList",
-      "style": {
-        "navigationBarTitleText": "待流转处方"
-      }
-    },
-    {
-      "path": "pages/workbench/prescriptionDetail",
-      "style": {
-        "navigationBarTitleText": "处方详情"
-      }
-    },
-    {
-      "path": "pages/my/prescriptionDetail",
-      "style": {
-        "navigationBarTitleText": "处方详情"
-      }
-
-    },
     {
       "path": "pages/pharmacist/index",
       "style": {
@@ -228,6 +203,18 @@
             "navigationBarTitleText": "患者详情"
           }
 
+        },
+        {
+          "path": "prescriptionList",
+          "style": {
+            "navigationBarTitleText": "待流转处方"
+          }
+        },
+        {
+          "path": "prescriptionDetail",
+          "style": {
+            "navigationBarTitleText": "处方详情"
+          }
         }
       ]
     },
@@ -321,6 +308,18 @@
             "navigationBarTitleText": "常用医嘱管理"
 
           }
+        },
+        {
+          "path": "prescriptionList",
+          "style": {
+            "navigationBarTitleText": "我的处方"
+          }
+        },
+        {
+          "path": "prescriptionDetail",
+          "style": {
+            "navigationBarTitleText": "处方详情"
+          }
         }
       ]
     },
diff --git a/pages/my/index.vue b/pages/my/index.vue
index e4345ec..c1bdbe2 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -94,7 +94,7 @@
 						// }, {
 						name: '我的处方',
 						icon: '../../static/image/wd-cf.png',
-						url: '/pages/my/prescriptionList'
+						url: '/subPackages/sub_my/prescriptionList'
 					},
 					{
 						name: '我的常用方',
diff --git a/pages/workbench/index.vue b/pages/workbench/index.vue
index e55ee16..e5dbc1c 100644
--- a/pages/workbench/index.vue
+++ b/pages/workbench/index.vue
@@ -260,7 +260,7 @@
 
             <!-- 处方 -->
             <view v-if="noticeList.length" class="news_item flex-row flex-jus-sp flex-ali-center"
-                  @click="$go('./prescriptionList')">
+                  @click="$go('/subPackages/sub_workbench/prescriptionList')">
               <view style="width: 80rpx;position: relative;">
                 <u-image width="80rpx" height="80rpx" shape="circle" src="/static/image/home1.png">
                   <u-loading slot="loading"></u-loading>
diff --git a/store/index.js b/store/index.js
index 453551b..065a2bf 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import Utils from '@/common/utils.js';
 import { disconnectWebSocket } from '@/utils/ws/initWebSocket.js';
 
 import {
diff --git a/pages/my/prescriptionDetail.vue b/subPackages/sub_my/prescriptionDetail.vue
similarity index 100%
rename from pages/my/prescriptionDetail.vue
rename to subPackages/sub_my/prescriptionDetail.vue
diff --git a/pages/my/prescriptionList.vue b/subPackages/sub_my/prescriptionList.vue
similarity index 96%
rename from pages/my/prescriptionList.vue
rename to subPackages/sub_my/prescriptionList.vue
index 70fe130..0ce0cec 100644
--- a/pages/my/prescriptionList.vue
+++ b/subPackages/sub_my/prescriptionList.vue
@@ -10,10 +10,10 @@
 			<view class="p-row-2 m-t-2">
 				<block v-if="!loading && list.length > 0">
 					<view class="p-32 b-r-8 white m-b-2" v-for="(item, i) in list" :key="item.id"
-						@click="$go('/pages/my/prescriptionDetail?id=' +item.id)">
+						@click="$go('/subPackages/sub_my/prescriptionDetail?id=' +item.id)">
 						<view class="flex-row flex-ali-center flex-jus-sp m-t-2">
 							<u-icon margin-left="8" label-size="32" label-color="#6C7380"
-								:name="require('../../static/image/ys.png')" :label="item.prescription_no"
+								:name="require('@/static/image/ys.png')" :label="item.prescription_no"
 								color="#6ACDBB" size="32"></u-icon>
 							<d-text :text="statusName[item.status]"></d-text>
 						</view>
diff --git a/subPackages/sub_online_reception/pages/chat.vue b/subPackages/sub_online_reception/pages/chat.vue
index 264bd5a..d1887d3 100644
--- a/subPackages/sub_online_reception/pages/chat.vue
+++ b/subPackages/sub_online_reception/pages/chat.vue
@@ -853,7 +853,7 @@ export default {
 			const rx = this.ordersRxList.find((r) => r._wxKey === wxKey);
 			const id = rx && (rx.id || rx.prescription_id);
 			if (!id) return;
-			let url = `/pages/my/prescriptionDetail?id=${id}`;
+			let url = `/subPackages/sub_my/prescriptionDetail?id=${id}`;
 			const no = rx.order_no || rx.prescription_no;
 			if (no) url += `&no=${encodeURIComponent(no)}`;
 			this.ordersPopupOpen = false;
@@ -1224,7 +1224,7 @@ export default {
 		viewPrescription(content) {
 			const id = content && content.id;
 			if (id) {
-				uni.navigateTo({ url: `/pages/my/prescriptionDetail?id=${id}` });
+				uni.navigateTo({ url: `/subPackages/sub_my/prescriptionDetail?id=${id}` });
 			}
 		},
 		onBubbleViewPrescription(idOrContent, orderNo) {
@@ -1234,7 +1234,7 @@ export default {
 			}
 			const id = idOrContent;
 			if (id) {
-				let url = `/pages/my/prescriptionDetail?id=${id}`;
+				let url = `/subPackages/sub_my/prescriptionDetail?id=${id}`;
 				if (orderNo) url += `&no=${encodeURIComponent(orderNo)}`;
 				uni.navigateTo({ url });
 			}
diff --git a/subPackages/sub_patient/patient_detail.vue b/subPackages/sub_patient/patient_detail.vue
index 5851669..53aa144 100644
--- a/subPackages/sub_patient/patient_detail.vue
+++ b/subPackages/sub_patient/patient_detail.vue
@@ -221,7 +221,7 @@
           }
           this.$go('../../subPackages/sub_workbench/workbench_infoPatient?id=' + patient_id + '&re_id=' + id)
         } else if (base_type == 5 && id) {
-          this.$go('/pages/my/prescriptionDetail?id=' + id)
+          this.$go('/subPackages/sub_my/prescriptionDetail?id=' + id)
         }
       },
 			patientInfo() {
diff --git a/subPackages/sub_patient/patient_label.vue b/subPackages/sub_patient/patient_label.vue
index dfb143f..fbe85b4 100644
--- a/subPackages/sub_patient/patient_label.vue
+++ b/subPackages/sub_patient/patient_label.vue
@@ -120,7 +120,7 @@
 					const re_id = e.split(',').slice(1, 2)
 					this.$go('../../subPackages/sub_workbench/workbench_infoPatient?id=' + id + '&re_id=' + re_id)
 				} else if (base_type == 5 && e) {
-					this.$go('/pages/my/prescriptionDetail?id=' + e)
+					this.$go('/subPackages/sub_my/prescriptionDetail?id=' + e)
 				}
 			},
 		},
diff --git a/pages/workbench/prescriptionDetail.vue b/subPackages/sub_workbench/prescriptionDetail.vue
similarity index 100%
rename from pages/workbench/prescriptionDetail.vue
rename to subPackages/sub_workbench/prescriptionDetail.vue
diff --git a/pages/workbench/prescriptionList.vue b/subPackages/sub_workbench/prescriptionList.vue
similarity index 93%
rename from pages/workbench/prescriptionList.vue
rename to subPackages/sub_workbench/prescriptionList.vue
index 4d2b6f0..169aa6d 100644
--- a/pages/workbench/prescriptionList.vue
+++ b/subPackages/sub_workbench/prescriptionList.vue
@@ -4,10 +4,10 @@
 			<view class="p-row-2 m-t-2">
 				<block v-if="list.length > 0">
 					<view class="p-32 b-r-8 white m-b-2 item" v-for="(item, i) in list" :key="item.id"
-						@click="$go('./prescriptionDetail?id=' +item.data + '&notice_id=' + item.id)">
+						@click="$go('/subPackages/sub_workbench/prescriptionDetail?id=' +item.data + '&notice_id=' + item.id)">
 						<view class="flex-row flex-ali-center flex-jus-sp m-t-2">
 							<u-icon margin-left="8" label-size="32" label-color="#6C7380"
-								:name="require('../../static/image/ys.png')" :label="item.content"
+								:name="require('@/static/image/ys.png')" :label="item.content"
 								color="#6ACDBB" size="32"></u-icon>
 							<!-- <d-text :text="statusName[item.status]"></d-text> -->
 						</view>
diff --git a/uni_modules/lime-painter/changelog.md b/subPackages/sub_workbench/uni_modules/lime-painter/changelog.md
similarity index 100%
rename from uni_modules/lime-painter/changelog.md
rename to subPackages/sub_workbench/uni_modules/lime-painter/changelog.md
diff --git a/uni_modules/lime-painter/components/common/relation.js b/subPackages/sub_workbench/uni_modules/lime-painter/components/common/relation.js
similarity index 100%
rename from uni_modules/lime-painter/components/common/relation.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/common/relation.js
diff --git a/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
diff --git a/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
diff --git a/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
diff --git a/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
diff --git a/uni_modules/lime-painter/components/l-painter/l-painter.vue b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/l-painter.vue
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter/l-painter.vue
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/l-painter.vue
diff --git a/uni_modules/lime-painter/components/l-painter/nvue.js b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/nvue.js
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter/nvue.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/nvue.js
diff --git a/uni_modules/lime-painter/components/l-painter/painter.js b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/painter.js
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter/painter.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/painter.js
diff --git a/uni_modules/lime-painter/components/l-painter/props.js b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/props.js
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter/props.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/props.js
diff --git a/uni_modules/lime-painter/components/l-painter/utils.js b/subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/utils.js
similarity index 100%
rename from uni_modules/lime-painter/components/l-painter/utils.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/l-painter/utils.js
diff --git a/uni_modules/lime-painter/components/lime-painter/index.vue b/subPackages/sub_workbench/uni_modules/lime-painter/components/lime-painter/index.vue
similarity index 100%
rename from uni_modules/lime-painter/components/lime-painter/index.vue
rename to subPackages/sub_workbench/uni_modules/lime-painter/components/lime-painter/index.vue
diff --git a/uni_modules/lime-painter/package.json b/subPackages/sub_workbench/uni_modules/lime-painter/package.json
similarity index 100%
rename from uni_modules/lime-painter/package.json
rename to subPackages/sub_workbench/uni_modules/lime-painter/package.json
diff --git a/uni_modules/lime-painter/readme.md b/subPackages/sub_workbench/uni_modules/lime-painter/readme.md
similarity index 100%
rename from uni_modules/lime-painter/readme.md
rename to subPackages/sub_workbench/uni_modules/lime-painter/readme.md
diff --git a/uni_modules/lime-painter/static/index.html b/subPackages/sub_workbench/uni_modules/lime-painter/static/index.html
similarity index 100%
rename from uni_modules/lime-painter/static/index.html
rename to subPackages/sub_workbench/uni_modules/lime-painter/static/index.html
diff --git a/uni_modules/lime-painter/static/painter.js b/subPackages/sub_workbench/uni_modules/lime-painter/static/painter.js
similarity index 100%
rename from uni_modules/lime-painter/static/painter.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/static/painter.js
diff --git a/uni_modules/lime-painter/static/uni.webview.1.5.3.js b/subPackages/sub_workbench/uni_modules/lime-painter/static/uni.webview.1.5.3.js
similarity index 100%
rename from uni_modules/lime-painter/static/uni.webview.1.5.3.js
rename to subPackages/sub_workbench/uni_modules/lime-painter/static/uni.webview.1.5.3.js
diff --git a/subPackages/sub_workbench/workbench_code.vue b/subPackages/sub_workbench/workbench_code.vue
index 58e1f88..768b81c 100644
--- a/subPackages/sub_workbench/workbench_code.vue
+++ b/subPackages/sub_workbench/workbench_code.vue
@@ -16,7 +16,12 @@
 </template>
 
 <script>
+import LPainter from './uni_modules/lime-painter/components/l-painter/l-painter.vue'
+
 export default {
+  components: {
+    'l-painter': LPainter
+  },
   data() {
     return {
       poster: {
diff --git a/subPackages/sub_workbench/workbench_infoPatient.vue b/subPackages/sub_workbench/workbench_infoPatient.vue
index 9206417..c0f7265 100644
--- a/subPackages/sub_workbench/workbench_infoPatient.vue
+++ b/subPackages/sub_workbench/workbench_infoPatient.vue
@@ -312,7 +312,7 @@ export default {
       return item && item.register_id ? item.register_id : ''
     },
     openPrescriptionDetail(prescriptionId) {
-      this.$go('/pages/my/prescriptionDetail?id=' + prescriptionId)
+      this.$go('/subPackages/sub_my/prescriptionDetail?id=' + prescriptionId)
     },
     withdrawRxByIndex(which, index) {
       const list = which === 'current' ? this.rxCurrentList : this.rxHistoryList