优化

前端开发-罗建龙
1 parent 8bf0550d
Showing 7 changed files with 52 additions and 35 deletions
components/diy_user_info/diy_user_info.js
components/diy_user_info/diy_user_info.wxml
components/diy_user_info/diy_user_info.wxss
packageG/pages/user/userinfo/userinfo.js
packageG/pages/user/userinfo/userinfo.wxml
pages/user/index/index.wxml
pages/user/index/index.wxss
 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({
@@ -73,11 +73,16 @@
                     <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
                 </view>
             </view>
-            <view class="m_ta">
+            <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 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>
 \ No newline at end of file
@@ -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; */
+}
@@ -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);
@@ -309,7 +309,7 @@
           </view>
           <view class='txt2' wx:if="{{user.address}}">{{user.address}}</view>
         </view>
-      </view>
+      </view> 
       <view class="canvas_box">
         <canvas class="g_img" canvas-id="qrcode" />
       </view>
@@ -318,7 +318,7 @@
     </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>
 </view>
@@ -22,22 +22,19 @@
         </block>
         <!-- 会员信息 -->
         <block wx:if="{{item.ename=='userinfo'}}">
-          <diy_user_info object="{{item.content}}"
-                         byquan="{{byquan}}" yuer="{{yuer}}" udata="{{udata}}"
-                         qy_data="{{qy_data}}" pulscardname="{{pulscardname}}"  rfmName="{{rfmName}}" ></diy_user_info>
+          <diy_user_info object="{{item.content}}" byquan="{{byquan}}" yuer="{{yuer}}" udata="{{udata}}" qy_data="{{qy_data}}" pulscardname="{{pulscardname}}" rfmName="{{rfmName}}"></diy_user_info>
         </block>
         <!-- 我的订单 -->
         <block wx:if="{{item.ename=='order'}}">
-          <diy_user_order object="{{item.content}}" toji="{{toji}}" ></diy_user_order>
+          <diy_user_order object="{{item.content}}" toji="{{toji}}"></diy_user_order>
         </block>
         <!-- 我的权益 -->
         <block wx:if="{{item.ename=='my_rights'}}">
-          <diy_user_my_rights object="{{item.content}}"  qy_data="{{qy_data}}" b_gift="{{b_gift}}" ></diy_user_my_rights>
+          <diy_user_my_rights object="{{item.content}}" qy_data="{{qy_data}}" b_gift="{{b_gift}}"></diy_user_my_rights>
         </block>
         <!-- 工具与服务 -->
         <block wx:if="{{item.ename=='tools_services'}}">
-          <diy_user_tools_services object="{{item.content}}"  is_dengji="{{is_dengji}}"  qy_data="{{qy_data}}"
-                                   enableMeiye="{{enableMeiye}}"   f_user_tool="{{user_tool}}"  c_list="{{c_list}}"></diy_user_tools_services>
+          <diy_user_tools_services object="{{item.content}}" is_dengji="{{is_dengji}}" qy_data="{{qy_data}}" enableMeiye="{{enableMeiye}}" f_user_tool="{{user_tool}}" c_list="{{c_list}}"></diy_user_tools_services>
         </block>
  
       </view>
@@ -87,7 +84,7 @@
                 <view style="position:relative;">
                   <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
                   <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 }}">
-                    <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax">
+                    <view data-url="/pages/user/plus/plus" catchtap="goto" class="flex-center plusMax">
                       <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                       <view>{{pulscardname}}</view>
                     </view>
@@ -108,12 +105,12 @@
                   <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
                     <block wx:if="{{cz_val<full_cz_val}}">
                       {{" "}}
-                      <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
+                      <text class="grow-up-val" style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
                       <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
                     </block>
                     <block wx:else>
                       {{" "}}
-                      <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
+                      <text class="grow-up-val" style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
                     </block>
                   </view>
                 </view>
@@ -450,24 +447,24 @@
               <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
             </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" />
-      </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 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>
  
     <pop_txt id="pop_txt"></pop_txt>
-    <include src="../../../components/com_servicer/com_servicer.wxml"/>
+    <include src="../../../components/com_servicer/com_servicer.wxml" />
  
   </block>
  
 -</block>
+</block>
 \ No newline at end of file
@@ -597,7 +597,7 @@
  
 .m_ta {
   margin-top: 50rpx;
-}
+} 
  
 .g_img {
   width: 350rpx;