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

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

           <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">
         Title: '',
         OrgId: '',
         CaseId: ''
-      }
+      },
+      dialogVisible: false,
+      imgs: '',
+      imgsArr: [],
+      limit: 1
     }
   },
   components: {},
     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
     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

           <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">
         Title: '',
         OrgId: '',
         CaseId: ''
-      }
+      },
+      dialogVisible: false,
+      imgs: '',
+      imgsArr: [],
+      limit: 1
     }
   },
   components: {},
       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,
     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,
         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

       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

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

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

       })
     },
     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

               :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>
             <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>
           <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>
         Name: '',
         Title: '',
         DetailContent: '',
-        IsAllCourse: '1',
+        Status: '1',
         imgs: '',
         detailimgs: '',
         courseids: ''
     ...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 + ','
       }
     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

             <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>
             <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>
           <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>
         Name: '',
         Title: '',
         DetailContent: '',
-        IsAllCourse: '1',
+        Status: '1',
         imgs: '',
         detailimgs: '',
         courseids: ''
   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
         })
     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, {
         }
       }).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

         </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"
       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('确认删除此项目专题?', '提示', {
       })
     },
     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++) {
       }).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

           <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"
           <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">
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
   data () {
         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
     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

           <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>
             <div style="width:50%">
               <el-input
                 placeholder="请输入连接"
-                v-model="postData.link"
+                v-model="postData.ForwardUrl"
                 clearable>
               </el-input>
             </div>
           <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>
           <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>
         <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">
 </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

           label="标题">
         </el-table-column>
         <el-table-column
-          prop="LocationShow"
+          prop="LocationNames"
           label="位置">
         </el-table-column>
         <el-table-column
     <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>
     },
     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)
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        })
+        this.deleteNews(row.NewsId)
       }).catch(() => {
         this.$message({
           type: 'info',
       })
     },
     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/util/api.js

       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: {