Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
wangchao
/
businessCard
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

achao 2 lat temu
rodzic
91bf7a57f7 0fddad5700
commit
a84e59c7e3
6 zmienionych plików z 10 dodań i 10 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2 2
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java
  2. 2 2
      unimall-admin/config/prod.env.js
  3. 1 1
      unimall-admin/index.html
  4. 2 2
      unimall-admin/src/views/layout/components/Navbar.vue
  5. 1 1
      unimall-admin/src/views/login/index.vue
  6. 2 2
      xiaochengxu/config/index.js

+ 2 - 2
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java
Wyświetl plik 

@@ -54,8 +54,8 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 
         //更新数据库默认值
 
         cardManagementInfo = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
 
         //二维码
 
-        String str = qrCodeUtil.getQRCodeImage(String.valueOf(cardManagementInfo.getId()), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
-        String str1 = qrCodeUtil.getQRCodeImage(cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
+        String str = qrCodeUtil.getQRCodeImage("http://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
+        String str1 = qrCodeUtil.getQRCodeImage("http://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
 
         cardManagementInfo.setQrCode(str);
 
         cardManagementInfo.setQrCodeMyself(str1);
 
         return cardManagementInfoMapper.updateById(cardManagementInfo) > 0;

+ 2 - 2
unimall-admin/config/prod.env.js
Wyświetl plik 

@@ -1,6 +1,6 @@
 
 module.exports = {
 
 	NODE_ENV: '"production"',
 
   	ENV_CONFIG: '"prod"',
 
-    HOST: '"http://106.14.75.12:8181"',
 
-    BASE_API: '"http://106.14.75.12:8181/m.api"'
 
+    HOST: '"https://cardapi.eliangeyun.com"',
 
+    BASE_API: '"https://cardapi.eliangeyun.com/m.api"'
 
 }

+ 1 - 1
unimall-admin/index.html
Wyświetl plik 

@@ -5,7 +5,7 @@
 
     <meta charset="utf-8">
 
     <meta name="renderer" content="webkit">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-    <title>电商后台管理</title>
 
+    <title>名片后台管理</title>
 
 </head>
 
 
 <body>

+ 2 - 2
unimall-admin/src/views/layout/components/Navbar.vue
Wyświetl plik 

@@ -79,8 +79,8 @@ export default {
 
     },
 
     logout() {
 
       this.$store.dispatch('LogOut').then(() => {
 
-        window.location.href = 'http://106.14.75.12:9999/'
 
-        // location.reload() // In order to re-instantiate the vue-router object to avoid bugs
 
+        // window.location.href = 'http://106.14.75.12:9999/'
 
+        location.reload() // In order to re-instantiate the vue-router object to avoid bugs
 
       })
 
     }
 
   }

+ 1 - 1
unimall-admin/src/views/login/index.vue
Wyświetl plik 

@@ -11,7 +11,7 @@
 
           class="img"
 
           src="@/assets/avatar.png"
 
           alt="">
 
-        <p class="title">电商后台登录</p>
 
+        <p class="title">名片后台登录</p>
 
       </div>
 
       <div class="login-border">
 
         <div class="login-main">

+ 2 - 2
xiaochengxu/config/index.js
Wyświetl plik 

@@ -1,8 +1,8 @@
 
 const dev = {
 
 	// baseUrlNew: 'http://192.168.110.72:8182',
 
-	baseUrlNew: 'http://192.168.110.138:8182',
 
+	// baseUrlNew: 'http://192.168.110.138:8182',
 
 	// baseUrlNew: 'http://192.168.110.82:8182',
 
-	// baseUrlNew: 'https://shiyaopinche.cspc.cn:10443',
 
+	baseUrlNew: 'https://cardapi.eliangeyun.com',
 
 	h5Appid: 'wxb66b599f7f61b46f',
 
 	debug: false
 
 }