From 536aeb3e0c53cf003ec422a85e5def436e82d353 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Fri, 2 Jul 2021 11:07:19 +0800
Subject: [PATCH] =?UTF-8?q?1=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2=E7=88=B1?=
 =?UTF-8?q?=E5=BF=83=E4=B8=8B=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=96=87=E5=AD=97?=
 =?UTF-8?q?2=20=E8=8F=9C=E5=8D=95=E7=9A=84=E5=8D=8F=E8=AE=AE=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E7=BB=9F=E4=B8=80=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=9C=B0=E5=9B=BE=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/collect/index.vue       | 14 +++++++++++---
 pages/goodsDetail/index.vue   |  5 +++--
 pages/login/index.vue         |  4 ++--
 pages/order/apply-details.vue |  2 +-
 pages/order/apply-refund.vue  |  2 +-
 pages/order/confirm-order.vue |  2 +-
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pages/collect/index.vue b/pages/collect/index.vue
index 0f01e70..733dd04 100644
--- a/pages/collect/index.vue
+++ b/pages/collect/index.vue
@@ -13,8 +13,16 @@
 								<view class="lf-m-l-10 lf-font-28 lf-line-1 shop-name">{{ item.goods.store.name }}</view>
 							</view>
 							<view @click="switchCollect(index)" class="lf-font-40">
-								<u-icon name="heart-fill" color="#ff0f00" v-if="item.is_collect"></u-icon>
-								<u-icon name="heart" v-else></u-icon>
+								<view v-if="item.is_collect" class="flex flex-direction justify-around align-center text-center" style="width: 100%;">
+									<u-icon name="heart-fill" color="#ff0f00"></u-icon>
+									<text class="lf-font-24">取消收藏</text>
+								</view>
+								
+								<view v-else class="flex flex-direction justify-around align-center text-center" style="width: 100%;">
+									<u-icon name="heart"></u-icon>
+									<text class="lf-font-24">添加收藏</text>
+								</view>
+								
 							</view>
 						</view>
 						<view class="lf-m-t-20 lf-font-24 lf-color-gray">{{ item.created_at_text }}</view>
@@ -120,7 +128,7 @@
 				border-radius: 10rpx;
 			}
 			.shop-name{
-				width: 340rpx; 
+				width: 305rpx; 
 				color: #555555;
 			}
 		}
diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index fa9e35d..ba0345c 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -141,11 +141,12 @@
 			},
 			// 打开地图
 			openMap(){
-				return;
+				// return;
 				uni.openLocation({
 				  longitude: 108.36637,
 				  latitude: 22.817746,
-				  scale: 18
+				  scale: 18,
+				  name: this.goods_detail.store.address
 			   })
 			},
 			// 跳转到确认下单页面
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 36467a6..e6ddb9b 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -29,9 +29,9 @@
 			</checkbox-group>
 			<view class="lf-m-l-10 lf-font-24 lf-color-gray" style="display: inline-block;">
 				<text>请认真阅读并同意</text>
-				<text @click="enterAgree" style="color: #5c6ed1;">《{{ agreement.title }}》</text>
+				<text @click="enterAgree" class="text-orange">《{{ agreement.title }}》</text>
 				<text>，在小程序下单购买即表示您已默认同意</text>
-				<text @click="enterAgree" style="color: #5c6ed1;">《{{ agreement.title }}》</text>
+				<text @click="enterAgree" class="text-orange">《{{ agreement.title }}》</text>
 				<text>的所有条款。</text>
 			</view>
 		</view>
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index f9a1752..92995d1 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -65,7 +65,7 @@
 					<view class="padding-lr bg-white" style="padding-top: 30rpx;" v-if="checkArea">
 						<view class="cu-self menu">
 							<view class="text-gray lf-font-28">
-								由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text @tap="$routerGo('/pages/agreement/agreement?id='+checkAreaId)" class="text-orange">《{{checkArea}}》</text>或咨询客服
+								由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参考产品的<text @tap="$routerGo('/pages/agreement/agreement?id='+checkAreaId)" class="text-orange">《{{checkArea}}》</text>或咨询客服
 							</view>
 						</view>
 					</view>
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index 835c887..ace4faf 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -66,7 +66,7 @@
 					<view class="padding-top padding-lr bg-white" v-if="applyDetails.agreement.article_id">
 						<view class="cu-self menu">
 							<view class="text-gray lf-font-28">
-								由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+applyDetails.agreement.article_id)">《{{applyDetails.agreement.title}}》</text>或咨询客服
+								由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参考产品的<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+applyDetails.agreement.article_id)">《{{applyDetails.agreement.title}}》</text>或咨询客服
 							</view>
 						</view>
 					</view>
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 0910dc6..2eeae69 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -54,7 +54,7 @@
 							</view>
 						</checkbox-group>
 						<view class="lf-font-24 text-gray">
-							请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。 
+							请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)" class="text-orange">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。 
 						</view>
 					</view>
 					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">