xcx

config/index.js

@@ -12,9 +12,9 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://192.168.0.62:8080', //wf
         // target: 'http://192.168.0.11', //ys
-        target: 'http://192.168.0.125:8080', //hyq
+        // target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/cardAndCouponManager/cardManager/edit.vue

@@ -138,7 +138,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="cardInfo.SendType !== 'case' && cardInfo.SendType !== 'system'">
           <span>视频：</span>
           <div class="flex-item">
             <div style="vertical-align: middle;">

src/pages/system/cardAndCouponManager/couponManager/edit.vue

@@ -202,7 +202,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="couponInfo.SendType !== 'case' && couponInfo.SendType !== 'system'">
           <span>视频：</span>
           <div class="flex-item">
             <div style="vertical-align: middle;">
@@ -579,11 +579,15 @@ export default {
     },
     submit () { // 保存
       if (this.$route.query.id) {
+        if (this.couponInfo.ValidDays) {
+          this.couponInfo.StartDate = undefined
+          this.couponInfo.EndDate = undefined
+        }
         this.editCoupon({
           ...this.couponInfo,
           IsAll: this.couponInfo.IsAll - 0,
           TotalCount: this.couponInfo.TotalCount - 0,
-          ValidDays: this.couponInfo.ValidDays || 0
+          ValidDays: this.couponInfo.ValidDays - 0 || 0
         }).then((res) => {
           this.$alert('操作成功', '提示', {
             confirmButtonText: '确定',
@@ -593,11 +597,15 @@ export default {
           })
         })
       } else {
+        if (this.couponInfo.ValidDays) {
+          this.couponInfo.StartDate = undefined
+          this.couponInfo.EndDate = undefined
+        }
         this.addCoupon({
           ...this.couponInfo,
           IsAll: this.couponInfo.IsAll - 0,
           TotalCount: this.couponInfo.TotalCount - 0,
-          ValidDays: this.couponInfo.ValidDays || 0
+          ValidDays: this.couponInfo.ValidDays - 0 || 0
         }).then((res) => {
           this.$alert('操作成功', '提示', {
             confirmButtonText: '确定',

src/pages/system/cardAndCouponManager/couponManager/index.vue

@@ -49,9 +49,10 @@
           label="有效期"
           width="150">
           <template slot-scope="scope">
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
+            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
+            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column

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

@@ -164,14 +164,14 @@ export default {
   },
   created () {
     this.GetCourseList({ page: 1, pagesize: 100 })
-    this.updateLocationInfo()
+    this.updateLocationAllInfo()
     this.updateSystemInfo().then(() => {
       this.postData.CaseId = this.defaultCaseId
     })
   },
   computed: {
     ...mapState({
-      positionList: x => x.cms.location,
+      positionList: x => x.cms.locationAll,
       OrgId: x => x.app.user.OrgId,
       defaultCaseId: x => x.app.cases.default,
       caseList: x => x.app.cases.list
@@ -184,7 +184,7 @@ export default {
     ...mapCourseActions([
       'GetCourseList',
     ]),
-    ...mapCmsActions(['updateLocationInfo']),
+    ...mapCmsActions(['updateLocationAllInfo']),
     ...mapActions(['updateSystemInfo']),
     submit () {
       if (this.postData.ForwardType === '1') {

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="CaseId" placeholder="请选择" :disabled="Boolean(this.id)">
+              <el-select v-model="CaseId" placeholder="请选择" @change="caseChange">
                 <el-option
                   v-for="item in caseList"
                   :key="item.CaseId"
@@ -220,7 +220,7 @@ export default {
   name: '',
   data () {
     return {
-      id: this.$route.query.id ? this.$route.query.id : '',
+      id: '',
       limit: 1,
       // imgs: null,
       // detailimgs: null,
@@ -248,7 +248,7 @@ export default {
         return this.detail.CaseId || this.caseid
       },
       set (val) {
-        this.UpdateInfo({...this.detail, CaseId: val})
+        this.UpdateInfo({ ...this.detail, CaseId: val })
         this.getCourse()
       }
     },
@@ -258,40 +258,6 @@ export default {
     detailImgShow () {
       return this.detailimg || ((this.detail.CmsCaseImgs || []).filter(x => x.ImageType === 'detail')[0] || {}).CaseImageUrl
     },
-    // 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
-    //   }
-    // },
-    // 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
-    //   }
-    // },
     coursesList () {
       return (this.courses.list || []).map(x => {
         return {
@@ -313,18 +279,19 @@ export default {
     ...mapCourseActions([
       'GetCourseList',
     ]),
+    caseChange () {
+      this.selCourseList = []
+      this.detail.Courses = []
+    },
     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, OrgId: this.OrgId, imgs: this.img, detailimgs: this.detailimg, courseids}).then(res => {
+        this.AddCaseInfo({ ...this.detail, OrgId: this.OrgId, imgs: this.img, detailimgs: this.detailimg, courseids }).then(res => {
           this.afterSave()
         })
       } else {
-        this.AddCaseInfo({...this.detail, imgs: this.img, detailimgs: this.detailimg, courseids}).then(res => {
+        this.AddCaseInfo({ ...this.detail, imgs: this.img, detailimgs: this.detailimg, courseids }).then(res => {
           this.afterSave()
         })
       }
@@ -342,23 +309,11 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    // handlePictureCardPreview (res, file, fileList) {
-    //   this.imgsArr = fileList
-    // },
-    // handleRemove (file, fileList) {
-    //   this.imgsArr = fileList
-    // },
-    // handlePictureCardPreviewDetail (res, file, fileList) {
-    //   this.detailimgsArr = fileList
-    // },
-    // handleRemoveDetail (file, fileList) {
-    //   this.detailimgsArr = fileList
-    // },
     getDetail () {
-      this.GetCaseInfo({id: this.id})
+      this.GetCaseInfo({ id: this.id })
     },
     getCourse () {
-      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100})
+      this.GetCourseList({ caseid: this.CaseId, page: 1, pagesize: 100 })
     },
     toggleSelection (rows) {
       if (rows) {
@@ -369,15 +324,8 @@ export default {
         this.$refs.courseTable.clearSelection()
       }
     },
-    // exceed () {
-    //   this.$message({
-    //     message: '超过可传的图片上限',
-    //     type: 'info',
-    //     duration: 1000
-    //   })
-    // },
     addCourse () {
-      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
+      this.GetCourseList({ caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow })
     },
     coursesShow () {
       this.selCourseList = this.detail.Courses || []
@@ -388,14 +336,13 @@ export default {
     },
     handleSelectionChange (val) {
       this.selCourseList = val
-      // this.UpdateInfo({...this.detail, Courses: val})
     },
     addCourseOk () {
-      this.UpdateInfo({...this.detail, Courses: this.selCourseList})
+      this.UpdateInfo({ ...this.detail, Courses: this.selCourseList })
       this.selCourseVisible = false
     },
     deleteItem (row) {
-      this.UpdateInfo({...this.detail, Courses: this.detail.Courses.filter(x => x.CourseId !== row.CourseId)})
+      this.UpdateInfo({ ...this.detail, Courses: this.detail.Courses.filter(x => x.CourseId !== row.CourseId) })
     },
     handleImgSuccess (res, file) {
       this.img = res.result.url

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

@@ -6,12 +6,12 @@
           <span>跳转类型：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-                <el-radio v-model="postData.ForwardType" label='1' >链接</el-radio>
-                <el-radio v-model="postData.ForwardType" label='0' >课程</el-radio>
+                <el-radio v-model="postData.ForwardType" label='url' >链接</el-radio>
+                <el-radio v-model="postData.ForwardType" label='course' >课程</el-radio>
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <li class="flex-h" v-if="postData.ForwardType==='url'">
           <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">
@@ -100,12 +115,14 @@
 <script>
 import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
+const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
+
 export default {
   name: '',
   data () {
     return {
       postData: {
-        ForwardType: '1',
+        ForwardType: 'url',
         ForwardUrl: '',
         ForwardResourceId: '',
         Status: '1',
@@ -127,22 +144,26 @@ export default {
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId
     })
-    this.getCourseLink().then((res) => {
-      console.log(JSON.stringify(res))
-    })
+    this.updateLocationAllInfo()
+    this.GetCourseList({ page: 1, pagesize: 10000 })
   },
   computed: {
     ...mapState({
-      positionList: x => x.cms.location,
+      positionList: x => x.cms.locationAll,
       OrgId: x => x.app.user.OrgId,
       CaseId: x => x.app.cases.default,
+    }),
+    ...mapCourseState({
+      courses: x => x.courseList,
     })
   },
   methods: {
+    ...mapCourseActions([
+      'GetCourseList',
+    ]),
     ...mapActions(['updateSystemInfo']),
     ...mapCmsActions([
-      'updateLocationInfo',
-      'getCourseLink',
+      'updateLocationAllInfo',
     ]),
     submit () {
       if (this.postData.ForwardType === '1') {

src/store/cms/index.js

@@ -4,12 +4,16 @@ import api from '../../util/api'
 export default {
   namespaced: true,
   state: {
-    location: []
+    location: [],
+    locationAll: []
   },
   mutations: {
     init (state, data) { // 这里的state对应着上面这个state
       state.location = data
-    }
+    },
+    initAll (state, data) { // 这里的state对应着上面这个state
+      state.locationAll = data
+    },
   },
   actions: {
     updateLocationInfo ({ commit }, payload) {
@@ -25,6 +29,16 @@ export default {
         }).catch(reject)
       })
     },
+    updateLocationAllInfo ({ commit }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.cms.location.url, {
+          method: api.cms.location.method,
+        }).then(res => {
+          commit('initAll', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
     getCourseLink ({ commit }) {
       return new Promise((resolve, reject) => {
         ajax(api.cms.getCourseLink.url, {