yuantianjiao vor 6 Jahren
Ursprung
Commit
dd444f1da7

+ 1
- 1
dist/index.html Datei anzeigen

@@ -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.792d471da91686e908f22bf88ee4e73e.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.7ab5aba10a7b07270b0d.js></script></body></html>
7
+      }</style><link href=./static/css/app.2f364324b9013a10c001697e90df6f42.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.ca1b3c4c7db05277ea50.js></script></body></html>

dist/static/css/app.2f364324b9013a10c001697e90df6f42.css
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


dist/static/css/app.2f364324b9013a10c001697e90df6f42.css.map
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 0
- 2
dist/static/js/app.7ab5aba10a7b07270b0d.js
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 0
- 1
dist/static/js/app.7ab5aba10a7b07270b0d.js.map
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 2
- 0
dist/static/js/app.ca1b3c4c7db05277ea50.js
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 1
- 0
dist/static/js/app.ca1b3c4c7db05277ea50.js.map
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Datei anzeigen

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

+ 2
- 2
src/page/index/index.vue Datei anzeigen

@@ -212,12 +212,12 @@ export default {
212 212
       this.getRecord({ id: this.lotteryId }).then((res) => {
213 213
         this.data.list = this.list
214 214
       })
215
-      let logo = this.logo.substring(2, this.logo.length)
215
+      // let logo = this.logo.substring(2, this.logo.length)
216 216
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
217 217
         title: '悦见山,金秋送好礼',
218 218
         desc: '扫码分享,免费抽取赢森林音乐节门票,机会有限,速来参加',
219 219
         link: `${window.location.origin}${window.location.pathname}#/from/${this.data.userInfo.user.Id}`,
220
-        thu_image: `${window.location.origin}${window.location.pathname}${logo}`
220
+        thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg?x-oss-process=style/wxicon`
221 221
       })
222 222
     },
223 223
     init () {

+ 7
- 5
src/store/app.js Datei anzeigen

@@ -7,17 +7,19 @@ const http = {}
7 7
 http.getUserInfo = (data) => {
8 8
   let queryData = {}
9 9
   if (data.code) {
10
-    queryData = data
11
-  } else {
12 10
     queryData = {
13
-      luckdrawid: data.luckdrawid,
14
-      from: data.from
11
+      code: data.code
15 12
     }
13
+  } else {
14
+    queryData = {}
16 15
   }
17 16
   return new Promise((resolve, reject) => {
18 17
     Ajax(api.lottery.userInfo.url, {
19 18
       method: api.lottery.userInfo.method,
20
-      queryData: queryData
19
+      queryData: queryData,
20
+      urlData: {
21
+        id: data.luckdrawid
22
+      }
21 23
     }).then(res => {
22 24
       resolve(res)
23 25
     }).catch((err) => {

+ 22
- 6
src/util/ajax.js Datei anzeigen

@@ -3,6 +3,17 @@ import qs from 'qs'
3 3
 import { Toast } from 'vant'
4 4
 import { setToLogin } from './util'
5 5
 
6
+const token = function (headers) {
7
+  let JWT = ''
8
+  if (headers) {
9
+    localStorage.setItem('JWT', headers.authorization)
10
+    JWT = headers.authorization
11
+  }
12
+  const token = JWT ? JWT : localStorage.getItem('JWT')
13
+
14
+  return !token ? '' : token
15
+}
16
+
6 17
 const Axios = axios.create({
7 18
   timeout: 60000,
8 19
   responseType: 'json',
@@ -10,12 +21,15 @@ const Axios = axios.create({
10 21
   queryData: {},
11 22
   urlData: {},
12 23
   headers: {
13
-    'Content-Type': 'multipart/form-data'
24
+    'Content-Type': 'multipart/form-data',
25
+    'authorization': token()
14 26
   }
15 27
 })
16 28
 
17 29
 Axios.interceptors.request.use((config) => {
30
+  config.headers.authorization = token()
18 31
   // 处理请求data,若为get请求,拼到url后面,若为post请求,直接添加到body中
32
+  config.urlData = { ...config.urlData, org: 'MQ' }
19 33
   let queryData = qs.stringify(config.queryData)
20 34
   // 判断是通过斜杠传参还是通过query传参
21 35
   if (config.url.indexOf(':') > -1) {
@@ -25,10 +39,9 @@ Axios.interceptors.request.use((config) => {
25 39
         return url.replace(re, config.urlData[k])
26 40
       }, config.url)
27 41
     }
28
-  } else {
29
-    if (queryData) {
30
-      config.url += '?' + queryData
31
-    }
42
+  }
43
+  if (queryData) {
44
+    config.url += '?' + queryData
32 45
   }
33 46
   let fm = new FormData()
34 47
   for (let k in config.data) {
@@ -46,7 +59,10 @@ Axios.interceptors.request.use((config) => {
46 59
 
47 60
 const ajax = (...args) => {
48 61
   return new Promise((resolve, reject) => {
49
-    Axios(...args).then(({ data }) => {
62
+    Axios(...args).then(({ data, headers }) => {
63
+      if (headers.authorization) {
64
+        token(headers)
65
+      }
50 66
       const { message, result, code } = data
51 67
       if (code === 200) {
52 68
         resolve(result)

+ 8
- 6
src/util/api.js Datei anzeigen

@@ -1,6 +1,8 @@
1
-const baseUrl = '/api-v2'
1
+// const baseUrl = '/api-v2'
2
+const baseUrl = '/api'
2 3
 // const baseUrl = '/check-api'
3
-const wechat = ''
4
+const wechat = '/wechat/:org'
5
+// const guest = '/guest/:org'
4 6
 
5 7
 const $api = {
6 8
   common: {
@@ -12,7 +14,7 @@ const $api = {
12 14
   lottery: {
13 15
     userInfo: { // 获取用户信息
14 16
       method: 'get',
15
-      url: `${baseUrl}${wechat}/user`
17
+      url: `${baseUrl}${wechat}/luckdraw/user/:id`
16 18
     },
17 19
     getPrize: { // 获取抽奖信息
18 20
       method: 'get',
@@ -24,15 +26,15 @@ const $api = {
24 26
     },
25 27
     getRecord: { // 中奖记录
26 28
       method: 'get',
27
-      url: `${baseUrl}${wechat}/record`
29
+      url: `${baseUrl}${wechat}/luckdraw/record`
28 30
     },
29 31
     userRecordList: { // 用户中奖记录列表
30 32
       method: 'get',
31
-      url: `${baseUrl}${wechat}/user/record`
33
+      url: `${baseUrl}${wechat}/user/luckdraw/record`
32 34
     },
33 35
     userRecordDetail: { // 用户中奖记录详情
34 36
       method: 'get',
35
-      url: `${baseUrl}${wechat}/user/record/:id`
37
+      url: `${baseUrl}${wechat}/user/luckdraw/record/:id`
36 38
     },
37 39
     setUser: { // 分享发送userId
38 40
       method: 'post',