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 1/2] =?UTF-8?q?1=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=B8=8B=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E5=AD=972=20=E8=8F=9C=E5=8D=95=E7=9A=84=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=BB=9F=E4=B8=80=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=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 @@ {{ item.goods.store.name }} - - + + + 取消收藏 + + + + + 添加收藏 + + {{ item.created_at_text }} @@ -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 @@ 请认真阅读并同意 - 《{{ agreement.title }}》 + 《{{ agreement.title }}》 ，在小程序下单购买即表示您已默认同意 - 《{{ agreement.title }}》 + 《{{ agreement.title }}》 的所有条款。 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 @@ - 由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的《{{checkArea}}》或咨询客服 + 由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参考产品的《{{checkArea}}》或咨询客服 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 @@ - 由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的《{{applyDetails.agreement.title}}》或咨询客服 + 由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参考产品的《{{applyDetails.agreement.title}}》或咨询客服 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 @@ - 请认真阅读并同意《{{orderDetails.agreement.title}}》，在小程序下单购买即表示您已默认同意《{{orderDetails.agreement.title}}》的所有条款。 + 请认真阅读并同意《{{orderDetails.agreement.title}}》，在小程序下单购买即表示您已默认同意《{{orderDetails.agreement.title}}》的所有条款。 From 151521219086bdd92f187a4ceca50a23c2cb0a4c Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Fri, 2 Jul 2021 11:38:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9/=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=95=86=E5=AE=B6=E5=9B=BE=E6=A0=87=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/collect/index.vue | 12 ++++++------ pages/goodsDetail/index.vue | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pages/collect/index.vue b/pages/collect/index.vue index 733dd04..cc3c6af 100644 --- a/pages/collect/index.vue +++ b/pages/collect/index.vue @@ -3,13 +3,13 @@ - + {{ item.goods.name }} - - + + {{ item.goods.store.name }} @@ -123,9 +123,9 @@ border-radius: 20rpx; } .shop-img{ - width: 60rpx; - height: 60rpx; - border-radius: 10rpx; + width: 50rpx; + height: 50rpx; + border-radius: 50%; } .shop-name{ width: 305rpx; diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index ba0345c..fc6b68a 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -31,8 +31,8 @@ 适用门店 - - + + {{ goods_detail.store.name }} @@ -276,7 +276,7 @@ .shop-img{ width: 60rpx; height: 60rpx; - border-radius: 10rpx; + border-radius: 50%; } }