diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js index 5de9714..431ea7c 100644 --- a/components/diy_user_info/diy_user_info.js +++ b/components/diy_user_info/diy_user_info.js @@ -1,6 +1,6 @@ const rq = require("../../utils/request.js"); const ut = require("../../utils/util.js"); -const {qrcode} = require("../../utils/index.js"); +const {barcode,qrcode} = require("../../utils/index.js"); var s = getApp().globalData.setting; var r=s; Component({ @@ -43,6 +43,8 @@ Component({ sys_switch:null, tc_hide:true, //会员卡的弹出层隐藏 + brcode:'', + showtext1:'点击可查看条形数据' }, ready: function() { @@ -99,14 +101,22 @@ Component({ var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime; val = "^" + ut.base64_encode(val); - qrcode('qrcode', val, 480, 480, that); + qrcode('qrcode', val, 350, 350, that); + let userInfo = getApp().globalData.userInfo; + barcode('barcode', userInfo.userQrcode, 480,140,that); that.setData({ tc_hide: false, + brcode:userInfo.userQrcode }); } } }) }, + showtext:function(){ + this.setData({ + showtext1:this.data.brcode + }) + }, //隐藏会员卡 hide_tc: function () { this.setData({ diff --git a/components/diy_user_info/diy_user_info.wxml b/components/diy_user_info/diy_user_info.wxml index ea93ec3..a619035 100644 --- a/components/diy_user_info/diy_user_info.wxml +++ b/components/diy_user_info/diy_user_info.wxml @@ -73,11 +73,16 @@ {{userInfo.address}} - + - 前台收银扫此二维码,即可享受优惠! + + + + + {{showtext1}} + \ No newline at end of file diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss index 376e708..df7caed 100644 --- a/components/diy_user_info/diy_user_info.wxss +++ b/components/diy_user_info/diy_user_info.wxss @@ -210,8 +210,8 @@ } .g_img { - width: 480rpx; - height: 480rpx; + width: 350rpx; + height: 350rpx; } .s_sao { @@ -231,4 +231,9 @@ background-color: #999; } - +.canvas_box{ + display: flex; + align-items: center; + justify-content: center; + /* margin-top: 20rpx; */ +} diff --git a/packageG/pages/user/userinfo/userinfo.js b/packageG/pages/user/userinfo/userinfo.js index decd554..1aa05cc 100644 --- a/packageG/pages/user/userinfo/userinfo.js +++ b/packageG/pages/user/userinfo/userinfo.js @@ -5,7 +5,7 @@ function e(e, a, r) { configurable: !0, writable: !0 }) : e[a] = r, e; -} +} var a = getApp(), r = a.globalData.setting, @@ -13,7 +13,7 @@ var a = getApp(), s = require("../../../../utils/common.js"), util = require("../../../../utils/util.js"), ut = util, - d = getApp().globalData; + d = getApp().globalData; var timestamp = Date.parse(new Date()); var date = new Date(timestamp); diff --git a/packageG/pages/user/userinfo/userinfo.wxml b/packageG/pages/user/userinfo/userinfo.wxml index 41d12e5..14621de 100644 --- a/packageG/pages/user/userinfo/userinfo.wxml +++ b/packageG/pages/user/userinfo/userinfo.wxml @@ -309,7 +309,7 @@ {{user.address}} - + @@ -318,7 +318,7 @@ {{showtext1}} - + diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index 111af1b..b6e08e3 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -22,22 +22,19 @@ - + - + - + - + @@ -87,7 +84,7 @@ - + {{pulscardname}} @@ -108,12 +105,12 @@ {{" "}} - {{rfmName}} + {{rfmName}} {{cz_val}} / {{need_money}} {{" "}} - {{rfmName}} {{cz_val}} + {{rfmName}} {{cz_val}} @@ -450,24 +447,24 @@ {{userInfo.address}} - - - - - - - - - - {{showtext1}} - + + + + + + + + + + {{showtext1}} + - + - + \ No newline at end of file diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss index 3ca0149..3c0992c 100644 --- a/pages/user/index/index.wxss +++ b/pages/user/index/index.wxss @@ -597,7 +597,7 @@ .m_ta { margin-top: 50rpx; -} +} .g_img { width: 350rpx;