Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

src/components/ImageUpload/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="component-upload-image img-accessory-1">
-    <div class="img-box-1">
+    <div class="img-box-1" :class="low && 'low'">
 
       <ul class="el-upload-list el-upload-list--picture-card">
         <li v-for="(item, index) in previewList" class="el-upload-list__item is-ready" style="float: left;">
@@ -107,6 +107,11 @@
       isPublic: {
         type: Boolean,
         default: true
+      },
+      // 半高显示
+      low: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -467,3 +472,24 @@
       display: block;
   }
 </style>
+<style lang="scss">
+.component-upload-image {
+  .low {
+    height: 40px;
+    .el-upload--picture-card {
+      height: 40px !important;
+      line-height: 50px !important;
+    }
+    .el-upload-list__item {
+      margin: 0 !important;
+      height: 40px !important;
+    }
+    .el-image {
+      height: 38px !important;
+    }
+    .el-upload-list__item-actions {
+      height: 38px !important;
+    }
+  }
+}
+</style>

src/views/business/goods/components/spec.vue

@@ -35,12 +35,12 @@
       <table v-if="skuList instanceof Array && skuList.length > 0" class="spec-table" border="1" bordercolor="#CCC">
         <tr>
           <th :colspan="specListTmp.length">商品规格</th>
-          <th rowspan="2">SKU主图</th>
-          <th rowspan="2">名称</th>
-          <th rowspan="2">价格</th>
-          <th rowspan="2">兑换价格</th>
+          <th rowspan="2" class="required"><span>＊</span>SKU主图</th>
+          <th rowspan="2" class="required"><span>＊</span>名称</th>
+          <th rowspan="2" class="required"><span>＊</span>价格</th>
+          <th rowspan="2" class="required"><span>＊</span>兑换价格</th>
           <th rowspan="2">成本</th>
-          <th rowspan="2">库存</th>
+          <th rowspan="2" class="required"><span>＊</span>库存</th>
           <th rowspan="2">启用</th>
         </tr>
         <tr>
@@ -53,7 +53,7 @@
           </td>
           <td>
             <el-form-item :prop="`skuList.${index}.picUrl`" :rules="{ required: true, message: '请上传SKU图片', trigger: 'blur' }">
-              <Upload v-model="sku.picUrl" :limit="1" style="height: 40px;overflow: hidden" />
+              <Upload v-model="sku.picUrl" :limit="1" :low="true" style="height: 40px;overflow: hidden" />
             </el-form-item>
           </td>
           <td>
@@ -117,7 +117,7 @@ export default {
       specValTmp: '',
       specifications: [],
       valueYRules: [{ required: true, message: '请输入价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
-      costYRules: [{ required: true, message: '请输入成本', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
+      costYRules: [{ required: false, message: '请输入成本', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
       // exchangeRules: [{ required: true, message: '请输入兑换价格', trigger: 'blur' },{ pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"]}]
     }
   },
@@ -306,5 +306,16 @@ export default {
   td {
     text-align: center;
   }
+  .required {
+    position: relative;
+    span {
+      position: relative;
+      top: -6px;
+      left: 2px;
+      font-size: 10px;
+      color: red;
+    }
+  }
+  
 }
 </style>