Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue

src/scrm_pages/article/articleList.vue

@@ -1,53 +1,70 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button  style="float:right;" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="AddArticle()">添加文章</el-button>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        style="float:right;"
+        type="primary"
+        size="small"
+        icon="el-icon-circle-plus-outline"
+        @click="AddArticle()"
+      >添加文章</el-button>
     </div>
     <div class="app-container">
-          <div style="margin-bottom: 10px">
-            <el-row :gutter="24">
-              <el-col :span="8">
-                  <el-input style="width: 300px" v-model="listQuery.keyword"  placeholder="请输入您需要搜索的内容"></el-input>
-                  <el-button type="primary"  icon="el-icon-search" @click="changeKey()">搜索</el-button>
-              </el-col>
-            </el-row>
-          </div>
-          <div class="cell clearfix">
-            <label class="title"><span class="name">标签</span>:</label>
-             <div class="time">
-                <ul class="">
-                  <li :class="0==tagType?'active':''" @click="selectsign(0)">全部</li>
-                  <li :class="item.id==tagType?'active':''"  v-for="item in tagOptions" :key="item.id" @click="selectsign(item.id)">{{item.name}}</li>
-                </ul>
-             </div>
-          </div>
-          <div class="cell clearfix">
-            <label class="title"><span class="name">状态:</span></label>
-            <div class="time">
-              <ul class="">
-                 <li :class="{ active: selecting_status == 0 }" @click="changeSelectingStatus(0)">全部</li>
-                 <li :class="{ active: selecting_status == 1 }" @click="changeSelectingStatus(1)">已发布</li>
-                 <li :class="{ active: selecting_status == 2 }" @click="changeSelectingStatus(2)">草稿箱</li>
-                 <li :class="{ active: selecting_status == 3 }" @click="changeSelectingStatus(3)">未通过</li>
-              </ul>
-            </div>
-          </div>
+      <div style="margin-bottom: 10px">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-input style="width: 300px" v-model="listQuery.keyword" placeholder="请输入您需要搜索的内容"></el-input>
+            <el-button type="primary" icon="el-icon-search" @click="changeKey()">搜索</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">标签</span>:
+        </label>
+        <div class="time">
+          <ul class>
+            <li :class="0==tagType?'active':''" @click="selectsign(0)">全部</li>
+            <li
+              :class="item.id==tagType?'active':''"
+              v-for="item in tagOptions"
+              :key="item.id"
+              @click="selectsign(item.id)"
+            >{{item.name}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">状态:</span>
+        </label>
+        <div class="time">
+          <ul class>
+            <li :class="{ active: selecting_status == 0 }" @click="changeSelectingStatus(0)">全部</li>
+            <li :class="{ active: selecting_status == 1 }" @click="changeSelectingStatus(1)">已发布</li>
+            <li :class="{ active: selecting_status == 2 }" @click="changeSelectingStatus(2)">草稿箱</li>
+            <li :class="{ active: selecting_status == 3 }" @click="changeSelectingStatus(3)">未通过</li>
+          </ul>
+        </div>
+      </div>
 
-            <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
-              <el-checkbox style="width: 30px" @change="selectAllFunc" v-model="selectAll">全选</el-checkbox>
-              <el-button size="small" icon="el-icon-delete" @click="deleteAllArticles()">批量删除</el-button>
-            </div>
+      <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
+        <el-checkbox style="width: 30px" @change="selectAllFunc" v-model="selectAll">全选</el-checkbox>
+        <el-button size="small" icon="el-icon-delete" @click="deleteAllArticles()">批量删除</el-button>
+      </div>
 
       <div class="clearfix">
         <div class="published-cell" v-for="(article,index) in articsData" :key="article.id">
-          <div class="checkbox" >
-             <el-checkbox v-model='article.checked' @change="selectProduct"></el-checkbox>
+          <div class="checkbox">
+            <el-checkbox v-model="article.checked" @change="selectProduct"></el-checkbox>
           </div>
 
           <div class="activity-image-panel">
-            <span class="status-text">{{article.article_status ==1 ? '已发布':'' || article.article_status ==2 ? '草稿':'' || article.article_status ==3 ? '未通过':''}}</span>
-            <img :src="article.imgs"/>
+            <span
+              class="status-text"
+            >{{article.article_status ==1 ? '已发布':'' || article.article_status ==2 ? '草稿':'' || article.article_status ==3 ? '未通过':''}}</span>
+            <img :src="article.imgs" />
           </div>
           <div class="activity-info-panel">
             <h3 class="title">
@@ -55,23 +72,23 @@
             </h3>
             <!-- <div class="statistics">
               阅读：{{article.real_read_num}} 丨 评论：{{article.comment_num}} 丨 点赞：{{article.star_num}}
-            </div> -->
+            </div>-->
             <div>
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
                   size="mini"
                   type="primary"
                   icon="el-icon-edit-outline"
-                 @click="editArticles(article.id,article.type)">
-                </el-button>
+                  @click="editArticles(article.id,article.type)"
+                ></el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
                   size="mini"
                   type="danger"
                   icon="el-icon-delete"
-                  @click="deleteArticle(article.id,index)">
-                </el-button>
+                  @click="deleteArticle(article.id,index)"
+                ></el-button>
               </el-tooltip>
             </div>
           </div>
@@ -82,380 +99,398 @@
         </div>
       </div>
 
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10,20,50,100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;float: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-          </el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10,20,50,100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
     </div>
   </div>
 </template>
 
 <script>
-  import BreadCrumb from '../components/bread-crumb'
-  import { GetAllArticles,deleteArticle,deleteAllArticles,GetAllCategory} from '@/api/act/submitinfo'
-  import PublishedCell from "@/scrm_pages/article/components/published_cell"
-  import {uParseTime} from "@/utils/tools";
-  export default {
-    name: 'commentList',
-    components:{
-      BreadCrumb,
-      PublishedCell,
+import BreadCrumb from "../components/bread-crumb";
+import {
+  GetAllArticles,
+  deleteArticle,
+  deleteAllArticles,
+  GetAllCategory
+} from "@/api/act/submitinfo";
+import PublishedCell from "@/scrm_pages/article/components/published_cell";
+import { uParseTime } from "@/utils/tools";
+export default {
+  name: "commentList",
+  components: {
+    BreadCrumb,
+    PublishedCell
+  },
+  inject: ["reload"],
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "文章管理" },
+        { path: "/articles/articleList", name: "文章列表" }
+      ],
+      time: "",
+      active: true,
+      tagType: 0,
+      tagOptions: [],
+      listQuery: {
+        page: 1,
+        limit: 10,
+        classid: "",
+        name: "",
+        keyword: ""
+      },
+      articsData: [],
+      total: 0,
+      dialogVisible: false,
+      checkAllStatus: false,
+      selecting_status: "",
+      orgName: "",
+      statustext: "",
+      checked: false,
+      selectAll: false,
+      selectReply: [],
+      startPointX: 0,
+      changePointX: 0,
+      showIndex: 0
+    };
+  },
+  methods: {
+    GetAllArticles() {
+      GetAllArticles(
+        this.selecting_status,
+        this.listQuery.classid,
+        this.listQuery.keyword,
+        this.listQuery.limit,
+        this.listQuery.page
+      ).then(response => {
+        if (response.data.state === 1) {
+          this.articsData = response.data.data.articles;
+          this.total = response.data.data.total;
+          console.log("文章列表", this.articsData);
+          console.log("total", this.total);
+          // this.orgName =  response.data.data.OrgName;
+          // console.log("机构姓名",this.orgName)
+        }
+        //  if(typeof(response.data.data.category != 'undefined')){
+        //    this.tagOptions = response.data.data.category
+        //     console.log("分类列表",this.tagOptions)
+        //  }
+      });
     },
-    inject:['reload'],
-    data(){
-      return{
-        crumbs: [
-          { path: false, name: '文章管理' },
-          { path: '/articles/articleList', name: '文章列表' }
-        ],
-        time: '',
-        active: true,
-        tagType: 0,
-        tagOptions:[],
-        listQuery:{
-            page:1,
-            limit:10,
-            classid:'',
-            name:'',
-            keyword:'',
-        },
-        articsData:[],
-        total:0,
-        dialogVisible: false,
-        checkAllStatus:false,
-        selecting_status:'',
-        orgName:'',
-        statustext:'',
-        checked: false,
-        selectAll:false,
-        selectReply:[],
-       startPointX: 0,
-       changePointX: 0,
-       showIndex: 0,
-      }
+    articlecreatetime(time) {
+      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+    },
+    selectsign(id) {
+      console.log("id", id);
+      this.listQuery.classid = id;
+      this.listQuery.name = name;
+      this.tagType = id;
+      this.GetAllArticles();
+    },
+    handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+      this.GetAllArticles();
+    },
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+      this.GetAllArticles();
+    },
+    changeKey() {
+      this.GetAllArticles();
+    },
+    memberAvatar(row) {
+      return row.imgs;
+    },
+    AddArticle() {
+      this.$router.push({ path: "/articles/createArticle/:id" });
+    },
+    changeSelectingStatus(status) {
+      console.log("status是多少?", status);
+      this.selecting_status = status;
+      this.GetAllArticles();
+    },
+    openDelete(row, index) {
+      var id = row.id;
+      this.$confirm("确认要删除该信息吗?删除后将无法恢复!", {
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var ids = [];
+          ids.push(row.id);
+          openDelete({ ids: ids })
+            .then(response => {
+              this.articsData.splice(index, 1);
+              this.$message.success("删除成功");
+            })
+            .catch(e => {});
+        })
+        .catch(e => {});
     },
-    methods:{
-           GetAllArticles(){
-              GetAllArticles(this.selecting_status,this.listQuery.classid,this.listQuery.keyword,this.listQuery.limit,this.listQuery.page).then(response=>{
-                     if(response.data.state === 1){
-                        this.articsData = response.data.data.articles;
-                        this.total = response.data.data.total;
-                        console.log("文章列表",this.articsData)
-                        console.log("total",this.total)
-                        // this.orgName =  response.data.data.OrgName;
-                        // console.log("机构姓名",this.orgName)
-                     }
-                    //  if(typeof(response.data.data.category != 'undefined')){
-                    //    this.tagOptions = response.data.data.category
-                    //     console.log("分类列表",this.tagOptions)
-                    //  }
-              })
-         },
-         articlecreatetime(time){
-            return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
-         },
-         selectsign(id){
-            console.log("id",id)
-            this.listQuery.classid = id;
-            this.listQuery.name = name;
-            this.tagType = id;
-            this.GetAllArticles();
-         },
-         handleSizeChange(limit) {
-          this.listQuery.limit = limit;
-          this.GetAllArticles();
-        },
-         handleCurrentChange(page) {
-          this.listQuery.page = page;
-          this.GetAllArticles();
-        },
-        changeKey(){
-           this.GetAllArticles();
-        },
-        memberAvatar(row){
-             return row.imgs
-        },
-        AddArticle(){
-           this.$router.push({path:'/articles/createArticle/:id'})
-        },
-        changeSelectingStatus(status){
-          console.log("status是多少?",status)
-          this.selecting_status = status;
-          this.GetAllArticles();
-        },
-        openDelete(row,index){
-             var  id = row.id;
-            this.$confirm('确认要删除该信息吗?删除后将无法恢复!',{
-              dangerouslyUseHTMLString:true,
-             confirmButtonText: '确定',
-             cancelButtonText: '取消',
-             type: 'warning'
-            }).then(()=>{
-                var ids = [];
-                ids.push(row.id);
-                openDelete({ids:ids}).then(response=>{
-                    this.articsData.splice(index,1);
-                    this.$message.success("删除成功");
-                }).catch(e=>{});
-          }).catch(e=>{});
-        },
 
-          handleSelectionChange(val){
-             this.selectedArticles = val;
-         },
-           deleteArticle(id,index){
+    handleSelectionChange(val) {
+      this.selectedArticles = val;
+    },
+    deleteArticle(id, index) {
+      this.$confirm("确定要删除吗?删除后信息将无法恢复!", "删除提示", {
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteArticle(id)
+            .then(response => {
+              if (response.data.state == 1) {
+                this.articsData.splice(index, 1);
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.msg);
+              }
+            })
+            .catch(e => {});
+        })
+        .catch(() => {
+          return false;
+        });
+    },
+    editArticles(id, articletype) {
+      if (articletype == 1) {
+        this.$router.push("/articles/editArticle/" + id);
+      }
+      if (articletype == 2) {
+        this.$router.push("/articles/editVido/" + id);
+      }
+    },
 
-             this.$confirm('确定要删除吗?删除后信息将无法恢复!','删除提示',{
-               dangerouslyUseHTMLString:true,
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-             }).then(()=>{
-                     deleteArticle(id).then(response=>{
-                if(response.data.state==1){
-                    this.articsData.splice(index,1)
-                    this.$message.success("删除成功")
-                }else{
-                  this.$message.error(response.msg)
-                }
-              }).catch(e=>{});
-             }).catch(() => {
-               return false
-            });
-           },
-           editArticles(id,articletype){
-               if(articletype == 1){
-                  this.$router.push("/articles/editArticle/"+id);
-               }
-               if(articletype == 2){
-                 this.$router.push("/articles/editVido/"+id);
-               }
-           },
+    selectProduct(val) {
+      var ids = [];
+      for (let i = 0, len = this.articsData.length; i < len; i++) {
+        if (!this.articsData[i].checked) {
+          this.selectAll = false;
+        } else {
+          this.selectAll = true;
+          this.selectReply = val;
+          ids.push(this.articsData[i].id);
+          this.selectReply = ids;
+        }
+      }
+      console.log("ids是什么", ids);
+    },
+    selectAllFunc(val) {
+      var ids = [];
+      this.articsData.map((item, i) => {
+        item.checked = val;
+      });
 
-          selectProduct(val){
-            var ids =[];
-            for(let i=0,len=this.articsData.length;i<len;i++){
-                if(!this.articsData[i].checked){
-                   this.selectAll = false;
-                }else{
-                  this.selectAll = true;
-                  this.selectReply = val;
-                  ids.push(this.articsData[i].id);
-                  this.selectReply = ids;
-                }
-            }
-            console.log("ids是什么",ids);
-        },
-        selectAllFunc(val){
-          var ids = [];
-           this.articsData.map((item,i)=>{
-             item.checked = val;
-           })
+      for (let i = 0, len = this.articsData.length; i < len; i++) {
+        if (!this.articsData[i].checked) {
+          this.selectAll = false;
+        } else {
+          this.selectAll = true;
+          this.selectReply = val;
+          ids.push(this.articsData[i].id);
+          this.selectReply = ids;
+        }
+      }
+      console.log("ids是什么", ids);
+    },
 
-            for(let i=0,len=this.articsData.length;i<len;i++){
-                if(!this.articsData[i].checked){
-                   this.selectAll = false;
-                }else{
-                  this.selectAll = true;
-                  this.selectReply = val;
-                  ids.push(this.articsData[i].id);
-                  this.selectReply = ids;
-                }
-            }
-            console.log("ids是什么",ids);
-        },
+    deleteAllArticles() {
+      if (this.selectReply.length == 0) {
+        this.$message.error("请选择要删除的信息");
+        return false;
+      }
 
-        deleteAllArticles(){
-            if (this.selectReply.length==0) {
-            this.$message.error("请选择要删除的信息");
-            return false;
+      this.$confirm("确认要删除所选的文章吗?", "删除提示", {
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        deleteAllArticles().then(response => {
+          var ids = [];
+          var idMap = {};
+          for (let index = 0; index < this.selectReply.length; index++) {
+            ids.push(this.selectReply[index]);
+            idMap[this.selectReply[index]] = this.selectReply[index];
           }
-
-          this.$confirm('确认要删除所选的文章吗?','删除提示',{
-             dangerouslyUseHTMLString:true,
-             confirmButtonText: '确定',
-             cancelButtonText: '取消',
-             type: 'warning'
-          }).then(()=>{
-               deleteAllArticles().then(response=>{
-                   var ids = [];
-                   var idMap = {};
-                  for (let index = 0; index < this.selectReply.length; index++) {
-                    ids.push(this.selectReply[index]);
-                     idMap[this.selectReply[index]] = this.selectReply[index];
-                  }
-                   console.log("第二个ids是什么?",ids);
-                  deleteAllArticles({ids:ids}).then(response=>{
-                       if(response.data.state ==1){
-                            for (let index = this.articsData.length-1; index >= 0; index--) {
-                              if(this.articsData[index].id in idMap){
-                                   this.articsData.splice(index,1)
-                              }
-                            }
-                             this.$message.success("删除成功");
-                       }
-                  })
-               });
-          })
-        },
-        GetAllCategory(){
-          GetAllCategory().then(response=>{
-            if(response.data.state == 1){
-             var categorys = response.data.data.categorys;
-             this.tagOptions = response.data.data.categorys;
-             console.log("标签是什么",categorys)
+          console.log("第二个ids是什么?", ids);
+          deleteAllArticles({ ids: ids }).then(response => {
+            if (response.data.state == 1) {
+              for (
+                let index = this.articsData.length - 1;
+                index >= 0;
+                index--
+              ) {
+                if (this.articsData[index].id in idMap) {
+                  this.articsData.splice(index, 1);
+                }
+              }
+              this.$message.success("删除成功");
             }
-          })
-        },
-        articleDetail(id,articletype){
-        
-          if(articletype == 1){
-           this.$router.push("/articles/articleDetail/"+id);
-          }
-          if(articletype == 2){
-            this.$router.push("/articles/vidoDetail/"+id);
-          }
-        }
+          });
+        });
+      });
     },
-    created(){
-      this.GetAllArticles();
-      this.GetAllCategory();
+    GetAllCategory() {
+      GetAllCategory().then(response => {
+        if (response.data.state == 1) {
+          var categorys = response.data.data.categorys;
+          this.tagOptions = response.data.data.categorys;
+          console.log("标签是什么", categorys);
+        }
+      });
     },
-
-
+    articleDetail(id, articletype) {
+      if (articletype == 1) {
+        this.$router.push("/articles/articleDetail/" + id);
+      }
+      if (articletype == 2) {
+        this.$router.push("/articles/vidoDetail/" + id);
+      }
+    }
+  },
+  created() {
+    this.GetAllArticles();
+    this.GetAllCategory();
   }
+};
 </script>
 
 <style scoped  rel="stylesheet/scss" lang="scss">
-    .parent{
-        position: relative;
-        width: 160px;
-        height: 120px;
-        left: 20px;
-    }
-    .parent .text{
-        display: inline-block;
-        transform: rotate(-45deg);
-        padding: 20px;
-        color:red;
-        position: relative;
-        left: -60px;
-    }
-   .triangle-topleft{
-        width: 0;
-        height: 0;
-        border-top: 70px solid yellow;
-        border-right: 70px solid transparent;
-        position: relative;
-        margin-top: -140px;
-    }
-
-    .published-cell {
-    padding: 20px 15px;
-    border: none;
-    border-bottom: 1px solid #e5e8ea;
-    float: left;
-    margin: 0;
-    width: 100%;
-    border-radius: 0;
-    position: relative;
+.parent {
+  position: relative;
+  width: 160px;
+  height: 120px;
+  left: 20px;
+}
+.parent .text {
+  display: inline-block;
+  transform: rotate(-45deg);
+  padding: 20px;
+  color: red;
+  position: relative;
+  left: -60px;
+}
+.triangle-topleft {
+  width: 0;
+  height: 0;
+  border-top: 70px solid yellow;
+  border-right: 70px solid transparent;
+  position: relative;
+  margin-top: -140px;
+}
 
-    .activity-image-panel {
-        width: 155px;
-        height: 122px;
-        border: 1px #dee2e5 solid;
-        display: flex;
-        justify-content: center;
-        position: relative;
-        -webkit-border-radius: 4px;
-        -moz-border-radius: 4px;
-        border-radius: 4px;
-        overflow: hidden;
-        float: left;
+.published-cell {
+  padding: 20px 15px;
+  border: none;
+  border-bottom: 1px solid #e5e8ea;
+  float: left;
+  margin: 0;
+  width: 100%;
+  border-radius: 0;
+  position: relative;
 
-        .status-text {
-            position: absolute;
-            font-size: 12px;
-            color: #fff;
-            top: 14px;
-            left: 3px;
-            -webkit-transform: rotate(316deg);
-            transform: rotate(316deg);
-        }
+  .activity-image-panel {
+    width: 155px;
+    height: 122px;
+    border: 1px #dee2e5 solid;
+    display: flex;
+    justify-content: center;
+    position: relative;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    overflow: hidden;
+    float: left;
 
-        img {
-            width: 100%;
-            height: 100%;
-            object-fit: cover;
-            object-position: center;
-        }
+    .status-text {
+      position: absolute;
+      font-size: 12px;
+      color: #fff;
+      top: 14px;
+      left: 3px;
+      -webkit-transform: rotate(316deg);
+      transform: rotate(316deg);
     }
-    .activity-image-panel::before {
-        border-top: 28px solid #5bd18b;
-        border-right: 28px solid transparent;
-        border-bottom: 28px solid transparent;
-        border-left: 28px solid #5bd18b;
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 0;
-        height: 0;
-        display: block;
-        content: "";
+
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      object-position: center;
     }
+  }
+  .activity-image-panel::before {
+    border-top: 28px solid #5bd18b;
+    border-right: 28px solid transparent;
+    border-bottom: 28px solid transparent;
+    border-left: 28px solid #5bd18b;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 0;
+    height: 0;
+    display: block;
+    content: "";
+  }
 
-    .activity-info-panel {
-        padding: 7px 20px;
-        width: 60%;
-        float: left;
+  .activity-info-panel {
+    padding: 7px 20px;
+    width: 60%;
+    float: left;
 
-        .title {
-            padding-bottom: 5px;
-            margin-bottom: 15px;
-            a {
-                color: #495060;
-                font-size: 20px;
-                max-width: 100%;
-                font-weight: 500;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                display: inline-block;
-            }
-        }
+    .title {
+      padding-bottom: 5px;
+      margin-bottom: 15px;
+      a {
+        color: #495060;
+        font-size: 20px;
+        max-width: 100%;
+        font-weight: 500;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        display: inline-block;
+      }
+    }
 
-        .statistics {
-            color: #a8b3ba;
-            font-size: 15px;
-            justify-content: space-between;
-            line-height: 30px;
-        }
+    .statistics {
+      color: #a8b3ba;
+      font-size: 15px;
+      justify-content: space-between;
+      line-height: 30px;
     }
+  }
 
-    .activity-time-panel {
-        float: right;
-        padding: 7px 0;
+  .activity-time-panel {
+    float: right;
+    padding: 7px 0;
 
-        .time {
-            font-size: 15px;
-            color: #a8b3ba;
-        }
-    }
-    .center{
-        font-size:15px;
-        color: #a8b3ba;
-    }
-    .checkbox{
-        float:left;
-        position: relative;
-        left:-10px;
+    .time {
+      font-size: 15px;
+      color: #a8b3ba;
     }
+  }
+  .center {
+    font-size: 15px;
+    color: #a8b3ba;
+  }
+  .checkbox {
+    float: left;
+    position: relative;
+    left: -10px;
+  }
 }
-
 </style>

src/scrm_pages/article/article_detail.vue

@@ -1,70 +1,72 @@
 <template>
-   <div  class="main-contain">
-      <div class="position">
-         <bread-crumb :crumbs='crumbs'></bread-crumb>
-     </div> 
-     <div class="app-container">
-          <div class="articlename">
-              {{articleform.title}}
-          </div>
-           <div v-html="articleform.content" class="articlecontent">
-
-           </div>
-     </div>
-   </div>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="articlename">{{articleform.title}}</div>
+      <div v-html="articleform.content" class="articlecontent"></div>
+    </div>
+  </div>
 </template>
 
 <script>
-    import BreadCrumb from '../components/bread-crumb'
-     import { getArticleDetail } from '@/api/act/submitinfo'
-    export default {
-        name: "article_detail",
-         components:{
-           BreadCrumb,
-      },
-      data(){
-        return{
-            crumbs: [
-             { path: false, name: '文章管理' },
-             { path: '/articles/articleDetail', name: '文章详情' }
-          ],  
-          articleform:{
-            title:"",
-            content:"",
-          }
-        }  
-      },
-      methods:{
-         getArticleDetail(){
-            const id = this.$route.params && this.$route.params.id;
-            console.log("文章详情id是什么",id);
-           getArticleDetail(id,this.articleform).then(response=>{
-               if(response.data.state == 1){
-                 var articles =  response.data.data.articles;
-                this.articleform =  response.data.data.articles;
-                 console.log("articles",articles)
-               }
-           })
-         }
-      },
-      created(){
-        this.getArticleDetail();
+import BreadCrumb from "../components/bread-crumb";
+import { getArticleDetail } from "@/api/act/submitinfo";
+export default {
+  name: "article_detail",
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "文章管理" },
+        { path: "/articles/articleDetail", name: "文章详情" }
+      ],
+      articleform: {
+        title: "",
+        content: ""
       }
+    };
+  },
+  methods: {
+    getArticleDetail() {
+      const id = this.$route.params && this.$route.params.id;
+      console.log("文章详情id是什么", id);
+      getArticleDetail(id, this.articleform).then(response => {
+        if (response.data.state == 1) {
+          var articles = response.data.data.articles;
+          this.articleform = response.data.data.articles;
+          console.log("articles", articles);
+        }
+      });
     }
+  },
+  created() {
+    this.getArticleDetail();
+  }
+};
 </script>
 
 <style scoped>
-    .articlename{
-      min-width: 500px;
-      height: 50px;
-      /* border: solid 1px red; */
-      margin-left: 600px;
-    }
+.articlename {
+  min-width: 500px;
+  height: 50px;
+  /* border: solid 1px red; */
+  margin-left: 600px;
+  font-weight: 600;
+  font-size: 24px;
+  margin-top: 30px;
+  margin: 0 auto;
+  text-align: center;
+}
 
-    .articlecontent{
-      width: 1000px;
-      height: 100%;
-      /* border:solid 1px red; */
-      /* margin-left: 300px; */
-    }
+.articlecontent {
+  width: 1000px;
+  height: 100%;
+  margin: 0 auto;
+  /* border:solid 1px red; */
+  /* margin-left: 300px; */
+}
 </style>

src/scrm_pages/kefu/index.vue

@@ -31,9 +31,7 @@
 
         <div class="left_content">
           <div class="conversation-admin">
-            <span class="nickname">
-              <span></span>
-            </span>
+            <p class="nickname" v-html="nickName"></p>
           </div>
           <div class="message-list-wrap">
             <div class="message-list-item">
@@ -64,7 +62,7 @@
                 <span class="face_icon" @click="showEmotionDialog"></span>
               </div> -->
               <div class="picture">
-                <span class="picture_icon" @click="selectPicClick"></span>
+                <img class="picture_icon" src='static/images/ico.png' @click="selectPicClick" />
               </div>
             </div>
             <div id="wl_faces_box" class="wl_faces_box" v-bind:style="{left:'0px', display:facesBoxDisplay}">
@@ -190,6 +188,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
         selSess:null,
         message:'',
         messageBox:[],
+        nickName:''
       }
     },
     methods: {
@@ -345,6 +344,8 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
           this.$message.error('选择对象还未关联用户，无法进行对话');
           return false;
         }
+        // console.log(customer)
+        this.nickName = customer.name;
         this.thisCustomer = customer;
         this.selToID = "User_" + customer.user_id;
         this.onSelSess(selType, this.selToID);
@@ -915,7 +916,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
 
   
 .app-container{
-  height: 750px;  
+  height: 540px;  
 }
 .customer_plate {
   width: 100%;
@@ -1030,7 +1031,10 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
   width: 100%;
 }
 .left_content .conversation-admin .nickname {
-  padding-left: 22px;
+  /* padding-left: 22px; */
+  text-align: center;
+  min-width: 200px;
+  margin:0 auto;
 }
 .client_list ul {
   list-style: none;
@@ -1201,7 +1205,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
 .send_box .inputer_actions .picture_icon {
   width: 28px;
   height: 24px;
-  background: url(http://jk.kuyicloud.com/static/images/ico.png) no-repeat -508px -314px;
+  /* background: url(http://jk.kuyicloud.com/static/images/b.jpg) no-repeat -508px -314px; */
   display: inline-block;
   margin-right: 22px;
   cursor: pointer;
@@ -1249,6 +1253,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
   font-size: 14px;
   line-height: 1.5em;
   border: none;
+  border:1px solid #58a2ec;
   overflow-x: hidden;
   overflow-y: auto;
   border-radius: 0;
@@ -1737,4 +1742,4 @@ and open the template in the editor.
 figure {
   margin: 0;
 }
-</style>
+</style>

src/scrm_pages/members/members.vue

@@ -13,7 +13,7 @@
     <div class="app-container">
       <div style="margin-bottom: 10px">
         <el-row :gutter="24">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
             <el-button type="primary" icon="el-icon-search" @click="changeKey">搜索</el-button>
           </el-col>

src/scrm_pages/members/tags.vue

@@ -1,225 +1,262 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button  style="float:right;" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="openCreate">添加标签</el-button>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        style="float:right;"
+        type="primary"
+        size="small"
+        icon="el-icon-circle-plus-outline"
+        @click="openCreate"
+      >添加标签</el-button>
     </div>
     <div class="app-container">
-        <div style="margin-bottom: 10px">
-            <el-row :gutter="24">
-                <el-col :span="8">
-                    <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
-                    <el-button type="primary"  icon="el-icon-search" @click="changeKey">搜索</el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
-            <el-checkbox style="width: 30px" @change="changeCheck" v-model="checkAllStatus">全选</el-checkbox>
-            <el-button size="small" icon="el-icon-delete" @click="openDeleteTags">批量删除</el-button>
-        </div>
-        <el-table ref="multipleTable"  @selection-change="handleSelectionChange"  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="tagsData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;">
-            <el-table-column
-                align="center"
-                type="selection"
-                width="55">
-             </el-table-column>
-            <el-table-column label="标签" align="center">
-                <template slot-scope="scope">
-                    {{scope.row.tag_name}}
-                </template>
-            </el-table-column>
-            <el-table-column label="会员数" align="center">
-                <template slot-scope="scope">
-                <span>{{scope.row.member_count}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center">
-                <template slot-scope="scope">
-                    <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                        <el-button size="mini" type="primary" icon="el-icon-edit-outline" @click="openEdit(scope.row, scope.$index)" ></el-button>
-                    </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                        <el-button size="mini" type="danger" icon="el-icon-delete" @click="openDelete(scope.row, scope.$index)" ></el-button>
-                    </el-tooltip>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[10,20,50,100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;"
-            align="right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-        </el-pagination>
+      <div style="margin-bottom: 10px">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
+            <el-button type="primary" icon="el-icon-search" @click="changeKey">搜索</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
+        <el-checkbox style="width: 30px" @change="changeCheck" v-model="checkAllStatus">全选</el-checkbox>
+        <el-button size="small" icon="el-icon-delete" @click="openDeleteTags">批量删除</el-button>
+      </div>
+      <el-table
+        ref="multipleTable"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        :data="tagsData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+      >
+        <el-table-column align="center" type="selection" width="55"></el-table-column>
+        <el-table-column label="标签" align="center">
+          <template slot-scope="scope">{{scope.row.tag_name}}</template>
+        </el-table-column>
+        <el-table-column label="会员数" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.member_count}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="openEdit(scope.row, scope.$index)"
+              ></el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="openDelete(scope.row, scope.$index)"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10,20,50,100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        align="right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
 
-        <!--create-tag-form 添加标签-->
-        <create-tag-form ref="createTagForm" :tagsData="tagsData" ></create-tag-form>
-        <!--edit-tag-form 编辑标签-->
-        <edit-tag-form ref="editTagForm" :tagsData="tagsData" :tagIndex="tagIndex" :form="editForm"></edit-tag-form>
+      <!--create-tag-form 添加标签-->
+      <create-tag-form ref="createTagForm" :tagsData="tagsData"></create-tag-form>
+      <!--edit-tag-form 编辑标签-->
+      <edit-tag-form ref="editTagForm" :tagsData="tagsData" :tagIndex="tagIndex" :form="editForm"></edit-tag-form>
     </div>
   </div>
 </template>
 
 <script>
-  import {GetTags,DeleteTags} from "@/api/member/member";
-  import BreadCrumb from '../components/bread-crumb';
-  import CreateTagForm from "./components/CreateTagForm";
-  import EditTagForm from "./components/EditTagForm";
+import { GetTags, DeleteTags } from "@/api/member/member";
+import BreadCrumb from "../components/bread-crumb";
+import CreateTagForm from "./components/CreateTagForm";
+import EditTagForm from "./components/EditTagForm";
 
-  export default {
-    name: 'memberTagList',
-    components:{
-      BreadCrumb,
-      CreateTagForm,
-      EditTagForm,
-    },
-    data(){
-      return{
-        crumbs: [
-          { path: false, name: '会员管理' },
-          { path: false, name: '标签管理' }
-        ],
-        total:0,
-        listQuery:{
-            page:1,
-            limit:10,
-            search:'',
-        },
-        checkAllStatus:false,
-        selectedTags:[],
-        tagsData:[],
-        tagIndex:-1,
-        editForm:{
-            id:0,
-            tag_name:'',
-        },
+export default {
+  name: "memberTagList",
+  components: {
+    BreadCrumb,
+    CreateTagForm,
+    EditTagForm
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "会员管理" },
+        { path: false, name: "标签管理" }
+      ],
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 10,
+        search: ""
+      },
+      checkAllStatus: false,
+      selectedTags: [],
+      tagsData: [],
+      tagIndex: -1,
+      editForm: {
+        id: 0,
+        tag_name: ""
       }
+    };
+  },
+  methods: {
+    openCreate: function() {
+      this.$refs.createTagForm.open();
     },
-    methods:{
-        openCreate:function(){
-          this.$refs.createTagForm.open();
-        },
-        openEdit:function(row,index){
-            this.tagIndex = index;
-            this.editForm.id = row.id;
-            this.editForm.tag_name = row.tag_name;
-            this.$refs.editTagForm.open();
-        },
-        openDeleteTags:function(){
-          if (this.selectedTags.length==0) {
-            this.$message.error("请选择要删除的标签");
-            return false;
-          }
+    openEdit: function(row, index) {
+      this.tagIndex = index;
+      this.editForm.id = row.id;
+      this.editForm.tag_name = row.tag_name;
+      this.$refs.editTagForm.open();
+    },
+    openDeleteTags: function() {
+      if (this.selectedTags.length == 0) {
+        this.$message.error("请选择要删除的标签");
+        return false;
+      }
 
-          this.$confirm('确认要删除所选的标签吗？<br>删除后，标签将无法恢复', '删除提示', {
-            dangerouslyUseHTMLString:true,
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            var ids = [];
-            var idMap = {};
-            for (const index in this.selectedTags) {
-              ids.push(this.selectedTags[index].id);
-              idMap[this.selectedTags[index].id] = this.selectedTags[index].id;
-            }
-            DeleteTags({ids:ids}).then(response=>{
+      this.$confirm(
+        "确认要删除所选的标签吗？<br>删除后，标签将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(() => {
+          var ids = [];
+          var idMap = {};
+          for (const index in this.selectedTags) {
+            ids.push(this.selectedTags[index].id);
+            idMap[this.selectedTags[index].id] = this.selectedTags[index].id;
+          }
+          DeleteTags({ ids: ids })
+            .then(response => {
               var res = response.data;
               if (res.state === 1) {
                 var tagsDataLength = this.tagsData.length;
-                for (let index = tagsDataLength-1; index >= 0; index--) {
-                  if(this.tagsData[index].id in idMap) {
+                for (let index = tagsDataLength - 1; index >= 0; index--) {
+                  if (this.tagsData[index].id in idMap) {
                     this.tagsData.splice(index, 1);
-                  }                  
+                  }
                 }
                 this.$message.success("删除标签成功");
-              }else {
+              } else {
                 this.$message.error(res.msg);
               }
-            }).catch(e=>{});
-          }).catch(() => {
-            return false        
-          });
-        },
-        openDelete:function(row,index){
-          this.$confirm('确认要删除该标签吗？<br>删除后，该标签将无法恢复', '删除提示', {
-            dangerouslyUseHTMLString:true,
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            var ids = [];
-            ids.push(row.id);
-            DeleteTags({ids:ids}).then(response=>{
+            })
+            .catch(e => {});
+        })
+        .catch(() => {
+          return false;
+        });
+    },
+    openDelete: function(row, index) {
+      this.$confirm(
+        "确认要删除该标签吗？<br>删除后，该标签将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(() => {
+          var ids = [];
+          ids.push(row.id);
+          DeleteTags({ ids: ids })
+            .then(response => {
               var res = response.data;
               if (res.state === 1) {
                 this.tagsData.splice(index, 1);
                 this.$message.success("删除标签成功");
-              }else {
+              } else {
                 this.$message.error(res.msg);
               }
-            }).catch(e=>{});
-          }).catch(() => {
-            return false        
-          });
-        },
-        changeCheck:function(){
-          this.$refs.multipleTable.clearSelection();
-          if (this.checkAllStatus) {
-            this.$refs.multipleTable.toggleAllSelection();
-          }
-        },
-        handleSelectionChange:function (val) {
-          this.selectedTags = val;
-        },
-        handleSizeChange(limit) {
-            this.listQuery.limit = limit;
-            this.GetTags();
-        },
-        handleCurrentChange(page) {
-            this.listQuery.page = page;
-            this.GetTags();
-        },
-        changeKey(){
-            this.GetTags();
-        },
-        GetTags(){
-            GetTags(this.listQuery).then(response=>{
-                var res = response.data;
-                if(res.state===1) {
-                    this.tagsData = res.data.tags;
-                    this.total = res.data.total;
-                }
-            }).catch(e=>{})
-        }
+            })
+            .catch(e => {});
+        })
+        .catch(() => {
+          return false;
+        });
     },
-    computed:{
-        activeTagsData:function(){
-        var tags = [];
-        
-        return tags;
-        }
+    changeCheck: function() {
+      this.$refs.multipleTable.clearSelection();
+      if (this.checkAllStatus) {
+        this.$refs.multipleTable.toggleAllSelection();
+      }
+    },
+    handleSelectionChange: function(val) {
+      this.selectedTags = val;
+    },
+    handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+      this.GetTags();
     },
-    created(){
-        this.GetTags();
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+      this.GetTags();
+    },
+    changeKey() {
+      this.GetTags();
+    },
+    GetTags() {
+      GetTags(this.listQuery)
+        .then(response => {
+          var res = response.data;
+          if (res.state === 1) {
+            this.tagsData = res.data.tags;
+            this.total = res.data.total;
+          }
+        })
+        .catch(e => {});
+    }
+  },
+  computed: {
+    activeTagsData: function() {
+      var tags = [];
+
+      return tags;
     }
+  },
+  created() {
+    this.GetTags();
   }
+};
 </script>
 
 <style scoped>
-  /*.app-container .cell.clearfix .time ul li {*/
-    /*float: left;*/
-    /*list-style: none;*/
-    /*cursor: pointer;*/
-    /*padding: 6px 20px;*/
-    /*color: #606266;*/
-    /*border-radius: 4px;*/
-    /*margin: 0 8px 0 0;*/
-    /*font-size: 14px;*/
-    /*text-align: center;*/
-  /*}*/
-</style>
+/*.app-container .cell.clearfix .time ul li {*/
+/*float: left;*/
+/*list-style: none;*/
+/*cursor: pointer;*/
+/*padding: 6px 20px;*/
+/*color: #606266;*/
+/*border-radius: 4px;*/
+/*margin: 0 8px 0 0;*/
+/*font-size: 14px;*/
+/*text-align: center;*/
+/*}*/
+</style>

src/scrm_pages/site/components/new-feature.vue

@@ -57,7 +57,7 @@
   <el-dialog
     title="新增轮播图"
     :visible.sync="dialogVisible"
-    width="36%"
+    width="58%"
     center>
     <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
@@ -105,7 +105,7 @@
    <el-dialog
      title="添加图片"
      :visible.sync="addpicVisible"
-     width="35%"
+     width="40%"
      center>
   <el-form ref="picform" :model="picform" label-width="90px" :rules="rules">
     <el-form-item label="图片编辑:" required prop="imageUrl">
@@ -201,7 +201,7 @@
   <el-dialog
     title="新增医院介绍"
     :visible.sync="two"
-      width="50%"
+      width="58%"
      :modal='false'
      v-dialogDrag
      :close-on-click-modal="false"
@@ -233,7 +233,7 @@
   <el-dialog
     title="新增科室介绍"
     :visible.sync="three"
-    width="50%"
+    width="58%"
     center>
     <el-form ref="administform" :model="administform" label-width="90px" :rules="rules">
       <el-form-item label="模块标题:" required prop="title">
@@ -262,7 +262,7 @@
   <el-dialog
     title="新增名医介绍"
     :visible.sync="four"
-    width="550px"
+    width="58%"
     center>
     <el-form ref="doctorform" :model="doctorform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
@@ -309,7 +309,7 @@
    <el-dialog
       title="新增医生信息"
       :visible.sync="centerDialogVisible"
-      width="50%"
+      width="58%"
       center>
        <el-form label-width="90px" class="clearfix" :model="eidtDoctorform" ref="eidtDoctorform" :rules="rules">
           <el-row :span=20>
@@ -443,7 +443,7 @@
    <el-dialog
     title="新增科室环境"
     :visible.sync="five"
-    width="550px"
+    width="58%"
      center>
     <el-form ref="keform" :model="keform" label-width="110px" :rules="rules">
       <el-form-item label="模块标题: " required prop="title">
@@ -489,7 +489,7 @@
   <el-dialog
     title="图片编辑"
    :visible.sync="officeVisible"
-    width="30%"
+    width="35%"
     center>
      <el-form label-width="90px" :model="officeform" ref="officeform" :rules="rules">
        <el-form-item label="图片编辑:" required prop="enviroimages" >
@@ -551,7 +551,7 @@
   <el-dialog
     title="新增文章列表"
     :visible.sync="six"
-    width="550px"
+    width="58%"
     center>
     <el-form ref="articeform" :model="articeform" label-width="110px" :rules="rules">
       <el-form-item label="模块标题:" required  prop="title">
@@ -593,7 +593,7 @@
    <el-dialog
     title="新增活动列表"
     :visible.sync="seven"
-    width="550px"
+    width="58%"
     center>
     <el-form ref="activeform" :model="activeform" label-width="120px" :rules="rules">
       <el-form-item label="模块标题: " required prop="title">
@@ -618,7 +618,7 @@
     <el-dialog
     title="新增魔方导航"
     :visible.sync="eight"
-    width="550px"
+    width="58%"
     center>
     <el-form ref="marginform" :model="marginform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
@@ -665,7 +665,7 @@
   <el-dialog
     title="编辑魔方导航"
     :visible.sync="EditMacDialogVisible"
-    width="30%"
+    width="35%"
     center>
     <el-form label-width="90px" ref="editmacform" :model="editmacform" :rules="rules">
       <el-form-item label="导航标题:" required prop="margtitle">

src/scrm_pages/site/preview.vue

@@ -1398,7 +1398,7 @@
              </el-dialog>
 
               <!-- 手机模拟页面 -->
-               <el-col :span="10" class="text">
+               <el-col :span="9" class="text">
                   <div class="phone">
                    <div class="time">9:42</div>
                    <div class="xinhao"></div>
@@ -5350,7 +5350,7 @@ export default {
         width: 80px;
        height: 20px;
       //  border:solid 1px red;
-       margin-left: 430px;
+       margin-left: 416px;
        margin-top: 510px;
        font-size: 14px;
      }
@@ -5360,7 +5360,7 @@ export default {
          width: 40px;
          height: 40px;
         //  border:solid 1px red;
-         margin-left: 390px;
+         margin-left: 376px;
          margin-top: 500px;
 
      }
@@ -5428,12 +5428,12 @@ export default {
      width: 110px;
      height: 110px;
     //  border: solid 1px red;
-     margin-left: 400px;
+     margin-left: 380px;
      margin-top: 50px;
    }
    .share{
      position: relative;
-     width: 350px;
+     width: 300px;
      height: 720px;
      border: solid 1px black;
     //  margin-left: -10px;
@@ -5444,7 +5444,7 @@ export default {
 
    .share2{
      position: absolute;
-     width: 348px;
+     width: 300px;
      height: 50px;
     //  border: solid 1px red;
      background-color: #333333;
@@ -5453,7 +5453,7 @@ export default {
 
    .share3{
      position: absolute;
-     margin-left: 150px;
+     margin-left: 120px;
      margin-top: 15px;
    }
     .wrapper {
@@ -5658,8 +5658,9 @@ export default {
      height: 40px;
      font-size: 14px;
      color: #FF6600;
+     margin: 0 auto;
      margin-top: 50px;
-     margin-left: 150px;
+    //  margin-left: 150px;
     //  border: solid 1px red;
    }
 
@@ -6190,7 +6191,7 @@ export default {
 
    .navigationone{
      position: relative;
-     width: 330px;
+     width: 280px;
      height: 50px;
      border: solid 1px  rgba(242, 242, 242, 1);
      margin-top: 10px;
@@ -6198,7 +6199,7 @@ export default {
    }
    .navigacontent{
      position: relative;
-     width:348px;
+     width:300px;
      height: 670px;
      border:solid 0.1px rgba(242, 242, 242, 1);
      margin-top: 50px;
@@ -6208,13 +6209,13 @@ export default {
      height: 35px;
     //  border: solid 1px blue;
      margin-top: 7px;
-     margin-left: 20px;
+     margin-left: 10px;
    }
 
    .navithree{
      width:120px;
      height: 30px;
-     margin-left: 60px;
+     margin-left: 45px;
      margin-top: -25px;
      font-size: 14px;
    }

src/scrm_pages/systemsetting/staffmanagement.vue

@@ -13,7 +13,7 @@
     <div class="app-container">
       <div>
         <el-row :gutter="24">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-input style="width: 300px" v-model="keyword" placeholder="请输入您需要搜索的内容"></el-input>
             <el-button type="primary" icon="el-icon-search" @click="changeKey()">搜索</el-button>
           </el-col>