From a79b8fa74e7fc670b3383f4cb6b9510be787e48c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 7 Oct 2024 21:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/navbar.vue |  18 +++---
 components/base/tabbar.vue |  18 ++----
 main.js                    |  10 +++-
 pages.json                 |  12 ++++
 pages/index/activity.vue   |  27 +++++++++
 pages/index/center.vue     | 144 +--------------------------------------------
 pages/index/index.vue      | 109 +---------------------------------
 pages/index/message.vue    |  27 +++++++++
 8 files changed, 95 insertions(+), 270 deletions(-)
 create mode 100644 pages/index/activity.vue
 create mode 100644 pages/index/message.vue

diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index a7526b9..909f33c 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="navbar"
-	:style="{backgroundColor : bgColor}">
+<!-- 	<view class="navbar"
+	:style="{backgroundColor : bgColor}"> -->
 		<view class="title"
 		:style="{backgroundColor : bgColor}">
 			<view class="left">
@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		
-	</view>
+	<!-- </view> -->
 </template>
 
 <script>
@@ -81,13 +81,13 @@
 
 
 <style lang="scss" scoped>
-.navbar{
-	width: 100%;
-	height: 120rpx;
-	padding-top: var(--status-bar-height);
-}
+// .navbar{
+// 	width: 100%;
+// 	height: 120rpx;
+// 	padding-top: var(--status-bar-height);
+// }
 .title{
-	position: fixed;
+	position: sticky;
 	top: 0;
 	left: 0;
 	padding-top: calc(var(--status-bar-height) + 20rpx);
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 732e9ef..f9b64f8 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -38,31 +38,23 @@
 						"pagePath": "/pages/index/index",
 						"title": "首页"
 					},
-					{
-						"selectedIconPath": "/static/image/tabbar/category-a.png",
-						"iconPath": "/static/image/tabbar/category.png",
-						"pagePath": "/pages/index/category",
-						"title": "分类",
-						isNotShop : true,
-					},
 					{
 						"selectedIconPath": "/static/image/tabbar/order-a.png",
 						"iconPath": "/static/image/tabbar/order.png",
-						"pagePath": "/pages/index/order",
-						"title": "订单中心"
+						"pagePath": "/pages/index/activity",
+						"title": "活动"
 					},
 					{
 						"selectedIconPath": "/static/image/tabbar/cart-a.png",
 						"iconPath": "/static/image/tabbar/cart.png",
-						"pagePath": "/pages/index/cart",
-						"title": "购物车",
-						isNotShop : true,
+						"pagePath": "/pages/index/message",
+						"title": "消息",
 					},
 					{
 						"selectedIconPath": "/static/image/tabbar/center-a.png",
 						"iconPath": "/static/image/tabbar/center.png",
 						"pagePath": "/pages/index/center",
-						"title": "个人中心"
+						"title": "我的"
 					}
 				]
 			};
diff --git a/main.js b/main.js
index 84751ca..c589c46 100644
--- a/main.js
+++ b/main.js
@@ -14,18 +14,26 @@ import store from '@/store/store'
 import './config'
 import './utils/index.js'
 
+
+
 //组件注册
 import configPopup from '@/components/config/configPopup.vue'
 import navbar from '@/components/base/navbar.vue'
+import tabbar from '@/components/base/tabbar.vue'
 
 Vue.component('configPopup',configPopup)
-Vue.component('navbar',navbar)
+Vue.component('navbar', navbar)
+Vue.component('tabbar', tabbar)
+
 
 const app = new Vue({
 	...App,
 	store,
 })
 app.$mount()
+
+
+
 // #endif
 
 // #ifdef VUE3
diff --git a/pages.json b/pages.json
index e8910a4..bf341ff 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,18 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/index/activity",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/index/message",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/index/category",
 			"style": {
diff --git a/pages/index/activity.vue b/pages/index/activity.vue
new file mode 100644
index 0000000..78913b6
--- /dev/null
+++ b/pages/index/activity.vue
@@ -0,0 +1,27 @@
+<template>
+	<view class="page">
+		
+		<tabber select="1" />
+	</view>
+</template>
+
+<script>
+	import tabber from '@/components/base/tabbar.vue'
+	export default {
+		components : {
+			tabber
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/index/center.vue b/pages/index/center.vue
index bb528c3..6242ebf 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -1,147 +1,9 @@
 <template>
 	<view class="page">
 
-		<navbar title="个人中心" />
-
-		<view class="head">
-			<view class="headImage">
-				<image src="" mode=""></image>
-			</view>
-			<view class="info">
-				<view class="name">
-					倾心.
-				</view>
-				<!-- <view class="vip">
-					VIP1
-				</view> -->
-				<view class="tips">
-					今天是您来的的第32天
-				</view>
-			</view>
-			<view class="headBtn" @click="headBtn">
-				角色切换
-			</view>
-			<view class="setting">
-				<uv-icon name="setting" size="40rpx"></uv-icon>
-			</view>
-		</view>
-
-		<!-- 水洗店 -->
-		<view class="userShop" v-if="userShop">
-			<userShopCommission />
-			<view class="userList">
-				<view class="title">
-					我的用户
-				</view>
-				<view class="list">
-					<view class="item" v-for="(item, index) in 20" :key="index">
-						<view class="name">
-							客户：王生
-						</view>
-						<view class="num">
-							剩余水洗布：198
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 酒店 -->
-		<view class="user" v-else>
-			<view class="line">
-				<view class="item">
-					<view class="image">
-						<image src="/static/image/center/1.png" mode=""></image>
-					</view>
-					<view class="">
-						余额￥3000
-					</view>
-				</view>
-				<view class="item">
-					<view class="image">
-						<image src="/static/image/center/4.png" mode=""></image>
-					</view>
-					<view class="">
-						押金￥30000
-					</view>
-				</view>
-			</view>
-			<view class="line grid">
-				<view class="title">
-					常用功能
-				</view>
-				<uv-grid :col="4" :border="false">
-
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/address')">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
-						<text class="grid-text">地址管理</text>
-					</uv-grid-item>
-
-					<uv-grid-item @click="$utils.redirectTo('/index/order')">
-						<image class="image" src="/static/image/center/8.png" mode=""></image>
-						<text class="grid-text">订单管理</text>
-					</uv-grid-item>
-
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+0)">
-						<image class="image" src="/static/image/center/5.png" mode=""></image>
-						<text class="grid-text">换货</text>
-					</uv-grid-item>
-
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+1)">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
-						<text class="grid-text">退货</text>
-					</uv-grid-item>
-				</uv-grid>
-			</view>
-			<view class="line grid">
-				<uv-grid :col="4" :border="false">
-
-					<uv-grid-item @click="contactUs">
-						<image class="image" src="/static/image/center/9.png" mode=""></image>
-						<text class="grid-text">联系客服</text>
-					</uv-grid-item>
-
-					<uv-grid-item>
-						<image class="image" src="/static/image/center/6.png" mode=""></image>
-						<text class="grid-text">我的租赁</text>
-					</uv-grid-item>
-
-					<uv-grid-item @click="$utils.redirectTo('/index/cart')">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
-						<text class="grid-text">租赁车</text>
-					</uv-grid-item>
-
-					<uv-grid-item
-						@click="$utils.navigateTo('/pages_order/auth/loginAndRegisterAndForgetPassword?index='+2)">
-						<image class="image" src="/static/image/center/7.png" mode=""></image>
-						<text class="grid-text">申请成为水洗店</text>
-					</uv-grid-item>
-				</uv-grid>
-			</view>
-		</view>
-
-		<!-- 联系客服弹框 -->
-		<uv-overlay :show="show" @click="show = false">
-			<view class="warp">
-				<view class="rect" @tap.stop>
-					<view class="title">联系客服</view>
-					<view class="center">确定拨打客服电话?</view>
-					<view class="bottom">
-						<view>
-							<uv-button type="info" shape="circle" text="取消" :custom-style="customStyle1"
-								@click="cancle"></uv-button>
-						</view>
-						<view>
-							<uv-button type="info" shape="circle" text="确定" :custom-style="customStyle2"
-								@click="confirm"></uv-button>
-						</view>
-					</view>
-				</view>
-			</view>
-		</uv-overlay>
-
-
-		<tabber select="4" />
+
+
+		<tabber select="3" />
 	</view>
 </template>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dc9e069..1f06831 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,112 +1,9 @@
 <template>
 	<view class="page">
 		
-		<navbar/>
-		
-		<view class="search">
-		
-			<view @click="showSelectArea" class="left-area">
-				<image src="@/static/image/home/address-icon.png"></image>
-				<view class="area">{{ area }}</view>
-				<image src="@/static/image/home/arrow-icon.png" mode="aspectFit"></image>
-				<view class="parting-line">|</view>
-			</view>
-		
-			<view class="center-area">
-				<image 
-				style="margin-right: 20rpx;"
-				src="@/static/image/home/search-icon.png"></image>
-				<input v-model="queryParams.title" 
-				placeholder="桌布租赁" />
-			</view>
-		
-			<!-- <view class="right-area">
-				<view @click="searchAddress" class="search-button">
-					搜索
-				</view>
-			</view> -->
-		
-		</view>
-		
-		<view class="swipe">
-			<uv-swiper 
-			:list="bannerList" 
-			indicator
-			height="320rpx"
-			keyName="url"></uv-swiper>
-		</view>
-		
-		<!-- 水洗店 -->
-		<view class="userShop"
-		v-if="userShop">
-			<view class="list">
-				<view class="item"
-				v-for="(item, index) in 4"
-				:key="index">
-					<view class="">
-						<view class="">
-							我的客户
-						</view>
-						<view class="num">
-							{{ 30 }}
-						</view>
-					</view>
-					<view class="">
-						<image :src="`/static/image/home/${index}.png`" mode=""></image>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 酒店 -->
-		<view class="user"
-		v-else>
-			<uv-notice-bar 
-			fontSize="28rpx"
-			:text="text"></uv-notice-bar>
-			
-			<view class="shop">
-				<image 
-				class="image"
-				src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg" 
-				mode=""></image>
-				<view class="shopInfo">
-					<view class="title">
-						HOUS水洗店
-					</view>
-					<view class="tags">
-						<view class="tag">
-							桌布水洗
-						</view>
-						<view class="tag">
-							桌布租赁
-						</view>
-					</view>
-					<view class="time">
-						9:00-18:00
-					</view>
-					<view class="address">
-						长沙市天心区桂花坪街道231号
-					</view>
-				</view>
-				<view class="btns">
-					<view class="btn"
-					@click="$utils.navigateTo('/pages_order/auth/wxUserInfo')">
-						我要水洗
-					</view>
-				</view>
-				
-				<view class="tips">
-					关联门店：主信门店
-				</view>
-			</view>
-			
-			<view class="productList">
-				<productList/>
-			</view>
-		</view>
-		
-		<!-- <selectArea ref="selectArea" @close="closeAreaPro" @select="selectArea"></selectArea> -->
+		<image src="https://cdn.uviewui.com/uview/swiper/swiper3.png" 
+		style="w100p"
+		mode="widthFix"></image>
 		
 		<PrivacyAgreementPoup/>
 		
diff --git a/pages/index/message.vue b/pages/index/message.vue
new file mode 100644
index 0000000..8a79a1a
--- /dev/null
+++ b/pages/index/message.vue
@@ -0,0 +1,27 @@
+<template>
+	<view class="page">
+		
+		<tabber select="2" />
+	</view>
+</template>
+
+<script>
+	import tabber from '@/components/base/tabbar.vue'
+	export default {
+		components : {
+			tabber
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>