Merge branch '1.1' into release

src/main.js

@@ -62,6 +62,39 @@ Vue.prototype.$lodash = _;
 Vue.prototype.$moment = moment;
 Vue.prototype.$ww = ww;
 Vue.prototype.$clone = deepClone // vue原型挂载递归拷贝方法
+
+// 设置全局 Message 默认显示时间为 2 秒
+Vue.prototype.$message = function(options) {
+  if (typeof options === 'string') {
+    return ElementUI.Message({
+      message: options,
+      duration: 1000
+    });
+  } else {
+    return ElementUI.Message({
+      duration: 1000,
+      ...options
+    });
+  }
+};
+
+// 设置各种类型的 Message 默认显示时间
+['success', 'warning', 'info', 'error'].forEach(type => {
+  Vue.prototype.$message[type] = function(options) {
+    if (typeof options === 'string') {
+      return ElementUI.Message[type]({
+        message: options,
+        duration: 1000
+      });
+    } else {
+      return ElementUI.Message[type]({
+        duration: 1000,
+        ...options
+      });
+    }
+  };
+});
+
 new Vue({
   router,
   store,

src/views/components/order/searchUser.vue

@@ -95,6 +95,10 @@
         this.$emit('result', value, valueItem)
       },
       requestAccountList() {
+        if (this.accountSelect == '') {
+          this.$message.warning('暂无关联的账号，请先去关联账号!')
+          return false
+        }
         roleList({ role_name: this.resulte, member_id: this.accountSelect, ...this.pageInfo }).then((res) => {
           this.loading = false
           this.searchUserOption = this.searchUserOption.concat(res.data.data)