Merge branch 'master' of http://git.ascrm.cn:3000/scrm/wechat-ui

src/views/wechat/wx/WxDrawer.vue

@@ -93,10 +93,13 @@
         let result = await refreshLoginQRApi(values);
         if (result.code === 0) {
           if (result.data.status === '0' || result.data.status === '5') {
+            setModalProps({ showOkBtn:true });
             modalContent.value = `<img src="${result.data.qRCode}" />`;
           } else if (result.data.status === '3' && unref(isUpdate)) {
+            setModalProps({ showOkBtn:false });
             modalContent.value = `<p><b>${result.data.statusDesc}</b></p><p>如果需要更换账号，您需要先退出登陆~</p>`;
           } else {
+            setModalProps({ showOkBtn:false });
             modalContent.value = `<p><b>${result.data.statusDesc}</b></p>`;
           }
           openModal(true);

src/views/wechat/wx/index.vue

@@ -77,7 +77,7 @@
         showIndexColumn: false,
         clickToRowSelect: false,
         actionColumn: {
-          width: 30,
+          width: 60,
           title: t('common.action'),
           dataIndex: 'action',
           fixed: undefined,