root пре 3 година
родитељ
комит
d5a0f2cf08

+ 3 - 1
.env.development

@@ -2,6 +2,8 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://172.24.31.87:9968'
+VUE_APP_BASE_CDN = 'http://16.163.228.151:8036'
+VUE_APP_BASE_API = 'http://172.19.28.55:9968'
 VUE_APP_ACCESS_TOKEN_PREFIX = 'Bearer '
 
+

+ 1 - 0
src/utils/request.js

@@ -7,6 +7,7 @@ import { accessToken } from '@/utils/localUserInfo'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000 // request timeout
 })

+ 9 - 0
src/utils/tool.js

@@ -220,6 +220,15 @@ let tool = {
   getLocaleLink(imageUrl, path = '') {
       return imageUrl.indexOf('http') > -1 ? imageUrl : `${CDN_BASE_URL}${path}${imageUrl}`;
   },
+  /**
+   * 拼装图片
+   * @param imageUrl 图片
+   * @param path 路径
+   * @returns {string}
+   */
+   getArImage(imageUrl, path) {
+    return `${process.env.VUE_APP_BASE_CDN}${path}${imageUrl}`;
+  }
 }
 
 export default tool

+ 12 - 11
src/views/dashboard/admin/components/PanelGroup.vue

@@ -2,9 +2,9 @@
   <el-row :gutter="40" class="panel-group">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel">
-        <div class="card-panel-icon-wrapper icon-people">
+        <!-- <div class="card-panel-icon-wrapper icon-people">
           <svg-icon icon-class="star" class-name="card-panel-icon" />
-        </div>
+        </div> -->
         <div class="card-panel-description">
           <div class="card-panel-text">
             {{ $t('dashboard.highestDirector') }}
@@ -17,9 +17,9 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel">
-        <div class="card-panel-icon-wrapper icon-message">
+        <!-- <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="people" class-name="card-panel-icon" />
-        </div>
+        </div> -->
         <div class="card-panel-description">
           <div class="card-panel-text">
             {{ $t('dashboard.memberLevel') }}
@@ -32,9 +32,9 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel">
-        <div class="card-panel-icon-wrapper icon-money">
+        <!-- <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="money" class-name="card-panel-icon" />
-        </div>
+        </div> -->
         <div class="card-panel-description">
           <div class="card-panel-text">
             {{ $t('dashboard.payCycle') }}
@@ -47,9 +47,9 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel">
-        <div class="card-panel-icon-wrapper icon-remain-bv">
+        <!-- <div class="card-panel-icon-wrapper icon-remain-bv">
           <svg-icon icon-class="shopping" class-name="card-panel-icon" />
-        </div>
+        </div> -->
         <div class="card-panel-description">
           <div class="card-panel-text">
             {{ $t('dashboard.remainBv') }}
@@ -62,12 +62,12 @@
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel">
-        <div class="card-panel-icon-wrapper icon-shopping">
+        <!-- <div class="card-panel-icon-wrapper icon-shopping">
           <div class="card-panel-icon">
           <i class="el-icon-alarm-clock"  class-name="card-panel-icon" />
-        </div>
+        </div> -->
           <!-- <svg-icon icon-class="el-icon-alarm-clock" class-name="card-panel-icon" /> -->
-        </div>
+        <!-- </div> -->
         <div class="card-panel-description">
           <div class="card-panel-text">
             {{ $t('dashboard.activeDeadline') }}
@@ -191,6 +191,7 @@ export default {
       font-weight: bold;
       margin: 26px;
       margin-left: 0px;
+      text-align: center;
 
       .card-panel-text {
         line-height: 18px;

+ 22 - 9
src/views/dashboard/admin/index.vue

@@ -2,17 +2,16 @@
   <div class="dashboard-editor-container">
     <!-- <github-corner class="github-corner" /> -->
     <el-row  class="system-carousel">
-      <el-carousel indicator-position="none" :height="bannerHeight+'px'">
+      <el-carousel indicator-position="none" :height="bannerHeight+'px'" style="max-height:350px;">
         <el-carousel-item v-for="(item,key) in slides" :key="key">
           <template v-if="item.TYPE==='1'">
             <router-link :to="`/shop/index`" target="_self">
-            <img ref="bannerHeight"  @load="imgLoad" style="width:100%"  src="http://ndsupload.ekhkad.com/files/2022/0526/573c9560dca111eca0a40ae051ba5350.jpg" alt="" >
+            <img ref="bannerHeight"  @load="imgLoad"  :src="imageArticle(item.IMAGE)" alt="" >
           </router-link>
           </template>
           <template v-else>
             <router-link :to="`/article/detail/${item.CONTENT}`" target="_blank">
-              <!-- http://ndsupload.ekhkad.com/files/2022/0526/573c9560dca111eca0a40ae051ba5350.jpg -->
-            <img ref="bannerHeight" @load="imgLoad"  style="width:100%" src="http://ndsupload.ekhkad.com/files/2022/0526/573c9560dca111eca0a40ae051ba5350.jpg" alt="" >
+            <img ref="bannerHeight"  @load="imgLoad"  :src="imageArticle(item.IMAGE)" alt="" >
           </router-link>
           </template>
         </el-carousel-item>
@@ -31,7 +30,7 @@
           <template v-if="item.LISTS.length>0">
             <div v-for="(o,k) in item.LISTS" :key="k" class="text item" >
               <router-link :to="`/article/detail/${o.ID}`" :title="o.TITLE">{{o.TITLE}}</router-link>
-              <span>{{o.CREATED_AT}}</span>
+              <span>{{ formatDate(o.CREATED_AT) }}</span>
             </div>
           </template>
           <div v-if="item.LISTS.length==0">No content</div><!--暂无内容-->
@@ -62,6 +61,7 @@ import BarChart from './components/BarChart'
 import TransactionTable from './components/TransactionTable'
 import TodoList from './components/TodoList'
 import BoxCard from './components/BoxCard'
+import tool from '@/utils/tool'
 
 const lineChartData = {
   newVisitis: {
@@ -114,9 +114,6 @@ export default {
       endTime: '',
       num: 0
     }
-  },
-  created(){
-    
   },
   methods: {
     handleSetLineChartData(type) {
@@ -126,9 +123,17 @@ export default {
       let _this = this
       if (_this.$refs.bannerHeight) {
         _this.$nextTick(function () {
-          _this.bannerHeight = _this.$refs.bannerHeight[0] && _this.$refs.bannerHeight[0].height ? _this.$refs.bannerHeight[0].height : _this.bannerHeight
+          _this.bannerHeight = _this.$refs.bannerHeight[0] && _this.$refs.bannerHeight[0].height ? 
+          _this.$refs.bannerHeight[0].height 
+          : _this.bannerHeight
         })
       }
+    },
+    imageArticle (imageUrl) {
+      return tool.getArImage(imageUrl, '/files/')
+    },
+    formatDate(data) {
+      return tool.formatDate(data,false)
     }
   },
   mounted() {
@@ -160,6 +165,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+img {
+  max-height:350px;
+  max-width:400px;
+  margin: 0 auto;
+}
+::v-deep .el-carousel__container {
+  text-align: center !important;
+}
 .dashboard-editor-container {
   padding: 32px;
   background-color: rgb(240, 242, 245);

+ 1 - 1
vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://192.168.162.127:8868",
+        target:"http://172.18.219.250:9968",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""