小程序扫码更新
diff --git a/pages/scan/scan.js b/pages/scan/scan.js
index f3f47fb..849ce65 100644
--- a/pages/scan/scan.js
+++ b/pages/scan/scan.js
@@ -15,41 +15,41 @@
onLoad: function(options) {
var url = wx.getStorageSync("scanurl");
var userid = wx.getStorageSync("userid");
- // this.setData({
- // scanurl:url
- // })
- var that=this;
- if (url.indexOf("dwz.cn") >= 0){
- console.log('init here');
- wx.request({
- url: url,
- method: 'GET',
- success: function (res) {
- var model = res.data;
- var index = model.indexOf('retcobillno');
- var index2 = model.indexOf(';');
- var rowbillno = model.substring(index, index2);
- var billno = rowbillno.substring(rowbillno.indexOf('=') + 1);
- var url = 'https://yy.dlsmk.cn/water/api/device/qrcode/pretend?cobillno=' + billno + '&userid=' + userid;
-
- wx.setStorageSync("trueurl", url);
- wx.navigateTo({
- url: '../scan2/scan2',
- })
- }
- })
- } else{
- console.log('init there');
- if (url.indexOf("?") > 0){
- url = url + '&userid=' + userid;
- }else{
- url = url + '?userid=' + userid;
- }
- console.log(url);
- this.setData({
- scanurl:url
- })
- }
+ this.setData({
+ scanurl:url
+ })
+ // var that=this;
+ // if (url.indexOf("dwz.cn") >= 0){
+ // console.log('init here');
+ // wx.request({
+ // url: url,
+ // method: 'GET',
+ // success: function (res) {
+ // var model = res.data;
+ // var index = model.indexOf('retcobillno');
+ // var index2 = model.indexOf(';');
+ // var rowbillno = model.substring(index, index2);
+ // var billno = rowbillno.substring(rowbillno.indexOf('=') + 1);
+ // var url = 'https://yy.dlsmk.cn/water/api/device/qrcode/pretend?cobillno=' + billno + '&userid=' + userid;
+//
+ // wx.setStorageSync("trueurl", url);
+ // wx.navigateTo({
+ // url: '../scan2/scan2',
+ // })
+ // }
+ // })
+ // } else{
+ // console.log('init there');
+ // if (url.indexOf("?") > 0){
+ // url = url + '&userid=' + userid;
+ // }else{
+ // url = url + '?userid=' + userid;
+ // }
+ // console.log(url);
+ // this.setData({
+ // scanurl:url
+ // })
+ // }
},
getTrueUrl: function(res) {
@@ -58,7 +58,7 @@
if (url.indexOf("pretend") < 0){
return;
}
- if (url.indexOf("yy.dlsmk.cn") >= 0) {
+ // if (url.indexOf("yy.dlsmk.cn") >= 0) {
console.log("succ");
var userid = wx.getStorageSync("userid");
if (url.indexOf("?") > 0) {
@@ -70,7 +70,7 @@
wx.navigateTo({
url: '../scan2/scan2',
})
- }
+ // }
},
/**