页面修改

src/components/UserMan/RecommendRebate.vue

@@ -154,7 +154,7 @@
                             </div>
                            
                              <div class="goods-item" style="width: 10%;">
-                                <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods"   flex="main:center cross:center">
+                                <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods"   flex="main:center cross:center" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 ">
                                        
                                         <div v-if="list.OrderIntroduction.CommissionState==1">待结算</div>
                                         <div v-if="list.OrderIntroduction.CommissionState==2">已结算</div>
@@ -163,7 +163,7 @@
                             </div>
                            
                             <div class="goods-item" style="width: 20%;">
-                                <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" >
+                                <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 ">
                                        
                                         
 

src/components/UserMan/baseSet.vue

@@ -44,6 +44,10 @@
               <el-radio v-model="addMsg.IsEnableFXGrade" :label="1">开启</el-radio>
               <el-radio v-model="addMsg.IsEnableFXGrade" :label="2">不开启</el-radio>
             </el-form-item>
+            <el-form-item label="无上级是否开启返佣">
+              <el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="1">开启</el-radio>
+              <el-radio v-model="addMsg.IsEnableNoSuperiorFY" :label="2">不开启</el-radio>
+            </el-form-item>
           </div>
         </el-card>
         <el-card class="box-card" style="margin-top:10px">
@@ -247,7 +251,8 @@
           IndexImage: '',
           IndexImagePath: '',
           IsCommissionResidue: 1,
-          IsEnableFXGrade:1  //1开启 2不开启
+          IsEnableFXGrade:1,  //1开启 2不开启
+          IsEnableNoSuperiorFY:1,
 
         },
         dialogVisible: false,

src/components/UserMan/usersCoupon.vue

@@ -87,7 +87,8 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
-          UserId: -1, //0-未使用，1-已使用，2-已过期，-1全部
+          UseState: -1, //0-未使用，1-已使用，2-已过期，-1全部
+          UserId: 0, 
           StartDate: '',
           EndDate: '',
         },
@@ -103,8 +104,11 @@
       }
     },
     created() {
-      this.getList();
-
+     
+      if(this.$route.query.UserId){
+          this.msg.UserId = this.$route.query.UserId;
+      }
+       this.getList();
     },
     mounted() {
     },
@@ -132,7 +136,7 @@
         this.getList();
       },
       handleClick(val){
-        this.msg.UserId = val.$attrs.dataId;
+        this.msg.UseState = val.$attrs.dataId;
         this.getList()
       },
       delete_b(row){

src/components/UserMan/usersList.vue

@@ -71,7 +71,7 @@
         </el-table-column>
         <el-table-column prop="name" label="优惠券数量">
           <template slot-scope="scope">
-            <span @click="CommonJump('usersCoupon')" class="blue point">{{scope.row.CouponsNum}}</span>
+            <span @click="CommonJump('usersCoupon',{UserId:scope.row.Id})" class="blue point">{{scope.row.CouponsNum}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="name" label="卡券数量">

src/components/orderMan/RecommendBill.vue

@@ -134,7 +134,7 @@
         </el-table-column>
         <el-table-column prop="Number" label="数量" width="60"></el-table-column>
         <el-table-column prop="Final_Price" label="价格" width="80"></el-table-column>
-        <el-table-column prop="OrderIntroduction" label="返佣信息" width="130">
+        <el-table-column prop="OrderIntroduction" label="返佣信息" width="200">
           <template slot-scope="scope">
             <div>姓名：{{scope.row.OrderIntroduction.Name}}</div>
             <div>昵称：{{scope.row.OrderIntroduction.UserName}}</div>

src/components/orderMan/orderList.vue

@@ -138,7 +138,7 @@
                           </div>
                         </div>
                       </div>
-                      <div style="margin-bottom: 24px;">
+                      <div style="margin-bottom: 5px;">
                         <span style="margin-right: 10px;">
                           规格：
                           <el-tag
@@ -150,12 +150,11 @@
                           </el-tag>
                         </span>
                       </div>
-                      <div class="app-order-goods-price">
-                        <span>货号：{{list.ProductCode}}</span>
-                      </div>
-                      <div class="app-order-goods-price" v-if='list.FreeShippingRemarks!=null'>
-                        <span>{{list.FreeShippingRemarks}}</span>
+                      <div  style=" display: flex;flex-direction: row;align-items: center;">
+                        <span>货号：{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span>
+                        <span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>
                       </div>
+                    
                     </div>
                     <div flex="dir:left box:mean" style="width: 300px;">
                       <div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;">