Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/konggang-city-miniprogram

# Conflicts:
#	pages/supply/index.vue

pages/supply/index.vue

@@ -8,7 +8,7 @@
         range-key="name"
         class="picker_self"
       >
-        <view class="picker_title active" style="padding-left: 15%">
+        <view class="picker_title active" style="padding-left: 15%;">
           {{ picker_title }}
         </view>
       </picker>
@@ -173,7 +173,6 @@ export default {
       height: 100%;
       display: flex;
       justify-content: flex-start;
-	  
     }
   }
   .picker::after {