Home Explore Help
Sign In
molingzhide
/
colexiu-mall-admin
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

1

1
mo 2 years ago
parent
00e092a276 d6f80ff294
commit
42f1378cf6
33 changed files with 35 additions and 18 deletions
Split View Show Diff Stats
  1. 5 1
      dist/index.html
  2. 0 0
      dist/static/css/app.ad631c7cc13ecc2c475c4fb4613cbab8.css
  3. 0 0
      dist/static/css/app.ad631c7cc13ecc2c475c4fb4613cbab8.css.map
  4. 0 0
      dist/static/js/0.d7546e19abcaef20bc4f.js
  5. 0 0
      dist/static/js/0.d7546e19abcaef20bc4f.js.map
  6. 0 0
      dist/static/js/1.5357c6fe486b7dc44806.js
  7. 0 0
      dist/static/js/1.5357c6fe486b7dc44806.js.map
  8. 0 0
      dist/static/js/30.debf4b3b09eeb2809a58.js
  9. 0 0
      dist/static/js/30.debf4b3b09eeb2809a58.js.map
  10. 0 0
      dist/static/js/30.f2be593dd102c36f7958.js
  11. 0 0
      dist/static/js/30.f2be593dd102c36f7958.js.map
  12. 0 0
      dist/static/js/34.dba8142eb0e78d22b164.js
  13. 0 0
      dist/static/js/34.dba8142eb0e78d22b164.js.map
  14. 2 2
      dist/static/js/35.fae5dcf381e6613f131c.js
  15. 0 0
      dist/static/js/35.fae5dcf381e6613f131c.js.map
  16. 0 0
      dist/static/js/36.8de3a1d73d70a151e94f.js
  17. 0 0
      dist/static/js/36.8de3a1d73d70a151e94f.js.map
  18. 0 0
      dist/static/js/36.f5bc4111c6b262fdb771.js
  19. 0 0
      dist/static/js/36.f5bc4111c6b262fdb771.js.map
  20. 0 0
      dist/static/js/app.0e72775244432f7150ec.js
  21. 0 0
      dist/static/js/app.0e72775244432f7150ec.js.map
  22. 0 0
      dist/static/js/app.faa226add4b182c4fa38.js
  23. 0 0
      dist/static/js/app.faa226add4b182c4fa38.js.map
  24. 0 0
      dist/static/js/manifest.21f07fc4c877e7afc7e2.js
  25. 1 0
      dist/static/js/manifest.21f07fc4c877e7afc7e2.js.map
  26. 0 0
      dist/static/js/manifest.d45a20b7fb4eb29cfdcd.js.map
  27. 2 1
      src/api/homeBrand.js
  28. 15 9
      src/components/Tinymce/components/editorImage.vue
  29. 1 1
      src/store/modules/user.js
  30. 1 1
      src/views/home/index.vue
  31. 7 2
      src/views/layout/components/Navbar.vue
  32. BIN
      src/views/layout/components/images/header.png
  33. 1 1
      src/views/ums/admin/index.vue

+ 5 - 1
dist/index.html
View File 

@@ -7,4 +7,8 @@
 
         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
 
         var s = document.getElementsByTagName("script")[0];
 
         s.parentNode.insertBefore(hm, s);
 
-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.4b74bd1b252bd4aef6a7eefcd74aa408.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.d45a20b7fb4eb29cfdcd.js></script><script type=text/javascript src=./static/js/vendor.aa49b92428edfd1450db.js></script><script type=text/javascript src=./static/js/app.0e72775244432f7150ec.js></script></body></html>
 
+<<<<<<< HEAD
 
+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.4b74bd1b252bd4aef6a7eefcd74aa408.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.d45a20b7fb4eb29cfdcd.js></script><script type=text/javascript src=./static/js/vendor.aa49b92428edfd1450db.js></script><script type=text/javascript src=./static/js/app.0e72775244432f7150ec.js></script></body></html>
 
+=======
 
+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.ad631c7cc13ecc2c475c4fb4613cbab8.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.21f07fc4c877e7afc7e2.js></script><script type=text/javascript src=./static/js/vendor.aa49b92428edfd1450db.js></script><script type=text/javascript src=./static/js/app.faa226add4b182c4fa38.js></script></body></html>
 
+>>>>>>> master

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ad631c7cc13ecc2c475c4fb4613cbab8.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ad631c7cc13ecc2c475c4fb4613cbab8.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.d7546e19abcaef20bc4f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.d7546e19abcaef20bc4f.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/1.5357c6fe486b7dc44806.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/1.5357c6fe486b7dc44806.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/30.debf4b3b09eeb2809a58.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/30.debf4b3b09eeb2809a58.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/30.f2be593dd102c36f7958.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/30.f2be593dd102c36f7958.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/34.dba8142eb0e78d22b164.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/34.dba8142eb0e78d22b164.js.map


+ 2 - 2
dist/static/js/34.bbb5bead70912c0168a8.js → dist/static/js/35.fae5dcf381e6613f131c.js
View File 

@@ -1,2 +1,2 @@
 
-webpackJsonp([34],{jHNE:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r={name:"updateProduct",components:{ProductDetail:n("CmKi").a}},o={render:function(){var t=this.$createElement;return(this._self._c||t)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var u=n("VU/8")(r,o,!1,function(t){n("oLCt")},null,null);e.default=u.exports},oLCt:function(t,e){}});
 
-//# sourceMappingURL=34.bbb5bead70912c0168a8.js.map
 
+webpackJsonp([35],{jHNE:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r={name:"updateProduct",components:{ProductDetail:n("CmKi").a}},o={render:function(){var t=this.$createElement;return(this._self._c||t)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var u=n("VU/8")(r,o,!1,function(t){n("oLCt")},null,null);e.default=u.exports},oLCt:function(t,e){}});
 
+//# sourceMappingURL=35.fae5dcf381e6613f131c.js.map

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/35.fae5dcf381e6613f131c.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/36.8de3a1d73d70a151e94f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/36.8de3a1d73d70a151e94f.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/36.f5bc4111c6b262fdb771.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/36.f5bc4111c6b262fdb771.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0e72775244432f7150ec.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0e72775244432f7150ec.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.faa226add4b182c4fa38.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.faa226add4b182c4fa38.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.21f07fc4c877e7afc7e2.js


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/manifest.21f07fc4c877e7afc7e2.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.d45a20b7fb4eb29cfdcd.js.map


+ 2 - 1
src/api/homeBrand.js
View File 

@@ -11,7 +11,8 @@ export function updateRecommendStatus(data) {
 
   return request({
 
     url:'/home/brand/update/recommendStatus',
 
     method:'post',
 
-    data:data
 
+    data:data,
 
+    requestType:'form'
 
   })
 
 }

+ 15 - 9
src/components/Tinymce/components/editorImage.vue
View File 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="upload-container">
 
     <el-button
 
-    :disabled="disabled"
 
+      :disabled="disabled"
 
       icon="el-icon-upload"
 
       size="mini"
 
       :style="{ background: color, borderColor: color }"
 
@@ -11,7 +11,7 @@
 
     </el-button>
 
     <el-dialog append-to-body :visible.sync="dialogVisible">
 
       <el-upload
 
-      :disabled="disabled"
 
+        :disabled="disabled"
 
         class="editor-slide-upload"
 
         :action="ossUploadUrl"
 
         :data="dataObj"
 
@@ -41,10 +41,14 @@ export default {
 
       type: String,
 
       default: "#1890ff",
 
     },
 
-        disabled: {
 
+    disabled: {
 
       type: Boolean,
 
       default: false,
 
     },
 
+    bucket_name: {
 
+      type: String,
 
+      default: "mall",
 
+    },
 
   },
 
   data() {
 
     return {
 
@@ -60,7 +64,7 @@ export default {
 
         acl: "public-read",
 
         name: "",
 
       },
 
-      ossUploadUrl:'https://ks3-cn-beijing.ksyuncs.com/daya'
 
+      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
 
     };
 
   },
 
   methods: {
 
@@ -87,11 +91,11 @@ export default {
 
       const uid = file.uid;
 
 
       const objKeyArr = Object.keys(this.listObj);
 
-       console.log(objKeyArr,'objKeyArr',this.listObj)
 
+      console.log(objKeyArr, "objKeyArr", this.listObj);
 
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
 
         if (this.listObj[objKeyArr[i]].uid === uid) {
 
           this.listObj[objKeyArr[i]].url =
 
-            this.ossUploadUrl+'/'+  this.listObj[objKeyArr[i]].key;
 
+            this.ossUploadUrl + "/" + this.listObj[objKeyArr[i]].key;
 
           this.listObj[objKeyArr[i]].hasSuccess = true;
 
           return;
 
         }
 
@@ -108,7 +112,7 @@ export default {
 
       }
 
     },
 
     beforeUpload(file) {
 
-      console.log(file,'试试批量上传')
 
+      console.log(file, "试试批量上传");
 
       const _self = this;
 
       const fileName = file.uid;
 
       this.listObj[fileName] = {};
 
@@ -116,7 +120,9 @@ export default {
 
         let key = new Date().getTime() + file.name;
 
         let obj = {
 
           filename: file.name,
 
+             bucketName: this.bucket_name,
 
           postData: {
 
+
 
             filename: file.name,
 
             acl: "public-read",
 
             key: key,
 
@@ -136,8 +142,8 @@ export default {
 
               uid: file.uid,
 
               width: this.width,
 
               height: this.height,
 
-              name:file.name,
 
-              key:key
 
+              name: file.name,
 
+              key: key,
 
             };
 
 
             resolve(true);

+ 1 - 1
src/store/modules/user.js
View File 

@@ -56,7 +56,7 @@ const user = {
 
             reject('getInfo: roles must be a non-null array !')
 
           }
 
           commit('SET_NAME', data.username)
 
-          commit('SET_AVATAR', data.icon)
 
+          commit('SET_AVATAR', data.icon )
 
           resolve(response)
 
         }).catch(error => {
 
           reject(error)

+ 1 - 1
src/views/home/index.vue
View File 

@@ -121,7 +121,7 @@
 
         </el-row>
 
         <el-row :gutter="20">
 
           <el-col :span="8">
 
-            <div class="un-handle-item" @click="gotoOrder(1)">
 
+            <div class="un-handle-item" @click="gotoOrder(2)">
 
               <span class="font-medium">已发货订单</span>
 
               <span style="float: right" class="color-danger"
 
                 >({{ staticeDate.outOrder }})</span

+ 7 - 2
src/views/layout/components/Navbar.vue
View File 

@@ -4,7 +4,7 @@
 
     <breadcrumb></breadcrumb>
 
     <el-dropdown class="avatar-container" trigger="click">
 
       <div class="avatar-wrapper">
 
-        <img class="user-avatar" :src="avatar">
 
+        <img class="user-avatar" :src="avatar?avatar:headerInfo">
 
         <p class="user-name">{{name}}</p>
 
         <i class="el-icon-caret-bottom"></i>
 
       </div>
 
@@ -26,12 +26,17 @@
 
 import { mapGetters } from 'vuex'
 
 import Breadcrumb from '@/components/Breadcrumb'
 
 import Hamburger from '@/components/Hamburger'
 
-
 
+import headerInfo from './images/header.png'
 
 export default {
 
   components: {
 
     Breadcrumb,
 
     Hamburger
 
   },
 
+  data(){
 
+    return {
 
+      headerInfo
 
+    }
 
+  },
 
   computed: {
 
     ...mapGetters([
 
       'sidebar',

BIN
src/views/layout/components/images/header.png
View File


+ 1 - 1
src/views/ums/admin/index.vue
View File 

@@ -29,7 +29,7 @@
 
     <el-card class="operate-container" shadow="never">
 
       <i class="el-icon-tickets"></i>
 
       <span>数据列表</span>
 
-      <el-button size="mini" class="btn-add" @click="handleAdd()" style="margin-left: 20px">添加</el-button>
 
+      <!-- <el-button size="mini" class="btn-add" @click="handleAdd()" style="margin-left: 20px">添加</el-button> -->
 
     </el-card>
 
     <div class="table-container">
 
       <el-table ref="adminTable"

Some files were not shown because too many files changed in this diff