Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppAskForm/components/Result.vue

@@ -38,7 +38,6 @@
   mounted() {
     this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact'])
   },
-
   methods: {
     ...mapActions(['injectJWeixin', 'wxInvoke']),
 
@@ -79,6 +78,9 @@
         type: 'Tabbar'
       })
     }
+  },
+  onShow() {
+    wx.hideOptionMenu();
   }
 }
 </script>
@@ -146,7 +148,7 @@
     font-size: 36px;
     color: #fff;
     background: #197DF0;
-      box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.02);
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.02);
     border-radius: 4px;
 
     &:active {