Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl

# Conflicts:
#	.env.base

.env.base

@@ -4,8 +4,9 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://localhost:48080'
-# VITE_BASE_URL='http://114.215.207.150:48080'
+# VITE_BASE_URL='http://47.98.161.246:48080'
+#VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 小程序接口请求路劲
 VITE_APPLET_URL='https://cloud.ahduima.com'

.env.front

@@ -4,7 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://47.98.161.246:48080'
+#VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

package.json

@@ -60,6 +60,7 @@
     "min-dash": "^4.1.1",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
+    "or": "^0.2.0",
     "pinia": "^2.1.3",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
@@ -69,6 +70,7 @@
     "vue": "3.3.4",
     "vue-amap": "^0.5.10",
     "vue-dompurify-html": "^5.0.1",
+    "vue-draggable-plus": "^0.5.3",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.2.1",
     "vue-types": "^5.0.3",