Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master

# Conflicts:
#	App.vue
#	pages/index/index/index.vue

App.vue

@@ -57,19 +57,21 @@ export default {
 <style>
 @import url("/components/gaoyia-parse/parse.css");
 </style>
+
 <style lang="scss" rel="stylesheet/scss">
 	@import "@/uview-ui/index.scss";
-	@import '@/common/styles/theme.css';
-	@import '@/common/styles/common.css';
-	@import '@/common/styles/main.css';
-	@import "@/common/styles/icon.css";
-	@import "@/common/styles/iconfont.css";
 </style>
 <style rel="stylesheet/less" lang="less">
 @import 'common/css/1px.wxss';
 @import 'common/css/font.css';
 @import "pages/index/index/index.less";
 @import "common/css/iconfont.css";
+@import '@/common/styles/theme.css';
+/*公共样式*/
+@import '@/common/styles/common.css';
+@import '@/common/styles/main.css';
+@import "@/common/styles/icon.css";
+@import "@/common/styles/iconfont.css";
 
 page {
     margin: 0;

pages/index/index/index.vue

@@ -7,7 +7,6 @@
 			    <image mode="widthFix" v-if="is_show_about" src="https://cdn.ibrand.cc/%E5%85%B3%E4%BA%8E.png"></image>
 			</view> -->
 			<!-- #endif -->
-		   <!-- <view @click="$url('/pages/shop/shopdetail')">测试跳转</view> -->
 		    <block v-if="microData && microData.pages && microData.pages.length">
 		        <view v-for="(item, index) in microData.pages" :key="index">
 		            <!-- <view v-if="item.name == 'micro_page_componet_search'">

pages/shop/shopdetail.vue

@@ -2,11 +2,31 @@
 	<view>
 		<lf-nav :spreadOut="false" :showIcon="true" baColor="rgba(0,0,0,0)"></lf-nav>
 		<view class="shop-head">
-			<image style="width: 100%;height: 100%;" src="http://k.zol-img.com.cn/dcbbs/16254/a16253094_01000.jpg" mode="aspectFill"></image>
+			<image class="lf-w-100 lf-h-100" src="http://k.zol-img.com.cn/dcbbs/16254/a16253094_01000.jpg" mode="aspectFill"></image>
 		</view>
 		<view class="shop-title">
-			<view>
-				
+			<view class="shop-flex">
+				<view class="shop-img">
+					<image class="shop-img" src="http://k.zol-img.com.cn/dcbbs/16254/a16253094_01000.jpg" mode="aspectFill"></image>
+				</view>
+				<view>
+					<view class="lf-color-black lf-font-36">AIMER MEN爱慕先生</view>
+					<view class="lf-font-24 lf-color-black">L2</view>
+				</view>
+			</view>
+			<view class="function-total">
+				<view>
+					<image class="shop-function" src="http://k.zol-img.com.cn/dcbbs/16254/a16253094_01000.jpg" mode="aspectFill"></image>
+					<view class="lf-font-24 lf-color-333">客服</view>
+				</view>
+				<view>
+					<image class="shop-function" src="http://k.zol-img.com.cn/dcbbs/16254/a16253094_01000.jpg" mode="aspectFill"></image>
+					<view class="lf-font-24 lf-color-333">收藏</view>
+				</view>
+				<view>
+					<image class="shop-function" src="http://k.zol-img.com.cn/dcbbs/16254/a16253094_01000.jpg" mode="aspectFill"></image>
+					<view class="lf-font-24 lf-color-333">分享</view>
+				</view>
 			</view>
 		</view>
 		
@@ -22,6 +42,10 @@
 		height: 400rpx;
 		position: relative;
 	}
+	.shop-flex {
+		display: flex;
+		padding: 30rpx;
+	}
 	.shop-title {
 		width: 686rpx;
 		height: 274rpx;
@@ -32,4 +56,19 @@
 		position: relative;
 		top: -32rpx;
 	}
+	.shop-img {
+		width: 90rpx;
+		height: 90rpx;
+		margin-right: 15rpx;
+	}
+	.shop-function {
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 50%;
+	}
+	.function-total {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 65rpx 0 65rpx;
+	}
 </style>