yuantianjiao 6 lat temu
rodzic
commit
da0d7d3b1c

+ 5
- 1
dist/index.html Wyświetl plik

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.dd00a9c870329bc81562dd14da6e98e5.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.8e3e4baf78b3cc886f2b.js></script></body></html>
1
+<<<<<<< HEAD
2
+<!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.dd00a9c870329bc81562dd14da6e98e5.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.8e3e4baf78b3cc886f2b.js></script></body></html>
3
+=======
4
+<!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.2c223bbaf0f4bdb0e71a1c3f8d3b6d76.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.ae4e272b7a17b74072a4.js></script></body></html>
5
+>>>>>>> 1a58430db27c36e72d639c79e205c7a4ac284c80

+ 5
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Wyświetl plik

1
-{"version":3,"sources":["webpack:///webpack/bootstrap 2e8957695796b9a1e3ef"],"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 2e8957695796b9a1e3ef"],"sourceRoot":""}
1
+<<<<<<< HEAD
2
+{"version":3,"sources":["webpack:///webpack/bootstrap 2e8957695796b9a1e3ef"],"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 2e8957695796b9a1e3ef"],"sourceRoot":""}
3
+=======
4
+{"version":3,"sources":["webpack:///webpack/bootstrap 5d987702dc0078cd7e59"],"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 5d987702dc0078cd7e59"],"sourceRoot":""}
5
+>>>>>>> 1a58430db27c36e72d639c79e205c7a4ac284c80

+ 3
- 2
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/edit.vue Wyświetl plik

120
             <div>
120
             <div>
121
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
121
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
122
                 <el-date-picker
122
                 <el-date-picker
123
+                  value-format="yyyy-MM-dd 00:00:00"
123
                   v-model="cardInfo.StartDate"
124
                   v-model="cardInfo.StartDate"
124
                   type="date"
125
                   type="date"
125
                   placeholder="选择起始日期"
126
                   placeholder="选择起始日期"
127
                 </el-date-picker>
128
                 </el-date-picker>
128
                 <span style="line-height:40px;">至</span>
129
                 <span style="line-height:40px;">至</span>
129
                 <el-date-picker
130
                 <el-date-picker
131
+                  value-format="yyyy-MM-dd 23:59:59"
130
                   v-model="cardInfo.EndDate"
132
                   v-model="cardInfo.EndDate"
131
                   type="date"
133
                   type="date"
132
                   placeholder="选择截止日期"
134
                   placeholder="选择截止日期"
294
       this.cardInfo.ChannelId = ''
296
       this.cardInfo.ChannelId = ''
295
     },
297
     },
296
     submit () { // 保存
298
     submit () { // 保存
299
+      // console.log(this.cardInfo.StartDate)
297
       if (this.$route.query.id) {
300
       if (this.$route.query.id) {
298
         this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
301
         this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
299
-        console.log(JSON.stringify(this.cardInfo))
300
         this.editGymCard(this.cardInfo).then((res) => {
302
         this.editGymCard(this.cardInfo).then((res) => {
301
           this.$alert('操作成功', '提示', {
303
           this.$alert('操作成功', '提示', {
302
             confirmButtonText: '确定',
304
             confirmButtonText: '确定',
308
       } else {
310
       } else {
309
         this.cardInfo.OrgId = this.OrgId
311
         this.cardInfo.OrgId = this.OrgId
310
         this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
312
         this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
311
-        console.log(JSON.stringify(this.cardInfo))
312
         this.addGymCard(this.cardInfo).then((res) => {
313
         this.addGymCard(this.cardInfo).then((res) => {
313
           this.$alert('操作成功', '提示', {
314
           this.$alert('操作成功', '提示', {
314
             confirmButtonText: '确定',
315
             confirmButtonText: '确定',

+ 2
- 0
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue Wyświetl plik

135
         <ul class="dialogSearchList flex-h">
135
         <ul class="dialogSearchList flex-h">
136
           <li class="flex-item">
136
           <li class="flex-item">
137
             <el-date-picker
137
             <el-date-picker
138
+              value-format="yyyy-MM-dd 00:00:00"
138
               v-model="dialogPostData.begindate"
139
               v-model="dialogPostData.begindate"
139
               type="date"
140
               type="date"
140
               placeholder="选择起始日期">
141
               placeholder="选择起始日期">
141
             </el-date-picker>
142
             </el-date-picker>
142
             <el-date-picker
143
             <el-date-picker
144
+              value-format="yyyy-MM-dd 23:59:59"
143
               v-model="dialogPostData.enddate"
145
               v-model="dialogPostData.enddate"
144
               type="date"
146
               type="date"
145
               placeholder="选择截止日期">
147
               placeholder="选择截止日期">

+ 3
- 8
src/pages/system/cardAndCouponManager/cardManager/edit.vue Wyświetl plik

118
           <div class="flex-item">
118
           <div class="flex-item">
119
             <div>
119
             <div>
120
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
120
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
121
-                <!-- <el-date-picker
122
-                  :disabled="isEdit"
123
-                  v-model="date"
124
-                  type="daterange"
125
-                  range-separator="至"
126
-                  start-placeholder="开始日期"
127
-                  end-placeholder="结束日期">
128
-                </el-date-picker> -->
129
                 <el-date-picker
121
                 <el-date-picker
122
+                  value-format="yyyy-MM-dd 00:00:00"
130
                   :disabled="isEdit"
123
                   :disabled="isEdit"
131
                   v-model="cardInfo.StartDate"
124
                   v-model="cardInfo.StartDate"
132
                   type="date"
125
                   type="date"
134
                 </el-date-picker>
127
                 </el-date-picker>
135
                 <span style="line-height:40px;">至</span>
128
                 <span style="line-height:40px;">至</span>
136
                 <el-date-picker
129
                 <el-date-picker
130
+                  value-format="yyyy-MM-dd 23:59:59"
137
                   :disabled="isEdit"
131
                   :disabled="isEdit"
138
                   v-model="cardInfo.EndDate"
132
                   v-model="cardInfo.EndDate"
139
                   type="date"
133
                   type="date"
477
       return true
471
       return true
478
     },
472
     },
479
     submit () { // 保存
473
     submit () { // 保存
474
+      console.log(this.cardInfo.StartDate, this.cardInfo.EndDate)
480
       if (this.$route.query.id) {
475
       if (this.$route.query.id) {
481
         // if (this.date !== '') {
476
         // if (this.date !== '') {
482
         //   this.cardInfo.StartDate = this.date[0]
477
         //   this.cardInfo.StartDate = this.date[0]

+ 2
- 0
src/pages/system/cardAndCouponManager/cardManager/index.vue Wyświetl plik

141
         <ul class="dialogSearchList flex-h">
141
         <ul class="dialogSearchList flex-h">
142
           <li class="flex-item">
142
           <li class="flex-item">
143
             <el-date-picker
143
             <el-date-picker
144
+              value-format="yyyy-MM-dd 00:00:00"
144
               v-model="dialogPostData.begindate"
145
               v-model="dialogPostData.begindate"
145
               type="date"
146
               type="date"
146
               placeholder="选择起始日期">
147
               placeholder="选择起始日期">
147
             </el-date-picker>
148
             </el-date-picker>
148
             <el-date-picker
149
             <el-date-picker
150
+              value-format="yyyy-MM-dd 23:59:59"
149
               v-model="dialogPostData.enddate"
151
               v-model="dialogPostData.enddate"
150
               type="date"
152
               type="date"
151
               placeholder="选择截止日期">
153
               placeholder="选择截止日期">

+ 4
- 0
src/pages/system/cardAndCouponManager/couponManager/edit.vue Wyświetl plik

162
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
162
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
163
                 <el-radio v-model="postData.TimeType" label="1" :disabled="isEdit">固定时间</el-radio>
163
                 <el-radio v-model="postData.TimeType" label="1" :disabled="isEdit">固定时间</el-radio>
164
                 <el-date-picker
164
                 <el-date-picker
165
+                  value-format="yyyy-MM-dd 00:00:00"
165
                   :disabled="isEdit"
166
                   :disabled="isEdit"
166
                   v-model="couponInfo.StartDate"
167
                   v-model="couponInfo.StartDate"
167
                   type="date"
168
                   type="date"
169
                 </el-date-picker>
170
                 </el-date-picker>
170
                 <span style="line-height:40px;">至</span>
171
                 <span style="line-height:40px;">至</span>
171
                 <el-date-picker
172
                 <el-date-picker
173
+                  value-format="yyyy-MM-dd 23:59:59"
172
                   :disabled="isEdit"
174
                   :disabled="isEdit"
173
                   v-model="couponInfo.EndDate"
175
                   v-model="couponInfo.EndDate"
174
                   type="date"
176
                   type="date"
195
           <div class="flex-item">
197
           <div class="flex-item">
196
             <div>
198
             <div>
197
               <el-date-picker
199
               <el-date-picker
200
+                value-format="yyyy-MM-dd 00:00:00"
198
                 :disabled="isEdit"
201
                 :disabled="isEdit"
199
                 v-model="couponInfo.StartDate"
202
                 v-model="couponInfo.StartDate"
200
                 type="date"
203
                 type="date"
202
               </el-date-picker>
205
               </el-date-picker>
203
               <span style="line-height:40px;">至</span>
206
               <span style="line-height:40px;">至</span>
204
               <el-date-picker
207
               <el-date-picker
208
+                value-format="yyyy-MM-dd 23:59:59"
205
                 :disabled="isEdit"
209
                 :disabled="isEdit"
206
                 v-model="couponInfo.EndDate"
210
                 v-model="couponInfo.EndDate"
207
                 type="date"
211
                 type="date"

+ 2
- 0
src/pages/system/cardAndCouponManager/couponManager/index.vue Wyświetl plik

132
         <ul class="dialogSearchList flex-h">
132
         <ul class="dialogSearchList flex-h">
133
           <li class="flex-item">
133
           <li class="flex-item">
134
             <el-date-picker
134
             <el-date-picker
135
+              value-format="yyyy-MM-dd 00:00:00"
135
               v-model="dialogPostData.begindate"
136
               v-model="dialogPostData.begindate"
136
               type="date"
137
               type="date"
137
               placeholder="选择起始日期">
138
               placeholder="选择起始日期">
138
             </el-date-picker>
139
             </el-date-picker>
139
             <el-date-picker
140
             <el-date-picker
141
+              value-format="yyyy-MM-dd 23:59:59"
140
               v-model="dialogPostData.enddate"
142
               v-model="dialogPostData.enddate"
141
               type="date"
143
               type="date"
142
               placeholder="选择截止日期">
144
               placeholder="选择截止日期">

+ 2
- 2
src/pages/system/cardAndCouponManager/givingRecords.vue Wyświetl plik

13
           </li>
13
           </li>
14
           <li>
14
           <li>
15
             <el-date-picker
15
             <el-date-picker
16
+              value-format="yyyy-MM-dd 00:00:00"
16
               v-model="postData.startDate"
17
               v-model="postData.startDate"
17
               type="date"
18
               type="date"
18
-              value-format="yyyy-MM-dd"
19
               placeholder="选择起始日期">
19
               placeholder="选择起始日期">
20
             </el-date-picker>
20
             </el-date-picker>
21
             <span>至</span>
21
             <span>至</span>
22
             <el-date-picker
22
             <el-date-picker
23
+              value-format="yyyy-MM-dd 23:59:59"
23
               v-model="postData.endDate"
24
               v-model="postData.endDate"
24
               type="date"
25
               type="date"
25
-              value-format="yyyy-MM-dd"
26
               placeholder="选择截止日期">
26
               placeholder="选择截止日期">
27
             </el-date-picker>
27
             </el-date-picker>
28
           </li>
28
           </li>

+ 1
- 1
src/pages/system/courseManager/courseList/add.vue Wyświetl plik

125
                 range-separator="至"
125
                 range-separator="至"
126
                 start-placeholder="开始日期"
126
                 start-placeholder="开始日期"
127
                 end-placeholder="结束日期"
127
                 end-placeholder="结束日期"
128
-                value-format="yyyy-MM-ddTHH:mm:ss"
128
+                :default-time="['00:00:00', '23:59:59']"
129
                 :picker-options="pickerOptions">
129
                 :picker-options="pickerOptions">
130
               </el-date-picker>
130
               </el-date-picker>
131
             </div>
131
             </div>

+ 2
- 0
src/pages/system/dataStatistics/cardCouponUsedList/index.vue Wyświetl plik

50
           <li style="white-space: nowrap;">
50
           <li style="white-space: nowrap;">
51
             <span>有效期:</span>
51
             <span>有效期:</span>
52
             <el-date-picker
52
             <el-date-picker
53
+              value-format="yyyy-MM-dd 00:00:00"
53
               v-model="postData.begindate"
54
               v-model="postData.begindate"
54
               type="date"
55
               type="date"
55
               placeholder="选择起始日期">
56
               placeholder="选择起始日期">
56
             </el-date-picker>
57
             </el-date-picker>
57
             <span>至</span>
58
             <span>至</span>
58
             <el-date-picker
59
             <el-date-picker
60
+              value-format="yyyy-MM-dd 23:59:59"
59
               v-model="postData.enddate"
61
               v-model="postData.enddate"
60
               type="date"
62
               type="date"
61
               placeholder="选择截止日期">
63
               placeholder="选择截止日期">

+ 2
- 0
src/pages/system/dataStatistics/courseOrderList/index.vue Wyświetl plik

33
           <li style="white-space: nowrap;">
33
           <li style="white-space: nowrap;">
34
             <span>下单时间:</span>
34
             <span>下单时间:</span>
35
             <el-date-picker
35
             <el-date-picker
36
+              value-format="yyyy-MM-dd 00:00:00"
36
               v-model="postData.begindate"
37
               v-model="postData.begindate"
37
               type="date"
38
               type="date"
38
               placeholder="选择起始日期">
39
               placeholder="选择起始日期">
39
             </el-date-picker>
40
             </el-date-picker>
40
             <span>至</span>
41
             <span>至</span>
41
             <el-date-picker
42
             <el-date-picker
43
+              value-format="yyyy-MM-dd 23:59:59"
42
               v-model="postData.enddate"
44
               v-model="postData.enddate"
43
               type="date"
45
               type="date"
44
               placeholder="选择截止日期">
46
               placeholder="选择截止日期">

+ 2
- 0
src/pages/system/dataStatistics/goodsOrderList/index.vue Wyświetl plik

36
           <li style="white-space: nowrap;">
36
           <li style="white-space: nowrap;">
37
             <span>下单时间:</span>
37
             <span>下单时间:</span>
38
             <el-date-picker
38
             <el-date-picker
39
+              value-format="yyyy-MM-dd 00:00:00"
39
               v-model="postData.begindate"
40
               v-model="postData.begindate"
40
               type="date"
41
               type="date"
41
               placeholder="选择起始日期">
42
               placeholder="选择起始日期">
42
             </el-date-picker>
43
             </el-date-picker>
43
             <span>至</span>
44
             <span>至</span>
44
             <el-date-picker
45
             <el-date-picker
46
+              value-format="yyyy-MM-dd 23:59:59"
45
               v-model="postData.enddate"
47
               v-model="postData.enddate"
46
               type="date"
48
               type="date"
47
               placeholder="选择截止日期">
49
               placeholder="选择截止日期">

+ 1
- 0
src/pages/system/newOrder/caseRecord/index.vue Wyświetl plik

88
               <div class="flex-item">
88
               <div class="flex-item">
89
                 <div style="width:50%">
89
                 <div style="width:50%">
90
                   <el-date-picker
90
                   <el-date-picker
91
+                    value-format="yyyy-MM-dd 00:00:00"
91
                     v-model="detail.Month"
92
                     v-model="detail.Month"
92
                     type="month"
93
                     type="month"
93
                     placeholder="选择月">
94
                     placeholder="选择月">

+ 2
- 2
src/util/api.js Wyświetl plik

1
-const baseUrl = '/api-v2'
2
-// const baseUrl = '/api'
1
+// const baseUrl = '/api-v2'
2
+const baseUrl = '/api'
3
 const common = '/common/:org'
3
 const common = '/common/:org'
4
 const guest = '/guest/:org'
4
 const guest = '/guest/:org'
5
 
5