yuantianjiao 6 år sedan
förälder
incheckning
a247442571

+ 1
- 1
dist/index.html Visa fil

@@ -1 +1 @@
1
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>城的空间抽奖</title><link href=./static/css/app.58d1e226090424abc1864fa4e66e23ef.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.2a96777d0d5038fab28c.js></script><script type=text/javascript src=./static/js/app.8c8a83fe8d6a8482b005.js></script></body></html>
1
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>城的空间抽奖</title><link href=./static/css/app.624ad3971afb56772dc4c62ef519ecf4.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.2a96777d0d5038fab28c.js></script><script type=text/javascript src=./static/js/app.f099cd5c7cfadfdc3e3f.js></script></body></html>

+ 0
- 2
dist/static/css/app.58d1e226090424abc1864fa4e66e23ef.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 0
- 1
dist/static/css/app.58d1e226090424abc1864fa4e66e23ef.css.map
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 2
- 0
dist/static/css/app.624ad3971afb56772dc4c62ef519ecf4.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 0
dist/static/css/app.624ad3971afb56772dc4c62ef519ecf4.css.map
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 0
- 2
dist/static/js/app.8c8a83fe8d6a8482b005.js
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 0
- 1
dist/static/js/app.8c8a83fe8d6a8482b005.js.map
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 2
- 0
dist/static/js/app.f099cd5c7cfadfdc3e3f.js
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 0
dist/static/js/app.f099cd5c7cfadfdc3e3f.js.map
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Visa fil

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

+ 6
- 5
src/page/index/index.vue Visa fil

@@ -61,6 +61,7 @@
61 61
           <div v-for='(item, index) in  data.list' :key='index'>
62 62
             <img :src="item.UserHeadImg" alt="">
63 63
             <span>{{item.PrizeName}}</span>
64
+            <!-- <span>{{this.toolClass.dateFormatM(item.CreateDate)}}</span> -->
64 65
             <span>{{item.UserName}}</span>
65 66
           </div>
66 67
         </div>
@@ -227,11 +228,11 @@ export default {
227 228
         this.init()
228 229
       })
229 230
       this.getRecord({ id: this.lotteryId }).then((res) => {
230
-        if (this.list.length >= 10) {
231
-          this.data.list = this.list.slice(0, 10)
232
-        } else {
233
-          this.data.list = this.list
234
-        }
231
+        // if (this.list.length >= 10) {
232
+        //   this.data.list = this.list.slice(0, 10)
233
+        // } else {
234
+        this.data.list = this.list
235
+        // }
235 236
       })
236 237
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
237 238
         title: '城的空间抽奖',

+ 24
- 0
src/page/index/page.scss Visa fil

@@ -237,6 +237,7 @@ body * {
237 237
           img {
238 238
             width: 0.18rem;
239 239
             height: 0.18rem;
240
+            border-radius: 50%;
240 241
           }
241 242
           span:nth-of-type(1) {
242 243
             flex: 1;
@@ -246,6 +247,29 @@ body * {
246 247
           span:nth-of-type(2) {
247 248
             text-align: right;
248 249
           }
250
+          // span:nth-of-type(1) {
251
+          //   text-align: left;
252
+          //   margin: .1rem;
253
+          //   width: 28%;
254
+          //   overflow: hidden;
255
+          //   text-overflow: ellipsis;
256
+          //   white-space: nowrap;
257
+          //   font-size: 12px;
258
+          // }
259
+          // span:nth-of-type(2) {
260
+          //   flex: 1;
261
+          //   margin: .1rem;
262
+          //   font-size: 12px;
263
+          // }
264
+          // span:nth-of-type(3) {
265
+          //   text-align: right;
266
+          //   width: 13%;
267
+          //   overflow: hidden;
268
+          //   text-overflow: ellipsis;
269
+          //   white-space: nowrap;
270
+          //   margin: .1rem;
271
+          //   font-size: 12px;
272
+          // }
249 273
         }
250 274
       }
251 275
     }

+ 5
- 5
src/page/lotteryDetail/index.vue Visa fil

@@ -1,9 +1,9 @@
1 1
 <template>
2 2
   <div class="mainPage">
3
-    <div>核销时间:2018-08-22 ~ 2018-10-03</div>
4
-    <div class="name">核销地点:江北新区白马路10号悦见山</div>
3
+    <div>核销时间:{{this.toolClass.dateFormat(data.prize.VerificationStart)}} ~ {{this.toolClass.dateFormat(data.prize.VerificationEnd)}}</div>
4
+    <div class="name">核销地点:{{data.caseAddress}}</div>
5 5
     <div>
6
-      <qrCode :msg='msg' v-if='data.Status === 0'></qrCode>
6
+      <qrCode :msg='msg' v-if='data.record.Status === 0'></qrCode>
7 7
       <div v-else class="bottomMsg">
8 8
         <img :src="bottomMsg" alt="">
9 9
       </div>
@@ -39,8 +39,8 @@ export default {
39 39
   created () {
40 40
     this.getLotteryDetail({ id: this.$route.query.id }).then((res) => {
41 41
       this.data = this.detail
42
-      this.msg.luckydraw_id = this.data.LuckdrawId
43
-      this.msg.record_id = this.data.Id
42
+      this.msg.luckydraw_id = this.data.record.LuckdrawId
43
+      this.msg.record_id = this.data.record.Id
44 44
     })
45 45
   },
46 46
   methods: {

+ 20
- 0
src/util/util.js Visa fil

@@ -21,6 +21,26 @@ const toolClass = {
21 21
     }
22 22
     return y + '-' + m + '-' + d + ' ' + h + ':' + min
23 23
   },
24
+  dateFormatM: (timestamp) => {
25
+    let date = new Date(timestamp)
26
+    let m = date.getMonth() + 1
27
+    let d = date.getDate()
28
+    let h = date.getHours()
29
+    let min = date.getMinutes()
30
+    if (m < 10) {
31
+      m = '0' + m
32
+    }
33
+    if (d < 10) {
34
+      d = '0' + d
35
+    }
36
+    if (h < 10) {
37
+      h = '0' + h
38
+    }
39
+    if (min < 10) {
40
+      min = '0' + min
41
+    }
42
+    return m + '-' + d + ' ' + h + ':' + min
43
+  },
24 44
   UrlSearch: (urls) => {
25 45
     let url = urls // 获取url中"?"符后的字串
26 46
     let theRequest = {}