Merge branch 'release/dev/2.0.0' into release/2.0.0

components/notes/notes.acss

@@ -4,6 +4,7 @@
   padding: 16rpx;
   margin-top: 16rpx;
   margin-bottom: 1rpx;
+  word-break: break-all;
 }
 
 .notes-edit {

components/remark/remark.acss

@@ -3,6 +3,7 @@
   border-radius: 8rpx;
   padding: 16rpx;
   margin-top: 16rpx;
+  word-break: break-all;
 }
 
 .notes-edit {

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) => {
 
@@ -301,8 +305,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) {

pages/place/place.acss

@@ -59,6 +59,7 @@ page {
     /* padding: 20rpx 0; */
     height: 112rpx;
     display: flex;
+    /* align-items: center; */
     padding-left: 32rpx;
 }
 
@@ -93,8 +94,8 @@ page {
     line-height: 24rpx;
 }
 
-.equipment {
-    margin-left: 16rpx;
+.num {
+    margin-right: 16rpx;
 }
 
 .equipment text {

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, "")
+}