add to local

pages/components/blockItem/blockItem.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "auth2": "/pages/components/auth2/auth2"
+    "auth2": "/pages/components/auth2/auth2",
+    "wxbutton": "/pages/components/wxbutton/wxbutton"
   }
 }

pages/components/blockItem/blockItem.wxml

@@ -44,14 +44,10 @@
 </block>
 
 <block wx:elif="{{item_data.show_type == 'wxbutton'}}">
-<!-- <<<<<<< HEAD
-  <button style="background-image:url({{item_data.image}});width:100%;height:{{(item_data.height/1080*750)+'rpx'}}"
-            open-type="getUserInfo"
-            bindgetuserinfo="userInfoHandler">
-  </button>
-======= -->
-   <view bindtap="handleAuth">
+  <wxbutton item_data="{{item_data}}"></wxbutton>
+  <!--  -->
+
+   <!-- <view bindtap="handleAuth">
     <auth2 bind:getAuth="getAuth" item_data="{{item_data}}"></auth2>
-   </view>
-<!-- >>>>>>> a49f2d3af0110e238df86657a2c26d74186d9798 -->
+   </view> -->
 </block>