mirror of
https://github.com/kuaifan/dootask.git
synced 2026-01-12 00:48:11 +00:00
no message
This commit is contained in:
parent
d4f3124054
commit
834bb28100
2
public/css/app.css
vendored
2
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
2
public/js/app.js
vendored
2
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/109.js
vendored
2
public/js/build/109.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
public/js/build/581.js
vendored
2
public/js/build/581.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/626.js
vendored
2
public/js/build/626.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
public/js/build/943.js
vendored
2
public/js/build/943.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/build/996.js
vendored
2
public/js/build/996.js
vendored
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
33079b9993ee4e79
|
||||
99d6fde55d9f5fe4
|
||||
|
||||
@ -88,8 +88,7 @@ export default {
|
||||
if (this.userId > 0) {
|
||||
if (this.$isEEUiApp) {
|
||||
setTimeout(_ => {
|
||||
const webview = requireModuleJs("webview");
|
||||
webview && webview.sendMessage({
|
||||
$A.eeuiAppSendMessage({
|
||||
action: 'setUmengAlias',
|
||||
userid: this.userId,
|
||||
token: this.userToken,
|
||||
|
||||
1
resources/assets/js/app.js
vendored
1
resources/assets/js/app.js
vendored
@ -2,6 +2,7 @@ const isElectron = window && window.process && window.process.type;
|
||||
const isEEUiApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent);
|
||||
|
||||
import './functions/common'
|
||||
import './functions/eeui'
|
||||
import './functions/web'
|
||||
|
||||
import Vue from 'vue'
|
||||
|
||||
@ -53,6 +53,7 @@ export default {
|
||||
const ended = audio.ended || audio.paused;
|
||||
audio.controls = false;
|
||||
audio.loop = false;
|
||||
audio.volume = 1;
|
||||
if (info === false) {
|
||||
if (!ended) {
|
||||
audio.pause()
|
||||
|
||||
@ -89,14 +89,13 @@ export default {
|
||||
|
||||
appAndroidEvents() {
|
||||
if (this.$isEEUiApp && $A.isAndroid()) {
|
||||
const eeui = requireModuleJs("eeui");
|
||||
eeui.setPageBackPressed({
|
||||
$A.eeuiAppSetPageBackPressed({
|
||||
pageName: 'firstPage',
|
||||
}, _ => {
|
||||
if (this.canBack()) {
|
||||
this.onBack();
|
||||
} else {
|
||||
eeui.goDesktop()
|
||||
$A.eeuiAppGoDesktop()
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -41,13 +41,10 @@ export default {
|
||||
if (this.duration > 0) {
|
||||
this.timer = setTimeout(this.close, this.duration)
|
||||
}
|
||||
if (this.$isEEUiApp) {
|
||||
const webview = requireModuleJs("webview");
|
||||
webview && webview.sendMessage({
|
||||
action: 'setVibrate',
|
||||
time: 1000
|
||||
});
|
||||
}
|
||||
$A.eeuiAppSendMessage({
|
||||
action: 'setVibrate',
|
||||
time: 1000
|
||||
});
|
||||
},
|
||||
|
||||
close() {
|
||||
|
||||
3
resources/assets/js/functions/common.js
vendored
3
resources/assets/js/functions/common.js
vendored
@ -730,8 +730,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
const webview = requireModuleJs("webview");
|
||||
webview.setUrl(url);
|
||||
$A.eeuiAppSetUrl(url);
|
||||
} else {
|
||||
window.location.reload();
|
||||
}
|
||||
|
||||
47
resources/assets/js/functions/eeui.js
vendored
Executable file
47
resources/assets/js/functions/eeui.js
vendored
Executable file
@ -0,0 +1,47 @@
|
||||
/**
|
||||
* EEUI App 专用
|
||||
*/
|
||||
(function (window) {
|
||||
const $ = window.$A;
|
||||
|
||||
/**
|
||||
* =============================================================================
|
||||
* ******************************* App extra *******************************
|
||||
* =============================================================================
|
||||
*/
|
||||
$.extend({
|
||||
eeuiAppOpenPage(object, callback) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
if (typeof callback !== "function") callback = _ => {};
|
||||
requireModuleJs("eeui").openPage(object, callback);
|
||||
},
|
||||
|
||||
eeuiAppOpenWeb(url) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
requireModuleJs("eeui").openWeb(url)
|
||||
},
|
||||
|
||||
eeuiAppSetPageBackPressed(object, callback) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
if (typeof callback !== "function") callback = _ => {};
|
||||
requireModuleJs("eeui").setPageBackPressed(object, callback);
|
||||
},
|
||||
|
||||
eeuiAppGoDesktop() {
|
||||
if (!$A.isEEUiApp) return;
|
||||
requireModuleJs("eeui").goDesktop();
|
||||
},
|
||||
|
||||
eeuiAppSendMessage(object) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
requireModuleJs("webview").sendMessage(object);
|
||||
},
|
||||
|
||||
eeuiAppSetUrl(url) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
requireModuleJs("webview").setUrl(url);
|
||||
},
|
||||
});
|
||||
|
||||
window.$A = $;
|
||||
})(window);
|
||||
@ -349,17 +349,6 @@
|
||||
<ProjectArchived v-if="archivedProjectShow"/>
|
||||
</DrawerOverlay>
|
||||
|
||||
<!--菜单按钮-->
|
||||
<DragBallComponent
|
||||
:distanceLeft="0"
|
||||
:distanceTop="60"
|
||||
@on-click="show768Menu=!show768Menu">
|
||||
<div class="manage-mini-menu">
|
||||
<Icon :type="show768Menu ? 'md-close' : 'md-menu'" />
|
||||
<Badge :count="unreadTotal"/>
|
||||
</div>
|
||||
</DragBallComponent>
|
||||
|
||||
<!--移动端选项卡-->
|
||||
<transition name="mobile-slide">
|
||||
<MobileTabbar v-if="showMobileTabbar" @on-click="onTabbarClick"/>
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
<!-- 移动端表情(底部) -->
|
||||
<ChatEmoji v-if="emojiBottom && showEmoji" @on-select="onSelectEmoji"/>
|
||||
|
||||
<!-- 录音取消 -->
|
||||
<!-- 录音浮窗 -->
|
||||
<transition name="fade">
|
||||
<div
|
||||
v-if="recordState === 'ing'"
|
||||
@ -95,7 +95,8 @@
|
||||
class="chat-input-record-transfer"
|
||||
:class="{cancel: touchLimitY}"
|
||||
@click="stopRecord">
|
||||
<div class="record-duration">{{recordFormatDuration}}</div>
|
||||
<div v-if="recordDuration > 0" class="record-duration">{{recordFormatDuration}}</div>
|
||||
<div v-else class="record-loading"><Loading/></div>
|
||||
<div class="record-cancel" @click.stop="stopRecord(true)">{{$L(touchLimitY ? '松开取消' : '向上滑动取消')}}</div>
|
||||
</div>
|
||||
</transition>
|
||||
|
||||
@ -375,13 +375,12 @@ export default {
|
||||
}
|
||||
});
|
||||
} else if (this.$isEEUiApp) {
|
||||
const eeui = requireModuleJs("eeui");
|
||||
eeui.openPage({
|
||||
$A.eeuiAppOpenPage({
|
||||
pageType: 'web',
|
||||
pageTitle: `${this.msgData.msg.name} (${$A.bytesToSize(this.msgData.msg.size)})`,
|
||||
statusBarStyle: false,
|
||||
url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
|
||||
}, _ => {});
|
||||
});
|
||||
} else {
|
||||
window.open($A.apiUrl(`..${uri}`))
|
||||
}
|
||||
|
||||
@ -201,13 +201,12 @@ export default {
|
||||
},
|
||||
});
|
||||
} else if (this.$isEEUiApp) {
|
||||
const eeui = requireModuleJs("eeui");
|
||||
eeui.openPage({
|
||||
$A.eeuiAppOpenPage({
|
||||
pageType: 'web',
|
||||
pageTitle: $A.getFileName(this.file) + ` [${row.created_at}]`,
|
||||
statusBarStyle: false,
|
||||
url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
|
||||
}, _ => {});
|
||||
});
|
||||
} else {
|
||||
window.open($A.apiUrl(`..${uri}`))
|
||||
}
|
||||
|
||||
@ -1272,13 +1272,12 @@ export default {
|
||||
}
|
||||
});
|
||||
} else if (this.$isEEUiApp) {
|
||||
const eeui = requireModuleJs("eeui");
|
||||
eeui.openPage({
|
||||
$A.eeuiAppOpenPage({
|
||||
pageType: 'web',
|
||||
pageTitle: `${file.name} (${$A.bytesToSize(file.size)})`,
|
||||
statusBarStyle: false,
|
||||
url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
|
||||
}, _ => {});
|
||||
});
|
||||
} else {
|
||||
window.open($A.apiUrl(`..${uri}`))
|
||||
}
|
||||
|
||||
3
resources/assets/js/store/actions.js
vendored
3
resources/assets/js/store/actions.js
vendored
@ -176,8 +176,7 @@ export default {
|
||||
// 失败
|
||||
});
|
||||
} else if ($A.isEEUiApp) {
|
||||
const eeui = requireModuleJs("eeui");
|
||||
eeui.openWeb(url);
|
||||
$A.eeuiAppOpenWeb(url);
|
||||
} else {
|
||||
window.open(url)
|
||||
}
|
||||
|
||||
@ -343,9 +343,22 @@
|
||||
transition: all 0.3s ease;
|
||||
.record-duration {
|
||||
font-size: 20px;
|
||||
padding-bottom: 6px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.record-loading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 30px;
|
||||
.common-loading {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
.record-cancel {
|
||||
margin-top: 6px;
|
||||
opacity: 0.6;
|
||||
}
|
||||
&.cancel {
|
||||
|
||||
24
resources/assets/sass/pages/page-manage.scss
vendored
24
resources/assets/sass/pages/page-manage.scss
vendored
@ -253,16 +253,6 @@
|
||||
overflow: auto;
|
||||
}
|
||||
}
|
||||
.manage-mini-menu {
|
||||
display: none;
|
||||
position: relative;
|
||||
.ivu-badge {
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
left: 30px;
|
||||
transform: scale(0.9);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.page-manage-menu-dropdown {
|
||||
@ -448,19 +438,5 @@
|
||||
transform: translateX(0);
|
||||
}
|
||||
}
|
||||
.manage-mini-menu {
|
||||
//display: flex; // todo 可以去除mini了
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 46px;
|
||||
height: 42px;
|
||||
font-size: 22px;
|
||||
background-color: #ffffff;
|
||||
white-space: nowrap;
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 0 50px rgba(0, 0, 0, 0.3);
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -477,6 +477,7 @@
|
||||
}
|
||||
.messenger-msg {
|
||||
z-index: 49;
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
Subproject commit ef9f10d915ac19be9017c4002e4f51978176ba7a
|
||||
Subproject commit 5e43f5d24edce45158d33acc4c71e9a9f8579cba
|
||||
Loading…
x
Reference in New Issue
Block a user