yuantianjiao пре 6 година
родитељ
комит
6f7734b79b

+ 1
- 1
dist/index.html Прегледај датотеку

@@ -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.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>
7
+      }</style><link href=./static/css/app.b257c3986a4ba8a0b131b8f17a98d124.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.0b87405a20474b474dc1.js></script></body></html>

+ 0
- 2
dist/static/css/app.4931bd18aaa0293d1eaa5037cd98bee4.css
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 0
- 1
dist/static/css/app.4931bd18aaa0293d1eaa5037cd98bee4.css.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 2
- 0
dist/static/css/app.b257c3986a4ba8a0b131b8f17a98d124.css
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 0
dist/static/css/app.b257c3986a4ba8a0b131b8f17a98d124.css.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


BIN
dist/static/img/middelImg1.a1ec44a.png Прегледај датотеку


BIN
dist/static/img/middelImg3.251bd83.png Прегледај датотеку


+ 2
- 0
dist/static/js/app.0b87405a20474b474dc1.js
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 0
dist/static/js/app.0b87405a20474b474dc1.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 0
- 2
dist/static/js/app.21947cb9e1de47fa9c32.js
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 0
- 1
dist/static/js/app.21947cb9e1de47fa9c32.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Прегледај датотеку

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

BIN
src/assets/middelImg1.png Прегледај датотеку


BIN
src/assets/middelImg2.png Прегледај датотеку


BIN
src/assets/middelImg3.png Прегледај датотеку


+ 7
- 2
src/components/model1/index.vue Прегледај датотеку

@@ -23,7 +23,7 @@
23 23
         </div>
24 24
         <div class="box" v-else>
25 25
           <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
26
-          <div class='dialog-title' style="padding-bottom:.1rem;">谢谢参与</div>
26
+          <div class='dialog-title' style="padding-bottom:.1rem;">{{winning}}</div>
27 27
           <img class="qrCode" :src="qrCode" alt="">
28 28
           <div class="desc">长按二维码关注“城的空间”,查看更多精彩活动</div>
29 29
         </div>
@@ -213,11 +213,16 @@ export default {
213 213
         this.round = true
214 214
       }, 50)
215 215
       this.winning = this.prizeData.prize.PrizeName
216
-      this.showBtn = this.prizeData.detail.Url ? 1 : 0
216
+      // this.showBtn = this.prizeData.detail.Url ? 1 : 0
217 217
       this.jump = this.prizeData.detail.Url
218 218
       setTimeout(() => {
219 219
         this.reflash = false
220 220
         this.showDialog = true
221
+        if (this.prizeData.detail.Url) {
222
+          setTimeout(() => {
223
+            this.get()
224
+          }, 2000)
225
+        }
221 226
         this.setRunState(2)
222 227
         this.reflash = true
223 228
       }, 10000)

+ 40
- 12
src/components/model2/index.vue Прегледај датотеку

@@ -2,6 +2,12 @@
2 2
 @import "page.scss";
3 3
 </style>
4 4
 
5
+<style>
6
+.jgg-content pre p {
7
+  color: #895b2f;
8
+}
9
+</style>
10
+
5 11
 <template>
6 12
   <div class='bg mainPage'>
7 13
     <img class='bg-img' :src='bg' alt='' width='100%'>
@@ -20,7 +26,7 @@
20 26
         </div>
21 27
         <div class="box" v-else>
22 28
           <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
23
-          <div class='dialog-title' style="padding-bottom:.1rem;">谢谢参与</div>
29
+          <div class='dialog-title' style="padding-bottom:.1rem;">{{winning}}</div>
24 30
           <img class="qrCode" :src="qrCode" alt="">
25 31
           <div class="desc">长按二维码关注“城的空间”,查看更多精彩活动</div>
26 32
         </div>
@@ -30,16 +36,17 @@
30 36
       <div class='sudoku'>
31 37
         <div v-for='(item,index) in square' :key='index' :class='item.class'>
32 38
           <div class='light' v-show='item.light'></div>
33
-          <div v-if='item.title' @click='run()'>
34
-            <p>{{item.title.split(',')[0]}}</p>
35
-            <p>{{item.title.split(',')[1]}}</p>
39
+          <div v-if='item.picMiddel' @click='run()'>
40
+            <!-- <p>{{item.title.split(',')[0]}}</p>
41
+            <p>{{item.title.split(',')[1]}}</p> -->
42
+            <img :src="item.picMiddel" alt="" width="80%">
36 43
           </div>
37 44
           <img v-if='item.pic' class='square-prize' :src='item.pic' alt=''>
38 45
           <span v-if='item.text' class=''>{{item.text}}</span>
39 46
         </div>
40 47
       </div>
41 48
     </div>
42
-    <div class="times">您当前还剩余<span>{{residue}}</span>次抽奖机会</div>
49
+    <div class="times">您当前还剩余 <span>{{residue}}</span> 次抽奖机会</div>
43 50
     <div class="list-area">
44 51
       <div class="winningList">
45 52
         <div class="title">
@@ -62,7 +69,7 @@
62 69
           <span>活动规则</span>
63 70
           <img :src="right" alt="">
64 71
         </div>
65
-        <div class="content">
72
+        <div class="content jgg-content">
66 73
           <pre v-html='data.prize.LuckdrawRule'></pre>
67 74
         </div>
68 75
       </div>
@@ -76,6 +83,9 @@ import dialog from '@/assets/dialog.png'
76 83
 import lq from '@/assets/lq.png'
77 84
 import qrCode from '@/assets/qrCode.jpg'
78 85
 import right from '@/assets/right.png'
86
+import middelImg1 from '@/assets/middelImg1.png'
87
+import middelImg2 from '@/assets/middelImg2.png'
88
+import middelImg3 from '@/assets/middelImg3.png'
79 89
 import { createNamespacedHelpers } from 'vuex'
80 90
 const { mapActions: mapAppActions } = createNamespacedHelpers('app')
81 91
 export default {
@@ -90,6 +100,9 @@ export default {
90 100
       showBtn: false,
91 101
       winning: '',
92 102
       jump: '',
103
+      middelImg1,
104
+      middelImg2,
105
+      middelImg3,
93 106
       square: [
94 107
         {
95 108
           title: '',
@@ -120,9 +133,10 @@ export default {
120 133
           light: false
121 134
         },
122 135
         {
123
-          title: '立即,抽奖',
136
+          title: '',
124 137
           text: '',
125 138
           pic: '',
139
+          picMiddel: '',
126 140
           class: 'check-btn',
127 141
           light: false
128 142
         },
@@ -174,13 +188,17 @@ export default {
174 188
       data = this.checkLength(data)
175 189
       data.splice(4, 0, {})
176 190
       if (this.activityStatus === 0) {
177
-        this.square[4].title = '活动,未开始'
191
+        // this.square[4].title = '活动,未开始'
192
+        this.square[4].picMiddel = this.middelImg1
178 193
       } else if (this.activityStatus === 1) {
179
-        this.square[4].title = '立即,抽奖'
194
+        // this.square[4].title = '立即,抽奖'
195
+        this.square[4].picMiddel = this.middelImg2
180 196
       } else if (this.activityStatus === 9) {
181
-        this.square[4].title = '活动,已结束'
197
+        // this.square[4].title = '活动,已结束'
198
+        this.square[4].picMiddel = this.middelImg3
182 199
       } else if (this.activityStatus === -1) {
183
-        this.square[4].title = '活动,已删除'
200
+        // this.square[4].title = '活动,已删除'
201
+        this.square[4].picMiddel = this.middelImg3
184 202
         this.$toast('活动已删除')
185 203
       }
186 204
       for (let i = 0; i < data.length; i++) {
@@ -212,7 +230,7 @@ export default {
212 230
       this.square[0].light = true
213 231
       this.loop()
214 232
       this.winning = this.prizeData.prize.PrizeName
215
-      this.showBtn = this.prizeData.detail.Url ? 1 : 0
233
+      // this.showBtn = this.prizeData.detail.Url ? 1 : 0
216 234
       this.jump = this.prizeData.detail.Url
217 235
     },
218 236
     loop () {
@@ -226,6 +244,11 @@ export default {
226 244
           if ((this.ORDER[this.num] - 1) === this.END && this.nowRound === this.ROUND) {
227 245
             setTimeout(() => {
228 246
               this.showDialog = true
247
+              if (this.prizeData.detail.Url) {
248
+                setTimeout(() => {
249
+                  this.get()
250
+                }, 2000)
251
+              }
229 252
             }, 300)
230 253
             this.setRunState(2)
231 254
             return false
@@ -234,6 +257,11 @@ export default {
234 257
           if (this.ORDER[this.num] === this.END && this.nowRound === this.ROUND) {
235 258
             setTimeout(() => {
236 259
               this.showDialog = true
260
+              if (this.prizeData.detail.Url) {
261
+                setTimeout(() => {
262
+                  this.get()
263
+                }, 2000)
264
+              }
237 265
             }, 300)
238 266
             this.setRunState(2)
239 267
             return false

+ 2
- 0
src/components/model2/page.scss Прегледај датотеку

@@ -183,6 +183,7 @@
183 183
           font-size: 0.16rem;
184 184
           padding: 0 0.1rem;
185 185
           color: #895B2F;
186
+          font-weight: bold;
186 187
         }
187 188
       }
188 189
       .list {
@@ -261,6 +262,7 @@
261 262
           font-size: 0.16rem;
262 263
           padding: 0 0.1rem;
263 264
           color: #895B2F;
265
+          font-weight: bold;
264 266
         }
265 267
       }
266 268
       .content {

+ 15
- 4
src/components/model3/index.vue Прегледај датотеку

@@ -2,6 +2,12 @@
2 2
 @import "page.scss";
3 3
 </style>
4 4
 
5
+<style>
6
+.ggl-content pre p {
7
+  color: #585858;
8
+}
9
+</style>
10
+
5 11
 <template>
6 12
   <div class='bg mainPage'>
7 13
     <img class='bg-img' :src='bg' alt='' width='100%'>
@@ -20,7 +26,7 @@
20 26
         </div>
21 27
         <div class="box" v-else>
22 28
           <img class='dialog-bg' @click.stop="close" :src="dialog" alt="">
23
-          <div class='dialog-title' style="padding-bottom:.1rem;">谢谢参与</div>
29
+          <div class='dialog-title' style="padding-bottom:.1rem;">{{winning}}</div>
24 30
           <img class="qrCode" :src="qrCode" alt="">
25 31
           <div class="desc">长按二维码关注“城的空间”,查看更多精彩活动</div>
26 32
         </div>
@@ -37,7 +43,7 @@
37 43
         <div class="cover-button" v-if="cover.button" @click="btnClick()">{{cover.button}}</div>
38 44
       </div>
39 45
     </div>
40
-    <div class='times'>您当前还剩余<span>{{residue}}</span>次抽奖机会 <p v-if="reload" @click="init()">再来一次</p></div>
46
+    <div class='times'>您当前还剩余 <span>{{residue}}</span> 次抽奖机会 <p v-if="reload" @click="init()">再来一次</p></div>
41 47
     <div class="list-area">
42 48
       <div class="list-top"></div>
43 49
       <div class='winningList'>
@@ -63,7 +69,7 @@
63 69
         <div class='title'>
64 70
           <span>活动规则</span>
65 71
         </div>
66
-        <div class='content'>
72
+        <div class='content ggl-content'>
67 73
           <pre v-html='data.prize.LuckdrawRule'></pre>
68 74
         </div>
69 75
       </div>
@@ -186,10 +192,15 @@ export default {
186 192
         setTimeout(() => {
187 193
           this.showDialog = true
188 194
           this.reload = true
195
+          if (this.prizeData.detail.Url) {
196
+            setTimeout(() => {
197
+              this.get()
198
+            }, 2000)
199
+          }
189 200
         }, 300)
190 201
         this.setRunState(2)
191 202
         this.winning = this.prizeData.prize.PrizeName
192
-        this.showBtn = this.prizeData.detail.Url ? 1 : 0
203
+        // this.showBtn = this.prizeData.detail.Url ? 1 : 0
193 204
         this.jump = this.prizeData.detail.Url
194 205
       }
195 206
     },

+ 4
- 3
src/components/model3/page.scss Прегледај датотеку

@@ -149,7 +149,7 @@
149 149
   }
150 150
   .list-area{
151 151
     width: 100%;
152
-    height: 3rem;
152
+    height: 2.95rem;
153 153
     position: absolute;
154 154
     top: 3.65rem;
155 155
     left: 50%;
@@ -162,7 +162,7 @@
162 162
       height: .2rem;
163 163
       background:rgba(157,135,109,1);
164 164
       border-radius: .1rem;
165
-      box-shadow: 0px 6px 3px -1px rgba(157, 135, 109, 0.6);
165
+      box-shadow: 0px 6px 1px -1px rgba(157, 135, 109, 0.4);
166 166
       position: absolute;
167 167
       top: .18rem;
168 168
       left: 50%;
@@ -219,6 +219,7 @@
219 219
             flex-flow: column nowrap;
220 220
             div{
221 221
               text-align: left;
222
+              color: #585858;
222 223
             }
223 224
             div:nth-last-of-type(1){
224 225
               font-family: initial;
@@ -227,6 +228,7 @@
227 228
           }
228 229
           span:nth-of-type(2) {
229 230
             text-align: right;
231
+            color: #585858;
230 232
           }
231 233
           // span:nth-of-type(1) {
232 234
           //   text-align: left;
@@ -298,7 +300,6 @@
298 300
           white-space:pre-line;
299 301
           text-align: left;
300 302
           line-height: .18rem;
301
-          color: #585858;
302 303
         }
303 304
       }
304 305
     }

+ 9
- 1
src/page/index/index.vue Прегледај датотеку

@@ -166,7 +166,15 @@ export default {
166 166
       } else {
167 167
         this.start().then((res) => {
168 168
           if (this.$route.params.id) {
169
-            this.setUser({ toId: this.lotteryId, fromId: this.$route.params.id, isnew: this.$route.query.isnew })
169
+            if (this.$route.query.isnew) {
170
+              this.setUser({ toId: this.lotteryId, fromId: this.$route.params.id, isnew: this.$route.query.isnew })
171
+            } else {
172
+              this.setUser({ toId: this.lotteryId, fromId: this.$route.params.id })
173
+            }
174
+          } else {
175
+            if (this.$route.query.isnew) {
176
+              this.setUser({ toId: this.lotteryId, isnew: this.$route.query.isnew })
177
+            }
170 178
           }
171 179
           this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
172 180
             if (typeof (res) === 'object') {

+ 8
- 8
src/page/lotteryDetail/index.vue Прегледај датотеку

@@ -1,9 +1,9 @@
1 1
 <template>
2 2
   <div class="mainPage" v-if='showPage'>
3 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>
4
+      <span v-if="data.record">
5
+        <!-- <span v-if="data.prize.ValidDays>0">领取后{{data.prize.ValidDays}}天有效</span> -->
6
+        <span>{{toolClass.dateFormat(data.record.VerificationStart)}} ~ {{toolClass.dateFormat(data.record.VerificationEnd)}}</span>
7 7
       </span>
8 8
     </div>
9 9
     <div class="name">核销地点:{{data.caseAddress}}</div>
@@ -49,17 +49,17 @@ export default {
49 49
       })
50 50
     } else {
51 51
       this.getRushDetail({ customerFlashBuyId: this.$route.query.id }).then((res) => {
52
+        console.log(res)
52 53
         this.data = {
53
-          prize: {
54
-            VerificationStart: this.detail.ValidateStart,
55
-            VerificationEnd: this.detail.ValidateEnd
56
-          },
57 54
           record: {
58 55
             Status: this.detail.VerifyStatus === 'useable' ? 0 : 1,
59
-            CustomerQrcode: this.detail.CustomerQrcode
56
+            CustomerQrcode: this.detail.CustomerQrcode,
57
+            VerificationStart: this.detail.ValidateStart,
58
+            VerificationEnd: this.detail.ValidateEnd
60 59
           },
61 60
           caseAddress: this.detail.CaseName
62 61
         }
62
+        console.log(this.data)
63 63
         this.msg.record_id = this.data.record.CustomerQrcode
64 64
         this.showPage = true
65 65
       })

+ 2
- 2
src/page/lotteryList/index.vue Прегледај датотеку

@@ -1,8 +1,8 @@
1 1
 <template>
2 2
   <div class="mainPage">
3 3
     <div class="list title">
4
-      <span :class="{active:active === 1}" @click="prize()">抽奖奖品</span>
5
-      <span :class="{active:active === 2}" @click="rush()">抢购奖品</span>
4
+      <span :class="{active:active === 1}" @click="prize()">抽奖记录</span>
5
+      <span :class="{active:active === 2}" @click="rush()">抢购记录</span>
6 6
     </div>
7 7
     <div class="list" v-if="data.list.length > 0" v-for='(item,index) in data.list' :key='index' @click="toDetail(item)" :class="{gray:item.Status === 1}">
8 8
       <div>

+ 1
- 1
src/router/index.js Прегледај датотеку

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

+ 1
- 1
src/store/app.js Прегледај датотеку

@@ -85,7 +85,7 @@ http.setUser = (data) => {
85 85
         id: data.toId
86 86
       },
87 87
       data: {
88
-        from: data.fromId,
88
+        from: data.fromId || '',
89 89
         isnew: data.isnew ? data.isnew : 0
90 90
       }
91 91
     }).then(res => {