From e1480a2304a23ca3485c16fe033304a08f82b51a Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Mon, 4 Aug 2025 16:20:42 +0800
Subject: [PATCH] no message

---
 .../pages/Contact/contact-list/friend-list.vue     |  2 +-
 pages/NEUIKit/pages/Contact/contact-list/index.vue |  2 +-
 pages/NEUIKit/pages/Contact/index.vue              |  1 -
 .../pages/Conversation/conversation-list/index.vue |  2 +-
 pages/NEUIKit/pages/styles/common.scss             | 55 ----------------------
 pages/message/index.vue                            |  1 -
 root/NEUIKit/components/NavBar.vue                 |  1 -
 root/NEUIKit/components/PersonSelect.vue           |  1 -
 root/NEUIKit/components/PinCard.vue                |  1 -
 root/NEUIKit/components/UserCard.vue               |  1 -
 .../uni-popup/components/uni-popup/i18n/en.json    |  7 ---
 .../uni-popup/components/uni-popup/i18n/index.js   |  1 -
 .../pages/Chat/message/mention-member-list.vue     |  2 +-
 root/NEUIKit/pages/Chat/message/message-bubble.vue |  2 +-
 root/NEUIKit/pages/Chat/message/message-input.vue  |  2 +-
 root/NEUIKit/pages/Chat/message/nav-bar.vue        |  1 -
 root/NEUIKit/pages/Chat/message/p2p-set.vue        |  2 +-
 root/NEUIKit/pages/Chat/message/pin-list.vue       |  2 +-
 .../pages/Contact/contact-list/black-list.vue      |  2 +-
 .../pages/Contact/contact-list/friend-list.vue     |  2 +-
 root/NEUIKit/pages/Contact/contact-list/index.vue  |  2 +-
 .../pages/Contact/contact-list/valid-list.vue      |  2 +-
 root/NEUIKit/pages/Contact/index.vue               |  1 -
 root/NEUIKit/pages/Friend/add-friend/index.vue     |  2 +-
 root/NEUIKit/pages/Friend/friend-info-edit.vue     |  1 -
 root/NEUIKit/pages/Login/index.vue                 |  1 -
 root/NEUIKit/pages/user-card/detail-item/index.vue |  2 +-
 root/NEUIKit/pages/user-card/friend/index.vue      |  2 +-
 root/NEUIKit/pages/user-card/my-detail/index.vue   |  2 +-
 uni_modules/vk-uview-ui/index.scss                 |  1 -
 utils/ajax.js                                      |  4 +-
 utils/wyyx.js                                      |  4 +-
 32 files changed, 20 insertions(+), 94 deletions(-)
 delete mode 100644 pages/NEUIKit/pages/styles/common.scss
 delete mode 100644 root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/en.json

diff --git a/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue b/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue
index adce45d..3288bfc 100644
--- a/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue
+++ b/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue
@@ -78,7 +78,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 .friend-group-item {
   padding-left: 20px;
diff --git a/pages/NEUIKit/pages/Contact/contact-list/index.vue b/pages/NEUIKit/pages/Contact/contact-list/index.vue
index 1ea6804..8727f5e 100644
--- a/pages/NEUIKit/pages/Contact/contact-list/index.vue
+++ b/pages/NEUIKit/pages/Contact/contact-list/index.vue
@@ -146,7 +146,7 @@ onHide(() => {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/common.scss";
+
 
 page {
 	height: 100vh;
diff --git a/pages/NEUIKit/pages/Contact/index.vue b/pages/NEUIKit/pages/Contact/index.vue
index f87473f..5ddd1ef 100644
--- a/pages/NEUIKit/pages/Contact/index.vue
+++ b/pages/NEUIKit/pages/Contact/index.vue
@@ -17,7 +17,6 @@ onShow(() => {
 </script>
 
 <style>
-@import "../styles/common.scss";
 
 page {
   height: 100vh;
diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/index.vue b/pages/NEUIKit/pages/Conversation/conversation-list/index.vue
index 954ec55..bab1bdb 100644
--- a/pages/NEUIKit/pages/Conversation/conversation-list/index.vue
+++ b/pages/NEUIKit/pages/Conversation/conversation-list/index.vue
@@ -214,7 +214,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/common.scss";
+
 
 .conversation-wrapper {
 	overflow: hidden;
diff --git a/pages/NEUIKit/pages/styles/common.scss b/pages/NEUIKit/pages/styles/common.scss
deleted file mode 100644
index 3b35436..0000000
--- a/pages/NEUIKit/pages/styles/common.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-.ok-btn {
-  color: #fff;
-  background-color: rgb(20, 146, 209);
-  padding: 10px;
-  font-size: 16px;
-  text-align: center;
-  position: fixed;
-  bottom: 0;
-  left: calc(50% - 25vw);
-  width: 50vw;
-  border-radius: 3px;
-}
-
-.ok-btn-mp {
-  color: #fff;
-  background-color: rgb(20, 146, 209);
-  padding: 10px;
-  font-size: 16px;
-  text-align: center;
-  position: fixed;
-  bottom: 20px;
-  left: calc(50% - 25vw);
-  width: 50vw;
-  border-radius: 3px;
-}
-
-.button-box,.button-box-mp {
-  display: flex;
-  align-items: center;
-  position: fixed;
-  z-index: 100;
-  bottom: 120px;
-  right: 30px;
-}
-
-.button-box {
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-.button-box,
-.button-box-mp .button-icon {
-  width: 40px;
-  height: 40px;
-  margin-left: 20px;
-}
-
-.button-box{
-	width: 40px;
-	height: 40px;
-	position: fixed;
-	z-index: 100;
-	bottom: 70px;
-	right: 30px;
-}
\ No newline at end of file
diff --git a/pages/message/index.vue b/pages/message/index.vue
index 299fc87..8eac06e 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -210,7 +210,6 @@ const updateType = (e) => {
 </script>
 
 <style lang="scss">
-@import "../NEUIKit/pages/styles/common.scss";
 
 .i-items {
 	// border-bottom: 1px solid #eee;
diff --git a/root/NEUIKit/components/NavBar.vue b/root/NEUIKit/components/NavBar.vue
index 4fe3d26..7872441 100644
--- a/root/NEUIKit/components/NavBar.vue
+++ b/root/NEUIKit/components/NavBar.vue
@@ -55,7 +55,6 @@ const back = () => {
 </script>
 
 <style lang="scss" scoped>
-@import '../pages/styles/common.scss';
 
 .nav-bar-wrapper {
   position: fixed;
diff --git a/root/NEUIKit/components/PersonSelect.vue b/root/NEUIKit/components/PersonSelect.vue
index 329bd72..bb0a065 100644
--- a/root/NEUIKit/components/PersonSelect.vue
+++ b/root/NEUIKit/components/PersonSelect.vue
@@ -119,7 +119,6 @@ const onBtnClick = () => {
 </script>
 
 <style lang="scss" scoped>
-@import '../pages/styles/common.scss';
 
 .friend-select-wrapper {
   display: flex;
diff --git a/root/NEUIKit/components/PinCard.vue b/root/NEUIKit/components/PinCard.vue
index b5f9b73..b2e0002 100644
--- a/root/NEUIKit/components/PinCard.vue
+++ b/root/NEUIKit/components/PinCard.vue
@@ -275,7 +275,6 @@ const timeFormat = () => {
 </script>
 
 <style lang="scss" scoped>
-@import '../pages/styles/common.scss';
 
 .pincard-wrapper {
   background-color: #fff;
diff --git a/root/NEUIKit/components/UserCard.vue b/root/NEUIKit/components/UserCard.vue
index 228bd3f..ab0110f 100644
--- a/root/NEUIKit/components/UserCard.vue
+++ b/root/NEUIKit/components/UserCard.vue
@@ -68,7 +68,6 @@ const copyAccount = () => {
 </script>
 
 <style lang="scss" scoped>
-@import '../pages/styles/common.scss';
 
 .user-wrapper {
   background-color: #fff;
diff --git a/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/en.json b/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/en.json
deleted file mode 100644
index 5653abd..0000000
--- a/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/en.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "uni-popup.cancel": "cancel",
-  "uni-popup.ok": "ok",
-  "uni-popup.placeholder": "pleace enter",
-  "uni-popup.title": "Hint",
-  "uni-popup.shareTitle": "Share to"
-}
diff --git a/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/index.js b/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/index.js
index efd9208..dfdeb89 100644
--- a/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/index.js
+++ b/root/NEUIKit/components/uni-components/uni-popup/components/uni-popup/i18n/index.js
@@ -1,4 +1,3 @@
-import en from './en.json'
 import zhHans from './zh-Hans.json'
 import zhHant from './zh-Hant.json'
 export default {
diff --git a/root/NEUIKit/pages/Chat/message/mention-member-list.vue b/root/NEUIKit/pages/Chat/message/mention-member-list.vue
index a75453e..5fdd585 100644
--- a/root/NEUIKit/pages/Chat/message/mention-member-list.vue
+++ b/root/NEUIKit/pages/Chat/message/mention-member-list.vue
@@ -211,7 +211,7 @@ onUnmounted(() => {
 </script>
 
 <style scoped lang="scss">
-@import '../../styles/common.scss';
+
 
 .mention-member-list-wrapper {
   z-index: 9999;
diff --git a/root/NEUIKit/pages/Chat/message/message-bubble.vue b/root/NEUIKit/pages/Chat/message/message-bubble.vue
index 954ee00..fadab6f 100644
--- a/root/NEUIKit/pages/Chat/message/message-bubble.vue
+++ b/root/NEUIKit/pages/Chat/message/message-bubble.vue
@@ -741,7 +741,7 @@ onUnmounted(() => {
 </script>
 
 <style scoped lang="scss">
-@import '../../styles/common.scss';
+
 
 .msg-bg {
   max-width: 360rpx;
diff --git a/root/NEUIKit/pages/Chat/message/message-input.vue b/root/NEUIKit/pages/Chat/message/message-input.vue
index e89c592..35ea6f2 100644
--- a/root/NEUIKit/pages/Chat/message/message-input.vue
+++ b/root/NEUIKit/pages/Chat/message/message-input.vue
@@ -969,7 +969,7 @@
 </script>
 
 <style scoped lang="scss">
-	@import "../../styles/common.scss";
+	
 
 	.input-root {
 		width: 100%;
diff --git a/root/NEUIKit/pages/Chat/message/nav-bar.vue b/root/NEUIKit/pages/Chat/message/nav-bar.vue
index 16a6953..c765328 100644
--- a/root/NEUIKit/pages/Chat/message/nav-bar.vue
+++ b/root/NEUIKit/pages/Chat/message/nav-bar.vue
@@ -53,7 +53,6 @@ const back = () => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../../pages/styles/common.scss';
 
 .nav-bar-wrapper {
   display: flex;
diff --git a/root/NEUIKit/pages/Chat/message/p2p-set.vue b/root/NEUIKit/pages/Chat/message/p2p-set.vue
index deb4cc9..62d9cad 100644
--- a/root/NEUIKit/pages/Chat/message/p2p-set.vue
+++ b/root/NEUIKit/pages/Chat/message/p2p-set.vue
@@ -128,7 +128,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/Chat/message/pin-list.vue b/root/NEUIKit/pages/Chat/message/pin-list.vue
index 1e11ec2..722b28c 100644
--- a/root/NEUIKit/pages/Chat/message/pin-list.vue
+++ b/root/NEUIKit/pages/Chat/message/pin-list.vue
@@ -86,7 +86,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/Contact/contact-list/black-list.vue b/root/NEUIKit/pages/Contact/contact-list/black-list.vue
index 2e57aa7..a9709b8 100644
--- a/root/NEUIKit/pages/Contact/contact-list/black-list.vue
+++ b/root/NEUIKit/pages/Contact/contact-list/black-list.vue
@@ -63,7 +63,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/Contact/contact-list/friend-list.vue b/root/NEUIKit/pages/Contact/contact-list/friend-list.vue
index 762c637..583e99d 100644
--- a/root/NEUIKit/pages/Contact/contact-list/friend-list.vue
+++ b/root/NEUIKit/pages/Contact/contact-list/friend-list.vue
@@ -78,7 +78,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 .friend-group-item {
   padding-left: 20px;
diff --git a/root/NEUIKit/pages/Contact/contact-list/index.vue b/root/NEUIKit/pages/Contact/contact-list/index.vue
index 664bca7..5b1fa6f 100644
--- a/root/NEUIKit/pages/Contact/contact-list/index.vue
+++ b/root/NEUIKit/pages/Contact/contact-list/index.vue
@@ -149,7 +149,7 @@ onHide(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   height: 100vh;
diff --git a/root/NEUIKit/pages/Contact/contact-list/valid-list.vue b/root/NEUIKit/pages/Contact/contact-list/valid-list.vue
index 2519b5e..583340d 100644
--- a/root/NEUIKit/pages/Contact/contact-list/valid-list.vue
+++ b/root/NEUIKit/pages/Contact/contact-list/valid-list.vue
@@ -160,7 +160,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/common.scss";
+
 
 page {
 	padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/Contact/index.vue b/root/NEUIKit/pages/Contact/index.vue
index 507f20f..cf36532 100644
--- a/root/NEUIKit/pages/Contact/index.vue
+++ b/root/NEUIKit/pages/Contact/index.vue
@@ -17,7 +17,6 @@ onShow(() => {
 </script>
 
 <style>
-@import "../styles/common.scss";
 
 page {
   height: 100vh;
diff --git a/root/NEUIKit/pages/Friend/add-friend/index.vue b/root/NEUIKit/pages/Friend/add-friend/index.vue
index 9250d5c..6b675d1 100644
--- a/root/NEUIKit/pages/Friend/add-friend/index.vue
+++ b/root/NEUIKit/pages/Friend/add-friend/index.vue
@@ -162,7 +162,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 @import "../../../base.scss";
 
 .search-input-wrapper {
diff --git a/root/NEUIKit/pages/Friend/friend-info-edit.vue b/root/NEUIKit/pages/Friend/friend-info-edit.vue
index 5f91b7d..85af5c8 100644
--- a/root/NEUIKit/pages/Friend/friend-info-edit.vue
+++ b/root/NEUIKit/pages/Friend/friend-info-edit.vue
@@ -84,7 +84,6 @@ onLoad((option) => {
 </script>
 
 <style lang="scss" scoped>
-@import '../styles/common.scss';
 
 page {
   // padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/Login/index.vue b/root/NEUIKit/pages/Login/index.vue
index 27b612b..b7ba648 100644
--- a/root/NEUIKit/pages/Login/index.vue
+++ b/root/NEUIKit/pages/Login/index.vue
@@ -28,7 +28,6 @@ onUnload(() => {
 </script>
 
 <style>
-@import '../styles/common.scss';
 
 page {
   height: 100vh;
diff --git a/root/NEUIKit/pages/user-card/detail-item/index.vue b/root/NEUIKit/pages/user-card/detail-item/index.vue
index d37d672..36f2b01 100644
--- a/root/NEUIKit/pages/user-card/detail-item/index.vue
+++ b/root/NEUIKit/pages/user-card/detail-item/index.vue
@@ -143,7 +143,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/user-card/friend/index.vue b/root/NEUIKit/pages/user-card/friend/index.vue
index adace71..59d0c1c 100644
--- a/root/NEUIKit/pages/user-card/friend/index.vue
+++ b/root/NEUIKit/pages/user-card/friend/index.vue
@@ -224,7 +224,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   padding-top: var(--status-bar-height);
diff --git a/root/NEUIKit/pages/user-card/my-detail/index.vue b/root/NEUIKit/pages/user-card/my-detail/index.vue
index e3878ff..e8a249b 100644
--- a/root/NEUIKit/pages/user-card/my-detail/index.vue
+++ b/root/NEUIKit/pages/user-card/my-detail/index.vue
@@ -249,7 +249,7 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import '../../styles/common.scss';
+
 
 page {
   padding-top: var(--status-bar-height);
diff --git a/uni_modules/vk-uview-ui/index.scss b/uni_modules/vk-uview-ui/index.scss
index 84daa72..377b671 100644
--- a/uni_modules/vk-uview-ui/index.scss
+++ b/uni_modules/vk-uview-ui/index.scss
@@ -1,5 +1,4 @@
 // 引入公共基础类
-@import "./libs/css/common.scss";
 @import "./libs/css/color.scss";
 
 // 非nvue的样式
diff --git a/utils/ajax.js b/utils/ajax.js
index 472fce2..aadb6c7 100644
--- a/utils/ajax.js
+++ b/utils/ajax.js
@@ -1,5 +1,5 @@
-let ajaxUrl = "http://192.168.3.83:8001";
-// let ajaxUrl = "https://daotian.matripe.com.cn";
+// let ajaxUrl = "http://192.168.3.83:8001";
+let ajaxUrl = "https://daotian.matripe.com.cn";
 let data = {
   ajaxUrl: ajaxUrl,
   Get ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {
diff --git a/utils/wyyx.js b/utils/wyyx.js
index f64ab69..a2ef626 100644
--- a/utils/wyyx.js
+++ b/utils/wyyx.js
@@ -1,5 +1,5 @@
-let ajaxUrl = "http://192.168.3.83:8001";
-// let ajaxUrl = "https://daotian.matripe.com.cn";
+// let ajaxUrl = "http://192.168.3.83:8001";
+let ajaxUrl = "https://daotian.matripe.com.cn";
 let data = {
   wyyxajaxUrl: ajaxUrl,
   wyyxGet ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {