修改图标和商城条跳转

1

src/layout/components/Navbar.vue

@@ -45,6 +45,14 @@
       </el-scrollbar>
     </div>
     <div class="right-menu">
+      <el-tooltip style="display: flex;" effect="dark" v-if="tenantForm.tenantId == 1" content="点击进入商城系统" placement="bottom">
+        <div
+          class="msginfo right-position"
+          @click="gotoMall"
+        >
+          <i class="icon_admin_mall operationSize"></i>
+        </div>
+      </el-tooltip>
       <el-tooltip style="display: flex;" effect="dark" v-if="tenantForm.tenantId == 1" content="点击进入OA系统" placement="bottom">
         <div
           class="msginfo right-position"
@@ -53,6 +61,7 @@
           <i class="icon_admin_oa operationSize"></i>
         </div>
       </el-tooltip>
+
       <!-- <el-popover
         placement="bottom"
         trigger="hover"
@@ -341,7 +350,7 @@ import { resetPassword } from "@/api/buildTeam";
 import AppLink from "./Sidebar/Link";
 import { getBelongTopMenuPath } from "@/utils/permission";
 // import instructions from "./instructions";
-import { validOaUrl } from '@/utils/validate'
+import { validOaUrl,validMallUrl } from '@/utils/validate'
 import { tenantInfoQueryPage } from '@/views/organManager/api'
 import Cookies from 'js-cookie'
 import axios from 'axios'
@@ -542,6 +551,9 @@ export default {
       // Cookies.set('Admin-Token', Token, { domain: `.${validOaUrl().split('//')[1]}`, path: '/' })
       // document.cookie = `Adminoken=${Token};domain=oadev.dayaedu.com;`
       window.open(validOaUrl())
+    },
+    gotoMall(){
+      window.open(validMallUrl())
     }
   },
   watch: {

src/styles/menu.scss

@@ -15,7 +15,7 @@
   display: inline-block;
 }
 
-$menuList: icon_admin_home, icon_admin_tenant_manager, icon_admin_charge, icon_admin_operate, icon_admin_user, icon_admin_people, icon_admin_content, icon_admin_goods, icon_admin_report, icon_admin_setting, icon_admin_platform, icon_admin_oa, icon_admin_book, icon_admin_message, icon_admin_orgin, icon_admin_tenant, icon_admin_change, icon_admin_account, icon_admin_edit, icon_admin_exit;
+$menuList:icon_admin_mall, icon_admin_home, icon_admin_tenant_manager, icon_admin_charge, icon_admin_operate, icon_admin_user, icon_admin_people, icon_admin_content, icon_admin_goods, icon_admin_report, icon_admin_setting, icon_admin_platform, icon_admin_oa, icon_admin_book, icon_admin_message, icon_admin_orgin, icon_admin_tenant, icon_admin_change, icon_admin_account, icon_admin_edit, icon_admin_exit;
 
 // 开始 @each 循环遍历数组
 // $c 作为循环变量，代表了数组的元素，不是索引~！！！
@@ -41,4 +41,4 @@ $menuList: icon_admin_home, icon_admin_tenant_manager, icon_admin_charge, icon_a
 //     background: url('~@/assets/menu/#{$c}.png') no-repeat center center;
 //     background-size: cover;
 //   }
-// }
+// }

src/utils/validate.js

@@ -70,7 +70,7 @@ export function vaildTeachingUrl() {
   return returnUrl
 }
 
-// 教务地址
+// OA地址
 export function validOaUrl() {
   let url = window.location.href
   let returnUrl = ''
@@ -86,7 +86,21 @@ export function validOaUrl() {
   return returnUrl
 }
 
-
+// 商城地址
+export function validMallUrl() {
+  let url = window.location.href
+  let returnUrl = ''
+  if (/online/.test(url)) { //线上
+    returnUrl = 'https://online.dayaedu.com/mall/'
+  } else if (/dev/.test(url)) { // dev 环境
+    returnUrl = 'https://dev.dayaedu.com/mall/'
+  } else if (/test/.test(url)) { // dev 环境
+    returnUrl = 'https://test.dayaedu.com/mall/'
+  } else { // 默认dev环境
+    returnUrl = 'https://test.dayaedu.com/mall/'
+  }
+  return returnUrl
+}
 export function nextMonthLastDay(year, month) { //日期显示为次月最后一天
   // var time = date ? new Date(date) : new Date();
   // var year = time.getFullYear();