From 9591e85ee823718841ae1f481559afd3f223f7d9 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 1 Sep 2021 10:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                     | 11 ++++++-----
 pages/index/index/index.vue |  1 -
 pages/shop/shopdetail.vue   | 21 ++++++++++++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/App.vue b/App.vue
index a152087..3042e2b 100644
--- a/App.vue
+++ b/App.vue
@@ -56,17 +56,18 @@ export default {
 </style>
 <style lang="scss" scoped>
 	// @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;
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 13ac6bc..3382572 100644
--- a/pages/index/index/index.vue
+++ b/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'">
diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue
index 2ced4f4..fbe5802 100644
--- a/pages/shop/shopdetail.vue
+++ b/pages/shop/shopdetail.vue
@@ -2,11 +2,17 @@
 	<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>
 		
@@ -22,6 +28,10 @@
 		height: 400rpx;
 		position: relative;
 	}
+	.shop-flex {
+		display: flex;
+		padding: 30rpx;
+	}
 	.shop-title {
 		width: 686rpx;
 		height: 274rpx;
@@ -32,4 +42,9 @@
 		position: relative;
 		top: -32rpx;
 	}
+	.shop-img {
+		width: 90rpx;
+		height: 90rpx;
+		margin-right: 15rpx;
+	}
 </style>