diff --git a/pages/main/index.js b/pages/main/index.js
index 7de8e90..5b082ce 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -81,40 +81,21 @@ Page({
url: '/pages/spellGroup/spellGroup',
})
},
- qrcode: function(e) {
+ qrcode: function() {
var that = this;
- that.setData({
- showQrcode: true
- })
- wx.showToast({
- title: '生成中...',
- icon: 'loading',
- duration: 2000
- });
- console.log(e)
- var st = setTimeout(function() {
- wx.hideToast()
- var size = that.setCanvasSize();
- console.log(size)
- var url = JSON.stringify({
- END: "C",
- TYPE: "memberCode",
- ID: that.data.memberId,
- });
- console.log(url,777777777)
- that.createQrCode(url, "mycanvas2", size.w, size.h);
- that.setData({
- maskHidden: true
- });
- clearTimeout(st);
- }, 1000)
- },
- hideQrcode: function() {
- let that = this;
- that.setData({
- showQrcode: false
- })
+ let memberId = that.data.memberId;
+ if (memberId){
+ wx.navigateTo({
+ url: '/pages/specialcourtesy/specialcourtesy'
+ })
+ }
},
+ // hideQrcode: function() {
+ // let that = this;
+ // that.setData({
+ // showQrcode: false
+ // })
+ // },
//跳往限时秒杀
gotoRushBuy: function () {
wx.navigateTo({
@@ -151,28 +132,11 @@ Page({
url: '/pages/index/searchbar/index',
})
},
- //适配不同屏幕大小的canvas
- setCanvasSize: function() {
- var size = {};
- try {
- var res = wx.getSystemInfoSync();
- var scale = 750 / 500;
- //不同屏幕下canvas的适配比例;设计稿是750宽
- var width = res.windowWidth / scale;
- var height = width;
- //canvas画布为正方形
- size.w = width;
- size.h = height;
- } catch (e) {
- // Do something when catch error
- console.log("获取设备信息失败" + e);
- }
- return size;
- },
- createQrCode: function(url, canvasId, cavW, cavH) {
- //调用插件中的draw方法,绘制二维码图片
- QR.api.draw(url, canvasId, cavW, cavH);
- },
+
+ // createQrCode: function(url, canvasId, cavW, cavH) {
+ // //调用插件中的draw方法,绘制二维码图片
+ // QR.api.draw(url, canvasId, cavW, cavH);
+ // },
swiperChange: function(e) {
this.setData({
swiperCurrent: e.detail.current
@@ -321,11 +285,11 @@ Page({
ismember: true,
memberId: res.data.id
})
- var size = this.setCanvasSize();
+ // var size = this.setCanvasSize();
var initUrl = JSON.stringify({
flagid: res.data.id
});
- that.createQrCode(initUrl, "mycanvas1", size.w, size.h);
+ // that.createQrCode(initUrl, "mycanvas1", size.w, size.h);
}
})
.catch(err => {
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index ef8e59a..c1be6fc 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -51,13 +51,13 @@
-
-
- {{levelName}}
-
-
-
-
+
diff --git a/pages/main/index.wxss b/pages/main/index.wxss
index 66772ed..3cb2c9f 100644
--- a/pages/main/index.wxss
+++ b/pages/main/index.wxss
@@ -12,9 +12,7 @@
line-height: 88rpx;
overflow: hidden;
}
-#mycanvas2{
- height: 500rpx;
-}
+
.red{
position:absolute;
width:13rpx;
diff --git a/pages/main/rushtobyCard/index.wxss b/pages/main/rushtobyCard/index.wxss
index c78bfea..f9b2f7f 100644
--- a/pages/main/rushtobyCard/index.wxss
+++ b/pages/main/rushtobyCard/index.wxss
@@ -3,7 +3,6 @@
display: inline-block;
box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
border-radius:16rpx;
-
}
.rushtobuyimgs{
padding: 0 30rpx;
diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js
index c03ab7b..cf90a77 100644
--- a/pages/specialcourtesy/specialcourtesy.js
+++ b/pages/specialcourtesy/specialcourtesy.js
@@ -1,7 +1,10 @@
var config = require("../../config/config.js");
var app = getApp();
const Http = require("../../utils/HttpBasics");
+const QR = require("../../utils/memberqrcode.js");
+const BR = require("../../utils/barcode.js");
const imgurl = require("../../utils/imgurl");
+const util = require("../../utils/util");
Page({
/**
* 页面的初始数据
@@ -9,6 +12,7 @@ Page({
data: {
myspeacialUrl: imgurl.myspeacial.url,
teliconUrl: imgurl.telicon.url,
+ memberId:"000000"
},
phone: function (e) {
console.log(e)
@@ -30,6 +34,10 @@ Page({
that.setData({
level: res.data.level ? res.data.level : ''
})
+ that.qrcode(res.data.id);
+ that.setData({
+ memberId: res.data.id
+ })
console.log(res.data.levelMerchantList)
let discountMerchantList = [];
res.data.levelMerchantList.map(file=>{
@@ -37,13 +45,47 @@ Page({
discountMerchantList.push(file);
}
})
- console.log(discountMerchantList)
that.setData({
discountMerchantList: discountMerchantList,
})
})
},
-
+ /**
+ * 二维码
+ */
+ qrcode: function (memberId){
+ let that = this;
+ var size = that.setCanvasSize();
+ let url = JSON.stringify({
+ END: "C",
+ TYPE: "memberCode",
+ ID: memberId,
+ });
+ that.createQrCode(url, "mycanvas2", size.w, size.h);
+ // util.barcode('barcode',memberId, 600, 150);
+ },
+ createQrCode: function (url, canvasId, cavW, cavH) {
+ //调用插件中的draw方法,绘制二维码图片
+ QR.api.draw(url, canvasId, cavW, cavH);
+ },
+ //适配不同屏幕大小的canvas
+ setCanvasSize: function () {
+ var size = {};
+ try {
+ var res = wx.getSystemInfoSync();
+ var scale = 750 / 300;
+ //不同屏幕下canvas的适配比例;设计稿是750宽
+ var width = res.windowWidth / scale;
+ var height = width;
+ //canvas画布为正方形
+ size.w = width;
+ size.h = height;
+ } catch (e) {
+ // Do something when catch error
+ console.log("获取设备信息失败" + e);
+ }
+ return size;
+ },
/**
* 生命周期函数--监听页面隐藏
*/
diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml
index 64170ab..ecd4072 100644
--- a/pages/specialcourtesy/specialcourtesy.wxml
+++ b/pages/specialcourtesy/specialcourtesy.wxml
@@ -1,5 +1,8 @@
-