diff --git a/components/order/orderCard.vue b/components/order/orderCard.vue
new file mode 100644
index 0000000..fcee10f
--- /dev/null
+++ b/components/order/orderCard.vue
@@ -0,0 +1,185 @@
+
+
+
+ {{ data.title }}
+ {{ stateCodeAndDescFieldsMapping[data.state] }}
+
+
+
+
+
+ {{ `服务内容:${data.desc || '-'}` }}
+ {{ `下单时间:${data.createTime || '-'}` }}
+ {{ `订单号:${data.orderNo || '-'}` }}
+
+
+ 总价格:¥{{ data.price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/product/productCard.vue b/components/product/productCard.vue
index 126c6e9..13ad653 100644
--- a/components/product/productCard.vue
+++ b/components/product/productCard.vue
@@ -1,5 +1,5 @@
-
+
@@ -59,10 +59,14 @@
type: String,
default: 'horizontal' // horizontal | vertical
},
+ size: {
+ type: String,
+ default: 'small' // small | medium
+ },
readonly: {
type: Boolean,
default: false,
- }
+ },
},
data() {
return {
@@ -219,6 +223,29 @@
border-radius: 10rpx;
}
}
+
+ &.medium {
+ padding: 27rpx 25rpx;
+ width: 100%;
+ box-sizing: border-box;
+
+ .img {
+ width: 184rpx;
+ height: 184rpx;
+ }
+
+ .title {
+ margin-bottom: 14rpx;
+ }
+
+ .price {
+ margin-top: 15rpx;
+ }
+
+ .sales {
+ margin-top: 15rpx;
+ }
+ }
}
diff --git a/pages.json b/pages.json
index ac0bcd2..d066212 100644
--- a/pages.json
+++ b/pages.json
@@ -52,7 +52,15 @@
{
"path": "product/productDetail"
},
+ {
+ "path": "order/createOrder"
+ },
+ {
+ "path": "order/verifyOrder"
+ },
+
+
{
"path": "mine/partner"
},
@@ -92,9 +100,6 @@
{
"path": "home/journalism"
},
- {
- "path": "order/createOrder"
- },
{
"path": "mine/balance"
},
diff --git a/pages/index/order.vue b/pages/index/order.vue
index cb2cb26..a9f8ee0 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -36,78 +36,7 @@
-
-
-
-
-
-
-
-
- {{ good.title }}
-
-
- {{ tabs[Number(item.state) + 1].name }}
-
-
-
-
-
-
-
-
-
-
- 客户姓名:{{item.name}}
-
-
- 下单时间:{{item.createTime}}
-
-
- 联系电话:{{item.phone}}
-
-
-
-
-
-
-
-
-
- 总价格:
- ¥
- {{item.price}}
- 元
-
-
-
- 立即付款
-
-
-
- 取消订单
-
-
-
- 确认收货
-
-
-
- 联系客服
-
-
-
-
-
-
-
-
-
-
-
@@ -121,14 +50,12 @@
import mixinsList from '@/mixins/list.js'
import mixinsOrder from '@/mixins/order.js'
import tabber from '@/components/base/tabbar.vue'
- import customerServicePopup from '@/components/config/customerServicePopup.vue'
export default {
mixins: [mixinsList, mixinsOrder],
components: {
orderCard,
tabber,
- customerServicePopup,
},
computed: {},
data() {
@@ -199,91 +126,4 @@
.list {
padding: 16rpx 17rpx;
}
-
- .list {
- .item {
- width: calc(100% - 40rpx);
- background-color: #fff;
- margin: 20rpx;
- box-sizing: border-box;
- border-radius: 16rpx;
- padding: 30rpx;
-
- .content {
- .top {
- display: flex;
- justify-content: space-between;
- align-items: center;
- font-size: 34rpx;
-
- .status {
- font-weight: 600;
- color: #FFAC2F;
- flex-shrink: 0;
- margin-left: 20rpx;
- }
- }
-
- .main {
- display: flex;
- margin: 20rpx 0rpx;
-
- .left {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 180rpx;
- height: 180rpx;
-
- image {
- width: 95%;
- height: 95%;
- border-radius: 10rpx;
- }
- }
-
- .right {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- width: calc(100% - 200rpx);
- color: #777;
- font-size: 26rpx;
- padding: 30rpx 20rpx;
- box-sizing: border-box;
- margin-left: 20rpx;
- border-radius: 10rpx;
- background-color: #F8F8F8;
- }
- }
- }
-
- .bottom {
- display: flex;
- justify-content: space-between;
- font-size: 25rpx;
-
- .price {
- .total-title {}
-
- .num {
- font-size: 36rpx;
- }
-
- .num,
- .unit,
- .c-unit {
- color: $uni-color;
- }
- }
-
- .btn {
- border: 1px solid #C7C7C7;
- padding: 10rpx 20rpx;
- border-radius: 40rpx;
- color: #575757;
- }
- }
- }
- }
\ No newline at end of file
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 44283e0..a5f55b5 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -6,7 +6,7 @@
-
+
@@ -223,32 +223,6 @@
box-sizing: border-box;
}
- /deep/ .product-card__view {
- // margin: 0 13rpx;
- padding: 27rpx 25rpx;
- // width: calc(100vw - 13rpx*2);
- width: 100%;
- box-sizing: border-box;
- // transform: translateY(-50%);
-
- .img {
- width: 184rpx;
- height: 184rpx;
- }
-
- .title {
- margin-bottom: 14rpx;
- }
-
- .price {
- margin-top: 15rpx;
- }
-
- .sales {
- margin-top: 15rpx;
- }
- }
-
}
.card {
diff --git a/pages_order/order/verifyOrder.vue b/pages_order/order/verifyOrder.vue
new file mode 100644
index 0000000..2493b06
--- /dev/null
+++ b/pages_order/order/verifyOrder.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+ {{ `订单号:${orderDetail.orderNo}` }}
+ {{ `有效时间:${orderDetail.startTime}至${orderDetail.endTime}` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/static/verifyOrder/icon-checked.png b/pages_order/static/verifyOrder/icon-checked.png
new file mode 100644
index 0000000..8824cb2
Binary files /dev/null and b/pages_order/static/verifyOrder/icon-checked.png differ
diff --git a/pages_order/static/verifyOrder/icon-clock.png b/pages_order/static/verifyOrder/icon-clock.png
new file mode 100644
index 0000000..c22eedb
Binary files /dev/null and b/pages_order/static/verifyOrder/icon-clock.png differ
diff --git a/pages_order/static/verifyOrder/temp-qrcode.png b/pages_order/static/verifyOrder/temp-qrcode.png
new file mode 100644
index 0000000..f5285cd
Binary files /dev/null and b/pages_order/static/verifyOrder/temp-qrcode.png differ