Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/orderMan/orderDetails.vue

@@ -196,7 +196,7 @@
                 </div>
               </div>
             </div>
-           <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">
@@ -212,10 +212,43 @@
                   <div>￥{{item.Commission}}</div>
                 </div>
             </div>
-              
+
            </div>
-          
-            
+            <div v-if="dataInfo.OrderIntroductionInfo!=undefined && dataInfo.OrderIntroductionInfo.length>0">
+              <h3 >推荐供应商返佣</h3>
+              <div  v-for="(item,index2) in dataInfo.OrderIntroductionInfo" :key="index2">
+                <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>
+            <div v-if="dataInfo.SmallShopsCommissionInfo!=undefined && dataInfo.SmallShopsCommissionInfo.length>0">
+              <h3 >微店分销</h3>
+              <div  v-for="(item,index2) in dataInfo.SmallShopsCommissionInfo" :key="index2">
+                <div class="share-title">
+                  <span>{{item.SmallShopsName}}</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>
+
+
           </div>
         </el-col>
       </el-row>
@@ -259,7 +292,7 @@
             </template>
           </el-table-column>
            <el-table-column prop="FreeShippingRemarks" label="备注" width="200" align="center">
-          
+
           </el-table-column>
         </el-table>
         <el-form label-width="200px" class="app-order-count-price">

src/components/orderMan/orderList.vue

@@ -62,6 +62,7 @@
                     placeholder="请输入主播名称" v-model="msg.AnchorName" size="small">
 
           </el-input>
+          <el-checkbox v-model="msg.IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px" @change="msg.pageIndex=1,getList()">只看已付款</el-checkbox>
         </div>
         <div style="display: flex;flex-direction: row;align-items: center;font-size: 12px" v-if="TenantId==1">
             <div class="fkbox">
@@ -181,7 +182,7 @@
                         </span>
                       </div>
                       <div  style=" display: flex;flex-direction: row;align-items: center;" v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
-                        <span>微店价格：￥{{list.Final_Price}}</span>
+                        <span>微店价格：￥{{list.SmallShopsCostPrice}}</span>
 
                       </div>
                       <div  style=" display: flex;flex-direction: row;align-items: center;">
@@ -715,6 +716,7 @@
           ProductCode: '',
           Recycled: 2,
           AnchorName:'',
+          IsSelectPayMoney:0,
         },
         platList: [],
         option: [{
@@ -1352,6 +1354,7 @@
           this.msg.Mobile = '';
           this.msg.ProductCode = '';
         }
+        this.msg.IsSelectPayMoney = Number(this.msg.IsSelectPayMoney)
         if (this.dateList && this.dateList.length > 0) {
           this.msg.StartTime = this.dateList[0];
           this.msg.EndTime = this.dateList[1];