From 1e70bfee7d3e44a02cffccf319b931a0b0eded8f Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 28 Jul 2021 15:09:43 +0800
Subject: [PATCH] no message

---
 components/toast/index.js           | 29 ------------
 components/toast/index.json         |  9 ----
 components/toast/index.wxml         | 33 --------------
 components/toast/index.wxss         |  1 -
 components/toast/toast.js           | 70 -----------------------------
 pages/home/employee-info/index.js   | 10 ++---
 pages/home/employee-info/index.json |  1 -
 pages/home/employee-info/index.wxml |  1 -
 8 files changed, 3 insertions(+), 151 deletions(-)
 delete mode 100644 components/toast/index.js
 delete mode 100644 components/toast/index.json
 delete mode 100644 components/toast/index.wxml
 delete mode 100644 components/toast/index.wxss
 delete mode 100644 components/toast/toast.js

diff --git a/components/toast/index.js b/components/toast/index.js
deleted file mode 100644
index c4c2ed9..0000000
--- a/components/toast/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { VantComponent } from '../common/component';
-VantComponent({
-  props: {
-    show: Boolean,
-    mask: Boolean,
-    message: String,
-    forbidClick: Boolean,
-    zIndex: {
-      type: Number,
-      value: 1000,
-    },
-    type: {
-      type: String,
-      value: 'text',
-    },
-    loadingType: {
-      type: String,
-      value: 'circular',
-    },
-    position: {
-      type: String,
-      value: 'middle',
-    },
-  },
-  methods: {
-    // for prevent touchmove
-    noop() {},
-  },
-});
diff --git a/components/toast/index.json b/components/toast/index.json
deleted file mode 100644
index 9b1b78c..0000000
--- a/components/toast/index.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-loading": "../loading/index",
-    "van-overlay": "../overlay/index",
-    "van-transition": "../transition/index"
-  }
-}
diff --git a/components/toast/index.wxml b/components/toast/index.wxml
deleted file mode 100644
index 635e7d6..0000000
--- a/components/toast/index.wxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<van-overlay
-  wx:if="{{ mask || forbidClick }}"
-  show="{{ show }}"
-  z-index="{{ zIndex }}"
-  custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
-/>
-<van-transition
-  show="{{ show }}"
-  custom-style="z-index: {{ zIndex }}"
-  custom-class="van-toast__container"
->
-  <view
-    class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
-    catch:touchmove="noop"
-  >
-    <!-- text only -->
-    <text wx:if="{{ type === 'text' }}">{{ message }}</text>
-
-    <!-- with icon -->
-    <block wx:else>
-      <van-loading
-        wx:if="{{ type === 'loading' }}"
-        color="white"
-        type="{{ loadingType }}"
-        custom-class="van-toast__loading"
-      />
-      <van-icon wx:else class="van-toast__icon" name="{{ type }}" />
-      <text wx:if="{{ message }}" class="van-toast__text">{{ message }}</text>
-    </block>
-
-    <slot />
-  </view>
-</van-transition>
diff --git a/components/toast/index.wxss b/components/toast/index.wxss
deleted file mode 100644
index 85dc7a8..0000000
--- a/components/toast/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../common/index.wxss';.van-toast{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:initial;color:#fff;color:var(--toast-text-color,#fff);font-size:14px;font-size:var(--toast-font-size,14px);line-height:20px;line-height:var(--toast-line-height,20px);white-space:pre-wrap;word-wrap:break-word;background-color:rgba(0,0,0,.7);background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:8px;border-radius:var(--toast-border-radius,8px)}.van-toast__container{position:fixed;top:50%;left:50%;width:-webkit-fit-content;width:fit-content;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);max-width:70%;max-width:var(--toast-max-width,70%)}.van-toast--text{min-width:96px;min-width:var(--toast-text-min-width,96px);padding:8px 12px;padding:var(--toast-text-padding,8px 12px)}.van-toast--icon{width:88px;width:var(--toast-default-width,88px);min-height:88px;min-height:var(--toast-default-min-height,88px);padding:16px;padding:var(--toast-default-padding,16px)}.van-toast--icon .van-toast__icon{font-size:36px;font-size:var(--toast-icon-size,36px)}.van-toast--icon .van-toast__text{padding-top:8px}.van-toast__loading{margin:10px 0}.van-toast--top{-webkit-transform:translateY(-30vh);transform:translateY(-30vh)}.van-toast--bottom{-webkit-transform:translateY(30vh);transform:translateY(30vh)}
\ No newline at end of file
diff --git a/components/toast/toast.js b/components/toast/toast.js
deleted file mode 100644
index 4a1b63a..0000000
--- a/components/toast/toast.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { isObj } from '../common/validator';
-const defaultOptions = {
-  type: 'text',
-  mask: false,
-  message: '',
-  show: true,
-  zIndex: 1000,
-  duration: 2000,
-  position: 'middle',
-  forbidClick: false,
-  loadingType: 'circular',
-  selector: '#van-toast',
-};
-let queue = [];
-let currentOptions = Object.assign({}, defaultOptions);
-function parseOptions(message) {
-  return isObj(message) ? message : { message };
-}
-function getContext() {
-  const pages = getCurrentPages();
-  return pages[pages.length - 1];
-}
-function Toast(toastOptions) {
-  const options = Object.assign(
-    Object.assign({}, currentOptions),
-    parseOptions(toastOptions)
-  );
-  const context = options.context || getContext();
-  const toast = context.selectComponent(options.selector);
-  if (!toast) {
-    console.warn('未找到 van-toast 节点，请确认 selector 及 context 是否正确');
-    return;
-  }
-  delete options.context;
-  delete options.selector;
-  toast.clear = () => {
-    toast.setData({ show: false });
-    if (options.onClose) {
-      options.onClose();
-    }
-  };
-  queue.push(toast);
-  toast.setData(options);
-  clearTimeout(toast.timer);
-  if (options.duration != null && options.duration > 0) {
-    toast.timer = setTimeout(() => {
-      toast.clear();
-      queue = queue.filter((item) => item !== toast);
-    }, options.duration);
-  }
-  return toast;
-}
-const createMethod = (type) => (options) =>
-  Toast(Object.assign({ type }, parseOptions(options)));
-Toast.loading = createMethod('loading');
-Toast.success = createMethod('success');
-Toast.fail = createMethod('fail');
-Toast.clear = () => {
-  queue.forEach((toast) => {
-    toast.clear();
-  });
-  queue = [];
-};
-Toast.setDefaultOptions = (options) => {
-  Object.assign(currentOptions, options);
-};
-Toast.resetDefaultOptions = () => {
-  currentOptions = Object.assign({}, defaultOptions);
-};
-export default Toast;
diff --git a/pages/home/employee-info/index.js b/pages/home/employee-info/index.js
index f1a046e..1af2f47 100644
--- a/pages/home/employee-info/index.js
+++ b/pages/home/employee-info/index.js
@@ -1,7 +1,6 @@
 // pages/home/customer-info/index.js
 import Scene from '../../index/scene'
 import Dialog from '../../../components/dialog/dialog'
-import Toast from '../../../components/toast/toast'
 import { getRoleList} from "../../../api/saas"
 import { editEmploye, auditEmploye } from "../../../api/user"
 import { deleteEmploye } from "../../../api/saas"
@@ -86,11 +85,10 @@ Scene({
     }
     editEmploye(this.data.form).then(result => {
       wx.hideLoading()
-      Toast('保存成功')
-      util.showBackToast()
       event.emit('EventMessage', { what: 120, detail: '' })
       const channel = this.getOpenerEventChannel()
       channel.emit('onCallback', { what: 120 })
+      util.showBackToast('保存成功')
     }).catch(err => {
       wx.hideLoading()
       util.showToast(err)
@@ -105,10 +103,9 @@ Scene({
     this.data.form.status = 1
     auditEmploye(this.data.form).then(result => {
       wx.hideLoading()
-      Toast('审核已通过')
-      util.showBackToast()
       const channel = this.getOpenerEventChannel()
       channel.emit('onCallback', { what: 120 })
+      util.showBackToast('审核已通过')
     }).catch(err => {
       wx.hideLoading()
       util.showToast(err)
@@ -120,10 +117,9 @@ Scene({
       var enterpriseDepartmentId = this.data.form.enterpriseDepartmentId
       deleteEmploye({idList: [this.data.form.enterpriseMemberId], enterpriseDepartmentId }).then(result => {
         wx.hideLoading()
-        Toast('员工已经删除')
-        util.showBackToast()
         const channel = this.getOpenerEventChannel()
         channel.emit('onCallback', { what: 120 })
+        util.showBackToast('员工已经删除')
       }).catch(err => {
         wx.hideLoading()
         util.showToast(err)
diff --git a/pages/home/employee-info/index.json b/pages/home/employee-info/index.json
index 9570622..034d091 100644
--- a/pages/home/employee-info/index.json
+++ b/pages/home/employee-info/index.json
@@ -10,7 +10,6 @@
     "van-popup": "/components/popup/index",
     "van-radio": "/components/radio/index",
     "van-radio-group": "/components/radio-group/index",
-    "van-toast": "/components/toast/index",
     "van-dialog": "/components/dialog/index",
     "notification": "/pages/message/notification/index"
   }
diff --git a/pages/home/employee-info/index.wxml b/pages/home/employee-info/index.wxml
index 6456ce9..d2d878a 100644
--- a/pages/home/employee-info/index.wxml
+++ b/pages/home/employee-info/index.wxml
@@ -35,7 +35,6 @@
   <van-button block type="info" bind:click="agreeForm">同意</van-button>
 </view>
 
-<van-toast id="van-toast" />
 <van-dialog id="van-dialog" />
 <van-popup position="bottom" show="{{ visible }}" bind:close="onHide" z-index="29">
   <van-checker show-toolbar title="选择角色" columns="{{ roleList }}" active-id="{{ form.enterpriseRoleIds }}" bind:cancel="onHide" bind:confirm="onConfirm" />