许成详 6 年之前
父節點
當前提交
a0ed2e8471

+ 2
- 2
config/index.js 查看文件

@@ -12,8 +12,8 @@ module.exports = {
12 12
     proxyTable: {
13 13
       '/api': {
14 14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15
-        // target: 'http://192.168.0.62:8080', //wf
16
-         target: 'http://127.0.0.1:8080', 
15
+        target: 'http://192.168.0.62:8080', //wf
16
+        // target: 'http://127.0.0.1:8080', 
17 17
         // target: 'http://192.168.0.11', //ys
18 18
         // target: 'http://192.168.0.125:8080', //hyq
19 19
         // target: 'http://dev.ycjcjy.com/', //frp

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

@@ -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.6d3a84c72a2cbf91cae3ee9dea719ebc.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.0c3377925c672e8d721a.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.8d558d9829abebb1f37b11f1edb73c13.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.1987297196245aa45be9.js></script></body></html>

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

@@ -1 +1 @@
1
-{"version":3,"sources":["webpack:///webpack/bootstrap 529180f8ea88f8629474"],"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 529180f8ea88f8629474"],"sourceRoot":""}
1
+{"version":3,"sources":["webpack:///webpack/bootstrap 3f25be952ff52ae11e45"],"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 3f25be952ff52ae11e45"],"sourceRoot":""}

+ 2
- 2
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/edit.vue 查看文件

@@ -120,7 +120,7 @@
120 120
             <div>
121 121
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
122 122
                 <el-date-picker
123
-                  value-format="yyyy-MM-dd 00:00:00"
123
+                  value-format="yyyy-MM-ddT00:00:00Z"
124 124
                   v-model="cardInfo.StartDate"
125 125
                   type="date"
126 126
                   placeholder="选择起始日期"
@@ -128,7 +128,7 @@
128 128
                 </el-date-picker>
129 129
                 <span style="line-height:40px;">至</span>
130 130
                 <el-date-picker
131
-                  value-format="yyyy-MM-dd 23:59:59"
131
+                  value-format="yyyy-MM-ddT23:59:59Z"
132 132
                   v-model="cardInfo.EndDate"
133 133
                   type="date"
134 134
                   placeholder="选择截止日期"

+ 2
- 2
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue 查看文件

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

+ 6
- 3
src/pages/system/cardAndCouponManager/cardManager/edit.vue 查看文件

@@ -101,7 +101,7 @@
101 101
           <span>目标课程:<em>*</em></span>
102 102
           <div class="flex-item">
103 103
             <div>
104
-              <el-select v-model="cardInfo.Targets[0].TargetId" placeholder="请选择" :disabled="isEdit">
104
+              <el-select v-model="cardInfo.Targets[0].TargetId" placeholder="请选择" :disabled="isEdit" @change="courseChange">
105 105
                 <el-option
106 106
                   v-for="item in courseList"
107 107
                   :key="item.CourseId"
@@ -119,7 +119,7 @@
119 119
             <div>
120 120
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
121 121
                 <el-date-picker
122
-                  value-format="yyyy-MM-dd 00:00:00"
122
+                  value-format="yyyy-MM-ddT00:00:00Z"
123 123
                   :disabled="isEdit"
124 124
                   v-model="cardInfo.StartDate"
125 125
                   type="date"
@@ -127,7 +127,7 @@
127 127
                 </el-date-picker>
128 128
                 <span style="line-height:40px;">至</span>
129 129
                 <el-date-picker
130
-                  value-format="yyyy-MM-dd 23:59:59"
130
+                  value-format="yyyy-MM-ddT23:59:59Z"
131 131
                   :disabled="isEdit"
132 132
                   v-model="cardInfo.EndDate"
133 133
                   type="date"
@@ -338,6 +338,9 @@ export default {
338 338
     ...mapChannelActions([
339 339
       'GetChannelListList',
340 340
     ]),
341
+    courseChange () {
342
+      // 1
343
+    },
341 344
     caseChange () { // 选择案场
342 345
       this.GetChannelListList({
343 346
         caseid: this.cardInfo.CaseId,

+ 2
- 2
src/pages/system/cardAndCouponManager/cardManager/index.vue 查看文件

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

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

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

+ 2
- 2
src/pages/system/cardAndCouponManager/couponManager/index.vue 查看文件

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

+ 3
- 3
src/pages/system/cardAndCouponManager/givingRecords.vue 查看文件

@@ -13,14 +13,14 @@
13 13
           </li>
14 14
           <li>
15 15
             <el-date-picker
16
-              value-format="yyyy-MM-dd 00:00:00"
16
+              value-format="yyyy-MM-ddT00:00:00Z"
17 17
               v-model="postData.startDate"
18 18
               type="date"
19 19
               placeholder="选择起始日期">
20 20
             </el-date-picker>
21 21
             <span>至</span>
22 22
             <el-date-picker
23
-              value-format="yyyy-MM-dd 23:59:59"
23
+              value-format="yyyy-MM-ddT23:59:59Z"
24 24
               v-model="postData.endDate"
25 25
               type="date"
26 26
               placeholder="选择截止日期">
@@ -140,7 +140,7 @@ export default {
140 140
       this.getList()
141 141
     },
142 142
     FormatDate (date) {
143
-      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
143
+      return this.toolClass.dateFormat(date, 'yyyy-MM-ddThh:mm:ss')
144 144
     },
145 145
   }
146 146
 }

+ 2
- 2
src/pages/system/cardAndCouponManager/vipManager/index.vue 查看文件

@@ -92,14 +92,14 @@
92 92
           prop="ActiveDate"
93 93
           label="激活时间">
94 94
           <template slot-scope="scope">
95
-            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd hh:mm')}}</span>
95
+            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-ddThh:mm')}}</span>
96 96
           </template>
97 97
         </el-table-column>
98 98
         <el-table-column
99 99
           prop="CreateDate"
100 100
           label="创建时间">
101 101
           <template slot-scope="scope">
102
-            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd hh:mm')}}</span>
102
+            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-ddThh:mm')}}</span>
103 103
           </template>
104 104
         </el-table-column>
105 105
       </el-table>

+ 1
- 1
src/pages/system/caseManager/signinManager/index.vue 查看文件

@@ -177,7 +177,7 @@ export default {
177 177
       this.$data.valueCase = ''
178 178
     },
179 179
     FormatDate (date) {
180
-      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
180
+      return this.toolClass.dateFormat(date, 'yyyy-MM-ddThh:mm:ss')
181 181
     },
182 182
     excelSignin () { // 导出Excel
183 183
       window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')

+ 2
- 2
src/pages/system/courseManager/courseList/add.vue 查看文件

@@ -118,14 +118,14 @@
118 118
           <div class="flex-item">
119 119
             <div>
120 120
               <el-date-picker
121
-                value-format="yyyy-MM-dd 00:00:00"
121
+                value-format="yyyy-MM-ddT00:00:00Z"
122 122
                 v-model="detail.BeginDate"
123 123
                 type="date"
124 124
                 placeholder="选择起始日期">
125 125
               </el-date-picker>
126 126
               <span style="line-height:40px;">至</span>
127 127
               <el-date-picker
128
-                value-format="yyyy-MM-dd 23:59:59"
128
+                value-format="yyyy-MM-ddT23:59:59Z"
129 129
                 v-model="detail.EndDate"
130 130
                 type="date"
131 131
                 placeholder="选择截止日期">

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

@@ -80,10 +80,10 @@
80 80
                   placeholder="选择开始日期"
81 81
                   >
82 82
                 </el-date-picker>
83
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
83
+                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm')}}</span>
84 84
               </div>
85 85
             </div> -->
86
-            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
86
+            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm')}}</span>
87 87
           </li>
88 88
           <li class="flex-h">
89 89
             <span>结束时间:</span>
@@ -95,10 +95,10 @@
95 95
                   type="datetime"
96 96
                   placeholder="选择结束日期">
97 97
                 </el-date-picker>
98
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
98
+                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm')}}</span>
99 99
               </div>
100 100
             </div> -->
101
-            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
101
+            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm')}}</span>
102 102
           </li>
103 103
         </ul>
104 104
       </div>

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

@@ -125,6 +125,7 @@ export default {
125 125
         caseid: id
126 126
       }).then((res) => {
127 127
         this.pageData = []
128
+        res = res || []
128 129
         for (var n = 0; n < res.length; n++) {
129 130
           this.pageData.push([])
130 131
           for (var a = 0; a < res[n].length; a++) {
@@ -132,7 +133,7 @@ export default {
132 133
             this.pageData[n].push(res[n][a])
133 134
           }
134 135
         }
135
-        // console.log(JSON.stringify(this.pageData))
136
+        console.log(JSON.stringify(this.pageData))
136 137
       })
137 138
     },
138 139
     getBottomData (id, type) {

+ 2
- 2
src/pages/system/dataStatistics/cardCouponUsedList/index.vue 查看文件

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

+ 2
- 2
src/pages/system/dataStatistics/courseOrderList/index.vue 查看文件

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

+ 2
- 2
src/pages/system/dataStatistics/goodsOrderList/index.vue 查看文件

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

+ 1
- 1
src/pages/system/newOrder/caseRecord/index.vue 查看文件

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

+ 1
- 1
src/pages/system/systemSet/userManager/add.vue 查看文件

@@ -51,7 +51,7 @@
51 51
           </div>
52 52
         </li>
53 53
         <li class="flex-h">
54
-          <span>邮箱:<em>*</em></span>
54
+          <span>邮箱:</span>
55 55
           <div class="flex-item">
56 56
             <div style="width:50%">
57 57
               <el-input

+ 3
- 3
src/pages/system/systemSet/userManager/edit.vue 查看文件

@@ -3,7 +3,7 @@
3 3
     <form class="mainForm">
4 4
       <ul>
5 5
         <li class="flex-h">
6
-          <span>帐户名称:</span>
6
+          <span>帐户名称:<em>*</em></span>
7 7
           <div class="flex-item">
8 8
             <div style="width:50%">
9 9
               <el-input
@@ -39,7 +39,7 @@
39 39
           </div>
40 40
         </li>
41 41
         <li class="flex-h">
42
-          <span>真实姓名:</span>
42
+          <span>真实姓名:<em>*</em></span>
43 43
           <div class="flex-item">
44 44
             <div style="width:50%">
45 45
               <el-input
@@ -75,7 +75,7 @@
75 75
           </div>
76 76
         </li>
77 77
         <li class="flex-h">
78
-          <span>手机号:</span>
78
+          <span>手机号:<em>*</em></span>
79 79
           <div class="flex-item">
80 80
             <div style="width:50%">
81 81
               <el-input

+ 2
- 2
src/util/api.js 查看文件

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