Merge branch 'dev/v1.0.34_yf' of jianyu/web into feature/v1.0.34

apps/bigmember_pc/src/assets/style/reset-ele.scss

@@ -122,9 +122,9 @@
     color: #686868;
     font-size: 16px;
   }
-  .custom-cancel-btn-differ,
-  .custom-cancel-btn-differ:hover,
-  .custom-cancel-btn-differ:focus{
+  .custom-default-btn,
+  .custom-default-btn:hover,
+  .custom-default-btn:focus{
     width: 132px;
     height: 36px;
     margin-right: 52px;

apps/bigmember_pc/src/utils/mixins/subscribe-setting-prompt.js

@@ -18,7 +18,7 @@ export const mixinNoOpenSetMessage = {
           this.initSetPrompt()
         }
       },
-      deep: true
+      immediate: true
     }
   },
   data() {
@@ -55,7 +55,7 @@ export const mixinNoOpenSetMessage = {
           confirmButtonText: '立即开启',
           confirmButtonClass: 'custom-confirm-btn',
           cancelButtonText: '暂不开启',
-          cancelButtonClass: 'custom-cancel-btn-differ',
+          cancelButtonClass: 'custom-default-btn',
           message: h(
             'div',
             {
@@ -89,7 +89,7 @@ export const mixinNoOpenSetMessage = {
         confirmButtonText: '确定',
         confirmButtonClass: 'custom-confirm-btn',
         cancelButtonText: '取消',
-        cancelButtonClass: 'custom-cancel-btn-differ',
+        cancelButtonClass: 'custom-default-btn',
         message: h(
           'div',
           {

packages/work-bench-frame/packages/layout/work-bench/index.vue

@@ -165,20 +165,17 @@ export default {
     font-size: 16px;
   }
 
-  .custom-cancel-btn{
+  .custom-default-btn,
+  .custom-default-btn:hover,
+  .custom-default-btn:focus{
     width: 132px;
     height: 36px;
     margin-right: 52px;
-    background: transparent;
     border-radius: 6px;
-    border: 1px solid #E0E0E0;
-    font-size: 16px;
+    background-color: #fff;
+    border: 1px solid #DCDFE6;
     color: #686868;
-    &:hover{
-      color: #686868;
-      border-color: #e0e0e0;
-      background-color: transparent;
-    }
+    font-size: 16px;
   }
 
   .el-message-box__message {