diff --git a/packages/community/providentFund/index.scss b/packages/community/providentFund/index.scss
index 3ba91d2b..c6c9f1a4 100644
--- a/packages/community/providentFund/index.scss
+++ b/packages/community/providentFund/index.scss
@@ -3,7 +3,7 @@ page {
}
.container {
.container_body {
- background: url("http://127.0.0.1:5500/assets/community_providentFund_Group_1523.png") no-repeat;
+ background: url("http://192.168.0.152:5500/assets/community_providentFund_Group_1523.png") no-repeat;
background-size: 100% 100%;
}
.title {
diff --git a/packages/community/providentFund/index.vue b/packages/community/providentFund/index.vue
index 4bfd6b49..e437eb50 100644
--- a/packages/community/providentFund/index.vue
+++ b/packages/community/providentFund/index.vue
@@ -59,13 +59,13 @@
@@ -90,7 +90,7 @@ export default {
data() {
return {
top: '',
- moeny: 0.00,
+ moeny: '0.00',
show: false,
ownerDesc: '本房产的物业公积金为该房产的所有成员物业公积金总和。无需经过成员同意便可用于本房产的物业费抵扣，一旦成功抵扣，成员所拥有的物业公积金将自动进行扣除。',
desc: '物业公积金可通用至您加入的所有房产，任一房产的物业相关费用均可用该物业公积金抵扣。',
diff --git a/packages/localLife/detail/index.vue b/packages/localLife/detail/index.vue
index f17966cc..a7364a20 100644
--- a/packages/localLife/detail/index.vue
+++ b/packages/localLife/detail/index.vue
@@ -89,11 +89,11 @@
导航
-
+
电话
-
+
点评
diff --git a/packages/localLife/shopList/index.vue b/packages/localLife/shopList/index.vue
index 5326acbe..0185703c 100644
--- a/packages/localLife/shopList/index.vue
+++ b/packages/localLife/shopList/index.vue
@@ -23,7 +23,7 @@
点评
@@ -49,7 +49,7 @@ export default {
list: [
{
title: "李氏济世堂",
- pic: "http://127.0.0.1:5500/assets/index_Mask_group.png",
+ pic: "http://192.168.0.152:5500/assets/index_Mask_group.png",
desc: ["到家服务", "买单返物业费", "买单返物业费"],
address: "苏州市太仓市城厢镇桃园三村11幢105市",
distance: "898km",
@@ -57,7 +57,7 @@ export default {
},
{
title: "美容美发",
- pic: "http://127.0.0.1:5500/assets/index_Mask_group.png",
+ pic: "http://192.168.0.152:5500/assets/index_Mask_group.png",
desc: [ "买单返物业费"],
address: "苏州市太仓市城厢镇桃园三村11幢105市",
distance: "898km",
diff --git a/packages/user/orderDetail/index.scss b/packages/user/orderDetail/index.scss
new file mode 100644
index 00000000..f3208391
--- /dev/null
+++ b/packages/user/orderDetail/index.scss
@@ -0,0 +1,133 @@
+page {
+ background: #F6F7FB;
+ // background: red;
+}
+.container {
+ margin: 0 20px;
+ .header {
+ margin-top: 20rpx;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ .title {
+ padding-left: 20rpx;
+ font-size: 28rpx;
+ font-weight: 600;
+ color: #222222;
+ height: 85rpx;
+ line-height: 85rpx;
+ border-radius: 20rpx 20rpx 0 0;
+ background: linear-gradient( 304deg, #FFFFFF 0%, #FEE7C3 100%);
+ }
+ .list {
+ padding: 20rpx;
+ .item {
+ margin-top: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ &:first-child{
+ margin-top: 0;
+ }
+ .label {
+ font-size: 28rpx;
+ color: #999999;
+ }
+ .desc {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #222222;
+ text-align: right;
+ .price {
+ font-size: 36rpx;
+ }
+ .time {
+ font-size: 24rpx;
+ margin-top: 10rpx;
+ color: #999999;
+ }
+ .payLogo {
+ width: 36rpx;
+ height: 31rpx;
+ margin-right: 10rpx;
+ }
+ }
+ .pay {
+ display: flex;
+ align-items: center;
+ }
+ }
+ .line {
+ height: 0;
+ margin: 30rpx 0 10rpx;
+ border-bottom: 1px solid #EBEBEB;
+ }
+ }
+ }
+ .main {
+ margin-top: 20rpx;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ padding: 58rpx 20rpx;
+ .title {
+ font-size: 32rpx;
+ color: #222222;
+ font-weight: 600;
+ text-align: center;
+ }
+ .price {
+ text-align: center;
+ font-size: 60rpx;
+ color: #FF370B;
+ margin-top: 10rpx;
+ font-weight: 800;
+ }
+ .desc {
+ font-size: 26rpx;
+ color: #999999;
+ text-align: center;
+ margin-top: 10rpx;
+ }
+ .remark {
+ margin-top: 58rpx;
+ font-size: 26rpx;
+ color: #999999;
+ margin-bottom: 25rpx;
+ }
+ }
+ .btn {
+ margin: 60rpx auto 0;
+ width: 600rpx;
+ height: 90rpx;
+ line-height: 90rpx;
+ background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
+ border-radius: 100rpx 100rpx 100rpx 100rpx;
+ font-size: 36rpx;
+ color: #FFFFFF;
+ text-align: center;
+ }
+ .popup_container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .popup_pic {
+ margin-top: 51rpx;
+ width: 169rpx;
+ height: 148rpx;
+ }
+ .title {
+ margin-top: 28rpx;
+ font-size: 36rpx;
+ color: #222222;
+ font-weight: 500;
+ margin-bottom: 56rpx;
+ }
+ .btn {
+ width: 170rpx;
+ height: 52rpx;
+ line-height: 52rpx;
+ background: #FF370B;
+ border-radius: 100rpx 100rpx 100rpx 100rpx;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/user/orderDetail/index.vue b/packages/user/orderDetail/index.vue
new file mode 100644
index 00000000..e7f866a6
--- /dev/null
+++ b/packages/user/orderDetail/index.vue
@@ -0,0 +1,109 @@
+
+
+
+
+ 退款
+ ￥64.1
+ 确认退款后款项将自动原路返回消费者
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a94d9f7e..d0582c45 100644
--- a/pages.json
+++ b/pages.json
@@ -313,6 +313,13 @@
}
}
},
+ {
+ "path": "orderDetail/index",
+ "style": {
+ "navigationBarTitleText": "退款操作",
+ "navigationBarBackgroundColor": "#F9F9F9"
+ }
+ },
{
"path": "resetPwd/index",
"style": {
diff --git a/pages/shopcity/index.css b/pages/shopcity/index.css
index eb1e7306..0db3f0b1 100644
--- a/pages/shopcity/index.css
+++ b/pages/shopcity/index.css
@@ -2,9 +2,12 @@ page {
height: 100vh;
overflow: hidden;
}
+.search_popup {
+ max-height: 1000rpx;
+ overflow: auto;
+}
.city-select-page {
background-color: #f9f9f9;
- /* background-color: red; */
}
.white_container {
background: #FFFFFF;
@@ -24,6 +27,7 @@ page {
}
.hot-cities {
+ padding-right: 36rpx;
margin-top: 40rpx;
margin-bottom: 20rpx;
}
@@ -37,10 +41,11 @@ page {
.city-list {
display: flex;
flex-wrap: wrap;
+ padding-left: 4rpx;
}
.city_name {
display: inline-block;
- padding: 13rpx 52rpx 18rpx;
+ padding: 13rpx 38rpx 18rpx;
border-radius: 8rpx 8rpx 8rpx 8rpx;
border: 1rpx solid #EBEBEB;
font-size: 28rpx;
diff --git a/pages/shopcity/shopcity.vue b/pages/shopcity/shopcity.vue
index 9ca6aa23..9a1c3d3a 100644
--- a/pages/shopcity/shopcity.vue
+++ b/pages/shopcity/shopcity.vue
@@ -1,5 +1,5 @@
-
+
@@ -93,7 +95,7 @@