From 5669cd9b7bebc5ecd8586a88cc9cdbbdf9a7639b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 1 Sep 2021 11:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5uview=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                  |  4 ++--
 components/index-banner/index-banner.vue |  2 ++
 components/lf-adModal/lf-adModal.vue     | 22 +++++++++++++++++++---
 components/lf-nav/lf-nav.vue             |  5 +++--
 main.js                                  |  3 ++-
 pages.json                               |  3 +++
 pages/index/index/index.vue              | 21 ++++++++++++++-------
 uni.scss                                 |  3 +++
 8 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/App.vue b/App.vue
index d3de672..2be320f 100644
--- a/App.vue
+++ b/App.vue
@@ -57,8 +57,8 @@ export default {
 <style>
 @import url("/components/gaoyia-parse/parse.css");
 </style>
-<style lang="scss" scoped>
-	// @import "@/uview-ui/index.scss";
+<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';
diff --git a/components/index-banner/index-banner.vue b/components/index-banner/index-banner.vue
index 0937a8e..94ef4aa 100644
--- a/components/index-banner/index-banner.vue
+++ b/components/index-banner/index-banner.vue
@@ -104,6 +104,7 @@ export default {
 <!-- 复制之前的less放进来就可以 -->
 <style lang="less">
 	.index-banner{
+		height: 900rpx;
   //margin-bottom: 10px;
   .banner-title{
     padding: 10px 15px 10px 15px;
@@ -136,6 +137,7 @@ export default {
     background: #FFFFFF;
     image {
       width: 100%;
+	  height: 100%;
       object-fit: cover;
 
     }
diff --git a/components/lf-adModal/lf-adModal.vue b/components/lf-adModal/lf-adModal.vue
index 23327fe..58c3fbe 100644
--- a/components/lf-adModal/lf-adModal.vue
+++ b/components/lf-adModal/lf-adModal.vue
@@ -1,7 +1,14 @@
 <template>
 	<view class="content" v-if="value">
 		<view class="box">
-			<image class="img" src="https://picsum.photos/200" mode="aspectFill" @click="clickAd"></image>
+			<swiper class="swiper" :circular="true" 
+				indicator-active-color="#0091ff" 
+				:current="current" 
+				:indicator-dots="list.length > 1">
+				<swiper-item v-for="(item, index) in list" :key="index">
+					<image class="img" :src="item" mode="aspectFill" @click="clickAd"></image>
+				</swiper-item>
+			</swiper>
 			<view class="close" @click="close">
 				<text class="lf-iconfont icon-shanchu"></text>
 			</view>
@@ -17,6 +24,11 @@
 				default: true
 			}
 		},
+		data(){
+			return {
+				list: ['https://picsum.photos/200', 'https://picsum.photos/200']
+			}
+		},
 		created(){
 			
 		},
@@ -41,13 +53,17 @@
 		position: fixed;
 		left: 0;
 		top: 0;
+		z-index: 99;
 		.box{
 			width: 600rpx;
 			height: max-content;
-			.img{
+			.swiper{
 				width: 600rpx;
 				height: 840rpx;
-				border: 1rpx solid #979797;
+				.img{
+					width: 100%;
+					height: 100%;
+				}
 			}
 			.close{
 				width: 70rpx;
diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index 6d3d12b..b444854 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view :style="{marginBottom: spreadOut ? headHeight + 'px' : '0px'}">
-			<view :class="{head: true, 'border-b': boderBottom}" :style="{height: headHeight + 'px', background: baColor}">
+			<view :class="{head: true, 'border-b': boderBottom}" :style="{height: headHeight + 'px', background: bgColor}">
 			 <block v-if="diy">
 				 <view class="diy-head" :style="{'top': headHeight - 38 + 'px'}">
 					 <slot></slot>
@@ -33,7 +33,7 @@
 				type: Boolean, // 是否显示左侧操作菜单
 				default: false
 			},
-			baColor: {
+			bgColor: {
 				type: String, // head背景颜色
 				default: '#f8f8f8'
 			},
@@ -136,6 +136,7 @@
   top: 0;
   left: 0;
   z-index: 99999;
+  transition: all .2;
 }
 .head .head-nav{
   position: absolute;
diff --git a/main.js b/main.js
index de8d9b0..aed3983 100644
--- a/main.js
+++ b/main.js
@@ -16,7 +16,8 @@ if(wechat.isWechat()){
 import config from './common/js/config.js'  
 import store from '@/store/index.js';
 Vue.config.productionTip = false
-
+import uView from 'uview-ui';
+Vue.use(uView);
 Vue.prototype.$shared = $shared;
 Vue.prototype.$http = sandBox;
 Vue.prototype.$cookieStorage = cookieStorage;
diff --git a/pages.json b/pages.json
index 13971d9..f4c3e7e 100644
--- a/pages.json
+++ b/pages.json
@@ -1,4 +1,7 @@
 {
+	"easycom": {
+		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index/index",
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index a2dc277..fcac991 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -1,17 +1,16 @@
 <template>
     <block v-if="microData && microData.micro_page && microData.micro_page.meta">
-		<lf-nav title="主页"></lf-nav>
+		<lf-nav title="主页" :spreadOut="false" :bgColor="nav_bg_color"></lf-nav>
 		<view id="microData" :style="{background: microData.micro_page.meta.background_color}">
 			<!-- #ifdef MP-WEIXIN -->
 		<!-- 	<view class="about-program" @tap="changeAbout" v-if="is_show_init">
 			    <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>
+		   <!-- <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'">
-		                <!--搜索按钮-->
+		            <!-- <view v-if="item.name == 'micro_page_componet_search'">
 		                <view class="banner">
 		                    <view class="search">
 		                        <div class="menu-box" @tap="jumpMenu"><i class="iconfont icon-fenzu"></i></div>
@@ -21,7 +20,7 @@
 		                        </view>
 		                    </view>
 		                </view>
-		            </view>
+		            </view> -->
 		            <!--轮播图组件-->
 		            <view v-if="item.name == 'micro_page_componet_slide' && item.value && item.value.length">
 					
@@ -387,8 +386,8 @@
                 userInfo: '',
                 microData:"",
 				is_login:'',// 是否是登陆状态
-				show_ad: true
-					
+				show_ad: true, // 是否显示ad广告
+				nav_bg_color: 'transparent' // 导航背景颜色
             };
         },
         // 注册组件
@@ -462,6 +461,14 @@
             this.init(e);
            
         },
+		// 页面滚动
+		onPageScroll(event){
+			if(event.scrollTop >= 100){
+				this.nav_bg_color = '#ffffff';
+			}else{
+				this.nav_bg_color = 'transparent';
+			}
+		},
 		//下拉刷新
 		onPullDownRefresh(){
 			 wx.showLoading();
diff --git a/uni.scss b/uni.scss
index f0f426c..e5493c1 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,3 +1,4 @@
+@import '@/uview-ui/theme.scss';
 /**
  * 这里是uni-app内置的常用样式变量
  *
@@ -14,6 +15,8 @@
 
 /* 颜色变量 */
 
+
+
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;