Przeglądaj źródła

fix: 部分字段与显示修正

Sun 3 lat temu
rodzic
commit
8a0686927c

+ 1 - 1
src/components/ImageUpload/index.vue

@@ -5,7 +5,7 @@
       <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;">
           <auth-img v-if="!isPublic" :auth-src="item.thumbUrl" image-width="80px" image-height="78px"></auth-img>
-          <el-image v-if="isPublic" :src="item.thumbUrl" style="width: 80px;height: 78px;border-radius: 4px;"></el-image>
+          <el-image v-if="isPublic" :src="item.thumbUrl" fit="contain" style="width: 80px;height: 78px;border-radius: 4px;"></el-image>
           <label class="el-upload-list__item-status-label"><i class="el-icon-upload-success el-icon-check"></i></label>
           <span class="el-upload-list__item-actions">
             <span class="el-upload-list__item-preview"><i class="el-icon-zoom-in" @click="handlePreview(item)"></i></span>

+ 2 - 2
src/views/business/coupon/add.vue

@@ -13,8 +13,8 @@
               <el-radio :label="1">盲票购买</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="面值:" prop="discount">
-            <el-input v-model.number="addData.discount" :readonly="readonly" type="number" :min="0" placeholder="请输入券面值">
+          <el-form-item label="券金额:" prop="discount">
+            <el-input v-model.number="addData.discount" :readonly="readonly" type="number" :min="0" placeholder="请输入券券金额">
               <template slot="append">元</template>
             </el-input>
           </el-form-item>

+ 11 - 17
src/views/business/goods/add.vue

@@ -2,7 +2,7 @@
   <div class="app-container goods-add">
     <el-divider content-position="left">商品信息</el-divider>
     <el-form ref="addItem" :rules="rules" :model="addData" label-width="120px">
-      <el-row :gutter="40">
+      <el-row :gutter="40" style="width: 600px">
         <el-col :span="23">
           <el-form-item label="商品名称:" prop="title">
             <el-input v-model="addData.title" placeholder="请输入商品名称"/>
@@ -15,17 +15,15 @@
             <div class="tip">第一张图片将作为商品列表图片,最多上传10张,多张图片之间可随意调整位置,支持jpg、png格式上传,建议使用尺寸800x800像素以上、大小不超过1M的正方形图片;</div>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="40" style="width: 500px">
         <el-col :span="23">
           <el-form-item label="支持盲豆兑换:" prop="exchangeShow">
             <el-switch
               v-model="addData.exchangeShow"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
               :active-value="1"
               :inactive-value="0"
-              active-text="支持"
-              inactive-text="不支持">
-            </el-switch>
+            />
             <div class="tip">关闭则不再兑换大厅显示,不支持盲豆兑换。</div>
           </el-form-item>
         </el-col>
@@ -36,25 +34,21 @@
           <el-form-item label="启用多SKU:" prop="multiSku">
             <el-switch
               v-model="addData.multiSku"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
               :active-value="1"
               :inactive-value="0"
-              active-text="是"
-              inactive-text="否"
             />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="23">
+        <el-col :span="22">
           <el-form-item prop="skuList">
             <Spec ref="spec" @valid="update" :multiSku="addData.multiSku" />
           </el-form-item>
         </el-col>
       </el-row>
       
-      <el-row v-if="addData.multiSku === 0" :gutter="40">
+      <el-row v-if="addData.multiSku === 0" :gutter="40" style="width: 600px">
         <el-col :span="23">
           <el-form-item label="价格:" prop="value">
             <el-input v-model="addData.value" type="number" placeholder="请输入商品价格">
@@ -64,7 +58,7 @@
         </el-col>
         <el-col :span="23">
           <el-form-item label="兑换盲豆数量:" prop="value">
-            <el-input :value="addData.value * 10" type="number" readonly disabled>
+            <el-input :value="(addData.value * 10).toFixed(0)" type="number" readonly disabled>
               <template slot="append">盲豆</template>
             </el-input>
           </el-form-item>
@@ -86,7 +80,7 @@
       </el-row>
       <!-- <el-divider content-position="left">商品详情</el-divider> -->
       <el-row>
-        <el-col :span="23">
+        <el-col :span="22">
           <el-form-item label="商品详情" prop="description">
             <TinyEditor v-model="addData.description" />
           </el-form-item>
@@ -95,9 +89,9 @@
     </el-form>
     <br>
     <el-row>
-      <el-col :span="24" style="text-align: right">
-        <el-button type="primary" @click="updateItem()">发布</el-button>
+      <el-col :span="24" style="text-align: center">
         <el-button type="info" @click="$router.replace('/goods/list')">取消</el-button>
+        <el-button type="primary" @click="updateItem()">保存</el-button>
       </el-col>
     </el-row>
   </div>
@@ -133,7 +127,7 @@ export default {
           { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额,最多两位小数", trigger: ["blur", "change"] }
         ],
         exchangePrice: [
-          { required: true, message: '请输入商品价格', trigger: 'blur' },
+          { required: true },
           // { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
         ],
         cost: [

+ 27 - 14
src/views/business/goods/components/spec.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="multiSku === 1" style="padding: 16px 0px">
-    <el-form ref="spec" :model="{ specList }" label-width="80px">
+    <el-form ref="spec" :model="{ specList }" :inline="false" label-width="80px" @submit.native.prevent>
       <div v-for="(spec, index) in specList" :key="index" style="margin-bottom: 20px">
         <el-row style="margin-bottom: 10px">
           <el-col :span="8">
@@ -20,8 +20,8 @@
           <el-form-item :prop="`specList.${index}.vals`" :rules="{ required: true, message: '请完善规格值', trigger: ['blur', 'change'] }">
             <el-col :span="24">
               <el-tag v-for="(tag, index) in spec.vals" :key="index" closable style="margin-right: 10px" @close="spec.vals.splice(index, 1)">{{ tag }}</el-tag>
-              <el-input v-if="spec.editVals" v-model="specValTmp" style="display: inline-block;width: 120px; margin-right: 10px" size="mini" @keyup.enter.native="checkSpecVal(spec, `specList.${index}.vals`)" />
-              <el-button v-if="!spec.edit&&!spec.editVals" type="text" style="margin-left: 10px" icon="el-icon-plus" size="small" @click="spec.editVals = true">添加规格值</el-button>
+              <el-input v-if="spec.editVals" v-model="specValTmp" ref="specedit" style="display: inline-block;width: 120px; margin-right: 10px" size="mini" @keyup.enter.native="checkSpecVal(spec, `specList.${index}.vals`)" />
+              <el-button v-if="!spec.edit&&!spec.editVals" type="text" style="margin-left: 10px" icon="el-icon-plus" size="small" @click="addSpec(spec)">添加规格值</el-button>
               <el-button v-if="spec.editVals" type="text" @click="checkSpecVal(spec, `specList.${index}.vals`)">确认</el-button>
             </el-col>
           </el-form-item>
@@ -31,15 +31,15 @@
     <el-button type="primary" size="small" plain @click="specList.push({ name: '', vals: [], edit: true, editVals: false })" :disabled="!!specList.find(item => item.edit)" style="margin-bottom: 10px">添加规格</el-button>
     <el-button type="primary" size="small" style="margin-bottom: 10px;margin-left: 10px" :disabled="specList.length === 0 || !!specList.find(item => item.edit)" @click="genSku">{{ skuList.length > 0 ? '重新生成SKU表格' : '生成SKU表格' }}</el-button>
     <br>
-    <el-form ref="sku" :model="{ skuList }">
+    <el-form ref="sku" :model="{ skuList }" :inline="false">
       <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" 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" class="required"><span>*</span>价格(元)</th>
+          <th rowspan="2" class="required"><span>*</span>兑换盲豆数量</th>
+          <th rowspan="2">采购价格(元)</th>
           <th rowspan="2" class="required"><span>*</span>库存</th>
           <th rowspan="2">启用</th>
         </tr>
@@ -53,30 +53,30 @@
           </td>
           <td>
             <el-form-item :prop="`skuList.${index}.picUrlArr`" :rules="{ required: true, message: '请上传SKU图片', trigger: ['blur', 'change'] }">
-              <Upload v-model="sku.picUrlArr" :limit="1" :low="true" style="height: 40px;overflow: hidden" @change="$refs.sku.validateField([`skuList.${index}.picUrlArr`])" />
+              <Upload v-model="sku.picUrlArr" :limit="1" :low="true" style="width: 100%" @change="$refs.sku.validateField([`skuList.${index}.picUrlArr`])" />
             </el-form-item>
           </td>
-          <td>
+          <td class="pd">
             <el-form-item :prop="`skuList.${index}.name`" :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
               <el-input v-model="sku.name" />
             </el-form-item>
           </td>
-          <td>
+          <td class="pd">
             <el-form-item :prop="`skuList.${index}.valueY`" :rules="valueYRules">
               <el-input v-model="sku.valueY" />
             </el-form-item>
           </td>
           <td>
             <el-form-item :prop="`skuList.${index}.valueY`" :rules="exchangeRules">
-              <p>{{ sku.valueY * 10 }}</p>
+              <p>{{ (sku.valueY * 10).toFixed(0) }}</p>
             </el-form-item>
           </td>
-          <td>
+          <td class="pd">
             <el-form-item :prop="`skuList.${index}.costY`" :rules="costYRules">
               <el-input v-model="sku.costY" />
             </el-form-item>
           </td>
-          <td>
+          <td class="pd">
             <el-form-item :prop="`skuList.${index}.quantity`" :rules="{ required: true, message: '请输入库存', trigger: 'blur' }">
               <el-input-number v-model="sku.quantity" :min="0" @change="$event === 0 ? sku.status = false : sku.status = true" />
             </el-form-item>
@@ -118,7 +118,7 @@ export default {
       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: false, message: '请输入采购价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2}\d[0])?|0|([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"]}]
+      exchangeRules: [{ required: true, trigger: 'blur' }]
     }
   },
   methods: {
@@ -177,6 +177,16 @@ export default {
       spec.editVals = false
       this.$refs.spec.validateField([prop])
     },
+    addSpec(spec) {
+      spec.editVals = true
+      console.log(this.$refs.specedit)
+      setTimeout(() => {
+        console.log(this.$refs.specedit)
+        // if (this.$refs.specedit) {
+        //   this.$refs.edittmp.focus()
+        // }
+      }, 1000);
+    },
     checkSpecName(spec) {
       if (this.specList.filter(item => item.name === spec.name).length > 1) {
         this.$message.warning('规格名已存在')
@@ -310,6 +320,9 @@ export default {
   td {
     text-align: center;
   }
+  .pd {
+    padding: 15px;
+  }
   .required {
     position: relative;
     span {

+ 5 - 4
src/views/business/goods/index.vue

@@ -19,16 +19,17 @@
       </el-form-item>
       <el-form-item label="上架状态">
         <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable @change="queryParams.pageNum = 1;getList()">
+          <el-option label="全部" value="" />
           <el-option label="待上架" value="init" />
           <el-option label="已上架" value="on" />
           <el-option label="已下架" value="off" />
         </el-select>
       </el-form-item>
-      <el-form-item label="成本">
-        <el-input v-model="queryParams.minCost" placeholder="最低成本" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+      <el-form-item label="采购价格">
+        <el-input v-model="queryParams.minCost" placeholder="最低采购价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
       </el-form-item>
       <el-form-item label="-">
-        <el-input v-model="queryParams.maxCost" placeholder="最高成本" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.maxCost" placeholder="最高采购价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
       </el-form-item>
       <el-form-item label="价格">
         <el-input v-model="queryParams.minValue" placeholder="最低价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
@@ -70,7 +71,7 @@
           ¥{{$numberFormat(row.value)}}
         </template>
       </el-table-column>
-      <el-table-column label="成本" prop="cost">
+      <el-table-column label="采购价格" prop="cost">
         <template slot-scope="{row}">
           ¥{{$numberFormat(row.cost)}}
         </template>

+ 1 - 1
src/views/business/ticket/create.vue

@@ -241,7 +241,7 @@
 
         <el-table-column label="商品价格" min-width="85">
           <template slot-scope="scope">
-            <div>¥{{ $numberFormat(scope.row.exchangePrice) }}</div>
+            <div>¥{{ $numberFormat(scope.row.value) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="商品库存" prop="quantity" width="80" />