Merge branch 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program

* 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program:
  add special_list;  del homeTwo class

# Conflicts:
#	pages/components/blocks/home2/homeTwo.wxml

app.js

@@ -1,6 +1,6 @@
 //app.js
 App({
-  host:"https://a.lrlz.com/mobile/index.php",
+  host:"https://passport.lrlz.com/mobile/index.php",
   onLaunch: function () {
     let self = this;
     // 登录

config.js

@@ -1,5 +1,5 @@
 
-let api = "https://a.lrlz.com/mobile/index.php"
+let api = "https://passport.lrlz.com/mobile/index.php"
 
 
 function getReq(data, callback, fail) {

pages/components/blocks/home2/homeTwo.wxml

@@ -1,6 +1,11 @@
 <!--pages/components/blocks/home2/homeTwo.wxml-->
-<view style='display:flex;'>
-    <view style='flex:1;'>
+
+<!-- <view style='display:flex;'>
+    <view style='flex:1;'> -->
+
+<!-- <view style='display:flex;'>
+    <view style='flex:1;' class='flex-1px-r'>
+>>>>>>> d8d588a22a59845c7e14ed7e271a4ad456246a4f
         <blockItem item_data="{{items[0]}}"></blockItem>
     </view>
     <view style='display:flex;flex:1;flex-direction:column;'>
@@ -11,4 +16,18 @@
         <blockItem item_data="{{items[2]}}"></blockItem>
       </view>
     </view>
+</view> -->
+
+<view style='display:flex;'>
+    <view style='flex:1;' class=''>
+        <blockItem item_data="{{items[0]}}"></blockItem>
+    </view>
+    <view style='display:flex;flex:1;flex-direction:column;'>
+      <view style='flex:1;' class=''>
+        <blockItem item_data="{{items[1]}}"></blockItem>
+      </view>
+      <view style='flex:1;'>
+        <blockItem item_data="{{items[2]}}"></blockItem>
+      </view>
+    </view>
 </view>