修改

config/index.js

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

dist/static/js/manifest.3ad1d5771e9b13dbdad2.js

@@ -1,2 +0,0 @@
-!function(r){var n=window.webpackJsonp;window.webpackJsonp=function(e,u,c){for(var f,i,p,a=0,l=[];a<e.length;a++)i=e[a],o[i]&&l.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(r[f]=u[f]);for(n&&n(e,u,c);l.length;)l.shift()();if(c)for(a=0;a<c.length;a++)p=t(t.s=c[a]);return p};var e={},o={2:0};function t(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return r[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=r,t.c=e,t.d=function(r,n,e){t.o(r,n)||Object.defineProperty(r,n,{configurable:!1,enumerable:!0,get:e})},t.n=function(r){var n=r&&r.__esModule?function(){return r.default}:function(){return r};return t.d(n,"a",n),n},t.o=function(r,n){return Object.prototype.hasOwnProperty.call(r,n)},t.p="./",t.oe=function(r){throw console.error(r),r}}([]);
-//# sourceMappingURL=manifest.3ad1d5771e9b13dbdad2.js.map

dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap 67f48e46710049e36669"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 67f48e46710049e36669"],"sourceRoot":""}

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

@@ -23,7 +23,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入VIP卡数量"
-                v-model="postData.CardNum"
+                v-model="postData.TotalCount"
                 clearable>
               </el-input>
             </div>
@@ -35,7 +35,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入价格"
-                v-model="postData.Price"
+                v-model="postData.CardAmount"
                 clearable>
               </el-input>
             </div>
@@ -57,8 +57,8 @@ export default {
   data () {
     return {
       postData: {
-        CardNum: '', // 卡数量
-        Price: '', // 价格
+        TotalCount: '', // 卡数量
+        CardAmount: '', // 价格
         CaseId: '', // 案场id
       }
     }

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

@@ -53,7 +53,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="vips.list"
         stripe
         style="width: 100%">
         <el-table-column
@@ -101,7 +101,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapVipState, mapActions: mapVipActions } = createNamespacedHelpers('vip')
 
 export default {
   name: '',
@@ -116,16 +118,6 @@ export default {
         sellerName: '', // 销售姓名
         userName: '', // 用户名
       },
-      currentList: [{
-        CardNo: 'xxx',
-        Price: 'xxx',
-        Status: 'xxx',
-        SellerName: 'xxx',
-        CaseName: 'xxx',
-        UserName: 'xxx',
-        ActivationTime: 'xxx',
-        CreatTime: 'xxx',
-      }]
     }
   },
   mounted () {
@@ -134,6 +126,9 @@ export default {
     })
   },
   computed: {
+    ...mapVipState({
+      vips: x => x.vipList,
+    }),
     ...mapState({
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
@@ -148,14 +143,19 @@ export default {
     }
   },
   methods: {
+    ...mapVipActions([
+      'GetVipList',
+    ]),
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
       this.getList()
     },
     getList () { // 获取列表
+      this.GetVipList({...this.postData, caseid: this.CaseId})
     },
     handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
       this.getList()
     },
     addVIP () {

src/store/card/vip.js

@@ -0,0 +1,41 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    vipList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.vipList = payload || []
+    },
+  },
+  actions: {
+    GetVipList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.viplist.url, {
+          method: api.cardManager.viplist.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    AddVip ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.cardManager.vipadd.url, {
+          method: api.cardManager.vipadd.method,
+          data: {
+            ...payload,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    }
+  }
+}

src/store/index.js

@@ -25,6 +25,7 @@ export const modules = {
   goodsorder: () => require('./goods/order').default,
   cmscase: () => require('./cms/case').default,
   caserecord: () => require('./case/record').default,
+  vip: () => require('./card/vip').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -1,4 +1,4 @@
-const baseUrl = '/api'
+const baseUrl = '/api-v2'
 const common = '/common/:org'
 const guest = '/guest/:org'
 
@@ -543,5 +543,19 @@ const $api = {
       url: `${baseUrl}${common}/order/goods/record/:id`
     },
   },
+  cardManager: {
+    viplist: {
+      method: 'get',
+      url: `${baseUrl}${common}/vipcard`
+    },
+    vipadd: {
+      method: 'post',
+      url: `${baseUrl}${common}/vipcard`
+    },
+    vipcharge: {
+      method: 'put',
+      url: `${baseUrl}${common}/vipcard/:code`
+    },
+  },
 }
 export default $api