@aochuang/client-sdk 1.0.279 → 1.0.281

package/components/wechat-chat-control/url/url-miniprogram.vue

@@ -13,7 +13,7 @@
             {{title}}
           </div>
           <div class="sdk-chat-panel-control-url-miniprogram__content">
-            <div v-if="cover" :style="{width: '100%', height: '100%', background: 'url('+ cover +')', 'background-size': 'cover'}"></div>
+            <div v-if="cover" :style="{width: '100%', height: '100%', 'background-image': 'url('+ cover +')'}"></div>
           </div>
         </div>
         <div class="sdk-chat-panel-control-url-miniprogram__foot">小程序</div>
@@ -44,7 +44,7 @@
         {{title}}
       </div>
       <div class="sdk-chat-panel-control-url-miniprogram__content">
-        <div v-if="cover" :style="{width: '100%', height: '100%', background: 'url('+ cover +')', 'background-size': 'cover'}"></div>
+        <div v-if="cover" :style="{width: '100%', height: '100%', 'background-image': 'url('+ cover +')'}"></div>
       </div>
     </template>
   </div>
@@ -102,7 +102,7 @@ export default {
       return desc
     },
     cover () {
-      let cover = this.miniprogramData.msg && this.miniprogramData.msg.appmsg ? (this.miniprogramData.msg.appmsg.thumburl || this.content.previewImage) : ''
+      let cover = this.miniprogramData.msg && this.miniprogramData.msg.appmsg ? (this.miniprogramData.msg.appmsg.thumburl || this.content.previewImage || this.icon) : ''
       if (cover) {
         cover = formatOssPath(cover)
       }
@@ -149,6 +149,13 @@ export default {
   .sdk-chat-panel-control-url-miniprogram__content{
     height: 150px;
     background-color: #f1f0f5;
+    div {
+      height: 150px;
+      background-position: 50% 50%;
+      background-repeat: no-repeat;
+      background-size: contain;
+      background-color: #ffffff;
+    }
   }
   .sdk-chat-panel-control-url-miniprogram__desc{
     color: #888;
@@ -243,14 +250,13 @@ export default {
     background: url('./miniprogram.svg') no-repeat 50% 50%;
     background-size: cover;
   }
-  .sdk-chat-panel-control-url-miniprogram__content {
+  .sdk-chat-panel-control-url-miniprogram__content div {
     width: 52px;
     height: 52px;
     min-width: 52px;
     background-position: 50% 50%;
     background-repeat: no-repeat;
     background-size: cover;
-    background-color: rgba(0,0,0,.1);
   }
   .sdk-chat-panel-control-url-miniprogram__title{
     margin-right: 6px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.279",
+  "version": "1.0.281",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/services/client-chat/client-chat-wechat/client-chat-account.js

@@ -388,9 +388,9 @@ export default class ClientChatAccount {
 			return new Error('getAccountGreetingUnreadMsgCountMethod未定义')
 		}
 		return this.getAccountGreetingUnreadMsgCountMethod({
-			wechatAccountId: params.wechatAccountId
+			wechatAccountId: (params || {}).wechatAccountId
 		}).then(rs => {
-			Vue.set(this.accountGreetingUnreadMsgCountData, params.wechatAccountId || 'all', (rs || {}).data || 0)
+			Vue.set(this.accountGreetingUnreadMsgCountData, (params || {}).wechatAccountId || 'all', (rs || {}).data || 0)
 		})
 	}
 

package/services/client-chat/client-chat-wechat/client-chat-socket.js

@@ -27,6 +27,7 @@ export default class Websocket {
 			onCmdChatroomInvite: null,
 			onCmdNewGreetingMsg: null,
 			onCmdNewFriendRequest: null,
+			onCmdFriendAccepted: null,
 			onHeartbeatCheck: null,
 			onHeartbeatSuccess: null,
 			onSendMessage: null,
@@ -110,6 +111,11 @@ export default class Websocket {
 				options.onCmdNewFriendRequest(evt)
 			}
 		})
+		this.socket.event.on('onCmdFriendAccepted', (evt) => {
+			if (!options.checkSocketEventNotifyMethod || options.checkSocketEventNotifyMethod(evt) !== false) {
+				options.onCmdFriendAccepted(evt)
+			}
+		})
 		this.socket.event.on('onCmdMessageRecalled', options.onCmdMessageRecalled)
 		this.socket.event.on('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({

package/services/client-chat/client-chat-wechat/client-chat.js

@@ -931,7 +931,7 @@ class ClientChat {
 				}
 			},
 			// 打招呼有变化
-			onCmdNewGreetingMsg: ({ data }) => {
+			onCmdNewGreetingMsg: ({ data }) => {  
 				// {
 				// 	"cmdType": "CmdNewGreetingMsg",
 				// 	"seq": 440013669,
@@ -945,10 +945,24 @@ class ClientChat {
 				})
 			},
 			onCmdNewFriendRequest: ({ data }) => {
-				// 刷新未读
-				this.account.getAccountGreetingUnreadMsgCount({
-					wechatAccountId: data.wechatAccountId
-				})
+				// 刷新指定微信号请求数量
+				if (data.wechatAccountId) {
+					this.account.getAccountGreetingUnreadMsgCount({
+						wechatAccountId: data.wechatAccountId
+					})
+				}
+				// 刷新所有微信号请求数量
+				this.account.getAccountGreetingUnreadMsgCount()
+			},
+			onCmdFriendAccepted: ({ data }) => {
+				// 刷新指定微信号请求数量
+				if (data.wechatAccountId) {
+					this.account.getAccountGreetingUnreadMsgCount({
+						wechatAccountId: data.wechatAccountId
+					})
+				}
+				// 刷新所有微信号请求数量
+				this.account.getAccountGreetingUnreadMsgCount()
 			},
 			onHeartbeatCheck: ({ mergeParams }) => {
 				const ids = this.account.getAccountData().map(v => v.id)