From e860bc0481affba5ee44a68224729b575d8de712 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 4 Jul 2022 16:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8E=89=E6=9C=AC=E6=AC=A1?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E7=BA=BF=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/home.vue             |  8 ++--
 pages/index/index.vue            | 12 +++---
 pages/index/my-home.vue          | 65 ++++++++++++++++++--------------
 pages/product/product-detail.vue | 45 ++++++++++++++--------
 4 files changed, 75 insertions(+), 55 deletions(-)

diff --git a/pages/index/home.vue b/pages/index/home.vue
index 71959ad..41cdca6 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -54,9 +54,9 @@
 				<view class="cu-item" v-for="(item,index) in subCategories" :key="index" v-if="index < 5"
 					@click="chooseCategory(item)">
 					<view class="hot-sub-category-icon" :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-						<view class="cu-tag badge" v-if="item.badge!=0">
+						<!-- <view class="cu-tag badge" v-if="item.badge!=0">
 							<block v-if="item.badge!=1">{{item.badge}}</block>
-						</view>
+						</view> -->
 					</view>
 					<text>{{item.goodsCategoryName}}</text>
 				</view>
@@ -66,9 +66,9 @@
 				<view class="cu-item" v-for="(item,index) in subCategories" :key="index"
 					v-if="index < subCategories.length && index > 4" @click="chooseCategory(item)">
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-						<view class="cu-tag badge" v-if="item.badge!=0">
+						<!-- <view class="cu-tag badge" v-if="item.badge!=0">
 							<block v-if="item.badge!=1">{{item.badge}}</block>
-						</view>
+						</view> -->
 					</view>
 					<text>{{item.goodsCategoryName}}</text>
 				</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5cfc177..494d07d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,7 +24,7 @@
 							<view>公司、家居家政雇佣上门服务</view>
 						</view>
 					</view>
-					<view class="flex justify-start margin-tb-xl">
+					<!-- <view class="flex justify-start margin-tb-xl">
 						<view class="cu-avatar round middle-avatar second-avatar">
 							<view class="cuIcon-cameraaddfill"></view>
 						</view>
@@ -33,8 +33,8 @@
 							<view class="text-gray">30s发布宝贝</view>
 							<view class="text-sm">手机/家电卖出/非上门类</view>
 						</view>
-					</view>
-					<view class="flex justify-start margin-tb-xl">
+					</view> -->
+					<!-- <view class="flex justify-start margin-tb-xl">
 						<view class="cu-avatar round middle-avatar third-avatar">
 							<view class="cuIcon-footprint"></view>
 						</view>
@@ -42,8 +42,8 @@
 							<view class="text-xl">社区跑腿</view>
 							<view>同楼盘跑腿服务</view>
 						</view>
-					</view>
-					<view class="flex justify-start margin-tb-xl">
+					</view> -->
+					<!-- <view class="flex justify-start margin-tb-xl">
 						<view class="cu-avatar round middle-avatar fourth-avatar">
 							<view class="cuIcon-shopfill"></view>
 						</view>
@@ -51,7 +51,7 @@
 							<view class="text-xl">品牌厂商发布</view>
 							<view>销售商电商雇佣</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="cu-bar tabbar margin-bottom-xl fixed-bottom-bar">
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index b94f973..6aee92c 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<!-- 顶部头像栏 -->
-		<view class="padding bg-main-color" :style="'padding-top: ' + pageContentTop + 'px; padding-bottom: 100rpx;'">
-			<view class="flex justify-start padding-bottom-xl solid-bottom">
+		<view class="padding bg-gradual-color" :style="'padding-top: ' + pageContentTop + 'px; padding-bottom: 100rpx;'">
+			<view class="flex justify-start padding-bottom-xl">
 				<view class="cu-avatar round"
 					:style="'width: 120rpx; height: 120rpx; background-image:url(' + curUserInfo.customerLogoUrl  + ');'"></view>
 				<view class="margin-lr-sm">
@@ -14,7 +14,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-bar">
+			<!-- <view class="cu-bar">
 				<view class="action bar-first-action"><text class="margin-right-sm">余额:</text><text>{{myInfo.balance}}</text></view>
 				<view class="action"><text class="margin-right-sm">积分:</text><text>{{myInfo.integrate}}</text></view>
 				<view class="action" @click="showCart">
@@ -23,11 +23,11 @@
 						<text class="cu-tag badge my-cart-badge" v-if="myInfo.cartNum > 0">{{myInfo.cartNum}}</text>
 					</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="margin-lr-sm paper-drawer-bar margin-bottom-with-bar">
 			<!-- 服务圈 -->
-			<view class="bg-white padding-lr shadow-warp">
+			<!-- <view class="bg-white padding-lr shadow-warp">
 				<view class="cu-bar margin-top-sm solid-bottom">
 					<view class="action bar-first-action">
 						<text>{{myInfo.servCircle.name}}</text>
@@ -61,7 +61,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="bg-white padding-lr padding-bottom">
 				<!-- 服务订单 -->
 				<view class="cu-bar solid-bottom margin-top-sm">
@@ -120,7 +120,7 @@
 								<block>{{myInfo.serOrderNum.afterServ}}</block>
 							</view>
 						</view>
-						<text>完成待确认</text>
+						<text>待确认</text>
 					</view>
 					<view class="cu-item" @click="showMyOrders(servOrderTabList, 6, servOrderType)">
 						<view class="cuIcon-forward">
@@ -132,7 +132,7 @@
 					</view>
 				</view>
 				<!-- 商品订单 -->
-				<view class="cu-bar solid-bottom">
+				<!-- <view class="cu-bar solid-bottom">
 					<view class="action bar-first-action">
 						<text class="cuIcon-titles text-main-color"></text> 商品订单
 					</view>
@@ -182,7 +182,7 @@
 						</view>
 						<text>待转发</text>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			<!-- 所有功能 -->
 			<view class="bg-white padding-lr padding-bottom">
@@ -193,42 +193,42 @@
 					</view>
 				</view>
 				<view class="cu-list grid no-border col-4">
-					<view class="cu-item">
+					<!-- <view class="cu-item" @click="showPage(null)">
 						<view class="cuIcon-wefill text-red"></view>
 						<text>我的发布</text>
-					</view>
+					</view> -->
 					<view class="cu-item" @click="showMyAddress">
 						<view class="cuIcon-locationfill text-orange"></view>
 						<text>地址管理</text>
 					</view>
-					<view class="cu-item">
+					<!-- <view class="cu-item">
 						<view class="cuIcon-questionfill text-yellow"></view>
 						<text>常见问题</text>
-					</view>
-					<view class="cu-item">
+					</view> -->
+					<!-- <view class="cu-item">
 						<view class="cuIcon-servicefill text-olive"></view>
 						<text>联系客服</text>
-					</view>
-					<view class="cu-item">
+					</view> -->
+					<!-- <view class="cu-item">
 						<view class="cuIcon-qr_code text-green"></view>
 						<text>二维码分享</text>
-					</view>
-					<view class="cu-item" @click="showPage('/pages/my/my-money-bag')">
+					</view> -->
+					<!-- <view class="cu-item">
 						<view class="cuIcon-moneybagfill text-cyan"></view>
 						<text>钱包</text>
-					</view>
-					<view class="cu-item">
+					</view> -->
+					<!-- <view class="cu-item">
 						<view class="cuIcon-friendaddfill text-blue"></view>
 						<text>加盟项目</text>
-					</view>
-					<view class="cu-item">
+					</view> -->
+					<!-- <view class="cu-item">
 						<view class="cuIcon-group_fill text-purple"></view>
 						<text>社区代理</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<!-- 后台入口 -->
-			<view class="bg-white padding-lr padding-bottom">
+			<!-- <view class="bg-white padding-lr padding-bottom">
 				<view class="cu-bar margin-top-sm solid-bottom">
 					<view class="action bar-first-action">
 						<view class="cuIcon-titles text-main-color"></view>
@@ -249,7 +249,7 @@
 						<text>后台数据</text>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -280,7 +280,7 @@
 					name: '服务中'
 				}, {
 					type: 4,
-					name: '完成待确认'
+					name: '待确认'
 				}, {
 					type: 5,
 					name: '已完成'
@@ -343,9 +343,16 @@
 				})
 			},
 			showPage(pageUrl) {
-				uni.navigateTo({
-					url: pageUrl
-				})
+				if (pageUrl) {
+					uni.navigateTo({
+						url: pageUrl
+					})
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: '功能开发中'
+					})
+				}
 			}
 		}
 	}
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index 5448093..28c5374 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -2,16 +2,16 @@
 	<page-meta :page-style="'overflow:'+(ifShowPageMeta?'hidden':'visible')"></page-meta>
 	<view>
 		<!-- 顶部操作条 -->
-		<cu-custom :bgColor="'bg-white'" :isBack="true" :isBackHome="true" :homePageUrl="'/pages/index/index'">
-			<!-- <block slot="backText">返回</block> -->
+		<cu-custom :bgColor="'bg-white'" :isBack="true" :isBackHome="false" :homePageUrl="'/pages/index/index'">
+			<block slot="backText">返回</block>
 			<!-- <block slot="backHomeText">首页</block> -->
-			<!-- <block slot="content">商品详情</block> -->
+			<block slot="content">商品详情</block>
 		</cu-custom>
 		<!-- 导航栏 -->
 		<uni-transition class="fixed-top-bar" mode-class="fade" :show="showTopNav">
 			<view class="grid text-center col-3 solid-top solid-bottom bg-white">
 				<view class="padding" :class="curTopNav == 0 ? 'bg-blue' : ''" @click.stop="clickNav(0)">服务</view>
-				<view class="padding" :class="curTopNav == 1 ? 'bg-blue' : ''" @click.stop="clickNav(1)">评价</view>
+				<!-- <view class="padding" :class="curTopNav == 1 ? 'bg-blue' : ''" @click.stop="clickNav(1)">评价</view> -->
 				<view class="padding" :class="curTopNav == 2 ? 'bg-blue' : ''" @click.stop="clickNav(2)">详情</view>
 			</view>
 		</uni-transition>
@@ -128,14 +128,14 @@
 					:class="'cuIcon-' + (isShowAllSpecs ? 'fold' : 'unfold')"></text></view>
 		</view>
 		<!-- 服务评价 -->
-		<view id="pageAnchor1" class="margin-lr-sm margin-top-sm bg-white">
-			<view class="flex justify-between align-end padding">
-				<view class="text-black text-lg">商品评价</view>
+		<!-- <view id="pageAnchor1" class="margin-lr-sm margin-top-sm bg-white"> -->
+			<!-- <view class="flex justify-between align-end padding"> -->
+				<!-- <view class="text-black text-lg">商品评价</view> -->
 				<!-- <view class="text-red text-sm">好评率95%<text class="text-bold text-gray cuIcon-right"></text></view> -->
-			</view>
-			<view class="text-center padding-bottom">开发中，敬请期待</view>
+			<!-- </view> -->
+			<!-- <view class="text-center padding-bottom">开发中，敬请期待</view> -->
 			<!-- <comments-card :reviewers="reviewers"></comments-card> -->
-		</view>
+		<!-- </view> -->
 		<!-- 店家链接 -->
 		<view class="margin-lr-sm margin-top-sm padding bg-white">
 			<view class="flex justify-between align-center">
@@ -155,22 +155,30 @@
 		</view>
 		<!-- 底部操作条 -->
 		<view class="cu-bar bg-white tabbar border shop fixed-bottom-bar">
+			<view class="action" @click="showIndex">
+				<view class="cuIcon-homefill"></view>
+				首页
+			</view>
 			<button class="action" open-type="contact">
-				<view class="cuIcon-service text-green">
-					<view class="cu-tag badge" v-if="ifHasCsMsg"></view>
+				<view class="cuIcon-servicefill text-green">
+					<!-- <view class="cu-tag badge" v-if="ifHasCsMsg"></view> -->
 				</view>
 				客服
-			</button>
+			</button>
+			<view class="action" @click="showShopDetail(shopInfo)">
+				<view class="cuIcon-taoxiaopu text-orange"></view>
+				店铺
+			</view>
 			<!-- <view class="action">
 				<view class=" cuIcon-shop"></view> 店铺
 			</view> -->
-			<view class="action" @click="showCart">
+			<!-- <view class="action" @click="showCart">
 				<view class="cuIcon-cart">
 					<view class="cu-tag badge" v-if="totalPickCount > 0">{{totalPickCount}}</view>
 				</view>
 				购物车
-			</view>
-			<view class="bg-main-color light submit" @click="toggleProductPickModal">加入购物车</view>
+			</view> -->
+			<!-- <view class="bg-main-color light submit" @click="toggleProductPickModal">加入购物车</view> -->
 			<view class="bg-main-color submit" @tap="checkLogin" @click="toggleProductPickModal($event, true)">立即订购</view>
 		</view>
 		<!-- 底部弹窗 -->
@@ -363,6 +371,11 @@
 				uni.navigateTo({
 					url: '/pages/my/my-cart?myCartInfo=' + encodeURIComponent(JSON.stringify(myCartInfo))
 				});
+			},
+			showIndex() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				});
 			}
 		}
 	}