update: 优化

src/components/layout/layout.vue

@@ -175,7 +175,7 @@ export default {
     color: #606266;
     font-size: 13px;
     position: absolute;
-    left: 110px;
+    left: 200px;
     display: flex;
     margin-top: -5px;
     align-items: center;
@@ -196,6 +196,10 @@ export default {
   li + li {
     margin-left: 10px;
   }
+  li:hover {
+    transition: transform 0.2s ease;
+    transform: translateY(-2px);
+  }
 }
 .simu-el-item {
   margin-top: 6px;

src/utils/common.js

 /**
  * 业务代码公用方法
  */
-import { MessageBox } from 'element-ui';
+// import { MessageBox } from 'element-ui';
+import Vue from 'vue';
 import store from '@/store';
 import config from '@/config/index';
 import qs from 'qs';
@@ -16,19 +17,10 @@ const _config = config;
  * @param {object} otherConfig 额外设置
  */
 export const showConfirm = (warningText, cb, params, eb, otherConfig = {}) => {
-  let customClass = 'top-icon';
-  const { dangerouslyUseHTMLString = true, title = '', showClose = false, confirmButtonText = '确认', cancelButtonText = '取消', distinguishCancelAndClose = false } = otherConfig;
-  if (title) {
-    customClass += ' show-title';
-  }
-  MessageBox.confirm(warningText, title, {
-    customClass,
-    showClose: showClose, // 4.0规范不需要展示
-    dangerouslyUseHTMLString,
+  const { title = '', confirmButtonText = '确认', cancelButtonText = '取消' } = otherConfig;
+  Vue.prototype.$confirm(warningText, title, {
     confirmButtonText,
     cancelButtonText,
-    distinguishCancelAndClose, // 是否将取消（点击取消按钮）与关闭（点击关闭按钮或遮罩层、按下 ESC 键）进行区分
-    type: 'warning'
   })
     .then(() => {
       cb && cb(params);
@@ -243,4 +235,4 @@ export const getFileSize = (obj) => {
     fileSize = obj.files[0].size;
   }
   return Math.round(fileSize / 1024); // 单位为KB
-};
\ No newline at end of file
+};

src/views/card/card-package/form.vue

@@ -249,7 +249,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: this.isAdd ? '新建卡券包' : '编辑卡券包', breadPath: '' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: this.isAdd ? '新建卡券包' : '编辑卡券包', breadPath: '' } ]);
   },
   mounted() {
     if (this.currentAreaId) {

src/views/card/card-package/list.vue

@@ -197,7 +197,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券包列表' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券包列表' } ]);
   },
   mounted() {
     this.getTableList();

src/views/card/card-package/send-list.vue

@@ -135,9 +135,9 @@ export default {
   },
   created() {
     if('id' in this.$route.query) {
-      this.$emit('updateBread', [ { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: '卡券包发放记录' } ]);
+      this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: '卡券包发放记录' } ]);
     } else {
-      this.$emit('updateBread', [ { breadName: '卡券包发放记录' } ]);
+      this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券包发放记录' } ]);
     }
   },
   mounted() {

src/views/card/card-package/stock-list.vue

@@ -10,7 +10,7 @@ export default {
     stockList
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: '库存记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: '库存记录' } ]);
   }
 };
 </script>

src/views/card/gic-card/app-config.vue

@@ -53,7 +53,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: '应用配置' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: '应用配置' } ]);
   },
   mounted() {
     this.getDetail();

src/views/card/gic-card/card-form.js

@@ -387,7 +387,7 @@ export default {
   },
   created() {
     const breadName = this.isAdd || this.isCopy ? '新建卡券' : '编辑卡券';
-    this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName } ]);
     this.ruleForm1.giveImage = this.zmImg[0].url;
     this.ruleForm1.giveImageField = this.zmImg[0].fileId;
     this.ruleForm1.giveBannerImage = this.stImg[0].url;

src/views/card/gic-card/card-info.js

@@ -83,7 +83,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: this.isInfo ? '卡券详情' : '编辑卡券' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: this.isInfo ? '卡券详情' : '编辑卡券' } ]);
   },
   mounted() {
     if (this.currentAreaId) {

src/views/card/gic-card/card-list.vue

@@ -212,7 +212,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券列表' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券列表' } ]);
   },
   mounted() {
     if(this.currentAreaId) {

src/views/card/gic-card/destory-list.vue

@@ -127,7 +127,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券销毁列表' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券销毁列表' } ]);
   },
   mounted() {
     if(this.currentAreaId) {

src/views/card/gic-card/member-get.vue

@@ -163,7 +163,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [  { breadName: '卡券列表', breadPath: '/gic-card/list'  }, { breadName: '卡券领取记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券列表', breadPath: '/gic-card/list'  }, { breadName: '卡券领取记录' } ]);
   },
   mounted() {
     if(this.currentAreaId) {

src/views/card/gic-card/send-list.vue

@@ -107,7 +107,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '转赠记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '转赠记录' } ]);
   },
   mounted() {
     this.getTableList();

src/views/card/gic-card/stock-list.vue

@@ -10,7 +10,7 @@ export default {
     stockList
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: '库存记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: '库存记录' } ]);
   }
 };
 </script>

src/views/card/gic-card/stock-upload-list.vue

@@ -10,7 +10,7 @@ export default {
     stockRecord
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '库存上传记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '库存上传记录' } ]);
   },
   computed: {
     queryParams() {

src/views/card/setting/custom.vue

@@ -34,7 +34,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '通用设置' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '通用设置' } ]);
   },
   mounted() {
     this.getDetail();

src/views/gift-manage/address-lib-form.vue

@@ -116,7 +116,7 @@ export default {
     }
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '地址库管理', breadPath: '/setting/address-lib-list' }, { breadName: (this.addressId ? '编辑' : '新建') + '地址库' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '地址库管理', breadPath: '/setting/address-lib-list' }, { breadName: (this.addressId ? '编辑' : '新建') + '地址库' } ]);
   },
   methods: {
     change(value){

src/views/gift-manage/address-lib-list.vue

@@ -46,7 +46,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '地址库管理' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '地址库管理' } ]);
   },
   mounted() {
     this.getTableList();

src/views/gift-manage/pickup-form.vue

@@ -126,7 +126,7 @@ export default {
     }
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '自提点设置', breadPath: '/setting/pickup-list' }, { breadName: this.isAdd ? '新建自提点' : '编辑自提点', breadPath: '' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '自提点设置', breadPath: '/setting/pickup-list' }, { breadName: this.isAdd ? '新建自提点' : '编辑自提点', breadPath: '' } ]);
   },
   methods: {
     getInfo() {

src/views/gift-manage/pickup-list.vue

@@ -65,7 +65,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '自提点设置' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '自提点设置' } ]);
   },
   mounted() {
     this.getTableList();

src/views/gift-manage/real-gift-detail.vue

@@ -225,15 +225,15 @@
             <template>
               <el-checkbox-group v-model="goodsForm.checkList" @change="changeStockUse" :disabled="isEdit">
                 <el-checkbox label="0">
-                  <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
+                  <el-tooltip effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
                     <div slot="content" style="width:245px">固定库存：通过占用的方式获得固定可用库存，不会被其他应用/活动所消耗。</div>
-                    <span class="inline-block ml30 dash-style">固定库存</span>
+                    <span class="tooltip-icon">固定库存</span>
                   </el-tooltip>
                 </el-checkbox>
                 <el-checkbox label="1" style="margin-left:50px">
-                  <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
+                  <el-tooltip effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
                     <div slot="content" style="width:245px">实时库存：不占用库存，使用福利中心“可占库存”，与其他应用使用同个库存。</div>
-                    <span class="inline-block ml30 dash-style">实时库存</span>
+                    <span class="tooltip-icon">实时库存</span>
                   </el-tooltip>
                 </el-checkbox>
               </el-checkbox-group>
@@ -347,6 +347,7 @@ export default {
     return {
       uploadUrl: uploadUrl,
       bread: [
+        { breadName: '福利中心', breadPath: '/index' },
         {
           breadPath: '/gift-manage/real-gift',
           breadName: '实物礼品'
@@ -456,7 +457,7 @@ export default {
     this.getLoginUser();
     this.giftId = this.$route.query.giftId;
     if (this.giftId) {
-      this.bread[1].breadName = '编辑礼品';
+      this.bread[2].breadName = '编辑礼品';
       this.getMess();
       this.isEdit = true;
       this.getShopList();

src/views/gift-manage/real-gift.vue

@@ -197,6 +197,7 @@ export default {
   data() {
     return {
       bread: [
+        { breadName: '福利中心', breadPath: '/index' },
         {
           breadName: '实物礼品'
         }

src/views/gift-manage/real-stock-list.vue

@@ -10,7 +10,7 @@ export default {
     stockList
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '实物礼品', breadPath: '/gift-manage/real-gift' }, { breadName: '库存记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '实物礼品', breadPath: '/gift-manage/real-gift' }, { breadName: '库存记录' } ]);
   }
 };
 </script>

src/views/gift-manage/sales-return-setting.vue

@@ -35,7 +35,7 @@ export default {
     };
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '退货单设置' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '退货单设置' } ]);
   },
   mounted() {
     this.getDetail();

src/views/gift-manage/stock-record.vue

@@ -10,7 +10,7 @@ export default {
     stockRecord
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '库存上传记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '库存上传记录' } ]);
   }
 };
 </script>

src/views/gift-manage/virtual-gift-detail.vue

@@ -139,15 +139,15 @@
             <template>
               <el-checkbox-group v-model="goodsForm.checkList" @change="changeStockUse" :disabled="isEdit">
                 <el-checkbox label="0">
-                  <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
+                  <el-tooltip effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
                     <div slot="content" style="width:245px">固定库存：通过占用的方式获得固定可用库存，不会被其他应用/活动所消耗。</div>
-                    <span class="inline-block ml30 dash-style">固定库存</span>
+                    <span class="tooltip-icon">固定库存</span>
                   </el-tooltip>
                 </el-checkbox>
                 <el-checkbox label="1" style="margin-left:50px">
-                  <el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
+                  <el-tooltip effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
                     <div slot="content" style="width:245px">实时库存：不占用库存，使用福利中心“可占库存”，与其他应用使用同个库存。</div>
-                    <span class="inline-block ml30 dash-style">实时库存</span>
+                    <span class="tooltip-icon">实时库存</span>
                   </el-tooltip>
                 </el-checkbox>
               </el-checkbox-group>
@@ -246,6 +246,7 @@ export default {
     return {
       uploadUrl: uploadUrl,
       bread: [
+        { breadName: '福利中心', breadPath: '/index' },
         {
           breadPath: '/gift-manage/virtual-gift',
           breadName: '虚拟礼品'
@@ -339,7 +340,7 @@ export default {
     this.giftId = this.$route.query.giftId;
     if (this.giftId) {
       // this.readonly = true;
-      this.bread[1].breadName = '编辑礼品';
+      this.bread[2].breadName = '编辑礼品';
       this.getMess();
       this.isEdit = true;
       this.isEcho = true;

src/views/gift-manage/virtual-gift.vue

@@ -221,6 +221,7 @@ export default {
   data() {
     return {
       bread: [
+        { breadName: '福利中心', breadPath: '/index' },
         {
           breadName: '虚拟礼品'
         }

src/views/gift-manage/virtual-stock-list.vue

@@ -10,7 +10,7 @@ export default {
     stockList
   },
   created() {
-    this.$emit('updateBread', [ { breadName: '虚拟礼品', breadPath: '/gift-manage/virtual-gift' }, { breadName: '库存记录' } ]);
+    this.$emit('updateBread', [ { breadName: '福利中心', breadPath: '/index' }, { breadName: '虚拟礼品', breadPath: '/gift-manage/virtual-gift' }, { breadName: '库存记录' } ]);
   }
 };
 </script>

src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="welfare-index">
     <div class="welfare-index-header">福利中心</div>
     <div class="enter">
-      <div v-for="(item, idx) in wfTypes" :key="idx" :class="`block b${idx + 1}`" @click="openTab(item)">
+      <div v-for="(item, idx) in wfTypes" :key="idx" :class="`block b${idx + 1}`" @click="$router.push(item.target)">
         <span class="title">{{ item.title }}</span>
         <div class="target"><i class="icon-right-circle iconfont-welfare4"></i></div>
       </div>
@@ -72,7 +72,9 @@ export default {
     }
   }
   .block:hover {
-    margin-top: -20px;
+    // margin-top: -10px;
+    transition: transform 0.3s ease-in-out;
+    transform: translateY(-20px);
   }
   > div {
     transition: all 0.2s;

src/views/performance-manage/delivery-detail.vue

@@ -129,6 +129,7 @@ export default {
   },
   created() {
     this.$emit('updateBread', [
+      { breadName: '福利中心', breadPath: '/index' },
       {
         breadName: '发货单',
         breadPath: '/gift-performance/delivery',

src/views/performance-manage/delivery.vue

@@ -26,6 +26,7 @@ export default {
   },
   mounted() {
     this.$emit('updateBread', [
+      { breadName: '福利中心', breadPath: '/index' },
       {
         breadName: '发货单'
       },

src/views/performance-manage/record.vue

@@ -180,6 +180,7 @@ export default {
   },
   created() {
     this.$emit('updateBread', [
+      { breadName: '福利中心', breadPath: '/index' },
       {
         breadName: '履约记录'
       },

src/views/performance-manage/refund.vue

@@ -287,6 +287,7 @@ export default {
   },
   created() {
     this.$emit('updateBread', [
+      { breadName: '福利中心', breadPath: '/index' },
       {
         breadName: '退货单'
       },