Merge branch '01/21VipReset' into online

src/views/businessManager/orderManager/financeManager.vue

@@ -317,10 +317,10 @@
               scope.row.status | dealStatus
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
-            <template slot-scope="scope">{{
-              scope.row.memo ? scope.row.memo : "-"
-            }}</template>
+          <el-table-column align="center" label="备注" width="220px">
+           <template slot-scope="scope">
+                       <overflow-text width="200px" :text="scope.row.memo"/>
+                     </template>
           </el-table-column>
           <el-table-column
             align="center"

src/views/businessManager/orderManager/income.vue

@@ -290,10 +290,10 @@
               scope.row.status | dealStatus
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
-            <template slot-scope="scope">{{
-              scope.row.memo ? scope.row.memo : "-"
-            }}</template>
+          <el-table-column align="center" label="备注" width="220px">
+            <template slot-scope="scope">
+                       <overflow-text width="200px" :text="scope.row.memo"/>
+                     </template>
           </el-table-column>
           <el-table-column align="center" width="150px" label="操作">
             <template slot-scope="scope">

src/views/studentManager/components/studentOrder.vue

@@ -158,7 +158,14 @@
           label="订单说明"
           align="center"
           prop="memo"
-        ></el-table-column>
+          width="220px"
+        >
+         <template slot-scope="scope">
+                       <overflow-text width="200px" :text="scope.row.memo"/>
+                     </template>
+        </el-table-column>
+        <el-table-column>
+        </el-table-column>
       </el-table>
       <pagination
         sync