Skip to content

H
h5-base
Commit a71a94d1 authored by IvyXia123's avatar IvyXia123
Browse files
Options

期数

parent fcce99d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 33 deletions
dist/index.html
View file @ a71a94d1
...@@ -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.ed6d1273dc8c2d144766934b011e5890.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.3f5785fe15036f015342.js></script><script type=text/javascript src=static/js/vendor.7db1a6fce01e8076ed09.js></script><script type=text/javascript src=static/js/app.fe2c6415abc9d524853f.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.ed6d1273dc8c2d144766934b011e5890.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.40badb555620b847d5e6.js></script><script type=text/javascript src=static/js/vendor.7db1a6fce01e8076ed09.js></script><script type=text/javascript src=static/js/app.a932b8ae3f015b15ac38.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/3.741d28e4e99b0b927f71.js → dist/static/js/3.bfb3e07cfa2e19b0f234.js
View file @ a71a94d1
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.3f5785fe15036f015342.js → dist/static/js/manifest.40badb555620b847d5e6.js
View file @ a71a94d1
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={70:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"99eca63b2033f9e4329e",1:"eab7e8cd952c6a8c684d",2:"d02cc052f5b0a793ff42",3:"741d28e4e99b0b927f71",4:"ae2f2ad72b7647778888",5:"1bdc6eb28abca8d55594",6:"f33528d2879474d9b497",7:"b4c9d7f34b8677dee21f",8:"3a12c8d7575a76f18500",9:"5428e5efda8c69b091a8",10:"18feb799f9b98c2237ff",11:"8a616cd2bf9535aca14f",12:"60e22d22059b13a4b8b2",13:"49e2fab89863e5a59349",14:"97a1294dd4dfb6301ebe",15:"23378403a5bada9571df",16:"af157bb03acb4b7f37b8",17:"6cf9e1b9fa0428cf5d63",18:"2340341552200a69e80d",19:"aa6e3d65aa96e428d7a5",20:"91202ae1839a0b6719cc",21:"087997bfdc70e1b5139d",22:"b0fd96ad8f27124b5d6f",23:"dd87c78f2150cc550f10",24:"8df8758a582bb9d031cb",25:"efe64efe3630a4877751",26:"b76a54f75170d5e5b3b4",27:"7b4bd6e36741f7bf46b4",28:"c91f0c9c301128cebe5f",29:"52b720592707e63c2d4e",30:"dbf29282817872a8c5ce",31:"7873c4c22c96bbafe2af",32:"c27850f6211fa385b971",33:"4f4179fc1318f9e7142e",34:"303ef6f9471ee0fa4d71",35:"8094d895923accbe1d69",36:"8d68a6fdbee6ee8a9409",37:"df2033bdd5e192b42717",38:"30809f53757bc74a040c",39:"a4a3eb8cca888fce92da",40:"3af6c01c8e5cde2061b4",41:"38184f780150ed64771a",42:"d6489f8f07a723754a7c",43:"66d5fe6c1e6226ee4210",44:"efdfccfa6a3a101cf6f9",45:"c97dacb00740b3069dae",46:"c241465010464af50693",47:"7a5b8900ce5a0284e3d8",48:"95c184e4cdaa2e2f6bcb",49:"6a4cd5657a94075f1bc7",50:"c1cfda636c0eccc2e1f6",51:"868e6e7f5a7d64ee287e",52:"8510973a8e8e6c464086",53:"a59c89c16a2ac8f87891",54:"aa33075401a787f3074c",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"4221983faac6a4e4035f",59:"7669a929edb61384dd03",60:"35bfa194172cb46fe32d",61:"43bcf493dc4ca5a12ddf",62:"a34c4fc5f9e2a62decf0",63:"f557b12408cb596409b7",64:"ebd926664355393ca598",65:"f5549ab1cb4ae6c740a8",66:"ca36b9dbc4ba76113bf8",67:"d292e65832e700a88b15"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},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 c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={70:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"99eca63b2033f9e4329e",1:"eab7e8cd952c6a8c684d",2:"d02cc052f5b0a793ff42",3:"bfb3e07cfa2e19b0f234",4:"ae2f2ad72b7647778888",5:"1bdc6eb28abca8d55594",6:"f33528d2879474d9b497",7:"b4c9d7f34b8677dee21f",8:"3a12c8d7575a76f18500",9:"5428e5efda8c69b091a8",10:"18feb799f9b98c2237ff",11:"8a616cd2bf9535aca14f",12:"60e22d22059b13a4b8b2",13:"49e2fab89863e5a59349",14:"97a1294dd4dfb6301ebe",15:"23378403a5bada9571df",16:"af157bb03acb4b7f37b8",17:"6cf9e1b9fa0428cf5d63",18:"2340341552200a69e80d",19:"aa6e3d65aa96e428d7a5",20:"91202ae1839a0b6719cc",21:"087997bfdc70e1b5139d",22:"b0fd96ad8f27124b5d6f",23:"dd87c78f2150cc550f10",24:"8df8758a582bb9d031cb",25:"efe64efe3630a4877751",26:"b76a54f75170d5e5b3b4",27:"7b4bd6e36741f7bf46b4",28:"c91f0c9c301128cebe5f",29:"52b720592707e63c2d4e",30:"dbf29282817872a8c5ce",31:"7873c4c22c96bbafe2af",32:"c27850f6211fa385b971",33:"4f4179fc1318f9e7142e",34:"303ef6f9471ee0fa4d71",35:"8094d895923accbe1d69",36:"8d68a6fdbee6ee8a9409",37:"df2033bdd5e192b42717",38:"30809f53757bc74a040c",39:"a4a3eb8cca888fce92da",40:"3af6c01c8e5cde2061b4",41:"38184f780150ed64771a",42:"d6489f8f07a723754a7c",43:"66d5fe6c1e6226ee4210",44:"efdfccfa6a3a101cf6f9",45:"c97dacb00740b3069dae",46:"c241465010464af50693",47:"3e17631730d2b88e8675",48:"95c184e4cdaa2e2f6bcb",49:"6a4cd5657a94075f1bc7",50:"c1cfda636c0eccc2e1f6",51:"868e6e7f5a7d64ee287e",52:"8510973a8e8e6c464086",53:"a59c89c16a2ac8f87891",54:"aa33075401a787f3074c",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"4221983faac6a4e4035f",59:"7669a929edb61384dd03",60:"35bfa194172cb46fe32d",61:"43bcf493dc4ca5a12ddf",62:"a34c4fc5f9e2a62decf0",63:"f557b12408cb596409b7",64:"ebd926664355393ca598",65:"f5549ab1cb4ae6c740a8",66:"ca36b9dbc4ba76113bf8",67:"d292e65832e700a88b15"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},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/buy/buy.vue
View file @ a71a94d1
...@@ -418,8 +418,7 @@ export default { ...@@ -418,8 +418,7 @@ export default {
let data = { pay_type: 'ALI', return_url: window.location.href, buy_type: this.groupDetail.goods_type } let data = { pay_type: 'ALI', return_url: window.location.href, buy_type: this.groupDetail.goods_type }
let dataObj = Object.assign({}, data, json) let dataObj = Object.assign({}, data, json)
postPayBillApi(dataObj).then(res => { postPayBillApi(dataObj).then(res => {
let outTradEno = JSON.stringify({ out_trade_no: res.out_trade_no, invite_code: this.$route.query.invite_code, shopId: this.$route.query.shopId, goods_type: this.groupDetail.goods_type }) let outTradEno = JSON.stringify({ out_trade_no: res.out_trade_no, invite_code: this.$route.query.invite_code, shopId: this.$route.query.shopId, goods_type: this.groupDetail.goods_type, is_subscribe: this.userDetail.open_info.is_subscribe })
console.log(outTradEno)
localStorage.setItem('out_trade_no', outTradEno); localStorage.setItem('out_trade_no', outTradEno);
localStorage.setItem('pay_url', res.pay_url); localStorage.setItem('pay_url', res.pay_url);
location.href = `http://${ window.location.host }/#/guidelines?pay_url=${ encodeURI(res.pay_url) }` location.href = `http://${ window.location.host }/#/guidelines?pay_url=${ encodeURI(res.pay_url) }`
......
src/components/buy/buySuccess.vue
View file @ a71a94d1
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
localStorage.setItem("userDesc", JSON.stringify(res)); localStorage.setItem("userDesc", JSON.stringify(res));
this.userDesc = res; this.userDesc = res;
this.subscribe = this.userDesc.open_info.is_subscribe; this.subscribe = this.userDesc.open_info.is_subscribe;
alert(this.subscribe) // alert(this.subscribe)
getOrderDetailApi(this.orderNo).then(res => { getOrderDetailApi(this.orderNo).then(res => {
this.goods_id = res.goods_id; this.goods_id = res.goods_id;
this.invite_code = `CC-${res.invite_type}-${res.invite_id}`; this.invite_code = `CC-${res.invite_type}-${res.invite_id}`;
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
}); });
}); });
} else { } else {
alert(888) // alert(888)
this.userDesc = JSON.parse(localStorage.getItem("userDesc")); this.userDesc = JSON.parse(localStorage.getItem("userDesc"));
this.subscribe = this.userDesc.open_info.is_subscribe; this.subscribe = this.userDesc.open_info.is_subscribe;
getOrderDetailApi(this.orderNo).then(res => { getOrderDetailApi(this.orderNo).then(res => {
......
src/main.js
View file @ a71a94d1
...@@ -10,11 +10,12 @@ import VueClipboard from 'vue-clipboard2' ...@@ -10,11 +10,12 @@ import VueClipboard from 'vue-clipboard2'
import sa from 'sa-sdk-javascript'; import sa from 'sa-sdk-javascript';
import 'mint-ui/lib/style.css' import 'mint-ui/lib/style.css'
import scroll from "./base/scroll/scroll" import scroll from "./base/scroll/scroll"
import { Popup, Lazyload, Button, Dialog, Toast } from 'vant'; import {Popup, Lazyload, Button, Dialog, Toast} from 'vant';
import { getBillRefreshApi, getStatusWechatApi } from './service/api' import {getBillRefreshApi, getStatusWechatApi} from './service/api'
import './util/vancs.less' import './util/vancs.less'
import * as fundebug from 'fundebug-javascript'; import * as fundebug from 'fundebug-javascript';
import fundebugVue from 'fundebug-vue'; import fundebugVue from 'fundebug-vue';
fundebug.apikey = '4d414770c72b034dfa896048206a72258ede4e4ad5f9c6c4320d19b7f91a567e'; fundebug.apikey = '4d414770c72b034dfa896048206a72258ede4e4ad5f9c6c4320d19b7f91a567e';
fundebugVue(fundebug, Vue); fundebugVue(fundebug, Vue);
...@@ -50,29 +51,43 @@ Vue.component('scroll', scroll); ...@@ -50,29 +51,43 @@ Vue.component('scroll', scroll);
// 支付宝支付完成，订单状态查询 // 支付宝支付完成，订单状态查询
let timer = null; let timer = null;
if(window.localStorage.out_trade_no) { if (window.localStorage.out_trade_no) {
timer = setInterval(() => { timer = setInterval(() => {
let outTradEno = JSON.parse(window.localStorage.out_trade_no); let outTradEno = JSON.parse(window.localStorage.out_trade_no);
getBillRefreshApi({ outTradeNo: outTradEno.out_trade_no }).then(res => { getBillRefreshApi({outTradeNo: outTradEno.out_trade_no}).then(res => {
// 支付成功 // 支付成功
if(res.status === "SUCCESS") { if (res.status === "SUCCESS") {
localStorage.setItem("buyindex", 1);
Dialog.confirm({ title: '标题', message: '支付成功', confirmButtonText: '去查看' }).then(() => { getCourseInfoApi().then(res => {
if(res.buy_type == 1) { this.userCourse = JSON.parse(JSON.stringify(res));
router.push({ name: "buySuccess", query: outTradEno }); localStorage.setItem("userCourse", JSON.stringify(this.userCourse));
}else {
router.push({ name: "success", query: outTradEno }); localStorage.setItem("buyindex", 1);
} Dialog.confirm({title: '标题', message: '支付成功', confirmButtonText: '去查看'}).then(() => {
clearInterval(timer); if (res.teacher_alias && res.teacher_alias.substr(0, 1) == 1 && outTradEno.goods_type != 4 && outTradEno.is_subscribe == 1) {
localStorage.removeItem('out_trade_no') this.$router.push({ name: "guide", query: {shopId: outTradEno.shopId} });
}).catch(() => { }else {
clearInterval(timer); if (res.buy_type == 1) {
localStorage.removeItem('out_trade_no') router.push({name: "buySuccess", query: outTradEno});
} else {
router.push({name: "success", query: outTradEno});
}
}
clearInterval(timer);
localStorage.removeItem('out_trade_no')
}).catch(() => {
clearInterval(timer);
localStorage.removeItem('out_trade_no')
});
}); });
}else if(res.status === "NO_SYNC") {
Dialog.confirm({ title: '标题', message: '您有一笔未支付的订单', confirmButtonText: '去查看'}).then(() => {
} else if (res.status === "NO_SYNC") {
Dialog.confirm({title: '标题', message: '您有一笔未支付的订单', confirmButtonText: '去查看'}).then(() => {
clearInterval(timer); clearInterval(timer);
location.href = `http://${ window.location.host }/#/guidelines?pay_url=${ encodeURI(window.localStorage.pay_url) }` location.href = `http://${window.location.host}/#/guidelines?pay_url=${encodeURI(window.localStorage.pay_url)}`
}).catch(() => { }).catch(() => {
clearInterval(timer); clearInterval(timer);
localStorage.removeItem('out_trade_no') localStorage.removeItem('out_trade_no')
...@@ -84,11 +99,11 @@ if(window.localStorage.out_trade_no) { ...@@ -84,11 +99,11 @@ if(window.localStorage.out_trade_no) {
// 全局错误日志 // 全局错误日志
const errorHandler = (error, vm)=>{ const errorHandler = (error, vm) => {
Vue.prototype.$post(`api/client/report/errors/log`,{'routes_url':vm.$route.name,'result_text':error.toString()}) Vue.prototype.$post(`api/client/report/errors/log`, {'routes_url': vm.$route.name, 'result_text': error.toString()})
} }
Vue.config.errorHandler = errorHandler; Vue.config.errorHandler = errorHandler;
Vue.prototype.$throw = (error)=> errorHandler(error,this); Vue.prototype.$throw = (error) => errorHandler(error, this);
Vue.prototype.$common = common Vue.prototype.$common = common
//VConsole关闭屏蔽代码 //VConsole关闭屏蔽代码
if (process.env.NODE_ENV != 'production') { if (process.env.NODE_ENV != 'production') {
...@@ -112,7 +127,7 @@ new Vue({ ...@@ -112,7 +127,7 @@ new Vue({
el: '#app', el: '#app',
router, router,
store, store,
components: { App }, components: {App},
template: '<App/>' template: '<App/>'
}); });
......
src/router/index.js
View file @ a71a94d1
...@@ -651,7 +651,7 @@ router.beforeEach((to, from, next) => { ...@@ -651,7 +651,7 @@ router.beforeEach((to, from, next) => {
// 在支付宝里跳转 // 在支付宝里跳转
let micromessenger = common.isWeixinBrowser(); let micromessenger = common.isWeixinBrowser();
if(micromessenger == 2){ if(micromessenger == 2){
alert("支付成功啦，请回到唱唱公众号继续操作！") console.log("支付成功啦，请回到唱唱公众号继续操作！")
// location.href = "https://wechat-pre.changchangenglish.com/#/weixin" // location.href = "https://wechat-pre.changchangenglish.com/#/weixin"
location.href = "https://static-cdn.changchangenglish.com/public/images/alipay_success.png" location.href = "https://static-cdn.changchangenglish.com/public/images/alipay_success.png"
return ; return ;
......
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