xcx

config/index.js

     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
+<<<<<<< HEAD
         target: 'http://192.168.0.62:8080', //wf
         // target: 'http://localhost:8080', 
+=======
+        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://localhost:8080', 
+>>>>>>> 39e74bdea82b0a3170a0477becad3a119521b6f0
         // target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com/', //frp

src/components/upload/index.vue

+<template>
+  <input class="cust-upload" type="file" :accept="allowfile" @change="onchange" />
+</template>
+
+<script>
+export default {
+  name: 'fileUpload',
+  props: [
+    'accept',
+    'value',
+    'upload',
+  ],
+  data () {
+    return {}
+  },
+  computed: {
+    allowfile () {
+      return this.accept || 'image/jpeg, image/gif, image/png'
+    }
+  },
+  methods: {
+    onchange (e) {
+      const files = e.target.files
+      if (files && files.length) {
+        this.upload(files[0]).then((data) => {
+          this.$emit('input', data)
+        }).catch((error) => {
+          // TODO
+          console.log(error)
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.cust-upload {
+
+}
+</style>

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

               <a v-if="cardInfo.CardImageUrl && cardInfo.CardImageUrl.indexOf('.mp4') > -1" :href="cardInfo.CardImageUrl" target="blank" style="line-height:40px;">{{cardInfo.CardImageUrl}}</a>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="cardInfo.CardImageUrl && cardInfo.CardImageUrl.indexOf('.mp4') === -1" :src="cardInfo.CardImageUrl" class="avatar">
     },
     handleAvatarSuccess (res, file) {
       this.cardInfo.CardImageUrl = res.result.url
-    },
+    }
   }
 }
 </script>

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

   methods: {
     ...mapGymCardActions([
       'getGymCardList',
+      'giveCard',
     ]),
     ...mapCustomerActions([
       'GetCustomerList',
     },
     toSendCard () { // 赠送卡
       if (this.selectCustomer.length) {
+        console.log(this.selectCustomer)
         this.selectCustomer = this.selectCustomer.map(x => x.CustomerId).join(',')
         this.giveCard({
           id: this.currentCardId,
       }
     },
     sendCard (index, row) { // 赠送卡弹窗
-      this.currentCardId = row.CardId
+      this.currentCardId = row.GymCardId
       this.centerDialogVisible = true
     },
     search () { // 搜索

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

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="cardInfo.Images" :src="cardInfo.Images[0].CardImageUrl" class="avatar">
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="videoSuccess">
                 <a style="line-height: 40px;padding: 0 10px;">{{videoOff ? '更换' : '添加'}}视频</a>
         TotalCount: '',
         CaseId: '',
         OrgId: '',
-        Share: {
-          CardShareInfo: '',
-          CardUseRule: '',
-          CardUseInstruction: ''
-        },
-        Images: [{
-          CardImageUrl: ''
-        }],
-        Targets: [{
-          TargetType: '',
-          TargetId: '',
-          TargetName: ''
-        }],
+        Share: {},
+        Images: null,
+        Targets: [{}],
         ChannelId: ''
       },
       postData: {
     },
     handleAvatarSuccess (res, file) {
       this.cardInfo.Images[0].CardImageUrl = res.result.url
-    },
+    }
   }
 }
 </script>

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

         <el-table-column
           prop="SendType"
           label="发放类型">
+          <template slot-scope="scope">
+            <span>{{SendType(scope.row.SendType)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="TotalCount"
       'GetCustomerList',
       'SetCustomerListNull',
     ]),
+    SendType (type) {
+      if (type === 'channel') {
+        return '渠道'
+      }
+      if (type === 'case') {
+        return '案场'
+      }
+      if (type === 'system') {
+        return '系统'
+      }
+    },
     toSendHistory () { // 查看赠送记录
       this.$router.push({ name: 'givingRecords' })
     },

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

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="couponInfo.Images[0].CouponImageUrl" :src="couponInfo.Images[0].CouponImageUrl" class="avatar">
           <div class="flex-item">
             <div>
               <el-radio v-model="couponInfo.SendType" label="channel">渠道</el-radio>
-              <el-radio v-if="couponInfo.CouponType === 'case'" v-model="couponInfo.SendType" label="case">案场</el-radio>
+              <el-radio v-if="couponInfo.CouponType === 'course'" v-model="couponInfo.SendType" label="case">案场</el-radio>
               <el-radio v-model="couponInfo.SendType" label="system">系统</el-radio>
             </div>
           </div>
             </div>
           </div>
         </li>
-        <li class="flex-h" v-if="type === 'course'">
+        <li class="flex-h" v-if="couponInfo.CouponType === 'course'">
           <span>券有效时间：</span>
           <div class="flex-item">
             <div>
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="videoSuccess">
                 <a style="line-height: 40px;padding: 0 10px;">{{videoOff ? '更换' : '添加'}}视频</a>
           this.total = res.pagenum
         })
       }
-    },
+    }
   }
 }
 </script>

src/pages/system/caseManager/caseAreaManager/add.vue

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="postData.AreaIcon" :src="postData.AreaIcon" class="avatar">
             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccesser">
                 <img v-if="postData.AreaIconWhite" :src="postData.AreaIconWhite" class="avatar">

src/pages/system/caseManager/caseAreaManager/edit.vue

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="postData.AreaIcon" :src="postData.AreaIcon" class="avatar">
             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccesser">
                 <img v-if="postData.AreaIconWhite" :src="postData.AreaIconWhite" class="avatar">

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

               </a> -->
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="postData.CaseIcon" :src="postData.CaseIcon" class="avatar">

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

               </a> -->
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="postData.CaseIcon" :src="postData.CaseIcon" class="avatar">

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

           <span>图片：</span>
           <div class="flex-item">
             <!-- <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               :limit='limit'
               list-type="picture-card"
               :file-list='imgsArr'
             </el-dialog> -->
             <el-upload
               class="avatar-uploader"
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               :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>
+              <image-uploader :upload="uploader" v-model="postData.ImageUrl" />
+            </div> -->
           </div>
         </li>
         <!-- <li class="flex-h">
 
 <script>
 import { mapState, createNamespacedHelpers, mapActions } from 'vuex'
+// import upload from '@/util/upload'
 
 const { mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 const { mapState: mapCourseState, mapActions: mapCourseActions } = createNamespacedHelpers('course')
   name: '',
   data () {
     return {
+      // uploader: upload,
       postData: {
         ForwardType: '1',
         ForwardUrl: '',
       limit: 1
     }
   },
-  components: {},
+  components: {
+    // imageUploader: () => import('@/components/upload')
+  },
   created () {
     this.GetCourseList({page: 1, pagesize: 100})
     this.updateLocationInfo()
     // }
     handleAvatarSuccess (res, file) {
       this.postData.ImageUrl = res.result.url
-    },
+    }
   }
 }
 </script>

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

           <span>图片：</span>
           <div class="flex-item">
             <!-- <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               :limit='limit'
               list-type="picture-card"
               :file-list='imgsArr'
             </el-dialog> -->
             <el-upload
               class="avatar-uploader"
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
               <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
     // }
     handleAvatarSuccess (res, file) {
       this.postData.ImageUrl = res.result.url
-    },
+    }
   }
 }
 </script>

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

           <span>图片：</span>
           <div class="flex-item">
             <!-- <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               list-type="picture-card"
               :limit='limit'
               :file-list='imgsArr'
             <!-- 单选 -->
             <el-upload
               class="avatar-uploader"
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleImgSuccess">
               <img v-if="imgShow" :src="imgShow" class="avatar">
           <span>详细图片：</span>
           <div class="flex-item">
             <!-- <el-upload
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               list-type="picture-card"
               :limit='limit'
               :file-list='detailimgsArr'
             <!-- 单选 -->
             <el-upload
               class="avatar-uploader"
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleDetailImgSuccess">
               <img v-if="detailImgShow" :src="detailImgShow" class="avatar">
     },
     handleDetailImgSuccess (res, file) {
       this.detailimg = res.result.url
-    },
+    }
   },
   mounted () {
     this.getCourse()

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

           <span>图片：</span>
           <div class="flex-item">
             <!-- <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               :limit='limit'
               list-type="picture-card"
               :file-list='imgsArr'
             <!-- 单选 -->
             <el-upload
               class="avatar-uploader"
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
               <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
     // }
     handleAvatarSuccess (res, file) {
       this.postData.ImageUrl = res.result.url
-    },
+    }
   }
 }
 </script>

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

           <span>图片：</span>
           <div class="flex-item">
             <!-- <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               :limit='limit'
               list-type="picture-card"
               :file-list='imgsArr'
             </el-dialog> -->
             <el-upload
               class="avatar-uploader"
-              :action='$api.file.image.url'
+              action='string'
+              :http-request="toolClass.upload"
               :show-file-list="false"
               :on-success="handleAvatarSuccess">
               <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
     },
     handleAvatarSuccess (res, file) {
       this.postData.ImageUrl = res.result.url
-    },
+    }
   }
 }
 </script>

src/pages/system/courseManager/courseList/add.vue

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="detail.CourseImg" :src="detail.CourseImg" class="avatar">
         return this.detail.CaseId || this.caseid
       },
       set (val) {
-        this.UpdateInfo({...this.detail, CaseId: val})
+        this.UpdateInfo({ ...this.detail, CaseId: val })
       }
     },
     courseDate: {
         return this.detail.BeginDate && this.detail.EndDate ? [this.detail.BeginDate, this.detail.EndDate] : []
       },
       set (val) {
-        this.UpdateInfo({...this.detail, BeginDate: val[0], EndDate: val[1]})
+        this.UpdateInfo({ ...this.detail, BeginDate: val[0], EndDate: val[1] })
       },
     },
     tags: {
             TagId: x,
           }
         })
-        this.UpdateInfo({...this.detail, CourseTags: v})
+        this.UpdateInfo({ ...this.detail, CourseTags: v })
       }
     },
   },
       'GetCourseTagList',
     ]),
     handleAvatarSuccess (res, file) {
-      this.UpdateInfo({...this.detail, CourseImg: res.result.url})
+      this.UpdateInfo({ ...this.detail, CourseImg: res.result.url })
+    },
+    upLoad (item) {
+      this.toolClass.upload(item).then((res) => { this.handleAvatarSuccess(res, item.file) })
     },
     submit () { // 提交数据
       const { id } = this.$route.query
       if (!id || id === '') {
-        this.UpdateInfo({...this.detail, CourseId: ''})
+        this.UpdateInfo({ ...this.detail, CourseId: '' })
       }
       const _that = this
       this.detail.tagids = this.tags.map(x => {
         if (!this.detail.CaseId || this.detail.CaseId === '') {
           this.detail.CaseId = this.caseid
         }
-        this.AddCourse({...this.detail, callback: _that.afterSave})
+        this.AddCourse({ ...this.detail, callback: _that.afterSave })
       } else {
-        this.UpdateCourse({...this.detail, callback: _that.afterSave})
+        this.UpdateCourse({ ...this.detail, callback: _that.afterSave })
       }
     },
     afterSave () {

src/pages/system/courseManager/courseList/index.vue

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="newImg" :src="newImg" class="avatar">
     },
     toSchedule (row) {
       this.$router.push({ name: 'scheduleManager', query: { id: row.CourseId } })
-    },
+    }
   }
 }
 </script>

src/pages/system/courseManager/fiveA/add.vue

           <span>图片：</span>
           <div class="flex-item">
             <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               :limit='limit'
               list-type="picture-card"
               :file-list='imgsArr'

src/pages/system/courseManager/fiveA/edit.vue

           <span>图片：</span>
           <div class="flex-item">
             <el-upload
-              :action="$api.file.image.url"
+              action='string'
+              :http-request="toolClass.upload"
               :limit='limit'
               list-type="picture-card"
               :file-list='imgsArr'

src/pages/system/courseManager/scheduleManager/edit.vue

   <div class="subPage">
     <div class="system-table-search">
       <div class="flex-h">
-        <div class="flex-item flex-h"></div>
+        <div class="flex-item flex-h">
+          <el-button
+          size="mini"
+          type="primary" @click="goLast">继续排课</el-button>
+        </div>
         <ul>
           <li>
             <el-input
       this.search()
       this.centerDialogVisible = false
     },
+    goLast () {
+      const { courseid } = this.$route.query
+      this.$router.push({name: 'scheduleManager', query: {id: courseid}})
+    }
   }
 }
 </script>

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

 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
 
+const {mapState: mapStaState, mapActions: mapStaActions} = createNamespacedHelpers('sta')
+
 export default {
   name: '',
   data () {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapStaState({
+      goods: x => x.goods,
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
     })
   },
   methods: {
+    ...mapStaActions([
+      'GetGoods',
+    ]),
     search () { // 搜索
       // 1
     },

src/pages/system/goodsManager/goodManager/edit.vue

             <div style="width:50%">
               <!-- 多选 -->
               <!-- <el-upload
-                :action="$api.file.image.url"
+                action='string'
+                :http-request="toolClass.upload"
                 :limit='limit'
                 list-type="picture-card"
                 :file-list='imgsArr'
               <!-- 单选 -->
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="Image" :src="Image" class="avatar">

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

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="postData.Headimgurl" :src="postData.Headimgurl" class="avatar">

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

             <div>
               <el-upload
                 class="avatar-uploader"
-                :action='$api.file.image.url'
+                action='string'
+                :http-request="toolClass.upload"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="postData.Headimgurl" :src="postData.Headimgurl" class="avatar">

src/store/card/gymCard.js

         }).catch(reject)
       })
     },
-    // giveCard ({ commit }, { id, users }) {
-    //   return new Promise((resolve, reject) => {
-    //     ajax(api.cardManager.giveCard.url, {
-    //       method: api.cardManager.giveCard.method,
-    //       urlData: {
-    //         id,
-    //         users
-    //       },
-    //     }).then(res => {
-    //       resolve(res)
-    //     }).catch(reject)
-    //   })
-    // }
+    giveCard ({ commit }, { id, users }) {
+      return new Promise((resolve, reject) => {
+        ajax(api.gymCardManager.giveCard.url, {
+          method: api.gymCardManager.giveCard.method,
+          urlData: {
+            id,
+            users
+          },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    }
   }
 }

src/store/course/schedule.js

       })
     },
     SetListNull ({ commit }) {
-      commit('updatesSheduleList', [])
+      commit('updateList', [])
     }
   }
 }

src/store/index.js

   channel: () => require('./channel/channel').default,
   customer: () => require('./customer/customer').default,
   user: () => require('./system/user').default,
+  sta: () => require('./sta/sta').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/sta/sta.js

+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    goods: [],
+  },
+  mutations: {
+    updateGoods (state, payload) {
+      state.goods = payload || []
+    },
+  },
+  actions: {
+    GetGoods ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.goods.url, {
+          method: api.statistics.goods.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateGoods', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+  }
+}

src/util/ajax.js

     JWT = headers.authorization
   }
   console.log(JWT)
-  return JWT ? JWT : localStorage.getItem('JWT')
+  return JWT ? JWT : localStorage.getItem('JWT') // eslint-disable-line
 }
 
 const Axios = axios.create({

src/util/api.js

     getGymCardById: {
       method: 'get',
       url: `${baseUrl}${common}/gymcard/:id`
+    },
+    giveCard: {
+      method: 'post',
+      url: `${baseUrl}${common}/gymcard/:id/to/:users`
     }
   },
   customerManager: {
       method: 'get',
       url: `${baseUrl}${common}/coupon`
     }
+  },
+  statistics: {
+    goods: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/goods`
+    },
   }
 }
 export default $api

src/util/upload.js

+import api from './api'
+import ajax from './ajax'
+
+export default function upload (file) {
+  return new Promise((resolve, reject) => {
+    ajax({
+      ...api.file.image,
+      data: { file: file },
+    }).then(({ url }) => {
+      resolve(url)
+    }).catch(reject)
+  })
+}

src/util/util.js

+import Ajax from './ajax'
+import api from './api'
 const toolClass = {
   dateFormat: (timestamp, fmt) => {
     if (!fmt) {
     }
     return fmt
   },
-
+  ReplaceOrg (url) {
+    return url.replace(':org', 'MQ')
+  },
+  upload (item) {
+    return new Promise((resolve, reject) => {
+      Ajax({
+        ...api.file.image,
+        data: { file: item.file },
+      }).then((res) => {
+        let result = {
+          result: res
+        }
+        item.onSuccess(result, item.file)
+        console.log(result)
+        resolve(result)
+      }).catch(reject)
+    })
+  }
 }
 
 export function formatTimeBySeconds (ms) {