Merge branch 'dev' of http://172.16.90.250:3000/forest/forest-web into dev

src/api/homeAdvertise.js

@@ -1,42 +1,42 @@
 import request from '@/utils/request'
 export function fetchList(params) {
   return request({
-    url:'/home/advertise/list',
+    url:'/home/extension/list',
     method:'get',
     params:params
   })
 }
 export function updateStatus(id,params) {
   return request({
-    url:'/home/advertise/update/status/'+id,
+    url:'/home/extension/update/status/'+id,
     method:'post',
     params:params
   })
 }
 export function deleteHomeAdvertise(data) {
   return request({
-    url:'/home/advertise/delete',
+    url:'/home/extension/delete',
     method:'post',
     data:data
   })
 }
 export function createHomeAdvertise(data) {
   return request({
-    url:'/home/advertise/create',
+    url:'/home/extension/create',
     method:'post',
     data:data
   })
 }
 export function getHomeAdvertise(id) {
   return request({
-    url:'/home/advertise/'+id,
+    url:'/home/extension/'+id,
     method:'get',
   })
 }
 
 export function updateHomeAdvertise(id,data) {
   return request({
-    url:'/home/advertise/update/'+id,
+    url:'/home/extension/update/'+id,
     method:'post',
     data:data
   })

src/api/permissions.js

@@ -68,6 +68,6 @@ export const companydelete = permissions.indexOf("/umsCompany/info/delete")>=0;
 export const companyupdate = permissions.indexOf("/umsCompany/info/update")>=0;
 
 // 广告
-export const adcreate = permissions.indexOf("/home/advertise/create")>=0;
-export const adupdate = permissions.indexOf("/home/advertise/update/*")>=0;
-export const addelete = permissions.indexOf("/home/advertise/delete")>=0;
+export const adcreate = permissions.indexOf("/home/extension/create")>=0;
+export const adupdate = permissions.indexOf("/home/extension/update/*")>=0;
+export const addelete = permissions.indexOf("/home/extension/delete")>=0;

src/styles/index.scss

@@ -88,6 +88,7 @@ a:hover {
   display: inline-block;
   float: right;
   margin-top: 20px;
+  margin-bottom: 20px;
 }
 
 //添加、更新表单样式

src/views/layout/components/Navbar.vue

@@ -4,7 +4,7 @@
     <breadcrumb></breadcrumb>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <span class="user-avatar">{{username}}</span>
+        <span class="user-username">{{username}}</span>
         <img class="user-avatar" :src="avatar||profilephoto">
         <i class="el-icon-caret-bottom"></i>
       </div>
@@ -49,7 +49,6 @@ export default {
   },
   created(){
     this.username = Cookies.get('username');
-    console.log('1111',this.username);
   },
   methods: {
     toggleSideBar() {
@@ -96,7 +95,7 @@ export default {
         border-radius: 10px;
         vertical-align: middle;
       }
-      .user-avatar{margin-right: 5px;}
+      .user-username{margin-right: 5px;font-weight: bold;}
       .el-icon-caret-bottom {
         position: absolute;
         right: -20px;

src/views/pms/brand/components/BrandDetail.vue

@@ -108,7 +108,9 @@
                     type: 'success',
                     duration:1000
                   });
-                  this.$router.back();
+                  setTimeout(() =>{
+                    this.$router.back();
+                  },1000);
                 });
               } else {
                 createBrand(this.brand).then(response => {
@@ -119,6 +121,9 @@
                     type: 'success',
                     duration:1000
                   });
+                  setTimeout(() =>{
+                    this.$router.back();
+                  },1000);
                 });
               }
             });

src/views/pms/origin/components/originDetail.vue

@@ -184,7 +184,7 @@
           }
           let albumPics = this.origin.imgUrl.split(',');
           for(let i=0;i<albumPics.length;i++){
-            pics.push(albumPics[i]);
+            pics.push(albumPics[i]+'?imageMogr2/quality/60');
           }
           return pics;
         },

src/views/pms/origin/index.vue

@@ -139,7 +139,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         layout="total, sizes,prev, pager, next,jumper"
-        :current-page.sync="listQuery.pageNum"
+        :current-page.sync="listQuery.pageNo"
         :page-size="listQuery.pageSize"
         :page-sizes="[5,10,15]"
         :total="total">
@@ -153,7 +153,7 @@
   import {originsave,originupdate,origindelete} from '@/api/permissions'
 
   const defaultListQuery = {
-    pageNum: 1,
+    pageNo: 1,
     pageSize: 5,
     keyword: null
   };
@@ -190,16 +190,16 @@
         this.listQuery = Object.assign({}, defaultListQuery);
       },
       handleSearchList() {
-        this.listQuery.pageNum = 1;
+        this.listQuery.pageNo = 1;
         this.getList();
       },
       handleSizeChange(val) {
-        this.listQuery.pageNum = 1;
+        this.listQuery.pageNo = 1;
         this.listQuery.pageSize = val;
         this.getList();
       },
       handleCurrentChange(val) {
-        this.listQuery.pageNum = val;
+        this.listQuery.pageNo = val;
         this.getList();
       },
       handleAddorigin() {

src/views/pms/product/components/ProductAttrDetail.vue

@@ -213,7 +213,7 @@
           }
           let albumPics = this.value.albumPics.split(',');
           for(let i=0;i<albumPics.length;i++){
-            pics.push(albumPics[i]);
+            pics.push(albumPics[i]+'?imageMogr2/quality/60');
           }
           return pics;
         },

src/views/pms/product/index.vue

@@ -654,8 +654,10 @@
             type: 'success',
             duration: 1000
           });
+          this.getList();
         });
-        this.getList();
+        
+        // location.reload();
       },
       handleVerify(index,row){
         this.$confirm('是否审核通过此产品?', '提示', {

src/views/pms/productCate/components/ProductCateDetail.vue

@@ -184,7 +184,9 @@
                     type: 'success',
                     duration: 1000
                   });
-                  this.$router.back();
+                  setTimeout(() =>{
+                    this.$router.back();
+                  },1000);
                 });
               } else {
                 this.productCate.productAttributeIdList = this.getProductAttributeIdList();
@@ -196,6 +198,9 @@
                     type: 'success',
                     duration: 1000
                   });
+                  setTimeout(() =>{
+                    this.$router.back();
+                  },1000);
                 });
               }
             });

src/views/sms/advertise/components/HomeAdvertiseDetail.vue

@@ -144,7 +144,10 @@
                     type: 'success',
                     duration:1000
                   });
-                  this.$router.back();
+                  // this.$router.back();
+                  setTimeout(() =>{
+                    this.$router.push({ path:'/sms/advertise'  })
+                  },1000);
                 });
               } else {
                 createHomeAdvertise(this.homeAdvertise).then(response => {
@@ -156,6 +159,9 @@
                     duration:1000
                   });
                 });
+                setTimeout(() =>{
+                    this.$router.push({ path:'/sms/advertise'  })
+                  },1000);
               }
             });