合并

WXD-SEASON\season
2 parents 4ed1baf5 12166e3d
Showing 6 changed files with 58 additions and 21 deletions
packageG/pages/user/userinfo/userinfo.js
packageG/pages/user/userinfo/userinfo.wxml
packageG/pages/user/userinfo/userinfo.wxss
pages/user/index/index.js
pages/user/index/index.wxml
pages/user/index/index.wxss
@@ -5,7 +5,7 @@ function e(e, a, r) {
     configurable: !0,
     writable: !0
   }) : e[a] = r, e;
-} 
+}  
  
 var a = getApp(),
   r = a.globalData.setting,
@@ -76,7 +76,9 @@ Page({
     getusercode_vailtime:10,//会员二维码时效
  
     sele_ing:0,
-    set_isstcsp:0
+    set_isstcsp:0,
+    brcode:'',
+    showtext1:'点击可查看条形数据'
  
   },
   //通过路径跳转到其他页面
@@ -85,6 +87,11 @@ Page({
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
+  showtext:function(){
+    this.setData({
+      showtext1:this.data.brcode
+    })
+  },
   //获取配置信息
   get_config: function() {
     var th = this;
@@ -922,10 +929,12 @@ Page({
           //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
           var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
           val = "^" + ut.base64_encode(val);
-
-          qrcode('qrcode', val, 480, 480, that);
+          let userInfo = getApp().globalData.userInfo;
+          qrcode('qrcode', val, 350, 350, that);
+          barcode('barcode', userInfo.userQrcode, 480,140);
           that.setData({
             tc_hide: false,
+            brcode:userInfo.userQrcode
           });
         }
       }
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <view class="container">
  
-  <!-- 头像,昵称,多个卡 -->
+  <!-- 头像,昵称,多个卡 --> 
   <view class="head flex-space-between">
     <view class="flex-center">
  
@@ -310,10 +310,15 @@
           <view class='txt2' wx:if="{{user.address}}">{{user.address}}</view>
         </view>
       </view>
-      <view class="m_ta">
+      <view class="canvas_box">
         <canvas class="g_img" canvas-id="qrcode" />
       </view>
-      <view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
+      <view style="width: 100%;display: flex;justify-content: center;">
+      <canvas class="barcode" style="width: 100%;height: 140rpx;" canvas-id="barcode" />
+    </view>
+    <view catchtap="showtext" class="fs24" style="width: 100%;color: #898989;display: flex;text-align: center;align-content: center;justify-content: center;">
+      {{showtext1}}
+    </view>
     </view>
   </view>
 </view>
@@ -271,8 +271,8 @@ input {
 }
  
 .g_img {
-  width: 480rpx;
-  height: 480rpx;
+  width: 350rpx;
+  height: 350rpx;
 }
  
 .s_sao {
@@ -666,3 +666,9 @@ input {
 .lb_txt{
   color: red; font-size: 24rpx;
 }
+.canvas_box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* margin-top: 20rpx; */
+}
 \ No newline at end of file
@@ -47,13 +47,12 @@ Page({
 		add_card_data: '',  //等级卡的内容
 		getusercode_vailtime:10,//会员二维码时效
 		hiddenCS: true,
-
 		is_show_recommend:false,
-
 		has_rj:0,
 		rfmName:'成长值',
 		is_close_chuzhi:0,
-
+		brcode:'',
+		showtext1:'点击可查看条形数据',
 		pshow:0
  
 	},
@@ -604,7 +603,11 @@ Page({
 				url: "/packageD/pages/error/error?msg=还未购买小程序",
 			});
 	},
-
+  showtext:function(){
+    this.setData({
+      showtext1:this.data.brcode
+    })
+  },
 	/**
 	 * 页面上拉触底事件的处理函数
 	 */
@@ -663,9 +666,11 @@ Page({
           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);             
+          barcode('barcode', that.data.userInfo.userQrcode, 480,140);
           that.setData({
             tc_hide: false,
+            brcode:that.data.userInfo.userQrcode
           });
         }
       }
@@ -450,11 +450,17 @@
               <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
             </view>
           </view>
-          <view class="m_ta">
-            <!--<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>
-          <view class="s_sao">前台收银扫此二维码，即可享受优惠！</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" />
+      </view>
+      <view style="width: 100%;display: flex;justify-content: center;">
+      <canvas class="barcode" style="width: 100%;height: 140rpx;" canvas-id="barcode" />
+    </view>
+    <view catchtap="showtext" class="fs24" style="width: 100%;color: #898989;display: flex;text-align: center;align-content: center;justify-content: center;">
+      {{showtext1}}
+    </view>
         </view>
       </view>
     </view>
@@ -600,8 +600,8 @@
 }
  
 .g_img {
-  width: 480rpx;
-  height: 480rpx;
+  width: 350rpx;
+  height: 350rpx;
 }
  
 .s_sao {
@@ -778,4 +778,10 @@ button::after {
   width: 25rpx;
   height: 25rpx;
   margin-right: 5rpx;
+}
+.canvas_box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* margin-top: 20rpx; */
 }
 \ No newline at end of file