From 6a07d47620ebc4dfa75ac4cb670096b5a5609c1b Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 20 Apr 2019 14:19:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BA=97=E5=AE=B6=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E9=99=90=E6=97=B6=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/main/index.js | 76 ++++++---------------- pages/main/index.wxml | 14 ++-- pages/main/index.wxss | 4 +- pages/main/rushtobyCard/index.wxss | 1 - pages/specialcourtesy/specialcourtesy.js | 46 ++++++++++++- pages/specialcourtesy/specialcourtesy.wxml | 7 +- pages/specialcourtesy/specialcourtesy.wxss | 23 +++++++ 7 files changed, 100 insertions(+), 71 deletions(-) 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}} - - - - +