Merge branch 'master' of http://175.178.51.79:3000/Augcl/houserent-front

# Conflicts:
#	App.vue

pages_subpack/detail/index.vue

@@ -13,8 +13,6 @@
 				</view>
 			</view>
 			<view class="se-pr-30 se-flex se-flex-v-c">
-				
-				
 				<button style="justify-content: center;" class="se-w-140 se-flex se-flex-ai-c se-h-60 se-lh-60 se-fs-22 se-bgc-green se-c-white se-py-0 se-br-30 se-px-20 se-m-0" open-type="share">
 					<uv-icon name="share" color="#fff"></uv-icon>
 					<text class="se-fs-20 se-pl-5">分享</text>