diff --git a/pages.json b/pages.json
index cf6dadb..de9c5e3 100644
--- a/pages.json
+++ b/pages.json
@@ -534,6 +534,26 @@
{
"root": "pages/news/",
"pages": [
+ {
+ "path" : "coupon/index",
+ "style" :
+ {
+ "navigationBarTitleText": "领券中心",
+ "navigationBarBackgroundColor": "#FB3A22",
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "coupon/list",
+ "style" :
+ {
+ "navigationBarTitleText": "领券中心",
+ "navigationBarBackgroundColor": "#FB3A22",
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path" : "recycling/index",
"style" :
@@ -556,7 +576,25 @@
"path" : "recycling/confirm",
"style" :
{
- "navigationBarTitleText": "上门回收",
+ "navigationBarTitleText": "确认服务订单",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "recycling/timer",
+ "style" :
+ {
+ "navigationBarTitleText": "选择时间",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "recycling/order",
+ "style" :
+ {
+ "navigationBarTitleText": "订单详情",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
diff --git a/pages/news/coupon/index.vue b/pages/news/coupon/index.vue
new file mode 100644
index 0000000..3e036f6
--- /dev/null
+++ b/pages/news/coupon/index.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+ 商品券
+ 服务券
+
+
+
+ ¥890
+ 满999元使用
+ 适用于全场商品
+ 点击领取
+
+
+
+
+
+ 暂无已使用优惠券
+
+
+
+
+
+
+
diff --git a/pages/news/coupon/list.vue b/pages/news/coupon/list.vue
new file mode 100644
index 0000000..01fc7ad
--- /dev/null
+++ b/pages/news/coupon/list.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+ ¥890
+ 有效期:2024.01-2024.01.19
+ 适用于全场商品
+ 去使用
+ 满999元使用
+ 满999元减130元
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无已使用优惠券
+
+
+
+
+
+
+
diff --git a/pages/news/recycling/confirm.vue b/pages/news/recycling/confirm.vue
index 8404861..6b58e1a 100644
--- a/pages/news/recycling/confirm.vue
+++ b/pages/news/recycling/confirm.vue
@@ -52,7 +52,7 @@
服务时间
-
+
请选择预约到店时间
@@ -60,7 +60,7 @@
联系人
-
+
先生
@@ -72,34 +72,36 @@
联系电话
-
+
-
+
联系人微信
-
+
-
+
发件地址
-
+
+ 请选择所在人城市
+
-
+
门牌号
-
+
期待卖价
-
+
-
+
@@ -125,7 +127,7 @@
免支付预购
- 提交订单
+ 提交订单
@@ -146,6 +148,17 @@
methods: {
tabItem(i) {
this.tabIndex = i
+ },
+ openPage(i){
+ if(i == 1){
+ uni.navigateTo({
+ url: "/pages/news/recycling/timer"
+ })
+ }else {
+ uni.redirectTo({
+ url: "/pages/news/recycling/order"
+ })
+ }
},
}
}
@@ -325,14 +338,48 @@
}
.form {
padding: 0 40rpx;
- overflow: hidden;
+ overflow: hidden;
+ .remark{
+ .name{
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #313131;
+ }
+ .xu{
+ display: flex;
+ flex-wrap: wrap;
+ overflow: hidden;
+ .li{
+ line-height: 52rpx;
+ background: #FFFFFF;
+ border-radius: 6rpx;
+ border: 1px solid #EDEDED;
+ padding: 0 20rpx;
+ margin-right: 20rpx;
+ text-align: center;
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #949494;
+ margin-top: 20rpx;
+ }
+ }
+ .content{
+ padding: 20rpx 0 50rpx;
+ font-size: 28rpx;
+ color: #212121;
+ }
+ }
+ .photo{
+ padding: 20rpx 0;
+ overflow: hidden;
+ }
.item{
padding: 20rpx 0;
border-bottom: 1px solid #F4F4F4;
display: flex;
align-items: center;
.a{
- width: 140rpx;
+ width: 160rpx;
font-size: 28rpx;
font-weight: 400;
color: #313131;
@@ -353,20 +400,26 @@
color: #212121;
}
}
- input{
+ .box{
flex: 1;
font-size: 28rpx;
color: #212121;
line-height: 45rpx;
+ }
+ .box1{
+ width: 160rpx;
+ font-size: 28rpx;
+ color: #212121;
+ line-height: 45rpx;
}
.radio{
display: flex;
align-items: center;
- justify-content: center;
+ justify-content: flex-end;
flex: 1;
border-left: 1px solid #E6E6E6;
}
- }
+ }
}
}
}
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
new file mode 100644
index 0000000..b2e2d91
--- /dev/null
+++ b/pages/news/recycling/order.vue
@@ -0,0 +1,442 @@
+
+
+
+
+
+
+
+
+
+ 王小二
+ 19800998899
+
+
+
+
+
+
+ 手机回收
+ ¥7599
+
+ x1
+
+
+
+
+
+
+ 回收方式:门店回收
+
+
+
+ 回收时间:
+ 2023-12-20 15:20:20
+
+
+ 期待价格:
+ ¥2399
+
+
+ 商品图片:
+
+
+
+
+
+
+
+
+
+
+
+ 店铺名称:
+ 京选家电武隆路店
+
+
+ 店铺电话:
+ 17705773556
+
+
+ 店铺地址:
+ 杭州市萧山区宏达路237号丽景国际中心1F-33
+
+
+ 电话
+
+
+ 导航
+
+
+
+
+ 营业时间:
+ 10:00-18:00
+
+
+
+
+
+
+ 订单编号:
+ 2393990490490
+ 复制
+
+
+ 下单时间:
+ 2023-12-20 15:20:20
+
+
+ 商品快照:
+ 核对交易细节时,可作为判断依据
+ 查看
+
+
+ 营业时间:
+ 10:00-18:00
+
+
+
+
+
+
+
+ 物流公司:
+
+
+
+
+
+
+
+
+ 快递单号:
+
+
+
+
+ 确认发货
+
+
+
+
+
+
+
+ 留言:
+ 可提前来
+
+
+
+
+
+ 联系商家
+
+
+ 确认收款
+
+
+
+
+
+ 回收订单提交成功
+ 感谢您对低碳环保做出的努力!
+ 查看订单
+
+
+
+
+
+
+
+
diff --git a/pages/news/recycling/timer.vue b/pages/news/recycling/timer.vue
new file mode 100644
index 0000000..f309151
--- /dev/null
+++ b/pages/news/recycling/timer.vue
@@ -0,0 +1,156 @@
+
+
+
+
+ 今天01-10
+
+
+ 明天01-11
+
+
+ 周五01-11
+
+
+ 周六01-11
+
+
+
+
+ 19:30夜间
+
+
+
+ 实际到达时间可能会有30分钟浮动
+ 确定选择
+
+
+
+
+
\ No newline at end of file
diff --git a/static/news/coupon-bg.jpg b/static/news/coupon-bg.jpg
new file mode 100644
index 0000000..cfcae54
Binary files /dev/null and b/static/news/coupon-bg.jpg differ
diff --git a/static/news/icon-coupon-01.png b/static/news/icon-coupon-01.png
new file mode 100644
index 0000000..687ec0d
Binary files /dev/null and b/static/news/icon-coupon-01.png differ
diff --git a/static/news/icon-coupon-02.png b/static/news/icon-coupon-02.png
new file mode 100644
index 0000000..0cf32b7
Binary files /dev/null and b/static/news/icon-coupon-02.png differ
diff --git a/static/news/icon-coupon-03.png b/static/news/icon-coupon-03.png
new file mode 100644
index 0000000..4378b66
Binary files /dev/null and b/static/news/icon-coupon-03.png differ
diff --git a/static/news/icon-coupon-use.png b/static/news/icon-coupon-use.png
new file mode 100644
index 0000000..71a8d10
Binary files /dev/null and b/static/news/icon-coupon-use.png differ
diff --git a/static/news/icon-coupon-used.png b/static/news/icon-coupon-used.png
new file mode 100644
index 0000000..f31b2d1
Binary files /dev/null and b/static/news/icon-coupon-used.png differ
diff --git a/static/news/icon-recycling-order-01.png b/static/news/icon-recycling-order-01.png
new file mode 100644
index 0000000..663539c
Binary files /dev/null and b/static/news/icon-recycling-order-01.png differ
diff --git a/static/news/icon-recycling-order-02.png b/static/news/icon-recycling-order-02.png
new file mode 100644
index 0000000..8672101
Binary files /dev/null and b/static/news/icon-recycling-order-02.png differ
diff --git a/static/news/icon-recycling-order-03.png b/static/news/icon-recycling-order-03.png
new file mode 100644
index 0000000..131b485
Binary files /dev/null and b/static/news/icon-recycling-order-03.png differ
diff --git a/static/news/icon-recycling-order-04.png b/static/news/icon-recycling-order-04.png
new file mode 100644
index 0000000..c4ea63d
Binary files /dev/null and b/static/news/icon-recycling-order-04.png differ