diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue
index b4a82b0..effd5a2 100644
--- a/pages/Shopping-cart/productmain/testproductmain.vue
+++ b/pages/Shopping-cart/productmain/testproductmain.vue
@@ -3,9 +3,10 @@
购物车
-
-
+
+ 搜索购物车商品
{{ stateText.topBtn }}
@@ -47,8 +48,8 @@
- {{ item.quantity }}
+
+ {{ item.quantity }}
{
+ // isShowInput.value = true
+ // }
+
+ const blur = () => {
+ if (JudgeIsNullity(searchText.value)) {
+ isShowInput.value = !isShowInput.value
+ }
+ }
+
+ const changeInput = () => {
+ isShowInput.value = !isShowInput.value
+ }
+
//获取实体类商品信息
const getEntityPro = async () => {
@@ -173,6 +191,7 @@
console.log('res--->', res.data);
if (res.data.code === 1) {
products.value = res.data.data
+ tempProducts.value = res.data.data
products.value.forEach((item) => {
item.checked = false //所有都先未选中
})
@@ -238,6 +257,7 @@
console.log('服务类商品--->', res);
if (res.data.code === 1) {
products.value = res.data.data
+ tempProducts.value = res.data.data
products.value.forEach((item)=>{ //添加多选框状态
item.checked = false
})
@@ -616,13 +636,13 @@
const gotoSearch = async () => {
if (searchText.value === '') {
- await getProductCart()
+ products.value = tempProducts.value
return ;
}
if (current.value === 1) {
- products.value = products.value.filter(item => item.cartGoodVO.name.includes(searchText.value))
+ products.value = tempProducts.value.filter(item => item.cartGoodVO.name.includes(searchText.value))
} else {
- products.value = products.value.filter(item => item.cartExperienceGoodVO.name.includes(searchText.value))
+ products.value = tempProducts.value.filter(item => item.cartExperienceGoodVO.name.includes(searchText.value))
}
}
@@ -691,13 +711,13 @@
.section_3 {
padding: 0 15rpx;
background-color: #ffffff;
- border-radius: 9.38rpx;
+ border-radius: 20.38rpx;
height: 56.25rpx;
}
.image {
- width: 54.38rpx;
- height: 52.5rpx;
+ width: 45.63rpx;
+ height: 45rpx;
}
.section_1 {
@@ -848,7 +868,7 @@
.font_6 {
font-size: 26.25rpx;
font-family: FangZhengFonts;
- line-height: 18.73rpx;
+ line-height: 26.25rpx;
color: #323232;
}
@@ -987,7 +1007,7 @@
}
.text_12 {
- color: #000000;
+ color: #323232;
}
.text-wrapper_3 {
diff --git a/pages/book/myPhotoProducts/myPhotoProducts.vue b/pages/book/myPhotoProducts/myPhotoProducts.vue
index 6230b68..e226d3f 100644
--- a/pages/book/myPhotoProducts/myPhotoProducts.vue
+++ b/pages/book/myPhotoProducts/myPhotoProducts.vue
@@ -227,7 +227,7 @@
line-height: 32.44rpx;
}
.divider {
- background-color: #818181;
+ background-color: #BEBEBE;
height: 1.88rpx;
}
.pos {
diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue
index cc912a7..32c5dd5 100644
--- a/pages/mine/main/main.vue
+++ b/pages/mine/main/main.vue
@@ -19,30 +19,30 @@
剩余积分：{{ myPoints }}
-
-
+
+
全部
-
+
待支付
-
+
待发货
-
+
待收货
-
+
已退款
-
+
@@ -161,7 +161,7 @@
url: '/pages/mine/bookings/booking'
})
}
- const goto = (tab) => {
+ const gotoOrderListPage = (tab) => {
uni.navigateTo({
url: '/pages/my-order/myOrderList/myOrderList?status=' + tab
})
@@ -398,7 +398,7 @@
}
.text {
- color: #000000;
+ color: #323232;
font-size: 40rpx;
font-family: FangZhengFonts;
line-height: 40.61rpx;
@@ -408,7 +408,7 @@
font-size: 28.13rpx;
font-family: FangZhengFonts;
line-height: 27.02rpx;
- color: #000000;
+ color: #323232;
}
.text_2 {
@@ -474,7 +474,7 @@
font-size: 37.5rpx;
font-family: FangZhengFonts;
line-height: 36.47rpx;
- color: #000000;
+ color: #323232;
}
.text_8 {
@@ -584,7 +584,7 @@
font-size: 37.5rpx;
font-family: FangZhengFonts;
line-height: 30.47rpx;
- color: #000000;
+ color: #323232;
}
.text_10 {
diff --git a/pages/my-order/myOrderList/myOrderList.vue b/pages/my-order/myOrderList/myOrderList.vue
index 054ed17..6b6498a 100644
--- a/pages/my-order/myOrderList/myOrderList.vue
+++ b/pages/my-order/myOrderList/myOrderList.vue
@@ -250,7 +250,6 @@
cookie
}
})
- console.log(res.data.data)
orderList.value = res.data.data
tempOrderList.value = res.data.data
dealTimeout()
diff --git a/pages/my-order/researchOrder/researchOrder.vue b/pages/my-order/researchOrder/researchOrder.vue
index cecef73..8f956b7 100644
--- a/pages/my-order/researchOrder/researchOrder.vue
+++ b/pages/my-order/researchOrder/researchOrder.vue
@@ -1,6 +1,5 @@
-
import {ref} from 'vue'
import { onLoad } from "@dcloudio/uni-app";
- import { getFonts } from '../../../common/globalFont';
+
import { myOrderUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
+ import { getFonts } from '../../../common/globalFont';
onLoad(() => {
getFonts()
})
@@ -42,24 +42,16 @@
margin-left: 13.13rpx;
}
.page {
- background-color: #ffffff;
background-size: 100% 100%;
background-repeat: no-repeat;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
- height: 100%;
+ height: 100vh;
}
-// .section {
-// background-image: url('https://ide.code.fun/api/image?token=67cf80c84ae84d001228feb1&name=98c27c9593262699d4de87045e9a792c.png');
-// background-size: 100% 100%;
-// background-repeat: no-repeat;
-// width: 750rpx;
-// height: 1571.25rpx;
-// }
.section_2 {
padding: 33.75rpx 0 35.63rpx;
- background-color: #ffffff;
+ background-color: #fff;
box-shadow: 0rpx 3.75rpx 3.75rpx #00000040;
}
.pos {
diff --git a/pages/store-home/main/testMain.vue b/pages/store-home/main/testMain.vue
index 85930c3..6096a35 100644
--- a/pages/store-home/main/testMain.vue
+++ b/pages/store-home/main/testMain.vue
@@ -5,7 +5,7 @@
搜索商品
@@ -324,7 +324,7 @@ input {
font-size: 26.25rpx;
font-family: FangZhengFonts;
line-height: 24.41rpx;
- color: #000000;
+ color: #323232;
}
.text_4 {
font-size: 12px;
diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue
index a927da2..21b49e5 100644
--- a/pages/workshop/index/index.vue
+++ b/pages/workshop/index/index.vue
@@ -7,7 +7,8 @@
class="image" mode="aspectFill"
:src="workshopUrl + '/index/search.png'"
/>
-
+
+ 搜索商品
@@ -27,14 +28,15 @@
class="image_1" mode="aspectFill"
:src="publicPath + item.goodImg"
/>
- {{ item.name }}
+ {{ item.name }}
+
-
- {{ item.price }}
+ /> -->
+ ￥{{ item.price }}
@@ -163,7 +165,7 @@ const jump_detail =(item,index)=>{
.section_3 {
padding: 0 15rpx;
background-color: #fff;
- border-radius: 18.75rpx;
+ border-radius: 20.75rpx;
width: 506.25rpx;
height: 60rpx;
}
@@ -174,7 +176,7 @@ const jump_detail =(item,index)=>{
.font {
font-size: 24.38rpx;
font-family: FangZhengFonts;
- color: #000000;
+ color: #323232;
}
.text {
line-height: 23.04rpx;
@@ -218,12 +220,12 @@ const jump_detail =(item,index)=>{
height: 324.38rpx;
}
.text_2 {
- margin-left: 15.56rpx;
- margin-right: 3.19rpx;
+ font-size: 30rpx;
+ margin: 15rpx 20rpx 0;
line-height: 30rpx;
}
.group_2 {
- padding: 0 24.3rpx;
+ padding: 0 20rpx;
}
.image_4 {
width: 26.25rpx;
@@ -232,7 +234,6 @@ const jump_detail =(item,index)=>{
.font_2 {
color: #c35c5d;
font-size: 30rpx;
- font-family: Times New Roman;
line-height: 20.68rpx;
}
.flexbox {
diff --git a/pages/workshop/searchResult/searchResult.vue b/pages/workshop/searchResult/searchResult.vue
index 34a783d..e6c7639 100644
--- a/pages/workshop/searchResult/searchResult.vue
+++ b/pages/workshop/searchResult/searchResult.vue
@@ -16,7 +16,7 @@
{{ item.name }}
{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}
@@ -33,6 +33,7 @@
import { baseUrl } from '../../../api/request';
import { workshopUrl,bkgPubilcPath } from '../../../common/globalImagesUrl';
import { getFonts } from '../../../common/globalFont';
+ import { publicPath } from '../../../common/globalImagesUrl';
const cookie = wx.getStorageSync("cookie")
const keyword = ref('')
const type = ref(0)