yuantianjiao 6 yıl önce
ebeveyn
işleme
3ecd5287a9

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

@@ -4,4 +4,4 @@
4 4
         overflow-x: hidden;
5 5
         overflow-y: scroll;
6 6
         -webkit-overflow-scrolling: touch;
7
-      }</style><link href=./static/css/app.bea776154102d58d8daf48fea2501156.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.408f5efbccfb8619a3cd.js></script><script type=text/javascript src=./static/js/app.fdd3076e299b493a983d.js></script></body></html>
7
+      }</style><link href=./static/css/app.4931bd18aaa0293d1eaa5037cd98bee4.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.21947cb9e1de47fa9c32.js></script></body></html>

dist/static/css/app.4931bd18aaa0293d1eaa5037cd98bee4.css
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


dist/static/css/app.4931bd18aaa0293d1eaa5037cd98bee4.css.map
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 2
- 0
dist/static/js/app.21947cb9e1de47fa9c32.js
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 1
- 0
dist/static/js/app.21947cb9e1de47fa9c32.js.map
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 0
- 2
dist/static/js/app.fdd3076e299b493a983d.js
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 0
- 1
dist/static/js/app.fdd3076e299b493a983d.js.map
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Dosyayı Görüntüle

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

+ 26
- 0
dist/static/js/vendor.2a96777d0d5038fab28c.js
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 1
- 0
dist/static/js/vendor.2a96777d0d5038fab28c.js.map
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 0
- 26
dist/static/js/vendor.408f5efbccfb8619a3cd.js
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 0
- 1
dist/static/js/vendor.408f5efbccfb8619a3cd.js.map
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 9
- 2
src/components/model1/index.vue Dosyayı Görüntüle

@@ -11,7 +11,7 @@
11 11
     <img class="bg-img" :src="bg" alt="" width="100%">
12 12
     <transition name="fade">
13 13
       <div class="dialog" v-if="showDialog" @click="close">
14
-        <div class="box">
14
+        <div class="box" v-if="prizeData.prize.IsReality">
15 15
           <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
16 16
           <div class='dialog-title'>恭喜你!<span>成功获得</span></div>
17 17
           <div class="dialog-name">{{winning}}</div>
@@ -21,6 +21,12 @@
21 21
           </div>
22 22
           <div class="desc">长按二维码“城的空间”,进入会员中心查看奖品吧</div>
23 23
         </div>
24
+        <div class="box" v-else>
25
+          <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
26
+          <div class='dialog-title' style="padding-bottom:.1rem;">谢谢参与</div>
27
+          <img class="qrCode" :src="qrCode" alt="">
28
+          <div class="desc">长按二维码关注“城的空间”,查看更多精彩活动</div>
29
+        </div>
24 30
       </div>
25 31
     </transition>
26 32
     <div class="turntable">
@@ -190,8 +196,9 @@ export default {
190 196
       document.getElementsByTagName('head')[0].appendChild(style)
191 197
     },
192 198
     start () {
199
+      this.round = false
193 200
       if (this.stylesheet) {
194
-        alert(JSON.stringify(document.getElementsByTagName('head')[0].childNodes))
201
+        // alert(JSON.stringify(document.getElementsByTagName('head')[0].childNodes))
195 202
         document.getElementsByTagName('head')[0].removeChild(this.stylesheet)
196 203
       }
197 204
       setTimeout(() => {

+ 7
- 1
src/components/model2/index.vue Dosyayı Görüntüle

@@ -8,7 +8,7 @@
8 8
     <img v-if="data.hasTitle" class="title-logo" :src="titleLogo" alt="">
9 9
     <transition name='fade'>
10 10
       <div class='dialog' v-if='showDialog' @click='close'>
11
-        <div class='box' @click.stop='stop'>
11
+        <div class='box' @click.stop='stop' v-if="prizeData.prize.IsReality">
12 12
           <img class='dialog-bg' @click.stop='close' :src='dialog' alt=''>
13 13
           <div class='dialog-title'>恭喜你!<span>成功获得</span></div>
14 14
           <div class='dialog-name'>{{winning}}</div>
@@ -18,6 +18,12 @@
18 18
           </div>
19 19
           <div class='desc'>长按二维码“城的空间”,进入会员中心查看奖品吧</div>
20 20
         </div>
21
+        <div class="box" v-else>
22
+          <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
23
+          <div class='dialog-title' style="padding-bottom:.1rem;">谢谢参与</div>
24
+          <img class="qrCode" :src="qrCode" alt="">
25
+          <div class="desc">长按二维码关注“城的空间”,查看更多精彩活动</div>
26
+        </div>
21 27
       </div>
22 28
     </transition>
23 29
     <div class='sudoku-border'>

+ 8
- 2
src/components/model3/index.vue Dosyayı Görüntüle

@@ -8,7 +8,7 @@
8 8
     <img v-if="data.hasTitle" class="title-logo" :src="titleLogo" alt="">
9 9
     <transition name='fade'>
10 10
       <div class='dialog' v-if='showDialog' @click='close'>
11
-        <div class='box' @click.stop='stop'>
11
+        <div class='box' @click.stop='stop' v-if="prizeData.prize.IsReality">
12 12
           <img class='dialog-bg' @click.stop='close' :src='dialog' alt=''>
13 13
           <div class='dialog-title'>恭喜你!<span>成功获得</span></div>
14 14
           <div class='dialog-name'>{{winning}}</div>
@@ -18,6 +18,12 @@
18 18
           </div>
19 19
           <div class='desc'>长按二维码“城的空间”,进入会员中心查看奖品吧</div>
20 20
         </div>
21
+        <div class="box" v-else>
22
+          <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
23
+          <div class='dialog-title' style="padding-bottom:.1rem;">谢谢参与</div>
24
+          <img class="qrCode" :src="qrCode" alt="">
25
+          <div class="desc">长按二维码关注“城的空间”,查看更多精彩活动</div>
26
+        </div>
21 27
       </div>
22 28
     </transition>
23 29
     <div class="scrape" ref='box'>
@@ -118,7 +124,7 @@ export default {
118 124
           this.cover.button = '活动未开始'
119 125
           this.status = true
120 126
         } else if (this.activityStatus === 1) {
121
-          this.cover.title = '刮一刮赢别墅五折优惠券'
127
+          this.cover.title = '幸运刮刮乐 刮出小惊喜'
122 128
           this.cover.button = '点我刮奖'
123 129
         } else if (this.activityStatus === 9) {
124 130
           this.cover.button = '活动已结束'

+ 6
- 1
src/page/lotteryDetail/index.vue Dosyayı Görüntüle

@@ -1,6 +1,11 @@
1 1
 <template>
2 2
   <div class="mainPage" v-if='showPage'>
3
-    <div>核销时间:<span v-if="data.prize">{{this.showDate(data.prize.VerificationStart)}} ~ {{this.showDate(data.prize.VerificationEnd)}}</span></div>
3
+    <div>核销时间:
4
+      <span v-if="data.prize">
5
+        <span v-if="data.prize.ValidDays>0">领取后{{data.prize.ValidDays}}天有效</span>
6
+        <span v-esle>{{toolClass.dateFormat(data.prize.VerificationStart)}} ~ {{toolClass.dateFormat(data.prize.VerificationEnd)}}</span>
7
+      </span>
8
+    </div>
4 9
     <div class="name">核销地点:{{data.caseAddress}}</div>
5 10
     <div>
6 11
       <qrCode :msg='msg' v-if='data.record.Status === 0'></qrCode>

+ 2
- 2
src/page/lotteryList/index.vue Dosyayı Görüntüle

@@ -10,7 +10,7 @@
10 10
         <span>获得时间:{{toolClass.dateFormat(item.CreateDate)}}</span>
11 11
       </div>
12 12
       <div>
13
-        <span v-if="item.Status === 1">已核销</span>
13
+        <span v-if="item.Status === 1 || item.IsReality === 0">已核销</span>
14 14
         <span v-else style="color:#FF7E1A;font-size:.14rem">未核销</span>
15 15
       </div>
16 16
     </div>
@@ -59,7 +59,7 @@ export default {
59 59
     ...mapPrizeActions(['getLotteryList', 'rushList']),
60 60
     ...mapAppActions(['getUserInfo']),
61 61
     toDetail (item) {
62
-      if (item.Status === 1) {
62
+      if (item.Status === 1 || item.IsReality === 0) {
63 63
         return
64 64
       }
65 65
       if (item.Url) {

+ 1
- 1
src/router/index.js Dosyayı Görüntüle

@@ -15,7 +15,7 @@ export default new Router({
15 15
       component: index
16 16
     },
17 17
     {
18
-      path: '/from/:id',
18
+      path: '/from/:id/:isnew',
19 19
       name: 'share',
20 20
       component: index
21 21
     },