SpaceOfCheng
/
admin
关注 3
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 2 动态
浏览代码

ytj

yuantianjiao 6 年前
父节点
83dad6bffa 7a82db7d64
当前提交
d6d4ecda71
共有 10 个文件被更改，包括 102 次插入 和 64 次删除
合并视图 显示文件统计
  1. 1
    1
      dist/index.html
  2. 5
    1
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  3. 21
    21
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  4. 5
    2
      src/pages/system/caseManager/keyManager/index.vue
  5. 14
    5
      src/pages/system/courseManager/scheduleManager/index.vue
  6. 6
    6
      src/pages/system/dashboard/index.vue
  7. 5
    2
      src/pages/system/verificationManager/phoneVerification/index.vue
  8. 22
    9
      src/pages/system/verificationManager/phoneVerification/verificationList/index.vue
  9. 10
    7
      src/store/course/schedule.js
  10. 13
    10
      src/store/verification/verification.js

+ 1
- 1
dist/index.html 查看文件

1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.da72f493c7941463d2f91860e23741ea.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.5377c41cef7f8f6e4d94.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.3e4748c83fcfdc07f0dd9260d0edb217.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.00453897a47c6acb81ec.js></script></body></html>

+ 5
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map 查看文件

1 
-{"version":3,"sources":["webpack:///webpack/bootstrap 38c2fa8e54edeb855ede"],"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 38c2fa8e54edeb855ede"],"sourceRoot":""}
1 
+<<<<<<< HEAD
2 
+{"version":3,"sources":["webpack:///webpack/bootstrap 38c2fa8e54edeb855ede"],"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 38c2fa8e54edeb855ede"],"sourceRoot":""}
3 
+=======
4 
+{"version":3,"sources":["webpack:///webpack/bootstrap 6bfa9d07d14e3f431ca6"],"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 6bfa9d07d14e3f431ca6"],"sourceRoot":""}
5 
+>>>>>>> 7a82db7d64ac5252dfa99753c9a040dc9d06bfc2

+ 21
- 21
src/pages/system/cardAndCouponManager/couponManager/edit.vue 查看文件

284 
     <el-dialog
284 
     <el-dialog
285 
       title="选择指定商品"
285 
       title="选择指定商品"
286 
       :visible.sync="centerDialogVisible"
286 
       :visible.sync="centerDialogVisible"
287 
+      @close="postData.page=1;total=1"
287 
       width="650px"
288 
       width="650px"
288 
       center>
289 
       center>
289 
       <div>
290 
       <div>
290 
         <div v-if="couponInfo.CouponType === 'goods'">
291 
         <div v-if="couponInfo.CouponType === 'goods'">
291 
           <el-table
292 
           <el-table
292 
-            ref="multipleTable"
293 
-            :data="goodsList.list"
293 
+            ref="multipleTable1"
294 
+            :data="goodsList"
294 
             tooltip-effect="dark"
295 
             tooltip-effect="dark"
295 
             style="width: 100%"
296 
             style="width: 100%"
296 
             @selection-change="handleGoodsChange">
297 
             @selection-change="handleGoodsChange">
304 
             <el-table-column
305 
             <el-table-column
305 
               prop="TypeId"
306 
               prop="TypeId"
306 
               label="类别">
307 
               label="类别">
307 
-              <template slot-scope="scope">
308 
-                <span>{{returnGoodsType(scope.row.TypeId)}}</span>
309 
-              </template>
310 
             </el-table-column>
308 
             </el-table-column>
311 
             <el-table-column
309 
             <el-table-column
312 
               prop="Price"
310 
               prop="Price"
323 
         </div>
321 
         </div>
324 
         <div v-if="couponInfo.CouponType === 'course'">
322 
         <div v-if="couponInfo.CouponType === 'course'">
325 
           <el-table
323 
           <el-table
326 
-            ref="multipleTable"
324 
+            ref="multipleTable2"
327 
             :data="courseList"
325 
             :data="courseList"
328 
             tooltip-effect="dark"
326 
             tooltip-effect="dark"
329 
             style="width: 100%"
327 
             style="width: 100%"
338 
             <el-table-column
336 
             <el-table-column
339 
               prop="BeginDate"
337 
               prop="BeginDate"
340 
               label="开始时间">
338 
               label="开始时间">
341 
-              <template slot-scope="scope">
342 
-                <span>{{toolClass.dateFormat(scope.row.BeginDate, 'yyyy-MM-dd')}}</span>
343 
-              </template>
344 
             </el-table-column>
339 
             </el-table-column>
345 
             <el-table-column
340 
             <el-table-column
346 
               prop="EndDate"
341 
               prop="EndDate"
347 
               label="结束时间">
342 
               label="结束时间">
348 
-              <template slot-scope="scope">
349 
-                <span>{{toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')}}</span>
350 
-              </template>
351 
             </el-table-column>
343 
             </el-table-column>
352 
             <el-table-column
344 
             <el-table-column
353 
-              prop="LocationId"
345 
+              prop="LocationName"
354 
               label="类别">
346 
               label="类别">
355 
             </el-table-column>
347 
             </el-table-column>
356 
             <el-table-column
348 
             <el-table-column
386 
   name: '',
378 
   name: '',
387 
   data () {
379 
   data () {
388 
     return {
380 
     return {
381 
+      courseList: [],
382 
+      goodsList: [],
389 
       videoOff: false,
383 
       videoOff: false,
390 
       total: 0,
384 
       total: 0,
391 
       centerDialogVisible: false,
385 
       centerDialogVisible: false,
481 
       channelList: x => x.channelList,
475 
       channelList: x => x.channelList,
482 
     }),
476 
     }),
483 
     ...mapGoodsState({
477 
     ...mapGoodsState({
484 
-      goodsList: x => x.goodsList,
478 
+      // goodsList: x => x.goodsList,
485 
       goodsTypes: x => x.goodsTypes.list,
479 
       goodsTypes: x => x.goodsTypes.list,
486 
     }),
480 
     }),
487 
     ...mapCourseState({
481 
     ...mapCourseState({
488 
-      courseList: x => x.courseLister,
482 
+      // courseList: x => x.courseLister,
489 
     }),
483 
     }),
490 
     CaseId: {
484 
     CaseId: {
491 
       get () {
485 
       get () {
600 
       this.currentSelectArr = val
594 
       this.currentSelectArr = val
601 
     },
595 
     },
602 
     couponTypeChange () {
596 
     couponTypeChange () {
603 
-      // if (this.goodsList.length) {
604 
-      //   this.goodsList = []
605 
-      // }
606 
-      // if (this.courseList.length) {
607 
-      //   this.courseList = []
608 
-      // }
609 
       this.couponInfo.Targets = []
597 
       this.couponInfo.Targets = []
610 
     },
598 
     },
611 
     addGoods () { // 添加指定商品
599 
     addGoods () { // 添加指定商品
612 
       if (this.couponInfo.CouponType === 'goods') {
600 
       if (this.couponInfo.CouponType === 'goods') {
601 
+        this.postData.page = 1
602 
+        this.total = 1
613 
         this.GetGoodsList({
603 
         this.GetGoodsList({
614 
           ...this.postData,
604 
           ...this.postData,
615 
           caseid: this.couponInfo.CaseId
605 
           caseid: this.couponInfo.CaseId
616 
         }).then((res) => {
606 
         }).then((res) => {
607 
+          this.goodsList = []
608 
+          for (var n = 0; n < res.list.length; n++) {
609 
+            this.goodsList.push({ ...res.list[n], TypeId: this.returnGoodsType(res.list[n].TypeId) })
610 
+          }
617 
           this.total = res.pagenum
611 
           this.total = res.pagenum
618 
           this.centerDialogVisible = true
612 
           this.centerDialogVisible = true
619 
         })
613 
         })
620 
       } else if (this.couponInfo.CouponType === 'course') {
614 
       } else if (this.couponInfo.CouponType === 'course') {
615 
+        this.postData.page = 1
616 
+        this.total = 1
621 
         this.getCourseLister({
617 
         this.getCourseLister({
622 
           ...this.postData,
618 
           ...this.postData,
623 
           caseid: this.couponInfo.CaseId
619 
           caseid: this.couponInfo.CaseId
624 
         }).then((res) => {
620 
         }).then((res) => {
621 
+          this.courseList = []
622 
+          for (var n = 0; n < res.list.length; n++) {
623 
+            this.courseList.push({ ...res.list[n], BeginDate: this.toolClass.dateFormat(res.list[n].BeginDate), EndDate: this.toolClass.dateFormat(res.list[n].EndDate) })
624 
+          }
625 
           this.total = res.pagenum
625 
           this.total = res.pagenum
626 
           this.centerDialogVisible = true
626 
           this.centerDialogVisible = true
627 
           // console.log(JSON.stringify(this.courseList))
627 
           // console.log(JSON.stringify(this.courseList))

+ 5
- 2
src/pages/system/caseManager/keyManager/index.vue 查看文件

166 
     addKey () {
166 
     addKey () {
167 
       this.$router.push({ name: 'addKey' })
167 
       this.$router.push({ name: 'addKey' })
168 
     },
168 
     },
169 
+    checkPhone (val) {
170 
+      return !!(/^1[34578]\d{9}$/.test(val))
171 
+    },
169 
     sureBindPhone () { // 确认绑定手机号
172 
     sureBindPhone () { // 确认绑定手机号
170 
-      if (this.bindPhone !== '') {
173 
+      if (this.bindPhone !== '' && this.checkPhone(this.bindPhone)) {
171 
         this.bindKeyByPhone({
174 
         this.bindKeyByPhone({
172 
           phone: this.bindPhone,
175 
           phone: this.bindPhone,
173 
           keyid: this.currentItem.KeyId
176 
           keyid: this.currentItem.KeyId
183 
       } else {
186 
       } else {
184 
         this.$message({
187 
         this.$message({
185 
           type: 'error',
188 
           type: 'error',
186 
-          message: '请输入手机号'
189 
+          message: '请输入正确手机号'
187 
         })
190 
         })
188 
       }
191 
       }
189 
     },
192 
     },

+ 14
- 5
src/pages/system/courseManager/scheduleManager/index.vue 查看文件

125 
       courseid: '',
125 
       courseid: '',
126 
       currentCourseItem: {},
126 
       currentCourseItem: {},
127 
       centerDialogVisible: false,
127 
       centerDialogVisible: false,
128 
+      loaded: false,
128 
     }
129 
     }
129 
   },
130 
   },
130 
   computed: {
131 
   computed: {
141 
       },
142 
       },
142 
       set (val) {
143 
       set (val) {
143 
         this.caseid = val
144 
         this.caseid = val
144 
-        this.getList()
145 
+        if (this.loaded) {
146 
+          this.getList()
147 
+        }
145 
       }
148 
       }
146 
     },
149 
     },
147 
     fcEvents () {
150 
     fcEvents () {
148 
-      return this.details.map(x => {
151 
+      return this.loaded ? this.details.map(x => {
149 
         return {
152 
         return {
150 
           title: x.DetailName,
153 
           title: x.DetailName,
151 
           start: x.BeginDate,
154 
           start: x.BeginDate,
153 
           id: x.DetailId,
156 
           id: x.DetailId,
154 
           detail: x,
157 
           detail: x,
155 
         }
158 
         }
156 
-      })
159 
+      }) : []
157 
     },
160 
     },
158 
     CurrentMonth: {
161 
     CurrentMonth: {
159 
       get () {
162 
       get () {
184 
     },
187 
     },
185 
     changeMonth (start, end, current) {
188 
     changeMonth (start, end, current) {
186 
       this.CurrentMonth = this.toolClass.dateFormat(current, 'yyyy-MM')
189 
       this.CurrentMonth = this.toolClass.dateFormat(current, 'yyyy-MM')
187 
-      this.getList()
190 
+      if (this.loaded) {
191 
+        this.getList()
192 
+      }
188 
     },
193 
     },
189 
     search () { // 搜索
194 
     search () { // 搜索
190 
-      this.getList()
195 
+      if (this.loaded) {
196 
+        this.getList()
197 
+      }
191 
     },
198 
     },
192 
     getList () {
199 
     getList () {
193 
       if (this.CaseId !== '' || this.courseid !== '') {
200 
       if (this.CaseId !== '' || this.courseid !== '') {
195 
           caseid: this.CaseId,
202 
           caseid: this.CaseId,
196 
           date: this.CurrentMonth,
203 
           date: this.CurrentMonth,
197 
           courseid: this.courseid,
204 
           courseid: this.courseid,
205 
+        }).then(res => {
206 
+          this.loaded = true
198 
         })
207 
         })
199 
       } else {
208 
       } else {
200 
         this.SetListNull()
209 
         this.SetListNull()

+ 6
- 6
src/pages/system/dashboard/index.vue 查看文件

16 
           <dashboardList :data="subItem" :index="subIndex"></dashboardList>
16 
           <dashboardList :data="subItem" :index="subIndex"></dashboardList>
17 
         </div>
17 
         </div>
18 
         <div v-if="subItem.type === 'histogram' && typeof(subItem.value) === 'object' && subItem.value.length">
18 
         <div v-if="subItem.type === 'histogram' && typeof(subItem.value) === 'object' && subItem.value.length">
19 
-          <histogram :data="subItem.value" :index="index + '-' + subIndex"></histogram>
19 
+          <histogram :data="subItem" :index="index + '-' + subIndex"></histogram>
20 
         </div>
20 
         </div>
21 
         <div v-if="subItem.type === 'pieDiagram' && typeof(subItem.value) === 'object' && subItem.value.length">
21 
         <div v-if="subItem.type === 'pieDiagram' && typeof(subItem.value) === 'object' && subItem.value.length">
22 
           <pieDiagram :data="subItem" :index="index + '-' + subIndex"></pieDiagram>
22 
           <pieDiagram :data="subItem" :index="index + '-' + subIndex"></pieDiagram>
25 
           <brokenLineGraph :data="subItem" :index="index + '-' + subIndex"></brokenLineGraph>
25 
           <brokenLineGraph :data="subItem" :index="index + '-' + subIndex"></brokenLineGraph>
26 
         </div>
26 
         </div>
27 
         <div v-if="subItem.type === 'ringChart' && typeof(subItem.value) === 'object' && subItem.value.length">
27 
         <div v-if="subItem.type === 'ringChart' && typeof(subItem.value) === 'object' && subItem.value.length">
28 
-          <ringChart :data="subItem.value" :index="index + '-' + subIndex"></ringChart>
28 
+          <ringChart :data="subItem" :index="index + '-' + subIndex"></ringChart>
29 
         </div>
29 
         </div>
30 
         <div v-if="subItem.type === 'dashboard' && typeof(subItem.value) === 'object' && subItem.value.length">
30 
         <div v-if="subItem.type === 'dashboard' && typeof(subItem.value) === 'object' && subItem.value.length">
31 
-          <dashboard :data="subItem.value" :index="index + '-' + subIndex"></dashboard>
31 
+          <dashboard :data="subItem" :index="index + '-' + subIndex"></dashboard>
32 
         </div>
32 
         </div>
33 
         <div v-if="subItem.type === 'brokenLineGraphGroup' && typeof(subItem.value) === 'object' && subItem.value.length">
33 
         <div v-if="subItem.type === 'brokenLineGraphGroup' && typeof(subItem.value) === 'object' && subItem.value.length">
34 
-          <brokenLineGraphGroup :data="subItem.value" :index="index + '-' + subIndex"></brokenLineGraphGroup>
34 
+          <brokenLineGraphGroup :data="subItem" :index="index + '-' + subIndex"></brokenLineGraphGroup>
35 
         </div>
35 
         </div>
36 
       </div>
36 
       </div>
37 
     </div>
37 
     </div>
167 
       this.getBottomData(this.postData.caseid, this.bottomSelectValue)
167 
       this.getBottomData(this.postData.caseid, this.bottomSelectValue)
168 
     },
168 
     },
169 
     getData (id) {
169 
     getData (id) {
170 
+      this.pageData = []
170 
       this.getDashboardData({
171 
       this.getDashboardData({
171 
         caseid: id
172 
         caseid: id
172 
       }).then((res) => {
173 
       }).then((res) => {
173 
-        this.pageData = []
174 
         res = res || []
174 
         res = res || []
175 
         for (var n = 0; n < res.length; n++) {
175 
         for (var n = 0; n < res.length; n++) {
176 
           this.pageData.push([])
176 
           this.pageData.push([])
183 
       })
183 
       })
184 
     },
184 
     },
185 
     getBottomData (id, type) {
185 
     getBottomData (id, type) {
186 
+      this.bottomData = []
186 
       this.getDashboardBottomData({
187 
       this.getDashboardBottomData({
187 
         caseid: id,
188 
         caseid: id,
188 
         statype: type
189 
         statype: type
189 
       }).then((res) => {
190 
       }).then((res) => {
190 
-        this.bottomData = []
191 
         for (var n = 0; n < res.length; n++) {
191 
         for (var n = 0; n < res.length; n++) {
192 
           this.bottomData.push({
192 
           this.bottomData.push({
193 
             type: 'brokenLineGraph',
193 
             type: 'brokenLineGraph',

+ 5
- 2
src/pages/system/verificationManager/phoneVerification/index.vue 查看文件

51 
     inputPhone () {
51 
     inputPhone () {
52 
       this.phone = this.phone.replace(/\D/g, '')
52 
       this.phone = this.phone.replace(/\D/g, '')
53 
     },
53 
     },
54 
+    checkPhone (val) {
55 
+      return !!(/^1[34578]\d{9}$/.test(val))
56 
+    },
54 
     toVerificationList () { // 前往核销列表
57 
     toVerificationList () { // 前往核销列表
55 
-      if (this.phone !== '') {
58 
+      if (this.phone !== '' && this.checkPhone(this.phone)) {
56 
         this.$router.push({ name: 'phoneVerificationList', query: { tel: this.phone } })
59 
         this.$router.push({ name: 'phoneVerificationList', query: { tel: this.phone } })
57 
       } else {
60 
       } else {
58 
         this.$message({
61 
         this.$message({
59 
-          message: '手机号为空！',
62 
+          message: '手机号格式错误',
60 
           type: 'error'
63 
           type: 'error'
61 
         })
64 
         })
62 
       }
65 
       }

+ 22
- 9
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue 查看文件

16 
             type="warning"
16 
             type="warning"
17 
             @click="reback">返回</el-button>
17 
             @click="reback">返回</el-button>
18 
         </div>
18 
         </div>
19 
-        <div v-if="(courses.list||[]).length>0">
19 
+        <div v-if="courses.length>0">
20 
           <el-table
20 
           <el-table
21 
-              :data="courses.list"
21 
+              :data="courses"
22 
               stripe
22 
               stripe
23 
               style="width: 100%">
23 
               style="width: 100%">
24 
               <el-table-column
24 
               <el-table-column
58 
                   <el-button
58 
                   <el-button
59 
                     size="mini"
59 
                     size="mini"
60 
                     type="success"
60 
                     type="success"
61 
-                    v-if="scope.row.VerifyStatus!=='used'"
61 
+                    v-if="scope.row.VerifyStatus==='useable'"
62 
                     @click="check(scope.row)">核销</el-button>
62 
                     @click="check(scope.row)">核销</el-button>
63 
                   <el-button
63 
                   <el-button
64 
                     size="mini"
64 
                     size="mini"
65 
                     type="info"
65 
                     type="info"
66 
-                    v-else>已完成</el-button>
66 
+                    v-if="scope.row.VerifyStatus==='late'">逾期核销</el-button>
67 
+                  <el-button
68 
+                    size="mini"
69 
+                    type="info"
70 
+                    v-if="scope.row.VerifyStatus==='used'">已完成</el-button>
67 
                 </template>
71 
                 </template>
68 
               </el-table-column>
72 
               </el-table-column>
69 
             </el-table>
73 
             </el-table>
134 
       width="200">
138 
       width="200">
135 
       <span>确认核销此课程</span>
139 
       <span>确认核销此课程</span>
136 
       <span slot="footer" class="dialog-footer">
140 
       <span slot="footer" class="dialog-footer">
137 
-        <el-button @click="sureVerify">确 定</el-button>
141 
+        <el-button type="primary" @click="sureVerify">确 定</el-button>
138 
         <el-button type="primary" @click="sureAndBind">确定并绑定钥匙</el-button>
142 
         <el-button type="primary" @click="sureAndBind">确定并绑定钥匙</el-button>
139 
       </span>
143 
       </span>
140 
     </el-dialog>
144 
     </el-dialog>
151 
   name: '',
155 
   name: '',
152 
   data () {
156 
   data () {
153 
     return {
157 
     return {
158 
+      courses: [],
154 
       dialogVisible: false,
159 
       dialogVisible: false,
155 
       dialogList: [],
160 
       dialogList: [],
156 
       centerDialogVisible: false,
161 
       centerDialogVisible: false,
189 
       }
194 
       }
190 
     },
195 
     },
191 
     ...mapVerifState({
196 
     ...mapVerifState({
192 
-      courses: x => x.courseVerifs
197 
+      // courses: x => x.courseVerifs
193 
     }),
198 
     }),
194 
   },
199 
   },
195 
   methods: {
200 
   methods: {
208 
         id: this.phone
213 
         id: this.phone
209 
       }).then((res) => {
214 
       }).then((res) => {
210 
         if (res !== null) {
215 
         if (res !== null) {
216 
+          // console.log(JSON.stringify(this.courses))
211 
           this.customerId = res.CustomerId
217 
           this.customerId = res.CustomerId
212 
           this.customerName = res.CustomerName
218 
           this.customerName = res.CustomerName
213 
           const { code, tel } = this.$route.query
219 
           const { code, tel } = this.$route.query
215 
           this.tel = tel
221 
           this.tel = tel
216 
           this.getList()
222 
           this.getList()
217 
         } else {
223 
         } else {
218 
-          this.courses = {list: []}
224 
+          // this.courses = {list: []}
219 
           this.$message({
225 
           this.$message({
220 
             type: 'error',
226 
             type: 'error',
221 
             message: '未查询到用户信息'
227 
             message: '未查询到用户信息'
245 
     },
251 
     },
246 
     getList () {
252 
     getList () {
247 
       if (this.code && this.code !== '') {
253 
       if (this.code && this.code !== '') {
248 
-        this.GetCourseVerList({ id: this.code, page: this.page, pagesize: this.pagesize })
254 
+        this.GetCourseVerList({ id: this.code, page: this.page, pagesize: this.pagesize }).then((res) => {
255 
+          res.list = res.list || []
256 
+          this.courses = res.list
257 
+        })
249 
       } else {
258 
       } else {
250 
         if (this.tel && this.tel !== '') {
259 
         if (this.tel && this.tel !== '') {
251 
-          this.GetCourseVerListByTel({ tel: this.tel, page: this.page, pagesize: this.pagesize })
260 
+          this.GetCourseVerListByTel({ tel: this.tel, page: this.page, pagesize: this.pagesize }).then((res) => {
261 
+            res.list = res.list || []
262 
+            this.courses = res.list
263 
+          })
252 
         }
264 
         }
253 
       }
265 
       }
254 
     },
266 
     },
264 
       this.getList()
276 
       this.getList()
265 
     },
277 
     },
266 
     reback () { // 返回
278 
     reback () { // 返回
279 
+      this.courses = []
267 
       this.$router.push({ name: 'phoneVerification' })
280 
       this.$router.push({ name: 'phoneVerification' })
268 
     },
281 
     },
269 
     bindKey (item) { // 绑定钥匙
282 
     bindKey (item) { // 绑定钥匙

+ 10
- 7
src/store/course/schedule.js 查看文件

21 
   },
 21 
   },
22 
   actions: {
 22 
   actions: {
23 
     GetDetailList ({ commit }, payload) {
 23 
     GetDetailList ({ commit }, payload) {
24 
-      ajax(api.course.detail.url, {
25 
-        method: api.course.detail.method,
26 
-        queryData: {
27 
-          ...payload,
28 
-        }
29 
-      }).then(res => {
30 
-        commit('updateList', res)
24 
+      return new Promise((resolve, reject) => {
25 
+        ajax(api.course.detail.url, {
26 
+          method: api.course.detail.method,
27 
+          queryData: {
28 
+            ...payload,
29 
+          }
30 
+        }).then(res => {
31 
+          commit('updateList', res)
32 
+          resolve(res)
33 
+        }).catch(reject)
31 
       })
 34 
       })
32 
     },
 35 
     },
33 
     GetScheduleList ({ commit }, payload) {
 36 
     GetScheduleList ({ commit }, payload) {

+ 13
- 10
src/store/verification/verification.js 查看文件

29 
       })
 29 
       })
30 
     },
 30 
     },
31 
     GetCourseVerListByTel ({ commit }, payload) {
 31 
     GetCourseVerListByTel ({ commit }, payload) {
32 
-      ajax(api.verification.coursebytel.url, {
33 
-        method: api.verification.coursebytel.method,
34 
-        urlData: {
35 
-          tel: payload.tel
36 
-        },
37 
-        queryData: {
38 
-          ...payload
39 
-        }
40 
-      }).then(res => {
41 
-        commit('updateCourseList', res)
32 
+      return new Promise((resolve, reject) => {
33 
+        ajax(api.verification.coursebytel.url, {
34 
+          method: api.verification.coursebytel.method,
35 
+          urlData: {
36 
+            tel: payload.tel
37 
+          },
38 
+          queryData: {
39 
+            ...payload
40 
+          }
41 
+        }).then(res => {
42 
+          commit('updateCourseList', res)
43 
+          resolve(res)
44 
+        }).catch(reject)
42 
       })
 45 
       })
43 
     },
 46 
     },
44 
     CourseVerifs ({ commit }, payload) {
 47 
     CourseVerifs ({ commit }, payload) {