yuantianjiao 6 yıl önce
ebeveyn
işleme
d6d4ecda71

+ 1
- 1
dist/index.html Dosyayı Görüntüle

@@ -1 +1 @@
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 Dosyayı Görüntüle

@@ -1 +1,5 @@
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 Dosyayı Görüntüle

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

+ 5
- 2
src/pages/system/caseManager/keyManager/index.vue Dosyayı Görüntüle

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

+ 14
- 5
src/pages/system/courseManager/scheduleManager/index.vue Dosyayı Görüntüle

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

+ 6
- 6
src/pages/system/dashboard/index.vue Dosyayı Görüntüle

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

+ 5
- 2
src/pages/system/verificationManager/phoneVerification/index.vue Dosyayı Görüntüle

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

+ 22
- 9
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue Dosyayı Görüntüle

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

+ 10
- 7
src/store/course/schedule.js Dosyayı Görüntüle

@@ -21,13 +21,16 @@ export default {
21 21
   },
22 22
   actions: {
23 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 36
     GetScheduleList ({ commit }, payload) {

+ 13
- 10
src/store/verification/verification.js Dosyayı Görüntüle

@@ -29,16 +29,19 @@ export default {
29 29
       })
30 30
     },
31 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 47
     CourseVerifs ({ commit }, payload) {