1

src/layout/components/Sidebar/Item.vue

@@ -13,10 +13,15 @@ export default {
     }
   },
   render(h, context) {
-    const { icon, title } = context.props
+    let { icon, title } = context.props
     const vnodes = []
     if (icon) {
-      vnodes.push(<svg-icon icon-class={icon} />)
+      icon = 'iconfont ' + icon
+      console.log(icon, 'showInfo')
+      // vnodes.push(<svg-icon icon-class={icon} />)
+      vnodes.push(<span class={icon}></span>)
+    } else {
+      vnodes.push(<span class='iconfont noIcon'></span>)
     }
 
     if (title) {

src/layout/components/Sidebar/index.vue

@@ -192,8 +192,8 @@ export default {
 }
 /deep/.el-menu-item,
 /deep/.el-submenu__title {
-  height: 60px !important;
-  line-height: 60px !important;
+  height: 56px !important;
+  line-height: 56px !important;
 }
 /deep/.el-submenu .el-menu-item {
   color: #666666 !important;

src/main.js

@@ -31,6 +31,7 @@ import 'babel-polyfill'
 import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import '@/styles/index.scss' // global css
+import '@/styles/iconfont/iconfont.css' // 字体图标，主要用于菜单图标
 
 // import '@/assets/element-variables.scss'
 import App from './App'

src/styles/iconfont/iconfont.css

@@ -0,0 +1,345 @@
+@font-face {
+  font-family: "iconfont"; /* Project id  */
+  src: url('iconfont.ttf?t=1641873168481') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 18px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shouye:before {
+  content: "\e608";
+}
+
+.icon-baobiaozhongxin:before {
+  content: "\e609";
+}
+
+.icon-jiaoyiguanli:before {
+  content: "\e60a";
+}
+
+.icon-neirongguanli:before {
+  content: "\e60b";
+}
+
+.icon-pingtaiguanli:before {
+  content: "\e60c";
+}
+
+.icon-xitongshezhi:before {
+  content: "\e60e";
+}
+
+.icon-yonghuguanli:before {
+  content: "\e60f";
+}
+
+.icon-yunyingguanli:before {
+  content: "\e610";
+}
+
+.icon-shangpinguanli-copy:before {
+  content: "\e611";
+}
+
+.icon-bangzhuzhongxin:before {
+  content: "\e625";
+}
+
+.icon-banjiguanli:before {
+  content: "\e626";
+}
+
+.icon-choujianghuodongguanli:before {
+  content: "\e627";
+}
+
+.icon-baobiaozhongxin1:before {
+  content: "\e628";
+}
+
+.icon-chanpinguanli:before {
+  content: "\e629";
+}
+
+.icon-dingshirenwuguanli:before {
+  content: "\e62a";
+}
+
+.icon-gongnengzidian:before {
+  content: "\e62b";
+}
+
+.icon-gerenjinengceping:before {
+  content: "\e62c";
+}
+
+.icon-huodongguanli:before {
+  content: "\e62d";
+}
+
+.icon-fuwuzhibiaoguanli:before {
+  content: "\e62e";
+}
+
+.icon-jigouliebiao:before {
+  content: "\e62f";
+}
+
+.icon-fuwuguanli:before {
+  content: "\e630";
+}
+
+.icon-jietijiangli:before {
+  content: "\e631";
+}
+
+.icon-jiaoseguanli:before {
+  content: "\e632";
+}
+
+.icon-jibenxinxipeizhi:before {
+  content: "\e633";
+}
+
+.icon-kechengcanshushezhi:before {
+  content: "\e634";
+}
+
+.icon-dingdanguanli:before {
+  content: "\e635";
+}
+
+.icon-jiaoxuebanzou:before {
+  content: "\e636";
+}
+
+.icon-guanlishenpi:before {
+  content: "\e637";
+}
+
+.icon-jiezhuanjiangli:before {
+  content: "\e638";
+}
+
+.icon-jiaocailiebiao:before {
+  content: "\e639";
+}
+
+.icon-caiwuguanli:before {
+  content: "\e63a";
+}
+
+.icon-kechengguizeshezhi:before {
+  content: "\e63b";
+}
+
+.icon-jingyingbaobiao:before {
+  content: "\e63c";
+}
+
+.icon-huiyuanshezhi:before {
+  content: "\e63d";
+}
+
+.icon-leqiweibao:before {
+  content: "\e63e";
+}
+
+.icon-kechengzuguanli:before {
+  content: "\e63f";
+}
+
+.icon-kechengguizemorenzhi:before {
+  content: "\e640";
+}
+
+.icon-lingxingguanli:before {
+  content: "\e641";
+}
+
+.icon-laoshiguanli:before {
+  content: "\e642";
+}
+
+.icon-kaojibaoming:before {
+  content: "\e643";
+}
+
+.icon-pingtaicanshushezhi:before {
+  content: "\e644";
+}
+
+.icon-gongzuotai:before {
+  content: "\e645";
+}
+
+.icon-letuanxuncha:before {
+  content: "\e646";
+}
+
+.icon-renliziyuanguanli:before {
+  content: "\e647";
+}
+
+.icon-shengbushezhi:before {
+  content: "\e648";
+}
+
+.icon-shebeihaoguanli:before {
+  content: "\e649";
+}
+
+.icon-shangpinfenleiguanli:before {
+  content: "\e64a";
+}
+
+.icon-shangpinliebiao:before {
+  content: "\e64b";
+}
+
+.icon-xiazailiebiao:before {
+  content: "\e64c";
+}
+
+.icon-jiejiarishezhi:before {
+  content: "\e64d";
+}
+
+.icon-xueyuanguanli:before {
+  content: "\e64e";
+}
+
+.icon-pingtaiyuangongguanli:before {
+  content: "\e64f";
+}
+
+.icon-wenjuanguanli:before {
+  content: "\e650";
+}
+
+.icon-yijianfankui:before {
+  content: "\e651";
+}
+
+.icon-teshuguizemorenzhi:before {
+  content: "\e652";
+}
+
+.icon-yujingkechoushezhi:before {
+  content: "\e653";
+}
+
+.icon-shengbufenleishezhi:before {
+  content: "\e654";
+}
+
+.icon-yunyingyujing:before {
+  content: "\e655";
+}
+
+.icon-yichangshujuchaxun:before {
+  content: "\e656";
+}
+
+.icon-youjianfuwupeizhi:before {
+  content: "\e657";
+}
+
+.icon-yunyingzhibiao:before {
+  content: "\e658";
+}
+
+.icon-APPbanbenkongzhi:before {
+  content: "\e659";
+}
+
+.icon-teshuguizeshezhi:before {
+  content: "\e65a";
+}
+
+.icon-kechengguanli:before {
+  content: "\e65b";
+}
+
+.icon-yunjiaolianfankui:before {
+  content: "\e65c";
+}
+
+.icon-zuoyeguanli:before {
+  content: "\e65d";
+}
+
+.icon-yingxiaohuodong:before {
+  content: "\e65e";
+}
+
+.icon-neirongguanli1:before {
+  content: "\e65f";
+}
+
+.icon-choubeizhong:before {
+  content: "\e660";
+}
+
+.icon-baomingzhong:before {
+  content: "\e661";
+}
+
+.icon-guanbi:before {
+  content: "\e662";
+}
+
+.icon-letuandangan:before {
+  content: "\e663";
+}
+
+.icon-caozuorizhi:before {
+  content: "\e664";
+}
+
+.icon-jinhangzhong:before {
+  content: "\e665";
+}
+
+.icon-shenhezhong:before {
+  content: "\e666";
+}
+
+.icon-jiaofeizhong:before {
+  content: "\e667";
+}
+
+.icon-zanting:before {
+  content: "\e668";
+}
+
+.icon-quxiao:before {
+  content: "\e669";
+}
+
+.icon-chuangjianjiaofeizhong:before {
+  content: "\e66a";
+}
+
+.icon-bianjizhong:before {
+  content: "\e66b";
+}
+
+.icon-feiyongshenhezhong:before {
+  content: "\e66c";
+}
+
+.icon-yubaomingzhong:before {
+  content: "\e66d";
+}
+
+.icon-shenheshibai:before {
+  content: "\e66e";
+}
+

src/styles/sidebar.scss

@@ -132,8 +132,11 @@
       overflow: hidden;
     }
 
-    .svg-icon {
-      margin-right: 16px;
+    .svg-icon, .iconfont {
+      margin-right: 12px;
+      &.noIcon {
+        margin-right: 20px;
+      }
     }
 
     .el-menu {

src/styles/theme/berlinBlue.scss

@@ -1,10 +1,10 @@
 // 第二套样式配置
 $bluemenuPrimary: #2B78CC;
 $bluemenuActiveBg: #2568B2;
-$bluemenuText:#1a1a1a;
+$bluemenuText:#6D7278;
 $bluemenuActiveText:#fff;
 $bluemenuActiveText2:#2B78CC;
-$bluesubMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$bluesubMenuActiveText:#6D7278; //https://github.com/ElemeFE/element/issues/12951
 $bluemenuBg:#fff; // 侧边栏一级默认样式
 $bluemenuHover: #EDF6FF; // 侧边栏一级滑动样式
 $bluesubMenuBg:#fff; // 侧边栏二级默认样式

src/styles/theme/cloudAshes.scss

@@ -1,10 +1,10 @@
 // 第二套样式配置
 $ashesmenuPrimary: #444D5C;
 $ashesmenuActiveBg: #363A49; // 头部菜单选中背景色
-$ashesmenuText:#1a1a1a;
+$ashesmenuText:#6D7278;
 $ashesmenuActiveText:#fff;
 $ashesmenuActiveText2:#444D5C;
-$ashessubMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$ashessubMenuActiveText:#6D7278; //https://github.com/ElemeFE/element/issues/12951
 $ashesmenuBg:#fff; // 侧边栏一级默认样式
 $ashesmenuHover: #F3F4F7; // 侧边栏一级滑动样式
 $ashessubMenuBg:#fff; // 侧边栏二级默认样式

src/styles/theme/volcanicRed.scss

@@ -1,10 +1,10 @@
 // 第二套样式配置
 $redmenuPrimary: #BC3030;
 $redmenuActiveBg: #A62929;
-$redmenuText:#1a1a1a;
+$redmenuText:#6D7278;
 $redmenuActiveText:#fff;
 $redmenuActiveText2:#BC3030;
-$redsubMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$redsubMenuActiveText:#6D7278; //https://github.com/ElemeFE/element/issues/12951
 $redmenuBg:#fff; // 侧边栏一级默认样式
 $redmenuHover: #FBF3F3; // 侧边栏一级滑动样式
 $redsubMenuBg:#fff; // 侧边栏二级默认样式

src/styles/variables.scss

@@ -1,10 +1,10 @@
 // 默认大雅绿样式
 $menuPrimary: #00A79D;
 $menuActiveBg: #00928A; // 头部菜单选中背景色
-$menuText:#1a1a1a;    // #000
+$menuText:#6D7278;    // #000
 $menuActiveText:#fff;
 $menuActiveText2:#00A79D;
-$subMenuActiveText:#030303; //https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText:#6D7278; //https://github.com/ElemeFE/element/issues/12951
 $menuBg:#fff; // 侧边栏一级默认样式
 $menuHover: #F0FAF9; // 侧边栏一级滑动样式
 $subMenuBg:#fff; // 侧边栏二级默认样式

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -18,12 +18,12 @@
         </el-form-item>
         <el-form-item label="搜索">
           <el-input style="width:210px"
-                    v-model.trim="seachRoleValue"></el-input>
+                    v-model.trim="seachRoleValue" clearable></el-input>
           <el-button style="margin-left: 10px"
                      type="danger"
                      @click="seachRoles">搜索</el-button>
-          <el-button type="primary"
-                     @click="onReSetRole">重置</el-button>
+          <!-- <el-button type="primary"
+                     @click="onReSetRole">重置</el-button> -->
         </el-form-item>
         <el-form-item label="基本权限">
           <el-checkbox :indeterminate="isIndeterminate"

src/views/productService/components/cloudRecharge.vue

@@ -132,7 +132,7 @@ export default {
       line-height: 30px;
       font-size: 21px;
       font-weight: 500;
-      border-bottom: 1px solid rgba(0,0,0,0.25);
+      border-bottom: 1px solid #979797;
     }
   }
   .tips {

src/views/productService/components/serviceRenew.vue

@@ -156,7 +156,7 @@ export default {
       line-height: 30px;
       font-size: 21px;
       font-weight: 500;
-      border-bottom: 1px solid rgba(0,0,0,0.25);
+      border-bottom: 1px solid #979797;
     }
   }
   .el-col {

src/views/productService/index.vue

@@ -156,7 +156,7 @@ export default {
       line-height: 30px;
       font-size: 21px;
       font-weight: 500;
-      border-bottom: 1px solid rgba(0,0,0,0.25);
+      border-bottom: 1px solid #979797;
     }
   }
   .el-row {

src/views/resetTeaming/modals/instrumentModel.vue

@@ -48,14 +48,7 @@
                   :class="[con.isStatus ? 'check_active' : '']"
                 ></i>
                 <div>
-                  <div style="display: flex;align-items: center;">{{ con.name }}
-								    <i class="icon_courseFee" @click.stop="onLookRule" v-if="con.groupRemissionCourseFee == 1 && con.kitType == 'GROUP'"></i></div>
-                  <div
-                    v-if="con.goodsList"
-                    style="font-size: 12px; color: #808080"
-                  >
-                    {{ con.goodsList[0].specification }}
-                  </div>
+                  {{ con.name }}
                 </div>
               </el-col>
               <el-col :span="6">
@@ -83,7 +76,20 @@
               </el-col>
             </el-row>
 
-            <el-row
+            <el-row style="padding-left: 26px; margin-bottom: 5px;">
+              <el-col :span="24">
+                <div style="display: flex;align-items: center;">
+                    <div
+                      v-if="con.goodsList"
+                      style="font-size: 12px; color: #808080"
+                    >
+                      {{ con.goodsList[0].specification }}
+                    </div>
+                    <el-tag effect="plain" size="mini" style="margin-left: 10px; color: #01C1B5;" @click.stop="onLookRule" v-if="con.groupRemissionCourseFee == 1 && con.kitType == 'GROUP'">课程减免</el-tag>
+                  </div>
+              </el-col>
+            </el-row>
+            <!-- <el-row
               style="padding: 8px 0 8px 24px; border-top: 1px solid #F0F0F0;"
               v-if="con.childGoodsNames && con.kitType == 'GROUP'"
             >
@@ -95,7 +101,7 @@
                   con.childGoodsNames
                 }}</span>
               </el-col>
-            </el-row>
+            </el-row> -->
           </div>
         </div>
       </div>

src/views/setSilder/addSilder.vue

@@ -30,9 +30,12 @@
           :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         >
           <el-table-column width="300px" prop="name" label="菜单名称">
+            <template slot-scope="scope">
+              {{ scope.row.name }} - {{ scope.row.id }}
+            </template>
           </el-table-column>
-          <el-table-column prop="id" width="100px" label="元素ID">
-          </el-table-column>
+          <!-- <el-table-column prop="id" width="100px" label="元素ID">
+          </el-table-column> -->
           <el-table-column label="菜单类型" width="100px">
             <template slot-scope="scope">
               {{ scope.row.type == 1 ? "按钮" : "菜单" }}
@@ -43,6 +46,8 @@
           <el-table-column prop="path" label="文件路径"> </el-table-column>
           <el-table-column prop="parentPermission" label="高亮路径">
           </el-table-column>
+          <el-table-column prop="icon" label="菜单图标">
+          </el-table-column>
           <el-table-column prop="permission" label="接口权限">
           </el-table-column>
           <el-table-column prop="memo" label="页面权限"> </el-table-column>