0915PM

config/index.js

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

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

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

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

@@ -236,19 +236,9 @@ export default {
         TotalCount: '',
         CaseId: '',
         OrgId: '',
-        Share: {
-          CardShareInfo: '',
-          CardUseRule: '',
-          CardUseInstruction: ''
-        },
-        Images: [{
-          CardImageUrl: ''
-        }],
-        Targets: [{
-          TargetType: '',
-          TargetId: '',
-          TargetName: ''
-        }],
+        Share: {},
+        Images: null,
+        Targets: [{}],
         ChannelId: ''
       },
       postData: {

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

@@ -54,6 +54,9 @@
         <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"
@@ -279,6 +282,17 @@ export default {
       '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

@@ -90,7 +90,7 @@
           <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>
@@ -184,7 +184,7 @@
             </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>

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

@@ -2,7 +2,11 @@
   <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
@@ -251,6 +255,10 @@ export default {
       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

@@ -87,9 +87,11 @@
 </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 () {
@@ -111,6 +113,9 @@ export default {
       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
@@ -128,6 +133,9 @@ export default {
     })
   },
   methods: {
+    ...mapStaActions([
+      'GetGoods',
+    ]),
     search () { // 搜索
       // 1
     },

src/store/card/gymCard.js

@@ -61,18 +61,18 @@ export default {
         }).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

@@ -90,7 +90,7 @@ export default {
       })
     },
     SetListNull ({ commit }) {
-      commit('updatesSheduleList', [])
+      commit('updateList', [])
     }
   }
 }

src/store/index.js

@@ -32,6 +32,7 @@ export const modules = {
   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

@@ -0,0 +1,29 @@
+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/api.js

@@ -648,6 +648,10 @@ const $api = {
     getGymCardById: {
       method: 'get',
       url: `${baseUrl}${common}/gymcard/:id`
+    },
+    giveCard: {
+      method: 'post',
+      url: `${baseUrl}${common}/gymcard/:id/to/:users`
     }
   },
   customerManager: {
@@ -685,6 +689,12 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/coupon`
     }
+  },
+  statistics: {
+    goods: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/goods`
+    },
   }
 }
 export default $api

src/util/util.js

@@ -36,7 +36,7 @@ const toolClass = {
         data: { file: item.file },
       }).then((res) => {
         let result = {
-          result : res
+          result: res
         }
         item.onSuccess(result, item.file)
         console.log(result)