修改

src/components/CommodityMan/goodsListEdit.vue

@@ -1083,7 +1083,7 @@
           SupplierId: '',
           Sort: 0,
           Commission:0,
-          PresentFXGrade:0,
+          PresentFXGrade:'',
           PresentFXMonth:0,
           Advertising:'',
           SubName:'',
@@ -1759,6 +1759,9 @@
                 }
               }
             }
+            if(this.addMsg.PresentFXGrade==''){//没选择的时候默认为0
+                  this.addMsg.PresentFXGrade=0
+              }
             this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => {
               if (res.data.resultCode == 1) {
                 this.Success(res.data.message);
@@ -2021,6 +2024,9 @@
                 if (this.hpState == 1) {
                   this.addMsg.SeparateDistribution = 0;
                 }
+                if(this.addMsg.PresentFXGrade==0){
+                  this.addMsg.PresentFXGrade=''
+                }
                 this.getSuggestPrice();
                 this.getFXDGradeList2();
                 

src/components/UserMan/vipbuySales.vue

@@ -33,9 +33,9 @@
         <el-input type="text" class="w160" v-model="msg.UserId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
         <span style="margin-left:20px;">分销用户id：</span>
         <el-input type="text" class="w160" v-model="msg.DistributionUserId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
-         <span style="margin-left:20px;">订单id：</span>
+         <span style="margin-left:20px;">关联订单id：</span>
         <el-input type="text" class="w160" v-model="msg.ReOrderId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
-         <span style="margin-left:20px;">订单号：</span>
+         <span style="margin-left:20px;">关联订单号：</span>
         <el-input type="text" class="w200" v-model="msg.ReOrderNum" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
       </div>
       <el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0;color:#303133">

src/components/orderMan/orderDetails.vue

@@ -176,26 +176,28 @@
         </el-col>
         <el-col :span="8">
           <div flex="dir:top" class="card-box">
-            <h3>分销信息</h3>
-            <div v-for="(item,index) in dataInfo.DistributionInfo" :key="index">
-              <div class="share-title">
-                <span>{{item.GradeDescription}}</span>
-              </div>
-              <div flex="dir:left cross:center" class="item-box">
-                <span class="label">姓名:</span>
-                <div>{{item.UserName}}</div>
-              </div>
-              <div flex="dir:left cross:center" class="item-box">
-                <span class="label">手机号:</span>
-                <div>{{item.Mobile}}</div>
-              </div>
-              <div flex="dir:left cross:center" class="item-box share-price">
-                <span class="label orange-label">佣金:</span>
-                <div>￥{{item.Commission}}</div>
+            <div  v-if="dataInfo.DistributionInfo !=undefined &&dataInfo.DistributionInfo.length>0 && dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length==0">
+              <h3>分销信息</h3>
+              <div v-for="(item,index) in dataInfo.DistributionInfo" :key="index">
+                <div class="share-title">
+                  <span>{{item.GradeDescription}}</span>
+                </div>
+                <div flex="dir:left cross:center" class="item-box">
+                  <span class="label">姓名:</span>
+                  <div>{{item.UserName}}</div>
+                </div>
+                <div flex="dir:left cross:center" class="item-box">
+                  <span class="label">手机号:</span>
+                  <div>{{item.Mobile}}</div>
+                </div>
+                <div flex="dir:left cross:center" class="item-box share-price">
+                  <span class="label orange-label">佣金:</span>
+                  <div>￥{{item.Commission}}</div>
+                </div>
               </div>
             </div>
-            <h3 v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">Vip返利</h3>
-            <div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">
+           <div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">  
+              <h3 >Vip返利</h3>
               <div  v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2">
                 <div class="share-title">
                   <span>{{item.GradeDescription}}</span>
@@ -210,7 +212,9 @@
                   <div>￥{{item.Commission}}</div>
                 </div>
             </div>
-            </div>
+              
+           </div>
+          
             
           </div>
         </el-col>