From 2b3c0e4355922737457c099668f44df20c65a629 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 15 May 2024 14:31:09 +0800
Subject: [PATCH 01/57] =?UTF-8?q?Feat(=E6=8A=BD=E5=A5=96):=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/lottery.js | 7 +++++++
pkg-video/views/lottery.vue | 15 +++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/api/lottery.js b/api/lottery.js
index 14b42b6..dd81330 100644
--- a/api/lottery.js
+++ b/api/lottery.js
@@ -28,4 +28,11 @@ export function takePrize(lotteryRecordId){
* */
export function getLogs(page = 1, limit = 10) {
return request.get('/lottery/dice/records',{page,limit})
+}
+
+/**
+ * 抽奖活动分享
+ * */
+export function getLotteryShareInfo() {
+ return request.get('/lottery/shareImage')
}
\ No newline at end of file
diff --git a/pkg-video/views/lottery.vue b/pkg-video/views/lottery.vue
index 8f31e1d..75931e6 100644
--- a/pkg-video/views/lottery.vue
+++ b/pkg-video/views/lottery.vue
@@ -80,7 +80,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.mapTitle }}
-
-
-
-
-
-
-
- {{ item.provinceName }}
-
-
-
-
-
-
-
- {{ mapData.recommended.title }}
- {{ mapData.recommended.description }}
-
-
-
-
-
-
-
- {{ item.title }}
-
- ￥{{ item.price }}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 3dc35f846420bcc152c8a3b1e59650627df01eb4 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 17 May 2024 18:04:53 +0800
Subject: [PATCH 04/57] =?UTF-8?q?Style:=E7=95=8C=E9=9D=A2=E7=BB=86?=
=?UTF-8?q?=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/nativeList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg_product/views/nativeList.vue b/pkg_product/views/nativeList.vue
index e591188..869d26f 100644
--- a/pkg_product/views/nativeList.vue
+++ b/pkg_product/views/nativeList.vue
@@ -172,7 +172,7 @@ export default {
}
.item {
width: 345rpx;
- height: 455rpx;
+ height: 465rpx;
.cover {
width: 345rpx;
height: 345rpx;
From 4a4f8ffdd2a61b13801833464a5a2bc363f02e29 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 20 May 2024 10:56:15 +0800
Subject: [PATCH 05/57] =?UTF-8?q?Fix(=E9=A6=96=E9=A1=B5):[#1544]=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5=E5=81=9A=E4=B8=80=E4=B8=AA=E5=9B=9E=E5=88=B0=E9=A1=B6?=
=?UTF-8?q?=E9=83=A8=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E5=90=8E=E9=A1=B5=E9=9D=A2=E5=BE=80=E4=B8=8A=E5=9B=9E=E5=BC=B9?=
=?UTF-8?q?=E5=88=B0=E9=A6=96=E9=A1=B5=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/index.vue | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 92e5382..27391a0 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -232,6 +232,14 @@
+
+
+
@@ -380,7 +388,8 @@ export default {
contentFestival: {},
countyFamous: {},
seasonalFood: {},
- pageKeyId: Object.freeze('home_index')
+ pageKeyId: Object.freeze('home_index'),
+ scrollTop: 0
}
},
computed: mapGetters(["userInfo", 'isLogin']),
@@ -443,6 +452,9 @@ export default {
url: '/pkg-video/views/lottery'
})
},
+ onPageScroll(e) {
+ this.scrollTop = e.scrollTop
+ },
methods: {
init() {
let that = this;
@@ -719,6 +731,12 @@ export default {
query.fields({size: true, scrollOffset: true}, (data) => {
console.log(JSON.stringify(data))
}).exec()
+ },
+ setTopHandle() {
+ uni.pageScrollTo({
+ scrollTop: 0,
+ duration: 200
+ })
}
}
};
From de82fafe9ca07c1fe3514964e9d2c8648b6697e3 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 20 May 2024 11:13:04 +0800
Subject: [PATCH 06/57] =?UTF-8?q?Chore(=E9=A6=96=E9=A1=B5):=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96&=E5=8E=BB=E6=8E=89?=
=?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/index.vue | 341 +++++++++++++++++++------------------------
1 file changed, 149 insertions(+), 192 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 27391a0..4ca6976 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -191,7 +191,7 @@
-
+
@@ -244,34 +244,21 @@
\ No newline at end of file
From c2968d5da000b840a82aae0aedc06ca0f49f10c9 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 23 May 2024 16:24:38 +0800
Subject: [PATCH 14/57] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84/=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?):[#1620]=E5=90=84=E7=8A=B6=E6=80=81=E8=AE=A2=E5=8D=95=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=90=8E=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E5=90=8E=E4=BC=9A=E8=B7=B3=E8=BD=AC=E5=88=B0=E2=80=9C?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E2=80=9D=E8=AE=A2=E5=8D=95=EF=BC=8C=E4=B8=8D?=
=?UTF-8?q?=E4=BC=9A=E5=9B=9E=E5=88=B0=E7=9B=B8=E5=BA=94=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/MyOrder/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index cc6d81c..503e9c3 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -180,7 +180,7 @@ export default {
},
computed: mapGetters(["userInfo"]),
onShow: function () {
- this.type = parseInt(this.$yroute.query.type) || 0;
+ this.type = this.type || parseInt(this.$yroute.query.type) || 0;
this.changeType(this.type);
this.getOrderData();
this.getOrderListReq();
From dbdb902e6bdf70c58523450a07834f56167a298a Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 23 May 2024 16:26:31 +0800
Subject: [PATCH 15/57] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95/=E8=AF=A6=E6=83=85?=
=?UTF-8?q?):[#1614]=E4=B9=B0=E5=AE=B6=E7=95=99=E8=A8=80=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E9=9D=A0=E5=B7=A6=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/OrderDetails/index.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index fd38dd7..0a6060a 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -130,7 +130,7 @@
买家留言：
- {{ orderInfo.mark }}
+ {{ orderInfo.mark }}
@@ -770,4 +770,9 @@ export default {
color: #FE5261;
font-size: 26rpx;
}
+.item {
+ .conttent-left {
+ text-align: left !important;
+ }
+}
From f7dcdc22f1a1302c67298219f845db9ef4e90638 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 23 May 2024 16:33:53 +0800
Subject: [PATCH 16/57] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84/=E6=94=B6=E8=97=8F?=
=?UTF-8?q?):[#1622]=E6=9C=AA=E9=80=89=E6=8B=A9=E4=BB=BB=E4=BD=95=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E7=82=B9=E5=87=BB=E2=80=9C=E5=88=A0=E9=99=A4=E2=80=9D?=
=?UTF-8?q?=EF=BC=8C=E4=BB=8D=E4=BC=9A=E5=BC=B9=E5=87=BA=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=88=A0=E9=99=A4=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/myFavorite.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index afe1612..3fc03fa 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -251,7 +251,7 @@ export default {
remove() {
const _this = this
const ids = []
- switch (that.tabsIndex) {
+ switch (_this.tabsIndex) {
case 0:
_this.productList.forEach(item => {
if (item['state']) ids.push(item.id)
From 86b927b4878837999a74ac1dda9c69ad024f6a74 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 27 May 2024 16:23:11 +0800
Subject: [PATCH 17/57] =?UTF-8?q?Fix(=E8=B4=AD=E7=89=A9=E8=BD=A6):[#1609]?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E5=A2=9E=E5=87=8F=E5=95=86=E5=93=81=E6=95=B0?=
=?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=8F=96=E6=B6=88=E5=8A=A0=E8=BD=BD=E6=95=88?=
=?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cart.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/cart.vue b/pages/cart.vue
index 28ae0a3..ff7b0cf 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -342,11 +342,11 @@ export default {
const { type } = e
const value = good.cartNum + (type === 'plus' ? 1 : -1)
const id = good.id
- uni.showLoading()
+ // uni.showLoading()
changeCartNum(id, value).then(res => {
const { success } = res
if (success) {
- uni.hideLoading()
+ // uni.hideLoading()
this.$set(this.list[index].carts[gIndex], 'cartNum', value)
}
}).catch(() => {
From 9458e9347c9faebfb8068bbaff373d5dc0953a18 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 4 Jun 2024 17:54:30 +0800
Subject: [PATCH 18/57] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84/=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?/=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81):[#1688]=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=E8=BE=93=E5=85=A5=E4=B8=8D=E8=A7=84=E8=8C=83=E6=97=B6?=
=?UTF-8?q?=E4=BB=8D=E8=83=BD=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/payPassword.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkg_user/views/payPassword.vue b/pkg_user/views/payPassword.vue
index 9f321cc..043c1f4 100644
--- a/pkg_user/views/payPassword.vue
+++ b/pkg_user/views/payPassword.vue
@@ -144,6 +144,10 @@ export default {
return validatorDefaultCatch(e);
}
+ if (payPwd.length < 6) {
+ that.$dialog.toast({ mes: "请输入6位支付密码" })
+ return
+ }
//网络请求
uni.showLoading();
modifyUserPayPwd({
From 2c514164da806a0403af9b1331564d29a9e8216c Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 4 Jun 2024 17:56:09 +0800
Subject: [PATCH 19/57] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84/=E6=8F=90=E7=8E=B0?=
=?UTF-8?q?):[#1686,=20#1687]=E4=B8=8D=E8=BE=93=E5=85=A5=E4=BB=BB=E4=BD=95?=
=?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=87=91=E9=A2=9D,=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E2=80=9C=E5=85=A8=E9=83=A8=E6=8F=90=E7=8E=B0=E2=80=9D/?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E9=A1=B5=E9=9D=A2=E6=8F=90?=
=?UTF-8?q?=E7=8E=B0=E9=87=91=E9=A2=9D=E4=BC=9A=E8=87=AA=E5=8A=A8=E8=BE=93?=
=?UTF-8?q?=E5=85=A50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/withdrawal.vue | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/pkg_user/views/withdrawal.vue b/pkg_user/views/withdrawal.vue
index 6b96855..f59d11f 100644
--- a/pkg_user/views/withdrawal.vue
+++ b/pkg_user/views/withdrawal.vue
@@ -28,6 +28,7 @@
:customStyle="{
'border': 0
}"
+ :disabled="commissionCount <= 0"
placeholder-style="font-size:28rpx"
type="digit"
autofocus
@@ -35,7 +36,11 @@
@input="balanceInputChange"
/>
- 全部提现
+ 全部提现
@@ -199,7 +204,7 @@ export default {
},
balanceInputChange(value) {
let v = this.clearNoNum(value)
- if (v > this.commissionCount) {
+ if (v >= this.commissionCount) {
v = this.commissionCount
}
setTimeout(() => {
@@ -207,8 +212,9 @@ export default {
}, 0)
},
balanceInputBlur(value) {
+ console.log(value)
if (String(value).length == 0) {
- this.amout = 0
+ this.amout = ''
return
}
if (value > this.commissionCount) {
@@ -345,7 +351,7 @@ export default {
});
},
withdrawalAll: function () {
- if (this.commissionCount) {
+ if (parseFloat(this.commissionCount) > 0) {
this.amout = this.commissionCount + ''
}
},
@@ -354,7 +360,7 @@ export default {
res => {
this.banks = res.data.extractBank
this.minPrice = res.data.minPrice
- this.commissionCount = this.$force2Decimal(res.data.commissionCount)
+ this.commissionCount = parseFloat(this.$force2Decimal(res.data.commissionCount))
this.gdAmount = parseFloat(res.data.gdAmount)
this.gdLimit = parseFloat(res.data.gdLimit)
this.feeRate = parseFloat(res.data.fl)
@@ -432,6 +438,10 @@ export default {
text-align: center;
box-shadow: none;
background: #28AAF4;
+ &.grey {
+ background-color: #f1f1f1;
+ color: #dcdcdc;
+ }
}
.vline {
From 51bc828dc9d2d248e8a66d3314bb06e2bacda425 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 4 Jun 2024 17:58:05 +0800
Subject: [PATCH 20/57] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84/=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?/=E9=80=80=E6=AC=BE):[#1689]=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
=?UTF-8?q?=E7=89=87=E5=92=8C=E9=80=80=E6=AC=BE=E7=90=86=E7=94=B1=E4=B8=A4?=
=?UTF-8?q?=E9=A1=B9=E5=8A=A0=E4=B8=8A=E5=BF=85=E5=A1=AB=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_orders/views/refund.vue | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkg_orders/views/refund.vue b/pkg_orders/views/refund.vue
index 9d402a3..70b975a 100644
--- a/pkg_orders/views/refund.vue
+++ b/pkg_orders/views/refund.vue
@@ -3,7 +3,7 @@
- 上传图片
+ *上传图片
- 退款理由
+ *退款理由
@@ -232,6 +232,9 @@ export default {
.title {
margin-bottom: 0;
+ text {
+ color: #FF564A;
+ }
}
.option {
From 344e0aa8889028f6fc21b6766606d8a86c177d51 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 13 Jun 2024 18:09:35 +0800
Subject: [PATCH 21/57] =?UTF-8?q?Feat(=E9=A1=B5=E9=9D=A2):=E7=9B=91?=
=?UTF-8?q?=E5=90=AC=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E6=AC=A1=E6=95=B0?=
=?UTF-8?q?=E5=92=8C=E9=A1=B5=E9=9D=A2=E5=81=9C=E7=95=99=E6=97=B6=E9=95=BF?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 +
api/public.js | 4 ++
config/page.js | 5 +-
mixins/pageListenMixins.js | 27 +++++-----
pages/home/index.vue | 2 +-
pages/home/landMark.vue | 2 +-
utils/request.js | 25 ++++++----
utils/util.js | 100 +++++++++++++++++++++++++++++++++----
8 files changed, 131 insertions(+), 36 deletions(-)
diff --git a/App.vue b/App.vue
index d2204fc..52efa1a 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,9 @@
\ No newline at end of file
From f956c5a74c0d5e7d3839690d5d729c2689405fe5 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 21 Jun 2024 17:30:36 +0800
Subject: [PATCH 32/57] =?UTF-8?q?Fix(=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85)?=
=?UTF-8?q?:[#1842]=E9=9A=90=E8=97=8F=E9=94=80=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index c6f3cec..bab8a6b 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -142,7 +142,7 @@
库存:{{ dayInfo.stock }}{{ dayInfo.unitName }}
{{ tempName }}
- 销量:{{ dayInfo.sales }}{{ dayInfo.unitName }}
+
From eed49847c48b6e23b391b6ab2e265e6d33321778 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 21 Jun 2024 17:48:16 +0800
Subject: [PATCH 33/57] =?UTF-8?q?Fix(=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86)?=
=?UTF-8?q?:[31841]=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86=E7=A9=BA=E7=99=BD?=
=?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8A=A0=E4=B8=8A=E6=9A=82=E6=97=A0=E6=B6=88?=
=?UTF-8?q?=E8=B4=B9=E8=AE=B0=E5=BD=95=E7=9A=84=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/UserBill/index.vue | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/pages/user/UserBill/index.vue b/pages/user/UserBill/index.vue
index 0363a09..ce74d4e 100644
--- a/pages/user/UserBill/index.vue
+++ b/pages/user/UserBill/index.vue
@@ -25,6 +25,9 @@
+
+
+
+
From 44849db20d8a63feb00611a3aec0cc7f2f28a116 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Sun, 23 Jun 2024 11:39:24 +0800
Subject: [PATCH 34/57] =?UTF-8?q?Fix(=E5=85=A5=E9=A9=BB):[#1845,=20#1757]?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E5=AD=98=E5=9C=A8=E5=85=BC?=
=?UTF-8?q?=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_join/views/shop.vue | 62 ++++++++++----------
pkg_join/views/supplier.vue | 109 ++++++++++++++++++++----------------
2 files changed, 90 insertions(+), 81 deletions(-)
diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 2e48110..9f4118e 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -149,20 +149,25 @@
-
+
*
-
-
+
+
+
+
-
-
-
@@ -430,7 +435,6 @@ export default {
trigger: ['blur', 'change']
}
},
- showType: false,
columnsType: [],
indexType: [0],
district: [],
@@ -455,9 +459,6 @@ export default {
this.$refs.shopForm.setRules(this.rules);
},
methods: {
- changeType(state){
- this.showType=state
- },
changeRemove(state){
this.showRemove=state
},
@@ -487,14 +488,13 @@ export default {
init() {
getCity().then(({data}) => {
- this.district = data;
- });
-
+ this.district = data
+ })
getShopData().then(({data}) => {
- this.columnsType.push(data.hotelTypeList);
- this.notice = data.merchantApplyNotice;
- this.initInfo();
- });
+ this.columnsType = data.hotelTypeList
+ this.notice = data.merchantApplyNotice
+ this.initInfo()
+ })
},
initInfo() {
@@ -530,9 +530,9 @@ export default {
}
})
}
- this.indexType = this.columnsType[0].findIndex(item => item.id === this.form.type);
- if (this.indexType != -1) {
- this.form.typeText = this.columnsType[0][this.indexType].name;
+ this.indexType = this.columnsType.findIndex(item => item.id === this.form.type)
+ if (this.indexType !== -1) {
+ this.form.typeText = this.columnsType[this.indexType].name
}
this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6);
this.form.area = `${this.form.provinceName} ${this.form.cityName} ${this.form.areaName}`;
@@ -595,17 +595,15 @@ export default {
})
}
},
-
- // 回调参数为包含column indexs、value、values
- confirmType(e) {
- this.indexType = e.indexs;
- this.form.type = e.value[0].id;
- this.form.typeText = e.value[0].name;
- this.showType = false;
- },
-
- cancelType() {
- this.showType = false;
+ typeChange(e) {
+ const idx = parseInt(e.detail.value)
+ this.columnsType.map((item, index) => {
+ if (index === idx) {
+ this.form.typeText = item.name
+ this.indexType = index
+ this.form.type = item.id
+ }
+ })
},
// 省市区
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index e574080..8a3980f 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -120,21 +120,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -287,20 +292,26 @@
-
+
*
-
-
+
+
+
+
-
-
@@ -456,7 +467,7 @@ export default {
subType: "",
area: "",
address: "",
- position: "",
+ position: ""
},
form: {
name: "",
@@ -596,14 +607,10 @@ export default {
trigger: ['blur', 'change']
}
},
-
- showType: false,
columnsType: [],
- indexType: [0],
-
- showSupplierType: false,
+ indexType: 0,
columnsSupplierType: [],
- indexSupplierType: [0],
+ indexSupplierType: 0,
district: [],
@@ -641,9 +648,6 @@ export default {
this.$refs.supplierForm.setRules(this.rulesSupplier);
},
methods: {
- changeType(state){
- this.showType=state
- },
changeRemove(state){
this.showRemove=state
},
@@ -677,8 +681,8 @@ export default {
});
getShopData().then(({data}) => {
- this.columnsType.push(data.hotelTypeList);
- this.columnsSupplierType.push(data.supplierTypeList);
+ this.columnsType = data.hotelTypeList
+ this.columnsSupplierType = data.supplierTypeList
this.notice = data.merchantApplyNotice;
this.initInfo();
});
@@ -718,8 +722,8 @@ export default {
}
})
}
- this.indexType = this.columnsType[0].findIndex(item => item.id === this.form.type);
- this.form.typeText = this.columnsType[0][this.indexType].name;
+ this.indexType = this.columnsType.findIndex(item => item.id === this.form.type);
+ this.form.typeText = this.columnsType[this.indexType].name;
this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6);
this.form.area = `${this.form.provinceName} ${this.form.cityName} ${this.form.areaName}`;
if (data.hotelInfo.coverType === 2) {
@@ -733,8 +737,8 @@ export default {
if (this.infoTitle === "文玩" && data.applyType !== 3) return;
this.formSupplier = data.supplierInfo;
- this.indexSupplierType = this.columnsSupplierType[0].findIndex(item => item.key === this.formSupplier.subType);
- this.formSupplier.typeText = this.columnsSupplierType[0][this.indexSupplierType].value;
+ this.indexSupplierType = this.columnsSupplierType.findIndex(item => item.key === this.formSupplier.subType);
+ this.formSupplier.typeText = this.columnsSupplierType[this.indexSupplierType].value;
this.formSupplier.position = this.$forceToDecimal(this.formSupplier.longitude, 6) + ',' + this.$forceToDecimal(this.formSupplier.latitude, 6);
this.formSupplier.area = `${this.formSupplier.provinceName} ${this.formSupplier.cityName} ${this.formSupplier.areaName}`;
}
@@ -810,24 +814,31 @@ export default {
}
},
- // 回调参数为包含column indexs、value、values
- confirmType(e) {
- this.indexType = e.indexs;
- this.form.type = e.value[0].id;
- this.form.typeText = e.value[0].name;
- this.showType = false;
- },
-
confirmSupplierType(e) {
this.indexSupplierType = e.indexs;
this.formSupplier.subType = e.value[0].key;
this.formSupplier.typeText = e.value[0].value;
this.showSupplierType = false;
},
-
- cancelType() {
- this.showType = false;
- this.showSupplierType = false;
+ typeChange(e) {
+ const idx = parseInt(e.detail.value)
+ this.columnsType.map((item, index) => {
+ if (index === idx) {
+ this.form.typeText = item.name
+ this.indexType = index
+ this.form.type = item.id
+ }
+ })
+ },
+ supplierTypeChange(e) {
+ const idx = parseInt(e.detail.value)
+ this.columnsSupplierType.map((item, index) => {
+ if (index === idx) {
+ this.formSupplier.typeText = item.value
+ this.indexSupplierType = index
+ this.formSupplier.type = item.key
+ }
+ })
},
resultSupplier(values) {
From 2226d665ad6759e8aca775f80cc190b66bdc97f3 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 24 Jun 2024 09:56:46 +0800
Subject: [PATCH 35/57] =?UTF-8?q?Fix(=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85)?=
=?UTF-8?q?:[#1842]=E9=9A=90=E8=97=8F=E9=94=80=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index bab8a6b..35e1cbf 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -201,7 +201,7 @@
快递
{{ storeInfo.postage === 0 ? "免运费" : `￥${storeInfo.postage}` }}
- 销量：{{ storeInfo.sales }}
+
From 9ab00a372e29ac9f997c7b96202a1b113ef8c551 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 24 Jun 2024 15:15:20 +0800
Subject: [PATCH 36/57] =?UTF-8?q?Feat(=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
=?UTF-8?q?&=E5=BA=97=E9=93=BA):=E6=9D=A5=E6=BA=90=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/chose-city/chose-city.vue | 31 +++++++++++++++++++--
pages/shop/GoodsCon/index.vue | 48 +++++++++++++++++++++++++++++++-
pagesInn/inn/innHome.vue | 43 ++++++++++++++++++++++++++--
pkg_product/views/nativeList.vue | 10 ++++++-
utils/util.js | 7 ++++-
5 files changed, 131 insertions(+), 8 deletions(-)
diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue
index 7044b58..4fc347f 100644
--- a/pages/chose-city/chose-city.vue
+++ b/pages/chose-city/chose-city.vue
@@ -339,14 +339,41 @@ export default {
return
}
uni.navigateTo({
- url: '/pagesInn/inn/innHome?id=' + id
+ url: '/pagesInn/inn/innHome?id=' + id + '&from=' + this.getOptionsParams()
})
},
goToGoods(productId) {
if (!productId) {
return
}
- this.$global.navToGoods(productId)
+ uni.navigateTo({
+ url: `/pages/shop/GoodsCon/index?id=${productId}&from=${this.getOptionsParams()}`
+ })
+ },
+ getOptionsParams() {
+ // 0、特产；1、文玩;2、七彩云上；3、特色礼品；4、康养食材；5、千县名品；6、景点门票
+ let from = ''
+ switch(this.type) {
+ case 0:
+ from = 'techan'
+ break
+ case 1:
+ from = 'wenwan'
+ break
+ case 3:
+ from = 'gift'
+ break
+ case 4:
+ from = 'wellness'
+ break
+ case 5:
+ from = 'famous'
+ break
+ default:
+ from = ''
+ break
+ }
+ return from
},
bannerItemTapHandle(banner) {
if (!banner) {
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 35e1cbf..ec29aca 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -422,6 +422,7 @@ import cookie from "@/utils/store/cookie";
import {famousGoodsShareImage, secKillGoodsShareImage} from "@/api/share";
import CouponsPopup from "@/components/CouponsPopup.vue"
import {addProduct, checkProduct, removeProduct} from "@/api/favorite";
+import { pageListenMixins } from '@/mixins/pageListenMixins'
export default {
name: "GoodsCon",
@@ -434,6 +435,7 @@ export default {
ShareInfo,
CouponsPopup
},
+ mixins: [pageListenMixins],
data: function () {
return {
isProductInfoExpand: true, //商品信息是否展开
@@ -504,7 +506,8 @@ export default {
// v9-2
show: false,
uniqueId: null,
- isFavorite: false
+ isFavorite: false,
+ pageKeyId: ''
};
},
computed: mapGetters(["isLogin", "location", "userInfo"]),
@@ -541,6 +544,49 @@ export default {
console.log("getEnterOptionsSync", uni.getEnterOptionsSync());
uni.removeStorageSync('couponId')
+ const from = options.from
+ const id = options.id
+ switch (from) {
+ // 特产
+ case 'techan':
+ this.pageKeyId = `product_from_goods_productId_${id}`
+ break
+ // 地标好物
+ case 'landmark':
+ this.pageKeyId = `product_from_landmarkGoods_productId_${id}`
+ break
+ // 节日
+ case 'gift':
+ this.pageKeyId = `product_from_appContentFestival_productId_${id}`
+ break
+ // 时令尝鲜
+ case 'season':
+ this.pageKeyId = `product_from_seasonalFood_productId_${id}`
+ break
+ // 秒杀
+ case 'kill':
+ this.pageKeyId = `seckillProduct_seckillId_${options.activityId}`
+ break
+ // 文玩
+ case 'wenwan':
+ this.pageKeyId = `product_from_wenwan_productId_${id}`
+ break
+ // 非遗文化
+ case 'ich':
+ this.pageKeyId = `product_from_ich_productId_${id}`
+ break
+ // 康养食材
+ case 'wellness':
+ this.pageKeyId = `product_from_wellnessFood_productId_${id}`
+ break
+ // 千县
+ case 'famous':
+ this.pageKeyId = `product_from_countyFamous_productId_${id}`
+ break
+ default:
+ break
+ }
+
let url = handleQrCode();
if (url && url.productId) {
this.id = url.productId;
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index bcf4bf4..d1e4b7f 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -428,11 +428,13 @@ import {getUrlParam} from "@/utils/common.js"
import imgBox from '@/components/imageTypeSet/imagebox.vue'
import cookie from "@/utils/store/cookie"
import {addStore, removeStore} from "@/api/favorite"
+import { pageListenMixins } from '@/mixins/pageListenMixins'
export default {
components: {
imgBox
},
+ mixins: [pageListenMixins],
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
@@ -469,7 +471,8 @@ export default {
{ text: '商家资质', value: 3, isShow: true }
],
isLoadGoodListoSuccess: false,
- isLoadInfoListSuccess: false
+ isLoadInfoListSuccess: false,
+ pageKeyId: ''
}
},
// 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
@@ -477,8 +480,42 @@ export default {
this.scrollData = e
},
onLoad(options) {
- if (options.id) {
- this.id = options.id || null
+ const id = options.id || ''
+ const from = options.from
+ switch (from) {
+ // 特产
+ case 'techan':
+ this.pageKeyId = `hotel_from_techan_hotelId_${id}`
+ break
+ // 千县
+ case 'famous':
+ this.pageKeyId = `hotel_from_famous_hotelId_${id}`
+ break
+ // 特色礼品
+ case 'gift':
+ this.pageKeyId = `hotel_from_gift_hotelId_${id}`
+ break
+ // 文玩
+ case 'wenwan':
+ this.pageKeyId = `hotel_from_wenwan_hotelId_${id}`
+ break
+ // 寻趣味
+ case 'fun':
+ this.pageKeyId = `hotel_from_findFun_hotelId_${id}`
+ break
+ // 养生圣地
+ case 'wellness':
+ this.pageKeyId = `hotel_from_wellnessPlace_hotelId_${id}`
+ break
+ // 民宿
+ case 'homestay':
+ this.pageKeyId = `product_from_countyFamous_productId_${id}`
+ break
+ default:
+ break
+ }
+ if (id) {
+ this.id = id || null
this.partnerId = options.partnerId || null
} else {
let obj = uni.getEnterOptionsSync()
diff --git a/pkg_product/views/nativeList.vue b/pkg_product/views/nativeList.vue
index 8a8bf49..76011ad 100644
--- a/pkg_product/views/nativeList.vue
+++ b/pkg_product/views/nativeList.vue
@@ -36,7 +36,7 @@
v-for="(item, index) in dataList"
:key="index"
class="item"
- @click="$global.navToGoods(item.id)"
+ @click="goodItemClick(item.id)"
>
Date: Mon, 24 Jun 2024 15:15:52 +0800
Subject: [PATCH 37/57] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84):[#1857]=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/User/index.vue | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 30e489e..2c3dd63 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -31,7 +31,9 @@
- {{ userInfo.nickname }}
+
+ {{ userInfo.nickname }}
+
Date: Mon, 24 Jun 2024 16:10:54 +0800
Subject: [PATCH 38/57] =?UTF-8?q?Feat(=E7=94=A8=E6=88=B7&=E7=99=BB?=
=?UTF-8?q?=E5=BD=95):=E5=A2=9E=E5=8A=A0=E6=80=A7=E5=88=AB=E5=92=8C?=
=?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/authorization/index.vue | 87 +++++++++---
pkg_user/views/personalData.vue | 236 +++++++++++++++-----------------
2 files changed, 178 insertions(+), 145 deletions(-)
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index e01b481..81017ed 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -40,12 +40,54 @@
- 请完善您的头像和昵称
-
@@ -61,10 +103,8 @@
import {mapActions, mapMutations, mapState} from 'vuex'
import cookie from '@/utils/store/cookie'
import {login, uploadImage} from '@/utils'
-import {getAgree} from "@/api/public";
-import {postUserEdit} from "@/api/user";
-
-const defaultAvatarUrl = "/20230506100714762257.png"
+import {getAgree} from "@/api/public"
+import {postUserEdit} from "@/api/user"
export default {
data() {
@@ -75,10 +115,13 @@ export default {
agreeInfo: {},
isAgree: false,
show: false,
-
showFillOut: false,
- nickname: "",
- avatarUrl: this.$VUE_APP_RESOURCES_URL + defaultAvatarUrl,
+ nickname: '',
+ avatarUrl: this.$VUE_APP_RESOURCES_URL + '/20230506100714762257.png',
+ form: {
+ gender: '',
+ birthday: ''
+ }
}
},
computed: {
@@ -205,9 +248,11 @@ export default {
},
saveUserInfo() {
- let param = {
+ const param = {
nickname: this.nickname,
- avatar: this.avatarUrl
+ avatar: this.avatarUrl,
+ gender: this.form.gender || 0,
+ birthday: this.form.birthday || ''
}
postUserEdit(param).then(res => {
if (res.status === 200) {
@@ -336,7 +381,6 @@ export default {
box-sizing: border-box;
overflow: hidden;
width: 516rpx;
- height: 576rpx;
border-radius: 24rpx;
background: #fff;
@@ -374,13 +418,20 @@ export default {
font-size: 32rpx;
text-align: center;
}
+ .gender-row {
+ display: flex;
+ align-items: center;
+ margin-top: 32rpx;
+ }
+ .picker {
+ text-align: center;
+ line-height: 72rpx;
+ }
.btn-submit {
- position: absolute;
- bottom: 0;
- left: 0;
width: 100%;
height: 100rpx;
+ margin: 32rpx 0 0 0;
box-sizing: border-box;
border-top: 2rpx solid #E0E0E0;
color: #3A87FC;
diff --git a/pkg_user/views/personalData.vue b/pkg_user/views/personalData.vue
index e3bfda2..d78d9fb 100644
--- a/pkg_user/views/personalData.vue
+++ b/pkg_user/views/personalData.vue
@@ -37,7 +37,51 @@
-
+
+
+ 性别
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 出生日期
+
+
+
+
+
+
+
+
+
+
+
手机号
@@ -47,7 +91,6 @@
-
支付密码
@@ -57,29 +100,20 @@
-
-
-
-
-
-
-
-
-
@@ -290,7 +270,6 @@ export default {
.cell-box {
width: 686rpx;
- height: 406rpx;
margin: -130rpx 32rpx 0;
padding: 0 40rpx 20rpx;
box-shadow: 0 6rpx 12rpx rgba(0, 0, 0, 0.16);
@@ -317,6 +296,9 @@ export default {
color: #999999;
font-size: 32rpx;
line-height: 48rpx;
+ .picker {
+ width: 400rpx;
+ }
}
.icon {
From 302a6c2b40444c5a11ce36a4b3679792a3529617 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 24 Jun 2024 16:32:16 +0800
Subject: [PATCH 39/57] =?UTF-8?q?Fix(=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85)?=
=?UTF-8?q?:=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9D=A5=E6=BA=90=E6=98=BE=E7=A4=BA=E5=95=86?=
=?UTF-8?q?=E5=93=81=E4=B8=8D=E5=90=8C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index ec29aca..90f6e16 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -13,7 +13,7 @@
-
+
{{ storeInfo.storeName }}
@@ -883,7 +883,7 @@ export default {
this.posterImageStatus = !this.posterImageStatus;
this.posters = false;
},
- //产品详情接口；
+ // 产品详情接口
productCon: function () {
const from = this.location
if (this.$deviceType == 'app') {
@@ -901,7 +901,7 @@ export default {
this.$set(this, 'storeInfo', data.storeInfo)
this.isWenwan = data.isWenwan
// 给 attr 赋值，将请求回来的规格赋值给 attr
- if (this.source === '' || this.source === 'famous') {
+ if (this.source !== 'pre' && this.source !== 'day' && this.source !== 'kill' && this.source !== 'spe') {
this.$set(this.attr, 'productAttr', data.productAttr)
this.productValueArr = []
for (const key in data.productValue) {
From 138abd46a25cdd1f7da6ec513da8201d1d2257be Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 24 Jun 2024 16:33:17 +0800
Subject: [PATCH 40/57] =?UTF-8?q?Fix(=E5=AF=BB=E8=B6=A3=E5=91=B3):?=
=?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=E5=AF=BC=E8=87=B4=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cloud/haveFun.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 62698a4..89b7706 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -114,9 +114,9 @@ export default {
this.fetchList()
},
onLoad() {
- this.getMapData()
getHotelTypeList().then(({data}) => {
- this.typeList = data;
+ this.typeList = data
+ this.getMapData()
})
},
onShow() {
From b7cb860c5e597773aea359929245d3d2e8ade608 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 25 Jun 2024 09:32:43 +0800
Subject: [PATCH 41/57] =?UTF-8?q?Fix(=E5=AF=BB=E8=B6=A3=E5=91=B3):[#1863]?=
=?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E7=B1=BB=EF=BC=8C=E6=88=96=E5=88=87?=
=?UTF-8?q?=E6=8D=A2=E5=9F=8E=E5=B8=82=E6=97=B6=EF=BC=8C=E6=B8=85=E7=A9=BA?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cloud/haveFun.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 89b7706..66ffb16 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -124,6 +124,7 @@ export default {
if (memCityName.length) {
this.cityName = memCityName
uni.removeStorageSync('cityName')
+ this.name = ''
this.search()
}
},
@@ -150,6 +151,7 @@ export default {
tapType(index) {
if (this.typeIndex === index) return
this.typeIndex = index
+ this.name = ''
this.search()
},
search() {
From 7e9eb39a3283f9f5c83d473f41f0a600b4104977 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 25 Jun 2024 09:35:34 +0800
Subject: [PATCH 42/57] =?UTF-8?q?Fix(=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86)?=
=?UTF-8?q?:[#1862]=E6=9C=89=E8=AE=B0=E5=BD=95=E6=97=B6=E4=B8=8D=E8=A6=81?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9A=82=E6=97=A0=E8=AE=B0=E5=BD=95=E5=9B=BE?=
=?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/UserBill/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/user/UserBill/index.vue b/pages/user/UserBill/index.vue
index ce74d4e..3c541ce 100644
--- a/pages/user/UserBill/index.vue
+++ b/pages/user/UserBill/index.vue
@@ -25,7 +25,7 @@
-
+
From d1304ff4c5e62c30fac5a6971c9bac7656caf278 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 25 Jun 2024 09:52:48 +0800
Subject: [PATCH 43/57] =?UTF-8?q?Fix(=E8=B4=AD=E7=89=A9=E8=BD=A6):[#1864]?=
=?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=AE=B6=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF=EF=BC=8C=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E2=80=9C=E8=BF=9B=E5=BA=97=E9=80=9B=E9=80=9B=E2=80=9D=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E5=AD=97=E6=A0=B7=E6=8A=98=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cart.vue | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/pages/cart.vue b/pages/cart.vue
index c916231..240dd75 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -29,7 +29,7 @@
class="group-item"
>
-
+
- {{ item['merName'] }}
+ {{ item['merName'] }}
进店逛逛
@@ -560,7 +559,7 @@ view {
.group-item {
width: 710rpx;
margin: 12rpx 20rpx;
- padding: 8rpx 8rpx 32rpx 20rpx;
+ padding: 20rpx 8rpx 32rpx 20rpx;
background: #FFFFFF;
border-radius: 12rpx;
@@ -570,6 +569,20 @@ view {
margin-right: 8rpx;
border-radius: 50%;
}
+ .mer-left {
+ width: calc(100% - 140rpx);
+ }
+ .mer-name {
+ width: calc(100% - 104rpx);
+ color: #333;
+ font-size: 30rpx;
+ }
+ .hotle-btn {
+ justify-content: flex-end;
+ width: 140rpx;
+ color: #E92727;
+ font-size: 24rpx;
+ }
}
.good-box {
From ef2443dc58bb69f077b2da4e935967655a8debae Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 25 Jun 2024 11:07:53 +0800
Subject: [PATCH 44/57] =?UTF-8?q?Fix(=E5=85=A5=E9=A9=BB):[#1811]=E5=95=86?=
=?UTF-8?q?=E6=88=B7=E6=8F=90=E4=BA=A4=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=97=B6=E5=95=86=E5=AE=B6=E8=B5=84=E8=B4=A8=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_join/views/shop.vue | 51 +++++++++++++++++++++++++------------
pkg_join/views/supplier.vue | 50 +++++++++++++++++++++++++-----------
2 files changed, 70 insertions(+), 31 deletions(-)
diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 9f4118e..14ddaeb 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -520,16 +520,27 @@ export default {
}
if (data.hotelInfo) {
- this.pics = [];
- this.form = data.hotelInfo;
- let temp = this.form.pics.split(",");
- if (temp.length > 0) {
- temp.map(item => {
- if (item.length > 0) {
+ // 店铺图片
+ this.pics = []
+ this.form = data.hotelInfo
+ const picsTemp = this.form.pics.split(",")
+ if (picsTemp.length > 0) {
+ picsTemp.map(item => {
+ if (item) {
this.pics.push({url: item})
}
})
}
+ // 商家资质
+ this.quaPics = []
+ const quaPicsTemp = this.form.qualification.split(",")
+ if (quaPicsTemp.length > 0) {
+ quaPicsTemp.map(item => {
+ if (item) {
+ this.quaPics.push({url: item})
+ }
+ })
+ }
this.indexType = this.columnsType.findIndex(item => item.id === this.form.type)
if (this.indexType !== -1) {
this.form.typeText = this.columnsType[this.indexType].name
@@ -673,17 +684,25 @@ export default {
},
save() {
- this.form.pics = "";
- this.pics.map(item => {
- this.form.pics += (item.url + ",");
- })
- this.form.pics = this.form.pics.substring(0, this.form.pics.length - 1);
+ this.form.pics = ''
+ const picsLength = this.pics.length
+ if (picsLength > 0) {
+ const tempArr = []
+ this.pics.map(item => {
+ item.url && tempArr.push(item.url)
+ })
+ this.form.pics = tempArr.join(',')
+ }
- this.form.qualification = "";
- this.quaPics.map(item => {
- this.form.qualification += (item.url + ",");
- })
- this.form.qualification = this.form.qualification.substring(0, this.form.qualification.length - 1);
+ this.form.qualification = ''
+ const quaPicsLength = this.quaPics.length
+ if (quaPicsLength > 0) {
+ const tempArr = []
+ this.quaPics.map(item => {
+ item.url && tempArr.push(item.url)
+ })
+ this.form.qualification = tempArr.join(',')
+ }
const postData = Object.assign({}, this.form)
if (postData.coverType === 2) {
postData.cover = postData.coverVideo
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 8a3980f..fcf671f 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -711,17 +711,27 @@ export default {
}
if (data.hotelInfo) {
- this.pics = [];
- this.form = data.hotelInfo;
- let temp = this.form.pics.split(",");
- if (temp.length > 0) {
- this.pics = [];
- temp.map(item => {
- if (item.length > 0) {
+ // 店铺图片
+ this.pics = []
+ this.form = data.hotelInfo
+ const picsTemp = this.form.pics.split(",")
+ if (picsTemp.length > 0) {
+ picsTemp.map(item => {
+ if (item) {
this.pics.push({url: item})
}
})
}
+ // 商家资质
+ this.quaPics = []
+ const quaPicsTemp = this.form.qualification.split(",")
+ if (quaPicsTemp.length > 0) {
+ quaPicsTemp.map(item => {
+ if (item) {
+ this.quaPics.push({url: item})
+ }
+ })
+ }
this.indexType = this.columnsType.findIndex(item => item.id === this.form.type);
this.form.typeText = this.columnsType[this.indexType].name;
this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6);
@@ -925,15 +935,25 @@ export default {
},
save() {
- this.form.pics = "";
- this.pics.map(item => {
- this.form.pics += (item.url + ",");
- })
+ this.form.pics = ''
+ const picsLength = this.pics.length
+ if (picsLength > 0) {
+ const tempArr = []
+ this.pics.map(item => {
+ item.url && tempArr.push(item.url)
+ })
+ this.form.pics = tempArr.join(',')
+ }
- this.formSupplier.qualification = "";
- this.quaPics.map(item => {
- this.formSupplier.qualification += (item.url + ",");
- })
+ this.formSupplier.qualification = ''
+ const quaPicsLength = this.quaPics.length
+ if (quaPicsLength > 0) {
+ const tempArr = []
+ this.quaPics.map(item => {
+ item.url && tempArr.push(item.url)
+ })
+ this.formSupplier.qualification = tempArr.join(',')
+ }
const postData = Object.assign({}, this.form)
if (postData.coverType === 2) {
postData.cover = postData.coverVideo
From f9b8ca6bf2ac16a5f4ed3cbae4120c4f938833b8 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 26 Jun 2024 14:40:45 +0800
Subject: [PATCH 45/57] =?UTF-8?q?Feat(=E9=A1=B5=E9=9D=A2):=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=9F=8B=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 1 +
pagesInn/inn/innHome.vue | 1 +
pkg_product/views/famousHot.vue | 8 +-
pkg_product/views/famousStory.vue | 13 +-
pkg_product/views/healthList.vue | 234 ++++++++++++++++++++----------
pkg_product/views/nativeList.vue | 10 +-
6 files changed, 184 insertions(+), 83 deletions(-)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 90f6e16..74cf7c1 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -584,6 +584,7 @@ export default {
this.pageKeyId = `product_from_countyFamous_productId_${id}`
break
default:
+ this.pageKeyId = `product_from_common_productId_${id}`
break
}
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index d1e4b7f..fd2cdb3 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -512,6 +512,7 @@ export default {
this.pageKeyId = `product_from_countyFamous_productId_${id}`
break
default:
+ this.pageKeyId = `hotel_from_common_hotelId_${id}`
break
}
if (id) {
diff --git a/pkg_product/views/famousHot.vue b/pkg_product/views/famousHot.vue
index 0e4a87c..0155832 100644
--- a/pkg_product/views/famousHot.vue
+++ b/pkg_product/views/famousHot.vue
@@ -7,7 +7,7 @@
-
+
@@ -25,7 +25,11 @@
{{ item.storeName }}
- {{ tag }}
+ {{ tag }}
diff --git a/pkg_product/views/famousStory.vue b/pkg_product/views/famousStory.vue
index 4594aa6..661c69e 100644
--- a/pkg_product/views/famousStory.vue
+++ b/pkg_product/views/famousStory.vue
@@ -1,15 +1,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 2bac749ca411cce68e96412db44413de5096a134 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 26 Jun 2024 15:40:08 +0800
Subject: [PATCH 48/57] =?UTF-8?q?Feat(=E5=BA=97=E9=93=BA):=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E5=BA=97=E9=93=BA?=
=?UTF-8?q?=E8=B5=84=E8=B4=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesInn/inn/innProfileEdit.vue | 59 ++++++++++++++++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue
index 16d4072..dda4b3d 100644
--- a/pagesInn/inn/innProfileEdit.vue
+++ b/pagesInn/inn/innProfileEdit.vue
@@ -136,6 +136,14 @@
-->
+
+
+
+ 店铺图片
+ 最多上传9张图片
+
+
+
+
+
+
+ 店铺资质
+ 最多上传9张图片
+
+
+
+
+
+
+
+
确定修改
@@ -176,10 +204,12 @@ export default {
},
innHistory: {}, // 历史信息
picsArray: [],
+ qualificationsArray: [],
typeList: [], // 类型列表
typeIndex: 0, // 选中的类型
typeRange: [], // 类型数据源
uploadedFilesArray: [],
+ uploadedQualificationFilesArray: [],
innApplyInfo: {
'address': '',
'areaId': 0,
@@ -193,6 +223,7 @@ export default {
'name': '',
'ownerName': '',
'pics': [],
+ 'qualification': [],
'position': '',
'tel': '',
'qrcode': '',
@@ -209,6 +240,7 @@ export default {
if (id) {
// 赋值
const hotel = JSON.parse(uni.getStorageSync('MY_HOTEL_INFO'))
+ console.log(hotel)
this.innHistory = hotel
this.fillData(this.innApplyInfo, this.innHistory)
if (hotel.coverType === 2) {
@@ -216,7 +248,7 @@ export default {
} else {
this.innApplyInfo.coverVideo = ''
}
- // 图片填充
+ // 店铺图片
this.picsArray = hotel.pics.map(item => {
return {
path: item,
@@ -224,6 +256,17 @@ export default {
}
})
this.uploadedFilesArray = hotel.pics || []
+ // 资质
+ const uploadedQualificationFilesArray = []
+ this.qualificationsArray = hotel.qualifications.map(item => {
+ const image = item.image || ''
+ uploadedQualificationFilesArray.push(image)
+ return {
+ path: item.image,
+ upload_percent: 100
+ }
+ })
+ this.uploadedQualificationFilesArray = uploadedQualificationFilesArray
}
},
methods: {
@@ -261,6 +304,10 @@ export default {
uploadedImgChange: function (uploadedFilesList) {
this.uploadedFilesArray = uploadedFilesList
},
+ // 文件上传结果
+ uploadedImg2Change: function (uploadedFilesList) {
+ this.uploadedQualificationFilesArray = uploadedFilesList
+ },
chooseQrcodeImg() {
chooseImage(img => {
this.$set(this.innApplyInfo, 'qrcode', img)
@@ -311,11 +358,16 @@ export default {
this.$dialog.error('请上传至少一张店铺图片')
return
}
+ if (this.uploadedQualificationFilesArray.length === 0) {
+ this.$dialog.error('请上传至少一张店铺资质图片')
+ return
+ }
// 深拷贝
const param = JSON.parse(JSON.stringify(this.innApplyInfo))
if (this.uploadedFilesArray.length > 0) {
param.pics = this.uploadedFilesArray.join(',')
}
+ param.qualification = this.uploadedQualificationFilesArray
param.id = this.innHistory.id
if (param.coverType === 2) {
param.cover = param.coverVideo
@@ -430,6 +482,11 @@ export default {
flex-shrink: 0;
margin-right: 10rpx;
}
+.base-info-section .item.is_required .cell .cell-title .txt {
+ margin: 0 0 0 8px;
+ color: red;
+ font-size: 22rpx;
+}
.base-info-section .item.is_required .cell .cell-value {
flex-grow: 1;
From d4f61842fb025e5dd9254c48b7cf59e72ee6718f Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 26 Jun 2024 16:08:29 +0800
Subject: [PATCH 49/57] =?UTF-8?q?Fix(=E7=99=BB=E5=BD=95):=E5=87=BA?=
=?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=9F=E9=80=89=E4=B8=AD=E6=9C=AA=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/authorization/index.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 81017ed..5b0c691 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -217,6 +217,10 @@ export default {
inputName(e) {
this.nickname = e.detail.value;
},
+ birthdayChange(e) {
+ const value = e.detail.value
+ this.form.birthday = value
+ },
onSubmit() {
let that = this;
From 28ffaee0ceff9019782c30a5450600cab8113d91 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 26 Jun 2024 16:45:48 +0800
Subject: [PATCH 50/57] =?UTF-8?q?Feat(=E5=9C=B0=E5=9D=80=E7=AE=A1=E7=90=86?=
=?UTF-8?q?):=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/user.js | 7 +
pages/user/address/AddAddress/index.vue | 165 +++++++++++++++++-------
2 files changed, 127 insertions(+), 45 deletions(-)
diff --git a/api/user.js b/api/user.js
index 1a1b3e0..62e18f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -273,6 +273,13 @@ export function postAddress(data) {
return request.post("/address/edit", data);
}
+/*
+ * 自动识别收货地址
+ * */
+export function analysisAddress(data) {
+ return request.post("/address/analysis", data);
+}
+
/*
* 获取收藏产品
* */
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index 27ca54d..6db7837 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -7,7 +7,7 @@
联系电话
-
+
所在地区
@@ -29,6 +29,31 @@
+
+
+
+
+
+
+ 清空
+
+
+ 识别
+
+
+
@@ -48,13 +73,12 @@