diff --git a/pages/index/index.vue b/pages/index/index.vue
index c68c6b8..551eba4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -184,7 +184,7 @@
overflow: hidden;
margin: 20rpx 32rpx;
background-color: #FFFFFF;
- box-shadow:0 0 10px 5px #e5e5e5;
+ box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1);
align-items: flex-start;
.left{
overflow: hidden;
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index a048651..73cf1bf 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1,76 +1,79 @@
-
-
-
-
-
-
-
-
- {{orderDetails.goods.name}}
-
-
- 数量
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{orderDetails.goods.name}}
-
-
-
-
- {{Number(orderDetails.goods.specs[0].selling_price || 0)}}
+
+ 数量
+
+
+
+
+
+
+
+
+
+ {{Number(orderDetails.goods.specs[0].selling_price || 0)}}
+
+
-
-
-
-
-
-
-
-
-
-
- 优惠
- 暂无优惠
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{orderDetails.agreement.tips}}
+
+
+
+
+
+ 优惠
+ 暂无优惠
+
-
-
-
- 应付款：
-
- {{Number(orderDetails.goods.specs[0].selling_price*num || 0)}}
+
+
+
+
+
+
+
+
+
+
+
+ {{orderDetails.agreement.tips}}
+
+
+
+
+ 应付款：
+
+ {{Number(orderDetails.goods.specs[0].selling_price*num || 0)}}
+
+
-
-
-
+
+
+
@@ -89,12 +92,18 @@
goods_id: 1,
goods_specs_id: 1,
orderDetails: {},
- ifchoose: true
+ ifchoose: true,
+ ifCheck: true
}
},
computed: {
total(){
return this.num * this.price
+ },
+ isRight(){
+ return function(val){
+ return this.$shared.isRight(val);
+ }
}
},
onLoad(e) {
@@ -107,6 +116,11 @@
if(res.code == 0) {
this.orderDetails = res.data
this.skeletonLoading = false
+ if( Object.keys(res.metal_data).length != 0 ) {
+ this.ifCheck = false
+ }else {
+ this.ifCheck = true
+ }
}else {
this.$msg(res.msg)
}
@@ -136,39 +150,34 @@
},
submit(){
if(this.ifchoose == true) {
- this.$http(this.API.API_PRPAID, {
- goods_id: this.goods_id,
- goods_specs_id: this.goods_specs_id,
- number: this.num,
- token: 'fdf12000e774e48bc60c6b6d42055602'
- }).then(res => {
- console.log(res)
-
- // let nonceStr = res.data.nonceStr
- // appId: "wxb35ef055a4dd8ad4"
- // nonceStr: "60d3125d138af"
- // order_num: "2842855348400816128"
- // package: "prepay_id=wx23185213000285e14ea77ac97acc670000"
- // paySign: "6DC330CBDF6C29BEDD4D254D9DA97364"
- // signType: "MD5"
- // timeStamp: "1624445533"
-
-
- uni.requestPayment({
- orderInfo: res.data.order_num,
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.package,
- signType: res.data.signType,
- paySign: res.data.paySign,
- complete: result => {
- console.log(result)
- }
+ if(this.ifCheck == false) {
+ this.$routerGo('/pages/login/index?type=phone')
+ }else {
+ this.$http(this.API.API_PRPAID, {
+ goods_id: this.goods_id,
+ goods_specs_id: this.goods_specs_id,
+ number: this.num,
+ token: 'fdf12000e774e48bc60c6b6d42055602'
+ }).then(res => {
+ console.log(res)
+ uni.requestPayment({
+ orderInfo: res.data.order_num,
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.package,
+ signType: res.data.signType,
+ paySign: res.data.paySign,
+ success: function (res) {
+ this.$routerGo('/pages/order/pay-success?ifSuccess='+1)
+ },
+ fail: function (err) {
+ this.$routerGo('/pages/order/pay-success?ifSuccess='+2)
+ }
+ })
+
})
-
- })
- return
- this.$routerGo('/pages/order/pay-success')
+ }
+
}else {
this.$msg('请认真阅读并同意协议!')
return
diff --git a/pages/order/index.vue b/pages/order/index.vue
index d69d1d6..16b6314 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -224,7 +224,8 @@
overflow: hidden;
margin: 20rpx 32rpx;
background-color: #FFFFFF;
- box-shadow: 0 0 10px 5px #e5e5e5;
+ // box-shadow: 0 0 10px 5px #e5e5e5;
+ box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1);
align-items: flex-start;
.left {
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index 9959aea..e087cce 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -1,99 +1,99 @@
-
-
-
-
-
-
-
-
-
- {{orderDetails.goods.name}}
-
- 数量 x{{orderDetails.number}}
-
-
-
- {{Number(orderDetails.selling_price || 0)}}
+
+
+
+
+
+
+
+
+
+ {{orderDetails.goods.name}}
-
-
-
+ 数量 x{{orderDetails.number}}
+
+
+
+ {{Number(orderDetails.selling_price || 0)}}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 订单编号
-
- {{orderDetails.order_sn}}
- 复制
-
-
-
- 下单时间
- {{orderDetails.created_at_text}}
-
-
- 付款时间
- {{orderDetails.payment_at_text}}
-
-
- 支付方式
- {{orderDetails.payment_type}}
-
+
-
-
- 优惠
- 暂无优惠
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 订单编号
+
+ {{orderDetails.order_sn}}
+ 复制
- {{checkArea}}
- 复制
-
- 待使用
+
+ 下单时间
+ {{orderDetails.created_at_text}}
+
+
+ 付款时间
+ {{orderDetails.payment_at_text}}
+
+
+ 支付方式
+ {{orderDetails.payment_type}}
-
-
- 已付款：
-
- {{Number(orderDetails.amount || 0)}}
+
+
+
+
+ 优惠
+ 暂无优惠
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{checkArea}}
+ 复制
+
+
+ 待使用
-
- {{orderDetails.state_text.text}}
+
+
+ 已付款：
+
+ {{Number(orderDetails.amount || 0)}}
+
+
+
+ {{orderDetails.state_text.text}}
+
-
-
+
+
@@ -116,6 +116,11 @@
computed: {
total(){
return this.num * this.price
+ },
+ isRight(){
+ return function(val){
+ return this.$shared.isRight(val);
+ }
}
},
onLoad(e) {
diff --git a/pages/order/pay-success.vue b/pages/order/pay-success.vue
index 75d3cb7..b1513a3 100644
--- a/pages/order/pay-success.vue
+++ b/pages/order/pay-success.vue
@@ -1,6 +1,6 @@
-
+
@@ -37,7 +37,7 @@
export default {
data() {
return {
-
+ ifpaySuccess:1
}
},
methods: {
@@ -46,6 +46,9 @@
url: '/pages/order/index'
})
}
+ },
+ onLoad(e) {
+ this.ifpaySuccess = e.ifSuccess
}
}
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index 3c18f7b..dafb0a0 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -1,66 +1,68 @@
-
-
-
-
-
-
-
-
- {{orderDetails.goods.name}}
-
- 数量 x{{orderDetails.number}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{orderDetails.goods.name}}
-
-
-
+ 数量 x{{orderDetails.number}}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 订单编号
-
- {{orderDetails.order_sn}}
- 复制
-
-
-
- 下单时间
- {{orderDetails.created_at_text}}
-
-
- 付款时间
- {{orderDetails.payment_at_text}}
-
-
- 支付方式
- {{orderDetails.payment_type}}
-
+
+
-
-
- 优惠
- 暂无优惠
+
+
+
+
+ 订单编号
+
+ {{orderDetails.order_sn}}
+ 复制
+
+
+
+ 下单时间
+ {{orderDetails.created_at_text}}
+
+
+ 付款时间
+ {{orderDetails.payment_at_text}}
+
+
+ 支付方式
+ {{orderDetails.payment_type}}
+
-
-
+
+
+
+
+ 优惠
+ 暂无优惠
+
+
+
+
@@ -78,6 +80,11 @@
computed: {
total(){
return this.num * this.price
+ },
+ isRight(){
+ return function(val){
+ return this.$shared.isRight(val);
+ }
}
},
onLoad(e) {
diff --git a/static/center/collect.png b/static/center/collect.png
new file mode 100644
index 0000000..e487184
Binary files /dev/null and b/static/center/collect.png differ
diff --git a/static/center/loginout.png b/static/center/loginout.png
new file mode 100644
index 0000000..f5b7aa5
Binary files /dev/null and b/static/center/loginout.png differ
diff --git a/static/center/problem.png b/static/center/problem.png
new file mode 100644
index 0000000..5cc0025
Binary files /dev/null and b/static/center/problem.png differ
diff --git a/static/center/scan.png b/static/center/scan.png
new file mode 100644
index 0000000..91db2c0
Binary files /dev/null and b/static/center/scan.png differ
diff --git a/static/center/service.png b/static/center/service.png
new file mode 100644
index 0000000..37eafff
Binary files /dev/null and b/static/center/service.png differ
diff --git a/static/center/suggestion.png b/static/center/suggestion.png
new file mode 100644
index 0000000..d348c3b
Binary files /dev/null and b/static/center/suggestion.png differ