diff --git a/src/main.ts b/src/main.ts index a3460a50..15ba577f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -29,7 +29,6 @@ export function createApp() { const i18n = createI18n({ // 使用localStorage存储语言状态是为了保证页面刷新之后还是保持原来选择的语言状态 locale: getItem('lang') ? getItem('lang') : 'zh-CN', // 定义默认语言为中文 - allowComposition: true, messages: { 'zh-CN': zhCNLang, 'zh-TW': zhTWLang, diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue index e608eeb2..ab89da85 100644 --- a/src/pages/profile/profile.vue +++ b/src/pages/profile/profile.vue @@ -16,9 +16,12 @@ + 野火登录测试 - + @@ -228,6 +231,7 @@ import wfc from '@/wfc/client/wfc'; // @ts-ignore import { setItem } from '@/sheep/util/storageHelper'; + // #endif const phone = ref(''); const code = ref(''); @@ -281,5 +285,4 @@ }); }); } - // #endif diff --git a/src/sheep/api/imchat/appServerApi.js b/src/sheep/api/imchat/appServerApi.js index 5157034f..bcce737e 100644 --- a/src/sheep/api/imchat/appServerApi.js +++ b/src/sheep/api/imchat/appServerApi.js @@ -1,3 +1,4 @@ +// #ifdef APP-PLUS import Config from '@/config'; import FavItem from '@/wfc/model/favItem'; import { stringValue } from '@/wfc/util/longUtil'; @@ -221,3 +222,4 @@ export class AppServerApi { const appServerApi = new AppServerApi(); export default appServerApi; +// #endif diff --git a/src/sheep/api/imchat/conferenceApi.js b/src/sheep/api/imchat/conferenceApi.js index a01a48cc..22742078 100644 --- a/src/sheep/api/imchat/conferenceApi.js +++ b/src/sheep/api/imchat/conferenceApi.js @@ -1,75 +1,77 @@ -import {AppServerApi} from "./appServerApi"; +// #ifdef APP-PLUS +import { AppServerApi } from './appServerApi'; class ConferenceApi extends AppServerApi { - constructor() { - super(); - } + constructor() { + super(); + } - /** - * - * @return {Promise} - */ - getMyPrivateConferenceId() { - return this._post('/conference/get_my_id'); - } + /** + * + * @return {Promise} + */ + getMyPrivateConferenceId() { + return this._post('/conference/get_my_id'); + } - /** - * - * @param conferenceInfo - * @return {Promise} - */ - createConference(conferenceInfo) { - return this._post('/conference/create', conferenceInfo); - } + /** + * + * @param conferenceInfo + * @return {Promise} + */ + createConference(conferenceInfo) { + return this._post('/conference/create', conferenceInfo); + } - /** - * - * @param conferenceId - * @param password - * @return {Promise} - */ - queryConferenceInfo(conferenceId, password) { - let obj; - if (password) { - obj = {conferenceId, password} - } else { - obj = {conferenceId} - } - return this._post('/conference/info', obj); + /** + * + * @param conferenceId + * @param password + * @return {Promise} + */ + queryConferenceInfo(conferenceId, password) { + let obj; + if (password) { + obj = { conferenceId, password }; + } else { + obj = { conferenceId }; } + return this._post('/conference/info', obj); + } - destroyConference(conferenceId) { - return this._post('/conference/destroy/' + conferenceId); - } + destroyConference(conferenceId) { + return this._post('/conference/destroy/' + conferenceId); + } - favConference(conferenceId) { - return this._post('/conference/fav/' + conferenceId); - } + favConference(conferenceId) { + return this._post('/conference/fav/' + conferenceId); + } - unfavConference(conferenceId) { - return this._post('/conference/unfav/' + conferenceId); - } + unfavConference(conferenceId) { + return this._post('/conference/unfav/' + conferenceId); + } - isFavConference(conferenceId) { - return this._post('/conference/is_fav/' + conferenceId); - } + isFavConference(conferenceId) { + return this._post('/conference/is_fav/' + conferenceId); + } - getFavConferences() { - return this._post('/conference/fav_conferences'); - } + getFavConferences() { + return this._post('/conference/fav_conferences'); + } - updateConference(conferenceInfo) { - return this._post('/conference/put_info', conferenceInfo); - } + updateConference(conferenceInfo) { + return this._post('/conference/put_info', conferenceInfo); + } - recordConference(conferenceId, record) { - return this._post('/conference/recording/' + conferenceId, {recording: record}); - } + recordConference(conferenceId, record) { + return this._post('/conference/recording/' + conferenceId, { recording: record }); + } - setConferenceFocusUserId(conferenceId, userId) { - return this._post('/conference/focus/' + conferenceId, {userId: userId ? userId : ''}); - } + setConferenceFocusUserId(conferenceId, userId) { + return this._post('/conference/focus/' + conferenceId, { userId: userId ? userId : '' }); + } } const conferenceApi = new ConferenceApi(); export default conferenceApi; +// #endif diff --git a/src/sheep/api/imchat/organizationServerApi.js b/src/sheep/api/imchat/organizationServerApi.js index 5cd4e4e2..d1c1bd65 100644 --- a/src/sheep/api/imchat/organizationServerApi.js +++ b/src/sheep/api/imchat/organizationServerApi.js @@ -1,3 +1,4 @@ +// #ifdef APP-PLUS import Config from '@/config'; import { getItem, setItem } from '@/sheep/util/storageHelper'; import wfc from '@/wfc/client/wfc'; @@ -186,3 +187,4 @@ export class OrganizationServerApi { const organizationServerApi = new OrganizationServerApi(); export default organizationServerApi; +// #endif diff --git a/src/sheep/util/draft.js b/src/sheep/util/draft.js index a4c57948..c4bbc361 100644 --- a/src/sheep/util/draft.js +++ b/src/sheep/util/draft.js @@ -1,5 +1,5 @@ import wfc from '@/wfc/client/wfc'; -import { _patchToJavaLong, _reverseToJsLongString, stringValue } from '@/wfc/wfc/util/longUtil'; +import { _patchToJavaLong, _reverseToJsLongString, stringValue } from '@/wfc/util/longUtil'; import store from '@/store'; export default class Draft {