From dee069d02ee6da42b33a2a78323f10f127f8f5b1 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 30 Jun 2020 15:19:23 +0800
Subject: [PATCH] 二维码的显示的修改

---
 pages/user/index/index.js         |  4 ++--
 pages/user/index/index.wxml       |  4 ++--
 pages/user/userinfo/userinfo.js   | 11 +++++++++++
 pages/user/userinfo/userinfo.wxml |  2 +-
 pages/user/userinfo/userinfo.wxss |  6 ++++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 3e25205..89e2470 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -362,8 +362,8 @@ Page({
   show_tc: function() {
     if (!this.data.userInfo) return false;
     //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-    var val= this.data.userInfo.mobile+"|"+ut.formatTime();
-    val=ut.base64_encode(val);
+    var val=this.data.userInfo.mobile+"|"+ut.formatTime();
+    val="^"+ut.base64_encode(val);
 
     qrcode('qrcode', val, 480, 480, this);
     this.setData({
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 19479fc..3d6fa58 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -284,8 +284,8 @@
         <image src="{{userInfo.head_pic}}" class="hd_img"></image>
         <view class="ctent_txt">
           <view class='txt1'>{{userInfo.nickname}}
-            <image wx:if="{{userInfo.sex==2}}" class="arrow-right" src="{{iurl}}/miniapp/images/user/wum.png"></image>
-            <image wx:else class="arrow-right fu" src="{{iurl}}/miniapp/images/user/man.png"></image>
+            <image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image>
+            <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx"  src="{{iurl}}/miniapp/images/user/man.png"></image>
           </view>
           <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
         </view>
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index f13ab9a..3be9c02 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -17,6 +17,10 @@ var a = getApp(),
 
 var timestamp = Date.parse(new Date());
 var date = new Date(timestamp);
+const {
+  barcode,
+  qrcode
+} = require('../../../utils/index.js');
 
 Page({
   data: {
@@ -713,6 +717,13 @@ Page({
 
   //------卡片的显示和关闭--------
   show_tc: function() {
+    if (!getApp().globalData.userInfo) return false;
+    //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+    var val=getApp().globalData.userInfo.mobile+"|"+ut.formatTime();
+    val="^"+ut.base64_encode(val);
+
+    qrcode('qrcode', val, 480, 480, this);
+
     this.setData({
       tc_hide: false,
     });
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index b3a0389..6a949b3 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -254,7 +254,7 @@
         </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={{user.mobile}}'></image>
+        <canvas class="g_img" canvas-id="qrcode" />
       </view>
       <view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
     </view>
diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss
index 6b6da66..6b11ea0 100644
--- a/pages/user/userinfo/userinfo.wxss
+++ b/pages/user/userinfo/userinfo.wxss
@@ -246,9 +246,11 @@ input {
 }
 
 .arrow-right {
-  width: 30rpx;
-  height: 30rpx;
+  width: 35rpx;
+  height: 35rpx;
   margin-left: 10rpx;
+  position: relative;
+  top: 5rpx;
 }
 
 .code {
--
libgit2 0.21.4