From 96d42cdab8046499d3e16e63b9e4c2a722cc0722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 2 Jul 2021 17:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/api.js                    |  8 ++++----
 pages/order/fillorder.vue        | 17 ++++++++++-------
 pages/tabbar/user/my.vue         | 18 +++++++++++-------
 pages/tabbar/user/utils/tool.vue | 12 +++++++-----
 4 files changed, 32 insertions(+), 23 deletions(-)

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 @@
     <!-- 优惠券 -->
     <div class="box box4">
       <u-row>
-        <u-col :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
-        <u-col :span="3" textAlign="right" @click="shippingFlag = true">
+        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
+        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="3" textAlign="right" @click="shippingFlag = true">
           {{   shippingMethod.find(e=>{  return e.value == shippingText; }).label }}
         </u-col>
       </u-row>
@@ -150,8 +150,8 @@
       </div>
       <div>
         <u-row>
-          <u-col :span="7">运费</u-col>
-          <u-col :span="5" class="tr tipsColor" textAlign="right">
+          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
+          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="5" class="tr tipsColor" textAlign="right">
             <u-tag v-if="orderMessage.priceDetailDTO.freightPrice == 0" style="margin-right: 20rpx" color="#FF6262" text="包邮" type="warning" size="mini" mode="plain" shape="circle" />
             <span>￥{{
                 orderMessage.priceDetailDTO.freightPrice | unitPrice
@@ -181,7 +181,7 @@
     </div>
 
     <!-- 配送地区没有提示 -->
-    <div class="notSupportFreight">
+    <div class="notSupportFreight" v-if="notSupportFreight.length !=0">
       <u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList"></u-notice-bar>
     </div>
 
@@ -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 @@
         <view class="user-name">登录/注册</view>
       </view>
 
-      <u-icon name="arrow-right"></u-icon>
+      <u-icon style="display: flex;
+      align-items: flex-start;" name="arrow-right"></u-icon>
+
     </view>
     <!-- 积分，优惠券，关注， -->
     <div class="pointBox">
@@ -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: "您的信息正在审核",