Skip to content

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

s

parent 3accd267
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 74 deletions
config/dev.env.js
View file @ 38bcf831
......@@ -2,7 +2,7 @@
const merge = require('webpack-merge');
const prodEnv = require('./prod.env');
// const ip = 'http://10.1.23.212:8085/'
const ip = 'http://192.168.0.111:8085/'
const ip = 'http://10.1.22.249:8085/'
module.exports = merge(prodEnv, {
NODE_ENV: '"development"',
API_URL: `"${ip}"`,
......
config/index.js
View file @ 38bcf831
......@@ -21,7 +21,7 @@ module.exports = {
},
// Various Dev Server settings
// host: '10.1.23.212', // can be overwritten by process.env.HOST
host: '192.168.0.111', // can be overwritten by process.env.HOST
host: '10.1.22.249', // can be overwritten by process.env.HOST
// host: 'localhost', // can be overwritten by process.env.HOST
port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
......
dev/index.html
View file @ 38bcf831
......@@ -11,4 +11,4 @@
position: fixed;
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.70d36f3b71a6728d7954.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.c53e7a3149a8250544bc.js></script></body></html>
\ No newline at end of file
/* 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.70d36f3b71a6728d7954.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.cd00f7412754ed86f10f.js></script></body></html>
\ No newline at end of file
dev/static/js/app.c53e7a3149a8250544bc.js → dev/static/js/app.cd00f7412754ed86f10f.js
View file @ 38bcf831
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
View file @ 38bcf831
......@@ -32,6 +32,7 @@
<div id="app"></div>
<!-- built files will be auto injected -->
<script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<!-- <script src="https://cdn.bootcss.com/html2canvas/0.5.0-alpha2/html2canvas.min.js"></script> -->
<script>
</script>
......
src/components/address-picker/Address.vue
View file @ 38bcf831
......@@ -12,13 +12,11 @@
</van-popup>
</div>
</template>
<script>
// https://cdn.singsingenglish.com/addr.js
// https://cdn.singsingenglish.com/new-sing/2306a83c3e48d84a0b6066f235a8158efa4505de.js
import Address from './addr.js'
import {Picker} from 'mint-ui'
// let Address ={}
console.log(Address)
let type = 1
let provinceValue = 2
let cityValue = 52
......@@ -76,6 +74,8 @@
let vm = this
vm.show = vm.showAddressPicker
// console.log(vm.show,80)
// console.log(window.addrArr)
// console.log(82)
},
components: {
[Picker.name]: Picker
......
src/components/address-picker/addr.js
View file @ 38bcf831
......@@ -22327,3 +22327,4 @@ var address = {
"version": "1"
}
export default address.addrs
console.log(22330)
src/components/index.vue
View file @ 38bcf831
......@@ -351,13 +351,6 @@ export default {
// this.test()
},
methods: {
test(){
// console.log(Vue.prototype)
// console.log(this)
// console.log(this.testAttr)
// console.log(this.__proto__)
// this.__proto__.testAttr = 'testAttr'
},
shadowClick(){
this.pt=false
sessionStorage.setItem('orderShadow',true);
......
src/components/youbang/index.vue
View file @ 38bcf831
......@@ -45,6 +45,7 @@ import bg9 from '../../assets/yb/9.png'
import bg10 from '../../assets/yb/10.png'
import bg11 from '../../assets/yb/11.png'
import bg12 from '../../assets/yb/12.png'
import shareImg from '../../assets/yb/share.png'
export default {
name: "ybIndex",
components: {},
......@@ -68,8 +69,10 @@ export default {
bg10:bg10,
bg11:bg11,
bg12:bg12,
shareImg:shareImg
},
videoDis:false
videoDis:false,
query:{}
};
},
mounted() {
......@@ -96,30 +99,31 @@ export default {
this.onShare()
this.$sa.track("GetCourseAIA", {
});
if (window.location.href.indexOf("parentId") > -1) {
this.query.parentId = this.$route.query.parentId;
}
if (window.location.href.indexOf("redeem_code") > -1) {
this.query.redeem_code = this.$route.query.redeem_code;
}
if (window.location.href.indexOf("invite_code") > -1) {
this.query.invite_code = this.$route.query.invite_code;
}
if (window.location.href.indexOf("agentId") > -1) {
this.query.agentId = this.$route.query.agentId;
}
},
goEdit(){
this.$router.push({name:'addressEdit'})
},
nav(){
let query = {};
let redeem_code = ''
if (window.location.href.indexOf("channel_code") > -1) {
query.channel_code = this.$route.query.channel_code;
}
if (window.location.href.indexOf("redeem_code") > -1) {
query.redeem_code = this.$route.query.redeem_code;
redeem_code = this.$route.query.redeem_code;
}
if (window.location.href.indexOf("invite_code") > -1) {
query.invite_code = this.$route.query.invite_code;
}
getYoubangApi({'redeem_code':redeem_code}).then(res =>{
getYoubangApi({'redeem_code':this.query.redeem_code}).then(res =>{
if(res.res==1){
this.$router.push({name:'ybOrderRender',query:query})
this.$router.push({name:'ybOrderRender',query:this.query})
}else if(res.res==2||res.res==4){
this.$router.push({name:'ybPaySuccess',query:query})
this.$router.push({name:'ybPaySuccess',query:this.query})
}else{
window.location.href=`https://sit.tohours.com/salesplus/goodstart/singing-English-Index.action?&parentId=${this.$route.query.parentId}&agentId=${this.$route.query.agentId}`
}
})
},
......@@ -132,11 +136,11 @@ export default {
});
},
onShare: function(type) {
let URL = `${process.env.BUY_URL}`;
let URL = `https://sit.tohours.com/salesplus/goodstart/singing-English-Index.action?&parentId=${this.$route.query.parentId}&agentId=${this.$route.query.agentId}`;
this.enableShare({
product_title: '【免费领】价值498元亲子早教英语启蒙训练课',
desc: '友邦助您启蒙宝贝快乐家庭',
shareIcon: '',
shareIcon: shareImg,
shareUrl: URL
});
},
......@@ -157,7 +161,7 @@ export default {
wx.ready(function() {
wx.onMenuShareTimeline({
title: option.product_title, // 分享标题
desc: option.desc, // 分享描述
desc: '【庆百年 友惊喜】暑期亲子礼︱价值498元唱唱英语线上课程免费领', // 分享描述
link: option.shareUrl, // 分享链接
imgUrl:
option.shareIcon ||
......@@ -171,8 +175,8 @@ export default {
}
});
wx.onMenuShareAppMessage({
title: option.product_title, // 分享标题
desc: option.desc, // 分享描述
title: '【庆百年 友惊喜】暑期亲子礼', // 分享标题
desc: '价值498元唱唱英语线上课程免费领', // 分享描述
link: option.shareUrl, // 分享链接
imgUrl:
option.shareIcon ||
......
src/components/youbang/ybOrderRender.vue
View file @ 38bcf831
......@@ -34,9 +34,7 @@
type="text"
label="所在地区"
:is-link='link'
placeholder="请选择"
/>
placeholder="请选择"/>
<div @click="showAddressPicker=true" class="clickItem" ></div>
</div>
<van-field
......@@ -105,10 +103,12 @@ import orderCancelDialog from "../buy/orderCancelDialog";
import imgprize from '../../assets/yb/imghh@2x.png'
import MyAddress from "@/components/address-picker/Address.vue";
import addressList from "../address-picker/addr";
import shareImg from '../../assets/yb/share.png'
export default {
name: "ybOrderRender",
data() {
return {
shareImg:shareImg,
addressInfo: {},
open:false,
link:true,
......@@ -126,7 +126,8 @@ export default {
groupDetail:{},
orderCancel:false,
imgprize:imgprize,
deliverDetail:{}
deliverDetail:{},
query:{}
};
},
components: {
......@@ -252,9 +253,9 @@ export default {
console.log(this)
console.log(this.$router)
console.log(this.invite_code)
this.$router.push({name:'ybPaySuccess',query:{invite_code:this.invite_code}});
this.$router.push({name:'ybPaySuccess',query:that.$route.query});
}else{
console.log(220)
console.log(220)
let that = this;
this.orderNo = res.out_trade_no;
this.jsApiParameters = res;
......@@ -292,7 +293,7 @@ export default {
console.log(254)
// 支付成功后处理
Toast('支付成功');
that.$router.push({name:'ybPaySuccess',query:{invite_code:this.invite_code}})
that.$router.push({name:'ybPaySuccess',query:that.$route.query})
}
if (res.err_msg === 'get_brand_wcpay_request:fail') {
}
......@@ -346,26 +347,13 @@ export default {
this.showAddressPicker = !this.showAddressPicker;
},
initPage() {
let query = {};
let redeem_code = ''
if (window.location.href.indexOf("channel_code") > -1) {
query.channel_code = this.$route.query.channel_code;
}
if (window.location.href.indexOf("redeem_code") > -1) {
query.redeem_code = this.$route.query.redeem_code;
redeem_code = this.$route.query.redeem_code;
}
if (window.location.href.indexOf("invite_code") > -1) {
query.invite_code = this.$route.query.invite_code;
this.invite_code = this.$route.query.invite_code;
}
getYoubangApi({'redeem_code':redeem_code}).then(res =>{
getYoubangApi({'redeem_code':this.$route.query.redeem_code}).then(res =>{
if(res.res==1){
this.$router.push({name:'ybOrderRender',query:query})
this.$router.push({name:'ybOrderRender',query:this.$route.query})
}else if(res.res==2||res.res==4){
this.$router.push({name:'ybPaySuccess',query:query})
this.$router.push({name:'ybPaySuccess',query:this.$route.query})
}else{
window.location.href=`https://sit.tohours.com/salesplus/goodstart/singing-English-Index.action?&parentId=${this.$route.query.parentId}&agentId=${this.$route.query.agentId}`
}
})
getNewestAddressListAPi().then(res=>{
......@@ -404,7 +392,6 @@ export default {
})
this.user_id = JSON.parse(localStorage.getItem("userDesc")).user_id;
this.onShare()
},
handleInviteCode() {
if (!this.invite_code) {
......@@ -417,11 +404,11 @@ export default {
},
onShare: function(type) {
this.handleInviteCode();
let URL = `${process.env.BUY_URL}invite_code=${this.this_code}`;
let URL = `https://sit.tohours.com/salesplus/goodstart/singing-English-Index.action?&parentId=${this.$route.query.parentId}&agentId=${this.$route.query.agentId}`;
this.enableShare({
product_title: '【免费领】价值498元亲子早教英语启蒙训练课',
desc: '友邦助您启蒙宝贝快乐家庭',
shareIcon: '',
shareIcon: shareImg,
shareUrl: URL
});
},
......@@ -442,7 +429,7 @@ export default {
wx.ready(function() {
wx.onMenuShareTimeline({
title: option.product_title, // 分享标题
desc: option.desc, // 分享描述
desc: '【庆百年 友惊喜】暑期亲子礼︱价值498元唱唱英语线上课程免费领', // 分享描述
link: option.shareUrl, // 分享链接
imgUrl:
option.shareIcon ||
......@@ -456,8 +443,8 @@ export default {
}
});
wx.onMenuShareAppMessage({
title: option.product_title, // 分享标题
desc: option.desc, // 分享描述
title: '【庆百年 友惊喜】暑期亲子礼', // 分享标题
desc: '价值498元唱唱英语线上课程免费领', // 分享描述
link: option.shareUrl, // 分享链接
imgUrl:
option.shareIcon ||
......
src/components/youbang/ybPaySuccess.vue
View file @ 38bcf831
......@@ -16,6 +16,7 @@
import icon_yes from '../../assets/yb/icon_yes@2x.png'
import img1 from '../../assets/yb/img1@2x.png'
import logo from '../../assets/yb/logo@2x.png'
import shareImg from '../../assets/yb/share.png'
import { getCourseInfoApi,getwechatParam } from "../../service/api";
export default {
name: "ybPaySuccess",
......@@ -26,7 +27,8 @@ export default {
img1:img1,
icon_yes:icon_yes,
logo:logo,
groupDetail:{}
groupDetail:{},
shareImg:shareImg
};
},
mounted() {
......@@ -75,11 +77,11 @@ export default {
},
onShare: function(type) {
this.handleInviteCode();
let URL = `${process.env.BUY_URL}invite_code=${this.this_code}`;
let URL = `https://sit.tohours.com/salesplus/goodstart/singing-English-Index.action?&parentId=${this.$route.query.parentId}&agentId=${this.$route.query.agentId}`;
this.enableShare({
product_title: '【免费领】价值498元亲子早教英语启蒙训练课',
desc: '友邦助您启蒙宝贝快乐家庭',
shareIcon: '',
shareIcon: shareImg,
shareUrl: URL
});
},
......@@ -100,7 +102,7 @@ export default {
wx.ready(function() {
wx.onMenuShareTimeline({
title: option.product_title, // 分享标题
desc: option.desc, // 分享描述
desc: '【庆百年 友惊喜】暑期亲子礼︱价值498元唱唱英语线上课程免费领', // 分享描述
link: option.shareUrl, // 分享链接
imgUrl:
option.shareIcon ||
......@@ -114,8 +116,8 @@ export default {
}
});
wx.onMenuShareAppMessage({
title: option.product_title, // 分享标题
desc: option.desc, // 分享描述
title: '【庆百年 友惊喜】暑期亲子礼', // 分享标题
desc: '价值498元唱唱英语线上课程免费领', // 分享描述
link: option.shareUrl, // 分享链接
imgUrl:
option.shareIcon ||
......
src/main.js
View file @ 38bcf831
......@@ -37,9 +37,9 @@ Vue.component('scroll', scroll);
// Vue.prototype.$throw = (error)=> errorHandler(error,this);
/* eslint-disable no-new */
// Vue.prototype.testAttr = 'testAttr'
if (process.env.NODE_ENV != 'production') {
new VConsole();
}
// if (process.env.NODE_ENV != 'production') {
// new VConsole();
// }
router.beforeEach((to, from, next) => {
next()
......
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