SpaceOfCheng
/
wechat
关注 3
点赞 0
派生 0
代码 工单 3 合并请求 0 版本发布 1 动态
浏览代码

ytj

yuantianjiao 6 年前
父节点
be43b8b8df
当前提交
f583021d28
共有 33 个文件被更改，包括 79 次插入 和 25 次删除
分列视图 显示文件统计
  1. 7
    0
      dist/index.html
  2. 2
    0
      dist/static/css/app.bea776154102d58d8daf48fea2501156.css
  3. 1
    0
      dist/static/css/app.bea776154102d58d8daf48fea2501156.css.map
  4. 二进制
      dist/static/img/bg1.ec3202b.jpg
  5. 二进制
      dist/static/img/bg2.da93dae.jpg
  6. 二进制
      dist/static/img/bg3.05757a4.jpg
  7. 二进制
      dist/static/img/bottomMsg.2450d9b.png
  8. 二进制
      dist/static/img/dialog.d0507e4.png
  9. 二进制
      dist/static/img/end.6bf7f9a.png
  10. 二进制
      dist/static/img/huxian.30c9cb8.png
  11. 二进制
      dist/static/img/line5.03ea747.png
  12. 二进制
      dist/static/img/logo1.96ecd83.png
  13. 二进制
      dist/static/img/logo2.a368a7c.png
  14. 二进制
      dist/static/img/qrCode.0464973.jpg
  15. 二进制
      dist/static/img/start.cfc7786.png
  16. 二进制
      dist/static/img/xiaoniao.ba6ad4c.png
  17. 二进制
      dist/static/img/zhi.f14c816.png
  18. 二进制
      dist/static/img/zhizhen.0705f0d.png
  19. 二进制
      dist/static/img/zhuanpan.87afe19.png
  20. 2
    0
      dist/static/js/app.fdd3076e299b493a983d.js
  21. 1
    0
      dist/static/js/app.fdd3076e299b493a983d.js.map
  22. 2
    0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js
  23. 1
    0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  24. 26
    0
      dist/static/js/vendor.408f5efbccfb8619a3cd.js
  25. 1
    0
      dist/static/js/vendor.408f5efbccfb8619a3cd.js.map
  26. 7
    3
      src/components/model1/index.vue
  27. 1
    1
      src/components/model2/index.vue
  28. 3
    3
      src/components/model3/index.vue
  29. 5
    5
      src/components/model3/page.scss
  30. 2
    2
      src/page/index/index.vue
  31. 4
    4
      src/page/lotteryList/index.vue
  32. 8
    5
      src/page/lotteryList/page.scss
  33. 6
    2
      src/store/app.js

+ 7
- 0
dist/index.html 查看文件 

@@ -0,0 +1,7 @@
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" charset=utf-8><title>城的空间抽奖</title><style>body{
2 
+        width: 100%;
3 
+        height: 100%;
4 
+        overflow-x: hidden;
5 
+        overflow-y: scroll;
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>

+ 2
- 0
dist/static/css/app.bea776154102d58d8daf48fea2501156.css
文件差异内容过多而无法显示
查看文件


+ 1
- 0
dist/static/css/app.bea776154102d58d8daf48fea2501156.css.map
文件差异内容过多而无法显示
查看文件


二进制
dist/static/img/bg1.ec3202b.jpg 查看文件


二进制
dist/static/img/bg2.da93dae.jpg 查看文件


二进制
dist/static/img/bg3.05757a4.jpg 查看文件


二进制
dist/static/img/bottomMsg.2450d9b.png 查看文件


二进制
dist/static/img/dialog.d0507e4.png 查看文件


二进制
dist/static/img/end.6bf7f9a.png 查看文件


二进制
dist/static/img/huxian.30c9cb8.png 查看文件


二进制
dist/static/img/line5.03ea747.png 查看文件


二进制
dist/static/img/logo1.96ecd83.png 查看文件


二进制
dist/static/img/logo2.a368a7c.png 查看文件


二进制
dist/static/img/qrCode.0464973.jpg 查看文件


二进制
dist/static/img/start.cfc7786.png 查看文件


二进制
dist/static/img/xiaoniao.ba6ad4c.png 查看文件


二进制
dist/static/img/zhi.f14c816.png 查看文件


二进制
dist/static/img/zhizhen.0705f0d.png 查看文件


二进制
dist/static/img/zhuanpan.87afe19.png 查看文件


+ 2
- 0
dist/static/js/app.fdd3076e299b493a983d.js
文件差异内容过多而无法显示
查看文件


+ 1
- 0
dist/static/js/app.fdd3076e299b493a983d.js.map
文件差异内容过多而无法显示
查看文件


+ 2
- 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js 查看文件 

@@ -0,0 +1,2 @@
1 
+!function(r){var n=window.webpackJsonp;window.webpackJsonp=function(e,u,c){for(var f,i,p,a=0,l=[];a<e.length;a++)i=e[a],o[i]&&l.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(r[f]=u[f]);for(n&&n(e,u,c);l.length;)l.shift()();if(c)for(a=0;a<c.length;a++)p=t(t.s=c[a]);return p};var e={},o={2:0};function t(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return r[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=r,t.c=e,t.d=function(r,n,e){t.o(r,n)||Object.defineProperty(r,n,{configurable:!1,enumerable:!0,get:e})},t.n=function(r){var n=r&&r.__esModule?function(){return r.default}:function(){return r};return t.d(n,"a",n),n},t.o=function(r,n){return Object.prototype.hasOwnProperty.call(r,n)},t.p="./",t.oe=function(r){throw console.error(r),r}}([]);
2 
+//# sourceMappingURL=manifest.3ad1d5771e9b13dbdad2.js.map

+ 1
- 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map 查看文件 

@@ -0,0 +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":""}

+ 26
- 0
dist/static/js/vendor.408f5efbccfb8619a3cd.js
文件差异内容过多而无法显示
查看文件


+ 1
- 0
dist/static/js/vendor.408f5efbccfb8619a3cd.js.map
文件差异内容过多而无法显示
查看文件


+ 7
- 3
src/components/model1/index.vue 查看文件 

@@ -24,7 +24,7 @@
24 24 
       </div>
25 25 
     </transition>
26 26 
     <div class="turntable">
27 
-      <div :class='{ "round": round }' class="turntable-body">
27 
+      <div :class='{ "round": round }' class="turntable-body" v-if="reflash">
28 28 
         <div v-for='(item, index) in data.prizeList' :key='index' :class='item.class' >
29 29 
           <img :src="item.img" alt="">
30 30 
           <span :class='item.font' v-html="item.PrizeName">{{item.PrizeName}}</span>
 
@@ -55,7 +55,7 @@
55 55 
           <img :src="jt" alt="">
56 56 
         </div>
57 57 
         <div class="list">
58 
-          <div v-for='(item, index) in  data.list' :key='index'>
58 
+          <div v-for='(item, index) in  data.list' :key='index' v-if="data.list.length > 0">
59 59 
             <img :src="item.UserHeadImg" alt="">
60 60 
             <span>
61 61 
               <div>{{item.UserName}}</div>
 
@@ -157,7 +157,8 @@ export default {
157 157 
       winning: '',
158 158 
       jump: '',
159 159 
       style: null,
160 
-      stylesheet: null
160 
+      stylesheet: null,
161 
+      reflash: true
161 162 
     }
162 163 
   },
163 164 
   props: ['prizeData', 'prizeNum', 'data', 'bg', 'activityStatus'],
 
@@ -190,6 +191,7 @@ export default {
190 191 
     },
191 192 
     start () {
192 193 
       if (this.stylesheet) {
194 
+        alert(JSON.stringify(document.getElementsByTagName('head')[0].childNodes))
193 195 
         document.getElementsByTagName('head')[0].removeChild(this.stylesheet)
194 196 
       }
195 197 
       setTimeout(() => {
 
@@ -207,8 +209,10 @@ export default {
207 209 
       this.showBtn = this.prizeData.detail.Url ? 1 : 0
208 210 
       this.jump = this.prizeData.detail.Url
209 211 
       setTimeout(() => {
212 
+        this.reflash = false
210 213 
         this.showDialog = true
211 214 
         this.setRunState(2)
215 
+        this.reflash = true
212 216 
       }, 10000)
213 217 
     },
214 218 
     get () {

+ 1
- 1
src/components/model2/index.vue 查看文件 

@@ -41,7 +41,7 @@
41 41 
           <img :src="right" alt="">
42 42 
         </div>
43 43 
         <div class="list">
44 
-          <div v-for='(item, index) in  data.list' :key='index'>
44 
+          <div v-for='(item, index) in  data.list' :key='index' v-if="data.list.length > 0">
45 45 
             <img :src="item.UserHeadImg" alt="">
46 46 
             <span>
47 47 
               <div>{{item.UserName}}</div>

+ 3
- 3
src/components/model3/index.vue 查看文件 

@@ -23,8 +23,8 @@
23 23 
     <div class="scrape" ref='box'>
24 24 
       <img :src="end" v-if="status" alt="" class="scrape-img">
25 25 
       <img :src="start" v-else alt="" class="scrape-img">
26 
-      <div v-if="status" class="scrape-prize">{{prizeData.prize.PrizeName}}</div>
27 
-      <div v-else class="scrape-prize">悦见山别墅小洋房<span>5</span>折神券</div>
26 
+      <div v-if="!cover.state" class="scrape-prize">{{prizeData.prize.PrizeName}}</div>
27 
+      <!-- <div v-else class="scrape-prize">悦见山别墅小洋房<span>5</span>折神券</div> -->
28 28 
       <canvas ref='canvas' v-if="!status"></canvas>
29 29 
       <div class="cover" v-if="cover.state" :class="{gray: activityStatus !== 1}">
30 30 
         <div class="cover-text" v-if="cover.title">{{cover.title}}</div>
 
@@ -40,7 +40,7 @@
40 40 
           <span>中奖名单</span>
41 41 
         </div>
42 42 
         <div class='list'>
43 
-          <div v-for='(item, index) in  data.list' :key='index'>
43 
+          <div v-for='(item, index) in  data.list' :key='index' v-if="data.list.length > 0">
44 44 
             <img :src='item.UserHeadImg' alt=''>
45 45 
             <span>
46 46 
               <div>{{item.UserName}}</div>

+ 5
- 5
src/components/model3/page.scss 查看文件 

@@ -64,7 +64,7 @@
64 64 
     width: 3.35rem;
65 65 
     height: 1.35rem;
66 66 
     position: absolute;
67 
-    top: 1.7rem;
67 
+    top: 1.5rem;
68 68 
     left: 50%;
69 69 
     transform: translateX(-50%);
70 70 
     .scrape-img{
 
@@ -129,13 +129,13 @@
129 129 
     position: absolute;
130 130 
     width: 2rem;
131 131 
     height: .3rem;
132 
-    top: 3.3rem;
132 
+    top: 3.1rem;
133 133 
     left: 50%;
134 134 
     transform: translateX(-50%);
135 135 
     background-color: rgba(157,135,109,.5);
136 136 
     line-height: .3rem;
137 137 
     font-size: .1rem;
138 
-    color: #9E7C60;
138 
+    color: #fff;
139 139 
     span{
140 140 
       color: #E60012;
141 141 
     }
 
@@ -151,7 +151,7 @@
151 151 
     width: 100%;
152 152 
     height: 3rem;
153 153 
     position: absolute;
154 
-    top: 3.85rem;
154 
+    top: 3.65rem;
155 155 
     left: 50%;
156 156 
     transform: translateX(-50%);
157 157 
     z-index: 2;
 
@@ -259,7 +259,7 @@
259 259 
     width: 100%;
260 260 
     height: 3rem;
261 261 
     position: absolute;
262 
-    top: 6.85rem;
262 
+    top: 6.65rem;
263 263 
     left: 50%;
264 264 
     transform: translateX(-50%);
265 265 
     z-index: 2;

+ 2
- 2
src/page/index/index.vue 查看文件 

@@ -159,14 +159,14 @@ export default {
159 159 
           lockScroll: true
160 160 
         }).then(() => {
161 161 
           const luckshare = this.$route.params.id ? `&luckshare=${this.$route.params.id}` : ''
162 
-          window.location.href = `${window.location.origin}/wechat/user.html#/bindMobile?isLottery=1${luckshare}`
162 
+          window.location.href = `${window.location.origin}/wechat/user.html#/bindMobile?isLottery=1${luckshare}&lotteryId=${this.lotteryId}`
163 163 
         }).catch(() => {
164 164 
           return false
165 165 
         })
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 })
169 
+            this.setUser({ toId: this.lotteryId, fromId: this.$route.params.id, isnew: this.$route.query.isnew })
170 170 
           }
171 171 
           this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
172 172 
             if (typeof (res) === 'object') {

+ 4
- 4
src/page/lotteryList/index.vue 查看文件 

@@ -4,17 +4,17 @@
4 4 
       <span :class="{active:active === 1}" @click="prize()">抽奖奖品</span>
5 5 
       <span :class="{active:active === 2}" @click="rush()">抢购奖品</span>
6 6 
     </div>
7 
-    <div class="list" v-if="data.list" v-for='(item,index) in data.list' :key='index' @click="toDetail(item)">
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>
9 9 
         <span>{{item.PrizeName || item.FlashBuyName}}</span>
10 10 
         <span>获得时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
11 11 
       </div>
12 12 
       <div>
13 
-        <span v-if="item.Status === 1" style="color:#FF7E1A;font-size:.14rem">已核销</span>
14 
-        <span v-else :class="gray">未核销</span>
13 
+        <span v-if="item.Status === 1">已核销</span>
14 
+        <span v-else style="color:#FF7E1A;font-size:.14rem">未核销</span>
15 15 
       </div>
16 16 
     </div>
17 
-    <div v-if="!data.list" class="bottomMsg">
17 
+    <div v-if="data.list.length <= 0" class="bottomMsg">
18 18 
       <img :src="bottomMsg" alt="">
19 19 
     </div>
20 20 
   </div>

+ 8
- 5
src/page/lotteryList/page.scss 查看文件 

@@ -45,10 +45,13 @@
45 45 
 .title{
46 46 
     border: 0px;
47 47 
     span{
48 
-    color: #000;
49 
-    font-weight: bold;
48 
+    color: #808080;
50 49 
     position: relative;
51 50 
     padding: 0 .3rem;
51 
+    font-size: .14rem;
52 
+  }
53 
+  .active{
54 
+    color: #000;
52 55 
   }
53 56 
   .active:after{
54 57 
     background: #fc6243;

@@ -60,13 +63,13 @@
60 63 
     transform: translateX(-50%);
61 64 
     width: 50%;
62 65 
   }
63 
-  .gray{
64 
-    filter: grayscale(100%);
65 
-  }
66 66 
 }
67 67 
 .bottomMsg{
68 68 
   img{
69 69 
     margin-top: 1.5rem;
70 70 
     width: 1.5rem;
71 71 
   }
72 
+}
73 
+.gray{
74 
+  opacity: .5;
72 75 
 }

+ 6
- 2
src/store/app.js 查看文件 

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

@@ -156,7 +157,10 @@ export default {
156 157 
     getRecord (context, data) {
157 158 
       return new Promise((resolve) => {
158 159 
         http.getRecord(data).then((res) => {
159 
-          res = res || []
160 
+          if (!res) {
161 
+            res = []
162 
+          }
163 
+          res = res.filter(item => item.IsReality === 1)
160 164 
           if (res.length >= 100) {
161 165 
             res = res.slice(0, 100)
162 166 
           }