Merge branch 'master' of http://101.37.147.115:3000/mz666/bocai_supplyChain_uni

package.json

@@ -4,5 +4,12 @@
     "html2canvas": "^1.4.1",
     "moment": "^2.29.4"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "@xkit-yx/im-store-v2": "^0.4.0",
+		"@xkit-yx/utils": "^0.5.6",
+		"dayjs": "^1.11.7",
+		"mobx": "^6.6.1",
+		"nim-web-sdk-ng": "^10.4.0",
+		"pinyin": "^3.1.0"
+  }
 }

pages/message/index.vue

@@ -8,7 +8,7 @@
 		</view>
 		<view class="container">
 			<view class="" v-if="tabInfo.list[tabInfo.active].classify == -2" hover-class="none" hover-stop-propagation="false">
-				<!-- <chatPanel type="ai" /> -->
+				11
 			</view>
 			<!-- <view class="" v-else-if="tabInfo.list[tabInfo.active].classify == -1" hover-class="none" hover-stop-propagation="false">
 				<chatPanel type='demo' />
@@ -28,6 +28,9 @@
 					<view class="g_fs_14 g_c_9 g_ell_1" style="width: 100%">{{ item.remark || "[图片]" }}</view>
 				</view>
 			</view>
+			<view class="" v-else-if="tabInfo.list[tabInfo.active].classify == 3" hover-class="none" hover-stop-propagation="false" style="padding-top: 260rpx;">
+				<g-empty text="暂无通知" ></g-empty>
+			</view>
 			<!-- <view class="" hover-class="none" hover-stop-propagation="false">
 			<view class="" v-else-if="tabInfo.active == 2" hover-class="none" hover-stop-propagation="false">
 				<view class="" style="margin-top: 120px" hover-class="none" hover-stop-propagation="false"> </view>