样式修改

public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<!--    <link rel="icon" href="<%= BASE_URL %>collapseMenuLogo.png">-->
+    <link rel="icon" href="<%= BASE_URL %>liulanqi_logo.png">
 <!--    <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">-->
 <!--    <title><%= webpackConfig.name %></title>-->
     <title>鸿泽云智能推广系统</title>

src/api/system/user.js

@@ -34,6 +34,7 @@ export function addUser(data) {
 }
 // 1.新增代言人
 export function addSysuser(data) {
+  data.deptId = undefined
   data = Qs.stringify(data)
   return request({
     url: '/sysuser/add',
@@ -56,6 +57,7 @@ export function updateUser(data) {
 // 2.修改代言人
 export function updateSysuser(data) {
   const businessId = data.businessId
+  data.deptId = undefined
   data = Qs.stringify(data)
   return request({
     url: '/sysuser/update/' + businessId,

src/layout/components/Sidebar/Logo.vue

 <template>
   <div v-if="collapse" class="sidebar-logo-containerCollapse" :class="{'collapse':collapse}">
-    <transition name="sidebarLogoFade">
-      <router-link  key="collapse" class="sidebar-logo-link" to="/">
-        12222
-        <img :src="collapseLogo" class="sidebar-logo2">
-      </router-link>
-    </transition>
+<!--    <transition name="sidebarLogoFade">-->
+<!--      <router-link  key="collapse" class="sidebar-logo-link" to="/">-->
+<!--        12222-->
+<!--        <img :src="collapseLogo" class="sidebar-logo2">-->
+<!--      </router-link>-->
+<!--    </transition>-->
   </div>
   <div  v-else class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link key="expand" class="sidebar-logo-link" to="/">
         <div class="sidebar-logoTitle">
-          <div class="sidebar-logoRow">
-<!--            <img :src="logo" class="sidebar-logo">-->
-          </div>
+<!--          <div class="sidebar-logoRow">-->
+<!--&lt;!&ndash;            <img :src="logo" class="sidebar-logo">&ndash;&gt;-->
+<!--          </div>-->
           <div class="sidebar-title title-current">{{ title }} </div>
         </div>
       </router-link>

src/layout/components/header.vue

@@ -51,9 +51,9 @@
               修改密码
             </router-link>
           </el-dropdown-item>
-          <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
-          </el-dropdown-item>
+<!--          <el-dropdown-item @click.native="setting = true">-->
+<!--            <span>布局设置</span>-->
+<!--          </el-dropdown-item>-->
           <el-dropdown-item divided @click.native="logout">
             <span style="display:block;">退出</span>
           </el-dropdown-item>

src/styles/themeA/navigationBar.scss

@@ -11,7 +11,7 @@
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 150px!important;
+  height: 50px!important;
   line-height: 50px;
   background: #214E90;
   padding-left: 11px;

src/views/brandAmbassador/index.vue

@@ -63,7 +63,7 @@
               :icon="commonField.addIcon"
               :size="commonField.smallSize"
               @click="handleAdd"
-            >新建代言人</el-button>
+            >新增</el-button>
             <!--          //导入按钮-->
             <!--            <el-button
               v-hasPermi="hasImportPerm"
@@ -84,8 +84,8 @@
             >{{ commonField.exportName }}</el-button>-->
             <!--          //导入按钮-->
             <el-button
-              :class="commonField.importClass"
-              :type="commonField.typeWarning"
+              :class="commonField.resetClass"
+              :type="commonField.resetIcon"
               :icon="commonField.importIcon"
               :size="commonField.smallSize"
               @click="handleImport"
@@ -664,8 +664,8 @@ export default {
         console.log('this.roles', this.roles)
         this.queryShop = false
         // this.queryParams.deptId = this.deptId
-        this.upload.deptId = this.deptId
-        this.form.deptId = this.deptId
+        // this.upload.deptId = this.deptId
+        // this.form.deptId = this.deptId
       } else {
         this.upload.deptId = ''
       }
@@ -687,8 +687,12 @@ export default {
           this.deptList = res.data
           if (res.data && res.data.length > 0) {
             this.queryParams.deptId = res.data[0].businessId
+            this.upload.deptId = res.data[0].businessId
+            this.form.deptId = res.data[0].businessId.map(item => Number(item))
           } else {
             this.queryParams.deptId = ''
+            this.upload.deptId = ''
+            this.form.deptId = ''
           }
         }
       })
@@ -809,7 +813,7 @@ export default {
     reset() {
       this.form = {
         userId: '',
-        deptId: null,
+        deptId: '',
         phone: '',
         username: '',
         userType: '',
@@ -866,6 +870,9 @@ export default {
         }
       })
       this.isUnitAdmin = true
+      if (this.queryParams.deptId) {
+        this.form.deptId = this.queryParams.deptId.toString().split(',').map(item => Number(item))
+      }
       this.open = true
       this.title = '添加代言人'
     },
@@ -911,7 +918,8 @@ export default {
         if (valid) {
           this.form.deptIdPrepares = this.form.deptId.join(',')
           if (this.form.businessId !== undefined) {
-            updateSysuser(this.form).then(response => {
+            const addParams = JSON.parse(JSON.stringify(this.form))
+            updateSysuser(addParams).then(response => {
               this.$message({
                 message: '修改成功',
                 type: 'success'
@@ -920,7 +928,8 @@ export default {
               this.getList()
             })
           } else {
-            addSysuser(this.form).then(response => {
+            const params = JSON.parse(JSON.stringify(this.form))
+            addSysuser(params).then(response => {
               this.newId = response.data.businessId
               this.$message({
                 message: '新增成功', type: 'success'

src/views/contentManagement/banner/index.vue

@@ -63,7 +63,7 @@
     <div style="padding:5px 10px">
       <el-table v-loading="loading" border :data="cmsBannerList">
         <el-table-column type="index" label="序号" width="60px" align="center" />
-        <el-table-column label="图片" prop="bannerPicture" :show-overflow-tooltip="true" width="150px">
+        <el-table-column label="图片" prop="bannerPicture" width="150px">
           <template slot-scope="scope">
             <div :id="step(scope.$index)">
               <el-image

src/views/contentManagement/clickManagement/index.vue

@@ -72,14 +72,14 @@
               <span>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" prop="title" label="标题" width="300" show-overflow-tooltip />
-          <el-table-column align="left" prop="title" label="类型" width="300" show-overflow-tooltip>
+          <el-table-column align="left" prop="title" label="标题" show-overflow-tooltip />
+          <el-table-column align="left" prop="title" label="类型" width="80px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.type === '1' ? '视频' : '新闻' }}
             </template>
           </el-table-column>
-          <el-table-column label="所属商家" prop="unitName" :show-overflow-tooltip="true" />
-          <el-table-column label="姓名" prop="userName" :show-overflow-tooltip="true">
+          <el-table-column label="所属商家" width="180px" prop="unitName" :show-overflow-tooltip="true" />
+          <el-table-column label="代言人" prop="userName" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               {{ scope.row.userName || '-' }}
             </template>
@@ -94,12 +94,13 @@
               {{ scope.row.phone || '-' }}
             </template>
           </el-table-column>
-          <el-table-column label="推广次数" prop="clickThroughRate" :show-overflow-tooltip="true">
+          <el-table-column label="推广次数" prop="clickThroughRate" width="155px" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="scope.row.edit === '0'"> {{ scope.row.clickThroughRate || '-' }}</span>
               <el-input-number
                 v-if="scope.row.edit === '1'"
                 v-model.trim="scope.row.clickThroughRate"
+                :min="0"
                 controls-position="right"
                 :step="1"
                 step-strictly
@@ -110,7 +111,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column label="价格" prop="price" :show-overflow-tooltip="true">
+          <el-table-column label="价格" prop="price" width="155px" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="scope.row.edit === '0'"> {{ scope.row.price || '-' }}</span>
               <el-input-number
@@ -118,6 +119,7 @@
                 v-model.trim="scope.row.price"
                 placeholder="价格"
                 controls-position="right"
+                :min="0"
                 :step="0.1"
                 step-strictly
                 clearable

src/views/contentManagement/newsInformation/index.vue

@@ -90,11 +90,16 @@
               <span>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" prop="title" label="新闻标题" width="300" show-overflow-tooltip />
-          <el-table-column align="left" label="新闻标题图" prop="pictureId">
+          <el-table-column align="left" prop="title" label="新闻标题" width="200" show-overflow-tooltip />
+          <el-table-column align="left" label="新闻标题图"  prop="path">
             <template slot-scope="scope">
               <div :id="step(scope.$index)">
-                <el-image :src="scope.row.path" :preview-src-list="[scope.row.path]" style="width:100%;height:100%;" @mouseover="justEnter($event)" @mouseout="justOut($event)" />
+                <el-image
+                  :src="scope.row.path"
+                  :preview-src-list="[scope.row.path]"
+                  style="width:100%;height:100%;"
+                  @click="handleClickStop(scope.$index)"
+                />
               </div>
             </template>
           </el-table-column>
@@ -103,17 +108,17 @@
           <!--              <span>{{ scope.row.isForntPage === 1 ? '是' : '否' }}</span>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-          <el-table-column align="left" prop="isTop" width="150" label="是否为置顶新闻" show-overflow-tooltip>
+          <el-table-column align="left" prop="isTop" label="是否为置顶新闻" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.isTop === 1 ? '是' : '否' }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" prop="isRecommended" width="150" label="是否为推荐新闻" show-overflow-tooltip>
+          <el-table-column align="left" prop="isRecommended"  label="是否为推荐新闻" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.isRecommended === 1 ? '是' : '否' }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" prop="newsType" width="150" label="文章来源" show-overflow-tooltip>
+          <el-table-column align="left" prop="newsType"  label="文章来源" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ newsTypeMap[scope.row.newsType] }}</span>
             </template>
@@ -151,7 +156,7 @@
               <span>{{ scope.row.nickName }}</span>
             </template>
           </el-table-column>-->
-          <el-table-column align="center" label="操作" width="250">
+          <el-table-column align="center" label="操作" width="230">
             <template slot-scope="scope">
               <el-button
                 v-has-permi="hasDetailPerm"

src/views/contentManagement/videoInformation/info/index.vue

@@ -4,9 +4,9 @@
       <div class="topTitle">
         <span class="topTitleText">{{ title }}</span>
       </div>
-      <div class="twoTitle">
-        <el-tag v-if="form.flag==='1'" type="success">已发布</el-tag>
-      </div>
+<!--      <div class="twoTitle">-->
+<!--        <el-tag v-if="form.flag==='1'" type="success">已发布</el-tag>-->
+<!--      </div>-->
       <div class="updateBoby">
         <el-form ref="deviceFormRef" :model="form" :rules="rules" label-position="right" label-width="auto">
           <el-row>

src/views/merchantManagement/index.vue

@@ -127,7 +127,7 @@
     />
     <!-- 添加或修改商家管理配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="130px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="auto">
         <el-form-item label="商家名称:" prop="unitName">
           <el-input v-model.trim="form.unitName" :maxlength="30" placeholder="请输入商家名称" />
         </el-form-item>

src/views/system/user/index.vue

@@ -80,7 +80,7 @@
               :icon="commonField.addIcon"
               :size="commonField.smallSize"
               @click="handleAdd"
-            >新建商家管理员</el-button>
+            >新增</el-button>
             <!--          //导入按钮-->
             <!--            <el-button
               v-hasPermi="hasImportPerm"