update: 分页参数更改及过滤条件优化

dist/css/chunk-2ab5ba38.3c185453.css

-.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-69dea756]{width:360px}.w-160[data-v-69dea756]{width:160px}.w140[data-v-69dea756]{width:140px}.w350[data-v-69dea756]{width:350px}.tab-top[data-v-69dea756]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-69dea756],.tab-top[data-v-69dea756]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-69dea756]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-69dea756]{height:60px}.table-content .img-text img[data-v-69dea756]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-69dea756]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-69dea756]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-69dea756]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-69dea756]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-69dea756]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-69dea756]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-69dea756]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-69dea756]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-69dea756]:hover{color:#2f54ed}.undeline-dash[data-v-69dea756]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-69dea756]{display:inline-block;line-height:32px}.hidden-data[data-v-69dea756]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/css/chunk-3bbbdd12.ac1aabf0.css

-.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-34351082]{width:360px}.w-160[data-v-34351082]{width:160px}.w140[data-v-34351082]{width:140px}.w350[data-v-34351082]{width:350px}.tab-top[data-v-34351082]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-34351082],.tab-top[data-v-34351082]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-34351082]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-34351082]{height:60px}.table-content .img-text img[data-v-34351082]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-34351082]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-34351082]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-34351082]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-34351082]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-34351082]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-34351082]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-34351082]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-34351082]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-34351082]:hover{color:#2f54ed}.undeline-dash[data-v-34351082]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-34351082]{display:inline-block;line-height:32px}.hidden-data[data-v-34351082]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/css/chunk-6d4a4dcb.fec0806b.css

+.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-735a576f]{width:360px}.w-160[data-v-735a576f]{width:160px}.w140[data-v-735a576f]{width:140px}.w350[data-v-735a576f]{width:350px}.tab-top[data-v-735a576f]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-735a576f],.tab-top[data-v-735a576f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-735a576f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-735a576f]{height:60px}.table-content .img-text img[data-v-735a576f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-735a576f]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-735a576f]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-735a576f]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-735a576f]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-735a576f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-735a576f]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-735a576f]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-735a576f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-735a576f]:hover{color:#2f54ed}.undeline-dash[data-v-735a576f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-735a576f]{display:inline-block;line-height:32px}.hidden-data[data-v-735a576f]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/css/chunk-baa9477a.f5adea56.css

+.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-f16dc7d2]{width:360px}.w-160[data-v-f16dc7d2]{width:160px}.w140[data-v-f16dc7d2]{width:140px}.w350[data-v-f16dc7d2]{width:350px}.tab-top[data-v-f16dc7d2]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-f16dc7d2],.tab-top[data-v-f16dc7d2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-f16dc7d2]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-f16dc7d2]{height:60px}.table-content .img-text img[data-v-f16dc7d2]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-f16dc7d2]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-f16dc7d2]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-f16dc7d2]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-f16dc7d2]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-f16dc7d2]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-f16dc7d2]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-f16dc7d2]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-f16dc7d2]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-f16dc7d2]:hover{color:#2f54ed}.undeline-dash[data-v-f16dc7d2]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-f16dc7d2]{display:inline-block;line-height:32px}.hidden-data[data-v-f16dc7d2]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/js/chunk-76577a52.623db612.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-76577a52"],{"1e4b":function(t,a,e){"use strict";e.r(a);var c=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"enter"},t._l(t.wfTypes,(function(a,c){return e("div",{key:c,class:"b"+(c+1)},[e("span",{staticClass:"title"},[t._v(t._s(a.title))]),e("router-link",{staticClass:"target",attrs:{to:a.target}},[e("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},n=[],i=e("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(e("ccb6"),e("5d22")),u=Object(s["a"])(l,c,n,!1,null,"8987bf3a",null);a["default"]=u.exports},"56c2":function(t,a,e){},ccb6:function(t,a,e){"use strict";e("56c2")},f9e4:function(t,a,e){"use strict";e.d(a,"b",(function(){return c})),e.d(a,"a",(function(){return n}));e("00f2"),Array(31).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})),Array(28).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,a){return{label:"".concat(a+1,"月"),value:"".concat(a+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file

dist/js/chunk-9632093e.765758aa.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-9632093e"],{"0687":function(t,a,e){},"1e4b":function(t,a,e){"use strict";e.r(a);var c=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"enter"},t._l(t.wfTypes,(function(a,c){return e("div",{key:c,class:"b"+(c+1)},[e("span",{staticClass:"title"},[t._v(t._s(a.title))]),e("router-link",{staticClass:"target",attrs:{to:a.target}},[e("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},n=[],i=e("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(e("ccb6"),e("2877")),u=Object(s["a"])(l,c,n,!1,null,"8987bf3a",null);a["default"]=u.exports},ccb6:function(t,a,e){"use strict";e("0687")},f9e4:function(t,a,e){"use strict";e.d(a,"b",(function(){return c})),e.d(a,"a",(function(){return n}));e("6c7b"),Array(31).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})),Array(28).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,a){return{label:"".concat(a+1,"月"),value:"".concat(a+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file

src/components/stock-upload-record/detail.vue

@@ -75,7 +75,6 @@ export default {
       const params = {
         ...this.listParams,
         id: this.id,
-        pageNum: this.listParams.currentPage,
       };
       this.loading = true;
       virtualErrorPage(params)

src/views/gift-manage/module/check-upload-detail.vue

@@ -71,7 +71,7 @@ export default {
         id: this.giftId,
         key: '',
         pageSize: this.pageSize,
-        pageNum: this.currentPage
+        currentPage: this.currentPage
       };
       virtualCardList(params).then(res =>{
         console.log(res);

src/views/gift-manage/module/update-cost.vue

-<template>
-  <el-dialog title="调整成本费用" :visible.sync="dialogVisible" width="500px" @close="cancelSubmit()">
-    <div v-loading="loading">
-      <el-input-number v-model="updateCostData.costPrice" precision="2" :min="0" :max="999999.99"  style="width:400px"></el-input-number>
-      <el-input type="textarea" :rows="3" placeholder="请填入调整备注" v-model="updateCostData.textarea" :maxlength="240" show-word-limit></el-input>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="cancelSubmit()">取消</el-button>
-      <el-button type="primary" @click="submitProNanme()">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-// import request from '../service/request.js';
-import api from '@/api/gift.js';
-const { realCostUpdate } = api;
-export default {
-  props: {
-    updateCostData: {
-      type: Object,
-      default() {
-        return {};
-      }
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      loading: false
-    };
-  },
-  mounted() {
-    this.dialogVisible = true;
-  },
-  methods: {
-    submitProNanme() {
-      if(this.loading) return;
-      if(!this.updateCostData.costPrice){
-        this.$message.error('请完善成本');
-      }
-      if(!this.updateCostData.textarea){
-        this.$message.error('请完善备注');
-      }
-      this.loading = true;
-      let params = {
-        giftId: this.updateCostData.id,
-        costPrice: this.updateCostData.costPrice,
-        remark: this.updateCostData.textarea
-      };
-      realCostUpdate(params).then(res => {
-        if(res.code === '000'){
-          this.dialogVisible = false;
-          setInterval(() => {
-            this.$emit('closeUpdateCost');
-          }, 10);
-          this.$message.success('修改成功');
-        }else{
-          this.$message.error(res.message);
-        }
-      }).finally(() => this.loading = false);
-    },
-    // 取消修改
-    cancelSubmit() {
-      this.dialogVisible = false;
-      setInterval(() => {
-        this.$emit('closeUpdateCost');
-      }, 10);
-    }
-  }
-};
-</script>
-<style scoped></style>

src/views/gift-manage/module/update-name.vue

-<template>
-  <el-dialog title="修改礼品名称" :visible.sync="dialogVisible" width="600px" @close="cancelSubmit('editInfoModal')">
-    <el-form :model="editInfoModal" ref="editInfoModal" :rules="modalRules" :label-position="labelPosition" v-loading="loading">
-      <el-form-item label="礼品名称" label-width="80px" prop="giftName" style="width:560px">
-        <dm-input type="text" v-model="editInfoModal.giftName" :byte-type="1" :maxlength="30"> </dm-input>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="cancelSubmit('editInfoModal')">取消</el-button>
-      <el-button type="primary" @click="submitProNanme('editInfoModal')">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import api from '@/api/gift.js';
-const { updateName } = api;
-export default {
-  props: {
-    updateNameForm: {
-      type: Object,
-      default() {
-        return {};
-      }
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      editInfoModal: {
-        giftName: '',
-        giftId: ''
-      },
-      labelPosition: 'top',
-      modalRules: {
-        giftName: [ { required: true, message: '名称不能为空', trigger: 'blur' } ]
-      },
-      loading: false
-    };
-  },
-  mounted() {
-    this.dialogVisible = true;
-  },
-  methods: {
-    submitProNanme() {
-      if(this.loading) return;
-      let params = {
-        giftId: this.updateNameForm.id,
-        name: this.editInfoModal.giftName
-      };
-      this.loading = true;
-      updateName(params).then(res => {
-        if(res.code === '0000'){
-          this.dialogVisible = false;
-          this.$emit('closeUpdateName');
-          this.$message.success('修改成功');
-        }else{
-          this.$message.error(res.message);
-        }
-      }).finally(() => this.loading = false);
-    },
-    // 取消修改
-    cancelSubmit(formName) {
-      this.$refs[formName].resetFields();
-      this.dialogVisible = false;
-      setInterval(() => {
-        this.$emit('closeUpdateName');
-      }, 10);
-    }
-  }
-};
-</script>
-<style scoped></style>

src/views/gift-manage/module/update-stock.vue

-<template>
-  <el-dialog title="调整库存" :visible.sync="dialogVisible" width="500px" @close="cancelSubmit()">
-    <div v-loading="loading">
-      <el-select v-model="stockType" style="width:100px;display:inline-block;margin-right:10px">
-        <el-option label="增加" :value="0"></el-option>
-        <el-option label="减少" :value="1"></el-option>
-      </el-select>
-      <el-input-number v-model="stock" precision="0" :min="0" :max="999999"  style="width:300px"></el-input-number>
-      <el-input class="mt20" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="cancelSubmit()">取消</el-button>
-      <el-button type="primary" @click="submitProNanme()">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-// import request from '../service/request.js';
-import api from '@/api/gift.js';
-const { realStockUpdate } = api;
-export default {
-  props: {
-    stockData: {
-      type: Object,
-      default() {
-        return {};
-      }
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      loading: false,
-      stockType: 0,
-      stock: '',
-      textarea: ''
-    };
-  },
-  mounted() {
-    this.dialogVisible = true;
-    console.log(this.stockData);
-  },
-  methods: {
-    submitProNanme() {
-      if(this.loading) return;
-      let params = {
-        giftId: this.stockData.id,
-        updateList: [
-          {
-            giftSkuId: '',
-            stock: this.stock,
-            stockType: this.stockType
-          }
-        ],
-        remark: this.textarea
-      };
-      this.loading = true;
-      realStockUpdate(params).then(res =>{
-        if(res.code === '0000'){
-          this.dialogVisible = false;
-          setInterval(() => {
-            this.$emit('closeUpdateStock');
-          }, 10);
-          this.$message.success('修改成功');
-        }else{
-          this.$message.error(res.message);
-        }
-      }).finally(() => this.loading = false);
-    },
-    // 取消修改
-    cancelSubmit() {
-      this.dialogVisible = false;
-      setInterval(() => {
-        this.$emit('closeUpdateStock');
-      }, 10);
-    }
-  }
-};
-</script>
-<style scoped></style>

src/views/gift-manage/real-gift-detail.vue

@@ -587,7 +587,6 @@ export default {
         .then(res => {
           if (res.code === '0000') {
             let resResult = res.result;
-            // this.goodsForm.changeDelivery = resResult.changeDelivery; // 兑换方式
             this.goodsForm.giftName = resResult.giftName; // 礼品名称
             this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
             this.goodsForm.stock = resResult.stock; // 库存
@@ -606,7 +605,6 @@ export default {
             this.goodsForm.giftImages = resResult.giftImages;
             this.goodsForm.stockUseType = resResult.stockUseType;
             let img = resResult.giftImages.split(',');
-            // this.goodsForm.giftImages = [];
             if (img.length) {
               for (let item of img) {
                 this.image.push({
@@ -617,14 +615,6 @@ export default {
             this.goodsForm.giftDescrption = resResult.giftDescrption; // 礼品详情
             this.goodsForm.refundFlag = resResult.refundFlag; // 是否支持退货
             this.goodsStandardInfo = resResult.giftSpecInfo ? JSON.parse(resResult.giftSpecInfo) : []; // 礼品规格信息
-            // if (this.goodsStandardInfo.length > 0) {
-            //   this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
-            // } else {
-            //   this.isStdImg = false;
-            // }
-            // if (this.goodsStandardInfo.length > 0) {
-            //   this.getSkuList();
-            // }
 
             let skuList = resResult.skuList || []; // 礼品规格值信息
             if(skuList.length > 1){
@@ -641,6 +631,8 @@ export default {
               }
             }else if(skuList.length === 1){
               this.goodsForm.costPrice = skuList[0].giftSkuCostPrice;
+            }else if(skuList.length === 0){
+              this.goodsForm.costPrice = resResult.costPrice;
             }
             let mapData = [];
             let skuSellObj = {};
@@ -697,9 +689,6 @@ export default {
         }).finally(() => this.$emit('updateLoading'));
       console.log(222);
     },
-    // handleChangeRdio() {
-    //   this.goodsForm.spuList[0].stock = 0;
-    // },
     // 上传前
     beforeUpload(file) {
       if (file.size > 1 * 1024 * 1024) {
@@ -715,18 +704,13 @@ export default {
     // 上传成功 返回的图片对象 里面有图片 大小 类型 等相关信息
     uploadOnSuccess(obj) {
       // 目前返回两个参数 {res:res,file:file}
-      console.log(obj.res.result[0]);
       let url = obj.res.result[0];
-      // obj.file.imageType = 1;
-      console.log(obj);
       this.image.push(url);
-      console.log(this.image);
       let handelImage = [];
       this.image.forEach((item, index) =>{
         handelImage[index] = item.url;
       });
       this.goodsForm.giftImages = handelImage.join('');
-      console.log(this.goodsForm.giftImages);
     },
     // 删除图片 返回图片列表的索引 你可以根据这个索引去找对应图片的id
     deleteImage(i) {
@@ -781,7 +765,6 @@ export default {
     },
     // 获取规格列表
     getStandardList(item, ids, search) {
-    // getStandardList() {
       let speIds;
       if (ids) {
         speIds = ids;
@@ -792,10 +775,6 @@ export default {
         speIds: speIds,
         search: search,
       };
-      // let params = {
-      //   speIds: '',
-      //   search: '',
-      // };
       giftStandardList(params).then(res => {
         if (res.code === '0000') {
           if (res.result) {
@@ -1422,19 +1401,14 @@ export default {
             // shopId: '', // 门店id
             giftName: this.goodsForm.giftName, // 礼品名称
             marketPrice: this.goodsForm.marketPrice, // 市场价
-            // costPrice: this.goodsForm.costPrice, // 成本价
-            costPrice: 0, // 成本价
+            costPrice: skuList.length == 0 ? this.goodsForm.costPrice : -1, // 成本价
             stock: this.goodsForm.stock, // 库存
             giftNo: this.goodsForm.giftNo, // 礼品编码
             giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码
-            // costPrice: this.goodsForm.spuList[0].costPrice, // 成本价
-            // stock: this.goodsForm.spuList[0].stock, // 库存
-            // giftNo: this.goodsForm.spuList[0].giftNo, // 礼品编码
-            // giftBarNo: this.goodsForm.spuList[0].giftBarNo, // 礼品条形码
             giftImages: this.goodsForm.giftImages, // 礼品主图
             giftDescrption: this.goodsForm.giftDescrption, // 礼品详情
             refundFlag: this.goodsForm.refundFlag, // 是否支持退货
-            giftSpecInfo: JSON.stringify(this.goodsStandardInfo),
+            giftSpecInfo: this.goodsStandardInfo.length > 0 ? JSON.stringify(this.goodsStandardInfo) : '',
             skuList: skuList,
             operAuthType: this.goodsForm.operAuthType, // 操作人权限
             operAuth: this.goodsForm.operAuthPre.join(','), // 操作人权限
@@ -1474,9 +1448,6 @@ export default {
       });
     }
   },
-  // computed: {
-  //   ...mapGetters([ 'getDefaultId' ])
-  // }
 };
 </script>
 <style lang="less" scoped>
@@ -1507,24 +1478,19 @@ export default {
     padding-bottom: 12px;
     background: #F7F8FA;
     .add-sku-button{
-      // display: inline-block;
       width: 110px;
       height: 32px;
       background: #FFFFFF;
       border-radius: 2px;
       border: 1px dashed #C4C6CF;
       text-align: center;
-      // margin-top: 12px;
-      // margin-left: 21px;
     }
   }
 }
 .from-content {
   position: relative;
   .demo-ruleForm {
-    // margin-bottom: 40px;
     .form-section {
-      // margin-bottom: 60px;
       padding: 30px 20px;
       h3 {
         color: #303133;
@@ -1558,10 +1524,7 @@ export default {
       .standard-info {
         //规格信息
         .add-sku-list {
-          // width: 900px;
           margin: 10px 13px 10px 13px;
-          // margin-top: 10px;
-          // margin-bottom: 20px;
           .add-sku-item {
             width: 100%;
             .sku-name {
@@ -1686,8 +1649,6 @@ export default {
 }
 .table-img {
   cursor: pointer;
-  // text-align: center;
-  // vertical-align: top;
   position: absolute;
   top: 44px;
   left: 0;
@@ -1697,7 +1658,6 @@ export default {
   border-radius: 4px;
   border: 1px solid #FF5152;
   .avatar-uploader{
-    // margin-top: 35px;
     z-index: 2;
     text-align: center;
     .avatar-uploader-icon{