Skip to content

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

支付成功修改3

parent 40ac383d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 17 deletions
dist/index.html
View file @ 66283267
...@@ -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.f983055a19b69eb54137ee36031e8a72.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.53f4bc96248908258de5.js></script><script type=text/javascript src=static/js/vendor.0c8bc24167292824b3ef.js></script><script type=text/javascript src=static/js/app.21f4c31bc552fd95d4b4.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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.fc0e3802501c3da5f46b.js></script><script type=text/javascript src=static/js/vendor.0c8bc24167292824b3ef.js></script><script type=text/javascript src=static/js/app.21f4c31bc552fd95d4b4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/11.0190280a254542af4cc8.js → dist/static/js/11.8186366a3e847ea1ef61.js
View file @ 66283267
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.daf84d25f75ecaaf3e09.js → dist/static/js/3.9782ad36356e167fdf78.js
View file @ 66283267
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.53f4bc96248908258de5.js → dist/static/js/manifest.fc0e3802501c3da5f46b.js
View file @ 66283267
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={67:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"edf1b0e0445b5dbb1992",1:"d283fee8736fad005644",2:"fece24bf8ba67d9082c7",3:"daf84d25f75ecaaf3e09",4:"c57e098b834f65610b6a",5:"0201e3c5bf417128b829",6:"d5d785000579d2879b7f",7:"fb128039c6d935a64a33",8:"1a60ee12ff924bb4202f",9:"03b1d6327b33da00401d",10:"07cccee1a58390c0ba00",11:"0190280a254542af4cc8",12:"3c65b20185fb5661f264",13:"3ec2fc3cfea5c4655f49",14:"9d21430023e85a791831",15:"87d141bedebf0ae36b04",16:"f092d3dc3bb1cc64610a",17:"4641e959cbe2a4aaadb2",18:"96258b26fd6f40099c93",19:"a1b7ff4be135d61b5938",20:"4abc2877cffd2d849600",21:"76c4799125157aec1f9c",22:"ccd5241d129249c496c5",23:"c603060a5fcde95360f7",24:"6c19295b05af1c46937f",25:"b08496369488c2831cd4",26:"3a4ae803c4c7678e04b7",27:"d08690329b27349cb0e2",28:"1c5fe844abfad5e048c8",29:"8ffa1cf4fab5cfab6da6",30:"244b2f14c54c0c0a70bb",31:"4790c094ca8198d1a4d2",32:"ce87cc3ee6c33834bbb4",33:"8a378f597ca723d26bce",34:"6343afaf74d6b92311b2",35:"af1de150112e04eb3afe",36:"1ca316ec4170b8cf7b9c",37:"7e34b6c518b122f531c2",38:"421d529498a1373ea583",39:"2b86f54b14f86d3331df",40:"bea34e111f562d115523",41:"b97944436306bc752119",42:"81320b29ab7366134bc9",43:"0f0fc8059aaf7ab4aee0",44:"4619d22ebc43a10ae7fd",45:"388b916c03a94f995a67",46:"8b905ba6006d36892bae",47:"dabb7cb12e3937a7ba09",48:"3188cf7d2f5a4dc73d8e",49:"9cdf56be34628cc35e67",50:"422e414a1c1de59a6267",51:"372c66a55259521e9dfc",52:"626a6fa47d9e890d462c",53:"fc71768248fc75f15da5",54:"c3abdc0780174edb2e74",55:"be16659d917db3fe744c",56:"17514904aefdbcfb81f6",57:"a5ecfa0fbb288572d48c",58:"5c4ebf5fcfd938090a0c",59:"1fe58e1f5c8d0cc1c3c3",60:"14a08973ae4747c0e695",61:"d5cd19613876056a9fea",62:"88d63000c6107d1ba671",63:"371425f4f5252c158565",64:"4ea8f92d5459dd81a771"}[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,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={67:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"edf1b0e0445b5dbb1992",1:"d283fee8736fad005644",2:"fece24bf8ba67d9082c7",3:"9782ad36356e167fdf78",4:"c57e098b834f65610b6a",5:"0201e3c5bf417128b829",6:"d5d785000579d2879b7f",7:"fb128039c6d935a64a33",8:"1a60ee12ff924bb4202f",9:"03b1d6327b33da00401d",10:"07cccee1a58390c0ba00",11:"8186366a3e847ea1ef61",12:"3c65b20185fb5661f264",13:"3ec2fc3cfea5c4655f49",14:"9d21430023e85a791831",15:"87d141bedebf0ae36b04",16:"f092d3dc3bb1cc64610a",17:"4641e959cbe2a4aaadb2",18:"96258b26fd6f40099c93",19:"a1b7ff4be135d61b5938",20:"4abc2877cffd2d849600",21:"76c4799125157aec1f9c",22:"ccd5241d129249c496c5",23:"c603060a5fcde95360f7",24:"6c19295b05af1c46937f",25:"b08496369488c2831cd4",26:"3a4ae803c4c7678e04b7",27:"d08690329b27349cb0e2",28:"1c5fe844abfad5e048c8",29:"8ffa1cf4fab5cfab6da6",30:"244b2f14c54c0c0a70bb",31:"4790c094ca8198d1a4d2",32:"ce87cc3ee6c33834bbb4",33:"8a378f597ca723d26bce",34:"6343afaf74d6b92311b2",35:"af1de150112e04eb3afe",36:"1ca316ec4170b8cf7b9c",37:"7e34b6c518b122f531c2",38:"421d529498a1373ea583",39:"2b86f54b14f86d3331df",40:"bea34e111f562d115523",41:"b97944436306bc752119",42:"81320b29ab7366134bc9",43:"0f0fc8059aaf7ab4aee0",44:"4619d22ebc43a10ae7fd",45:"388b916c03a94f995a67",46:"a20c40c48a02300dcdb0",47:"dabb7cb12e3937a7ba09",48:"3188cf7d2f5a4dc73d8e",49:"9cdf56be34628cc35e67",50:"422e414a1c1de59a6267",51:"372c66a55259521e9dfc",52:"626a6fa47d9e890d462c",53:"fc71768248fc75f15da5",54:"c3abdc0780174edb2e74",55:"be16659d917db3fe744c",56:"17514904aefdbcfb81f6",57:"a5ecfa0fbb288572d48c",58:"5c4ebf5fcfd938090a0c",59:"1fe58e1f5c8d0cc1c3c3",60:"14a08973ae4747c0e695",61:"d5cd19613876056a9fea",62:"88d63000c6107d1ba671",63:"371425f4f5252c158565",64:"4ea8f92d5459dd81a771"}[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,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.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 @ 66283267
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 多中 --> <!-- 支付方式选择 -->
<div class="pay-list"> <!--<div class="pay-list">
<div class="pay-choice">支付方式选择</div> <div class="pay-choice">支付方式选择</div>
<ul class="pay"> <ul class="pay">
<li v-for="item in payList" :key="item.value" @click="payListClick(item.value)"> <li v-for="item in payList" :key="item.value" @click="payListClick(item.value)">
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>-->
<footer> <footer>
<div class="sub-block"> <div class="sub-block">
...@@ -204,12 +204,12 @@ export default { ...@@ -204,12 +204,12 @@ export default {
orderCancel: false, orderCancel: false,
userCourse: {}, userCourse: {},
payList: [ payList: [
{ icon: weixin, title: '微信支付', value: 1 }, { icon: weixin, title: '微信支付', value: 0 },
{ icon: zhifubao, title: '支付宝支付', value: 2 }, { icon: zhifubao, title: '支付宝支付', value: 1 },
{ icon: xinyongka, title: '信用卡分期', value: 3 }, { icon: xinyongka,title: '信用卡分期', value: 2 },
{ icon: fenqi, title: '其他分期', value: 4 }, { icon: fenqi, title: '其他分期', value: 3 },
], ],
payIndex: 1 payIndex: 0
}; };
}, },
mounted() { mounted() {
...@@ -312,6 +312,7 @@ export default { ...@@ -312,6 +312,7 @@ export default {
this.bindMobile.show = false; this.bindMobile.show = false;
}, },
payOrder(flag) { payOrder(flag) {
console.log(flag)
let type = this.type ? 0 : 1; let type = this.type ? 0 : 1;
let that = this; let that = this;
this.orderCancel = false; this.orderCancel = false;
...@@ -361,6 +362,56 @@ export default { ...@@ -361,6 +362,56 @@ export default {
} }
this.orderFlag = false; this.orderFlag = false;
/* let payTypeArr = ['WX', 'ALI', '卡分期']
let data = { pay_type: payTypeArr[this.payIndex], return_url: window.location.href, goods_id: json.goods_id, buy_type: this.groupDetail.goods_type, group_order_id: json.group_order_id, order_coupon_id:json.order_coupon_id }
console.log(data)
postPayBillApi(data).then(res => {
if(this.payIndex === 0) {
this.orderNo = res.out_trade_no;
if (res.out_trade_no && !res.appId) {
getCourseInfoApi().then(res => {
this.userCourse = res;
localStorage.setItem(
"userCourse",
JSON.stringify(this.userCourse)
);
this.navPage(res);
});
} else {
let that = this;
this.orderNo = res.out_trade_no;
this.jsApiParameters = res;
wx.miniProgram.getEnv(function(res) {
if (res.miniprogram) {
let payParam = encodeURIComponent(JSON.stringify(json));
wx.miniProgram.navigateTo({
url: `pages/wxPay/main?payParam=${payParam}`
});
} else if (typeof WeixinJSBridge === "undefined") {
if (document.addEventListener) {
document.addEventListener(
"WeixinJSBridgeReady",
that.jsApiCall,
false
);
} else if (document.attachEvent) {
document.attachEvent("WeixinJSBridgeReady", that.jsApiCall);
document.attachEvent(
"onWeixinJSBridgeReady",
that.jsApiCall
);
}
} else {
that.jsApiCall();
}
});
}
}else if(this.payIndex === 1){
var clipboard = new Clipboard('.tag-read')
}
})
return false*/
payApi(json) payApi(json)
.then(res => { .then(res => {
this.orderNo = res.out_trade_no; this.orderNo = res.out_trade_no;
......
src/components/map/index.vue
View file @ 66283267
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<img class="zhongbian" :src="zhong" alt=""> <img class="zhongbian" :src="zhong" alt="">
</div> </div>
</router-link>--> </router-link>-->
</div> </div>
<!--竖屏 主题栏--> <!--竖屏 主题栏-->
<swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper"> <swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper">
......
src/components/map/promptTime.vue
View file @ 66283267
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
}) })
}else { }else {
Toast("请先设定时间"); Toast("请先设定时间");
console.log(this.$refs.timeSetting);
this.$refs.timeSetting.style.borderBottom = '1px solid red' this.$refs.timeSetting.style.borderBottom = '1px solid red'
} }
} }
......
src/service/api.js
View file @ 66283267
...@@ -377,6 +377,6 @@ export const postNotifySettingApi = function (json) { ...@@ -377,6 +377,6 @@ export const postNotifySettingApi = function (json) {
// 支付 // 支付
export const postPayBillApi = function (json) { export const postPayBillApi = function (json) {
return Vue.prototype.$post(`/client/bill/create`, json) return Vue.prototype.$post(`/api/client/bill/create`, json)
}; };
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