1

src/components/CommodityMan/goodsList.vue

@@ -149,11 +149,23 @@
                 </template>
             </el-table-column>
             <el-table-column
-            prop="SalesNum"
-            width="105"
+            width="120"
             sortable
-            label="已出售量">
+            >
+              <template slot="header" slot-scope="scope">
+                已出售量
+                <el-tooltip effect="dark" content="已出售量=实际销量+虚拟销量，按实际销量排序" placement="top">
+                  <i class="el-icon-info"></i>
+                </el-tooltip>
+              </template>
+
+              <template slot-scope="scope">
+
+                <span >{{scope.row.SalesNum}}+{{scope.row.GoodsBuyNum}}</span>
+
+              </template>
             </el-table-column>
+
           <el-table-column
             prop="UpdateDate"
             width="110"

src/components/UserMan/distributionOrder.vue

@@ -149,7 +149,8 @@
                                 </div>
                             </div>
                             <div flex="main:center cross:center" class="app-box-info" style="width: 10%;border-right: 1px solid #EBEEF5;">
-                                <div>待结算</div>
+                                <div v-if="item.IsOrderCommission==1">已结算</div>
+                                <div v-if="item.IsOrderCommission==2">待结算</div>
                             </div>
                             <div flex="main:center cross:center" class="app-order-info" style="border-right: 0px; width: 20%;">
                                 <div style="margin:0 auto;width:90%;margin-left:17%">
@@ -158,8 +159,8 @@
                                             <span>{{list.GradeDescription}}</span>
                                             <span class="price">￥{{list.Commission}}</span>
                                         </div>
-                                        <div>昵称：{{list.Name}}</div>
-                                        <div>姓名：{{list.UserName}}</div>
+                                        <div>昵称：{{list.UserName}}</div>
+                                        <div>姓名：{{list.Name}}</div>
                                         <div>手机：{{list.Mobile}}</div>
                                     </div>
                                 </div>

src/components/orderMan/orderList.vue

@@ -289,7 +289,7 @@
       </span>
     </el-dialog>
     <!--待处理-->
-    <el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%">
+    <el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi">
       <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="pendD = false">取 消</el-button>
@@ -1259,7 +1259,11 @@
   .hszDigClass .el-dialog__body {
     padding: 0 10px 20px 0;
   }
+  .orderList .tyi .el-dialog__body{
+    padding:0 20px
 
+
+  }
   .sendDigClass .el-dialog__body {
     padding: 0 10px 10px 0;
   }