Skip to content

H
h5-base
Commit 5d72ed70 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

81

parent c4983a0c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 16 deletions
dev/index.html
View file @ 5d72ed70
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
} }
/* html{font-size: 1px;} */</style><link href=static/css/app.129556e9383a4eca915187bdf43f354e.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.f6c93094f8c76ae81cf9.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.2f76c9c65d56733dbe50.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.129556e9383a4eca915187bdf43f354e.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.04946c48d395e5752c9b.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.bfdf769bc8d7b2112bb3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/23.0752a15f32cbee3d39c6.js 0 → 100644
View file @ 5d72ed70
This diff is collapsed.
dev/static/js/23.85889905f55a37fff1a9.js deleted 100644 → 0
View file @ c4983a0c
This diff is collapsed.
dev/static/js/27.3dc03a880fade9d2e53b.js deleted 100644 → 0
View file @ c4983a0c
This diff is collapsed.
dev/static/js/27.fa5ef4f219e538c32469.js 0 → 100644
View file @ 5d72ed70
This diff is collapsed.
dev/static/js/app.2f76c9c65d56733dbe50.js → dev/static/js/app.bfdf769bc8d7b2112bb3.js
View file @ 5d72ed70
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.f6c93094f8c76ae81cf9.js → dev/static/js/manifest.04946c48d395e5752c9b.js
View file @ 5d72ed70
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},c={57:0};function d(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,d),c.l=!0,c.exports}d.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,d){a=c[e]=[f,d]});a[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"1d066ed9d05d040481c7",1:"24efca991b2d3812d1f8",2:"b4810cf4aaa5dbb398fc",3:"54fa89bd2bbb06703661",4:"ae7a4e2215f3d99a5d20",5:"3a39e10d3dc416e74402",6:"a21931b82e68dbe10c39",7:"e261d1ac70064d3deaca",8:"c0f371ac44eaecd44000",9:"fcf2b2d643d7ef2b3d81",10:"9fac9d2a9e3d53e97f01",11:"382a5c11318af92fbb59",12:"0ecf58a89b4fc2a82470",13:"436dab9e7dd3bb983771",14:"db70f274239bf80de94a",15:"be352f7b2456c5e718bb",16:"d9657d596ed5fef12b1b",17:"fbd18139de0b13a6834b",18:"c38221332f620ad3f274",19:"4ff06adeb4bdb48bf53b",20:"7ebfa8f4c91914e77fef",21:"da73786f91e728410b17",22:"e55364228ebae84d8235",23:"85889905f55a37fff1a9",24:"69be3c796e6703e93042",25:"0e39f7a4c20acb074006",26:"9c649db055d761574150",27:"3dc03a880fade9d2e53b",28:"da96391cb22c86be22d5",29:"359ad1ee5bdeeb1318ea",30:"ef902e5dbe3f4638b21b",31:"3bbb6fac9f9c58f2a9b3",32:"e38c516bbdf070c56bad",33:"199b052e77ddc7a00c9a",34:"600fc943385b9659c26c",35:"622f69f0991eab4188a1",36:"d6b8387245352f632f67",37:"fbc16d51d34a46444b95",38:"672dfa4a19e599e4772e",39:"f80f18ac8e5d8d938108",40:"96646d8c16695f7e0740",41:"2aadcb1c5189985271e3",42:"bd3a3c85b5741337fb6f",43:"3e9a35c195fda147f986",44:"6892a2428a630359da7c",45:"aeffffc1121277483f8b",46:"6eeea39ece9ec4fef2eb",47:"bff16279a704d03fff30",48:"9009e5dbc9f19ad286f4",49:"7d1b01b1c958c748487e",50:"4bc930ca95c10f9642da",51:"d9e11241833a7e1dc106",52:"86f22738252758dfb3a0",53:"853d40b6ae9597fb1806",54:"5b2bad7a7f63f325a28e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},c={57:0};function d(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,d),c.l=!0,c.exports}d.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,d){a=c[e]=[f,d]});a[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"1d066ed9d05d040481c7",1:"24efca991b2d3812d1f8",2:"b4810cf4aaa5dbb398fc",3:"54fa89bd2bbb06703661",4:"ae7a4e2215f3d99a5d20",5:"3a39e10d3dc416e74402",6:"a21931b82e68dbe10c39",7:"e261d1ac70064d3deaca",8:"c0f371ac44eaecd44000",9:"fcf2b2d643d7ef2b3d81",10:"9fac9d2a9e3d53e97f01",11:"382a5c11318af92fbb59",12:"0ecf58a89b4fc2a82470",13:"436dab9e7dd3bb983771",14:"db70f274239bf80de94a",15:"be352f7b2456c5e718bb",16:"d9657d596ed5fef12b1b",17:"fbd18139de0b13a6834b",18:"c38221332f620ad3f274",19:"4ff06adeb4bdb48bf53b",20:"7ebfa8f4c91914e77fef",21:"da73786f91e728410b17",22:"e55364228ebae84d8235",23:"0752a15f32cbee3d39c6",24:"69be3c796e6703e93042",25:"0e39f7a4c20acb074006",26:"9c649db055d761574150",27:"fa5ef4f219e538c32469",28:"da96391cb22c86be22d5",29:"359ad1ee5bdeeb1318ea",30:"ef902e5dbe3f4638b21b",31:"3133d2bf704ac428d9e4",32:"beb5ffa5600989876732",33:"199b052e77ddc7a00c9a",34:"600fc943385b9659c26c",35:"622f69f0991eab4188a1",36:"d6b8387245352f632f67",37:"fbc16d51d34a46444b95",38:"672dfa4a19e599e4772e",39:"f80f18ac8e5d8d938108",40:"96646d8c16695f7e0740",41:"2aadcb1c5189985271e3",42:"bd3a3c85b5741337fb6f",43:"3e9a35c195fda147f986",44:"6892a2428a630359da7c",45:"aeffffc1121277483f8b",46:"6eeea39ece9ec4fef2eb",47:"bff16279a704d03fff30",48:"9009e5dbc9f19ad286f4",49:"7d1b01b1c958c748487e",50:"4bc930ca95c10f9642da",51:"d9e11241833a7e1dc106",52:"86f22738252758dfb3a0",53:"853d40b6ae9597fb1806",54:"5b2bad7a7f63f325a28e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/star/result.vue
View file @ 5d72ed70
<template> <template>
<div class="page"> <div class="page">
<div class="result" v-if="starInfo.activity_result.result!=16"> <div class="result" v-if="starInfo.activity_result&&starInfo.activity_result.result!=16">
<div class="float">结果公示</div> <div class="float">结果公示</div>
<div v-if="starInfo.activity_result.result==11"> <div v-if="starInfo.activity_result.result==11">
<h2>恭喜两个阶段全勤挑战成功</h2> <h2>恭喜两个阶段全勤挑战成功</h2>
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
<img :src="starPage.star_prize2" alt> <img :src="starPage.star_prize2" alt>
</div> </div>
</div> </div>
<div class="addr" v-if="addressObj"> <div class="addr" @click="goAddr" v-if="addressObj">
<span> <span>
{{addressObj.receive_name}}&nbsp;{{addressObj.receive_mobile}}&nbsp; {{addressObj.receive_name}}&nbsp;{{addressObj.receive_mobile}}&nbsp;
{{addressObj.province_name}}{{addressObj.city}}{{addressObj.area}}{{addressObj.address}} {{addressObj.province_name}}{{addressObj.city}}{{addressObj.area}}{{addressObj.address}}
</span> </span>
<!-- <i class="iconfont icon-youjiantou"></i> --> <i class="iconfont icon-youjiantou"></i>
</div> </div>
<div class="tip">注意：请于{{starInfo.start_twenty_five}}之前填写完您的收货地址，否则无法寄送礼品，过期不填视为放弃领取机会</div> <div class="tip">注意：请于{{starInfo.start_twenty_five}}之前填写完您的收货地址，否则无法寄送礼品，过期不填视为放弃领取机会</div>
</div> </div>
<div class="result fal" v-if="starInfo.activity_result.result==16"> <div class="result fal" v-if="starInfo.activity_result&&starInfo.activity_result.result==16">
<div class="float">结果公示</div> <div class="float">结果公示</div>
<div class="fal_title">很抱歉两个阶段全勤挑战失败</div> <div class="fal_title">很抱歉两个阶段全勤挑战失败</div>
<div class="fal_tip">学习没有终点，任何时候都是一个起点</div> <div class="fal_tip">学习没有终点，任何时候都是一个起点</div>
...@@ -70,7 +70,19 @@ export default { ...@@ -70,7 +70,19 @@ export default {
components: {}, components: {},
methods: { methods: {
initPage() { initPage() {
this.starInfo = this.$route.query.starInfo; this.starInfo = JSON.parse(decodeURIComponent(this.$route.query.starInfo));
this.addressObj = this.starInfo.addressObj
},
goAddr() {
if (this.addressObj) {
this.$router.push({
name: "activityAddr"
});
} else {
this.$router.push({
name: "addressEdit"
});
}
} }
}, },
mounted() { mounted() {
......
src/components/star/resultV2.vue
View file @ 5d72ed70
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
methods: { methods: {
initPage() { initPage() {
console.log(this.$route.query.starInfo) console.log(this.$route.query.starInfo)
this.starInfo = this.$route.query.starInfo; this.starInfo = JSON.parse(decodeURIComponent(this.$route.query.starInfo));
} }
}, },
mounted() { mounted() {
......
src/components/star/starRank.vue
View file @ 5d72ed70
...@@ -237,9 +237,10 @@ export default { ...@@ -237,9 +237,10 @@ export default {
}, },
methods: { methods: {
goResult() { goResult() {
this.starInfo.addressObj = this.addressObj
this.$router.push({ this.$router.push({
name: "starResult", name: "starResult",
query: { starInfo: this.starInfo } query: { starInfo: encodeURIComponent(JSON.stringify(this.starInfo)) }
}); });
}, },
goAddr(e) { goAddr(e) {
......
src/components/star/starRankV2.vue
View file @ 5d72ed70
...@@ -189,8 +189,12 @@ export default { ...@@ -189,8 +189,12 @@ export default {
goResult() { goResult() {
this.$router.push({ this.$router.push({
name: "starResultV2", name: "starResultV2",
query: { starInfo: this.starInfo } query: { starInfo: encodeURIComponent(JSON.stringify(this.starInfo)) }
}); });
// this.$router.push({
// name: "starResultV2",
// query: { starInfo: this.starInfo }
// });
}, },
goDetail(index) { goDetail(index) {
let obj = {}; let obj = {};
......
src/service/index.js
View file @ 5d72ed70
...@@ -15,7 +15,7 @@ axios.interceptors.request.use( ...@@ -15,7 +15,7 @@ axios.interceptors.request.use(
config => { config => {
// 获取token // 获取token
// process.env.versionTime // process.env.versionTime
let versiontime = '07291200' let versiontime = '08011200'
const token = localStorage.getItem('cc_token'); const token = localStorage.getItem('cc_token');
// 设置参数格式 // 设置参数格式
if (!config.headers['Content-Type']) { if (!config.headers['Content-Type']) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment