ytj

src/main.js

@@ -10,6 +10,7 @@ import './style/main.css'
 import router from './router'
 import Ajax from './util/ajax'
 import api from './util/api'
+import toolClass from './util/util'
 import store from './store'
 import Vuex from 'vuex'
 import md5 from 'js-md5'
@@ -31,6 +32,7 @@ Vue.prototype.$api = api
 Vue.prototype.$ajax = Ajax
 Vue.prototype.md5 = md5
 Vue.prototype.Base64 = Base64
+Vue.prototype.toolClass = toolClass
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

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

@@ -72,7 +72,7 @@
             </el-upload>
           </div>
         </li>
-        <li class="flex-h">
+        <!-- <li class="flex-h">
           <span>对应案场：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -86,7 +86,7 @@
               </el-select>
             </div>
           </div>
-        </li>
+        </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>
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
@@ -108,7 +108,7 @@ export default {
         ForwardUrl: '',
         ForwardResourceId: '',
         Status: '1',
-        LocationId: '',
+        LocationId: '1',
         ImageUrl: '',
         Title: '',
         OrgId: '',
@@ -119,7 +119,9 @@ export default {
   components: {},
   created () {
     this.updateLocationInfo()
-    this.postData.CaseId = this.defaultCaseId
+    this.updateSystemInfo().then(() => {
+      this.postData.CaseId = this.defaultCaseId
+    })
   },
   computed: {
     ...mapState({
@@ -131,9 +133,10 @@ export default {
   },
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
+    ...mapActions(['updateSystemInfo']),
     submit () {
       this.postData.OrgId = this.OrgId
-      console.log(this.postData)
+      this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.$ajax(this.$api.cms.addImage.url, {
         method: this.$api.cms.addImage.method,
         data: this.postData

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

@@ -72,7 +72,7 @@
             </el-upload>
           </div>
         </li>
-        <li class="flex-h">
+        <!-- <li class="flex-h">
           <span>对应案场：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -86,7 +86,7 @@
               </el-select>
             </div>
           </div>
-        </li>
+        </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>
@@ -133,6 +133,7 @@ export default {
     submit () {
       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.$ajax(this.$api.cms.editImage.url, {
         method: this.$api.cms.editImage.method,
@@ -168,6 +169,7 @@ export default {
       }).then(res => {
         console.log(res)
         res.Status = res.Status + ''
+        res.ForwardType === 'url' ? res.ForwardType = '1' : res.ForwardType = '0'
         this.postData = res
       }).catch(msg => {
 

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

@@ -57,7 +57,7 @@
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
-import { mapState, createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
@@ -80,11 +80,14 @@ export default {
     tableSearch,
   },
   created () {
+    this.updateSystemInfo().then(() => {
+      this.getList()
+    })
     this.updateLocationInfo()
-    this.getList()
   },
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
+    ...mapActions(['updateSystemInfo']),
     handleCurrentChange (val) {
       this.postData.currentPage = val
       this.getList()

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

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
@@ -84,7 +84,9 @@ export default {
   components: {},
   created () {
     this.updateLocationInfo()
-    this.postData.CaseId = this.defaultCaseId
+    this.updateSystemInfo().then(() => {
+      this.postData.CaseId = this.defaultCaseId
+    })
   },
   computed: {
     ...mapState({
@@ -96,6 +98,7 @@ export default {
   },
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
+    ...mapActions(['updateSystemInfo']),
     submit () {
       console.log(this.postData)
       this.postData.OrgId = this.OrgId
@@ -118,8 +121,7 @@ export default {
     cancel () {
       this.$router.go(-1)
     }
-  },
-  mounted () { }
+  }
 }
 </script>
 

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

@@ -5,7 +5,7 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addIndexMsg'>新增消息</el-button>
         </div>
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <tableSearch value="请输入标题" @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -104,7 +104,20 @@ export default {
       })
     },
     searchList (key) { // 搜索列表
-      console.log(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 => {
+
+      })
     },
     addIndexMsg () {
       this.$router.push({ name: 'addIndexMsg' })

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

@@ -104,7 +104,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: '',
   data () {
@@ -136,6 +136,7 @@ export default {
     })
   },
   methods: {
+    ...mapActions(['updateSystemInfo']),
     submit () {
       this.postData.OrgId = this.OrgId
       for (let i = 0; i < this.imgsArr.length; i++) {
@@ -188,13 +189,12 @@ export default {
           this.detailimgsArr.splice(i, 1)
         }
       }
-    },
-    spli (arr) {
-      console.log(arr)
     }
   },
   created () {
-    this.postData.CaseId = this.defaultCaseId
+    this.updateSystemInfo().then(() => {
+      this.postData.CaseId = this.defaultCaseId
+    })
   }
 }
 </script>

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

@@ -189,11 +189,24 @@ export default {
         }
       }
     },
-    spli (arr) {
-      console.log(arr)
+    getDetail () {
+      this.$ajax(this.$api.cms.caseDetail.url, {
+        method: this.$api.cms.caseDetail.method,
+        urlData: {
+          id: this.$route.query.id
+        }
+      }).then(res => {
+        console.log(res)
+        res.IsAllCourse += ''
+        this.postData = res
+      }).catch(msg => {
+
+      })
     }
   },
-  mounted () { }
+  created () {
+    this.getDetail()
+  }
 }
 </script>
 

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

@@ -28,19 +28,19 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="name"
+          prop="Name"
           label="名称">
         </el-table-column>
         <el-table-column
-          prop="title"
+          prop="Title"
           label="标题">
         </el-table-column>
         <el-table-column
-          prop="caseName"
+          prop="CaseName"
           label="对应案场">
         </el-table-column>
         <el-table-column
-          prop="creatTime"
+          prop="CreateDate"
           label="创建时间">
         </el-table-column>
         <el-table-column label="操作" width="450">
@@ -80,7 +80,7 @@
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 
 export default {
   name: '',
@@ -95,31 +95,7 @@ export default {
         key: '', // 搜索关键字
         caseId: '', // 案场id
       },
-      tableData: [{
-        name: 'xxx',
-        title: 'xxx',
-        caseName: 'xxx',
-        creatTime: 'xxx',
-        isShow: false
-      }, {
-        name: 'xxx',
-        title: 'xxx',
-        caseName: 'xxx',
-        creatTime: 'xxx',
-        isShow: false
-      }, {
-        name: 'xxx',
-        title: 'xxx',
-        caseName: 'xxx',
-        creatTime: 'xxx',
-        isShow: false
-      }, {
-        name: 'xxx',
-        title: 'xxx',
-        caseName: 'xxx',
-        creatTime: 'xxx',
-        isShow: false
-      }]
+      tableData: []
     }
   },
   computed: {
@@ -133,10 +109,13 @@ export default {
     tableSearch,
   },
   created () {
-    this.getList()
-    this.tableSearch.caseId = this.defaultCaseId
+    this.updateSystemInfo().then(() => {
+      this.tableSearch.caseId = this.defaultCaseId
+      this.getList()
+    })
   },
   methods: {
+    ...mapActions(['updateSystemInfo']),
     handleCurrentChange (val) {
       this.postData.currentPage = val - 1
       this.getList()
@@ -149,7 +128,7 @@ export default {
     },
     editItem (index, row) { // 编辑
       console.log(index, row)
-      this.$router.push({ name: 'editIndexCase', query: { id: row.id } })
+      this.$router.push({ name: 'editIndexCase', query: { id: row.CmsCaseId } })
     },
     copyItemUrl (index, row) { // 复制专题链接
       console.log(index, row)
@@ -161,10 +140,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        })
+        this.deleteInfo(row.CmsCaseId)
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -183,10 +159,32 @@ export default {
         method: this.$api.cms.case.method,
         queryData: {
           page: this.postData.currentPage,
-          pagesize: this.postData.pageSize
+          pagesize: this.postData.pageSize,
+          caseid: this.tableSearch.caseId
         }
       }).then(res => {
-        console.log(res)
+        for (let i = 0; i < res.list.length; i++) {
+          res.list[i].CreateDate = this.toolClass.dateFormat(res.list[i].CreateDate)
+        }
+        this.tableData = res.list
+        this.postData.total = res.pagenum
+        this.postData.currentPage = res.page
+      }).catch(msg => {
+
+      })
+    },
+    deleteInfo (id) {
+      this.$ajax(this.$api.cms.deleteCase.url, {
+        method: this.$api.cms.deleteCase.method,
+        urlData: {
+          id: id
+        }
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+        this.getList()
       }).catch(msg => {
 
       })

src/pages/system/cmsManager/newsManager/add.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.LocationId" 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,14 @@
         <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
+              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>
+            </el-upload>
           </div>
         </li>
         <li style="text-align:center">
@@ -90,42 +82,60 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        jumpType: '0',
-        link: '',
-        release: '0',
-        position: '',
-        index: '0'
-      },
-      positionList: [{
-        value: '0',
-        label: '首页'
-      }, {
-        value: '1',
-        label: '精选'
-      }, {
-        value: '2',
-        label: '社交'
-      }, {
-        value: '3',
-        label: '健身'
-      }],
+        ForwardType: '1',
+        ForwardUrl: '',
+        ForwardResourceId: '',
+        Status: '1',
+        LocationIds: '1',
+        ImageUrl: '',
+        Title: '',
+        OrgId: '',
+        CaseId: ''
+      }
     }
   },
   components: {},
+  computed: {
+    ...mapState({
+      positionList: x => x.cms.location,
+      OrgId: x => x.app.user.OrgId,
+    })
+  },
   methods: {
     submit () {
       console.log(this.postData)
+      this.postData.OrgId = this.OrgId
+      this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
+      this.$ajax(this.$api.cms.addNews.url, {
+        method: this.$api.cms.addNews.method,
+        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)
+    },
+    handleAvatarSuccess (res, file) {
+      console.log(res)
+      this.postData.ImageUrl = res.result.url
     }
-  },
-  mounted () { }
+  }
 }
 </script>
 

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

@@ -5,6 +5,19 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addNews'>新增资讯</el-button>
         </div>
+        <ul>
+          <li>
+            <span>选择位置：</span>
+            <el-select v-model="tableSearch.LocationId" placeholder="请选择">
+              <el-option
+                v-for="item in positionList"
+                :key="item.LocationId"
+                :label="item.LocationName"
+                :value="item.LocationId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
         <tableSearch @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
@@ -17,23 +30,24 @@
         <el-table-column
           prop="img"
           label="图片">
+          <template slot-scope="scope">
+            <a class="tableImg">
+              <img :src="scope.row.ImageUrl" class="centerLabel contain" alt="">
+            </a>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="title"
+          prop="Title"
           label="标题">
         </el-table-column>
         <el-table-column
-          prop="position"
+          prop="LocationShow"
           label="位置">
         </el-table-column>
         <el-table-column
-          prop="isShow"
+          prop="StatusShow"
           label="是否发布">
         </el-table-column>
-        <el-table-column
-          prop="toIndex"
-          label="推荐至首页">
-        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -49,9 +63,8 @@
       </el-table>
     </div>
     <el-pagination
-      @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
+      :current-page.sync="postData.currentPage"
       :page-size="10"
       layout="prev, pager, next, jumper"
       :total="100">
@@ -61,58 +74,39 @@
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
-import { createNamespacedHelpers } from 'vuex'
-
-const { mapState: mapCaseState } = createNamespacedHelpers('case')
-
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 export default {
   name: '',
   data () {
     return {
-      currentPage: 0, // 当前页码
+      postData: {
+        currentPage: 1, // 当前页码
+        pageSize: 10,
+        total: 0,
+      },
       tableSearch: { // 表格搜索条件
         key: '', // 搜索关键字
-        caseId: '', // 案场id
+        LocationId: '1',
       },
-      tableData: [{
-        img: 'xxx',
-        title: 'xxx',
-        position: 'xxx',
-        isShow: 'xxx',
-        toIndex: 'xxx'
-      }, {
-        img: 'xxx',
-        title: 'xxx',
-        position: 'xxx',
-        isShow: 'xxx',
-        toIndex: 'xxx'
-      }, {
-        img: 'xxx',
-        title: 'xxx',
-        position: 'xxx',
-        isShow: 'xxx',
-        toIndex: 'xxx'
-      }, {
-        img: 'xxx',
-        title: 'xxx',
-        position: 'xxx',
-        isShow: 'xxx',
-        toIndex: 'xxx'
-      }]
+      tableData: []
     }
   },
   computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
+    ...mapState({
+      positionList: x => x.cms.location,
     })
   },
   components: {
     tableSearch,
   },
+  created () {
+    this.updateLocationInfo().then(() => {
+      this.getList()
+    })
+  },
   methods: {
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-    },
+    ...mapCmsActions(['updateLocationInfo']),
     handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
     },
@@ -143,6 +137,34 @@ export default {
     },
     addNews () {
       this.$router.push({ name: 'addNews' })
+    },
+    getList () {
+      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
+        }
+      }).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 => {
+
+      })
     }
   }
 }

src/store/cms/index.js

@@ -11,12 +11,14 @@ export default {
   },
   actions: {
     updateLocationInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
-      this.$ajax(this.$api.cms.location.url, {
-        method: this.$api.cms.location.method
-      })
-        .then(res => {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.location.url, {
+          method: this.$api.cms.location.method
+        }).then(res => {
           context.commit('init', res)
+          resolve()
         })
+      })
     }
   }
 }

src/util/api.js

@@ -151,9 +151,29 @@ const $api = {
       method: 'put',
       url: `${baseUrl}/common/cms/info/:id`
     },
-    deleteInfo: { // 编辑首页消息
+    deleteInfo: { // 删除首页消息
       method: 'delete',
       url: `${baseUrl}/common/cms/info/:id`
+    },
+    news: { // 咨询列表
+      method: 'get',
+      url: `${baseUrl}/common/cms/news`
+    },
+    newsDetail: { // 咨询详情
+      method: 'get',
+      url: `${baseUrl}/common/cms/news/:id`
+    },
+    addNews: { // 新增咨询
+      method: 'post',
+      url: `${baseUrl}/common/cms/news`
+    },
+    editNews: { // 编辑咨询
+      method: 'put',
+      url: `${baseUrl}/common/cms/news/:id`
+    },
+    deleteNews: { // 删除咨询
+      method: 'delete',
+      url: `${baseUrl}/common/cms/news/:id`
     }
   },
   file: {

src/util/util.js

@@ -0,0 +1,25 @@
+const toolClass = {
+  dateFormat: (timestamp) => {
+    let date = new Date(timestamp)
+    let y = date.getFullYear()
+    let m = date.getMonth() + 1
+    let d = date.getDate()
+    let h = date.getHours()
+    let min = date.getMinutes()
+    if (m < 10) {
+      m = '0' + m
+    }
+    if (d < 10) {
+      d = '0' + d
+    }
+    if (h < 10) {
+      h = '0' + h
+    }
+    if (min < 10) {
+      min = '0' + min
+    }
+    return y + '-' + m + '-' + d + ' ' + h + ':' + min
+  }
+}
+
+export default toolClass