0905PM

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

@@ -11,7 +11,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="postData.ForwardType==='1'">
           <span>链接：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -23,6 +23,21 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" v-else>
+          <span>课程：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
+                <el-option
+                  v-for="item in courses.list"
+                  :key="item.CourseId"
+                  :label="item.CourseName"
+                  :value="item.CourseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>是否发布：</span>
           <div class="flex-item">
@@ -103,7 +118,10 @@
 
 <script>
 import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
+
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
@@ -117,7 +135,7 @@ export default {
         ImageUrl: '',
         Title: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
       },
       dialogVisible: false,
       imgs: '',
@@ -127,6 +145,7 @@ export default {
   },
   components: {},
   created () {
+    this.GetCourseList({page: 1, pagesize: 100})
     this.updateLocationInfo()
     this.updateSystemInfo().then(() => {
       this.postData.CaseId = this.defaultCaseId
@@ -138,13 +157,20 @@ export default {
       OrgId: x => x.app.user.OrgId,
       defaultCaseId: x => x.app.cases.default,
       caseList: x => x.app.cases.list
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
     })
   },
   methods: {
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
     ...mapCmsActions(['updateLocationInfo']),
     ...mapActions(['updateSystemInfo']),
     submit () {
       if (this.postData.ForwardType === '1') {
+        this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
             message: '链接地址不能为空',
@@ -161,6 +187,8 @@ export default {
             return false
           }
         }
+      } else {
+        this.postData.ForwardUrl = ''
       }
       this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'

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

@@ -11,7 +11,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="postData.ForwardType==='1'">
           <span>链接：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -23,6 +23,21 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" v-else>
+          <span>课程：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
+                <el-option
+                  v-for="item in courses.list"
+                  :key="item.CourseId"
+                  :label="item.CourseName"
+                  :value="item.CourseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>是否发布：</span>
           <div class="flex-item">
@@ -104,6 +119,8 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
@@ -117,7 +134,7 @@ export default {
         ImageUrl: '',
         Title: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
       },
       dialogVisible: false,
       imgs: '',
@@ -127,20 +144,27 @@ export default {
   },
   components: {},
   created () {
+    this.GetCourseList({page: 1, pagesize: 100, callback: this.getDetail})
     this.updateLocationInfo()
-    this.getDetail()
   },
   computed: {
     ...mapState({
       positionList: x => x.cms.location,
       OrgId: x => x.app.user.OrgId,
       caseList: x => x.app.cases.list
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
     })
   },
   methods: {
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
       if (this.postData.ForwardType === '1') {
+        this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
             message: '链接地址不能为空',
@@ -157,6 +181,8 @@ export default {
             return false
           }
         }
+      } else {
+        this.postData.ForwardUrl = ''
       }
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId

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

@@ -1,212 +0,0 @@
-<template>
-  <div class="subPage">
-    <form class="mainForm">
-      <ul>
-        <li class="flex-h">
-          <span>对应案场：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
-                <el-option
-                  v-for="item in caseList"
-                  :key="item.CaseId"
-                  :label="item.CaseName"
-                  :value="item.CaseId">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>名称：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-input
-                placeholder="请输入名称"
-                v-model="postData.Name"
-                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.Title"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>图片：</span>
-          <div class="flex-item">
-            <el-upload
-              :action="$api.file.image.url"
-              list-type="picture-card"
-              :limit='limit'
-              :on-success="handlePictureCardPreview"
-              :file-list='imgsArr'
-              :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">
-          <span>详细图片：</span>
-          <div class="flex-item">
-            <el-upload
-              :action='$api.file.image.url'
-              list-type="picture-card"
-              :limit='limit'
-              :file-list='detailimgsArr'
-              :on-success="handlePictureCardPreviewDetail"
-              :on-remove="handleRemoveDetail"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisibleDetail">
-              <img width="100%" :src="detailimgs" alt="">
-            </el-dialog>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>专题简介：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-input
-                placeholder="请输入专题简介"
-                v-model="postData.DetailContent"
-                type='textarea'
-                :autosize="{ minRows: 3, maxRows: 5}"
-                clearable>
-              </el-input>
-            </div>
-          </div>
-        </li>
-        <li class="flex-h">
-          <span>是否前台展示：</span>
-          <div class="flex-item">
-            <div style="width:50%" class="radio">
-              <el-radio v-model="postData.Status" label='1' >是</el-radio>
-              <el-radio v-model="postData.Status" label='0' >否</el-radio>
-            </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, mapActions } from 'vuex'
-export default {
-  name: '',
-  data () {
-    return {
-      postData: {
-        CaseId: '',
-        Name: '',
-        Title: '',
-        DetailContent: '',
-        Status: '1',
-        imgs: '',
-        detailimgs: '',
-        courseids: ''
-      },
-      limit: 1,
-      dialogVisible: false,
-      dialogVisibleDetail: false,
-      imgs: '',
-      detailimgs: '',
-      imgsArr: [],
-      detailimgsArr: []
-    }
-  },
-  components: {},
-  computed: {
-    ...mapState({
-      caseList: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default,
-      OrgId: x => x.app.user.OrgId
-    })
-  },
-  methods: {
-    ...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 + ','
-      }
-      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,
-        data: this.postData
-      }).then(res => {
-        this.$message({
-          message: '添加成功',
-          type: 'success',
-          duration: 1000
-        })
-        setTimeout(() => {
-          this.$router.push({ name: 'indexCase' })
-        }, 1000)
-      }).catch(msg => {
-
-      })
-    },
-    cancel () {
-      this.$router.go(-1)
-    },
-    handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
-      this.imgsArr = fileList
-    },
-    handleRemove (file, fileList) {
-      this.imgsArr = fileList
-    },
-    handlePictureCardPreviewDetail (res, file, fileList) {
-      this.detailimgs = res.result.url
-      this.dialogVisibleDetail = false
-      this.detailimgsArr = fileList
-    },
-    handleRemoveDetail (file, fileList) {
-      this.detailimgsArr = fileList
-    },
-    exceed () {
-      this.$message({
-        message: '超过可传的图片上限',
-        type: 'info',
-        duration: 1000
-      })
-    }
-  },
-  created () {
-    this.updateSystemInfo().then(() => {
-      this.postData.CaseId = this.defaultCaseId
-    })
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-</style>

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

@@ -6,7 +6,7 @@
           <span>对应案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
+              <el-select v-model="CaseId" placeholder="请选择">
                 <el-option
                   v-for="item in caseList"
                   :key="item.CaseId"
@@ -23,7 +23,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入名称"
-                v-model="postData.Name"
+                v-model="detail.Name"
                 clearable>
               </el-input>
             </div>
@@ -35,7 +35,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入标题"
-                v-model="postData.Title"
+                v-model="detail.Title"
                 clearable>
               </el-input>
             </div>
@@ -54,9 +54,6 @@
               :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">
@@ -72,9 +69,6 @@
               :on-exceed="exceed">
               <i class="el-icon-plus"></i>
             </el-upload>
-            <el-dialog :visible.sync="dialogVisibleDetail">
-              <img width="100%" :src="detailimgs" alt="">
-            </el-dialog>
           </div>
         </li>
         <li class="flex-h">
@@ -83,7 +77,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入专题简介"
-                v-model="postData.DetailContent"
+                v-model="detail.DetailContent"
                 type='textarea'
                 :autosize="{ minRows: 3, maxRows: 5}"
                 clearable>
@@ -91,12 +85,55 @@
             </div>
           </div>
         </li>
+        <li class="flex-h">
+          <span>展示课程：</span>
+          <div class="flex-item">
+            <div style="width:50%" class="radio">
+              <el-radio v-model="detail.IsAllCourse" :label='1' >全部课程</el-radio>
+              <el-radio v-model="detail.IsAllCourse" :label='0' >指定课程</el-radio>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h" v-if="detail.IsAllCourse === 0">
+          <el-table
+            :data="detail.Courses"
+            stripe
+            style="width: 100%">
+            <el-table-column
+              prop="CourseName"
+              label="课程名称">
+            </el-table-column>
+            <el-table-column
+              prop="BeginDate"
+              label="课程开始时间">
+              <template slot-scope="scope">
+                <label>{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="EndDate"
+              label="课程结束时间">
+              <template slot-scope="scope">
+                <label>{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="450">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="deleteItem(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+            <el-button type="primary" size="mini" @click="addCourse">新增</el-button>
+        </li>
         <li class="flex-h">
           <span>是否前台展示：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-              <el-radio v-model="postData.Status" label='1' >是</el-radio>
-              <el-radio v-model="postData.Status" label='0' >否</el-radio>
+              <el-radio v-model="detail.Status" :label='1' >是</el-radio>
+              <el-radio v-model="detail.Status" :label='0' >否</el-radio>
             </div>
           </div>
         </li>
@@ -106,32 +143,66 @@
         </li>
       </ul>
     </form>
+    <el-dialog
+      title="选择课程"
+      :visible.sync="selCourseVisible"
+      width="500px"
+      center>
+      <div>
+        <el-table
+          ref="courseTable"
+          :data="courses.list"
+          tooltip-effect="dark"
+          stripe
+          @selection-change="handleSelectionChange"
+          style="width: 100%">
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <el-table-column
+            prop="CourseName"
+            label="课程名称">
+          </el-table-column>
+          <el-table-column
+            prop="BeginDate"
+            label="课程开始时间">
+            <template slot-scope="scope">
+              <label>{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="EndDate"
+            label="课程结束时间">
+            <template slot-scope="scope">
+              <label>{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="selCourseVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addCourseOk">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('cmscase')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
     return {
-      postData: {
-        CaseId: '',
-        Name: '',
-        Title: '',
-        DetailContent: '',
-        Status: '1',
-        imgs: '',
-        detailimgs: '',
-        courseids: ''
-      },
+      id: '',
       limit: 1,
-      dialogVisible: false,
-      dialogVisibleDetail: false,
-      imgs: '',
-      detailimgs: '',
-      imgsArr: [],
-      detailimgsArr: []
+      imgs: null,
+      detailimgs: null,
+      selCourseVisible: false,
     }
   },
   components: {},
@@ -140,105 +211,117 @@ export default {
       caseList: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default,
       OrgId: x => x.app.user.OrgId
-    })
-  },
-  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 + ','
-      }
-      if (this.postData.imgs) {
-        this.postData.imgs = this.postData.imgs.substr(0, this.postData.imgs.length - 1)
+    }),
+    ...mapCaseState({
+      detail: x => x.caseInfo,
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
+    }),
+    CaseId: {
+      get () {
+        return this.detail.CaseId || this.caseid
+      },
+      set (val) {
+        this.UpdateInfo({...this.detail, CaseId: val})
       }
-      for (let i = 0; i < this.detailimgsArr.length; i++) {
-        this.postData.detailimgs += this.detailimgsArr[i].response.result.url + ','
+    },
+    imgsArr: {
+      get () {
+        return this.imgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'cover').map(x => {
+          return {
+            url: x.CaseImageUrl,
+            response: {
+              result: {
+                url: x.CaseImageUrl
+              }
+            }
+          }
+        })
+      },
+      set (val) {
+        this.imgs = val
       }
-      if (this.postData.detailimgs) {
-        this.postData.detailimgs = this.postData.detailimgs.substr(0, this.postData.detailimgs.length - 1)
+    },
+    detailimgsArr: {
+      get () {
+        return this.detailimgs || (this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail').map(x => {
+          return {
+            url: x.CaseImageUrl,
+            response: {
+              result: {
+                url: x.CaseImageUrl
+              }
+            }
+          }
+        })
+      },
+      set (val) {
+        this.detailimgs = val
       }
-      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: '编辑成功',
-          type: 'success',
-          duration: 1000
+    },
+  },
+  methods: {
+    ...mapCaseActions([
+      'GetCaseInfo',
+      'AddCaseInfo',
+      'SetNull',
+      'UpdateInfo',
+    ]),
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
+    submit () {
+      const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
+      const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
+      const courseids = this.detail.Courses.map(x => x.CourseId).join(',')
+      if (this.id === '') {
+        this.detail.OrgId = this.OrgId
+        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
+          this.afterSave()
         })
-        setTimeout(() => {
-          this.$router.push({ name: 'indexCase' })
-        }, 1000)
-      }).catch(msg => {
-
+      } else {
+        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
+          this.afterSave()
+        })
+      }
+    },
+    afterSave () {
+      this.$message({
+        message: '保存成功',
+        type: 'success',
+        duration: 1000
       })
+      setTimeout(() => {
+        this.$router.push({ name: 'indexCase' })
+      }, 1000)
     },
     cancel () {
       this.$router.go(-1)
     },
     handlePictureCardPreview (res, file, fileList) {
-      this.imgs = res.result.url
-      this.dialogVisible = false
       this.imgsArr = fileList
-      console.log(this.imgsArr)
     },
     handleRemove (file, fileList) {
       this.imgsArr = fileList
     },
     handlePictureCardPreviewDetail (res, file, fileList) {
-      this.detailimgs = res.result.url
-      this.dialogVisibleDetail = false
       this.detailimgsArr = fileList
     },
     handleRemoveDetail (file, fileList) {
       this.detailimgsArr = fileList
     },
     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.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 => {
-
-      })
+      this.GetCaseInfo({id: this.id})
+    },
+    toggleSelection (rows) {
+      if (rows) {
+        rows.map(row => {
+          this.$refs.courseTable.toggleRowSelection(row)
+        })
+      } else {
+        this.$refs.courseTable.clearSelection()
+      }
     },
     exceed () {
       this.$message({
@@ -246,10 +329,34 @@ export default {
         type: 'info',
         duration: 1000
       })
+    },
+    addCourse () {
+      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
+    },
+    coursesShow () {
+      this.selCourseVisible = true
+      setTimeout(() => {
+        this.toggleSelection(this.detail.Courses)
+      }, 30)
+    },
+    handleSelectionChange (val) {
+      this.UpdateInfo({...this.detail, Courses: val})
+    },
+    addCourseOk () {
+      this.selCourseVisible = false
+    },
+    deleteItem (row) {
+      this.UpdateInfo({...this.detail, Courses: this.detail.Courses.filter(x => x.CourseId !== row.CourseId)})
     }
   },
-  created () {
-    this.getDetail()
+  mounted () {
+    const { id } = this.$route.query
+    this.id = id
+    if (id && id !== '') {
+      this.getDetail()
+    } else {
+      this.SetNull()
+    }
   }
 }
 </script>

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

@@ -122,8 +122,23 @@ export default {
       this.postData.currentPage = val
       this.getList()
     },
-    showItem (index, row) { // 前台显示
-      this.editIsAllCourse(row)
+    showItem (index, 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 => {
+
+      })
     },
     editItem (index, row) { // 编辑
       console.log(index, row)
@@ -190,25 +205,6 @@ export default {
         this.getList()
       }).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 => {
-
       })
     },
   }

src/pages/system/newOrder/newOrderList/index.vue

@@ -76,7 +76,12 @@
 </template>
 
 <script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+
 import { getLodop } from '@/util/LodopFuncs'
+
+const { mapState: mapOrderState, mapActions: mapOrderActions } = createNamespacedHelpers('goodsorder')
+
 const baseUrl = process.env.NODE_ENV === 'development' ? 'ws://192.168.0.148:8078/admin' : 'ws://cdkj.ycjcjy.com/admin' // 'ws://cdkj.ycjcjy.com/admin'
 var LODOP
 export default {
@@ -94,11 +99,21 @@ export default {
     }
   },
   components: {
+    ...mapOrderState({
+      orders: x => x.ordersList
+    }),
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    })
   },
   mounted () {
-
+    this.GetOrdersList()
   },
   methods: {
+    ...mapOrderActions([
+      'GetOrdersList',
+    ]),
     submit (cl) {
       this.printPdf(cl)
     },

src/pages/system/page.js

@@ -45,7 +45,6 @@ import bannerManager from './cmsManager/bannerManager/index' // 轮播图管理
 import addBanner from './cmsManager/bannerManager/add' // 添加轮播图
 import editBanner from './cmsManager/bannerManager/edit' // 编辑轮播图
 import indexCase from './cmsManager/majorProjects/index' // 售楼处项目专题
-import addIndexCase from './cmsManager/majorProjects/add' // 新增售楼处项目专题
 import editIndexCase from './cmsManager/majorProjects/edit' // 编辑售楼处项目专题
 import indexMsg from './cmsManager/indexMsg/index' // 首页消息
 import addIndexMsg from './cmsManager/indexMsg/add' // 新增首页消息
@@ -285,12 +284,7 @@ export default {
           path: 'indexCase',
           name: 'indexCase',
           component: indexCase,
-          children: [{ // 新增售楼处项目专题
-            path: 'addIndexCase',
-            name: 'addIndexCase',
-            component: addIndexCase,
-            children: []
-          }, { // 编辑售楼处项目专题
+          children: [{ // 编辑售楼处项目专题
             path: 'editIndexCase',
             name: 'editIndexCase',
             component: editIndexCase,

src/store/cms/case.js

@@ -0,0 +1,56 @@
+
+export default {
+  namespaced: true,
+  state: {
+    caseInfo: {},
+  },
+  mutations: {
+    init (state, data) {
+      state.caseInfo = data
+    }
+  },
+  actions: {
+    GetCaseInfo ({ commit }, payload) {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.caseDetail.url, {
+          method: this.$api.cms.caseDetail.method,
+          urlData: {
+            id: payload.id
+          }
+        }).then(res => {
+          commit('init', res)
+          resolve()
+        })
+      })
+    },
+    AddCaseInfo ({ commit }, payload) {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.addCase.url, {
+          method: this.$api.cms.addCase.method,
+          data: payload
+        }).then(res => {
+          resolve()
+        })
+      })
+    },
+    UpdateCaseInfo ({ commit }, payload) {
+      return new Promise((resolve) => {
+        this.$ajax(this.$api.cms.editCase.url, {
+          method: this.$api.cms.editCase.method,
+          urlData: {
+            id: payload.id
+          },
+          data: payload
+        }).then(res => {
+          resolve()
+        })
+      })
+    },
+    SetNull ({ commit }) {
+      commit('init', {})
+    },
+    UpdateInfo ({ commit }, payload) {
+      commit('init', payload)
+    }
+  }
+}

src/store/course/course.js

@@ -28,6 +28,9 @@ export default {
         }
       }).then(res => {
         commit('updateList', res)
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     GetCourseByID ({ commit }, { id }) {

src/store/goods/order.js

@@ -0,0 +1,26 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    ordersList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.ordersList = payload || []
+    },
+  },
+  actions: {
+    GetOrdersList ({ commit }, payload) {
+      ajax(api.goodsOrder.getOnlineOrder.url, {
+        method: api.goodsOrder.getOnlineOrder.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+      })
+    },
+  }
+}

src/store/index.js

@@ -22,6 +22,8 @@ export const modules = {
   coursetag: () => require('./course/tag').default,
   schedule: () => require('./course/schedule').default,
   verification: () => require('./verification/verification').default,
+  goodsorder: () => require('./goods/order').default,
+  cmscase: () => require('./cms/case').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -525,5 +525,11 @@ const $api = {
       url: `${baseUrl}${common}/verify/course/:id`
     },
   },
+  goodsOrder: {
+    getOnlineOrder: {
+      method: 'get',
+      url: `${baseUrl}${common}/order/online/goods`
+    },
+  },
 }
 export default $api