Parcourir la source

feat: 美国孙总自定义url和logo
docs: 抵扣->立减

Ritchie il y a 1 an
Parent
commit
c2c80308b9

+ 1 - 1
src/assets/language/ja.json

@@ -649,7 +649,7 @@
         "noMoreThanMonths": "(3ヶ月を超えてはなりません)",
         "days": "日",
         "type": "タイプ",
-        "deductionRoll": "控除ロール",
+        "deductionRoll": "クーポン",
         "discount2": "割引",     
         "deductionPriceLabdel": "控除価格",
         "deductionPricePlaceholder": "控除価格を入力してください",

+ 3 - 3
src/assets/language/zh.json

@@ -649,10 +649,10 @@
     "noMoreThanMonths": "(不超过3个月)",
     "days": "天",
     "type": "类型",
-    "deductionRoll": "抵扣卷",
+    "deductionRoll": "立减券",
     "discount2": "打折",
-    "deductionPriceLabdel": "抵扣价格",
-    "deductionPricePlaceholder": "请输入抵扣价格",
+    "deductionPriceLabdel": "立减价格",
+    "deductionPricePlaceholder": "请输入立减价格",
     "enterNumber": "输入数字",
     "paymentMethod": "支付方式",
     "weChat": "微信",

BIN
src/assets/login/aetiLogo.png


src/assets/logo.png → src/assets/login/vueLogo.png


+ 2 - 0
src/service/login.js

@@ -5,10 +5,12 @@ import { stringToUrl } from '@/common/js/utils';
 export function login(params) {
   return axios.post(`/SZWL-SERVER/tAdmin/login?username=${params.username}&password=${params.password}&hostName=${params.hostName}`, params);
 }
+
 // 根据系统ID获取logo和系统名称
 export function getSys(params) {
   return axios.get(`/SZWL-SERVER/tLogo/getLogo?${stringToUrl(params)}`);
 }
+
 // 微信授权 -> 获取 openid
 export function getOpenid(params) {
   return axios.get(`/SZWL-SERVER/wxLogin/newMenuOauth?${stringToUrl(params)}`);

+ 1 - 1
src/styles/login/index.less

@@ -17,7 +17,7 @@
             top: 1.5rem;
             left: 50%;
             transform: translateX(-50%);
-            background: url("../../assets/login/logo.png");
+            // background: url("../../assets/login/logo.png");
             background-size: 100%;
         }
 

+ 0 - 1
src/views/device/diyFlower/index.vue

@@ -93,7 +93,6 @@ export default {
       if (id) {
         equipmentName.value = name;
       }
-
     });
     const showSugerPhoto = (row) => {
       let imgId = row.no;

+ 21 - 1
src/views/home/index.vue

@@ -2,7 +2,7 @@
   <!-- 主页 -->
   <div class="homePage flex-col">
     <div class="homeBox">
-      <s-header :name="sys ? sys.title : $t('public.sysName')" :noback="true" :isFixed="false"></s-header>
+      <s-header :name="sys ? sys.title : sysTitle" :noback="true" :isFixed="false"></s-header>
       <!-- 留言滚动条 -->
       <template v-if="noticeContent.title">
         <van-notice-bar @click="noticeClk" mode="link" :scrollable="true" color="rgba(64,77,116,1)" background="#fff" style="font-size: 0.375rem;"
@@ -227,6 +227,7 @@ export default {
     const router = useRouter();
     const userName = ref(user.name);
     const sys = ref(null);
+    const sysTitle = ref(''); // 页头标题
     const pic1 = ref([
       { url: 'https://fastly.jsdelivr.net/npm/@vant/assets/apple-3.jpeg', isImage: true },
       // Uploader 根据文件后缀来判断是否为图片文件
@@ -460,8 +461,26 @@ export default {
       if (localStorage.getItem('curLang') == 'zh') { // 机器人仅在中文环境下使用
         isShowRobot.value = true;
       }
+
+      getTitleFunc();
     });
 
+    const getTitleFunc = async () => {
+      const currentDomain = window.location.href;
+      // const currentDomain = window.location.hostname;
+      // console.log("currentDomain >>>", currentDomain);
+      switch (true) {
+        // case currentDomain.includes('/shenze/'):
+        //   sysTitle.value = 'AETI GLOBAL';
+        //   break;
+        case currentDomain.includes('/aeti/'):
+          sysTitle.value = 'AETI GLOBAL';
+          break;
+        default:
+          sysTitle.value = t('public.sysName');
+      }
+    }
+
     const confirmAlarm = () => {
       localStorage.setItem('firstLogin', false);
     }
@@ -707,6 +726,7 @@ export default {
       onClickBot,
       offset,
       isShowRobot,
+      sysTitle,
     };
   },
 

+ 40 - 4
src/views/login.vue

@@ -1,9 +1,12 @@
 <template>
   <!-- 登录 -->
   <div class="login">
-    <s-header :name="sys ? sys.title : $t('public.sysName')" :noback="true"></s-header>
+    <!-- <s-header :name="sys ? sys.title : $t('public.sysName')" :noback="true"></s-header> -->
+    <s-header :name="sys ? sys.title : sysTitle" :noback="true"></s-header>
     <div class="loginLogoBox l-re">
-      <div class="loginLogo"></div>
+      <div class="loginLogo">
+        <img :src="logoName" alt="Logo">
+      </div>
       <div class="l-ab pointer languageCon">
         <!-- <div class="c-text-b">
           {{ compLang }}
@@ -71,6 +74,8 @@ import enUS from "vant/es/locale/lang/en-US";
 import zhCN from "vant/es/locale/lang/zh-CN";
 // 引入日文语言包
 import jaJP from 'vant/es/locale/lang/ja-JP';
+import defaultLogo from '../assets/login/logo.png';
+import aetiLogo from '../assets/login/aetiLogo.png';
 
 export default {
   setup() {
@@ -106,6 +111,9 @@ export default {
     const route = useRoute();
     const sys = ref(null);
     const currentLan = ref(''); // 当前语言
+    const logoName = ref(defaultLogo); // Logo图片名称
+    const sysTitle = ref(''); // 页头标题
+
     // 页面初始化
     onMounted(() => {
       // 加载样式
@@ -117,6 +125,7 @@ export default {
         setLocal("curLang", navigatorLanguage());
         languageName.value = getLocal("curLang");
       }
+      console.log("route.query.relation_admin_id >>>", route.query.relation_admin_id);
       if (route.query.relation_admin_id) {
         getSysFun();
       }
@@ -134,7 +143,30 @@ export default {
       } else {
         currentLan.value = "English";
       }
+      getDomainFunc();
     });
+
+    const getDomainFunc = async () => {
+      const currentDomain = window.location.href;
+      // const currentDomain = window.location.hostname;
+      console.log("currentDomain >>>", currentDomain);
+      switch (true) {
+        // case currentDomain.includes('/shenze/'):
+        //   logoName.value = aetiLogo;
+        //   sysTitle.value = 'AETI GLOBAL';
+
+        //   break;
+        case currentDomain.includes('/aeti/'): // aeti是美国孙总portalmcc.com.cn
+          logoName.value = aetiLogo;
+          sysTitle.value = 'AETI GLOBAL';
+
+          break;
+        default:
+          logoName.value = defaultLogo;
+          sysTitle.value = t('public.sysName');
+      }
+    }
+
     const getSysFun = async () => {
       const { data } = await getSys({
         relationAdminId: route.query.relation_admin_id,
@@ -143,6 +175,7 @@ export default {
         data.data.relationAdminId = route.query.relation_admin_id;
         setLocal("loginSys", JSON.stringify(data.data));
         sys.value = data.data;
+        console.log("sys.value >>>", sys.value);
       }
     };
 
@@ -201,7 +234,7 @@ export default {
         localStorage.setItem('firstLogin', true);
 
         // 需要刷新页面,否则 axios.js 文件里的 token 不会被重置
-        window.location.href = '/shenze/';
+        // window.location.href = '/shenze/';
         setTimeout(() => {
           router.push("/home");
         }, 200);
@@ -227,7 +260,7 @@ export default {
       state.isLoading = true;
       try {
         // 用户静默授权,获取 用户信息
-        const {data} = await getOpenid({hostName: 'Sunzee'});
+        const { data } = await getOpenid({ hostName: 'Sunzee' });
         console.log("微信登录:", data)
         if (data.code === "00000") {
           window.location.href = data.data;
@@ -272,6 +305,9 @@ export default {
       onSelect,
       showPopover,
       currentLan,
+      logoName,
+      // getImageUrl
+      sysTitle,
     };
   },
   components: {

+ 1 - 1
src/views/merchantManage/index.vue

@@ -139,7 +139,7 @@ export default {
             showSuccessToast(t('login.loginSucess'));
             localStorage.setItem('firstLogin', true);
             // 需要刷新页面,否则 axios.js 文件里的 token 不会被重置
-            window.location.href = '/shenze/';
+            // window.location.href = '/shenze/';
             setTimeout(() => {
               router.push("/home");
             }, 200);