From 70d550f990a38a6c2cd55660a9f73e3ab22addb2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 1 Mar 2024 14:19:47 +0800
Subject: [PATCH] 针对二维码增加自行隐藏/显示二维码的功能。

---
 pages/user/index/iconfont.ttf | Bin 0 -> 1936 bytes
 pages/user/index/index.js     | 34 +++++++++++++++++++++++++++++++++-
 pages/user/index/index.wxml   | 23 ++++++++++++++++++-----
 pages/user/index/index.wxss   | 35 +++++++++++++++++++++++++++++++++--
 4 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 pages/user/index/iconfont.ttf

diff --git a/pages/user/index/iconfont.ttf b/pages/user/index/iconfont.ttf
new file mode 100644
index 0000000..4b13094
Binary files /dev/null and b/pages/user/index/iconfont.ttf differ
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 1182193..2747fe8 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -55,8 +55,8 @@ Page({
 		showvipcode:false,
 		pshow:0,
 
-
 		is_show_yq:0, //是不是要显示邀请
+		show_erm_u:1,//弹出框显示会员二维码
 	},
 	goto_nav: function (e) {
 		var th = this;
@@ -1237,6 +1237,38 @@ Page({
 		})
 	},
 
+	hide_u_ewm(){
+        this.setData({show_erm_u:0})
+	},
+	show_u_ewm(){
+		var th=this;
+
+		var getnowtime;
+		rq.get("/api/weshop/users/getServerTime", {
+			success: function (res) {
+				if (res.data.code == 0)
+				{
+					th.setData({show_erm_u:1})
+					getnowtime=res.data.data;
+					if (!getnowtime)
+					{
+						getApp().showWarning("获取服务时间失败");
+						return;
+					}
+					//base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+					var val = th.data.userInfo.mobile + "|" +getnowtime+"|"+th.data.getusercode_vailtime;
+					val = "^" + ut.base64_encode(val);
+
+					qrcode('qrcode', val, 350, 350, th);
+
+
+				}
+			}
+		})
+
+
+	}
+
 
 
 
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index a5ffb04..28bbf37 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -435,7 +435,7 @@
     <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
     <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
       <view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view>
-      <view class="modal-body" catchtouchmove="true">
+      <view class="modal-body {{show_erm_u?'':'low'}}  " catchtouchmove="true">
         <view class="modal-content">
           <view class="flex">
             <image src="{{userInfo.head_pic}}" class="hd_img"></image>
@@ -448,11 +448,24 @@
             </view>
           </view>
 
-          <view class="canvas_box">
-            <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
-            <canvas class="g_img" canvas-id="qrcode" />
+
+          <block wx:if="{{show_erm_u}}">
+            <view class="canvas_box">
+              <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
+              <canvas class="g_img" canvas-id="qrcode" />
+            </view>
+          </block>
+
+          <view style=" position: relative;top: -25rpx;">
+            <view wx:if="{{show_erm_u}}" catchtap="hide_u_ewm" class="fs24 flex ai-center jc-center" style="width: 100%;color: #898989;line-height: normal; ">
+              点击隐藏<text class="icon_yan icon-yanjing_yincang_o fs36"></text>
+            </view>
+            <view wx:else catchtap="show_u_ewm" class="fs24 flex ai-center jc-center" style="width: 100%;color: #898989; line-height: normal; ">
+              点击显示<text class="icon_yan icon-yanjing_xianshi_o fs36"></text>
+            </view>
           </view>
-          <view style="width: 100%;display: flex;justify-content: center;">
+
+          <view style="width: 100%;display: flex;justify-content: center; margin-top: 8rpx;" >
             <canvas class="barcode" style="width: 100%;height: 140rpx;" canvas-id="barcode" />
           </view>
           <view wx:if="{{showvipcode}}"  class="fs24" style="width: 100%;color: #898989;display: flex;text-align: center;align-content: center;justify-content: center;">
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 3c0992c..017b5d6 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -553,11 +553,15 @@
   background: #fff;
   /* margin-left: 73rpx; */
   width: 600rpx;
-  height: 860rpx;
+  height:860rpx;
   border-radius: 8px;
   text-align: center;
 }
 
+.modal-body.low{
+  height:600rpx;
+}
+
 .modal-content {
   width: 480rpx;
   margin: 0 auto;
@@ -784,4 +788,31 @@ button::after {
   align-items: center;
   justify-content: center;
   /* margin-top: 20rpx; */
-}
\ No newline at end of file
+
+  position: relative;top: -10rpx;
+}
+
+
+@font-face {
+  font-family: "iconfont_yan"; /* Project id 4449681 */
+  src: url('data:font/woff2;charset=utf-8;base64,d09GMgABAAAAAANUAA0AAAAAB4wAAAL+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGh4GYACCQhEICoJYgj4LDAABNgIkAxIEIAWFAgdQG38GyB6D424J0UpZYooBbRj+ksfDf2P97pt5s18lmcPpoknEknhJRJJ5pURKIorVLWF/8k/fFWKMLamk8Er8bJV3au6kCdLWTXPif+CcvCJMnkvmj2+Pokq7RgIdD3bMoCih64UOehC/MH1w3m4lM1lHIeC3CUcLwH9TUgD/bIRhzAJFqFJIFGSKFxrlWTkCnoP3R5ck+ilaxf8Lz7n74WWw/X30fWxI9AjqTwQCAEsQKirmILCfocAcI0tASkH3WE/3SD+9CxAQHQIQBQUAEMBLRU8BDQxiAE+AD4AEQGpDQwMj4w6OJvmk9yrt+rrvNvPmJqv3JuP2duA6/eoqo+9Sd9F7Rpz7957s6vZO+453iO2j0sBry1DODK6/bEGwYWlbwmG/ecakRRqB5EzuBJv6Helicpa7BMFXsZi/MnMbSSSVsstk+rTWrapglURr5h8V13LVe9MVDdOw6QQHe5ap9hFwBoc24h7lPhIFJ8Kprw4RzjHxR6kjcb74uSognogKm96bbHx6O0waqOCSev149g6kTa8g318RrJLE/eyNP9e5UO2pVq2z/mzCprlPUQ0fd1PCw6iGPxffn/XzAAJBefP7qdDW779/KHWS7dIRdaWsoF8BQcOOvZUAPqXcb4ZMQCK5LB1Cc4gxKBg0iB6ASS+AAFNYEAj9zkCg6PMAAlW/pwKkfl8EaIZ8E6Cj3w9AYNDO2A8IDJmKF6rIAWwAHQ3j/NBi1FW0GoeBRHrRZtYc2jFuHx10xde4IRvxEELVKlesXiOXISnRQlUohWlVtNWDA3t24GQH9hoQQnKeCxeUq9RArVgt+Jet2uDVQ9QrytWqo8glERMQgRVd/2KBKCpwdLBWudo6nlKnUSWJevUqkFSohWmQRCTxiXJqahhJtVqYUrlS9QTgMiCxrrFSUl9fsQZ0RWDtJG3iP4LdAA/Tp/nhZISEKlJ2C5TmacAC3aiIzI5x0hBaj0H8soZQokSdaCnWKhXaysJmRbG2rkpRiG1yi+ooLaZUDAAA') format('woff2'),
+  url('data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAU8AA0AAAAAB4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAFIAAAABoAAAAcohRq60dERUYAAAUAAAAAHgAAAB4AKQALT1MvMgAAAaAAAABGAAAAYEIBTpxjbWFwAAAB/AAAAEIAAAFCAA/veGdhc3AAAAT4AAAACAAAAAj//wADZ2x5ZgAAAkwAAAEsAAABWH3W0xtoZWFkAAABMAAAADAAAAA2JyyEpGhoZWEAAAFgAAAAHQAAACQHiQOFaG10eAAAAegAAAARAAAAEgxVAFVsb2NhAAACQAAAAAwAAAAMAEgArG1heHAAAAGAAAAAHgAAACABFABLbmFtZQAAA3gAAAFGAAACgl6CAQJwb3N0AAAEwAAAADYAAABQUf1A0HjaY2BkYGAAYqEpty7E89t8ZeBmYQCBR+wKdnA6lKGBeTXTaiCXg4EJJAoAB0UIyXjaY2BkYGBu+N/AEMPCAALMqxkYGVABCwBTpwMXAAAAeNpjYGRgYGBlsAdiEGACYi4gZGD4D+YzAAAPawFgAAB42mNgYWFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDAden3l9lrnhfwMDA/MdBiDJwIikRIGBEQCTww4iAAB42mNhgAAWCA5lCAUAAe4AtwAAAHjaY2BgYGaAYBkGRgYQsAHyGMF8FgYFIM0ChED+67P//wPJM///i5hDVTIwsjHAmAyMTECCiQEVMDIMewAAJFcIcgAAAAAAAAAAAAAASACseNotjzFLw0AUx9/LpYlIrVTTZJFD72yCBDrcpQ1UTUuhtQbqIHR1cUpNwbnTiZP9IF3yEbr6Ady6+xmci3fQB++/vN+D3x9smIMilaXgGFpAIQZA5rgURS/tIGFhlOGlHzQwEr0kZI7nB6yDSYaCotdAC1bb0Wj7Z2K13uX5Dj2Tay7ERAh+3WesPzVhzYuyLMzuY3WYyjATER8QHVDTPp9kY1VwCleQQB8ygHbqS+0TRqkx4U5krKQI3DAKubb1gwEaopt0DdPSYtwgqee2A4xwxh5y7Tl9ocXT4279/DMeasU7yc7O6xf6IIff9MjnAgltslvefCMTqWvTPbAN94vlu6CDD6Wc12Sh1AkjiItyJpvUFrxecx0a3Oie9pcc2+T+V39R+AdnzksMeNp9kM1Kw0AUhc/0T21BxILrWRVBSH+WpbtC3blwUddtOklbkkyYTAtdunXlA7j1MXwAn0Fw5YN4Gq8IFZqQyzfn3nNmJgAu8QmFn6eNa2GFU9wJV3CCWLhK/VG4Rn4RrqOFN+EG9Q/hJm7USLiFtnpmgqqdcdUp0/ascIGRcAXneBCuUrfCNfKTcB1XeBVuUH8XbmKKL+EWOmqJMRwMZvCsC2jMsWNdIWRuhqisHhg7M/Nmoec7vQptFtmM4r+pv9Y942JskDDacWniTTJzRy1HWlOmORQc2bc0+gjQo2xcsbKZ7ge9o/Zb2rMy4vCeBbY85oCqp1Hzc7SnpInEGF4hIWvkZW9NJaQeMNZkxv3+lWIbD7yPdORsqifc1iSJ1bmzaxN6Di/LPXIM0eUbHaQH5eFTjnmfD7vdSAKC0Kb4Bg9qcIcAAHjaY2BigAAuMMnIgA5YwaJMjEyMzIKViXlZmXnp8RWZiXnFGZnx+XCRysy85EQgnQ8ACQsOVgAAAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMABAABAAQAAAACAAAAAHjaY2BgYGQAgntsWnkg+hG7gh2MBgAurwQMAAA=') format('woff'),
+  url('iconfont.ttf?999') format('truetype');
+}
+.icon_yan{
+  font-family: "iconfont_yan" !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.icon-yanjing_xianshi_o:before {
+  content: "\ebcc";
+}
+.icon-yanjing_yincang_o:before {
+  content: "\ebcd";
+}
+
+.fs36{ font-size: 36rpx}
+
+
+
--
libgit2 0.21.4