Skip to content

K
kxz-app-phone-h5
Commit c94f60a4 by huahua
Options

提交

parent 5ffe961d
Showing with 16 additions and 19 deletions
pages/index/detailsphone.vue
...@@ -555,6 +555,7 @@ ...@@ -555,6 +555,7 @@
if (res) { if (res) {
this.list = res; this.list = res;
this.phone = res.phone this.phone = res.phone
//console.log(this.phone)
this.support_paypal = false; this.support_paypal = false;
if (this.list.support_paypal == 1) { if (this.list.support_paypal == 1) {
this.support_paypal = true; this.support_paypal = true;
...@@ -587,7 +588,7 @@ ...@@ -587,7 +588,7 @@
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.hideLoading(); uni.hideLoading();
}).catch(err => { }).catch(err => {
console.log(err) //console.log(err)
this.msg = err.msg this.msg = err.msg
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.hideLoading(); uni.hideLoading();
......
pages/mall/lineUp.vue
...@@ -195,10 +195,6 @@ ...@@ -195,10 +195,6 @@
this.designer = designer this.designer = designer
if (designer.status.value == 1) { if (designer.status.value == 1) {
this.clearIntervalTime() this.clearIntervalTime()
uni.navigateTo({
url: '../mine/self_help_payment_details?orderId=' + designer.order_id +
'&type=' + this.key + '&machine_id=' + this.queryPage.machine_id
})
} else { } else {
if (this.sighstate == true) return; if (this.sighstate == true) return;
this.sighstate = true this.sighstate = true
......
pages/mine/order.vue
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
machine_id: this.machine_id, //设备 machine_id: this.machine_id, //设备
goods_id: this.goods_id, //产品 goods_id: this.goods_id, //产品
works_id: this.works_id, //作品 works_id: this.works_id, //作品
channel_no: null, //货道 channel_no: this.channel_no, //货道
dict_id: null, //属性字典id dict_id: null, //属性字典id
goods_size: null, //产品尺寸 goods_size: null, //产品尺寸
works_num: null, //作品 works_num: null, //作品
...@@ -277,12 +277,11 @@ ...@@ -277,12 +277,11 @@
homeservice.WorksListPhone(data).then(result => { homeservice.WorksListPhone(data).then(result => {
uni.hideLoading(); uni.hideLoading();
let url_pay = result.data.link let url_pay = result.data.link
if (url_pay.includes("http")) { if (url_pay.includes("http")) {
window.location.href = url_pay window.location.href = url_pay
} else { } else {
this.generateQRCode(url_pay) this.generateQRCode(url_pay)
} }
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
...@@ -305,7 +304,7 @@ ...@@ -305,7 +304,7 @@
machine_id: this.machine_id, //设备 machine_id: this.machine_id, //设备
goods_id: this.goods_id, //产品 goods_id: this.goods_id, //产品
works_id: this.works_id, //作品 works_id: this.works_id, //作品
channel_no: null, //货道 channel_no: this.channel_no, //货道
dict_id: null, //属性字典id dict_id: null, //属性字典id
goods_size: null, //产品尺寸 goods_size: null, //产品尺寸
works_num: null, //作品 works_num: null, //作品
...@@ -329,14 +328,12 @@ ...@@ -329,14 +328,12 @@
}) })
homeservice.WorksListPhone(data).then(result => { homeservice.WorksListPhone(data).then(result => {
uni.hideLoading(); uni.hideLoading();
let url_pay = result.data.link let url_pay = result.data.link
url_pay="https://www.baidu.com/"
if (url_pay.includes("http")) { if (url_pay.includes("http")) {
window.location.href = url_pay window.location.href = url_pay
} else { } else {
this.generateQRCode(url_pay) this.generateQRCode(url_pay)
} }
//console.log(result) //console.log(result)
/* let url_pay = result.data.link /* let url_pay = result.data.link
...@@ -362,7 +359,7 @@ ...@@ -362,7 +359,7 @@
machine_id: this.machine_id, //设备 machine_id: this.machine_id, //设备
goods_id: this.goods_id, //产品 goods_id: this.goods_id, //产品
works_id: this.works_id, //作品 works_id: this.works_id, //作品
channel_no: null, //货道 channel_no: this.channel_no, //货道
dict_id: null, //属性字典id dict_id: null, //属性字典id
goods_size: null, //产品尺寸 goods_size: null, //产品尺寸
works_num: null, //作品 works_num: null, //作品
...@@ -385,12 +382,12 @@ ...@@ -385,12 +382,12 @@
}) })
homeservice.WorksListPhone(data).then(result => { homeservice.WorksListPhone(data).then(result => {
uni.hideLoading(); uni.hideLoading();
let url_pay = result.data.link let url_pay = result.data.link
if (url_pay.includes("http")) { if (url_pay.includes("http")) {
window.location.href = url_pay window.location.href = url_pay
} else { } else {
this.generateQRCode(url_pay) this.generateQRCode(url_pay)
} }
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();
...@@ -423,6 +420,7 @@ ...@@ -423,6 +420,7 @@
// key: this.tabletext ? 3 : 1 // key: this.tabletext ? 3 : 1
key: "3" key: "3"
}).then(result => { }).then(result => {
console.log(result)
this.coupon = result.coupon this.coupon = result.coupon
this.stock = result.stock this.stock = result.stock
// 读出锁库存储存信息 // 读出锁库存储存信息
...@@ -431,6 +429,8 @@ ...@@ -431,6 +429,8 @@
this.sizestock = this.$base.lockInventory.stock this.sizestock = this.$base.lockInventory.stock
this.channel_no = this.$base.lockInventory.channel_no this.channel_no = this.$base.lockInventory.channel_no
this.dict_id = this.$base.lockInventory.dict_id this.dict_id = this.$base.lockInventory.dict_id
}).catch(err => { }).catch(err => {
//uni.showToast({title: err.msg,icon: 'none'}); //uni.showToast({title: err.msg,icon: 'none'});
}); });
......
unpackage/dist/build/web/index.html
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Customize Phone case</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Customize Phone case</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b920293a.js></script><script src=/static/js/index.61784d34.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b920293a.js></script><script src=/static/js/index.63c97dad.js></script></body></html>
\ No newline at end of file \ No newline at end of file
util/Env.js
...@@ -15,7 +15,7 @@ if( "localhost" == domain || "kxzh5.refinecolor.com" == domain ){ ...@@ -15,7 +15,7 @@ if( "localhost" == domain || "kxzh5.refinecolor.com" == domain ){
//正式版 //正式版
const baseURL = hostname + "://"+domain+"/api/" const baseURL = hostname + "://"+domain+"/api/"
//// 获取当前页面的域名 // 获取当前页面的域名
const Env = { const Env = {
getDevBaseURL: () => baseURL, getDevBaseURL: () => baseURL,
getBaseURL: () => baseURL getBaseURL: () => baseURL
......
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