Просмотр исходного кода

Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

Liugl 3 лет назад
Родитель
Сommit
757c5a4b2e

+ 3 - 2
.env.development

@@ -1,10 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 云管铺
+
+VUE_APP_TITLE = 票赢天下
 
 # 开发环境配置
 ENV = 'development'
 
-# 云管铺/开发环境
+# 票赢天下/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

+ 3 - 2
.env.production

@@ -1,8 +1,9 @@
 # 页面标题
-VUE_APP_TITLE = 云管铺
+
+VUE_APP_TITLE = 票赢天下
 
 # 生产环境配置
 ENV = 'production'
 
-# 云管铺/生产环境
+# 票赢天下/生产环境
 VUE_APP_BASE_API = '/prod-api'

+ 3 - 2
.env.staging

@@ -1,10 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 云管铺
+
+VUE_APP_TITLE = 票赢天下
 
 NODE_ENV = staging
 
 # 测试环境配置
 ENV = 'staging'
 
-# 云管铺/测试环境
+# 票赢天下/测试环境
 VUE_APP_BASE_API = '/test-api'

+ 1 - 1
package.json

@@ -2,7 +2,7 @@
   "name": "mp",
   "version": "1.0.0",
   "description": "m",
-  "author": "云管铺",
+  "author": "票赢天下",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

+ 1 - 1
src/api/common.js

@@ -12,7 +12,7 @@ export const publicFileSaveUrl = '/api/v1/mp/image/remote/upload/0'
 export const privateFileGetUrl = '/api/v1/mp/file/remote/download?name='
 
 // 云端公开可访问的BaseUrl
-export const publicFileGetUrl = process.env.NODE_ENV === "production" ? 'https://mp-public-1307117429.cos.ap-shanghai.myqcloud.com/':'https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/'
+export const publicFileGetUrl = process.env.NODE_ENV === "production" ? 'https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/':'https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/'
 
 /**
  * Put 方式上传图片

BIN
src/assets/images/login-left.png


+ 0 - 1
src/layout/components/Navbar.vue

@@ -35,7 +35,6 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-      <p class="type">标准版</p>
     </div>
   </div>
 </template>

+ 4 - 4
src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
       </router-link>
     </transition>
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '云管铺',
+      title: '票赢天下',
       logo: logoImg
     }
   }

+ 1 - 1
src/views/login.vue

@@ -3,7 +3,7 @@
     <el-row type="flex">
       <el-col :span="12">
         <div class="login-form-left"> 
-          <span class="copyright">Copyright © 2021 quanshu123.com All Rights Reserved.</span>
+          <!-- <span class="copyright">Copyright © 2021 quanshu123.com All Rights Reserved.</span> -->
         </div>
       </el-col>
       <el-col :span="12">

+ 1 - 1
src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">云管铺</h3>
+      <h3 class="title">票赢天下</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

+ 1 - 1
vue.config.js

@@ -5,7 +5,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = process.env.VUE_APP_TITLE || '云管铺' // 网页标题
+const name = process.env.VUE_APP_TITLE || '盲票管理' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口