From 72293613936eab4ca16f193036cf63638449bb53 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Thu, 13 Apr 2023 10:40:49 +0800
Subject: [PATCH] gx
---
src/pages/ArtWorks/ArtWorks.vue | 12 ++++++++----
src/pages/MyOrder/MyOrder.vue | 7 ++++---
src/pages/ShoppingCart/ShoppingCart.vue | 11 +++++++----
src/pages/activity/activity.vue | 6 ++++++
src/pages/improveData/improveData.vue | 14 +++++++++++---
src/pages/pageHome/pageHome.vue | 10 +++++-----
src/pages/shop/Shop.vue | 8 ++++++--
7 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue
index 884bdf6..35f84d5 100644
--- a/src/pages/ArtWorks/ArtWorks.vue
+++ b/src/pages/ArtWorks/ArtWorks.vue
@@ -30,11 +30,11 @@
- 热销商品
+ 热销作品
- 全部商品
+ 全部作品
@@ -289,7 +289,12 @@
},
//选择一级类型
chooseOneType(item,index) {
- this.type = item
+ if(index == 0){
+ this.type = ''
+ }else{
+ this.type = item
+ this.getTypeE()
+ }
this.typeO = index
this.fil = 0
this.typeT = 9999
@@ -297,7 +302,6 @@
this.list2 = []
this.orderBy = ''
this.pages = 1
- this.getTypeE()
this.getData()
},
//选择二级类型
diff --git a/src/pages/MyOrder/MyOrder.vue b/src/pages/MyOrder/MyOrder.vue
index 6ae0e15..0de300f 100644
--- a/src/pages/MyOrder/MyOrder.vue
+++ b/src/pages/MyOrder/MyOrder.vue
@@ -37,7 +37,8 @@
-
+
+
@@ -65,11 +66,11 @@
x{{v.count}}
- 合计合计:¥{{v.totalPrice}}
- 合计合计:{{v.totalPoint}}积分
diff --git a/src/pages/ShoppingCart/ShoppingCart.vue b/src/pages/ShoppingCart/ShoppingCart.vue
index 60373ca..883eb85 100644
--- a/src/pages/ShoppingCart/ShoppingCart.vue
+++ b/src/pages/ShoppingCart/ShoppingCart.vue
@@ -51,7 +51,7 @@
{{v.goods.moneyPrice}}元
-
+
{{v.goods.pointPrice}}积分
@@ -72,7 +72,9 @@
- 合计:{{allMoney}}元{{allPoint}}积分
+ 合计:
+ {{allMoney}}元
+ {{allPoint}}积分
@@ -120,7 +122,7 @@
onShow() {
this.allMoney = 0
this.allPoint = 0
- this.pages = 0
+ this.pages = 1
this.getData()
this.getUserInfo()
},
@@ -273,7 +275,8 @@
if(item.checked == 1){
_this.orderDet.push({
count: item.count,
- goodsId: item.goodsId
+ goodsId: item.goodsId,
+ shopCarId: item.id
})
}
})
diff --git a/src/pages/activity/activity.vue b/src/pages/activity/activity.vue
index 1784f05..bd62245 100644
--- a/src/pages/activity/activity.vue
+++ b/src/pages/activity/activity.vue
@@ -71,6 +71,11 @@
uni.stopPullDownRefresh();
}, 1000);
},
+ //上拉
+ onReachBottom() {
+ this.pages++
+ this.getData();
+ },
methods:{
toDetail(val){
uni.navigateTo({
@@ -132,6 +137,7 @@
padding: 0 16px;
z-index: 999;
box-sizing:border-box;
+ background-color: #FFFFFF;
.apptitle {
font-size: 18px;
font-weight: 800;
diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue
index 1311cac..dba683a 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pages/improveData/improveData.vue
@@ -77,7 +77,7 @@
-->
*密码
-
@@ -216,6 +216,14 @@
+
+
+ *所属协会
+
+
+
+
@@ -384,7 +392,7 @@
renCaiShow: false,
zhengzhiShow: false,
zhengzhiValue: '',
- renCaiValue: ' ',
+ renCaiValue: '',
zuValue: "汉族",
xieValue: '',
zuShow: false,
@@ -395,7 +403,7 @@
honorList: [''],
StandradList: [''],
peopleSkillColums: [
- ["无", "乡镇人才", "县级人才", "乡镇人才", "市级人才", "省级人才", "国家级人才"]
+ ["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
],
Zucolumns: [
["汉族", "朝鲜族"],
diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index 0159ef5..8fc7d5e 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -648,15 +648,15 @@
.not {
width: 100%;
text-align: center;
-
+
.notice {
font-size: 24rpx;
- color: #808DA1;
+ color: #CCCCCC;
font-weight: 400;
- line-height: 36RPX;
-
+ line-height: 42rpx;
+
.phone {
- color: #1492ff;
+ color: #6C8BC7;
}
}
}
diff --git a/src/pages/shop/Shop.vue b/src/pages/shop/Shop.vue
index 6b338d8..89f9223 100644
--- a/src/pages/shop/Shop.vue
+++ b/src/pages/shop/Shop.vue
@@ -243,7 +243,12 @@
},
//选择一级类型
chooseOneType(item,index) {
- this.type = item
+ if(index == 0){
+ this.type = ''
+ }else{
+ this.type = item
+ this.getTypeE()
+ }
this.typeO = index
this.fil = 0
this.typeT = 9999
@@ -251,7 +256,6 @@
this.list2 = []
this.orderBy = ''
this.pages = 1
- this.getTypeE()
this.getData()
},
//选择二级类型