From 7740e8f6a8e0d67428eddff1fd28ec4d52138e06 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 23 Aug 2024 17:45:06 +0800
Subject: [PATCH 01/30] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF=E5=BA=97=E9=93=BA?=
=?UTF-8?q?):=E6=9D=91=E5=B1=8B=E5=87=BA=E7=A7=9F=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/qianxian.js | 15 +
pages.json | 7 +
pkg_product/views/famousQianxianShop.vue | 180 ++++-
.../views/famousQianxianVillageShop.vue | 653 ++++++++++++++++++
4 files changed, 849 insertions(+), 6 deletions(-)
create mode 100644 pkg_product/views/famousQianxianVillageShop.vue
diff --git a/api/qianxian.js b/api/qianxian.js
index a40aabc..bbe592d 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -79,3 +79,18 @@ export function getCountyFamousIndustryProjectFile(param) {
export function getCountyFamousInvestmentFile(param) {
return request.get('/countyFamous/investmentFile', param, { login: true })
}
+
+// 获取千县名品县城村屋列表
+export function getCountyFamousVillage(param) {
+ return request.get('/countyFamous/village', param, { login: true })
+}
+
+// 获取千县名品县城村屋详情
+export function getCountyFamousVillageDetail(id) {
+ return request.get('/countyFamous/village/' + id, {}, { login: true })
+}
+
+// 获取千县名品县城村屋资讯
+export function getCountyFamousVillageNews(param) {
+ return request.get('/countyFamous/village/news', param, { login: true })
+}
diff --git a/pages.json b/pages.json
index 6a8584a..ce30577 100644
--- a/pages.json
+++ b/pages.json
@@ -597,6 +597,13 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "views/famousQianxianVillageShop",
+ "style": {
+ "navigationBarTitleText": "千县名品",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "views/famousQianxianInvestment",
"style": {
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 0333000..23a6394 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -44,8 +44,8 @@
class="city-section flex jc-end ai-center"
>
{{ inn.cityName }}
@@ -417,6 +417,72 @@
+
+
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ village.address }}
+
+
+
+
+
+ {{ village.intro }}
+
+
+
+
+ {{ village.name }}
+
+
+
+
+
+ 暂无村屋出租
+
+
+
+
@@ -458,7 +524,8 @@ import {
postCountyFamousNewsView,
getCountyFamousIndustry,
getCountyFamousIndustryProject,
- getCountyFamousInvestmentFile
+ getCountyFamousInvestmentFile,
+ getCountyFamousVillage
} from '@/api/qianxian'
import {formatDateTime} from '@/utils'
import {getUrlParam} from '@/utils/common.js'
@@ -518,9 +585,12 @@ export default {
industryProjectList: [],
// 招商政策文件列表
investmentFileList: [],
+ // 村屋列表
+ villageList: [],
industryTab: [
{ name: '产业项目', icon: '/page/qianxian/icon-04.png' },
- { name: '招商政策', icon: '/page/qianxian/icon-03.png' }
+ { name: '招商政策', icon: '/page/qianxian/icon-03.png' },
+ { name: '村屋出租', icon: '/page/qianxian/icon-07.png' }
],
industryTabIndex: 0
}
@@ -581,6 +651,16 @@ export default {
this.investmentFileList = data.records || []
}
})
+ getCountyFamousVillage({
+ countyFamousDataId: this.id,
+ page: 1,
+ limit: 9999
+ }).then(res => {
+ const { success, data } = res
+ if (success) {
+ this.villageList = data.records || []
+ }
+ })
},
getShopDetailReq() {
const _this = this
@@ -865,6 +945,9 @@ export default {
},
gotoInvestment() {
uni.navigateTo({ url: `/pkg_product/views/famousQianxianInvestment?id=${this.id}` })
+ },
+ villageItemClick(item) {
+ uni.navigateTo({ url: `/pkg_product/views/famousQianxianVillageShop?id=${item.id}` })
}
}
}
@@ -1330,12 +1413,15 @@ export default {
z-index: 2;
display: block;
width: 750rpx;
- height: 530rpx;
+ height: 518rpx;
+ }
+ .bg3 {
+ height: 1159rpx;
}
.card-cont {
position: absolute;
z-index: 5;
- top: 30rpx;
+ top: 20rpx;
left: 30rpx;
right: 30rpx;
.tab-wrap {
@@ -1417,6 +1503,88 @@ export default {
}
}
}
+ .village-wrap {
+ height: 980rpx;
+ padding: 16rpx 0 0 0;
+ overflow-y: auto;
+ }
+ .village-list {
+ display: flex;
+ flex-wrap: wrap;
+ width: 660rpx;
+ margin: 0 auto;
+ .village-item {
+ width: 320rpx;
+ height: 480rpx;
+ margin: 0 20rpx 20rpx 0;
+ border-radius: 16rpx;
+ background-color: #f0f0f0;
+ &:nth-child(2n) {
+ margin-right: 0;
+ }
+ .img-wrap {
+ position: relative;
+ .img {
+ display: block;
+ width: 320rpx;
+ height: 320rpx;
+ border-radius: 16rpx;
+ }
+ .location {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 5;
+ display: flex;
+ align-items: center;
+ height: 60rpx;
+ padding: 0 20rpx;
+ border-radius: 0 0 16rpx 16rpx;
+ font-size: 28rpx;
+ line-height: 36rpx;
+ color: #fff;
+ background: linear-gradient(180deg, rgba(0,0,0,0) 0%, #000000 100%);
+ .icon {
+ display: block;
+ width: 28rpx;
+ height: 28rpx;
+ margin: 0 8rpx 0 0;
+ }
+ .addr {
+ width: calc(100% - 40rpx);
+ }
+ }
+ }
+ .info {
+ padding: 6rpx 8rpx 16rpx 8rpx;
+ .intro {
+ height: 80rpx;
+ line-height: 40rpx;
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #333;
+ }
+ .name-wrap {
+ display: flex;
+ align-items: center;
+ .logo {
+ display: block;
+ width: 48rpx;
+ height: 48rpx;
+ margin: 0 8rpx 0 0;
+ }
+ .name {
+ width: calc(100% - 60rpx);
+ padding: 10rpx 0 0 0;
+ font-size: 28rpx;
+ line-height: 48rpx;
+ color: #999;
+ }
+ }
+ }
+ }
+ }
}
}
.project-wrap {
diff --git a/pkg_product/views/famousQianxianVillageShop.vue b/pkg_product/views/famousQianxianVillageShop.vue
new file mode 100644
index 0000000..e0878a9
--- /dev/null
+++ b/pkg_product/views/famousQianxianVillageShop.vue
@@ -0,0 +1,653 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ inn.cityName }}
+
+
+
+
+
+
+
+
+
+ {{ inn.name }}
+
+ {{ inn.contact }}/联系人
+
+
+
+
+
+
+
+ {{ inn.intro }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ inn.address }}
+
+
+
+
+ 导航
+
+
+
+ 客服
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
+
+ 暂无图片~
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无资讯~
+
+
+
+
+
+
+
+
+
+
+
+
From 5fc4159e08bc14bf634916e3315428d25aa8eeb4 Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 26 Aug 2024 10:35:57 +0800
Subject: [PATCH 02/30] =?UTF-8?q?Style(=E6=9D=91=E5=B1=8B=E5=87=BA?=
=?UTF-8?q?=E7=A7=9F)=EF=BC=9A=E6=8B=9B=E7=A7=9F=E6=9D=91=E5=B1=8B?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousQianxianShop.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 23a6394..dd988f8 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -1564,6 +1564,7 @@ export default {
font-size: 30rpx;
font-weight: bold;
color: #333;
+ margin-top: 8rpx;
}
.name-wrap {
display: flex;
@@ -1573,6 +1574,7 @@ export default {
width: 48rpx;
height: 48rpx;
margin: 0 8rpx 0 0;
+ border-radius: 50%;
}
.name {
width: calc(100% - 60rpx);
From 77453380fa94313159b5e850c3f687e5df7a3697 Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 26 Aug 2024 11:49:54 +0800
Subject: [PATCH 03/30] =?UTF-8?q?Style:=2012=E6=9C=9F=E9=80=9A=E7=94=A8?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 44 +++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 assets/css/v12-style.less
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
new file mode 100644
index 0000000..11dfc7e
--- /dev/null
+++ b/assets/css/v12-style.less
@@ -0,0 +1,44 @@
+/*================变量==================*/
+@primary-color: #C52733;
+@dark-color: #333333;
+@white-color: #fff;
+/*=====================================*/
+
+.v12-primary{
+ background-color: @primary-color;
+ background: @primary-color;
+}
+.v12-primary-text{
+ color: @primary-color;
+}
+.v12-dark{
+ background: @dark-color !important;
+ background-color: @dark-color !important;
+}
+.v12-dark-text{
+ color: @dark-color !important;
+}
+.v12-white{
+ background-color: @white-color;
+ background: @white-color;
+}
+.v12-white-color{
+ background-color: @white-color;
+ background: @white-color;
+}
+
+.generateFontSize(@i) when (@i <= 80) {
+ .v12-font-@{i} {
+ font-size: @i * 1rpx !important;
+ }
+ .generateFontSize(@i + 4);
+}
+
+.generateFontSize(20);
+
+.v12-font-bold{
+ font-weight: bold !important;
+}
+
+
+
From 32a7e311fc05a94d5c71465b28a9329bfb78f740 Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 26 Aug 2024 11:50:35 +0800
Subject: [PATCH 04/30] =?UTF-8?q?Style(=E5=8D=83=E5=8E=BF=E5=90=8D?=
=?UTF-8?q?=E5=93=81)=EF=BC=9A=E5=8E=BF=E5=9F=8E=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E6=96=87=E5=AD=97=E5=8A=A0=E5=A4=A7?=
=?UTF-8?q?=E5=8A=A0=E7=B2=97=EF=BC=8C=E5=8F=82=E8=80=83=E6=95=88=E6=9E=9C?=
=?UTF-8?q?=E5=9B=BE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 +
pkg_product/views/famousQianxianShop.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/App.vue b/App.vue
index 52efa1a..38ef2d8 100644
--- a/App.vue
+++ b/App.vue
@@ -25,4 +25,5 @@ export default {
@import "./assets/css/base.less";
@import "./assets/css/reset.less";
@import "./assets/css/style.less";
+@import "./assets/css/v12-style.less";
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index dd988f8..e42d9e1 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -57,7 +57,7 @@
- {{ inn.name }}
+ {{ inn.name }}
From 9803c53c3b25ab4bc17664744d2e3b97ac30915c Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 26 Aug 2024 14:55:43 +0800
Subject: [PATCH 05/30] =?UTF-8?q?Style(=E5=8D=83=E5=8E=BF=E5=90=8D?=
=?UTF-8?q?=E5=93=81)=EF=BC=9A=E6=8B=9B=E5=95=86=E6=94=BF=E7=AD=96?=
=?UTF-8?q?=E6=9A=82=E6=97=A0=E9=A1=B9=E7=9B=AE=E6=96=87=E5=AD=97=E5=B1=85?=
=?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 11 +++++++++++
pkg_product/views/famousQianxianShop.vue | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 11dfc7e..3c1ff9a 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -40,5 +40,16 @@
font-weight: bold !important;
}
+.v12-align-center{
+ display: flex;
+ align-items: center;
+}
+.v12-justify-center{
+ display: flex;
+ justify-content: center;
+}
+
+
+
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index e42d9e1..1a8afe9 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -388,7 +388,7 @@
{{ tab.name }}
-
+
Date: Mon, 26 Aug 2024 16:55:16 +0800
Subject: [PATCH 06/30] =?UTF-8?q?Fix(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
=?UTF-8?q?=EF=BC=9A=E6=96=87=E5=8C=96=E7=9A=84=E5=9B=BE=E7=89=87=E5=85=A8?=
=?UTF-8?q?=E9=83=A8=E9=9D=A0=E5=B7=A6=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 41 +++++++++++-------------
pkg_product/views/famousQianxianShop.vue | 8 ++---
2 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 3c1ff9a..5fdf542 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -2,30 +2,22 @@
@primary-color: #C52733;
@dark-color: #333333;
@white-color: #fff;
+
+@colors: #C52733, #333333, #fff;
+@classnames: primary, dark, white;
/*=====================================*/
-.v12-primary{
- background-color: @primary-color;
- background: @primary-color;
-}
-.v12-primary-text{
- color: @primary-color;
-}
-.v12-dark{
- background: @dark-color !important;
- background-color: @dark-color !important;
-}
-.v12-dark-text{
- color: @dark-color !important;
-}
-.v12-white{
- background-color: @white-color;
- background: @white-color;
-}
-.v12-white-color{
- background-color: @white-color;
- background: @white-color;
-}
+each(@colors, {
+ @color: extract(@colors, @index);
+ @classname: extract(@classnames, @index);
+ .v12-@{classname} {
+ background-color: @color !important;
+ background: @color !important;
+ }
+ .v12-@{classname}-text{
+ color: @color !important;
+ }
+});
.generateFontSize(@i) when (@i <= 80) {
.v12-font-@{i} {
@@ -48,6 +40,11 @@
display: flex;
justify-content: center;
}
+.v12-d-grid-columns-2 {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+}
+
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 1a8afe9..b26881d 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -240,7 +240,7 @@
图片
-
+
Date: Mon, 26 Aug 2024 17:22:33 +0800
Subject: [PATCH 07/30] =?UTF-8?q?Style(=E5=8D=83=E5=8E=BF=E5=90=8D?=
=?UTF-8?q?=E5=93=81)=EF=BC=9A=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=8E=EF=BC=8C=E8=B0=83=E6=95=B4=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=E6=97=B6=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousList.vue | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/pkg_product/views/famousList.vue b/pkg_product/views/famousList.vue
index d871896..8174a76 100644
--- a/pkg_product/views/famousList.vue
+++ b/pkg_product/views/famousList.vue
@@ -8,9 +8,9 @@
placeholder="请输入关键词县名~"
placeholder-style="color:#949494"
class="inp"
- @confirm="getListReq"
+ @confirm="handlerSearch"
>
-
+
搜索
@@ -153,6 +154,7 @@
{
@@ -296,7 +307,7 @@ export default {
.county-index {
position: relative;
min-height: 100vh;
- background-color: #fff;
+ background-color: #f0f0f0;
.search-wrap {
padding: 20rpx 50rpx;
background-color: #fff;
From 2bf5ba295ec4ed0e5eaf6e6c84847ebc84c14d9d Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 26 Aug 2024 17:57:57 +0800
Subject: [PATCH 08/30] =?UTF-8?q?Fix(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
=?UTF-8?q?=EF=BC=9A=E5=BA=97=E9=93=BA=E2=80=94=E4=BA=A7=E4=B8=9A=E2=80=94?=
=?UTF-8?q?=E6=8B=9B=E5=95=86=E6=94=BF=E7=AD=96=E2=80=94=E6=9B=B4=E5=A4=9A?=
=?UTF-8?q?=E6=94=BF=E7=AD=96=EF=BC=8C=E5=B0=91=E5=81=9A=E4=BA=86=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=E6=A1=86=EF=BC=8C=E6=95=88=E6=9E=9C=E5=9B=BE=E6=98=AF?=
=?UTF-8?q?=E6=9C=89=E6=90=9C=E7=B4=A2=E6=A1=86=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 47 +++++++++++++++++++
.../views/famousQianxianInvestment.vue | 25 ++++++++--
2 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 5fdf542..f737c69 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -28,6 +28,53 @@ each(@colors, {
.generateFontSize(20);
+.generateMarginAndPadding(@n, @i:0) when (@i<= @n) {
+ @baseNum: @i * 8rpx;
+ .v12-mt-@{i} {
+ margin-top: @baseNum;
+ }
+ .v12-ml-@{i} {
+ margin-left: @baseNum;
+ }
+ .v12-mr-@{i} {
+ margin-right: @baseNum;
+ }
+ .v12-mb-@{i} {
+ margin-bottom: @baseNum;
+ }
+ .v12-ma-@{i} {
+ margin: @baseNum;
+ }
+ .v12-mx-@{i} {
+ margin: 0 @baseNum;
+ }
+ .v12-my-@{i} {
+ margin: @baseNum 0;
+ }
+ .v12-pt-@{i} {
+ padding-top: @baseNum;
+ }
+ .v12-pl-@{i} {
+ padding-left: @baseNum;
+ }
+ .v12-pr-@{i} {
+ padding-right: @baseNum;
+ }
+ .v12-pb-@{i} {
+ padding-bottom: @baseNum;
+ }
+ .v12-pa-@{i} {
+ padding: @baseNum;
+ }
+ .v12-px-@{i} {
+ padding: 0 @baseNum
+ }
+ .v12-py-@{i} {
+ padding: @baseNum 0
+ }
+ .generateMarginAndPadding(@n, (@i + 1))
+}
+.generateMarginAndPadding(40);
.v12-font-bold{
font-weight: bold !important;
}
diff --git a/pkg_product/views/famousQianxianInvestment.vue b/pkg_product/views/famousQianxianInvestment.vue
index 4167dc6..f2cc496 100644
--- a/pkg_product/views/famousQianxianInvestment.vue
+++ b/pkg_product/views/famousQianxianInvestment.vue
@@ -1,8 +1,19 @@
+
+
+
+
-
+ /> -->
@@ -37,7 +48,9 @@ export default {
webUrl: this.$VUE_APP_RESOURCES_URL,
isLoad: false,
pageKeyId: '',
- list: []
+ list: [],
+ keyword: '',
+ currentList: []
}
},
onLoad(options) {
@@ -45,6 +58,9 @@ export default {
this.getListReq(id)
},
methods: {
+ handleSearch() {
+ this.currentList = this.list.filter(item => item.title.indexOf(this.keyword) > -1)
+ },
getListReq(id) {
getCountyFamousInvestmentFile({
countyFamousDataId: id,
@@ -55,6 +71,7 @@ export default {
if (success) {
this.isLoad = true
this.list = data.records || []
+ this.currentList = [...this.list]
}
})
},
From b092e8c9c58236c827a2ed9462c33912a7007fe7 Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 26 Aug 2024 18:11:17 +0800
Subject: [PATCH 09/30] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F)?=
=?UTF-8?q?=EF=BC=9A=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E2=80=94=E5=8D=83?=
=?UTF-8?q?=E5=8E=BF=E5=BA=97=E9=93=BA=EF=BC=8C=E5=85=A8=E9=80=89=E6=95=B0?=
=?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/myFavorite.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index 7b05c69..ba5c552 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -328,6 +328,9 @@ export default {
case 2:
countList = this.videoList
break
+ case 3:
+ countList = this.countyFamousList
+ break
}
countList.forEach(item => {
@@ -393,6 +396,7 @@ export default {
break
case 3:
this.countyFamousList[mark]['state'] = state
+ console.log(this.countyFamousList);
this.isAll = this.selectCount === this.countyFamousList.length
break
}
From 6ad3ba0fd6daf7fd64f8e419783d6496c890ec08 Mon Sep 17 00:00:00 2001
From: linxi
Date: Tue, 27 Aug 2024 09:52:41 +0800
Subject: [PATCH 10/30] =?UTF-8?q?Fix(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
=?UTF-8?q?:=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81=E5=BA=97=E9=93=BA?=
=?UTF-8?q?=E2=80=94=E8=B5=84=E8=AE=AF=E7=BD=AE=E9=A1=B6=E6=9C=AA=E7=94=9F?=
=?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousQianxianShop.vue | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index b26881d..f843c3f 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -705,7 +705,7 @@ export default {
}).then(res => {
const { data } = res
_this.loading = false
- _this.infoArray.push.apply(_this.infoArray, data.records.map((info) => {
+ _this.infoArray.push.apply(_this.infoArray, _this.toTop(data.records).map((info) => {
var pt = info.createTime.replace(/-/g, "/")
info.year = formatDateTime(pt, 'yyyy')
info.monthDay = formatDateTime(pt, 'MM/dd')
@@ -713,12 +713,18 @@ export default {
info.showMore = false
return info
}))
+ // console.log(this.toTop(_this.infoArray));
}).finally(() => {
_this.loading = false
_this.isLoadInfoListSuccess = true
uni.stopPullDownRefresh()
})
},
+ toTop(arr) {
+ return arr.sort((a, b) => {
+ return b.isTop - a.isTop
+ })
+ },
// 攻略
getGuideReq() {
const _this = this
From 2aceabf991547e0c7d3bded2359b1d2206a50fca Mon Sep 17 00:00:00 2001
From: linxi
Date: Tue, 27 Aug 2024 10:15:17 +0800
Subject: [PATCH 11/30] =?UTF-8?q?Fix(=E6=94=BB=E7=95=A5=E4=B8=93=E9=A2=98)?=
=?UTF-8?q?:=E5=BA=97=E9=93=BA=E2=80=94=E2=80=94=E6=94=BB=E7=95=A5?=
=?UTF-8?q?=E4=B8=93=E9=A2=98=E9=A1=B5=E7=AC=AC=E5=9B=9B=E9=A1=B5=E5=92=8C?=
=?UTF-8?q?=E7=AC=AC=E4=BA=94=E9=A1=B5=E4=B9=8B=E9=97=B4=E6=9C=89=E7=99=BD?=
=?UTF-8?q?=E8=BE=B9=EF=BC=88=E8=8B=B9=E6=9E=9C=E6=89=8B=E6=9C=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 2 +-
pkg_product/views/famousQianxianTheme.vue | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index f737c69..8bb6dfb 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -26,7 +26,7 @@ each(@colors, {
.generateFontSize(@i + 4);
}
-.generateFontSize(20);
+.generateFontSize(0);
.generateMarginAndPadding(@n, @i:0) when (@i<= @n) {
@baseNum: @i * 8rpx;
diff --git a/pkg_product/views/famousQianxianTheme.vue b/pkg_product/views/famousQianxianTheme.vue
index 9b4717e..3f38989 100644
--- a/pkg_product/views/famousQianxianTheme.vue
+++ b/pkg_product/views/famousQianxianTheme.vue
@@ -8,7 +8,7 @@
transparent="auto"
color='#ffffff'
/>
-
+
Date: Tue, 27 Aug 2024 10:37:42 +0800
Subject: [PATCH 12/30] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F)?=
=?UTF-8?q?=EF=BC=9A=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F--=E5=8D=83?=
=?UTF-8?q?=E5=8E=BF=E5=BA=97=E9=93=BA=EF=BC=8C=E6=9C=89=E5=A4=9A=E4=B8=AA?=
=?UTF-8?q?=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E9=80=89=E6=8B=A9=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E6=9F=90=E4=B8=AA=E5=BA=97=E9=93=BA=EF=BC=8C=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E5=90=8E=E4=BC=9A=E6=98=BE=E7=A4=BA=E2=80=9Cundefined?=
=?UTF-8?q?=E2=80=9D=E6=88=96=E2=80=9D=E6=82=A8=E8=BF=98=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E6=94=B6=E8=97=8F=E2=80=9C=EF=BC=8C=E5=88=B7=E6=96=B0=E5=90=8E?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/myFavorite.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index ba5c552..dfe2d9f 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -456,6 +456,7 @@ export default {
const res = await removeFavorite(ids)
if (res.success) {
_this.isAll = false
+ _this.page = 1
_this.fetchData()
_this.removeAfter()
}
@@ -463,6 +464,11 @@ export default {
}
})
},
+ computedIsManage(arr) {
+ if(this.isManage && arr.length === 0) {
+ this.isManage = false
+ }
+ },
removeAfter() {
switch (this.tabsIndex) {
case 0:
@@ -490,6 +496,7 @@ export default {
item.state = false
_this.productList.push(item)
})
+ _this.computedIsManage(_this.productList)
_this.page++
}
},
@@ -505,6 +512,7 @@ export default {
item.state = false
_this.storeList.push(item)
})
+ _this.computedIsManage(_this.storeList)
_this.page++
}
},
@@ -519,6 +527,7 @@ export default {
item.state = false
_this.videoList.push(item)
})
+ _this.computedIsManage(_this.videoList)
_this.page++
}
},
@@ -533,6 +542,7 @@ export default {
item.state = false
_this.countyFamousList.push(item)
})
+ _this.computedIsManage(_this.countyFamousList)
_this.page++
}
},
From 33526c2df0e78524d4d37a8d9742f679b49c7dc0 Mon Sep 17 00:00:00 2001
From: linxi
Date: Tue, 27 Aug 2024 18:14:57 +0800
Subject: [PATCH 13/30] =?UTF-8?q?Fix(=E5=BA=97=E9=93=BA=E8=B5=84=E6=96=99)?=
=?UTF-8?q?:=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E8=B5=84=E6=96=99--?=
=?UTF-8?q?=E8=BF=9E=E7=BB=AD=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BC=9A=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E9=80=80=E5=87=BA=E5=88=B0=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=BA=97=E9=93=BA=E4=B8=BB?=
=?UTF-8?q?=E9=A1=B5=E4=BC=9A=E5=8F=8D=E5=A4=8D=E6=8F=90=E7=A4=BA=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E6=88=90=E5=8A=9F=E5=86=8D=E9=80=80=E5=87=BA=E6=9D=A5?=
=?UTF-8?q?=EF=BC=8C=E5=BA=97=E9=93=BA=E8=B5=84=E8=B4=A8=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E4=BC=9A=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesInn/inn/innProfileEdit.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue
index 2a520e2..91b4ca7 100644
--- a/pagesInn/inn/innProfileEdit.vue
+++ b/pagesInn/inn/innProfileEdit.vue
@@ -229,7 +229,8 @@ export default {
'qrcode': '',
'tips': '',
'type': ''
- }
+ },
+ loading: false
}
},
onShow() {
@@ -330,6 +331,9 @@ export default {
})
},
submit() {
+ if(this.loading) {
+ return
+ }
if (!this.innApplyInfo.logo) {
this.$dialog.error('请上传店铺LOGO')
return
@@ -372,6 +376,7 @@ export default {
if (param.coverType === 2) {
param.cover = param.coverVideo
}
+ this.loading = true
uni.showLoading()
postHotelInfoEdit(param).then((res) => {
uni.hideLoading()
@@ -380,11 +385,13 @@ export default {
content: '修改成功!',
showCancel: false,
success: () => {
+ this.loading = false
uni.navigateBack()
}
})
}).catch((err) => {
uni.hideLoading()
+ this.loading = false
uni.showToast({
title: err.msg + '',
icon: 'none',
From 3fac70482825acc9dc750e664becdd5828d009e7 Mon Sep 17 00:00:00 2001
From: modendeveloper
Date: Wed, 28 Aug 2024 00:48:10 +0800
Subject: [PATCH 14/30] =?UTF-8?q?Style(=E5=AE=A2=E6=9C=8D)=EF=BC=9A?=
=?UTF-8?q?=E5=AE=A2=E6=9C=8DUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_common/views/room.vue | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/pkg_common/views/room.vue b/pkg_common/views/room.vue
index a0cf9aa..03ab139 100644
--- a/pkg_common/views/room.vue
+++ b/pkg_common/views/room.vue
@@ -29,7 +29,7 @@
-
@@ -334,9 +334,9 @@ export default {
bottom: 0;
width: 100vw;
padding: 30rpx 32rpx 28rpx;
- border-radius: 24rpx 24rpx 0 0;
+ border-radius: 40rpx 40rpx 0rpx 0rpx;
background: #FFFFFF;
-
+ height: 160rpx;
image {
width: 64rpx;
height: 64rpx;
@@ -359,9 +359,8 @@ export default {
button {
width: 120rpx;
- height: 64rpx;
margin: 0;
- border-radius: 32rpx;
+ border-radius: 100rpx;
background: #FD574B;
font-size: 28rpx;
color: #FFFFFF;
From dce23773832ced2994a9d3d44ac87ac04a50b7ea Mon Sep 17 00:00:00 2001
From: linxi
Date: Wed, 28 Aug 2024 11:25:35 +0800
Subject: [PATCH 15/30] =?UTF-8?q?Feat(=E5=AE=A2=E6=9C=8D)=EF=BC=9A?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=9B=E5=85=A5=E5=AE=A2=E6=9C=8D=E9=A1=B5?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E9=80=81=E5=95=86=E5=93=81=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 43 ++++++++++++++++++++++++++++++-----
pages/shop/GoodsCon/index.vue | 12 +++++++++-
pkg_common/views/room.vue | 40 ++++++++++++++++++++++++++++----
3 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 8bb6dfb..4681a0e 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -3,8 +3,8 @@
@dark-color: #333333;
@white-color: #fff;
-@colors: #C52733, #333333, #fff;
-@classnames: primary, dark, white;
+@colors: #C52733, #333333, #fff, #666;
+@classnames: primary, dark, white, secondary-dark;
/*=====================================*/
each(@colors, {
@@ -19,15 +19,28 @@ each(@colors, {
}
});
+/*===================字体大小======================*/
.generateFontSize(@i) when (@i <= 80) {
.v12-font-@{i} {
font-size: @i * 1rpx !important;
}
- .generateFontSize(@i + 4);
+ .generateFontSize(@i + 2);
}
.generateFontSize(0);
+.v12-font-bold{
+ font-weight: bold !important;
+}
+.generateFontWeight(@n, @i: 100) when (@i <= @n) {
+ .v12-font-weight-@{i} {
+ font-weight: @i !important;
+ }
+ .generateFontWeight(@n, (@i + 100))
+}
+.generateFontWeight(900);
+
+/*==================内外边距====================*/
.generateMarginAndPadding(@n, @i:0) when (@i<= @n) {
@baseNum: @i * 8rpx;
.v12-mt-@{i} {
@@ -75,10 +88,24 @@ each(@colors, {
.generateMarginAndPadding(@n, (@i + 1))
}
.generateMarginAndPadding(40);
-.v12-font-bold{
- font-weight: bold !important;
-}
+/*==================圆角====================*/
+.generateRadius(@n, @i: 0) when (@i <= @n) {
+ @baseRadius: @i * 1rpx;
+ .v12-radius-@{i} {
+ border-radius: @baseRadius
+ }
+ .generateRadius(@n, (@i + 1))
+}
+.generateRadius(100);
+/*=========================================*/
+
+.v12-d-flex{
+ display: flex !important;
+}
+.v12-flex-column {
+ flex-direction: column;
+}
.v12-align-center{
display: flex;
align-items: center;
@@ -87,6 +114,10 @@ each(@colors, {
display: flex;
justify-content: center;
}
+.v12-justify-between{
+ display: flex;
+ justify-content: space-between;
+}
.v12-d-grid-columns-2 {
display: grid;
grid-template-columns: 1fr 1fr;
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 7d21499..4ce95d5 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -663,8 +663,18 @@ export default {
},
methods: {
goRoom() {
+ const params = {
+ goodsId: this.productId,
+ goodsName: this.attr.productSelect.store_name,
+ skuStr: this.attrValue,
+ price: this.attr.productSelect.price,
+ seckillId: this.activityId,
+ cover: this.attr.productSelect.image,
+ goodsData: '',
+ seckillData: ''
+ }
uni.navigateTo({
- url: `/pkg_common/views/room?id=${this.storeInfo.merId}&name=${this.storeInfo.merName}`
+ url: `/pkg_common/views/room?id=${this.storeInfo.merId}&name=${this.storeInfo.merName}¶ms=${JSON.stringify(params)}`
})
},
goodsDetail: function (item) {
diff --git a/pkg_common/views/room.vue b/pkg_common/views/room.vue
index 03ab139..e14063a 100644
--- a/pkg_common/views/room.vue
+++ b/pkg_common/views/room.vue
@@ -13,6 +13,7 @@
+
@@ -23,6 +24,24 @@
+
+
+
+
+
+
+
+ {{ params.goodsName }}
+
+
+ {{ params.skuStr }}
+
+
+
+ ￥{{ params.price }}
+
+
+
@@ -67,12 +86,14 @@ export default {
roomId: null, //房间ID
content: "", //消息内容
- list: [], //消息列表
+ list: [], //消息列表,
+ params: {}
}
},
onLoad(options) {
this.storeId = options.id;
this.merName = options.name;
+ this.params = options.params && JSON.parse(options.params) || {}
if (this.merName!="undefined" && this.merName!="null") {
uni.setNavigationBarTitle({
title: this.merName
@@ -165,6 +186,11 @@ export default {
console.log('WebSocket连接已打开！', res);
this.socketOpen = true;
this.createRoom();
+ if(Object.values(this.params).length > 0) {
+ this.content = JSON.stringify(this.params)
+ // this.list.push(this.params)
+ this.userSend(2)
+ }
});
uni.onSocketError(err => {
@@ -185,7 +211,7 @@ export default {
this.content = event.detail.value;
},
- userSend() {
+ userSend(msg_type) {
if (this.content.length === 0) return;
let param = {
@@ -195,7 +221,7 @@ export default {
username: this.userInfo.nickname,
header: this.userInfo.avatar,
room_id: this.roomId,
- msg_type: 0,
+ msg_type: msg_type === 2 ? msg_type : 0,
content: this.content,
token: this.token
}
@@ -204,6 +230,7 @@ export default {
},
createRoom() {
+
let param = {
type: "join",
user_type: 0,
@@ -265,6 +292,9 @@ export default {
\ No newline at end of file
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index f843c3f..887e8e4 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -360,6 +360,7 @@
@@ -412,7 +413,7 @@
-
+
更多政策
@@ -949,8 +950,8 @@ export default {
}
})
},
- gotoInvestment() {
- uni.navigateTo({ url: `/pkg_product/views/famousQianxianInvestment?id=${this.id}` })
+ gotoInvestment(title = '', type = 'investment', id = '') {
+ uni.navigateTo({ url: `/pkg_product/views/famousQianxianInvestment?id=${id || this.id}&title=${title}&type=${type}` })
},
villageItemClick(item) {
uni.navigateTo({ url: `/pkg_product/views/famousQianxianVillageShop?id=${item.id}` })
diff --git a/pkg_product/views/famousQianxianVillageShop.vue b/pkg_product/views/famousQianxianVillageShop.vue
index e0878a9..e2e69cd 100644
--- a/pkg_product/views/famousQianxianVillageShop.vue
+++ b/pkg_product/views/famousQianxianVillageShop.vue
@@ -444,7 +444,7 @@ export default {
line-height: 48rpx;
}
.inn-owner {
- width: calc(100% - 160rpx);
+ width: calc(100% - 240rpx);
font-size: 36rpx;
font-weight: bold;
color: #333;
From 19bb5c1084f73599005ffd5a5c092a195559ef15 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 28 Aug 2024 14:48:39 +0800
Subject: [PATCH 19/30] =?UTF-8?q?Fix(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
=?UTF-8?q?:[#2229]=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81=E5=BA=97=E9=93=BA?=
=?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=95=86=E5=93=81=E8=BE=83=E5=B0=91=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E8=83=8C=E6=99=AF=E5=BA=95=E8=89=B2=E4=B8=8D=E4=B8=80?=
=?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousQianxian.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg_product/views/famousQianxian.vue b/pkg_product/views/famousQianxian.vue
index bb12b38..aa79f25 100644
--- a/pkg_product/views/famousQianxian.vue
+++ b/pkg_product/views/famousQianxian.vue
@@ -140,11 +140,12 @@ export default {
.county-index {
position: relative;
min-height: 100vh;
- background-color: #fff;
+ background-color: #f0f0f0;
.top-img {
position: relative;
z-index: 5;
padding: 21rpx;
+ background-color: #fff;
.img {
display: block;
width: 100%;
@@ -175,7 +176,6 @@ export default {
}
}
.list-wrap {
- background-color: #F0F0F0;
.loadend {
width: 100%;
}
From 223bcf6ac81d4afb0be8732d2441ddbd064680b8 Mon Sep 17 00:00:00 2001
From: linxi
Date: Thu, 29 Aug 2024 10:39:44 +0800
Subject: [PATCH 20/30] =?UTF-8?q?Feat(=E9=A6=96=E9=A1=B5)=EF=BC=9A?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=BD=E5=A5=96=E7=AA=97=E5=8F=A3=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=8A=BD?=
=?UTF-8?q?=E5=A5=96=E6=AC=A1=E6=95=B0=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 437952c..390562f 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -207,7 +207,7 @@
@@ -294,7 +294,8 @@ export default {
// 节日专题
contentFestival: {},
pageKeyId: Object.freeze('appIndex'),
- scrollTop: 0
+ scrollTop: 0,
+ lotteryCanDraw: false
}
},
onLoad() {
@@ -371,6 +372,7 @@ export default {
_this.$set(_this, 'contentFestival', data.contentFestivalV2)
_this.bastLeftList = []
_this.bastRightList = []
+ _this.lotteryCanDraw = data.lotteryCanDraw
for (let i = 0; i < data.bastList.length; i++) {
if (i % 2 === 0) {
// 店铺排名
From fda09a5cb0eaacc5c6a07e53c3ad05a044d2a8ee Mon Sep 17 00:00:00 2001
From: linxi
Date: Thu, 29 Aug 2024 16:36:32 +0800
Subject: [PATCH 21/30] =?UTF-8?q?Style(=E5=8D=83=E5=8E=BF=E5=90=8D?=
=?UTF-8?q?=E5=93=81):=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81=E5=9F=8E?=
=?UTF-8?q?=E5=B8=82=E7=AE=A1=E7=90=86--=E4=BA=A7=E4=B8=9A=E7=AE=A1?=
=?UTF-8?q?=E7=90=86--=E6=9D=91=E5=B1=8B=E5=87=BA=E7=A7=9F=EF=BC=8C?=
=?UTF-8?q?=E6=9D=91=E5=B1=8B=E5=B1=95=E7=A4=BA=E8=83=8C=E6=99=AF=E9=A2=9C?=
=?UTF-8?q?=E8=89=B2=E6=9B=B4=E6=8D=A2=E4=B8=BA=E7=99=BD=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousQianxianShop.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 887e8e4..e3cd48f 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -445,7 +445,7 @@
From c50474c156f17f5dfd5b0604936b0a5578d4e627 Mon Sep 17 00:00:00 2001
From: linxi
Date: Thu, 29 Aug 2024 16:36:51 +0800
Subject: [PATCH 22/30] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81?=
=?UTF-8?q?):=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E6=8D=A2=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg_product/views/famousList.vue b/pkg_product/views/famousList.vue
index 8174a76..b19cd86 100644
--- a/pkg_product/views/famousList.vue
+++ b/pkg_product/views/famousList.vue
@@ -162,7 +162,7 @@
From 719bbebbf62db773d81168f56c554cae68537f28 Mon Sep 17 00:00:00 2001
From: linxi
Date: Fri, 30 Aug 2024 09:33:55 +0800
Subject: [PATCH 23/30] =?UTF-8?q?Fix(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
=?UTF-8?q?:=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81=E5=8E=BF=E5=9F=8E?=
=?UTF-8?q?=E4=B8=80=E5=8F=A5=E8=AF=9D=E4=BB=8B=E7=BB=8D=E8=BF=87=E9=95=BF?=
=?UTF-8?q?=E6=97=B6=E4=BC=9A=E6=8C=A4=E5=8E=8B=E5=8E=BF=E5=9F=8E=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousQianxian.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkg_product/views/famousQianxian.vue b/pkg_product/views/famousQianxian.vue
index f9a0af8..631a58d 100644
--- a/pkg_product/views/famousQianxian.vue
+++ b/pkg_product/views/famousQianxian.vue
@@ -10,7 +10,7 @@
{{ countyFamous.countyName }}
-
+
{{ countyFamous.content }}
@@ -164,6 +164,7 @@ export default {
margin: 0 0 0 8rpx;
font-size: 24rpx;
color: #aaa;
+ flex: 1;
}
}
.intro {
From ae81590c9e4ef8965712ada7f96cb78cc055337c Mon Sep 17 00:00:00 2001
From: linxi
Date: Mon, 2 Sep 2024 10:30:52 +0800
Subject: [PATCH 24/30] =?UTF-8?q?Fix(=E5=95=86=E5=93=81)=EF=BC=9A=E5=A4=9A?=
=?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=95=86=E5=93=81=E5=9C=A8=E9=80=89=E8=B4=AD?=
=?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=80=89=E6=8B=A9=E7=AC=AC=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=A2=9E=E5=8A=A0=E6=95=B0=E9=87=8F=EF=BC=8C?=
=?UTF-8?q?=E5=86=8D=E6=94=B9=E9=80=89=E7=AC=AC=E4=BA=8C=E4=B8=AA=E8=A7=84?=
=?UTF-8?q?=E6=A0=BC=EF=BC=8C=E6=95=B0=E9=87=8F=E4=B8=8D=E4=BC=9A=E5=88=B7?=
=?UTF-8?q?=E6=96=B0=EF=BC=8C=E4=BD=86=E7=AB=8B=E5=8D=B3=E8=B4=AD=E4=B9=B0?=
=?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E2=80=9C1=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 4ce95d5..3eb90d8 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -376,6 +376,7 @@
+
Date: Mon, 2 Sep 2024 15:48:47 +0800
Subject: [PATCH 25/30] =?UTF-8?q?Style(=E5=AF=BB=E8=B6=A3=E5=91=B3)?=
=?UTF-8?q?=EF=BC=9A=E5=AF=BB=E8=B6=A3=E5=91=B3=E5=88=97=E8=A1=A8=E6=9A=82?=
=?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E5=BA=95=E8=89=B2?=
=?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cloud/haveFun.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 164abd6..ec388e6 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -260,7 +260,7 @@ export default {
.body {
padding: 20rpx 32rpx;
- background: #F9F9F9;
+ background: #f5f5f5;
}
.city-box {
From ee04a02cb6d0925ccb58be3eb7b73d2a70871d26 Mon Sep 17 00:00:00 2001
From: linxi
Date: Tue, 3 Sep 2024 17:27:07 +0800
Subject: [PATCH 26/30] =?UTF-8?q?Style(=E8=B4=AD=E7=89=A9=E8=BD=A6)?=
=?UTF-8?q?=EF=BC=9AUI=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/v12-style.less | 13 +++
components/CheckboxIcon.vue | 8 +-
pages.json | 1 +
pages/cart.vue | 142 +++++++++++++++++++++-----------
pages/home/index.vue | 2 +-
static/tabbar/icon-cart-hot.png | Bin 2292 -> 1027 bytes
static/tabbar/icon-home.png | Bin 3212 -> 656 bytes
static/tabbar/icon-user.png | Bin 2516 -> 934 bytes
8 files changed, 111 insertions(+), 55 deletions(-)
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index bf38100..94dc2f5 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -17,6 +17,9 @@ each(@colors, {
.v12-@{classname}-text{
color: @color !important;
}
+ .v12-@{classname}-border{
+ border: 1px solid @color !important;
+ }
});
/*===================字体大小======================*/
@@ -100,6 +103,8 @@ each(@colors, {
.generateRadius(100);
/*=========================================*/
+/*====================flex 函数表达式=====================*/
+
.v12-d-flex{
display: flex !important;
}
@@ -110,6 +115,14 @@ each(@colors, {
display: flex;
align-items: center;
}
+.v12-align-start{
+ display: flex;
+ align-items: start;
+}
+.v12-align-end{
+ display: flex;
+ align-items: end;
+}
.v12-justify-center{
display: flex;
justify-content: center;
diff --git a/components/CheckboxIcon.vue b/components/CheckboxIcon.vue
index 1ff67c1..e50fab9 100644
--- a/components/CheckboxIcon.vue
+++ b/components/CheckboxIcon.vue
@@ -1,6 +1,7 @@
-
+
+
@@ -43,7 +44,7 @@ export default {
width: 32rpx;
height: 32rpx;
box-sizing: border-box;
- border: 2rpx solid #D5D7D8;
+ border: 2px solid #D5D7D8;
border-radius: 50%;
}
@@ -53,7 +54,6 @@ export default {
}
.isSelected {
- border: 3px solid #FD5749;
- background: #FD5749;
+ border: 3px solid #C52733;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ce30577..50f12b8 100644
--- a/pages.json
+++ b/pages.json
@@ -836,6 +836,7 @@
},
"tabBar": {
"color": "#8B8F99",
+ "custom": true,
"selectedColor": "#FF564A",
"borderStyle": "black",
"backgroundColor": "#ffffff",
diff --git a/pages/cart.vue b/pages/cart.vue
index e4059db..f764b2d 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -41,49 +41,51 @@
class="store-cover"
mode="scaleToFill"
/>
- {{ item['merName'] }}
+ {{ item['merName'] }}
- 进店逛逛
-
+
-
-
-
+
+
+
+
+
{{ good['productInfo']['storeName'] }}
规格：{{ good['productInfo']['attrInfo']['sku'] }}
+
- ￥
- {{ good['truePrice'] }}
+ ￥
+ {{ good['truePrice'] }}
-
+
- {{ good['cartNum'] }}
+ {{ good['cartNum'] }}
-
+
@@ -139,13 +149,15 @@
:mark="[-1]"
@change="onChange"
/>
- 全选({{ selectCount }})
+ 全选({{ selectCount }})
- 合计:
- ￥{{ total }}
+
+ 合计:
+ ￥
+ {{ total }}
- 结算
+ 结算
\ No newline at end of file
From 8242632cb0a5918d3fe912d7e3fbde9be11e2870 Mon Sep 17 00:00:00 2001
From: linxi
Date: Wed, 4 Sep 2024 10:51:34 +0800
Subject: [PATCH 28/30] =?UTF-8?q?Feat(=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?):=20=E6=B5=B7=E6=8A=A5=E6=94=B9=E8=BD=AE=E6=92=AD=E5=9B=BE?=
=?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=8E=A5=E5=90=8E=E5=8F=B0=E9=85=8D=E5=B1=9E?=
=?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87&=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/User/index.vue | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 3871592..ba3f521 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -203,13 +203,18 @@
-
-
+
+
@@ -264,6 +269,8 @@ export default {
mixins: [pageListenMixins],
data() {
return {
+ userCenterCarousel:[],
+ userCenterCarouselShow: 0,
statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
webUrl: this.$VUE_APP_RESOURCES_URL,
isWeixin: false,
@@ -372,6 +379,10 @@ export default {
},
methods: {
...mapMutations(['updateAuthorizationPage']),
+ handleSwiper(e) {
+ const url = this.userCenterCarousel[e].url
+ this.linkTo(url)
+ },
goRoomLogs() {
uni.navigateTo({
url: '/pkg_common/views/roomLogs'
@@ -447,6 +458,8 @@ export default {
getUserCenterBanner().then(res => {
const { success, data } = res
if (success) {
+ this.userCenterCarousel = data.userCenterCarousel || []
+ this.userCenterCarouselShow = data.userCenterCarouselShow
if (data.userCenterBanner) {
this.bannerBgUrl = data.userCenterBanner
this.userCenterBannerUrl = data.userCenterBannerUrl || ''
From 1a231d6715c8d03893209692eaf11768383ec0a7 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 4 Sep 2024 16:26:05 +0800
Subject: [PATCH 29/30] =?UTF-8?q?Style(=E5=8D=83=E5=8E=BF=E5=90=8D?=
=?UTF-8?q?=E5=93=81):=E7=9C=81=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousList.vue | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkg_product/views/famousList.vue b/pkg_product/views/famousList.vue
index b19cd86..e6a45ab 100644
--- a/pkg_product/views/famousList.vue
+++ b/pkg_product/views/famousList.vue
@@ -76,7 +76,9 @@
>
- {{ item.provinceName }}
+
+ {{ item.provinceName }}
+
@@ -420,12 +422,18 @@ export default {
position: absolute;
bottom: 0;
left: 0;
+ z-index: 1;
width: 100%;
height: 6rpx;
border-radius: 6rpx;
content: " ";
background: linear-gradient(90deg, #C52733 0%, rgba(202,56,67,0.92) 51%, rgba(255,255,255,0) 100%);
}
+ .txt-inner {
+ position: relative;
+ z-index: 2;
+ font-weight: bold;
+ }
}
}
.desc {
From 06abd34261a09acdb3c64a998194312b45138adb Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 4 Sep 2024 16:35:39 +0800
Subject: [PATCH 30/30] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84):=E8=BD=AE?=
=?UTF-8?q?=E6=92=AD=E5=B9=BF=E5=91=8A=E5=9B=BE=E4=B8=8D=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=88=99=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/User/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index ba3f521..53ecb0a 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -203,7 +203,7 @@
-
+