yuantianjiao 6 anni fa
parent
commit
d00990cb0d

+ 1
- 1
dist/index.html Vedi File

@@ -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.a60b8a0ad8e3a10ee8e2bc3d55dadbe1.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.6edd65e851d0deaa174e.js></script></body></html>
7
+      }</style><link href=./static/css/app.5a4922bc0909e2595cb76162a12d90e2.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.7659d20a1e7a8b2757e0.js></script></body></html>

+ 2
- 0
dist/static/css/app.5a4922bc0909e2595cb76162a12d90e2.css
File diff suppressed because it is too large
Vedi File


+ 1
- 0
dist/static/css/app.5a4922bc0909e2595cb76162a12d90e2.css.map
File diff suppressed because it is too large
Vedi File


+ 0
- 2
dist/static/css/app.a60b8a0ad8e3a10ee8e2bc3d55dadbe1.css
File diff suppressed because it is too large
Vedi File


+ 0
- 1
dist/static/css/app.a60b8a0ad8e3a10ee8e2bc3d55dadbe1.css.map
File diff suppressed because it is too large
Vedi File


dist/static/img/bg.ec3202b.jpg → dist/static/img/bg1.ec3202b.jpg Vedi File


BIN
dist/static/img/bg2.da93dae.jpg Vedi File


BIN
dist/static/img/bg3.05757a4.jpg Vedi File


BIN
dist/static/img/logo1.96ecd83.png Vedi File


BIN
dist/static/img/logo2.a368a7c.png Vedi File


+ 0
- 2
dist/static/js/app.6edd65e851d0deaa174e.js
File diff suppressed because it is too large
Vedi File


+ 0
- 1
dist/static/js/app.6edd65e851d0deaa174e.js.map
File diff suppressed because it is too large
Vedi File


+ 2
- 0
dist/static/js/app.7659d20a1e7a8b2757e0.js
File diff suppressed because it is too large
Vedi File


+ 1
- 0
dist/static/js/app.7659d20a1e7a8b2757e0.js.map
File diff suppressed because it is too large
Vedi File


+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Vedi File

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

src/assets/bg.jpg → src/assets/bg1.jpg Vedi File


BIN
src/assets/bg2.jpg Vedi File


BIN
src/assets/bg3.jpg Vedi File


BIN
src/assets/logo1.png Vedi File


BIN
src/assets/logo2.png Vedi File


+ 3
- 3
src/components/model1/index.vue Vedi File

@@ -204,8 +204,8 @@ export default {
204 204
         this.round = true
205 205
       }, 50)
206 206
       this.winning = this.prizeData.prize.PrizeName
207
-      // this.showBtn = this.prizeData.detail.Url ? 1 : 0
208
-      // this.jump = this.prizeData.detail.Url
207
+      this.showBtn = this.prizeData.detail.Url ? 1 : 0
208
+      this.jump = this.prizeData.detail.Url
209 209
       setTimeout(() => {
210 210
         this.showDialog = true
211 211
         this.setRunState(2)
@@ -213,7 +213,7 @@ export default {
213 213
     },
214 214
     get () {
215 215
       console.log('去领取')
216
-      window.location.href = this.jump
216
+      window.location.href = `${window.location.origin}/wechat/user.html#/${this.jump}?isAuto=auto`
217 217
     },
218 218
     close (data) {
219 219
       this.showDialog = false

+ 10
- 7
src/components/model2/index.vue Vedi File

@@ -5,6 +5,7 @@
5 5
 <template>
6 6
   <div class='bg mainPage'>
7 7
     <img class='bg-img' :src='bg' alt='' width='100%'>
8
+    <img v-if="data.hasTitle" class="title-logo" :src="titleLogo" alt="">
8 9
     <transition name='fade'>
9 10
       <div class='dialog' v-if='showDialog' @click='close'>
10 11
         <div class='box' @click.stop='stop'>
@@ -32,7 +33,7 @@
32 33
         </div>
33 34
       </div>
34 35
     </div>
35
-    <div class="times">您当前还剩余<span>4</span>次抽奖机会</div>
36
+    <div class="times">您当前还剩余<span>{{residue}}</span>次抽奖机会</div>
36 37
     <div class="list-area">
37 38
       <div class="winningList">
38 39
         <div class="title">
@@ -64,6 +65,7 @@
64 65
 </template>
65 66
 
66 67
 <script>
68
+import titleLogo from '@/assets/logo2.png'
67 69
 import dialog from '@/assets/dialog.png'
68 70
 import lq from '@/assets/lq.png'
69 71
 import qrCode from '@/assets/qrCode.jpg'
@@ -73,6 +75,7 @@ const { mapActions: mapAppActions } = createNamespacedHelpers('app')
73 75
 export default {
74 76
   data () {
75 77
     return {
78
+      titleLogo,
76 79
       dialog,
77 80
       qrCode,
78 81
       lq,
@@ -153,7 +156,7 @@ export default {
153 156
       nowRound: 0
154 157
     }
155 158
   },
156
-  props: ['prizeData', 'prizeNum', 'data', 'bg', 'activityStatus'],
159
+  props: ['prizeData', 'prizeNum', 'data', 'bg', 'activityStatus', 'residue'],
157 160
   created () {
158 161
     this.init()
159 162
     console.log(1)
@@ -168,12 +171,12 @@ export default {
168 171
         this.square[4].title = '活动,未开始'
169 172
       } else if (this.activityStatus === 1) {
170 173
         this.square[4].title = '立即,抽奖'
171
-      } else if (this.activityStatus === 2) {
174
+      } else if (this.activityStatus === 9) {
172 175
         this.square[4].title = '活动,已结束'
173 176
       }
174 177
       for (let i = 0; i < data.length; i++) {
175 178
         this.square[i].text = data[i].PrizeName
176
-        this.square[i].pic = data[i].pic
179
+        this.square[i].pic = data[i].PrizeImg
177 180
       }
178 181
     },
179 182
     checkLength (arr) {
@@ -200,8 +203,8 @@ export default {
200 203
       this.square[0].light = true
201 204
       this.loop()
202 205
       this.winning = this.prizeData.prize.PrizeName
203
-      // this.showBtn = this.prizeData.detail.Url ? 1 : 0
204
-      // this.jump = this.prizeData.detail.Url
206
+      this.showBtn = this.prizeData.detail.Url ? 1 : 0
207
+      this.jump = this.prizeData.detail.Url
205 208
     },
206 209
     loop () {
207 210
       let speed = [4, 3, 2, 1, 2, 3, 4, 5]
@@ -236,7 +239,7 @@ export default {
236 239
     },
237 240
     get () {
238 241
       console.log('去领取')
239
-      window.location.href = this.jump
242
+      window.location.href = `${window.location.origin}/wechat/user.html#/${this.jump}?isAuto=auto`
240 243
     },
241 244
     close (data) {
242 245
       this.showDialog = false

+ 8
- 1
src/components/model2/page.scss Vedi File

@@ -1,3 +1,10 @@
1
+.title-logo{
2
+  width: 2.5rem;
3
+  position: absolute;
4
+  top: .6rem;
5
+  left: 50%;
6
+  transform: translateX(-50%);
7
+}
1 8
 .bg {
2 9
   position: relative;
3 10
   width: 100%;
@@ -152,7 +159,7 @@
152 159
   }
153 160
   .list-area{
154 161
     width: 3.33rem;
155
-    height: 6.6rem;
162
+    height: 5.85rem;
156 163
     background-color: rgba(168,107,48,.1);
157 164
     position: absolute;
158 165
     top: 5.8rem;

+ 9
- 6
src/components/model3/index.vue Vedi File

@@ -5,6 +5,7 @@
5 5
 <template>
6 6
   <div class='bg mainPage'>
7 7
     <img class='bg-img' :src='bg' alt='' width='100%'>
8
+    <img v-if="data.hasTitle" class="title-logo" :src="titleLogo" alt="">
8 9
     <transition name='fade'>
9 10
       <div class='dialog' v-if='showDialog' @click='close'>
10 11
         <div class='box' @click.stop='stop'>
@@ -30,7 +31,7 @@
30 31
         <div class="cover-button" v-if="cover.button" @click="btnClick()">{{cover.button}}</div>
31 32
       </div>
32 33
     </div>
33
-    <div class='times'>您当前还剩余<span>4</span>次抽奖机会 <p v-if="reload" @click="init()">再来一次</p></div>
34
+    <div class='times'>您当前还剩余<span>{{residue}}</span>次抽奖机会 <p v-if="reload" @click="init()">再来一次</p></div>
34 35
     <div class="list-area">
35 36
       <div class="list-top"></div>
36 37
       <div class='winningList'>
@@ -65,6 +66,7 @@
65 66
 </template>
66 67
 
67 68
 <script>
69
+import titleLogo from '@/assets/logo1.png'
68 70
 import dialog from '@/assets/dialog.png'
69 71
 import lq from '@/assets/lq.png'
70 72
 import qrCode from '@/assets/qrCode.jpg'
@@ -78,6 +80,7 @@ const { mapActions: mapAppActions } = createNamespacedHelpers('app')
78 80
 export default {
79 81
   data () {
80 82
     return {
83
+      titleLogo,
81 84
       dialog,
82 85
       qrCode,
83 86
       lq,
@@ -100,7 +103,7 @@ export default {
100 103
       }
101 104
     }
102 105
   },
103
-  props: ['prizeData', 'prizeNum', 'data', 'bg', 'activityStatus'],
106
+  props: ['prizeData', 'prizeNum', 'data', 'bg', 'activityStatus', 'residue'],
104 107
   created () {
105 108
     this.init()
106 109
   },
@@ -116,7 +119,7 @@ export default {
116 119
         } else if (this.activityStatus === 1) {
117 120
           this.cover.title = '刮一刮赢别墅五折优惠券'
118 121
           this.cover.button = '点我刮奖'
119
-        } else if (this.activityStatus === 2) {
122
+        } else if (this.activityStatus === 9) {
120 123
           this.cover.button = '活动已结束'
121 124
         }
122 125
         this.context = this.$refs.canvas.getContext('2d')
@@ -174,13 +177,13 @@ export default {
174 177
         }, 300)
175 178
         this.setRunState(2)
176 179
         this.winning = this.prizeData.prize.PrizeName
177
-        // this.showBtn = this.prizeData.detail.Url ? 1 : 0
178
-        // this.jump = this.prizeData.detail.Url
180
+        this.showBtn = this.prizeData.detail.Url ? 1 : 0
181
+        this.jump = this.prizeData.detail.Url
179 182
       }
180 183
     },
181 184
     get () {
182 185
       console.log('去领取')
183
-      window.location.href = this.jump
186
+      window.location.href = `${window.location.origin}/wechat/user.html#/${this.jump}?isAuto=auto`
184 187
     },
185 188
     close (data) {
186 189
       this.showDialog = false

+ 7
- 0
src/components/model3/page.scss Vedi File

@@ -1,3 +1,10 @@
1
+.title-logo{
2
+  width: 2rem;
3
+  position: absolute;
4
+  top: .6rem;
5
+  left: 50%;
6
+  transform: translateX(-50%);
7
+}
1 8
 .bg {
2 9
   position: relative;
3 10
   width: 100%;

+ 46
- 8
src/page/index/index.vue Vedi File

@@ -6,15 +6,17 @@
6 6
 
7 7
 <template>
8 8
   <div v-if="showPage">
9
-    <model1 v-if="model === 1" @run='run' :prizeData='prizeData' :prizeNum='prizeNum' :data='data' :bg='bg' :activityStatus='activityStatus'></model1>
10
-    <model2 v-if="model === 2" @run='run' :prizeData='prizeData' :prizeNum='prizeNum' :data='data' :bg='bg' :activityStatus='activityStatus'></model2>
11
-    <model3 v-if="model === 3" @run='run' :prizeData='prizeData' :prizeNum='prizeNum' :data='data' :bg='bg' :activityStatus='activityStatus'></model3>
9
+    <model1 v-if="model === 1" @run='run' :prizeData='prizeData' :prizeNum='prizeNum' :data='data' :bg='bg1' :activityStatus='activityStatus' :residue='residue'></model1>
10
+    <model2 v-if="model === 2" @run='run' :prizeData='prizeData' :prizeNum='prizeNum' :data='data' :bg='bg2' :activityStatus='activityStatus' :residue='residue'></model2>
11
+    <model3 v-if="model === 3" @run='run' :prizeData='prizeData' :prizeNum='prizeNum' :data='data' :bg='bg3' :activityStatus='activityStatus' :residue='residue'></model3>
12 12
   </div>
13 13
 </template>
14 14
 
15 15
 <script>
16 16
 // import { getToLogin } from '@/util/util'
17
-import bg from '@/assets/bg.jpg'
17
+import bg1 from '@/assets/bg1.jpg'
18
+import bg2 from '@/assets/bg2.jpg'
19
+import bg3 from '@/assets/bg3.jpg'
18 20
 import wxsdk from '@/util/share'
19 21
 import model1 from '@/components/model1'
20 22
 import model2 from '@/components/model2'
@@ -24,14 +26,17 @@ const { mapActions: mapAppActions } = createNamespacedHelpers('app')
24 26
 export default {
25 27
   data () {
26 28
     return {
27
-      bg,
29
+      bg1,
30
+      bg2,
31
+      bg3,
28 32
       round: false,
29 33
       showDialog: false,
30 34
       data: {
31 35
         userInfo: {},
32 36
         prize: {},
33 37
         prizeList: [],
34
-        list: []
38
+        list: [],
39
+        hasTitle: true
35 40
       },
36 41
       prizeData: {},
37 42
       prizeNum: false,
@@ -40,7 +45,8 @@ export default {
40 45
       jump: '',
41 46
       model: 0,
42 47
       showPage: false,
43
-      activityStatus: 1
48
+      activityStatus: 1,
49
+      residue: 1
44 50
     }
45 51
   },
46 52
   components: {
@@ -62,6 +68,7 @@ export default {
62 68
           this.toolClass.getCode(res.appid)
63 69
         } else {
64 70
           this.data.userInfo = this.userInfo
71
+          this.residue = this.data.userInfo.set.SurplusNum
65 72
           this.getData()
66 73
         }
67 74
       }
@@ -85,7 +92,26 @@ export default {
85 92
         this.showPage = true
86 93
         this.data.prize = this.prize
87 94
         this.data.prizeList = this.data.prize.Prizes
88
-        this.model = 3 // 模板
95
+        this.model = res.TplId ? res.TplId : 3 // 模板
96
+        if (this.model === 1) {
97
+          this.bg1 = res.Imgs ? res.Imgs[0] : this.bg1
98
+        } else if (this.model === 2) {
99
+          this.bg2 = res.Imgs ? res.Imgs[0] : this.bg2
100
+        } else if (this.model === 3) {
101
+          this.bg3 = res.Imgs ? res.Imgs[0] : this.bg3
102
+        }
103
+        this.data.hasTitle = res.Imgs ? 0 : 1
104
+        this.activityStatus = this.data.prize.Status
105
+        let now = new Date().getTime()
106
+        let start = new Date(this.data.prize.BeginDate).getTime()
107
+        let end = new Date(this.data.prize.EndDate).getTime()
108
+        if (now < start) {
109
+          this.activityStatus = 0
110
+        } else if (now > start && now < end) {
111
+          this.activityStatus = this.data.prize.Status
112
+        } else if (now > end) {
113
+          this.activityStatus = 9
114
+        }
89 115
       })
90 116
       this.getRecord({ id: this.lotteryId }).then((res) => {
91 117
         this.data.list = this.list
@@ -138,6 +164,18 @@ export default {
138 164
           if (this.$route.params.id) {
139 165
             this.setUser({ toId: this.lotteryId, fromId: this.$route.params.id })
140 166
           }
167
+          this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
168
+            if (typeof (res) === 'object') {
169
+              if (res.appid && res.appid !== '') {
170
+                this.toolClass.getCode(res.appid)
171
+              } else {
172
+                this.data.userInfo = this.userInfo
173
+                this.residue = this.data.userInfo.set.SurplusNum
174
+              }
175
+            }
176
+          }).catch((err) => {
177
+            console.log(err)
178
+          })
141 179
         }).catch(() => {
142 180
           this.setRunState(0)
143 181
         })

+ 11
- 6
src/page/lotteryList/index.vue Vedi File

@@ -1,14 +1,18 @@
1 1
 <template>
2 2
   <div class="mainPage">
3 3
     <div class="list title">
4
-      <span>奖品</span>
5
-      <span>获取时间</span>
6
-      <span>状态</span>
4
+      <span :class="{active:active === 1}" @click="active=1">城的空间卡券</span>
5
+      <span :class="{active:active === 2}" @click="active=2">其他奖品</span>
7 6
     </div>
8 7
     <div class="list" v-if="data.list" v-for='(item,index) in data.list' :key='index' @click="toDetail(item)">
9
-      <span>{{item.PrizeName}}</span>
10
-      <span>{{toolClass.dateFormat(item.CreateDate)}}</span>
11
-      <span>{{item.Status === 1 ? '已领取' : '未领取'}}</span>
8
+      <div>
9
+        <span>{{item.PrizeName}}</span>
10
+        <span>获得时间:{{toolClass.dateFormat(item.CreateDate)}}</span>
11
+      </div>
12
+      <div>
13
+        <span v-if="item.Status === 1" style="color:#FF7E1A;font-size:.14rem">已核销</span>
14
+        <span v-else :class="gray">未核销</span>
15
+      </div>
12 16
     </div>
13 17
     <div v-if="!data.list" class="bottomMsg">
14 18
       <img :src="bottomMsg" alt="">
@@ -28,6 +32,7 @@ export default {
28 32
         list: [],
29 33
         userInfo: {}
30 34
       },
35
+      active: 1,
31 36
       bottomMsg
32 37
     }
33 38
   },

+ 53
- 12
src/page/lotteryList/page.scss Vedi File

@@ -1,26 +1,67 @@
1
+.mainPage{
2
+  padding: 0 .3rem;
3
+  box-sizing: border-box;
4
+}
1 5
 .list{
2 6
   display: flex;
3 7
   justify-content: space-between;
4 8
   align-items: center;
5
-  padding: .1rem .3rem;
9
+  padding: .15rem 0;
6 10
   border-bottom: 1px solid rgba(238,238,238,1);
7
-  span{
8
-    color: rgba(108,108,108,1);
9
-    display: block;
10
-    text-align: center;
11
-    overflow:hidden;
12
-    text-overflow:ellipsis;
13
-    white-space:nowrap
14
-  }
15
-  span{
11
+  >div:nth-of-type(1){
16 12
     flex: 1;
13
+    display: flex;
14
+    flex-flow: column nowrap;
15
+    justify-content: center;
16
+    align-items: flex-start;
17
+    span:nth-of-type(1){
18
+      color: #323645;
19
+      font-size: .16rem;
20
+      font-weight: bold;
21
+    }
22
+    span:nth-of-type(2){
23
+      color: #323645;
24
+      font-size: .12rem;
25
+    }
26
+  }
27
+  >div:nth-of-type(2){
28
+    width: 15%;
29
+    display: flex;
30
+    justify-content: center;
31
+    align-items: center;
17 32
   }
33
+  // span{
34
+  //   color: rgba(108,108,108,1);
35
+  //   display: block;
36
+  //   text-align: center;
37
+  //   overflow:hidden;
38
+  //   text-overflow:ellipsis;
39
+  //   white-space:nowrap
40
+  // }
41
+  // span{
42
+  //   flex: 1;
43
+  // }
18 44
 }
19 45
 .title{
20
-  background-color: rgba(242,242,242,1);
21
-  span{
46
+    border: 0px;
47
+    span{
22 48
     color: #000;
23 49
     font-weight: bold;
50
+    position: relative;
51
+    padding: 0 .3rem;
52
+  }
53
+  .active:after{
54
+    background: #fc6243;
55
+    bottom: -0.05rem;
56
+    content: "";
57
+    height: .02rem;
58
+    left: 50%;
59
+    position: absolute;
60
+    transform: translateX(-50%);
61
+    width: 50%;
62
+  }
63
+  .gray{
64
+    filter: grayscale(100%);
24 65
   }
25 66
 }
26 67
 .bottomMsg{