yuantianjiao 6 years ago
parent
commit
730fd300a9

+ 1
- 1
dist/index.html View 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.fcf98233b413a15056689268ee9fcc4e.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.c24e15d5c97d6f7df2d5.js></script></body></html>
7
+      }</style><link href=./static/css/app.6be1a777518c70a79d2952066264928a.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.4333994695f0c50efbcf.js></script></body></html>

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


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


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


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


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


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


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


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


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

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

+ 1
- 1
src/components/model1/index.vue View File

@@ -72,7 +72,7 @@
72 72
           <img :src="jt" alt="">
73 73
         </div>
74 74
         <div class="content">
75
-          <div v-html='data.prize.LuckdrawRule'></div>
75
+          <pre v-html='data.prize.LuckdrawRule'></pre>
76 76
         </div>
77 77
       </div>
78 78
       <img class="bird" :src="bird" alt="">

+ 4
- 4
src/components/model1/page.scss View File

@@ -302,10 +302,10 @@ body * {
302 302
         }
303 303
       }
304 304
       .content {
305
-        div{
306
-          // white-space:pre-line; 
307
-          // text-align: left;
308
-          // line-height: .18rem;
305
+        pre{
306
+          white-space:pre-line; 
307
+          text-align: left;
308
+          line-height: .18rem;
309 309
         }
310 310
       }
311 311
     }

+ 4
- 1
src/components/model2/index.vue View File

@@ -57,7 +57,7 @@
57 57
           <img :src="right" alt="">
58 58
         </div>
59 59
         <div class="content">
60
-          <div v-html='data.prize.LuckdrawRule'></div>
60
+          <pre v-html='data.prize.LuckdrawRule'></pre>
61 61
         </div>
62 62
       </div>
63 63
     </div>
@@ -173,6 +173,9 @@ export default {
173 173
         this.square[4].title = '立即,抽奖'
174 174
       } else if (this.activityStatus === 9) {
175 175
         this.square[4].title = '活动,已结束'
176
+      } else if (this.activityStatus === -1) {
177
+        this.square[4].title = '活动,已删除'
178
+        this.$toast('活动已删除')
176 179
       }
177 180
       for (let i = 0; i < data.length; i++) {
178 181
         this.square[i].text = data[i].PrizeName

+ 4
- 4
src/components/model2/page.scss View File

@@ -264,10 +264,10 @@
264 264
         }
265 265
       }
266 266
       .content {
267
-        div{
268
-          // white-space:pre-line;
269
-          // text-align: left;
270
-          // line-height: .18rem;
267
+        pre{
268
+          white-space:pre-line;
269
+          text-align: left;
270
+          line-height: .18rem;
271 271
           color: #895B2F;
272 272
         }
273 273
       }

+ 7
- 1
src/components/model3/index.vue View File

@@ -58,7 +58,7 @@
58 58
           <span>活动规则</span>
59 59
         </div>
60 60
         <div class='content'>
61
-          <div v-html='data.prize.LuckdrawRule'></div>
61
+          <pre v-html='data.prize.LuckdrawRule'></pre>
62 62
         </div>
63 63
       </div>
64 64
     </div>
@@ -116,11 +116,17 @@ export default {
116 116
       this.$nextTick(() => {
117 117
         if (this.activityStatus === 0) {
118 118
           this.cover.button = '活动未开始'
119
+          this.status = true
119 120
         } else if (this.activityStatus === 1) {
120 121
           this.cover.title = '刮一刮赢别墅五折优惠券'
121 122
           this.cover.button = '点我刮奖'
122 123
         } else if (this.activityStatus === 9) {
123 124
           this.cover.button = '活动已结束'
125
+          this.status = true
126
+        } else if (this.activityStatus === -1) {
127
+          this.cover.button = '活动已删除'
128
+          this.status = true
129
+          this.$toast('活动已删除')
124 130
         }
125 131
         this.context = this.$refs.canvas.getContext('2d')
126 132
         // 画蒙布

+ 4
- 4
src/components/model3/page.scss View File

@@ -294,10 +294,10 @@
294 294
         width: 100%;
295 295
         box-sizing: border-box;
296 296
         padding: 0 .1rem;
297
-        div{
298
-          // white-space:pre-line;
299
-          // text-align: left;
300
-          // line-height: .18rem;
297
+        pre{
298
+          white-space:pre-line;
299
+          text-align: left;
300
+          line-height: .18rem;
301 301
           color: #585858;
302 302
         }
303 303
       }

+ 4
- 1
src/page/index/index.vue View File

@@ -93,6 +93,9 @@ export default {
93 93
         this.showPage = true
94 94
         this.data.prize = this.prize
95 95
         this.data.prizeList = this.data.prize.Prizes
96
+        for (let i = 0; i < this.data.prizeList.length; i++) {
97
+          this.data.prizeList[i].PrizeName = this.data.prizeList[i].PrizeName ? this.data.prizeList[i].PrizeName : '谢谢参与'
98
+        }
96 99
         this.model = res.TplId ? Math.floor(res.TplId) : 3 // 模板
97 100
         if (this.model === 1) {
98 101
           this.bg1 = res.Imgs ? res.Imgs[0].ImgUrl : this.bg1
@@ -120,7 +123,7 @@ export default {
120 123
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, { // 随模板变动
121 124
         title: '悦见山,金秋送好礼',
122 125
         desc: '扫码分享,免费抽取赢森林音乐节门票,机会有限,速来参加',
123
-        link: `${window.location.origin}${window.location.pathname}#/from/${this.data.userInfo.user.CustomerId}`,
126
+        link: `${window.location.origin}${window.location.pathname}#/from/${this.data.userInfo.user.CustomerId}?lotteryId=${this.lotteryId}`,
124 127
         thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
125 128
       })
126 129
     },