diff --git a/api/request.ts b/api/request.ts
index 0f71fa1..a84e750 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -3,4 +3,4 @@ export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务
export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址
export const domain = 'https://www.carboner.cn/api'
-export const baseUrl = domain
\ No newline at end of file
+export const baseUrl = testUrl
\ No newline at end of file
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index 6c8a105..420652c 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -130,7 +130,7 @@
+ .mt-5 {
+ margin-top: 9.38rpx;
+ }
+
+ .ml-17 {
+ margin-left: 31.88rpx;
+ }
+
+ .mt-11 {
+ margin-top: 20.63rpx;
+ }
+
+ .mt-284 {
+ margin-top: 532.5rpx;
+ }
+
+ .page {
+ background-color: #f8e8c1;
+ width: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ height: 100%;
+ }
+
+ .image-wrapper {
+ padding: 15rpx 0;
+ background-color: #fffef8;
+ }
+
+ .image {
+ margin-left: 16.88rpx;
+ width: 37.5rpx;
+ height: 37.5rpx;
+ }
+
+ .group {
+ padding: 15rpx 15rpx 0;
+ }
+
+ .section {
+ padding: 16.88rpx 18.75rpx;
+ background-color: #fffef8;
+ border-radius: 18.75rpx;
+ }
+
+ .image_2 {
+ width: 75rpx;
+ height: 75rpx;
+ }
+
+ .section_2 {
+ padding: 33.75rpx 18.75rpx;
+ background-color: #fffef8;
+ border-radius: 18.75rpx;
+ }
+
+ .image_3 {
+ width: 43.13rpx;
+ height: 43.13rpx;
+ }
+
+ .font_2 {
+ font-size: 22.5rpx;
+ font-family: Open Sans;
+ line-height: 19.39rpx;
+ color: #818181;
+ }
+
+ .text_2 {
+ color: #6b6e72;
+ line-height: 21.34rpx;
+ }
+
+ .text_4 {
+ line-height: 20.91rpx;
+ }
+
+ .section_3 {
+ padding: 0 18.75rpx 26.25rpx 24.38rpx;
+ background-color: #fffef8;
+ border-radius: 18.75rpx;
+ }
+
+ .group_2 {
+ padding: 22.5rpx 0;
+ border-bottom: solid 1.88rpx #dfdfdf;
+ }
+
+ .image_4 {
+ margin-bottom: 5.63rpx;
+ border-radius: 9.38rpx;
+ width: 146.25rpx;
+ height: 165rpx;
+ }
+
+ .group_3 {
+ margin-top: 3.75rpx;
+ }
+
+ .font {
+ font-size: 26.25rpx;
+ font-family: Open Sans;
+ line-height: 24.43rpx;
+ color: #323232;
+ }
+
+ .text_3 {
+ line-height: 23.77rpx;
+ }
+
+ .text {
+ color: #323233;
+ font-size: 28.13rpx;
+ line-height: 26.08rpx;
+ }
+
+ .text_5 {
+ line-height: 20.79rpx;
+ }
+
+ .group_4 {
+ width: 90.66rpx;
+ }
+
+ .text_6 {
+ margin-left: 26.25rpx;
+ color: #323232;
+ font-size: 33.75rpx;
+ font-family: Open Sans;
+ font-weight: 600;
+ line-height: 24.88rpx;
+ }
+
+ .image_5 {
+ width: 30rpx;
+ height: 30rpx;
+ }
+
+ .image_6 {
+ margin-left: -90rpx;
+ }
+
+ .font_3 {
+ font-size: 26.25rpx;
+ font-family: Open Sans;
+ line-height: 19.39rpx;
+ color: #323232;
+ }
+
+ .text_7 {
+ font-weight: 600;
+ line-height: 19.29rpx;
+ }
+
+ .text_8 {
+ margin-right: 7.5rpx;
+ margin-top: 146.25rpx;
+ line-height: 18.73rpx;
+ }
+
+ .group_5 {
+ margin-top: 26.25rpx;
+ }
+
+ .font_4 {
+ font-size: 26.25rpx;
+ font-family: Open Sans;
+ line-height: 24.43rpx;
+ color: #818181;
+ }
+
+ .text_9 {
+ line-height: 24.28rpx;
+ }
+
+ .group_6 {
+ margin-top: 13.13rpx;
+ }
+
+ .text_10 {
+ line-height: 24.26rpx;
+ }
+
+ .image_7 {
+ width: 41.25rpx;
+ height: 30rpx;
+ }
+
+ .group_7 {
+ margin-top: 16.88rpx;
+ }
+
+ .group_8 {
+ width: 102.26rpx;
+ }
+
+ .image_8 {
+ margin-left: 71.25rpx;
+ }
+
+ .text_11 {
+ margin-left: -101.25rpx;
+ line-height: 24.09rpx;
+ }
+
+ .text_12 {
+ color: #fb8b05;
+ }
+
+ .divider {
+ background-color: #dfdfdf;
+ height: 1.88rpx;
+ }
+
+ .view {
+ margin-top: 16.88rpx;
+ }
+
+ .text_13 {
+ margin-top: 30rpx;
+ line-height: 24.21rpx;
+ }
+
+ .text-wrapper {
+ margin-top: 15rpx;
+ padding: 15rpx 0 11.25rpx;
+ background-color: #fffef8;
+ border-radius: 9.38rpx;
+ border-left: solid 1.88rpx #f0f0b5;
+ border-right: solid 1.88rpx #f0f0b5;
+ border-top: solid 1.88rpx #f0f0b5;
+ border-bottom: solid 1.88rpx #f0f0b5;
+ }
+
+ .text_14 {
+ margin-left: 15rpx;
+ margin-right: 18.75rpx;
+ line-height: 26.25rpx;
+ }
+
+ .view_2 {
+ margin-top: 18.75rpx;
+ }
+
+ .group_9 {
+ margin-top: 22.5rpx;
+ }
+
+ .text_15 {
+ line-height: 20.85rpx;
+ }
+
+ .font_5 {
+ font-size: 22.5rpx;
+ font-family: Open Sans;
+ color: #323232;
+ }
+
+ .text_16 {
+ line-height: 16.54rpx;
+ }
+
+ .text-wrapper_2 {
+ background-color: #fffef8;
+ width: 50.63rpx;
+ height: 22.5rpx;
+ border-left: solid 0.94rpx #d1d1d1;
+ border-right: solid 0.94rpx #d1d1d1;
+ border-top: solid 0.94rpx #d1d1d1;
+ border-bottom: solid 0.94rpx #d1d1d1;
+ }
+
+ .text_17 {
+ color: #323232;
+ font-size: 18.75rpx;
+ font-family: Open Sans;
+ line-height: 17.38rpx;
+ }
+
+ .group_10 {
+ margin-top: 11.25rpx;
+ }
+
+ .text_18 {
+ line-height: 20.7rpx;
+ }
+
+ .text_19 {
+ margin-right: 157.5rpx;
+ line-height: 16.63rpx;
+ }
+
+ .section_4 {
+ padding: 15rpx 26.25rpx;
+ background-color: #fffef8;
+ }
+
+ .image_9 {
+ margin-left: 86.25rpx;
+ width: 33.75rpx;
+ height: 33.75rpx;
+ }
+
+ .text_21 {
+ color: #fbb612;
+ font-size: 37.5rpx;
+ font-family: Open Sans;
+ font-weight: 700;
+ line-height: 27.62rpx;
+ }
+
+ .font_6 {
+ font-size: 30rpx;
+ font-family: Open Sans;
+ line-height: 27.62rpx;
+ }
+
+ .text_20 {
+ margin-left: -172.5rpx;
+ color: #000000;
+ line-height: 27.54rpx;
+ }
+
+ .text_23 {
+ margin-left: 78.75rpx;
+ color: #fbb612;
+ font-size: 30rpx;
+ font-family: Open Sans;
+ font-weight: 700;
+ line-height: 22.05rpx;
+ }
+
+ .text-wrapper_3 {
+ padding: 22.5rpx 0;
+ background-color: #fbb612;
+ border-radius: 75rpx;
+ width: 204.38rpx;
+ height: 71.25rpx;
+ }
+
+ .text_22 {
+ color: #ffffff;
+ line-height: 27.86rpx;
+ }
+
+ @import url(/common/css/global.css);
+
\ No newline at end of file
diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue
index 40043ad..68d678a 100644
--- a/pages/mine/mineorders/mineorders.vue
+++ b/pages/mine/mineorders/mineorders.vue
@@ -100,7 +100,7 @@
联系客服
-
+
查看物流
@@ -186,8 +186,8 @@ const isSelected = (tab) => Status.value.orderStatus === tab
return order.orderStatus === '待支付';
case '待发货':
return order.orderStatus === '待发货';
- case '已发货':
- return order.orderStatus === '已发货';
+ case '待收货':
+ return order.orderStatus === '待收货';
case '已退款':
return order.orderStatus === '已退款';
default:
diff --git a/pages/order/product-paysuccess/product-paysuccess.vue b/pages/order/product-paysuccess/product-paysuccess.vue
index a07b12f..b553de7 100644
--- a/pages/order/product-paysuccess/product-paysuccess.vue
+++ b/pages/order/product-paysuccess/product-paysuccess.vue
@@ -157,7 +157,7 @@ const setBottomText =()=>{ //更改按钮的字体
switch(stateObject.value.state) {
case '待支付': bottomBtn.value = '立即支付';break;
case '待发货': bottomBtn.value = '联系客服';break;
- case '已发货': bottomBtn.value = '查看物流';break;
+ case '待收货': bottomBtn.value = '查看物流';break;
case '已退款': bottomBtn.value = '删除订单';break;
case '交易成功': bottomBtn.value = '删除订单';break;
default: bottomBtn.value = '删除订单'
@@ -169,7 +169,7 @@ const stateSubmit = () => { //按钮状态改变的方法
} else if(bottomBtn.value === '删除订单') {
console.log('订单被删除');
} else {
- console.log('联系客服');
+ console.log('查看物流');
}
}
const wxPay = async( oid )=> { //传入订单id