修改样式

src/components/CommodityMan/goodsListEdit.vue

@@ -2185,8 +2185,8 @@
                let List =[];
                data.forEach(x=>{
                  let obj={};
-                 if(x.IsGuest !=1){
-
+                //  if(x.IsGuest !=1){
+                 if(x.IsGuest ==3){//只显示vip 
                    let obj = x
                    List.push(obj)
                  }

src/components/UserMan/vipbuySales.vue

@@ -27,24 +27,30 @@
     </div>
     <div class="content">
       <div>
-        <span>订单号：</span>
-        <el-input type="text" class="w160" v-model="msg.OrderNo" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
+        <span>VIP购买单号：</span>
+        <el-input type="text" class="w160" v-model="msg.OrderNo" @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.UserId" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
+        <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()"></el-input>
+        <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>
+        <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>
+        <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">
-        <el-table-column prop="OrderNo" label="订单号">
+        <el-table-column prop="OrderNo" label="VIP购买单号">
         </el-table-column>
         <el-table-column prop="UserName" label="购买用户">
           <template slot-scope="scope">
-            {{scope.row.UserName}} id:{{scope.row.UserId}}
+            {{scope.row.UserName}} ({{scope.row.UserId}})
           </template>
         </el-table-column>
         <el-table-column prop="Money" label="购买金额">
         </el-table-column>
         <el-table-column prop="GradeName" label="等级名称">
+        </el-table-column>
+         <el-table-column prop="Remark" label="备注">
         </el-table-column>
         <el-table-column prop="PayTimeStr" label="购买时间">
         </el-table-column>
@@ -93,7 +99,9 @@
           pageSize: 15,
           OrderNo: '', //订单号
           UserId: 0, //购买用户id
-          DistributionUserId: 0 //分销用户id
+          DistributionUserId: 0 ,//分销用户id
+          ReOrderId:'',//订单id
+          ReOrderNum:'',//订单号
         },
         total: 0,
       };
@@ -120,6 +128,12 @@
 
       getList() {
         this.loading = true;
+        if(this.msg.UserId == ''){
+          this.msg.UserId = 0 
+        }
+        if(this.msg.DistributionUserId == ''){
+          this.msg.DistributionUserId = 0 
+        }
         this.apipost("/api/uservip/GetVipBuyCommissionPageList", this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {

src/components/orderMan/orderDetails.vue

@@ -194,6 +194,21 @@
                 <div>￥{{item.Commission}}</div>
               </div>
             </div>
+            <h3 v-if="dataInfo.VipCommissionInfo.length>0">Vip返利</h3>
+            <div  v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2" v-if="dataInfo.VipCommissionInfo.length>0">
+                <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 share-price">
+                  <span class="label orange-label">佣金:</span>
+                  <div>￥{{item.Commission}}</div>
+                </div>
+            </div>
           </div>
         </el-col>
       </el-row>