Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/login/index.vue

@@ -71,7 +71,7 @@ export default {
           duration: 1000
         })
         setTimeout(() => {
-          this.$router.push({ name: 'system' })
+          this.$router.push({ name: 'userManager' })
         }, 1000)
       }).catch(msg => {
 

src/pages/system/caseManager/caseInfo/index.vue

@@ -32,10 +32,10 @@
               size="mini"
               type="warning"
               @click="editItem(scope.$index, scope.row)">编辑</el-button>
-            <!-- <el-button
+            <el-button
               size="mini"
               type="success"
-              @click="keyManager(scope.$index, scope.row)">钥匙管理</el-button> -->
+              @click="pplConcerned(scope.$index, scope.row)">相关人员</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -76,6 +76,9 @@ export default {
     this.getList()
   },
   methods: {
+    pplConcerned (index, row) { // 相关人员
+      this.$router.push({name: 'pplConcerned', query: {id: row.CaseId}})
+    },
     getList () { // 获取列表
       this.$ajax(this.$api.caseManager.getCaseList.url, {
         method: this.$api.caseManager.getCaseList.method,

src/pages/system/caseManager/caseInfo/pplConcerned/editPPLConcerned/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <div class="subPage">
+    <form class="mainForm">
+      <ul>
+        <li class="flex-h">
+          <span>用户类型：</span>
+          <div class="flex-item">
+            <el-select v-model="postData.UserType" placeholder="请选择">
+              <el-option
+                v-for="item in typeList"
+                :key="item.TypeId"
+                :label="item.TypeName"
+                :value="item.TypeId">
+              </el-option>
+            </el-select>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>用户姓名：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入名称"
+                v-model="postData.UserName"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>手机号码：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入手机号码"
+                v-model="postData.Tel"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li style="text-align:center">
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
+        </li>
+      </ul>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      postData: {
+        CaseUserId: '', // 主键id
+        OrgId: '', // 机构id
+        CaseId: this.$route.query.id, // 案场id
+        UserName: '', // 用户名称
+        Tel: '', // 电话
+        UserType: '', // 用户类型
+      },
+      typeList: [],
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
+  created () {
+    this.getUserTypeList()
+    this.getCaseUserInfo()
+  },
+  components: {},
+  methods: {
+    getCaseUserInfo () {
+      if (this.$route.query.userid !== undefined) {
+        this.$ajax(this.$api.caseManager.getCaseUserInfo.url, {
+          method: this.$api.caseManager.getCaseUserInfo.method,
+          urlData: {id: this.$route.query.userid}
+        }).then(res => {
+          this.postData = res
+        })
+      }
+    },
+    getUserTypeList () { // 获取用户类型
+      this.$ajax(this.$api.caseManager.getUserTypeList.url, {
+        method: this.$api.caseManager.getUserTypeList.method,
+      }).then(res => {
+        this.typeList = res
+        this.postData.UserType = res[0].TypeId
+      })
+    },
+    submit () { // 提交数据
+      if (this.postData.UserName === '') {
+        this.$message({
+          type: 'error',
+          message: '用户名称不能为空'
+        })
+        return false
+      }
+      if (this.postData.Tel === '') {
+        this.$message({
+          type: 'error',
+          message: '手机号码不能为空'
+        })
+        return false
+      }
+      this.postData.OrgId = this.OrgId
+      if (this.$route.query.userid !== undefined) {
+        this.$ajax(this.$api.caseManager.editCaseUser.url, {
+          method: this.$api.caseManager.editCaseUser.method,
+          data: this.postData
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.$router.push({ name: 'pplConcerned', query: { id: this.$route.query.id } })
+        })
+      } else {
+        this.$ajax(this.$api.caseManager.addCaseUser.url, {
+          method: this.$api.caseManager.addCaseUser.method,
+          data: this.postData
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.$router.push({ name: 'pplConcerned', query: { id: this.$route.query.id } })
+        })
+      }
+    },
+    cancel () { // 取消
+      this.$router.push({ name: 'pplConcerned', query: { id: this.$route.query.id } })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/system/caseManager/caseInfo/pplConcerned/editPPLConcerned/page.scss

@@ -0,0 +1,56 @@
+span{
+  em{
+    color: red;
+  }
+}
+.map{
+  height: 500px;
+  background: #eee;
+  position: relative;
+  overflow: hidden;
+  box-sizing: border-box;
+  border: 1px solid #dcdfe6;
+
+  &>div.search{
+    display: inline-block;
+    position: absolute;
+  }
+
+  &>div.flex-item{
+    width: 100%;
+    &>div{
+      width: 100%;
+      height: 100%;
+      position: relative;
+      overflow: hidden;
+    }
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/pages/system/caseManager/caseInfo/pplConcerned/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click="addPPLConcerned">新增相关人员</el-button>
+        </div>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table
+        :data="currentList"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="UserType"
+          label="用户类型">
+        </el-table-column>
+        <el-table-column
+          prop="UserName"
+          label="用户名称">
+        </el-table-column>
+        <el-table-column
+          prop="Tel"
+          label="手机号">
+        </el-table-column>
+        <el-table-column label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="warning"
+              @click="editItem(scope.$index, scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination
+      @current-change="handleCurrentChange"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
+      layout="prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      postData: { // 表格搜索条件
+        caseid: this.$route.query.id, // 案场名称
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      currentList: [],
+      typeList: [],
+    }
+  },
+  created () {
+    this.getUserTypeList().then(() => {
+      this.getList()
+    })
+  },
+  methods: {
+    getUserTypeList () { // 获取用户类型
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.caseManager.getUserTypeList.url, {
+          method: this.$api.caseManager.getUserTypeList.method,
+        }).then(res => {
+          this.typeList = res
+          resolve()
+        })
+      })
+    },
+    addPPLConcerned () { // 添加相关人员
+      this.$router.push({ name: 'editPPLConcerned', query: { id: this.$route.query.id } })
+    },
+    getList () { // 获取列表
+      this.$ajax(this.$api.caseManager.getCaseUserList.url, {
+        method: this.$api.caseManager.getCaseUserList.method,
+        queryData: this.postData
+      }).then(res => {
+        for (var n = 0; n < res.list.length; n++) {
+          res.list[n].UserType = this.typeList.filter(x => x.TypeId === res.list[n].UserType)[0].TypeName
+        }
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.getList()
+    },
+    editItem (index, row) { // 修改
+      this.$router.push({ name: 'editPPLConcerned', query: { id: this.$route.query.id, userid: row.CaseUserId } })
+    },
+    searchList (key) { // 搜索列表
+      this.postData.name = key
+      this.currentList = []
+      this.postData.page = 1
+      this.getList()
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/system/caseManager/caseInfo/pplConcerned/page.scss

@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/pages/system/channelManager/channelList/add.vue

@@ -3,24 +3,27 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>渠道名：</span>
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-input
-                placeholder="请输入渠道名"
-                v-model="postData.channelName"
-                clearable>
-              </el-input>
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>渠道code：</span>
+          <span>渠道名：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入渠道code"
-                v-model="postData.channelCode"
+                placeholder="请输入渠道名"
+                v-model="postData.ChannelName"
                 clearable>
               </el-input>
             </div>
@@ -36,26 +39,62 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        channelName: '',
-        channelCode: ''
+        ChannelId: '', // 渠道id
+        ChannelName: '', // 渠道名称
+        CaseId: '', // 案场id
+        OrgId: '', // 机构id
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
       }
     }
   },
   components: {},
   methods: {
-    submit () {
-      console.log(this.postData)
+    submit () { // 提交数据
+      if (this.postData.ChannelName === '') {
+        this.$message({
+          type: 'error',
+          message: '渠道名称不能为空'
+        })
+        return false
+      }
+      this.postData.OrgId = this.OrgId
+      if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
+      this.$ajax(this.$api.channelManager.addChannel.url, {
+        method: this.$api.channelManager.addChannel.method,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'channelList' })
+      })
     },
     cancel () {
-      this.$router.go(-1)
+      this.$router.push({ name: 'channelList' })
     }
   },
-  mounted () {}
+  mounted () { }
 }
 </script>
 

src/pages/system/channelManager/channelList/edit.vue

@@ -3,24 +3,27 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>渠道名：</span>
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-input
-                placeholder="请输入渠道名"
-                v-model="postData.channelName"
-                clearable>
-              </el-input>
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>渠道code：</span>
+          <span>渠道名：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入渠道code"
-                v-model="postData.channelCode"
+                placeholder="请输入渠道名"
+                v-model="postData.ChannelName"
                 clearable>
               </el-input>
             </div>
@@ -36,26 +39,73 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        channelName: '',
-        channelCode: ''
+        ChannelId: '', // 渠道id
+        ChannelName: '', // 渠道名称
+        CaseId: '', // 案场id
+        OrgId: '', // 机构id
       }
     }
   },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  created () {
+    this.getChannelInfo()
+  },
   components: {},
   methods: {
-    submit () {
-      console.log(this.postData)
+    getChannelInfo () {
+      this.$ajax(this.$api.channelManager.getChannelInfo.url, {
+        method: this.$api.channelManager.getChannelInfo.method,
+        urlData: { channelId: this.$route.query.id }
+      }).then(res => {
+        this.postData = res
+      })
+    },
+    submit () { // 提交数据
+      if (this.postData.ChannelName === '') {
+        this.$message({
+          type: 'error',
+          message: '渠道名称不能为空'
+        })
+        return false
+      }
+      this.postData.OrgId = this.OrgId
+      if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
+      this.$ajax(this.$api.channelManager.editChannel.url, {
+        method: this.$api.channelManager.editChannel.method,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'channelList' })
+      })
     },
     cancel () {
-      this.$router.go(-1)
+      this.$router.push({ name: 'channelList' })
     }
   },
-  mounted () {}
+  mounted () { }
 }
 </script>
 

src/pages/system/channelManager/channelList/index.vue

@@ -26,16 +26,16 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="currentList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="channelName"
-          label="渠道名">
+          prop="CaseName"
+          label="案场">
         </el-table-column>
         <el-table-column
-          prop="channelCode"
-          label="渠道code">
+          prop="ChannelName"
+          label="渠道名称">
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -70,7 +70,7 @@ export default {
     return {
       total: 0,
       postData: { // 表格搜索条件
-        CaseId: '', // 案场id
+        caseid: '', // 案场id
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -87,10 +87,10 @@ export default {
     }),
     CaseId: {
       get () {
-        return this.postData.CaseId || this.defaultCaseId
+        return this.postData.caseid || this.defaultCaseId
       },
       set (val) {
-        this.postData.CaseId = val
+        this.postData.caseid = val
       }
     }
   },
@@ -101,13 +101,10 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
-        method: this.$api.goodsManager.getGoodsTypeList.method,
-        data: { ...this.postData, CaseId: this.CaseId }
+      this.$ajax(this.$api.channelManager.getChannelList.url, {
+        method: this.$api.channelManager.getChannelList.method,
+        queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum
@@ -117,7 +114,7 @@ export default {
       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editGoodsType', query: { id: row.TypeId } })
+      this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
     },
     handleDelete (index, row) { // 删除
       let name = '确认删除规格“' + row.TypeName + '”?'

src/pages/system/cmsManager/bannerManager/add.vue

@@ -63,13 +63,18 @@
           <span>图片：</span>
           <div class="flex-item">
             <el-upload
-              class="avatar-uploader"
-              :action='$api.file.image.url'
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess">
-              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              :action="$api.file.image.url"
+              :limit='limit'
+              list-type="picture-card"
+              :file-list='imgsArr'
+              :on-success="handlePictureCardPreview"
+              :on-remove="handleRemove"
+              :on-exceed="exceed">
+              <i class="el-icon-plus"></i>
             </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+              <img width="100%" :src="imgs" alt="">
+            </el-dialog>
           </div>
         </li>
         <!-- <li class="flex-h">
@@ -113,7 +118,11 @@ export default {
         Title: '',
         OrgId: '',
         CaseId: ''
-      }
+      },
+      dialogVisible: false,
+      imgs: '',
+      imgsArr: [],
+      limit: 1
     }
   },
   components: {},
@@ -137,6 +146,13 @@ export default {
     submit () {
       this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
+      this.postData.ImageUrl = ''
+      for (let i = 0; i < this.imgsArr.length; i++) {
+        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      }
+      if (this.postData.ImageUrl) {
+        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      }
       this.$ajax(this.$api.cms.addImage.url, {
         method: this.$api.cms.addImage.method,
         data: this.postData
@@ -156,8 +172,20 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handleAvatarSuccess (res, file) {
-      this.postData.ImageUrl = res.result.url
+    handlePictureCardPreview (res, file, fileList) {
+      this.imgs = res.result.url
+      this.dialogVisible = true
+      this.imgsArr = fileList
+    },
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
+    },
+    exceed () {
+      this.$message({
+        message: '超过可传的图片上限',
+        type: 'info',
+        duration: 1000
+      })
     }
   }
 }

src/pages/system/cmsManager/bannerManager/edit.vue

@@ -63,13 +63,18 @@
           <span>图片：</span>
           <div class="flex-item">
             <el-upload
-              class="avatar-uploader"
-              :action='$api.file.image.url'
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess">
-              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              :action="$api.file.image.url"
+              :limit='limit'
+              list-type="picture-card"
+              :file-list='imgsArr'
+              :on-success="handlePictureCardPreview"
+              :on-remove="handleRemove"
+              :on-exceed="exceed">
+              <i class="el-icon-plus"></i>
             </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+              <img width="100%" :src="imgs" alt="">
+            </el-dialog>
           </div>
         </li>
         <!-- <li class="flex-h">
@@ -113,7 +118,11 @@ export default {
         Title: '',
         OrgId: '',
         CaseId: ''
-      }
+      },
+      dialogVisible: false,
+      imgs: '',
+      imgsArr: [],
+      limit: 1
     }
   },
   components: {},
@@ -134,7 +143,13 @@ export default {
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
-      console.log(this.postData)
+      this.postData.ImageUrl = ''
+      for (let i = 0; i < this.imgsArr.length; i++) {
+        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      }
+      if (this.postData.ImageUrl) {
+        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      }
       this.$ajax(this.$api.cms.editImage.url, {
         method: this.$api.cms.editImage.method,
         data: this.postData,
@@ -157,9 +172,6 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handleAvatarSuccess (res, file) {
-      this.postData.ImageUrl = res.result.url
-    },
     getDetail () {
       this.$ajax(this.$api.cms.imageDetail.url, {
         method: this.$api.cms.imageDetail.method,
@@ -170,10 +182,36 @@ export default {
         console.log(res)
         res.Status = res.Status + ''
         res.ForwardType === 'url' ? res.ForwardType = '1' : res.ForwardType = '0'
+        let imgsArr = []
+        let item = {
+          url: res.ImageUrl,
+          response: {
+            result: {
+              url: res.ImageUrl
+            }
+          }
+        }
+        imgsArr.push(item)
+        this.imgsArr = imgsArr
         this.postData = res
       }).catch(msg => {
 
       })
+    },
+    handlePictureCardPreview (res, file, fileList) {
+      this.imgs = res.result.url
+      this.dialogVisible = true
+      this.imgsArr = fileList
+    },
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
+    },
+    exceed () {
+      this.$message({
+        message: '超过可传的图片上限',
+        type: 'info',
+        duration: 1000
+      })
     }
   }
 }

src/pages/system/cmsManager/bannerManager/index.vue

@@ -116,6 +116,7 @@ export default {
       this.$router.push({ name: 'addBanner' })
     },
     getList () {
+      this.tableData = []
       this.$ajax(this.$api.cms.imageList.url, {
         method: this.$api.cms.imageList.method,
         queryData: {

src/pages/system/cmsManager/indexMsg/edit.vue

@@ -106,7 +106,7 @@ export default {
         data: this.postData
       }).then(res => {
         this.$message({
-          message: '添加成功',
+          message: '编辑成功',
           type: 'success',
           duration: 1000
         })

src/pages/system/cmsManager/indexMsg/index.vue

@@ -104,30 +104,20 @@ export default {
       })
     },
     searchList (key) { // 搜索列表
-      this.$ajax(this.$api.cms.info.url, {
-        method: this.$api.cms.info.method,
-        queryData: {
-          page: this.postData.currentPage,
-          pagesize: 100,
-          title: key
-        }
-      }).then(res => {
-        this.tableData = res.list
-        this.postData.total = res.pagenum
-        this.postData.currentPage = res.page
-      }).catch(msg => {
-
-      })
+      this.tableSearch.key = key
+      this.getList()
     },
     addIndexMsg () {
       this.$router.push({ name: 'addIndexMsg' })
     },
     getList () {
+      this.tableData = []
       this.$ajax(this.$api.cms.info.url, {
         method: this.$api.cms.info.method,
         queryData: {
           page: this.postData.currentPage,
-          pagesize: this.postData.pageSize
+          pagesize: this.postData.pageSize,
+          title: this.tableSearch.key
         }
       }).then(res => {
         this.tableData = res.list

src/pages/system/cmsManager/majorProjects/add.vue

@@ -48,6 +48,7 @@
               :action="$api.file.image.url"
               list-type="picture-card"
               :on-success="handlePictureCardPreview"
+              :file-list='imgsArr'
               :on-remove="handleRemove">
               <i class="el-icon-plus"></i>
             </el-upload>
@@ -62,6 +63,7 @@
             <el-upload
               :action='$api.file.image.url'
               list-type="picture-card"
+              :file-list='detailimgsArr'
               :on-success="handlePictureCardPreviewDetail"
               :on-remove="handleRemoveDetail">
               <i class="el-icon-plus"></i>
@@ -89,8 +91,8 @@
           <span>是否前台展示：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-              <el-radio v-model="postData.IsAllCourse" label='1' >是</el-radio>
-              <el-radio v-model="postData.IsAllCourse" label='0' >否</el-radio>
+              <el-radio v-model="postData.Status" label='1' >是</el-radio>
+              <el-radio v-model="postData.Status" label='0' >否</el-radio>
             </div>
           </div>
         </li>
@@ -114,7 +116,7 @@ export default {
         Name: '',
         Title: '',
         DetailContent: '',
-        IsAllCourse: '1',
+        Status: '1',
         imgs: '',
         detailimgs: '',
         courseids: ''
@@ -139,6 +141,8 @@ export default {
     ...mapActions(['updateSystemInfo']),
     submit () {
       this.postData.OrgId = this.OrgId
+      this.postData.imgs = ''
+      this.postData.detailimgs = ''
       for (let i = 0; i < this.imgsArr.length; i++) {
         this.postData.imgs += this.imgsArr[i].response.result.url + ','
       }
@@ -166,29 +170,21 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file) {
+    handlePictureCardPreview (res, file, fileList) {
       this.imgs = res.result.url
       this.dialogVisible = true
-      this.imgsArr.push(file)
+      this.imgsArr = fileList
     },
-    handleRemove (file) {
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        if (this.imgsArr[i].uid === file.uid) {
-          this.imgsArr.splice(i, 1)
-        }
-      }
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
     },
-    handlePictureCardPreviewDetail (res, file) {
+    handlePictureCardPreviewDetail (res, file, fileList) {
       this.detailimgs = res.result.url
       this.dialogVisibleDetail = true
-      this.detailimgsArr.push(file)
+      this.detailimgsArr = fileList
     },
-    handleRemoveDetail (file) {
-      for (let i = 0; i < this.detailimgsArr.length; i++) {
-        if (this.detailimgsArr[i].uid === file.uid) {
-          this.detailimgsArr.splice(i, 1)
-        }
-      }
+    handleRemoveDetail (file, fileList) {
+      this.detailimgsArr = fileList
     }
   },
   created () {

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -47,6 +47,7 @@
             <el-upload
               :action="$api.file.image.url"
               list-type="picture-card"
+              :file-list='imgsArr'
               :on-success="handlePictureCardPreview"
               :on-remove="handleRemove">
               <i class="el-icon-plus"></i>
@@ -62,6 +63,7 @@
             <el-upload
               :action='$api.file.image.url'
               list-type="picture-card"
+              :file-list='detailimgsArr'
               :on-success="handlePictureCardPreviewDetail"
               :on-remove="handleRemoveDetail">
               <i class="el-icon-plus"></i>
@@ -89,8 +91,8 @@
           <span>是否前台展示：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-              <el-radio v-model="postData.IsAllCourse" label='1' >是</el-radio>
-              <el-radio v-model="postData.IsAllCourse" label='0' >否</el-radio>
+              <el-radio v-model="postData.Status" label='1' >是</el-radio>
+              <el-radio v-model="postData.Status" label='0' >否</el-radio>
             </div>
           </div>
         </li>
@@ -114,7 +116,7 @@ export default {
         Name: '',
         Title: '',
         DetailContent: '',
-        IsAllCourse: '1',
+        Status: '1',
         imgs: '',
         detailimgs: '',
         courseids: ''
@@ -138,20 +140,30 @@ export default {
   methods: {
     submit () {
       this.postData.OrgId = this.OrgId
+      this.postData.imgs = ''
+      this.postData.detailimgs = ''
       for (let i = 0; i < this.imgsArr.length; i++) {
         this.postData.imgs += this.imgsArr[i].response.result.url + ','
       }
-      this.postData.imgs = this.postData.imgs.substr(0, this.postData.imgs.length - 1)
+      if (this.postData.imgs) {
+        this.postData.imgs = this.postData.imgs.substr(0, this.postData.imgs.length - 1)
+      }
       for (let i = 0; i < this.detailimgsArr.length; i++) {
         this.postData.detailimgs += this.detailimgsArr[i].response.result.url + ','
       }
-      this.postData.detailimgs = this.postData.detailimgs.substr(0, this.postData.detailimgs.length - 1)
-      this.$ajax(this.$api.cms.addCase.url, {
-        method: this.$api.cms.addCase.method,
+      if (this.postData.detailimgs) {
+        this.postData.detailimgs = this.postData.detailimgs.substr(0, this.postData.detailimgs.length - 1)
+      }
+      console.log(this.postData)
+      this.$ajax(this.$api.cms.editCase.url, {
+        method: this.$api.cms.editCase.method,
+        urlData: {
+          id: this.$route.query.id
+        },
         data: this.postData
       }).then(res => {
         this.$message({
-          message: '添加成功',
+          message: '编辑成功',
           type: 'success',
           duration: 1000
         })
@@ -165,29 +177,22 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handlePictureCardPreview (res, file) {
+    handlePictureCardPreview (res, file, fileList) {
       this.imgs = res.result.url
       this.dialogVisible = true
-      this.imgsArr.push(file)
+      this.imgsArr = fileList
+      console.log(this.imgsArr)
     },
-    handleRemove (file) {
-      for (let i = 0; i < this.imgsArr.length; i++) {
-        if (this.imgsArr[i].uid === file.uid) {
-          this.imgsArr.splice(i, 1)
-        }
-      }
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
     },
-    handlePictureCardPreviewDetail (res, file) {
+    handlePictureCardPreviewDetail (res, file, fileList) {
       this.detailimgs = res.result.url
       this.dialogVisibleDetail = true
-      this.detailimgsArr.push(file)
+      this.detailimgsArr = fileList
     },
-    handleRemoveDetail (file) {
-      for (let i = 0; i < this.detailimgsArr.length; i++) {
-        if (this.detailimgsArr[i].uid === file.uid) {
-          this.detailimgsArr.splice(i, 1)
-        }
-      }
+    handleRemoveDetail (file, fileList) {
+      this.detailimgsArr = fileList
     },
     getDetail () {
       this.$ajax(this.$api.cms.caseDetail.url, {
@@ -197,7 +202,34 @@ export default {
         }
       }).then(res => {
         console.log(res)
-        res.IsAllCourse += ''
+        res.Status += ''
+        let imgsArr = []
+        let detailimgsArr = []
+        for (let i = 0; i < res.CmsCaseImgs.length; i++) {
+          if (res.CmsCaseImgs[i].ImageType === 'cover') {
+            let item = {
+              url: res.CmsCaseImgs[i].CaseImageUrl,
+              response: {
+                result: {
+                  url: res.CmsCaseImgs[i].CaseImageUrl
+                }
+              }
+            }
+            imgsArr.push(item)
+          } else if (res.CmsCaseImgs[i].ImageType === 'detail') {
+            let item = {
+              url: res.CmsCaseImgs[i].CaseImageUrl,
+              response: {
+                result: {
+                  url: res.CmsCaseImgs[i].CaseImageUrl
+                }
+              }
+            }
+            detailimgsArr.push(item)
+          }
+        }
+        this.imgsArr = imgsArr
+        this.detailimgsArr = detailimgsArr
         this.postData = res
       }).catch(msg => {
 

src/pages/system/cmsManager/majorProjects/index.vue

@@ -45,21 +45,17 @@
         </el-table-column>
         <el-table-column label="操作" width="450">
           <template slot-scope="scope">
-            <el-button v-if="!scope.row.isShow"
+            <el-button
               size="mini"
               type="primary"
-              @click="showItem(scope.$index, scope.row)">前台展示</el-button>
-            <el-button v-if="scope.row.isShow"
-              size="mini"
-              type="danger"
-              @click="cancelShowItem(scope.$index, scope.row)">取消前台展示</el-button>
+              @click="showItem(scope.$index, scope.row)"><span v-if="scope.row.Status === 1">取消前台展示</span><span v-if="scope.row.Status === 0">前台展示</span></el-button>
             <el-button
               size="mini"
               type="warning"
               @click="editItem(scope.$index, scope.row)">编辑</el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
-              @click="copyItemUrl(scope.$index, scope.row)">复制专题链接</el-button>
+              @click="copyItemUrl(scope.$index, scope.row)">复制专题链接</el-button> -->
             <el-button
               size="mini"
               type="danger"
@@ -121,18 +117,16 @@ export default {
       this.getList()
     },
     showItem (index, row) { // 前台显示
-      console.log(index, row)
-    },
-    cancelShowItem (index, row) { // 取消前台显示
-      console.log(index, row)
+      this.editIsAllCourse(row)
     },
     editItem (index, row) { // 编辑
       console.log(index, row)
       this.$router.push({ name: 'editIndexCase', query: { id: row.CmsCaseId } })
     },
-    copyItemUrl (index, row) { // 复制专题链接
-      console.log(index, row)
-    },
+    // copyItemUrl (index, row) { // 复制专题链接
+    //   console.log(index, row)
+    //   window.clipboardData.setData('Text', row.Title)
+    // },
     deleteItem (index, row) { // 删除
       console.log(index, row)
       this.$confirm('确认删除此项目专题?', '提示', {
@@ -149,18 +143,21 @@ export default {
       })
     },
     searchList (key) { // 搜索列表
-      console.log(key)
+      this.tableSearch.key = key
+      this.getList()
     },
     addMajorProjects () {
       this.$router.push({ name: 'addIndexCase' })
     },
     getList () {
+      this.tableData = []
       this.$ajax(this.$api.cms.case.url, {
         method: this.$api.cms.case.method,
         queryData: {
           page: this.postData.currentPage,
           pagesize: this.postData.pageSize,
-          caseid: this.tableSearch.caseId
+          caseid: this.tableSearch.caseId,
+          name: this.tableSearch.key
         }
       }).then(res => {
         for (let i = 0; i < res.list.length; i++) {
@@ -188,7 +185,26 @@ export default {
       }).catch(msg => {
 
       })
-    }
+    },
+    editIsAllCourse (data) {
+      console.log(data)
+      let api = data.Status === 1 ? this.$api.cms.caseHide : this.$api.cms.caseShow
+      this.$ajax(api.url, {
+        method: api.method,
+        urlData: {
+          id: data.CmsCaseId
+        }
+      }).then(res => {
+        this.$message({
+          message: '编辑成功',
+          type: 'success',
+          duration: 1000
+        })
+        this.getList()
+      }).catch(msg => {
+
+      })
+    },
   }
 }
 </script>

src/pages/system/cmsManager/newsManager/add.vue

@@ -36,7 +36,7 @@
           <span>图片位置：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.LocationId" placeholder="请选择">
+              <el-select v-model="postData.LocationIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in positionList"
                   :key="item.LocationId"
@@ -63,13 +63,18 @@
           <span>图片：</span>
           <div class="flex-item">
             <el-upload
-              class="avatar-uploader"
-              :action='$api.file.image.url'
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess">
-              <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              :action="$api.file.image.url"
+              :limit='limit'
+              list-type="picture-card"
+              :file-list='imgsArr'
+              :on-success="handlePictureCardPreview"
+              :on-remove="handleRemove"
+              :on-exceed="exceed">
+              <i class="el-icon-plus"></i>
             </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+              <img width="100%" :src="imgs" alt="">
+            </el-dialog>
           </div>
         </li>
         <li style="text-align:center">
@@ -82,7 +87,8 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
   data () {
@@ -92,26 +98,46 @@ export default {
         ForwardUrl: '',
         ForwardResourceId: '',
         Status: '1',
-        LocationIds: '1',
+        LocationIds: [],
         ImageUrl: '',
         Title: '',
         OrgId: '',
         CaseId: ''
-      }
+      },
+      dialogVisible: false,
+      imgs: '',
+      imgsArr: [],
+      limit: 1
     }
   },
   components: {},
+  created () {
+    this.updateSystemInfo().then(() => {
+      this.postData.OrgId = this.OrgId
+      this.postData.CaseId = this.CaseId
+    })
+  },
   computed: {
     ...mapState({
       positionList: x => x.cms.location,
       OrgId: x => x.app.user.OrgId,
+      CaseId: x => x.app.cases.default,
     })
   },
   methods: {
+    ...mapActions(['updateSystemInfo']),
+    ...mapCmsActions(['updateLocationInfo']),
     submit () {
       console.log(this.postData)
-      this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
+      this.postData.locationids = this.postData.LocationIds.join(',')
+      this.postData.ImageUrl = ''
+      for (let i = 0; i < this.imgsArr.length; i++) {
+        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      }
+      if (this.postData.ImageUrl) {
+        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      }
       this.$ajax(this.$api.cms.addNews.url, {
         method: this.$api.cms.addNews.method,
         data: this.postData
@@ -131,9 +157,20 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    handleAvatarSuccess (res, file) {
-      console.log(res)
-      this.postData.ImageUrl = res.result.url
+    handlePictureCardPreview (res, file, fileList) {
+      this.imgs = res.result.url
+      this.dialogVisible = true
+      this.imgsArr = fileList
+    },
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
+    },
+    exceed () {
+      this.$message({
+        message: '超过可传的图片上限',
+        type: 'info',
+        duration: 1000
+      })
     }
   }
 }

src/pages/system/cmsManager/newsManager/edit.vue

@@ -6,8 +6,8 @@
           <span>跳转类型：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-                <el-radio v-model="postData.jumpType" label='0' >连接</el-radio>
-                <el-radio v-model="postData.jumpType" label='1' >课程</el-radio>
+                <el-radio v-model="postData.ForwardType" label='1' >连接</el-radio>
+                <el-radio v-model="postData.ForwardType" label='0' >课程</el-radio>
             </div>
           </div>
         </li>
@@ -17,7 +17,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入连接"
-                v-model="postData.link"
+                v-model="postData.ForwardUrl"
                 clearable>
               </el-input>
             </div>
@@ -27,8 +27,8 @@
           <span>是否发布：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-              <el-radio v-model="postData.release" label='0' >是</el-radio>
-                <el-radio v-model="postData.release" label='1' >否</el-radio>
+              <el-radio v-model="postData.Status" label='1' >是</el-radio>
+                <el-radio v-model="postData.Status" label='0' >否</el-radio>
             </div>
           </div>
         </li>
@@ -36,33 +36,24 @@
           <span>图片位置：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.position" placeholder="请选择">
+              <el-select v-model="postData.LocationIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in positionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                  :key="item.LocationId"
+                  :label="item.LocationName"
+                  :value="item.LocationId">
                 </el-option>
               </el-select>
             </div>
           </div>
         </li>
-        <li class="flex-h">
-          <span>是否推荐到首页：</span>
-          <div class="flex-item">
-            <div style="width:50%" class="radio">
-              <el-radio v-model="postData.index" label='0' >是</el-radio>
-                <el-radio v-model="postData.index" label='1' >否</el-radio>
-            </div>
-          </div>
-        </li>
         <li class="flex-h">
           <span>标题：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入真实姓名"
-                v-model="postData.realName"
+                placeholder="请输入标题"
+                v-model="postData.Title"
                 clearable>
               </el-input>
             </div>
@@ -71,13 +62,19 @@
         <li class="flex-h">
           <span>图片：</span>
           <div class="flex-item">
-            <div>
-              <a class="formImg">
-                <img src="" class="centerLabel contain" alt="">
-                <i class="iconfont icon-quxiao"></i>
-              </a>
-              <el-button type="success" size="mini">上传图片</el-button>
-            </div>
+            <el-upload
+              :action="$api.file.image.url"
+              :limit='limit'
+              list-type="picture-card"
+              :file-list='imgsArr'
+              :on-success="handlePictureCardPreview"
+              :on-remove="handleRemove"
+              :on-exceed="exceed">
+              <i class="el-icon-plus"></i>
+            </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+              <img width="100%" :src="imgs" alt="">
+            </el-dialog>
           </div>
         </li>
         <li style="text-align:center">
@@ -90,42 +87,122 @@
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
   data () {
     return {
       postData: {
-        jumpType: '0',
-        link: '',
-        release: '0',
-        position: '',
-        index: '0'
+        ForwardType: '1',
+        ForwardUrl: '',
+        ForwardResourceId: '',
+        Status: '1',
+        LocationIds: [],
+        ImageUrl: '',
+        Title: '',
+        OrgId: '',
+        CaseId: ''
       },
-      positionList: [{
-        value: '0',
-        label: '首页'
-      }, {
-        value: '1',
-        label: '精选'
-      }, {
-        value: '2',
-        label: '社交'
-      }, {
-        value: '3',
-        label: '健身'
-      }],
+      dialogVisible: false,
+      imgs: '',
+      imgsArr: [],
+      limit: 1
     }
   },
   components: {},
+  created () {
+    this.updateLocationInfo().then(() => {
+      this.getDetail()
+    })
+  },
+  computed: {
+    ...mapState({
+      positionList: x => x.cms.location
+    })
+  },
   methods: {
+    ...mapCmsActions(['updateLocationInfo']),
     submit () {
       console.log(this.postData)
+      this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
+      this.postData.locationids = this.postData.LocationIds.join(',')
+      this.postData.ImageUrl = ''
+      for (let i = 0; i < this.imgsArr.length; i++) {
+        this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
+      }
+      if (this.postData.ImageUrl) {
+        this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
+      }
+      this.$ajax(this.$api.cms.editNews.url, {
+        method: this.$api.cms.editNews.method,
+        urlData: {
+          id: this.$route.query.id
+        },
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          message: '编辑成功',
+          type: 'success',
+          duration: 1000
+        })
+        setTimeout(() => {
+          this.$router.push({ name: 'newsManager' })
+        }, 1000)
+      }).catch(msg => {
+
+      })
     },
     cancel () {
       this.$router.go(-1)
+    },
+    handlePictureCardPreview (res, file, fileList) {
+      this.imgs = res.result.url
+      this.dialogVisible = true
+      this.imgsArr = fileList
+    },
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
+    },
+    exceed () {
+      this.$message({
+        message: '超过可传的图片上限',
+        type: 'info',
+        duration: 1000
+      })
+    },
+    getDetail () {
+      this.$ajax(this.$api.cms.newsDetail.url, {
+        method: this.$api.cms.newsDetail.method,
+        urlData: {
+          id: this.$route.query.id
+        }
+      }).then(res => {
+        res.ForwardType === 'url' ? res.ForwardType = '1' : res.ForwardType = '0'
+        res.Status += ''
+        res.LocationIds = res.NewsLocations.reduce((previousValue, currentValue, index, array) => {
+          console.log(previousValue)
+          previousValue.push(currentValue.LocationId)
+          return previousValue
+        }, [])
+        console.log(res.LocationIds)
+        let imgsArr = []
+        let item = {
+          url: res.ImageUrl,
+          response: {
+            result: {
+              url: res.ImageUrl
+            }
+          }
+        }
+        imgsArr.push(item)
+        this.imgsArr = imgsArr
+        this.postData = res
+      }).catch(msg => {
+
+      })
     }
-  },
-  mounted () { }
+  }
 }
 </script>
 

src/pages/system/cmsManager/newsManager/index.vue

@@ -41,7 +41,7 @@
           label="标题">
         </el-table-column>
         <el-table-column
-          prop="LocationShow"
+          prop="LocationNames"
           label="位置">
         </el-table-column>
         <el-table-column
@@ -65,9 +65,9 @@
     <el-pagination
       @current-change="handleCurrentChange"
       :current-page.sync="postData.currentPage"
-      :page-size="10"
+      :page-size="postData.pageSize"
       layout="prev, pager, next, jumper"
-      :total="100">
+      :total="postData.total">
     </el-pagination>
   </div>
 </template>
@@ -112,7 +112,7 @@ export default {
     },
     handleEdit (index, row) { // 编辑
       console.log(index, row)
-      this.$router.push({ name: 'editNews' })
+      this.$router.push({ name: 'editNews', query: { id: row.NewsId } })
     },
     handleDelete (index, row) { // 删除
       console.log(index, row)
@@ -121,10 +121,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        })
+        this.deleteNews(row.NewsId)
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -133,37 +130,47 @@ export default {
       })
     },
     searchList (key) { // 搜索列表
-      console.log(key)
+      this.tableSearch.key = key
+      this.getList()
     },
     addNews () {
       this.$router.push({ name: 'addNews' })
     },
     getList () {
+      this.tableData = []
       this.$ajax(this.$api.cms.news.url, {
         method: this.$api.cms.news.method,
         queryData: {
           page: this.postData.currentPage,
           pagesize: this.postData.pageSize,
-          locationid: this.tableSearch.LocationId
+          locationid: this.tableSearch.LocationId,
+          title: this.tableSearch.key
         }
       }).then(res => {
-        let that = this
-        console.log(that.positionList)
-        console.log(res.list)
         for (let i = 0; i < res.list.length; i++) {
           res.list[i].Status === 1 ? res.list[i].StatusShow = '是' : res.list[i].StatusShow = '否'
-          for (let j = 0; j < that.positionList.length; i++) {
-            if (res.list[i].LocationIds === that.positionList[j].LocationId) {
-              res.list[i].LocationShow = that.positionList[j].LocationName
-            }
-          }
         }
-        console.log(res.list)
         this.tableData = res.list
         this.postData.total = res.pagenum
         this.postData.currentPage = res.page
       }).catch(msg => {
 
+      })
+    },
+    deleteNews (id) {
+      this.$ajax(this.$api.cms.deleteNews.url, {
+        method: this.$api.cms.deleteNews.method,
+        urlData: {
+          id: id
+        }
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+        this.getList()
+      }).catch(msg => {
+
       })
     }
   }

src/pages/system/dataStatistics/frontEndUserList/index.vue

@@ -3,147 +3,91 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h"></div>
-        <tableSearch value="请输入用户名称" @exportSearchKey="searchList"></tableSearch>
+        <tableSearch value="请输入用户手机号" @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="currentList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="name"
+          prop="Name"
           label="姓名">
         </el-table-column>
         <el-table-column
-          prop="phone"
+          prop="Phone"
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="nickName"
+          prop="CustomerName"
           label="微信昵称">
         </el-table-column>
         <el-table-column
-          prop="recommendName"
+          prop="RecommendName"
           label="推荐人">
         </el-table-column>
         <el-table-column
-          prop="integral"
+          prop="Points"
           label="积分">
-          <template slot-scope="scope">
-            -
-          </template>
         </el-table-column>
         <el-table-column
-          prop="openId"
+          prop="OpenId"
           label="openId">
         </el-table-column>
-        <el-table-column
-          prop="creatTime"
-          label="创建时间">
-        </el-table-column>
       </el-table>
     </div>
     <el-pagination
-      @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      :page-size="10"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
-      :total="100">
+      :total="total">
     </el-pagination>
   </div>
 </template>
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
-import { createNamespacedHelpers } from 'vuex'
-
-const { mapState: mapCaseState } = createNamespacedHelpers('case')
 
 export default {
   name: '',
   data () {
     return {
-      currentPage: 0, // 当前页码
-      tableSearch: { // 表格搜索条件
-        key: '', // 搜索关键字
-        caseId: '', // 案场id
+      total: 0,
+      postData: { // 表格搜索条件
+        phone: '', // 手机号
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
       },
-      tableData: [{
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }]
+      currentList: [],
     }
   },
-  computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
-    })
-  },
   components: {
     tableSearch,
   },
+  created () {
+    this.getList()
+  },
   methods: {
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-    },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+      this.getList()
     },
-    handleEdit (index, row) { // 编辑
-      console.log(index, row)
+    searchList (key) { // 搜索列表
+      this.postData.phone = key
+      this.postData.page = 1
+      this.getList()
     },
-    handleDelete (index, row) { // 删除
-      console.log(index, row)
-      this.$confirm('确认删除此渠道?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
+    getList () {
+      this.$ajax(this.$api.dataStatistics.getCustomerList.url, {
+        method: this.$api.dataStatistics.getCustomerList.method,
+        queryData: this.postData
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
       })
-    },
-    searchList (key) { // 搜索列表
-      console.log(key)
     }
   }
 }

src/pages/system/index.vue

@@ -3,10 +3,18 @@
     <div class="system-header flex-h">
       <i class="iconfont icon-yinchenglogo"></i>
       <span>银城-城的空间</span>
-      <div class="flex-item flex-h">
+      <div class="flex-item flex-h" style="overflow: visible;">
         <div class="flex-item"></div>
-        <span class="characterMark">用户角色</span>
-        <a class="userIcon"></a>
+        <span class="characterMark">{{user.UserName}}</span>
+        <div class="userIconBox">
+          <a class="userIcon">
+            <img :src="user.Headimgurl" class="centerLabel cover" alt="">
+          </a>
+          <ul class="userSet">
+            <li @click="signout">登出</li>
+            <li @click="editPassword">修改密码</li>
+          </ul>
+        </div>
       </div>
     </div>
     <div class="flex-item flex-h">
@@ -24,6 +32,22 @@
         </div>
       </div>
     </div>
+    <el-dialog title="修改密码" :visible.sync="dialogFormVisible">
+      <el-input
+        placeholder="请输入旧密码"
+        v-model="postData.oriPasswd"
+        clearable>
+      </el-input>
+      <el-input style="margin-top:20px;"
+        placeholder="请输入新密码"
+        v-model="postData.newPasswd"
+        clearable>
+      </el-input>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitPasswd">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -36,12 +60,18 @@ export default {
   name: '',
   data () {
     return {
+      dialogFormVisible: false,
+      postData: {
+        oriPasswd: '', // 旧密码
+        newPasswd: '', // 新密码
+      },
     }
   },
   computed: {
     ...mapState({
       breadCrumb: x => x.app.breadcrumb,
       pageMenu: x => x.app.menus,
+      user: x => x.app.user,
     })
   },
   components: {
@@ -53,6 +83,38 @@ export default {
     this.updateBread({ routerData, Url: this.$route.name })
   },
   methods: {
+    submitPasswd () { // 修改密码
+      var aData = {
+        oriPasswd: this.md5(this.postData.oriPasswd),
+        newPasswd: this.md5(this.postData.newPasswd)
+      }
+      this.$ajax(this.$api.system.editPassword.url, {
+        method: this.$api.system.editPassword.method,
+        urlData: { id: this.user.UserId },
+        data: aData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功!'
+        })
+        this.$cookie.set('accountInfo', null)
+        this.$router.push({ name: 'login' })
+      })
+    },
+    editPassword () { // 修改密码
+      this.dialogFormVisible = true
+    },
+    signout () { // 登出
+      this.$ajax(this.$api.system.signout.url, {
+        method: this.$api.system.signout.method,
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功!'
+        })
+        this.$router.push({ name: 'login' })
+      })
+    },
     ...mapMutations([
       'updateBread'
     ]),

src/pages/system/page.js

@@ -12,6 +12,8 @@ import caseManager from './caseManager/index' // 案场管理
 import caseInfo from './caseManager/caseInfo/index' // 案场信息
 import addCase from './caseManager/caseInfo/addCase/index' // 新增案场
 import editCase from './caseManager/caseInfo/editCase/index' // 新增案场
+import pplConcerned from './caseManager/caseInfo/pplConcerned/index' // 相关人员
+import editPPLConcerned from './caseManager/caseInfo/pplConcerned/editPPLConcerned/index' // 编辑相关人员
 import keyManager from './caseManager/keyManager/index' // 钥匙管理
 import addKey from './caseManager/keyManager/add' // 新增钥匙
 import caseAreaManager from './caseManager/caseAreaManager/index' // 案场区域管理
@@ -116,6 +118,16 @@ export default {
             name: 'editCase',
             component: editCase,
             children: []
+          }, { // 相关人员
+            path: 'pplConcerned',
+            name: 'pplConcerned',
+            component: pplConcerned,
+            children: [{ // 编辑相关人员
+              path: 'editPPLConcerned',
+              name: 'editPPLConcerned',
+              component: editPPLConcerned,
+              children: []
+            }]
           }]
         }, { // 钥匙管理
           path: 'keyManager',

src/pages/system/page.scss

@@ -58,6 +58,49 @@
     border-radius: 100%;
     background: #eee;
     margin: 0 20px 0 10px;
+    display: block;
+  }
+
+  .userIconBox{
+    position: relative;
+    overflow: visible;
+    .userSet{
+      display: none;
+      position: absolute;
+      right: 30px;
+      top: 40px;
+      background: #fff;
+      padding: 5px 0;
+      box-shadow: 0 0 20px 2px rgba(0, 0, 0, .1);
+      li{
+        display: block;
+        line-height: 30px;
+        white-space: nowrap;
+        color: #666;
+        font-size: 13px;
+        padding: 0 15px;
+        &:hover{
+          cursor: pointer;
+          background: #eee;
+        }
+      }
+      &::after{
+        content: '';
+        position: absolute;
+        width: 0;
+        height: 0;
+        border-style: dashed dashed solid dashed;
+        border-width: 8px;
+        border-color: transparent transparent #fff transparent;
+        right: 0;
+        top: -14px;
+      }
+    }
+    &:hover{
+      &>.userSet{
+        display: inline-block;
+      }
+    }
   }
 
 }

src/pages/system/systemSet/userManager/index.vue

@@ -271,6 +271,7 @@ export default {
       }).then(res => {
         if (res !== null) this.tags = res
         this.currentEditItem = row
+        this.getRole()
         this.dialogTableVisible = true
       })
     },
@@ -291,7 +292,7 @@ export default {
     getRole () { // 绑定角色搜索事件，发送请求搜索角色列表
       this.$ajax(this.$api.caseManager.getRolesList.url, {
         method: this.$api.caseManager.getRolesList.method,
-        data: this.postData
+        queryData: this.postData
       }).then(res => {
         this.searchTagList = res.list
       })

src/store/app.js

@@ -38,7 +38,7 @@ function packChildren (data) {
       }
     }
 
-    if (!found) {
+    if (!found && cp[inx].IsShow === 1) {
       res.push(cp[inx])
     }
   })

src/util/api.js

@@ -13,7 +13,15 @@ const $api = {
     init: { // 初始化菜单
       method: 'get',
       url: `${baseUrl}${common}/system/init`
-    }
+    },
+    signout: { // 登出
+      method: 'post',
+      url: `${baseUrl}${common}/signout`
+    },
+    editPassword: { // 修改密码
+      method: 'put',
+      url: `${baseUrl}${common}/user/:id/password`
+    },
   },
   systemSet: {
     getUserList: { // 获取用户列表
@@ -48,7 +56,19 @@ const $api = {
   channelManager: {
     getChannelList: { // 渠道列表
       method: 'get',
-      url: `${baseUrl}${common}/`
+      url: `${baseUrl}${common}/channel`
+    },
+    getChannelInfo: { // 获取渠道信息
+      method: 'get',
+      url: `${baseUrl}${common}/channel/:channelId`
+    },
+    addChannel: { // 新增渠道
+      method: 'post',
+      url: `${baseUrl}${common}/channel`
+    },
+    editChannel: { // 更新渠道
+      method: 'put',
+      url: `${baseUrl}${common}/channel`
     },
   },
   caseManager: {
@@ -72,6 +92,22 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/case/info/:id`
     },
+    getCaseUserList: { // 获取案场相关人员列表
+      method: 'get',
+      url: `${baseUrl}${common}/case/user`
+    },
+    getCaseUserInfo: { // 获取案场相关人员信息
+      method: 'get',
+      url: `${baseUrl}${common}/case/user/:id`
+    },
+    addCaseUser: { // 新增案场相关人员
+      method: 'post',
+      url: `${baseUrl}${common}/case/user`
+    },
+    editCaseUser: { // 更新案场相关人员
+      method: 'put',
+      url: `${baseUrl}${common}/case/user`
+    },
     getKeyList: { // 获取钥匙列表
       method: 'get',
       url: `${baseUrl}${common}/case/key`
@@ -252,25 +288,33 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}${common}/cms/info/:id`
     },
-    news: { // 咨询列表
+    news: { // 咨讯列表
       method: 'get',
       url: `${baseUrl}${common}/cms/news`
     },
-    newsDetail: { // 咨询详情
+    newsDetail: { // 咨讯详情
       method: 'get',
       url: `${baseUrl}${common}/cms/news/:id`
     },
-    addNews: { // 新增咨询
+    addNews: { // 新增咨讯
       method: 'post',
       url: `${baseUrl}${common}/cms/news`
     },
-    editNews: { // 编辑咨询
+    editNews: { // 编辑咨讯
       method: 'put',
       url: `${baseUrl}${common}/cms/news/:id`
     },
-    deleteNews: { // 删除咨询
+    deleteNews: { // 删除咨讯
       method: 'delete',
       url: `${baseUrl}${common}/cms/news/:id`
+    },
+    caseShow: { // 前台展示
+      method: 'put',
+      url: `${baseUrl}${common}/cms/caseshow/:id`
+    },
+    caseHide: { // 取消前台展示
+      method: 'put',
+      url: `${baseUrl}${common}/cms/casehide/:id`
     }
   },
   file: {
@@ -309,5 +353,11 @@ const $api = {
       url: `${baseUrl}${common}/rolemenu/:id`
     },
   },
+  dataStatistics: {
+    getCustomerList: { // 获取会员列表
+      method: 'get',
+      url: `${baseUrl}${common}/customer`
+    }
+  },
 }
 export default $api