From 0ce23425a038dbbaa818483508c76bc575ec6304 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Wed, 20 Mar 2024 17:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                           |   4 +
 pages_category_page1/goodsModule/evaluate.vue     |   2 +-
 pages_category_page1/orderModule/orderDetails.vue |   4 +-
 pages_category_page2/userModule/collection.vue    | 135 +++++++++++++---------
 4 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/App.vue b/App.vue
index f96b5e5..0ceb5b5 100644
--- a/App.vue
+++ b/App.vue
@@ -786,6 +786,10 @@ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
   color: #F54639;
 }
 
+.font-color-BCBDC6 {
+  color: #BCBDC6;
+}
+
 .bor-line-D3D4DE {
   border-bottom: #D3D4DE 1rpx solid;
 }
diff --git a/pages_category_page1/goodsModule/evaluate.vue b/pages_category_page1/goodsModule/evaluate.vue
index 6609bcb..2806e22 100644
--- a/pages_category_page1/goodsModule/evaluate.vue
+++ b/pages_category_page1/goodsModule/evaluate.vue
@@ -170,7 +170,7 @@
 
 <style lang="scss">
 	page{
-		background-color: #F7F7F7;
+		background-color: #FAFAFA;
 	}
 	.container{
 		.addEvaluate-box{
diff --git a/pages_category_page1/orderModule/orderDetails.vue b/pages_category_page1/orderModule/orderDetails.vue
index 2123d94..eb4f5cf 100644
--- a/pages_category_page1/orderModule/orderDetails.vue
+++ b/pages_category_page1/orderModule/orderDetails.vue
@@ -984,7 +984,7 @@
 
 <style lang="scss" scoped>
 	page {
-		background: #f7f7f7;
+		background: #FAFAFA;
 	}
 
 	.logistics {
@@ -1059,6 +1059,7 @@
 		flex-direction: row;
 		align-items: center;
     border-radius: 30rpx;
+    box-shadow: 0rpx 20rpx 40rpx 0rpx #F2F2F2;
 	}
 
 	.address-box .address-img {
@@ -1268,6 +1269,7 @@
 		display: flex;
 		flex-direction: column;
 		margin: 30upx 0 10upx;
+
 	}
 
 	.delivery-way-box .item {
diff --git a/pages_category_page2/userModule/collection.vue b/pages_category_page2/userModule/collection.vue
index 2e1b0bb..6c9e515 100644
--- a/pages_category_page2/userModule/collection.vue
+++ b/pages_category_page2/userModule/collection.vue
@@ -9,9 +9,14 @@
 		<view v-if="collectionTypeFlag == 0">
 			<view v-if="productCollect.length>0">
 				<view class="wid function-box">
-					<view class="finishbox" @click="finishClick" v-if="allCheckShow">{{$t('common.finish')}}</view>
-					<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png">
+<!--					<view class="finishbox" @click="finishClick" v-if="allCheckShow">{{$t('common.finish')}}</view>-->
+          <view v-if="allCheckShow" class="flex-row-plus editicon-box flex-items font-color-252744 fs28" @click="finishClick">
+            <image class="editicon" src="https://wechat.hnthee.com/ceres-local-file/image/collect_finish.png">
+            </image>
+            <text class="mar-left-10">{{$t('common.finish')}}</text>
+          </view>
+					<view v-else class="flex-row-plus editicon-box flex-items font-color-252744 fs28" @click="editClick">
+						<image class="editicon" src="https://wechat.hnthee.com/ceres-local-file/image/collect_edit.png">
 						</image>
 						<text class="mar-left-10">{{$t('common.edit')}}</text>
 					</view>
@@ -24,20 +29,20 @@
 							<!-- :disabled="allCheckShow" -->
 							<view class="flex-item" @click.stop="toGoodsDetails(item.productId,item.shopId,item.skuId)">
 								<view class="item wid flex-row-plus flex-display">
-									<view class="flex-items selctBtn" v-show="allCheckShow">
+									<view class="flex-items" v-show="allCheckShow">
 										<image mode="aspectFill" v-if="item.selected == 1"
 											@click.stop="productItemSel(index,0)"
-											src="https://ceres.zkthink.com/static/images/selectActive.png"
-											class="cart-select-img"></image>
+                           src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_active.png"
+                           class="cart-select-img"></image>
 										<image mode="aspectFill" v-else @click.stop="productItemSel(index,1)"
-											src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+											src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_normal.png"
 											class="cart-select-img"></image>
 									</view>
 									<view class="infoCent flex-items">
-										<image 
+										<image
 										onerror="this.src='url(https://wechat.hnthee.com/ceres-local-file/image/default.png) no-repeat center';this.οnerrοr=null"
 										class="product-img default-img" mode="aspectFill" :src="item.image" />
-										
+
 										<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 										<view class="title-wrap mar-left-20 priceBox">
 											<text
@@ -52,10 +57,10 @@
 													<image v-if="item.activityType===5" class="iconImg" src="https://ceres.zkthink.com/static/images/discountListIcon.png" alt="平台折扣"></image>
 													<image v-if="item.activityType===9" class="iconImg" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png" alt="会员价"></image>
 													<image v-if="item.activityType === 8" class="iconImg" src="https://zk-cereshop.oss-cn-shenzhen.aliyuncs.com/zkthink/2022-02-15/d0d8d96f28904167b271de4ae924d1a8_sceneMarketing.png" alt="场景营销"></image>
-												<text class="fs40 font-color-C83732">¥</text>
-												<text class="fs40 font-color-C83732 mar-right-20">{{item.price}}</text>
+												<text class="fs32 font-color-252744">¥</text>
+												<text class="fs32 font-color-252744 mar-right-20">{{item.price}}</text>
 												<text
-													class="font-color-CCC discountsPriceLine fs24">¥{{item.originalPrice}}</text>
+													class="font-color-BCBDC6 discountsPriceLine fs22 mar-top-10">¥{{item.originalPrice}}</text>
 											</view>
 										</view>
 									</view>
@@ -68,9 +73,10 @@
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
 						<image mode="aspectFill" v-if="isAllProCheck"
-							src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"
+                   src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_active.png"
+                   class="cart-select-img"
 							@click="allProductSel(0)"></image>
-						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+						<image mode="aspectFill" v-else src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_normal.png"
 							class="cart-select-img" @click="allProductSel(1)"></image>
 						<text>全选</text>
 					</view>
@@ -87,24 +93,29 @@
 		</view>
 		<view v-if="collectionTypeFlag == 1">
 			<view v-if="storeCollect.length>0">
-				<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
-				<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png">
+<!--				<view class="finishbox" @click="finishClick" v-if="allCheckShow">{{$t('common.finish')}}</view>-->
+        <view v-if="allCheckShow" class="flex-row-plus editicon-box flex-items font-color-252744 fs28" @click="finishClick">
+          <image class="editicon" src="https://wechat.hnthee.com/ceres-local-file/image/collect_finish.png">
+          </image>
+          <text class="mar-left-10">{{$t('common.finish')}}</text>
+        </view>
+				<view v-else class="flex-row-plus editicon-box flex-items font-color-252744 fs28" @click="editClick">
+					<image class="editicon" src="https://wechat.hnthee.com/ceres-local-file/image/collect_edit.png">
 					</image>
-					<text class="mar-left-10">编辑</text>
+					<text class="mar-left-10">{{$t('common.edit')}}</text>
 				</view>
-				<view class="swipe-box swipeBox">
+				<view class="swipe-box">
 					<view class="shopBox" v-for="(item, index) in storeCollect" :key="item.collectId" :index="index">
 						<u-swipe-action ref="shopActionSwipe" :disabled="allCheckShow" :show="item.show" :options="options" @click="storeActionClick(index)"
 							@open="storeOpen(index)">
 							<view class="item wid flex-row-plus flex-display">
-								<view v-show="allCheckShow" class="selctBtn flex-items">
+								<view v-show="allCheckShow" class="flex-items">
 									<image mode="aspectFill" v-if="item.selected == 1"
 										@click.stop="storeItemSel(index,0)"
-										src="https://ceres.zkthink.com/static/images/selectActive.png"
+										src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_active.png"
 										class="cart-select-img"></image>
 									<image mode="aspectFill" v-else @click.stop="storeItemSel(index,1)"
-										src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+										src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_normal.png"
 										class="cart-select-img"></image>
 								</view>
 								<view class="infoCent">
@@ -113,17 +124,17 @@
 											<image class="head-img" mode="aspectFill" :src="item.shopLogo" />
 											<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 											<view class="title-wrap mar-left-20">
-												<text class="title u-line-2 shopName">{{ item.shopName }}</text>
-												<text class="font-color-CCC fs24">{{item.person}}人关注</text>
+												<text class="shop-title u-line-2 shopName">{{ item.shopName }}</text>
+												<text class="font-color-25274 fs24">{{item.person}}人关注</text>
 											</view>
 										</view>
 										<view class="toStore flex-items-plus fs24" @click="toStoreClick(item.shopId)">
 											进入店铺
-											<image src="https://ceres.zkthink.com/static/images/arrowR.png"></image>
+											<image src="https://wechat.hnthee.com/ceres-local-file/image/collect_shop_forward.png"></image>
 										</view>
 									</view>
 									<view class="shopImgBox"  v-if="item.productList.length>0">
-										<view class="itemImgBox" v-for="(sItem, sIndex) of item.productList"
+										<view class="itemImgBox" v-for="(sItem, sIndex) of item.productList.slice(0, 5)"
 											:key="sIndex"
 											@click.stop="goodsDateils(sItem.shopId,sItem.productId,sItem.skuId)">
 											<image :src="sItem.image" class="pic-img default-img"
@@ -138,9 +149,9 @@
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
 						<image mode="aspectFill" v-if="isAllStoreCheck"
-							src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"
+							src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_active.png" class="cart-select-img"
 							@click="allStoreSel(0)"></image>
-						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
+						<image mode="aspectFill" v-else src="https://wechat.hnthee.com/ceres-local-file/image/icon_cart_select_normal.png"
 							class="cart-select-img" @click="allStoreSel(1)"></image>
 						<text>全选</text>
 					</view>
@@ -589,7 +600,7 @@
 		}
 
 		.function-box {
-			background-color: #F7F7F7;
+			background-color: #FAFAFA;
 		}
 
 		.tabsbox {
@@ -614,8 +625,8 @@
 		}
 
 		.editicon {
-			width: 50rpx;
-			height: 50rpx;
+			width: 32rpx;
+			height: 32rpx;
 		}
 
 		.swipe-box {
@@ -629,6 +640,7 @@
 				display: flex;
 
 				.infoCent {
+          width: 100%;
 					padding: 20rpx;
 				}
 
@@ -645,38 +657,48 @@
 				margin-top: 20rpx;
 
 				.itemImgBox {
-					margin-right: 15rpx;
+					margin-right: 20rpx;
 					margin-left: 5rpx;
 
 					image {
-						width: 120rpx;
-						height: 120rpx;
-						border: 2rpx solid #F3F4F5;
+						width: 100rpx;
+						height: 100rpx;
+            border-radius: 10rpx;
 					}
 				}
 			}
 
 			.product-img {
-				width: 220rpx;
-				flex: 0 0 220rpx;
-				height: 220rpx;
+				width: 150rpx;
+				flex: 0 0 150rpx;
+				height: 150rpx;
+        border-radius: 30rpx;
 			}
 
 			.head-img {
 				width: 80rpx;
 				flex: 0 0 80rpx;
 				height: 80rpx;
-				border-radius: 50%;
+				border-radius: 10rpx;
 			}
 
 			.title {
 				text-align: left;
 				font-size: 28rpx;
-				color: $u-content-color;
-				height: 165rpx;
+				color: #252744;
+				height: 100rpx;
 				padding-right: 20rpx;
 			}
 
+      .shop-title {
+        text-align: left;
+        font-size: 32rpx;
+        color: #252744;
+        font-weight: bold;
+        height: 100rpx;
+        padding-right: 20rpx;
+      }
+
 			.shopName {
 				height: auto;
 				overflow: hidden;
@@ -693,12 +715,11 @@
 			}
 
 			.toStore {
-				width: 100px;
-				color: #FFEBC4;
-				padding: 0rpx 20rpx;
-				height: 52rpx;
-				background: #333333;
+				color: #FFFFFF;
+				padding: 10rpx 27rpx;
+				background: #252744;
 				margin-right: 15rpx;
+        border-radius: 30rpx;
 
 				image {
 					width: 10rpx;
@@ -742,12 +763,14 @@
 
 			.btn-delete {
 				width: 232upx;
-				height: 104upx;
-				line-height: 104upx;
+				height: 80rpx;
+				line-height: 80rpx;
 				text-align: center;
-				font-size: 28upx;
+				font-size: 30rpx;
 				color: #FFFFFF;
-				background: #C83732;
+        margin-right: 30rpx;
+				background: #F54639;
+        border-radius: 50rpx;
 			}
 		}
 
@@ -797,18 +820,18 @@
 	}
 
 	.tabsbox /deep/ .u-tab-bar {
-		background-color: #c5aa7b !important;
+		background-color: #252744 !important;
 	}
 
 	.tabsbox /deep/ #u-tab-item-0::before {
 		content: '';
-		width: 2rpx;
-		height: 30rpx;
+		width: 1rpx;
+		height: 35rpx;
 		display: block;
-		background: #CCCCCC;
+		background: #BCBDC6;
 		position: absolute;
 		right: 0;
-		top: 20rpx;
+		top: 30rpx;
 	}
 
 	.swipe-box /deep/ .u-swipe-del {
@@ -827,6 +850,6 @@
 </style>
 <style>
 	page {
-		background-color: #F7F7F7;
+		background-color: #FAFAFA;
 	}
 </style>