diff --git a/config/api.js b/config/api.js
index 3206bbb..eed88ad 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,10 +4,10 @@
*/
// 开发环境
const dev = {
- // common: "https://common-api.pickmall.cn",
- // buyer: "https://buyer-api.pickmall.cn",
- common: "http://192.168.0.109:8890",
- buyer: "http://192.168.0.109:8888",
+ common: "https://common-api.pickmall.cn",
+ buyer: "https://buyer-api.pickmall.cn",
+ // common: "http://192.168.0.109:8890",
+ // buyer: "http://192.168.0.109:8888",
};
// 生产环境
const prod = {
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 6a89011..0c6d494 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -119,8 +119,8 @@
- 配送方式
-
+ 配送方式
+
{{ shippingMethod.find(e=>{ return e.value == shippingText; }).label }}
@@ -150,8 +150,8 @@
- 运费
-
+ 运费
+
¥{{
orderMessage.priceDetailDTO.freightPrice | unitPrice
@@ -181,7 +181,7 @@
-
+
@@ -530,7 +530,10 @@ export default {
res.data.result.memberAddress.consigneeAddressPath.split(",");
}
- if (res.data.result.notSupportFreight.length != 0) {
+ if (
+ res.data.result.notSupportFreight &&
+ res.data.result.notSupportFreight.length != 0
+ ) {
this.notSupportFreight = res.data.result.notSupportFreight;
res.data.result.notSupportFreight.forEach((item) => {
@@ -676,7 +679,7 @@ export default {
.notSupportFreight {
position: fixed;
- bottom: calc(100rpx + env(safe-area-inset-bottom)) ;
+ bottom: calc(100rpx + env(safe-area-inset-bottom));
// #ifdef H5
bottom: 100rpx;
// #endif
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index 9639a83..ec3346b 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -15,7 +15,9 @@
登录/注册
-
+
+
@@ -247,11 +249,12 @@ body {
justify-content: space-between;
.head-1 {
text-align: center;
- width: 144rpx;
+ width: 152rpx;
position: relative;
- margin-top: 40rpx;
+ display: flex;
+ align-items: center;
image {
- width: 144rpx;
+ width: 152rpx;
height: 144rpx;
border-radius: 50%;
margin-bottom: 30rpx;
@@ -282,11 +285,12 @@ body {
.head-2 {
flex: 1;
margin-left: 30rpx;
- line-height: 2em;
- margin-top: 60rpx;
+ margin-top: 100rpx;
+ line-height: 1;
}
+ /deep/ .u-icon,
.u-icon {
- margin-top: -120rpx;
+ margin-top: 106rpx;
}
}
.pointBox {
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 3f97149..ecc182a 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -73,18 +73,20 @@ export default {
distribution().then((res) => {
if (res.data.result) {
let type = res.data.result.distributionStatus;
- uni.navigateTo({
- url: "/pages/mine/distribution/auth",
- });
- return
if (type == "PASS") {
uni.navigateTo({
url: "/pages/mine/distribution/home",
});
- } else if (type == "RETREAT" || type == "REFUSE") {
+ } else if (type == "REFUSE") {
uni.navigateTo({
url: "/pages/mine/distribution/auth",
});
+ } else if (type == "RETREAT") {
+ uni.showToast({
+ title: "您的分销资格已被清退。请联系管理员!",
+ duration: 2000,
+ icon: "none",
+ });
} else {
uni.showToast({
title: "您的信息正在审核",