Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/layout/index.vue

@@ -69,7 +69,7 @@ export default {
 </script>
 <style>
   .el-table .cell{
-    text-overflow: clip;
+    overflow: visible;
   }
 </style>
 <style lang="scss" scoped>

src/views/goods/list.vue

@@ -74,7 +74,7 @@
     >
       <el-table-column align="center" label="序号" width="35">
         <template slot-scope="scope">
-          <span style="white-space:nowrap">{{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}</span>
+          <span style="white-space:nowrap;text-overflow:initial;">{{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}</span>
         </template>
       </el-table-column>
       <el-table-column label="商品ID" align="center" prop="id" width="50" />
@@ -137,16 +137,16 @@
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'市场价(' + dialog.normalPrice + ')，修改为：'" prop="normalPrice">
+        <el-form-item :label="'市场价：¥' + dialog.normalPrice + '，修改为：'" prop="normalPrice">
           <el-input v-model="dialog.normalPrice" />
         </el-form-item>
-        <el-form-item :label="'成本价(' + dialog.costPrice + ')，修改为：'" prop="costPrice">
+        <el-form-item :label="'成本价：¥' + dialog.costPrice + '，修改为：'" prop="costPrice">
           <el-input v-model="dialog.costPrice" />
         </el-form-item>
-        <el-form-item :label="'售价(' + dialog.retailPrice + ')，修改为：'" prop="retailPrice">
+        <el-form-item :label="'售价：¥' + dialog.retailPrice + '，修改为：'" prop="retailPrice">
           <el-input v-model="dialog.retailPrice" />
         </el-form-item>
-        <el-form-item :label="'起订量(' + dialog.minBuyNumber + ')，修改为：'" prop="minBuyNumber">
+        <el-form-item :label="'起订量：' + dialog.minBuyNumber + '，修改为：'" prop="minBuyNumber">
           <el-input v-model="dialog.minBuyNumber" />
         </el-form-item>
       </el-form>

src/views/order/logistics.vue

@@ -4,7 +4,9 @@
       <div class="app-title">发货记录</div>
       <el-button type="primary" icon="el-icon-back" style="float: right;" @click="backToList">返回</el-button>
     </div>
-    <el-card class="box-card">
+
+    <el-card v-if="logisticsInfoVos.length === 0" class="box-card" style="text-align:center;">暂无发货记录.....</el-card>
+    <el-card v-else class="box-card">
       <div v-for="(data,index) in logisticsInfoVos" :key="index" class="order-item">
         <el-row :gutter="24" class="box-row">
           <el-col :span="24"><b>发货时间:{{ data.logisticsBatch.deliveryTime }}</b></el-col>

src/views/order/refund-record.vue

@@ -47,12 +47,7 @@
         <el-col :span="6"><b>应收总额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}</el-col>
         <el-col :span="6"><b>经理折扣：</b>
           <template v-if="order.discountFee<0">¥0.00</template>
-          <template v-else>
-            ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
-            <span style="color:red;">(原:¥{{ order.discountFee | toThousandFloatFilter }}，
-              折扣取消:¥<template v-if="order.discountFee>returnedPurchaseFee">{{ returnedPurchaseFee | toThousandFloatFilter }}</template>
-              <template v-else>{{ order.discountFee | toThousandFloatFilter }}</template>)</span>
-          </template>
+          <template v-else> ¥{{ order.discountFee | toThousandFloatFilter }}</template>
         </el-col>
         <el-col :span="6"><b>运费:</b>
           <template v-if="order.freight*1===0">包邮</template>