diff --git a/common/styles/main.css b/common/styles/main.css index 32b9eb3..09413b7 100644 --- a/common/styles/main.css +++ b/common/styles/main.css @@ -501,6 +501,17 @@ radio.white.checked .uni-radio-input { box-sizing: border-box; } +.cu-btn1 { + width: 150rpx; + height: 63rpx; + background: #fff; + border-radius: 31.5rpx; + font-size: 24rpx; + margin: 0rpx 20rpx 0rpx 20rpx; + line-height: 60rpx; + padding: 0; +} + .solid::after { border: 1upx solid rgba(0, 0, 0, 0.1); } diff --git a/common/styles/theme.css b/common/styles/theme.css index c7d3b21..6201f2b 100644 --- a/common/styles/theme.css +++ b/common/styles/theme.css @@ -92,6 +92,10 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo background: #FFFFFF !important; } +.lf-bg-red { + background: #FF0000 !important; +} + .lf-color-gray { color: #777777 !important; } @@ -104,6 +108,22 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo background: #1998FE !important; } +.lf-color-green { + color: #0BCE5F !important; +} + +.lf-border-green { + border: 1px solid #0BCE5F !important; +} + +.lf-border-blue { + border: 1px solid #1998FE !important; +} + +.lf-border-gray { + border: 1px solid #555555 !important; +} + /* 一些常用的字体颜色 */ .lf-color-price { color: #FF0000 !important; diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0cfea6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,11 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "tki-qrcode": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/tki-qrcode/-/tki-qrcode-0.1.6.tgz", + "integrity": "sha512-EnnlS8psowC7PsW3MDYcxvJYkuklX3WAZ/BYanR4TdBHTu74GfjTBX8Y16REP+AeDENiVtBPh4jtTRL2P736hQ==" + } + } +} diff --git a/pages.json b/pages.json index 5a7c5d3..288484d 100644 --- a/pages.json +++ b/pages.json @@ -41,6 +41,24 @@ "navigationBarTitleText": "确认订单" } }, + { + "path": "pages/order/order_details", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "pages/order/unpay_details", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "pages/order/order", + "style": { + "navigationBarTitleText": "我的订单" + } + }, { "path": "pages/payState/paystate", "style": { diff --git a/pages/order/order.vue b/pages/order/order.vue new file mode 100644 index 0000000..e54f3c9 --- /dev/null +++ b/pages/order/order.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue new file mode 100644 index 0000000..0422041 --- /dev/null +++ b/pages/order/order_details.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/pages/order/unpay_details.vue b/pages/order/unpay_details.vue new file mode 100644 index 0000000..f4e1bc7 --- /dev/null +++ b/pages/order/unpay_details.vue @@ -0,0 +1,237 @@ + + + + +