更新代码

admin/src/components/Breadcrumb/index.vue

@@ -37,7 +37,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+        matched = [{ path: '/dashboard', meta: { title: '主页' }}].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)

admin/src/components/Category/list.vue

@@ -18,8 +18,8 @@
           <div slot="header" class="clearfix">
             <div class="container">
               <el-form inline size="small">
-                <el-form-item>
-                  <el-select v-model="listPram.status" placeholder="状态" class="selWidth">
+                <el-form-item label="状态：">
+                  <el-select v-model="listPram.status" placeholder="状态" class="selWidth" @change="handlerGetList">
                     <el-option label="全部" :value="-1"></el-option>
                     <el-option label="显示" :value="1"></el-option>
                     <el-option label="不显示" :value="0"></el-option>
@@ -31,11 +31,10 @@
                     <!--/>-->
                   </el-select>
                 </el-form-item>
-                <el-form-item>
-                  <el-input v-model="listPram.name" placeholder="名称" clearable class="selWidth"/>
-                </el-form-item>
-                <el-form-item>
-                  <el-button size="mini" @click="handlerGetList">查询</el-button>
+                <el-form-item label="名称：">
+                  <el-input v-model="listPram.name" placeholder="请输入名称" class="selWidth" size="small" clearable>
+                    <el-button slot="append" icon="el-icon-search" @click="handlerGetList" size="small"/>
+                  </el-input>
                 </el-form-item>
               </el-form>
             </div>
@@ -222,6 +221,8 @@ export default {
       categoryApi.categroyUpdateStatus( row.id ).then(() => {
         this.$message.success('修改成功')
         this.handlerGetTreeList()
+      }).catch(()=>{
+        row.status = !row.status
       })
     },
     handleEditMenu(rowData) {

admin/src/components/HeaderSearch/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div :class="{'show':show}" class="header-search">
-    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
+    <i class="iconfont iconios-search" style="font-size: 20px;" @click.stop="click"></i>
+    <!--<svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />-->
     <el-select
       ref="headerSearchSelect"
       v-model="search"
@@ -8,7 +9,7 @@
       filterable
       default-first-option
       remote
-      placeholder="Search"
+      placeholder="搜索菜单"
       class="header-search-select"
       @change="change"
     >
@@ -145,7 +146,8 @@ export default {
 <style lang="scss" scoped>
 .header-search {
   font-size: 0 !important;
-
+  display: inline-flex !important;
+  cursor: pointer;
   .search-icon {
     cursor: pointer;
     font-size: 18px;
@@ -160,15 +162,15 @@ export default {
     background: transparent;
     border-radius: 0;
     display: inline-block;
-    vertical-align: middle;
-
+    /*vertical-align: middle;*/
+    line-height: 50px;
     /deep/ .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;
       padding-right: 0;
       box-shadow: none !important;
-      border-bottom: 1px solid #d9d9d9;
+      /*border-bottom: 1px solid #d9d9d9;*/
       vertical-align: middle;
     }
   }

admin/src/components/Screenfull/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click" />
+    <i class="iconfont iconios-qr-scanner" style="font-size: 20px;" @click="click"></i>
+    <!--<svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click" />-->
   </div>
 </template>
 

admin/src/components/couponList/couponFrom/index.js

@@ -14,6 +14,7 @@ couponFrom.install = function(Vue, options) {
   instance.$mount(document.createElement('div'))
   document.body.appendChild(instance.$el)
   Vue.prototype.$modalCoupon = function(handle, keyNum, coupons=[], callback, userIds='') {
+    console.log( userIds)
     instance.visible = true
     instance.handle = handle
     instance.keyNum = keyNum

admin/src/components/couponList/index.vue

@@ -64,7 +64,7 @@
         min-width="90"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.isLimited===0 ? '不限量' : scope.row.lastTotal }}</span>
+          <span>{{ !scope.row.isLimited ? '不限量' : scope.row.lastTotal }}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="handle==='send'" label="操作" min-width="120" fixed="right" align="center">
@@ -145,7 +145,9 @@ export default {
   mounted() {
     this.tableFrom.page = 1
     this.getList()
-    this.multipleSelectionAll = this.couponData || []
+    this.couponData.forEach(row => {
+      this.$refs.table.toggleRowSelection(row);
+    });
   },
   methods: {
     close() {
@@ -222,7 +224,7 @@ export default {
     ok() {
       if (this.multipleSelection.length > 0) {
         this.$emit('getCouponId', this.multipleSelectionAll)
-        // this.close()
+         this.close()
       } else {
         this.$message.warning('请先选择优惠劵')
       }

admin/src/components/uploadPicture/index.vue

@@ -14,7 +14,7 @@
           </div>
           <div class="trees-coadd">
             <div class="scollhide">
-              <div class="trees">
+              <div class="trees" :style="{maxHeight:(!pictureType?'345px':'700px')}">
                 <el-tree
                   ref="tree"
                   :data="treeData2"
@@ -37,39 +37,10 @@
                         </span>
                         <el-dropdown-menu slot="dropdown">
                           <el-dropdown-item @click.native="onAdd(data.id)">添加分类</el-dropdown-item>
-                          <el-dropdown-item @click.native="onEdit(data.id)">编辑分类</el-dropdown-item>
-                          <el-dropdown-item @click.native="handleDelete(data.id)">删除分类</el-dropdown-item>
+                          <el-dropdown-item v-if="node.label !== '全部分类'" @click.native="onEdit(data.id)">编辑分类</el-dropdown-item>
+                          <el-dropdown-item v-if="node.label !== '全部分类'" @click.native="handleDelete(data.id)">删除分类</el-dropdown-item>
                         </el-dropdown-menu>
                       </el-dropdown>
-
-                      <!--<svg-icon-->
-                        <!--icon-class="example"-->
-                        <!--title="添加分类"-->
-                        <!--class="icon-space"-->
-                        <!--@click.stop="onAdd(data.id)"-->
-                      <!--/>-->
-                      <!--<svg-icon-->
-                        <!--icon-class="danyuan"-->
-                        <!--title="添加管理单元"-->
-                        <!--class="icon-space"-->
-                      <!--/>-->
-                      <!--<i-->
-                        <!--v-if="data.id!== 10000"-->
-                        <!--class="el-icon-edit"-->
-                        <!--title="修改"-->
-                        <!--@click.stop="onEdit(data.id)"-->
-                      <!--/>-->
-                      <!--<svg-icon-->
-                        <!--icon-class="detail"-->
-                        <!--title="查看该空间详情"-->
-                        <!--class="icon-space"-->
-                      <!--/>-->
-                      <!--<i-->
-                        <!--v-if="data.id!== 10000"-->
-                        <!--class="el-icon-delete"-->
-                        <!--title="删除分类"-->
-                        <!--@click.stop="() => handleDelete(data.id)"-->
-                      <!--/>-->
                     </span>
                   </div>
                 </el-tree>
@@ -81,25 +52,7 @@
       <el-col v-bind="grid2" class="colLeft">
         <div class="conter mb15">
           <div class="bnt">
-            <!--<el-tooltip class="item" effect="dark" content="使用选中图片" placement="top-start">-->
-              <!--<i class="el-icon-thumb mr20" style="font-size: 25px;" @click="checkPics"></i>-->
-            <!--</el-tooltip>-->
-            <!--<el-upload-->
-              <!--class="upload-demo mb15"-->
-              <!--action-->
-              <!--:http-request="handleUploadForm"-->
-              <!--:on-change="imgSaveToUrl"-->
-              <!--:headers="myHeaders"-->
-              <!--:show-file-list="false"-->
-              <!--multiple-->
-            <!--&gt;-->
-              <!--<el-tooltip class="item" effect="dark" content="上传图片" placement="top-start">-->
-                <!--<i class="el-icon-upload2 mr20" style="font-size: 25px;"></i>-->
-              <!--</el-tooltip>-->
-
-              <!--&lt;!&ndash;<el-button size="mini" type="primary">点击上传</el-button>&ndash;&gt;-->
-            <!--</el-upload>-->
-            <el-button size="small" type="primary" class="mr20 mb20" @click="checkPics">使用选中图片</el-button>
+            <el-button v-if="!pictureType" size="small" type="primary" class="mr20 mb20" @click="checkPics">使用选中图片</el-button>
             <div class="mr20 mb20">
               <el-button-group>
                 <el-tooltip class="item" effect="dark" content="上传图片" placement="top-start">
@@ -112,26 +65,17 @@
                     :show-file-list="false"
                     multiple
                   >
-                    <el-button type="primary" icon="el-icon-upload2" size="mini" style="font-size: 15px;"></el-button>
+                    <el-button icon="el-icon-upload2" size="mini" style="font-size: 15px;"></el-button>
                   </el-upload>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="添加分类" placement="top-start">
-                  <el-button type="primary" icon="el-icon-circle-plus-outline" style="font-size: 15px;" size="mini" @click="onAdd"></el-button>
+                  <el-button icon="el-icon-circle-plus-outline" style="font-size: 15px;" size="mini" @click="onAdd(10000)"></el-button>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="删除图片" placement="top-start">
-                  <el-button type="primary" icon="el-icon-delete" style="font-size: 15px;" size="mini" @click.stop="editPicList('图片')"></el-button>
+                  <el-button icon="el-icon-delete" style="font-size: 15px;" size="mini" @click.stop="editPicList('图片')"></el-button>
                 </el-tooltip>
               </el-button-group>
             </div>
-
-            <!--<el-tooltip class="item" effect="dark" content="添加分类" placement="top-start">-->
-              <!--<i class="el-icon-circle-plus-outline mr20" style="font-size: 25px;" @click="onAdd"></i>-->
-            <!--</el-tooltip>-->
-            <!--<el-button type="success" size="mini" @click.stop="onAdd">添加分类</el-button>-->
-            <!--<el-tooltip class="item" effect="dark" content="删除图片" placement="top-start">-->
-              <!--<i class="el-icon-delete mr20" style="font-size: 25px;" @click.stop="editPicList('图片')"></i>-->
-            <!--</el-tooltip>-->
-            <!--<el-button type="error" size="mini" class="mr10" :disabled="checkPicList.length===0" @click.stop="editPicList('图片')">删除图片</el-button>-->
             <el-select v-model="sleOptions.attachment_category_name" placeholder="图片移动至" class="mb20" size="small">
               <el-option
                 class="demo"
@@ -155,7 +99,7 @@
               <i class="el-icon-picture" style="font-size: 60px;color: rgb(219, 219, 219);" />
               <span class="imagesNo_sp">图片库为空</span>
             </div>
-            <div class="conters scrollbarAll">
+            <div class="conters scrollbarAll" :style="{maxHeight:(!pictureType?'296px':'700px')}">
               <div
                 v-for="(item, index) in pictrueList.list"
                 :key="index"
@@ -170,7 +114,7 @@
         </div>
         <div class="block">
           <el-pagination
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="!pictureType?[10, 20, 30, 40]:[30,60,90,120]"
             :page-size="tableData.limit"
             :current-page="tableData.page"
             :pager-count="5"
@@ -221,6 +165,10 @@ import { getToken } from '@/utils/auth'
 export default {
   name: 'Upload',
   props: {
+    pictureType: {
+      type: String,
+      default: ''
+    },
     isMore: {
       type: String,
       default: '1'
@@ -319,6 +267,7 @@ export default {
     }
   },
   mounted() {
+    this.pictureType ? this.tableData.limit = 30 : this.tableData.limit = 10
     if (this.$route && this.$route.query.field === 'dialog') import('../../../public/UEditor/dialogs/internal.js')
     this.getList()
     this.getFileList()
@@ -670,7 +619,6 @@ export default {
       box-sizing: border-box;
       .trees {
         width: 100%;
-        max-height: 345px;
       }
     }
     .scollhide::-webkit-scrollbar {
@@ -680,7 +628,7 @@ export default {
   .conters{
     display: flex;
     flex-wrap: wrap;
-    max-height: 296px;
+    /*max-height: 296px;*/
     overflow: auto;
   }
   .conters:after {content: ""; width: 410px !important; }

admin/src/components/userList/index.vue

@@ -4,7 +4,7 @@
       <div slot="header" class="clearfix">
         <el-form inline>
           <el-form-item>
-            <el-input v-model="tableFrom.keyword" placeholder="请输入用户名称" class="selWidth">
+            <el-input v-model="tableFrom.keywords" placeholder="请输入用户名称" class="selWidth">
               <el-button slot="append" icon="el-icon-search" @click="getList" />
             </el-input>
           </el-form-item>
@@ -114,7 +114,7 @@ export default {
       tableFrom: {
         page: 1,
         limit: 10,
-        keyword: ''
+        keywords: ''
       }
     }
   },