SpaceOfCheng
/
wechat
Watch 3
Star 0
Fork 0
Code Issues 3 Pull Requests 0 Releases 1 Activity
Browse Source

ytj

yuantianjiao 6 years ago
parent
526133b3e1
commit
f058ad9f53
24 changed files with 52 additions and 51 deletions
Unified View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 2
    0
      dist/static/css/app.58d1e226090424abc1864fa4e66e23ef.css
  3. 1
    0
      dist/static/css/app.58d1e226090424abc1864fa4e66e23ef.css.map
  4. 0
    2
      dist/static/css/app.9e8534d98d6cc9b36b8cda36a512f9f3.css
  5. 0
    1
      dist/static/css/app.9e8534d98d6cc9b36b8cda36a512f9f3.css.map
  6. BIN
      dist/static/img/bg.1ce7159.png
  7. BIN
      dist/static/img/bg.83bb19e.png
  8. 0
    2
      dist/static/js/app.129c7d0a66b103b1d3b9.js
  9. 0
    1
      dist/static/js/app.129c7d0a66b103b1d3b9.js.map
  10. 2
    0
      dist/static/js/app.8c8a83fe8d6a8482b005.js
  11. 1
    0
      dist/static/js/app.8c8a83fe8d6a8482b005.js.map
  12. 1
    1
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  13. 2
    2
      src/App.vue
  14. BIN
      src/assets/bg.png
  15. 2
    2
      src/components/qrCodeCard/qrCodeCard.vue
  16. 1
    1
      src/config/index.js
  17. 12
    11
      src/page/index/index.vue
  18. 11
    0
      src/page/index/page.scss
  19. 5
    7
      src/page/lotteryDetail/index.vue
  20. 1
    1
      src/page/lotteryDetail/page.scss
  21. 5
    16
      src/page/lotteryList/index.vue
  22. 2
    1
      src/store/app.js
  23. 1
    1
      src/style/main.css
  24. 2
    1
      src/util/ajax.js

+ 1
- 1
dist/index.html View File

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.9e8534d98d6cc9b36b8cda36a512f9f3.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.129c7d0a66b103b1d3b9.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.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>

+ 2
- 0
dist/static/css/app.58d1e226090424abc1864fa4e66e23ef.css
File diff suppressed because it is too large
View File


+ 1
- 0
dist/static/css/app.58d1e226090424abc1864fa4e66e23ef.css.map
File diff suppressed because it is too large
View File


+ 0
- 2
dist/static/css/app.9e8534d98d6cc9b36b8cda36a512f9f3.css
File diff suppressed because it is too large
View File


+ 0
- 1
dist/static/css/app.9e8534d98d6cc9b36b8cda36a512f9f3.css.map
File diff suppressed because it is too large
View File


BIN
dist/static/img/bg.1ce7159.png View File


BIN
dist/static/img/bg.83bb19e.png View File


+ 0
- 2
dist/static/js/app.129c7d0a66b103b1d3b9.js
File diff suppressed because it is too large
View File


+ 0
- 1
dist/static/js/app.129c7d0a66b103b1d3b9.js.map
File diff suppressed because it is too large
View File


+ 2
- 0
dist/static/js/app.8c8a83fe8d6a8482b005.js
File diff suppressed because it is too large
View File


+ 1
- 0
dist/static/js/app.8c8a83fe8d6a8482b005.js.map
File diff suppressed because it is too large
View File


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

1 
-{"version":3,"sources":["webpack:///webpack/bootstrap 8704433a07d307c7d3cd"],"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 8704433a07d307c7d3cd"],"sourceRoot":""}
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":""}

+ 2
- 2
src/App.vue View File

12
12
13 
 <style>
 13 
 <style>
14 
 #app {
 14 
 #app {
15 
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
15 
+  font-family: "Avenir", Helvetica, Arial, sans-serif;
16 
   -webkit-font-smoothing: antialiased;
 16 
   -webkit-font-smoothing: antialiased;
17 
   -moz-osx-font-smoothing: grayscale;
 17 
   -moz-osx-font-smoothing: grayscale;
18 
   text-align: center;
 18 
   text-align: center;
19 
   color: #2c3e50;
 19 
   color: #2c3e50;
20 
 }
 20 
 }
21 
 ::-webkit-scrollbar {
 21 
 ::-webkit-scrollbar {
22 
-    display: none;
22 
+  display: none;
23 
 }
 23 
 }
24 
 </style>
 24 
 </style>

BIN
src/assets/bg.png View File


+ 2
- 2
src/components/qrCodeCard/qrCodeCard.vue View File

38 
       const ele = document.querySelector('#QRcode')
38 
       const ele = document.querySelector('#QRcode')
39 
       this.qrCode = new QRCode(ele, {
39 
       this.qrCode = new QRCode(ele, {
40 
         text: codeText,
40 
         text: codeText,
41 
-        width: '100',
42 
-        height: '100',
41 
+        width: '150',
42 
+        height: '150',
43 
         colorDark: '#000000',
43 
         colorDark: '#000000',
44 
         colorLight: '#ffffff',
44 
         colorLight: '#ffffff',
45 
         correctLevel: QRCode.CorrectLevel.H
45 
         correctLevel: QRCode.CorrectLevel.H

+ 1
- 1
src/config/index.js View File

2 
   appid: 'wx7320287e057bbeee',
2 
   appid: 'wx7320287e057bbeee',
3 
   redirect_uri: encodeURIComponent(window.location.href),
3 
   redirect_uri: encodeURIComponent(window.location.href),
4 
   response_type: 'code',
4 
   response_type: 'code',
5 
-  scope: 'snsapi_userinfo',
5 
+  scope: 'snsapi_base',
6 
   state: '12313'
6 
   state: '12313'
7 
 }
7 
 }

+ 12
- 11
src/page/index/index.vue View File

1 
+<style lang="scss" scoped>
2 
+@font-face {
3 
+  font-family: myFont;
4 
+  src: url("https://spaceofcheng.oss-cn-beijing.aliyuncs.com/hkhb.ttf");
5 
+}
6 
+@import "page.scss";
7 
+</style>
8 
+
1 
 <template>
9 
 <template>
2 
   <div class="bg mainPage">
10 
   <div class="bg mainPage">
3 
     <img class="bg-img" :src="bg" alt="" width="100%">
11 
     <img class="bg-img" :src="bg" alt="" width="100%">
11 
           <div v-if="showBtn" @click="get">
19 
           <div v-if="showBtn" @click="get">
12 
             <img class="lq" :src="lq" alt="">
20 
             <img class="lq" :src="lq" alt="">
13 
           </div>
21 
           </div>
14 
-          <div v-else @click="get">
22 
+          <!-- <div v-else @click="get">
15 
             <img class="lq" :src="lq" alt="">
23 
             <img class="lq" :src="lq" alt="">
16 
-          </div>
24 
+          </div> -->
17 
           <div class="desc">长按二维码“城的空间”，进入会员中心查看奖品吧</div>
25 
           <div class="desc">长按二维码“城的空间”，进入会员中心查看奖品吧</div>
18 
         </div>
26 
         </div>
19 
       </div>
27 
       </div>
27 
         <img :src="turntable" alt="" width="100%" height="100%">
35 
         <img :src="turntable" alt="" width="100%" height="100%">
28 
       </div>
36 
       </div>
29 
       <img class="pointer"  @click="run" :src="pointer" alt="">
37 
       <img class="pointer"  @click="run" :src="pointer" alt="">
38 
+      <div class="titleText">山的艺墅季，金秋送好礼</div>
30 
       <img class="down" :src="down" alt="">
39 
       <img class="down" :src="down" alt="">
31 
       <img class="yf1" :src="yf1" alt="">
40 
       <img class="yf1" :src="yf1" alt="">
32 
       <img class="yf2" :src="yf2" alt="">
41 
       <img class="yf2" :src="yf2" alt="">
178 
     this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
187 
     this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
179 
       if (typeof (res) === 'string') {
188 
       if (typeof (res) === 'string') {
180 
         if (res.indexOf('401-') > -1) {
189 
         if (res.indexOf('401-') > -1) {
181 
-          this.toolClass.getCode(res.substring(4, res.length))
190 
+          // this.toolClass.getCode(res.substring(4, res.length))
182 
         }
191 
         }
183 
       } else {
192 
       } else {
184 
         this.data.userInfo = this.userInfo
193 
         this.data.userInfo = this.userInfo
301 
   }
310 
   }
302 
 }
311 
 }
303 
 </script>
312 
 </script>
304 
-
305 
-<style lang="scss" scoped>
306 
-@font-face {
307 
-  font-family: myFont;
308 
-  src: url("https://spaceofcheng.oss-cn-beijing.aliyuncs.com/hkhb.ttf");
309 
-}
310 
-@import "page.scss";
311 
-</style>

+ 11
- 0
src/page/index/page.scss View File

89 
       width: 0.3rem;
89 
       width: 0.3rem;
90 
       z-index: 1;
90 
       z-index: 1;
91 
     }
91 
     }
92 
+    .titleText{
93 
+      position: absolute;
94 
+      top: -0.7rem;
95 
+      left: 50%;
96 
+      transform: translateX(-50%);
97 
+      z-index: 1;
98 
+      font-size: .16rem;
99 
+      color: #12532d;
100 
+    }
92 
     .turntable-body {
101 
     .turntable-body {
93 
       width: 3rem;
102 
       width: 3rem;
94 
       height: 3rem;
103 
       height: 3rem;
185 
         font-size: 0.12rem;
194 
         font-size: 0.12rem;
186 
         font-family: Arial, Helvetica, sans-serif;
195 
         font-family: Arial, Helvetica, sans-serif;
187 
         color: rgba(160, 160, 160, 1);
196 
         color: rgba(160, 160, 160, 1);
197 
+        width: 85%;
198 
+        margin-top: .1rem;
188 
       }
199 
       }
189 
     }
200 
     }
190 
   }
201 
   }

+ 5
- 7
src/page/lotteryDetail/index.vue View File

3 
     <div>核销时间：2018-08-22 ~ 2018-10-03</div>
3 
     <div>核销时间：2018-08-22 ~ 2018-10-03</div>
4 
     <div class="name">核销地点：江北新区白马路10号悦见山</div>
4 
     <div class="name">核销地点：江北新区白马路10号悦见山</div>
5 
     <div>
5 
     <div>
6 
-      <qrCode :msg='msg' v-if='data.detail.Status === 0'></qrCode>
6 
+      <qrCode :msg='msg' v-if='data.Status === 0'></qrCode>
7 
       <div v-else class="bottomMsg">
7 
       <div v-else class="bottomMsg">
8 
         <img :src="bottomMsg" alt="">
8 
         <img :src="bottomMsg" alt="">
9 
       </div>
9 
       </div>
19 
 export default {
19 
 export default {
20 
   data () {
20 
   data () {
21 
     return {
21 
     return {
22 
-      data: {
23 
-        detail: {}
24 
-      },
22 
+      data: {},
25 
       msg: {
23 
       msg: {
26 
         course_type: 777,
24 
         course_type: 777,
27 
         record_id: '',
25 
         record_id: '',
40 
   },
38 
   },
41 
   created () {
39 
   created () {
42 
     this.getLotteryDetail({ id: this.$route.query.id }).then((res) => {
40 
     this.getLotteryDetail({ id: this.$route.query.id }).then((res) => {
43 
-      this.data.detail = this.detail
44 
-      this.mag.luckydraw_id = this.data.detail.LuckdrawId
45 
-      this.mag.record_id = this.data.detail.PrizeId
41 
+      this.data = this.detail
42 
+      this.msg.luckydraw_id = this.data.LuckdrawId
43 
+      this.msg.record_id = this.data.Id
46 
     })
44 
     })
47 
   },
45 
   },
48 
   methods: {
46 
   methods: {

+ 1
- 1
src/page/lotteryDetail/page.scss View File

1 
 .mainPage{
1 
 .mainPage{
2 
-  padding: 1.5rem .3rem 0;
2 
+  padding-top: 1.5rem;
3 
   box-sizing: border-box;
3 
   box-sizing: border-box;
4 
   display: flex;
4 
   display: flex;
5 
   justify-content: center;
5 
   justify-content: center;

+ 5
- 16
src/page/lotteryList/index.vue View File

32 
     })
32 
     })
33 
   },
33 
   },
34 
   mounted () {
34 
   mounted () {
35 
-    if (location.search && this.toolClass.UrlSearch(location.search).code) {
36 
-      this.code = this.toolClass.UrlSearch(location.search).code
37 
-    } else {
38 
-      this.code = null
39 
-    }
40 
-    this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
41 
-      if (typeof (res) === 'string') {
42 
-        if (res.indexOf('401-') > -1) {
43 
-          this.toolClass.getCode(res.substring(4, res.length))
44 
-        }
45 
-      } else {
46 
-        this.data.userInfo = this.userInfo
47 
-        this.getLotteryList({ userid: this.data.userInfo.user.Id }).then((res) => {
48 
-          this.data.list = this.list
49 
-        })
50 
-      }
35 
+    this.getUserInfo({ luckdrawid: this.lotteryId, from: this.$route.query.from || '' }).then((res) => {
36 
+      this.data.userInfo = this.userInfo
37 
+      this.getLotteryList({ userid: this.data.userInfo.user.Id }).then((res) => {
38 
+        this.data.list = this.list
39 
+      })
51 
     }).catch((err) => {
40 
     }).catch((err) => {
52 
       console.log(err)
41 
       console.log(err)
53 
     })
42 
     })

+ 2
- 1
src/store/app.js View File

9 
     queryData = data
9 
     queryData = data
10 
   } else {
10 
   } else {
11 
     queryData = {
11 
     queryData = {
12 
-      luckdrawid: data.luckdrawid
12 
+      luckdrawid: data.luckdrawid,
13 
+      from: data.from
13 
     }
14 
     }
14 
   }
15 
   }
15 
   return new Promise((resolve, reject) => {
16 
   return new Promise((resolve, reject) => {

+ 1
- 1
src/style/main.css View File

1 
 @charset "utf-8";
1 
 @charset "utf-8";
2 
-html,body{width:100%;height:100%;-webkit-text-size-adjust:100%;position:relative;color:#333;overflow-x:hidden;font-size:100px;}
2 
+html,body{width:100%;height:100%;-webkit-text-size-adjust:100%;position:relative;color:#333;overflow-x:hidden;font-size:100px;background-color: #fff;}
3 
 @media screen and (max-width:320px){html,body{font-size:85px;}}
3 
 @media screen and (max-width:320px){html,body{font-size:85px;}}
4 
 @media screen and (min-width:375px){html,body{font-size:100px;}}
4 
 @media screen and (min-width:375px){html,body{font-size:100px;}}
5 
 @media screen and (min-width:414px){html,body{font-size:110px;}}
5 
 @media screen and (min-width:414px){html,body{font-size:110px;}}

+ 2
- 1
src/util/ajax.js View File

57 
         console.log(data)
57 
         console.log(data)
58 
         if (typeof (Message) === 'string' && Message.indexOf('401-') > -1) {
58 
         if (typeof (Message) === 'string' && Message.indexOf('401-') > -1) {
59 
           resolve(Message)
59 
           resolve(Message)
60 
-        } else if (typeof (Message) === 'string' && Message.indexOf('没有找到') > -1) {
60 
+        } else if (typeof (Message) === 'string' && Message.indexOf('logerror') > -1) {
61 
+          console.log(Message)
61 
         } else {
62 
         } else {
62 
           Toast.fail(Message)
63 
           Toast.fail(Message)
63 
         }
64 
         }