diff --git a/order/orderConfirm/orderConfirm.vue b/order/orderConfirm/orderConfirm.vue
index a0988af..90da254 100644
--- a/order/orderConfirm/orderConfirm.vue
+++ b/order/orderConfirm/orderConfirm.vue
@@ -91,7 +91,7 @@
订单备注
-
+
@@ -191,6 +191,15 @@ const show = ref(false);
const timList = ref([]);
//使用pinia：storeToRefs方法包裹(保持响应式更新，不使用视图无法更新)
//const { count,doubleCount } = storeToRefs(counterStore);
+const isIos = ref(false);
+const System = () =>{
+ const phone = wx.getSystemInfoSync();
+ if (phone.platform == 'ios') {
+ isIos.value = true
+ } else if (phone.platform == 'android') {
+ isIos.value = false
+ }
+};
const OpenShop = ()=>{
shopShow.value ? shopPopup.value.close():shopPopup.value.open();
};
@@ -246,6 +255,7 @@ const onAddress=()=>{
})
};
onLoad((options) => {
+ System();
timeFun();
});
onShow(() => {
diff --git a/order/orderConfirm/style.scss b/order/orderConfirm/style.scss
index b3f5a85..63a809c 100644
--- a/order/orderConfirm/style.scss
+++ b/order/orderConfirm/style.scss
@@ -28,7 +28,7 @@ page{
color: #000000;
.cont_default{
font-size: 20rpx;
- background-color: #FFF4CD;
+ background-color: rgba(249, 212, 72, 0.2);
border-radius: 10rpx;
color: #F9D448;
margin-right: 10rpx;
diff --git a/pages.json b/pages.json
index 2e5eb6d..fcb66f5 100644
--- a/pages.json
+++ b/pages.json
@@ -178,6 +178,22 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
},
+ {
+ "path": "SearchProduct/SearchProduct",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "SearchList/SearchList",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "addressList/addressList",
"style": {
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 54eace0..0a92bf9 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -2,16 +2,16 @@
-
- 东方体育中心
+
+ 人间都汇·汤泉养生
购物车
我常买
- 优惠券(3）
- {{showEdit?'退出管理':'管理'}}
+ 优惠券(3）
+ {{showEdit?'退出管理':'管理'}}
@@ -31,7 +31,7 @@
- {{item.title}}
+ {{item.title}}
{{item.desc}}
{{item.price}}59.9
@@ -506,6 +506,5 @@ onReachBottom(()=>{
margin-bottom: 20rpx !important;
border-radius: 25rpx !important;
background-color: #fff !important;
- box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05) !important;
}
\ No newline at end of file
diff --git a/pages/cart/style.scss b/pages/cart/style.scss
index 555b930..a2af68f 100644
--- a/pages/cart/style.scss
+++ b/pages/cart/style.scss
@@ -31,7 +31,7 @@ page{
height: 21px;
background-image: url('../../static/location.png');
background-size: cover;
- margin: 0px 2px 0px 10px;
+ margin: 0px 1px 0px 10px;
}
.head_location::after{
vertical-align: middle;
@@ -42,8 +42,8 @@ page{
border-left: 10rpx solid transparent;
border-right: 10rpx solid transparent;
border-top: 11rpx solid #FFFFFF;
- margin-left: 3px;
- margin-top: 1.5px;
+ margin-left: 1.5px;
+ margin-top: 0.8px;
}
.head_location_active{
.location_title{
@@ -74,7 +74,7 @@ page{
}
.head_w{
color: #333333;
- font-size: 30rpx;
+ font-size: 28rpx;
padding-left: 15px;
padding-right: 15px;
}
@@ -116,6 +116,7 @@ page{
// box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
display: flex;
justify-content: space-between;
+ align-items: center;
padding: 20rpx 0rpx 20rpx 0rpx;
.cart_selected{
width: 50rpx;
@@ -161,12 +162,21 @@ page{
}
}
.cart_shop_cont{
- width: 410rpx;
+ width: 390rpx;
+ padding-right: 20rpx;
.cart_title{
- font-size: 28rpx;
+ font-size: 27rpx;
color: #333333;
font-weight: 500;
- min-height: 85rpx;
+ .cart_text{
+ min-height: 65rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ word-break: break-all;
+ }
}
.cart_desc{
font-size: 24rpx;
@@ -617,7 +627,6 @@ page{
font-weight: 400;
}
.cart_bottom{
- margin-top: 20rpx;
display: flex;
align-items: center;
justify-content: space-between;
@@ -629,7 +638,6 @@ page{
.cart_counter{
display: flex;
align-items: center;
- margin-right: 20rpx;
.cart_counter_btn{
width: 55rpx;
height: 50rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d776359..313aec7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,11 +1,11 @@
-
- 东方体育中心
-
+
+ 人间都汇·汤泉养生
+
-
+
搜索
@@ -350,6 +350,11 @@ const location=()=>{
url:`/userserve/location/location`
})
}
+const onSearch=()=>{
+ uni.navigateTo({
+ url:`/userserve/SearchProduct/SearchProduct`
+ })
+}
onLoad((options) => {
});
diff --git a/pages/index/style.scss b/pages/index/style.scss
index d216ceb..f34b315 100644
--- a/pages/index/style.scss
+++ b/pages/index/style.scss
@@ -37,7 +37,7 @@ page{
height: 21px;
background-image: url('../../static/location.png');
background-size: cover;
- margin: 0px 2px 0px 10px;
+ margin: 0px 1px 0px 10px;
}
.head_location::after{
vertical-align: middle;
@@ -48,8 +48,8 @@ page{
border-left: 10rpx solid transparent;
border-right: 10rpx solid transparent;
border-top: 11rpx solid #FFFFFF;
- margin-left: 3px;
- margin-top: 1.5px;
+ margin-left: 1.5px;
+ margin-top: 0.8px;
}
.head_location_active{
.location_title{
@@ -227,7 +227,7 @@ page{
padding-bottom: 30rpx;
display: inline-block;
margin-left: 20rpx;
- box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
+ // box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
.scroll_view_banner{
width: 100%;
height: 340rpx;
diff --git a/pages/user/style.scss b/pages/user/style.scss
index a7f6037..925e4a0 100644
--- a/pages/user/style.scss
+++ b/pages/user/style.scss
@@ -62,7 +62,7 @@ page{
background-color: #FFFFFF;
border-radius: 20rpx;
padding: 40rpx;
- box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05);
+ // box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05);
position: relative;
.user_account_li{
display: flex;
@@ -129,7 +129,7 @@ page{
flex-wrap: wrap;
background-color: #FFFFFF;
border-radius: 20rpx;
- box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05);
+ // box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05);
.user_cont_li{
width: 20%;
box-sizing: border-box;
diff --git a/userserve/SearchList/SearchList.vue b/userserve/SearchList/SearchList.vue
new file mode 100644
index 0000000..1940ebd
--- /dev/null
+++ b/userserve/SearchList/SearchList.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 够辣
+
+
+
+
+
+ 糖醋排骨
+ 乡下土猪
+
+ 仅剩3份
+ 劲辣胃浓
+
+
+ 43.959.9
+
+
+
+
+
+
+
+
+ 够辣
+
+
+
+
+
+ 糖醋排骨
+ 乡下土猪
+
+ 仅剩3份
+ 劲辣胃浓
+
+
+ 43.959.9
+
+
+
+
+
+
+
+
+ 香甜
+
+
+
+
+
+ 泡椒田鸡
+ 超大只田鸡
+
+ 仅剩3份
+ 劲辣胃浓
+ 劲辣胃浓
+
+
+ 43.959.9
+
+
+
+
+
+
+
+
+
+
+ 热销
+
+
+
+
+
+ 泡椒田鸡
+ 超大只田鸡
+
+ 仅剩3份
+ 劲辣胃浓
+
+
+ 43.959.9
+
+
+
+
+
+
+
+
+ 新鲜
+
+
+
+
+
+ 泡椒田鸡
+ 超大只田鸡
+
+ 仅剩3份
+ 劲辣胃浓
+
+
+ 43.959.9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/userserve/SearchList/style.scss b/userserve/SearchList/style.scss
new file mode 100644
index 0000000..4f6edb3
--- /dev/null
+++ b/userserve/SearchList/style.scss
@@ -0,0 +1,194 @@
+page{
+ background-color: #f6f6f6;
+}
+.main{
+ .head{
+ position: fixed;
+ z-index: 100;
+ width: 100%;
+ top: 0;
+ left: 0;
+ background-color: #FFFFFF;
+ border-bottom: 1rpx solid #f6f6f6;
+ padding-bottom: 10px;
+ .head_top{
+ display: flex;
+ align-items: center;
+ .head_back{
+ display: flex;
+ align-items: center;
+ border-radius: 50rpx;
+ margin-left: 10px;
+ .head_back_img{
+ display: block;
+ width: 18px;
+ height: 18px;
+ margin-left: 7px;
+ }
+ }
+ .head_search{
+ width: 210px;
+ margin:0rpx 0px 0rpx 10px;;
+ display: flex;
+ align-items: center;
+ background-color: #F6F6F6;
+ height: 38px;
+ border-radius: 50rpx;
+ font-size: 28rpx;
+ color: #000000;
+ justify-content: space-between;
+ .head_search_img{
+ width: 28px;
+ height: 28px;
+ margin-right: 13rpx;
+ margin-left: 23rpx;
+ }
+ .head_search_input{
+ width: 500rpx;
+ height: 100%;
+ font-size: 27rpx;
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+ }
+ .cont{
+ // 商品区域样式
+ .shop_view{
+ margin-top: 10rpx;
+ padding: 13rpx 20rpx 0rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
+ .shop_view_ul{
+ width: 346rpx;
+ .shop_view_li{
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ width: 100%;
+ box-shadow: 0 4rpx 8rpx rgba(0,0,0,.05);
+ margin-bottom: 20rpx;
+ .shop_view_li_swiper{
+ width: 100%;
+ height: 504rpx;
+ .shop_view_li_swiper_item{
+ width: 100%;
+ .shop_view_li_swiper_img_url{
+ width: 100%;
+ height: 504rpx;
+ display: block;
+ border-radius: 20rpx;
+ }
+ }
+ }
+ .shop_view_img{
+ width: 100%;
+ position: relative;
+ height: 320rpx;
+ .shop_view_tag{
+ width: 66rpx;
+ height: 42rpx;
+ position: absolute;
+ z-index: 2;
+ right: -15rpx;
+ top: 20rpx;
+ background: url(../../static/tag_img.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ .shop_view_tag_text{
+ font-size: 20rpx;
+ color: #FFFFFF;
+ height: 30rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ .shop_view_img_u{
+ width: 300rpx;
+ position: absolute;
+ z-index: 1;
+ left: 20rpx;
+ top: 20rpx;
+ .shop_view_img_url{
+ width: 100%;
+ height: 300rpx;
+ display: block;
+ }
+ }
+ }
+ .shop_view_cont{
+ padding: 20rpx;
+ .shop_view_cont_title{
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #000000;
+ min-height: 80rpx;
+ }
+ .shop_view_cont_desc{
+ color: #666666;
+ font-size: 24rpx;
+ }
+ .shop_view_cont_tag{
+ display: flex;
+ flex-wrap: wrap;
+ .shop_view_cont_tag_text{
+ border-radius: 6rpx;
+ border: 1px solid #FF6868;
+ padding: 0rpx 10rpx;
+ border-radius: 10rpx;
+ color: #ff6868;
+ font-size: 18rpx;
+ margin-top: 10rpx;
+ margin-right: 10rpx;
+ }
+ }
+ }
+ .shop_view_cont_bottom{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .shop_view_cont_price{
+ font-size: 32rpx;
+ color: red;
+ font-weight: 500;
+ }
+ .shop_view_cont_cart{
+ width: 65rpx;
+ height: 65rpx;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ .shop_view_cont_cart_img{
+ width: 40rpx;
+ height: 40rpx;
+ display: block;
+ }
+ }
+ }
+ }
+ .shop_view_bcg{
+ background-color: inherit;
+ }
+ }
+ }
+ }
+ .price::before {
+ content: '¥';
+ font-size: 24rpx;
+ margin-right: 5rpx;
+ }
+ .prices::before {
+ content: '¥';
+ font-size: 20rpx;
+ margin-right: 5rpx;
+ margin-left: 5rpx;
+ }
+ .market_name{
+ color: #999999;
+ font-size: 23rpx;
+ text-decoration: line-through;
+ margin-left: 5rpx;
+ font-weight: 400;
+ }
+}
\ No newline at end of file
diff --git a/userserve/SearchProduct/SearchProduct.vue b/userserve/SearchProduct/SearchProduct.vue
new file mode 100644
index 0000000..2f3b02e
--- /dev/null
+++ b/userserve/SearchProduct/SearchProduct.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+ 历史搜索
+
+ 排骨
+ 猪肉炖粉条
+ 蚂蚁上树
+
+
+ 搜索发现
+
+ 买1赠1起
+ 水果半价日
+ 海鲜5折抢
+ 春菜
+ 青团
+ 虾
+ 牛奶
+ 矿泉水
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/userserve/SearchProduct/style.scss b/userserve/SearchProduct/style.scss
new file mode 100644
index 0000000..3ade972
--- /dev/null
+++ b/userserve/SearchProduct/style.scss
@@ -0,0 +1,86 @@
+page{
+ background-color: #FFFFFF;
+}
+.main{
+ .head{
+ position: fixed;
+ z-index: 100;
+ width: 100%;
+ top: 0;
+ left: 0;
+ background-color: #FFFFFF;
+ border-bottom: 1rpx solid #f6f6f6;
+ padding-bottom: 10px;
+ .head_top{
+ display: flex;
+ align-items: center;
+ .head_back{
+ display: flex;
+ align-items: center;
+ border-radius: 50rpx;
+ margin-left: 10px;
+ .head_back_img{
+ display: block;
+ width: 18px;
+ height: 18px;
+ margin-left: 7px;
+ }
+ }
+ .head_search{
+ width: 210px;
+ margin:0rpx 0px 0rpx 10px;;
+ display: flex;
+ align-items: center;
+ background-color: #F6F6F6;
+ height: 38px;
+ border-radius: 50rpx;
+ font-size: 28rpx;
+ color: #000000;
+ justify-content: space-between;
+ .head_search_img{
+ width: 28px;
+ height: 28px;
+ margin-right: 13rpx;
+ margin-left: 23rpx;
+ }
+ .head_search_input{
+ width: 500rpx;
+ height: 100%;
+ font-size: 27rpx;
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+ }
+ .cont{
+ .cont_title{
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #333333;
+ margin: 40rpx 20rpx 0rpx 20rpx;
+ }
+ .cont_keyword{
+ display: flex;
+ overflow: hidden;
+ flex-wrap: wrap;
+ .cont_keyword_item{
+ font-size: 26rpx;
+ color: #333333;
+ padding: 10rpx 30rpx 10rpx 30rpx;
+ background-color: #f6f6f6;
+ border-radius: 50rpx;
+ margin-left: 20rpx;
+ margin-top: 20rpx;
+ }
+ }
+ .cont_ul{
+ .cont_li{
+ border-bottom:1rpx solid #D9D9D9;
+ padding: 30rpx 0;
+ margin: 0rpx 30rpx 0rpx 30rpx;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/userserve/addressEdit/style.scss b/userserve/addressEdit/style.scss
index 720ecd9..414e927 100644
--- a/userserve/addressEdit/style.scss
+++ b/userserve/addressEdit/style.scss
@@ -12,7 +12,7 @@ page{
// padding: 25rpx 0rpx 25rpx 0rpx;
display: flex;
justify-content: space-between;
- border-bottom: 1rpx solid #f6f6f6;
+ border-bottom: 1rpx solid #D9D9D9;
.adderss_name{
font-size: 28rpx;
color: #333333;
diff --git a/userserve/addressList/style.scss b/userserve/addressList/style.scss
index aa66be5..91dd8ed 100644
--- a/userserve/addressList/style.scss
+++ b/userserve/addressList/style.scss
@@ -11,14 +11,14 @@ page{
.location_list{
padding-top: 30rpx;
padding-bottom: 30rpx;
- border-bottom: 1rpx solid #f6f6f6;
+ border-bottom: 1rpx solid #D9D9D9;
.location_l{
.location_address{
.location_default{
font-size: 20rpx;
- background-color: #fff4cd;
+ background-color: rgba(249, 212, 72, 0.2);
border-radius: 10rpx;
- color: #f9d448;
+ color: #F9D448;
margin-right: 10rpx;
padding: 2rpx 10rpx;
vertical-align: middle;
diff --git a/userserve/location/style.scss b/userserve/location/style.scss
index 76e1812..9324921 100644
--- a/userserve/location/style.scss
+++ b/userserve/location/style.scss
@@ -47,14 +47,14 @@ page{
.location_list{
padding-top: 30rpx;
padding-bottom: 30rpx;
- border-bottom: 1rpx solid #f6f6f6;
+ border-bottom: 1rpx solid #D9D9D9;
.location_l{
.location_address{
.location_default{
font-size: 20rpx;
- background-color: #fff4cd;
+ background-color: rgba(249, 212, 72, 0.2);
border-radius: 10rpx;
- color: #f9d448;
+ color: #F9D448;
margin-right: 10rpx;
padding: 2rpx 10rpx;
vertical-align: middle;
@@ -101,7 +101,7 @@ page{
font-weight: 500;
color: #333333;
padding: 30rpx 0 30rpx 0;
- border-bottom: 1rpx solid #f6f6f6;
+ border-bottom: 1rpx solid #D9D9D9;
}
}
.flex{