From a83172b29744b53e1f22a745b1ff1cd7a5b15fd5 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 15 Feb 2023 11:23:02 +0800
Subject: [PATCH 1/2] 2023-02-15
---
mallplusui-uniapp-app/pages/index/index.vue | 386 +++++++++---------
.../pagesA/product/groupList.vue | 6 +-
mallplusui-uniapp-app/pagesA/product/list.vue | 14 +-
.../pagesA/product/product.vue | 6 +-
mallplusui-uniapp-app/static/njfw_icon.png | Bin 0 -> 719 bytes
mallplusui-uniapp-app/static/nywz_icon.png | Bin 0 -> 1200 bytes
mallplusui-uniapp-app/static/shwz_icon.png | Bin 0 -> 696 bytes
7 files changed, 208 insertions(+), 204 deletions(-)
create mode 100644 mallplusui-uniapp-app/static/njfw_icon.png
create mode 100644 mallplusui-uniapp-app/static/nywz_icon.png
create mode 100644 mallplusui-uniapp-app/static/shwz_icon.png
diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue
index 7ee7d76..3e85e0a 100644
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@@ -1,60 +1,47 @@
-
-
- 汇融云链
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ swiperCurrent + 1 }}
- /
- {{ swiperLength }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ swiperCurrent + 1 }}
+ /
+ {{ swiperLength }}
-
-
-
-
- 农业物资
-
-
-
- 生活物资
-
-
-
- 拼团特价
-
-
-
- 农机服务
-
-
+
+
+
+ 农业物资
+
+
+
+ 生活物资
+
+
+
+ 拼团特价
+
+
+
+ 农机服务
+
+
-
-
-
-
-
@@ -314,6 +300,7 @@
this.getNewProductList();
},
onPullDownRefresh() {
+
console.log("onPullDownRefresh")
this.pageNum = this.pageNum + 1;
this.getNewProductList('refresh');
@@ -446,6 +433,7 @@
* 加载首页数据
*/
async loadData() {
+
this.getBanner();
this.getHotGoodsList();
//this.getFlashPromotion();
@@ -453,6 +441,18 @@
this.getStoreList();
this.homeNewProduct();
this.homeRecommendProduct();
+
+ uni.getSystemInfo({
+ success: res => {
+ console.log("屏幕宽度", res.windowWidth)
+ }
+ })
+ uni.createSelectorQuery().in(this).select(".carousel-section").boundingClientRect(data => {
+ console.log("屏幕宽度", data.height)
+ // {"id":"","dataset":{},"left":12,"right":308,"top":12,"bottom":315,"width":296,"height":303}
+ }).exec(function(res) {
+ // 注意：exec方法必须执行，即便什么也不做，否则不会获取到任何数据
+ })
},
/**
@@ -462,7 +462,7 @@
let params = {};
let groupHotGoodsList = await Api.apiCall('get', Api.index.homeNewProduct, params);
if (groupHotGoodsList) {
- console.log("新品推荐》》》》》",groupHotGoodsList.records)
+ console.log("新品推荐》》》》》", groupHotGoodsList.records)
this.homeNewProductList = groupHotGoodsList.records;
}
@@ -474,7 +474,7 @@
async homeRecommendProduct() {
let params = {};
let groupHotGoodsList = await Api.apiCall('get', Api.index.homeRecommendProduct, params);
- console.log("人气推荐》》》》》",groupHotGoodsList.records)
+ console.log("人气推荐》》》》》", groupHotGoodsList.records)
this.homeRecommendProductList = groupHotGoodsList.records;
},
/**
@@ -573,7 +573,7 @@
async getHotGoodsList() {
let params = {};
let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
- console.log("团购信息》》》》》",groupHotGoodsList)
+ console.log("团购信息》》》》》", groupHotGoodsList)
this.groupHotGoodsList = groupHotGoodsList;
},
diff --git a/mallplusui-uniapp-app/pagesA/product/groupList.vue b/mallplusui-uniapp-app/pagesA/product/groupList.vue
index e71e738..832da08 100644
--- a/mallplusui-uniapp-app/pagesA/product/groupList.vue
+++ b/mallplusui-uniapp-app/pagesA/product/groupList.vue
@@ -18,7 +18,7 @@
{{ item.goods.name }}
{{ item.groupPrice }}
- 原价 {{ item.goods.price }}
+
@@ -395,11 +395,11 @@ page,
color: $font-color-light;
}
.price {
- font-size: $font-lg;
+ font-size: 26upx;
color: $uni-color-primary;
line-height: 1;
&:before {
- content: '￥';
+ content: '惠农团购价￥';
font-size: 26upx;
}
}
diff --git a/mallplusui-uniapp-app/pagesA/product/list.vue b/mallplusui-uniapp-app/pagesA/product/list.vue
index e583c02..63b83a8 100644
--- a/mallplusui-uniapp-app/pagesA/product/list.vue
+++ b/mallplusui-uniapp-app/pagesA/product/list.vue
@@ -19,18 +19,18 @@
{{ item.name }}
-
+
{{ item.price }}
-
+
+
@@ -457,12 +457,12 @@ page,
color: $font-color-light;
}
.price {
- font-size: $font-lg;
+ font-size: 26upx;
color: $uni-color-primary;
line-height: 1;
&:before {
content: '惠农价￥';
- font-size: $font-lg;
+ font-size: 26upx;
}
}
}
diff --git a/mallplusui-uniapp-app/pagesA/product/product.vue b/mallplusui-uniapp-app/pagesA/product/product.vue
index de691be..72870da 100644
--- a/mallplusui-uniapp-app/pagesA/product/product.vue
+++ b/mallplusui-uniapp-app/pagesA/product/product.vue
@@ -16,7 +16,7 @@
惠农价¥{{ goods.price }}
县区商超价{{ goods.originalPrice }}
¥{{ goods.price }}
- 优惠¥{{ goods.originalPrice- goods.price }}
+ 优惠¥{{ (goods.originalPrice- goods.price) | formatNumber}}
会员折扣{{ goods.memberRate }}折
@@ -376,6 +376,10 @@ export default {
formatCreateTime(time) {
let date = new Date(time);
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+ },
+
+ formatNumber(number) {
+ return new Number(number).toFixed(2);
}
},
methods: {
diff --git a/mallplusui-uniapp-app/static/njfw_icon.png b/mallplusui-uniapp-app/static/njfw_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dbd9534be9387a8a699bd75656b5c732c663479
GIT binary patch
literal 719
zcmeAS@N?(olHy`uVBq!ia0vp^)*#Hm3?x7OW@-dd>jHd2T<_fq1Tt@554d|X;QsBv
zd$$80-u4Fy-oG7i?{?6gn*l)f<2#}EZwB7K4`Kt+T_AZg;K73+ureSCVt`S=eIVmD
zP%n@haPKCV4K(>i0LUDm$v|Vlih<O}h_Nd@Jzw?ST9D6COVfy?Zwl
z$h~tX;Qr0vhY!7hX5POAauU#@Gx3M~fzGum3Gxg6&*0E-B~-n9A9}^8)lsSats*N=Sr<)(XSaNH>D+2@LG*1`D
zkcv5Pr(LgVHsEPBoZ$5BUbV^U>h16UCv8n(7ApOm_->MZyL9oB`H9{N?oX~y-J0ZX
z{Cvr_`|s-CWCpxEc1CRThJTYMzD-Y@Tdq9Y_n7&<6tOGkj%&RY`x$vW-81QU(Tz!|
z1#T?UR!wNj{ieYi{WhO#+i70D=x3tMxy6$XUHiG_!GdY4#YFC$4R_}_Uvy33(9KAH
z%_;5TZDnubV{e{LlkWXJ9r{Cmeru@QV4Nx<*EMjeyX;*FATgEsiYg
z*8l8yBfaEG@5fU2p4`Jv=VYzkFz3M$Imgxthx`{)m(8%Ut4Z**-J2Nk9@P(*0%VL)9*{Y&rUKa@6W&gO+5$3jawnJsng14S-N(MZXEPgKPX;;cd4D^Qd_B4AeSbgD
zx)0OZfmXkqFac=hn@OEtXZF9E-1Tl6)IIM(4(W?sgL{mK+c=o{bFMG=Sh=ZPw9C*rR&qoo_7-_
zyq?(edLqb*w?G9zT~oT>P40OIBqw#fo7@L9^VKAtceuZ5YDoV1k8i(49lm?}?EIPiZA)L3CS0>xBC^#WHBM{Ou^j=w
z7I!=E7UJ^DRhU&Guu{-Vyvj^6T<>DNulnV_aPTHGggMbarWb=Ql^IDzu63Yes;|i!H9Jg_^~6qtZSoEH?fBg=O*b
zKbP-I?tL=9Zc$Xp0ejzj(O=qFYVS+c1U0E$ull0ef8f{69b6AHj4GU>yBNjam)v(v
zT9~7C`A&o|>p!W_#oriiGj2=F728?NwChlYvfHzlhfVB6a`fXkUd)=yCaY^)ar}1E
zUA>s?hF9kuyI|y3ef-U}Jrm|V&Cn2Ry6vWB`FO>IZS#3Us`^R_?#}VutGX=w=fTx1
z`hn*}gb)AKZjY}KRtS}L`R;V&ilcq3B!}>(vwY$XlhY^jw;gDyx&5^ExXGsq4WH64
zMUB6-rlx-6bbUKn{o1nA6?W&N8)tladb}%s+L{!{`X_6%_Xv2j8NVtF*my4CNODwH
z|BbuCCO?G^tYiP-yuZ4at6{#0(CK?GBO>3caKF_Jm$`fRHBay9%o7*>w`V@9+FEkB
z_1~*IF-~rUye%?%h2Ji$;jVjkKzK>l@2|(gLVV6zymY&9adl&9$=6+neI~a#bGn=V
z+Pmv8S7G?^!jq>()RxtC8U^2DE!Wtkw_vwq$qcq7Tf?_?ES~&qve4CK5^kYl(N$XF
zHh1@RPfbWlpIrX)W5Yzti&8(t-fv^RuqWahNB&ETEkA2MZ&zZPw*?Khp!f_O8;DUm6hkm-&ml!A_ZmXkTE~
OVDNPHb6Mw<&;$S~?SHQT
literal 0
HcmV?d00001
diff --git a/mallplusui-uniapp-app/static/shwz_icon.png b/mallplusui-uniapp-app/static/shwz_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0d547f4138cb790b66eb298e01b62007267d158
GIT binary patch
literal 696
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=3?wxlRx|^t0|7oEu1_5f0h!Mn4n1}__}F3p
z6Z^x@91lKoJoLoj&~u0VKv^IgC<{bSfLzDJAQ6YdPwWo?8BgpFK5;ns)Dgr6NdX02
zAPPX*!3qvNwgsx+|J44#eXwaj#gE;OfutNxJhndo(g-pK$bec3b_v)Jkg*4Edv1fM
zdF~7}=M2!aR}RNOhS(i^0d$z-A+Zf!?m!PXlmz(&|7Y0W;1C+MDpO(otSzSvvi7X2
zS~ByN-^IjSx%tzkziTxUaTVx(Ec8Xj^YACj@Vf;89^V(Wv+p>fC8DP?DabiEvR?2%
z0|R5ar;B4q#hkZOZ&o!K2(&I16c>vO(RmjZy>;Eycdvi%4>g|2!tv?rX;twvzRwCi
zG0)^_3<ZmvN4@TP^sqW6!Zq
zo->kDx_x>r>WlC8$0%=}S~W4YTZ2bWUVE8@YLJqv+ltMHJpUg(b&z?2@`sz5uFguO
zu}uEX4!eGJXigBXO;MV#%8uzWcYn@bL)qWaFDs@${q)GQH0{}ni{XO#$IQ#r(pYau
zF|NADAI@yutFr%){)|l%vo0qW-SFDF&|#7P1?yXF3u|q3Z)`B@F_jiut{k`2S|Y08
z-)X;f2b(7ScKzTqF=VY`aOj)Y5(n)?E#K^%6|J$>a{6!PQ)x|q*y>_jilugmt><;Q
pUvzlo%o!ouQWuu*cPW`@U+E|ECjDROR$%loc)I$ztaD0e0s#BIQS<-+
literal 0
HcmV?d00001
From d76cd895e8624b177ecba6404783e4a222eb8e71 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 15 Feb 2023 11:39:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=86=9C=E6=9C=BA=E6=9C=8D=E5=8A=A1=20?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=20=E5=9B=BE=E6=96=87?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue b/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
index c30530b..17186be 100644
--- a/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
+++ b/mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
@@ -70,9 +70,7 @@ export default {
favorite: true,
shareList: [],
- desc: `
-
- `,
+ desc: "",
skuList: []
};
},
@@ -89,7 +87,12 @@ export default {
if (data) {
let detailData = data;
this.detailData = detailData;
- this.desc = data.content;
+
+ var richtext= data.content;
+ const regex = new RegExp('