|
@@ -56,7 +56,7 @@ Page({
|
|
onlyFromCamera: true,
|
|
onlyFromCamera: true,
|
|
success: (result) => {
|
|
success: (result) => {
|
|
var url=result.result;
|
|
var url=result.result;
|
|
- var network_id=this.data.network_id?this.data.network_id:getQueryVariable(url,"network_id");
|
|
|
|
|
|
+ var network_id=this.data.network_id?this.data.network_id:app.getQueryVariable(url,"network_id");
|
|
var order_num=app.getQueryVariable(url,"orde_num");
|
|
var order_num=app.getQueryVariable(url,"orde_num");
|
|
wx.navigateTo({
|
|
wx.navigateTo({
|
|
url: '/pages/order/deposit/deposit?network_id='+network_id+"&order_num="+order_num+"&is_deposit=0",
|
|
url: '/pages/order/deposit/deposit?network_id='+network_id+"&order_num="+order_num+"&is_deposit=0",
|
|
@@ -112,17 +112,20 @@ Page({
|
|
network_id:this.data.network_id
|
|
network_id:this.data.network_id
|
|
}).then((res)=>{
|
|
}).then((res)=>{
|
|
if(res.code!=200){
|
|
if(res.code!=200){
|
|
- wx.showToast({
|
|
|
|
- title: res.message.msg,
|
|
|
|
- icon:"none",
|
|
|
|
- success:function(){
|
|
|
|
- setTimeout(() => {
|
|
|
|
- wx.hideLoading({
|
|
|
|
- success: (res) => {},
|
|
|
|
- })
|
|
|
|
- }, 2000);
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ that.getDeviceinfo(order_num)
|
|
|
|
+ }, 1000);
|
|
|
|
+ // wx.showToast({
|
|
|
|
+ // title: res.message.msg,
|
|
|
|
+ // icon:"none",
|
|
|
|
+ // success:function(){
|
|
|
|
+ // setTimeout(() => {
|
|
|
|
+ // wx.hideLoading({
|
|
|
|
+ // success: (res) => {},
|
|
|
|
+ // })
|
|
|
|
+ // }, 2000);
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
}else{
|
|
}else{
|
|
wx.hideLoading()
|
|
wx.hideLoading()
|
|
var orders=res.message.data;
|
|
var orders=res.message.data;
|