diff --git a/api/login.js b/api/login.js index 37a56ff..e9eb378 100644 --- a/api/login.js +++ b/api/login.js @@ -1,4 +1,6 @@ let lock = false; +import { alertOnce } from './xFetch'; + export default async function login() { if (lock == true) { await waitLockRelease(50); @@ -19,6 +21,7 @@ export default async function login() { method: 'POST', dataType: 'json', success: function (res) { + console.log(res) if (res.data.code == 0) { const { oapiUser } = res.data.data; getApp().globalData.token = res.data.data.accessToken.access_token; @@ -35,6 +38,10 @@ export default async function login() { }); lock = false; resolve(res) + } else if (res.data.code == 10200) { + lock = false; + alertOnce('应用正在开通中,请稍后再试', reject, { ...res.data, code: 10200 }); + reject(res.data); } else { lock = false; reject(res.data); diff --git a/api/xFetch.js b/api/xFetch.js index 1ee7a08..7f38e7f 100644 --- a/api/xFetch.js +++ b/api/xFetch.js @@ -31,8 +31,9 @@ export default function xFetch({ url, method, data, type }) { } else { if (res.data.code == 401) { login(); + } else { + alertOnce(res.data.msg || '请求异常,请重试', rejects, { ...res.data }); } - alertOnce(res.data.msg || '请求异常,请重试', rejects, res); } }, fail: function (err) { @@ -51,13 +52,13 @@ export default function xFetch({ url, method, data, type }) { } let alert = false; -function alertOnce(content, rejects, err) { +export function alertOnce(content, rejects, err) { if (alert == false) { dd.alert({ content: content, buttonText: "确定", success: () => { - rejects({ refresh: true }); + rejects({ refresh: true, ...err }); alert = false; } }); diff --git a/components/notes/notes.acss b/components/notes/notes.acss index a2cefe1..4a47dec 100755 --- a/components/notes/notes.acss +++ b/components/notes/notes.acss @@ -4,6 +4,11 @@ padding: 16rpx; margin-top: 16rpx; margin-bottom: 1rpx; + word-break: break-all; +} + +.notes>view>text { + word-break: break-all } .notes-edit { diff --git a/components/remark/remark.acss b/components/remark/remark.acss index 8d38154..fc7005e 100755 --- a/components/remark/remark.acss +++ b/components/remark/remark.acss @@ -3,6 +3,7 @@ border-radius: 8rpx; padding: 16rpx; margin-top: 16rpx; + word-break: break-all; } .notes-edit { diff --git a/config.js b/config.js index bee41ff..e34d857 100644 --- a/config.js +++ b/config.js @@ -1,4 +1,4 @@ export const globalUrl = "https://gateway-ding.mingwork.com"; export const globalUrl2 = "https://third-authentication.mingwork.com"; -export const version = 0.038; +export const version = 0.041; export const websocketUrl = 'wss://gateway-ding.mingwork.com'; diff --git a/pages/index/index.axml b/pages/index/index.axml index b851140..6483a34 100644 --- a/pages/index/index.axml +++ b/pages/index/index.axml @@ -1,7 +1,7 @@ <import src="../../template/loading/loading.axml"/> <import src="../../template/fullScreen/fullScreen.axml"/> <import src="../../template/refresh/index.axml"/> -<template is="refresh" a:if='{{refresh}}' ></template> +<template is="refresh" a:if='{{refresh}}' data="{{refreshCode}}"></template> <block a:else> <view hidden="{{$data.tabBarIndex === '1'}}"> <import src="../../template/affairBlank/index.axml"/> diff --git a/pages/index/index.js b/pages/index/index.js index 6f78894..03b9404 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -183,8 +183,12 @@ create.Page({ }, connect_start() { + const userId = dd.getStorageSync({ key: 'mwUserId' }).data; + if (!userId) { + return + } dd.connectSocket({ - url: `${websocketUrl}/meet-websocket/websocket/${dd.getStorageSync({ key: 'mwUserId' }).data}/${uuid}`, + url: `${websocketUrl}/meet-websocket/websocket/${userId}/${uuid}`, success: (res) => { @@ -285,7 +289,8 @@ create.Page({ if (err && err.refresh) { this.setData({ loading: false, - refresh: true + refresh: true, + refreshCode: err.code }); } }); @@ -301,8 +306,12 @@ create.Page({ dd.closeSocket(); }, refresh() { + //重置数据 + DateMap = getDateMap(this.minYear, this.maxYear); this.isNeverShowSchedulePage = true; this.isLoaded = false; + //定位到今天,防止上面的不生效 + this.backToToday('first') this.onLoad(); }, getPages(current, callBack) { diff --git a/pages/meetingDetail/meetingDetail.acss b/pages/meetingDetail/meetingDetail.acss index 17e1a67..956339c 100644 --- a/pages/meetingDetail/meetingDetail.acss +++ b/pages/meetingDetail/meetingDetail.acss @@ -68,6 +68,7 @@ page { color: rgba(27, 38, 61, 1); font-size: 32rpx; font-family: PingFangSC-Medium; + overflow: hidden } .compose-column .title>text { diff --git a/template/refresh/index.axml b/template/refresh/index.axml index 83ccc2c..15f76cc 100644 --- a/template/refresh/index.axml +++ b/template/refresh/index.axml @@ -1,6 +1,7 @@ <template name="refresh"> <view class="refresh-bg"> - <view>您的网络好像不给力,请重试</view> + <view a:if="{{refreshCode == 10200}}">应用正在开通中,请稍后再试</view> + <view a:else>您的网络好像不给力,请重试</view> <button class="btn refresh-btn" onTap="refresh">刷新</button> </view> </template> \ No newline at end of file diff --git a/utils/utils.js b/utils/utils.js index 521ee9d..e770ddf 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -328,4 +328,6 @@ export function isJSON(str) { return false; } -export function removeHtml(str) { return str.replace(/<\/?.+?>/g, "") } +export function removeHtml(str) { + return str.replace(/<\/?.l>/g, "").replace(/<\/.+?>/g, "\n").replace(/<.+?>/g, "") +}