diff --git a/App.vue b/App.vue index 2774ed1..f9aa300 100644 --- a/App.vue +++ b/App.vue @@ -61,12 +61,12 @@ export default { uni.$on("isGlogin", function (data) { console.log("app.vue 接收", data); if (uni.getStorageSync("apply-uid")) { - // that.initWyyx() + that.initWyyx() } }); if (uni.getStorageSync("apply-token")) { console.log("app.vue 是否调用"); - // that.initWyyx() + that.initWyyx() } }, onHide: function () { diff --git a/pages.json b/pages.json index 98ac722..cd5ec86 100644 --- a/pages.json +++ b/pages.json @@ -610,6 +610,12 @@ "selectedIconPath": "static/image/apply-active.png", "text": "工单" }, + { + "iconPath": "static/image/message.png", + "selectedIconPath": "static/image/message_active.png", + "pagePath": "pages/message/index", + "text": "消息" + }, { "pagePath": "pages/person/index", "iconPath": "static/image/person.png", diff --git a/pages/NEUIKit/pages/Contact/BcFriend.vue b/pages/NEUIKit/pages/Contact/BcFriend.vue new file mode 100644 index 0000000..b044655 --- /dev/null +++ b/pages/NEUIKit/pages/Contact/BcFriend.vue @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + {{ receiverUserData.tel || "-" }} + + + {{ receiverUserData.userName || "-" }} + + + + + 开始聊天 + + + + + + + + + + + + + {{ item.userName }} + + + {{ item.tel }} + + + + + + + + + + + + + + + diff --git a/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue b/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue new file mode 100644 index 0000000..adce45d --- /dev/null +++ b/pages/NEUIKit/pages/Contact/contact-list/friend-list.vue @@ -0,0 +1,111 @@ + + + + + + + {{ friendGroup.key }} + + + + {{ friend.appellation }} + + + + + + + + + diff --git a/pages/NEUIKit/pages/Contact/contact-list/index.vue b/pages/NEUIKit/pages/Contact/contact-list/index.vue new file mode 100644 index 0000000..1ea6804 --- /dev/null +++ b/pages/NEUIKit/pages/Contact/contact-list/index.vue @@ -0,0 +1,276 @@ + + + + + + {{ t("contactText") }} + + + + + + + + + + {{ t("addFriendText") }} + + + + + + {{ t("createTeamText") }} + + + + + + + + + + + 添加好友 + + + + + + {{ t("validMsgText") }} + + + + + {{ t("blacklistText") }} + + + + + + 公司内部成员 + + + + + + + + + + + + + diff --git a/pages/NEUIKit/pages/Contact/index.vue b/pages/NEUIKit/pages/Contact/index.vue index 1ce31eb..f87473f 100644 --- a/pages/NEUIKit/pages/Contact/index.vue +++ b/pages/NEUIKit/pages/Contact/index.vue @@ -1,8 +1,26 @@ - + + diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item-isRead.vue b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item-isRead.vue new file mode 100644 index 0000000..51f310f --- /dev/null +++ b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item-isRead.vue @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue new file mode 100644 index 0000000..e9425f5 --- /dev/null +++ b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue @@ -0,0 +1,453 @@ + + + + + + + {{ unread }} + + + + + + + + + {{ sessionName }} + + {{ date }} + + + + {{ "[" + t("someoneText") + "@" + t("meText") + "]" }} + + + {{ lastMsgContent }} + + + + + + handleClick(action.type)"> + {{ action.name }} + + + + + + + + + diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/index.vue b/pages/NEUIKit/pages/Conversation/conversation-list/index.vue index 1ce31eb..954ec55 100644 --- a/pages/NEUIKit/pages/Conversation/conversation-list/index.vue +++ b/pages/NEUIKit/pages/Conversation/conversation-list/index.vue @@ -1,8 +1,345 @@ - + + + + + 最近的会话 + + + + + + + + diff --git a/pages/NEUIKit/pages/styles/common.scss b/pages/NEUIKit/pages/styles/common.scss new file mode 100644 index 0000000..3b35436 --- /dev/null +++ b/pages/NEUIKit/pages/styles/common.scss @@ -0,0 +1,55 @@ +.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/NEUIKit/tsconfig.json b/pages/NEUIKit/tsconfig.json new file mode 100644 index 0000000..f0b456d --- /dev/null +++ b/pages/NEUIKit/tsconfig.json @@ -0,0 +1,35 @@ +{ + "compilerOptions": { + "target": "esnext", + "module": "esnext", + "strict": true, + "jsx": "preserve", + "moduleResolution": "node", + "experimentalDecorators": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "forceConsistentCasingInFileNames": true, + "useDefineForClassFields": true, + "sourceMap": true, + "strictFunctionTypes": false, + "preserveValueImports": false, + "isolatedModules": false, + "baseUrl": ".", + "types": ["node", "webpack-env", "vue/types", "vue-router/types"], + "paths": { + "@/*": ["src/*"] + }, + "lib": ["esnext", "dom", "dom.iterable", "scripthost"] + }, + "files": ["*.d.ts", "**/*.ts", "**/*.tsx", "**/*.vue", "**/*.ts", "**/*.tsx"], + "include": [ + "*.d.ts", + "**/*.ts", + "**/*.tsx", + "**/*.vue", + "**/*.ts", + "**/*.tsx" + ], + "exclude": ["node_modules"] +} diff --git a/pages/message/index.vue b/pages/message/index.vue index cb9242f..299fc87 100644 --- a/pages/message/index.vue +++ b/pages/message/index.vue @@ -12,11 +12,11 @@ > - + - + @@ -52,11 +52,11 @@ + \ No newline at end of file diff --git a/root/detail/job.vue b/root/detail/job.vue index 5b0a923..a0d50c8 100644 --- a/root/detail/job.vue +++ b/root/detail/job.vue @@ -447,7 +447,7 @@ {{ isSc ? "已收藏" : "收藏" }} - + IM diff --git a/utils/ajax.js b/utils/ajax.js index aadb6c7..472fce2 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 a2ef626..f64ab69 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 = () => { }) {