diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index af6d24e..429d95f 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,11 +17,15 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
+<<<<<<< HEAD
   baseURL = 'http://128.10.249.23:9003';
+=======
+  // baseURL = 'http://128.10.249.13:9003';
+>>>>>>> 89bb9f2b58e667e7b1bc81a97a5c37f15bfe7980
 
 } else {
   console.error('---------------------')
diff --git a/admin-web-master/src/views/shopRental/manage/index copy.vue b/admin-web-master/src/views/shopRental/manage/index copy.vue
index 4a9e7e8..24d9b21 100644
--- a/admin-web-master/src/views/shopRental/manage/index copy.vue
+++ b/admin-web-master/src/views/shopRental/manage/index copy.vue
@@ -15,7 +15,7 @@
             </el-form-item>
             <el-form-item label="合同名称">
               <el-input v-model="formSel.contractName" placeholder="请输入" style="width:168px;" />
-            </el-form-item>  
+            </el-form-item>   
             <el-form-item label="签订时间">
               <el-date-picker style="width:160px;margin-right:5px" v-model="formSel.contractSigningDate"
                 value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder=""
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index 3b24148..ab34e4a 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -170,9 +170,9 @@
 
       </el-form>
       <div style="display: flex; justify-content: flex-end; align-items: center;padding: 20px 50px;">
-        <el-button @click="OA" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
         <el-button @click="openoa =false" class="buttonHover"
           style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+        <el-button @click="OA" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue
new file mode 100644
index 0000000..e48b205
--- /dev/null
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue
@@ -0,0 +1,700 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <div slot="header" style="display:flex;align-items: center;   justify-content: space-between;">
+        <div>
+          <span v-if="!productId" class="addTitle">新增商品</span>
+          <span v-else class="addTitle">编辑商品</span>
+        </div>
+       <div>
+         <el-button v-if="active" class="buttonHover"
+               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
+         <el-button v-if="active"  style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
+         <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="save">保存</el-button>
+         <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
+       </div>
+      </div>
+      <!-- 步骤条 -->
+      <div class="stepsColor common">
+        <div class="stepsOne common">
+          <div :class="active ? 'one_class common' : 't_class common'">1</div>
+          <div :class="active ? 'two_class' : 'w_class'">基本属性&商品描述</div>
+        </div>
+        <div class="line" />
+        <div class="stepsTwo common">
+          <div :class="active ? 't_class common' : 'one_class common'">2</div>
+          <div :class="active ? 'w_class' : 'two_class' ">基本属性&商品描述</div>
+        </div>
+      </div>
+    </el-card>
+    <!-- 商品 -->
+    <div class="addCom common">
+      <div v-if="active">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="padding:10px 20px;">
+          <div class="leftCom">
+            <el-form-item label="商品名称" prop="productName">
+              <el-input v-model="form.productName" maxlength="50" show-word-limit />
+            </el-form-item>
+            <el-form-item label="卖点简介">
+              <el-input v-model="form.productBrief" maxlength="50" show-word-limit />
+            </el-form-item>
+            <el-form-item>
+              <Tinymce v-if="showTinymce" ref="content" v-model="form.productText" class="tinymce-wrap" :height="200" />
+            </el-form-item>
+          </div>
+          <div class="rightCom">
+            <el-form-item label="官方分类" prop="classifyId">
+              <el-cascader
+                v-model="form.classifyId"
+                :options="classifyList"
+                clearable
+                :props="{
+                  checkStrictly: false,
+                  label:'categoryName',
+                  value:'id',
+                  children:'childs'
+                }"
+                @change="handleChangeCascader"
+              />
+            </el-form-item>
+
+            <el-form-item label="商品分组" prop="shopGroupId">
+              <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
+                <el-option
+                  v-for="(item,index) in groupList"
+                  :key="index"
+                  :label="item.groupName"
+                  :value="item.shopGroupId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="品牌">
+              <el-select
+                v-model="form.brandId"
+                clearable
+                placeholder="请选择品牌"
+              >
+                <el-option
+                  v-for="item in brandList"
+                  :key="item.id"
+                  :label="item.brandName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item class="form-item-long" label="供应商">
+              <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
+            </el-form-item>
+            <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
+              <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
+            </el-form-item>
+            <el-form-item label="需要物流" prop="ifLogistics">
+              <el-radio-group v-model="form.ifLogistics">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="上架状态" prop="shelveState">
+              <el-radio-group v-model="form.shelveState">
+                <el-radio :label="1">上架</el-radio>
+                <el-radio :label="0">下架</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="允许超卖" prop="ifOversold">
+              <el-radio-group v-model="form.ifOversold">
+                <el-radio :label="1">允许</el-radio>
+                <el-radio :label="0">不允许</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="积分兑换" prop="ifCredit">
+              <el-radio-group v-model="form.ifCredit">
+                <el-radio :label="1">允许</el-radio>
+                <el-radio :label="0">不允许</el-radio>
+              </el-radio-group>
+              <p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
+            </el-form-item>
+            <el-form-item v-if="form.ifCredit" class="form-item-long" label="单笔最大抵扣" prop="creditLimit">
+              <!-- <el-input v-model="form.creditLimit" type="number" placeholder="请输入单笔最大抵扣" /> -->
+              <el-input-number v-model="form.creditLimit" :controls="false" :min="0" :precision="0" placeholder="请输入单笔最大抵扣" />
+              <p style="color: #cf0f0f; height: 25px; line-height: 25px;margin-top: 10px">限制一笔订单中该商品最多抵扣多少积分</p>
+              <p style="color: #cf0f0f; height: 25px; line-height: 25px">( 注：1积分 = {{ integralProportion }}元 请输入整数 )</p>
+            </el-form-item>
+          <!--            <el-form-item label="花呗分期">-->
+          <!--              <el-radio-group v-model="form.ifHuabei">-->
+          <!--                <el-radio :label="1">支持</el-radio>-->
+          <!--                <el-radio :label="0">不支持</el-radio>-->
+          <!--              </el-radio-group>-->
+          <!--            </el-form-item>-->
+          </div>
+        </el-form>
+      </div>
+      <div v-if="!active" class="centerCom">
+        <el-form ref="form" :model="params" label-width="80px">
+          <StyleInformation :form="params" />
+        </el-form>
+      </div>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      class="check-image-dialog"
+      title="查看图片"
+      center="center"
+    >
+      <img width="100%" :src="dialogImageUrl" alt>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Tinymce from '@/components/Tinymce'
+import {
+  getGroupSelect,
+  getClassify,
+  getClassifyAdd,
+  getClassifyGetById,
+  getClassifyUpdate,
+  getBrandList
+} from '@/api/commodity'
+import {
+  getSelect
+} from '@/api/account';
+import { uploadUrl } from '@/utils/request'
+import StyleInformation from './addComponent'
+export default {
+  components: {
+    Tinymce,
+    StyleInformation
+  },
+  props: {
+    productId: {
+      type: Number,
+      default: 0
+    },
+    showTinymce: {
+      type: Boolean
+    }
+  },
+  watch: {
+
+      },
+  data() {
+    // const checkCreditLimit = (rule, value, callback) => {
+    //   console.log(this.form.ifCredit)
+    //   if (this.form.ifCredit) {
+    //     callback(new Error('当选择允许积分兑换时，必须填写该值'))
+    //   }
+    //   const reg = /^[1-9]\d*$/
+    //   if (value === '' || value === undefined || value === null) {
+    //     callback();
+    //   } else {
+    //     if ((!reg.test(value)) && value !== '') {
+    //       callback(new Error('请输入正确的价格'));
+    //     } else {
+    //       callback();
+    //     }
+    //   }
+    //   callback()
+    // }
+    return {
+      brandList: [],
+      active: 1,
+      action: uploadUrl,
+      form: {
+        brandId: null, // 品牌ID
+        productName: '', // 商品名称
+        productBrief: '', // 商品简介
+        shopGroupId: '', // 商品分组id
+        classifyId: '', // 分类id
+        supplierName: '', // 供应商名称
+        cost:null,//成本价
+        ifLogistics: '', // 是否需要物流 1-是 0-否
+        shelveState: '', // 是否上架 1-上架 0-不上架
+        ifOversold: '', // 是否允许超卖 1-是 0-否
+        ifCredit: '', // 是否支持积分兑换 1-是 0-否
+        creditLimit: '', // 单笔订单限制使用多少积分
+        ifHuabei: 1, // 是否支持花呗分期 1-是 0-否
+        productText: '', // 商品描述（富文本）
+        images: [], // "图片地址"
+        deletes: [], // 删除的规格id数组
+        names: [
+          {
+            code: '', // 级别
+            skuName: '', // 规格名
+            values: [
+              {
+                valueCode: '', // 级别
+                skuValue: '', // 规格值
+                image: '' // 图片
+              }
+            ]
+          }
+        ],
+        skus: [
+          {
+            skuName: '', // 规格名称
+            skuValue: '', // 规格值
+            price: '', // 售价
+            originalPrice: '', // 原价
+            stockNumber: '', // 库存数量
+            weight: '', // 重量
+            skuImage: '', // 配图地址
+            style: '' // 款式  1-单款式 2-多款式
+          }
+        ]
+      },
+      params: {
+        applyPrice: 0,
+        attrStyle: 0,
+        categoryId: '',
+        oversold: 1,
+        collects: 0,
+        groupId: '',
+        imgs: [],
+        deletes: [], // 删除规格数据
+        isDelete: 0,
+        limitCount: 0,
+        minusStock: '',
+        needLogistics: 1,
+        platform: '',
+        price: 0,
+        productCode: '',
+        productName: '',
+        sellCount: 0,
+        sellDesc: '',
+        sellType: '',
+        shortName: '',
+        skuAttrList: [
+          {
+            code: '',
+            skuName: '',
+            needImg: false,
+            values: [
+              {
+                skuValue: '',
+                valueCode: '',
+                image: ''
+              }
+            ]
+          }
+        ],
+        skuList: [
+          {
+            isDelete: '',
+            skuAttrCodeDTOList: [
+              {
+                code: '',
+                valueCode: ''
+              }
+            ],
+            skuAttrList: [],
+            sku: '',
+            skuImg: '',
+            price: 0,
+            originalPrice: 0,
+            stockNumber: 0,
+            weight: 0
+          }
+        ],
+        sortOrder: '',
+        status: '',
+        stock: '',
+        supplierName: '',
+        cost:null,
+        views: '',
+        weight: ''
+      },
+      imgList: [],
+      groupList: [],
+      classifyList: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      rules: {
+        productName: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
+        shopGroupId: [{ required: true, message: '请选择商品分组', trigger: 'change' }],
+        classifyId: [{ required: true, message: '请选择商品分类', trigger: 'change' }],
+        cost:[{ required: true, message: '请输入成本价', trigger: 'change' }],
+        ifLogistics: [{ required: true, message: '请选择是否需要物流', trigger: 'change' }],
+        shelveState: [{ required: true, message: '请选择是否上架', trigger: 'change' }],
+        ifOversold: [{ required: true, message: '请选择是否允许超卖', trigger: 'change' }],
+        ifCredit: [{ required: true, message: '请选择是否支持积分兑换', trigger: 'change' }],
+        creditLimit: [{ required: true, message: '请输入单笔最大抵扣', trigger: 'blur' }]
+      },
+      integralList: [],
+      integralProportion: '' // 积分兑换金额比例
+    }
+  },
+  watch: {
+    productId: {
+      handler(nVal, oVal) {
+        if (nVal) {
+          // this.details()
+        }
+      }
+    },
+  },
+  mounted() {
+    this.groups()
+    this.selectList()
+    this.getBrandList()
+    // if (this.productId) {
+    //   this.details()
+    // }
+    this.getCredit()
+  },
+  methods: {
+    handleChangeCascader() {
+      console.log(this.form.classifyId)
+    },
+    async getBrandList() {
+      const { data } = await getBrandList()
+      this.brandList = data
+    },
+    async getCredit() {
+      const res = await getSelect({ dictName: 'CREDIT_CONFIG' })
+      this.integralList = res.data
+      this.integralList.forEach((item) => {
+        if (item.dictName === 'credit_exchange_rate') {
+          this.integralProportion = item.dictDescribe
+        }
+      })
+    },
+    handleImageSuccess(response) {
+      const { url } = response.data
+      this.imgList.push(url)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.imgPath
+      this.dialogVisible = true
+    },
+    // 移除图片
+    handleRemove(file) {
+      const { imgPath } = file
+      this.form.imgs = this.form.imgs.filter(item => {
+        return item.imgPath !== imgPath
+      })
+    },
+    // 下一步
+    next() {
+      this.$refs['form'].validate((valid) => {
+        console.log('val', valid)
+        if (valid) {
+          if (this.active === 1) {
+            this.active = 0
+            // console.log(this.form);
+            sessionStorage.setItem('form', JSON.stringify(this.form.skus))
+          }
+        } else {
+          this.$message({
+            message: '请填写正确的信息',
+            type: 'warning'
+          })
+          return false
+        }
+      })
+    },
+    // 点击新增商品时表单数据重置
+    reset() {
+      // this.form.productText = ''
+      this.form = {
+        productName: '',
+        productBrief: '',
+        shopGroupId: '',
+        classifyId: '',
+        supplierName: '',
+        ifLogistics: '',
+        shelveState: ' ',
+        ifOversold: '',
+        ifCredit: '',
+        creditLimit: '',
+        ifHuabei: 1,
+        cost:null,
+        productText: '',
+        images: [],
+        deletes: [],
+        names: [
+          {
+            code: '',
+            skuName: '',
+            values: [
+              {
+                valueCode: '',
+                skuValue: '',
+                image: ''
+              }
+            ]
+          }
+        ],
+        skus: [
+          {
+            skuName: '',
+            skuValue: '',
+            price: '',
+            originalPrice: '',
+            stockNumber: '',
+            weight: '',
+            skuImage: '',
+            style: ''
+          }
+        ]
+      }
+      this.params = {
+        applyPrice: 0,
+        attrStyle: 0,
+        categoryId: '',
+        oversold: 1,
+        collects: 0,
+        groupId: '',
+        imgs: [],
+        cost:null,
+        deletes: [],
+        isDelete: 0,
+        limitCount: 0,
+        minusStock: '',
+        needLogistics: 1,
+        platform: '',
+        price: 0,
+        productCode: '',
+        productName: '',
+        sellCount: 0,
+        sellDesc: '',
+        sellType: '',
+        shortName: '',
+        skuAttrList: [
+          {
+            code: '',
+            skuName: '',
+            needImg: false,
+            values: [
+              {
+                skuValue: '',
+                valueCode: '',
+                image: ''
+              }
+            ]
+          }
+        ],
+        skuList: [
+          {
+            isDelete: '',
+            skuAttrCodeDTOList: [
+              {
+                code: '',
+                valueCode: ''
+              }
+            ],
+            skuAttrList: [],
+            sku: '',
+            skuImg: '',
+            price: 0,
+            originalPrice: 0,
+            stockNumber: 0,
+            weight: 0
+          }
+        ],
+        sortOrder: '',
+        status: '',
+        stock: '',
+        supplierName: '',
+        views: '',
+        weight: ''
+      }
+      this.imgList = []
+      this.dialogImageUrl = ''
+      this.dialogVisible = false
+      this.active = 1
+    },
+    // 返回
+    back() {
+      this.active = 1
+      this.$emit('cancel')
+    },
+    // 上一步
+    last() {
+      if (this.active !== 1) {
+        this.active = 1
+      }
+    },
+    // 保存
+    async save() {
+      console.log(this.params.skuAttrList)
+      if (this.params.attrStyle === 1) {
+        for (let i = 0; i < this.params.skuAttrList.length; i++) {
+          if (this.params.skuAttrList[i].skuName === '') {
+            this.$message({
+              message: '规格名不能为空',
+              type: 'warning'
+            })
+            return false
+          }
+        }
+      }
+      this.form.names = this.params.skuAttrList
+      this.params.skuList.forEach(element => {
+        element.style = this.params.attrStyle
+      })
+      this.form.skus = this.params.skuList
+      this.form.images = this.params.imgs
+      this.form.deletes = this.params.deletes
+      this.form.classifyId = Array.isArray(this.form.classifyId) ? this.form.classifyId[this.form.classifyId.length - 1] : this.form.classifyId
+      if (this.productId) {
+        this.form.productId = this.productId
+        const sku = JSON.parse(sessionStorage.getItem('form'))
+        sku.forEach((element, i) => {
+          for (let index = 0; index < this.form.skus.length; index++) {
+            if (i === index) {
+              this.form.skus[index].skuId = element.skuId
+            }
+          }
+        })
+        console.log(this.form, 'this.form')
+        
+        const res = await getClassifyUpdate(this.form)
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+          this.back()
+        }
+      } else {
+
+        const res = await getClassifyAdd(this.form)
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+          this.reset()
+          this.back()
+        }
+      }
+    },
+    // 获取商品分组
+    async groups() {
+      const res = await getGroupSelect({
+      })
+      this.groupList = res.data
+    },
+    // 获取详情
+    async details() {
+      const res = await getClassifyGetById({ productId: this.productId })
+      this.form = res.data
+      this.$set(this.form, 'productText', res.data.productText)
+      // this.form.productText = res.data.productText
+      // console.log(this.form.productText, 'productText')
+      if (res.data.names.length !== 0) {
+        this.params.skuAttrList = res.data.names
+      }
+      // this.params.skuAttrList.forEach((item) => {
+      //   var data = {}
+      //   var arr = Object.keys(res.data)
+      //   if (arr.length === 0) {
+      //     item.needImg = false
+      //   }
+      // })
+      this.params.skuList = this.form.skus
+      this.params.attrStyle = res.data.skus[0].style
+      this.params.imgs = res.data.images
+    },
+    async selectList() {
+      const res = await getClassify()
+      this.classifyList = this.filterList(res.data)
+    },
+    filterList(data) {
+      data.forEach(i => {
+        if (i.childs.length) {
+          this.filterList(i.childs)
+        } else {
+          i.childs = null
+        }
+      })
+      return data
+    }
+  }
+}
+</script>
+
+<style scoped lang='scss'>
+@import url("../../../styles/elDialog.scss");
+.btnList {
+  float: right;
+  padding: 3px 0;
+  width: 100px;
+  height: 40px;
+  border-radius: 4px;
+  margin-right: 30px;
+}
+.addTitle {
+  font-size: 14px;
+  color: #333333;
+  line-height: 50px;
+}
+.stepsColor{
+  font-size: 20px;
+  line-height: 40px;
+  .one_class {
+    width: 40px;
+    background: #3F9B6A;
+    border-radius: 50%;
+    color: #ffffff;
+    margin: 0 10px;
+  }
+  .two_class {
+    color: #3F9B6A;
+  }
+  .line {
+    width: 230px;
+    height: 2px;
+    background: #e0e5eb;
+    margin: 0 20px;
+  }
+  .t_class {
+    width: 40px;
+    background: #dddddd;
+    border-radius: 50%;
+    color: #333333;
+    margin: 0 10px;
+  }
+  .w_class {
+    color: #666666;
+  }
+}
+.common {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.addCom {
+  margin: 10px 0;
+  justify-content: space-around;
+  align-items: unset;
+  width: 100%;
+  .el-form{
+    display: flex;
+    padding: 0px 10px 10px;
+  }
+  .leftCom {
+    width: 65%;
+    background: #ffffff;
+  }
+  .rightCom {
+    width: 35%;
+    background: #ffffff;
+    margin-left: 80px;
+  }
+}
+.centerCom {
+  width: 1660px;
+  background: #ffffff;
+  box-shadow: 0px 5px 20px 0px rgba(51, 51, 51, 0.15);
+  border-radius: 4px;
+}
+</style>
+<style scoped>
+.form-item-long >>> .el-input {
+  width: 100%;
+}
+</style>
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
index e48b205..de933e8 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
@@ -1,134 +1,135 @@
 <template>
   <div>
-    <el-card class="box-card">
-      <div slot="header" style="display:flex;align-items: center;   justify-content: space-between;">
-        <div>
-          <span v-if="!productId" class="addTitle">新增商品</span>
-          <span v-else class="addTitle">编辑商品</span>
-        </div>
-       <div>
-         <el-button v-if="active" class="buttonHover"
-               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
-         <el-button v-if="active"  style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
-         <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="save">保存</el-button>
-         <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
-       </div>
+    <!-- 步骤条 -->
+    <div class="stepsColor common">
+      <div class="stepsOne common">
+        <div :class="active ? 'one_class common' : 't_class common'">1</div>
+        <div :class="active ? 'two_class' : 'w_class'">基本属性</div>
       </div>
-      <!-- 步骤条 -->
-      <div class="stepsColor common">
-        <div class="stepsOne common">
-          <div :class="active ? 'one_class common' : 't_class common'">1</div>
-          <div :class="active ? 'two_class' : 'w_class'">基本属性&商品描述</div>
-        </div>
-        <div class="line" />
-        <div class="stepsTwo common">
-          <div :class="active ? 't_class common' : 'one_class common'">2</div>
-          <div :class="active ? 'w_class' : 'two_class' ">基本属性&商品描述</div>
-        </div>
+      <div class="line" />
+      <div class="stepsTwo common">
+        <div :class="active ? 't_class common' : 'one_class common'">2</div>
+        <div :class="active ? 'w_class' : 'two_class' ">商品描述</div>
       </div>
-    </el-card>
+    </div>
     <!-- 商品 -->
     <div class="addCom common">
       <div v-if="active">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="padding:10px 20px;">
-          <div class="leftCom">
-            <el-form-item label="商品名称" prop="productName">
-              <el-input v-model="form.productName" maxlength="50" show-word-limit />
-            </el-form-item>
-            <el-form-item label="卖点简介">
-              <el-input v-model="form.productBrief" maxlength="50" show-word-limit />
-            </el-form-item>
-            <el-form-item>
-              <Tinymce v-if="showTinymce" ref="content" v-model="form.productText" class="tinymce-wrap" :height="200" />
-            </el-form-item>
-          </div>
-          <div class="rightCom">
-            <el-form-item label="官方分类" prop="classifyId">
-              <el-cascader
-                v-model="form.classifyId"
-                :options="classifyList"
-                clearable
-                :props="{
-                  checkStrictly: false,
-                  label:'categoryName',
-                  value:'id',
-                  children:'childs'
-                }"
-                @change="handleChangeCascader"
-              />
-            </el-form-item>
-
-            <el-form-item label="商品分组" prop="shopGroupId">
-              <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
-                <el-option
-                  v-for="(item,index) in groupList"
-                  :key="index"
-                  :label="item.groupName"
-                  :value="item.shopGroupId"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="品牌">
-              <el-select
-                v-model="form.brandId"
-                clearable
-                placeholder="请选择品牌"
-              >
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.id"
-                  :label="item.brandName"
-                  :value="item.id"
+          <el-form-item label="商品名称" prop="productName">
+            <el-input v-model="form.productName" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="官方分类" prop="classifyId">
+                <el-cascader
+                  v-model="form.classifyId"
+                  :options="classifyList"
+                  clearable
+                  :props="{
+                    checkStrictly: false,
+                    label:'categoryName',
+                    value:'id',
+                    children:'childs'
+                  }"
+                  style="width: 100%"
+                  @change="handleChangeCascader"
                 />
-              </el-select>
-            </el-form-item>
-            <el-form-item class="form-item-long" label="供应商">
-              <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
-            </el-form-item>
-            <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
-              <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
-            </el-form-item>
-            <el-form-item label="需要物流" prop="ifLogistics">
-              <el-radio-group v-model="form.ifLogistics">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="上架状态" prop="shelveState">
-              <el-radio-group v-model="form.shelveState">
-                <el-radio :label="1">上架</el-radio>
-                <el-radio :label="0">下架</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="允许超卖" prop="ifOversold">
-              <el-radio-group v-model="form.ifOversold">
-                <el-radio :label="1">允许</el-radio>
-                <el-radio :label="0">不允许</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="积分兑换" prop="ifCredit">
-              <el-radio-group v-model="form.ifCredit">
-                <el-radio :label="1">允许</el-radio>
-                <el-radio :label="0">不允许</el-radio>
-              </el-radio-group>
-              <p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
-            </el-form-item>
-            <el-form-item v-if="form.ifCredit" class="form-item-long" label="单笔最大抵扣" prop="creditLimit">
-              <!-- <el-input v-model="form.creditLimit" type="number" placeholder="请输入单笔最大抵扣" /> -->
-              <el-input-number v-model="form.creditLimit" :controls="false" :min="0" :precision="0" placeholder="请输入单笔最大抵扣" />
-              <p style="color: #cf0f0f; height: 25px; line-height: 25px;margin-top: 10px">限制一笔订单中该商品最多抵扣多少积分</p>
-              <p style="color: #cf0f0f; height: 25px; line-height: 25px">( 注：1积分 = {{ integralProportion }}元 请输入整数 )</p>
-            </el-form-item>
-          <!--            <el-form-item label="花呗分期">-->
-          <!--              <el-radio-group v-model="form.ifHuabei">-->
-          <!--                <el-radio :label="1">支持</el-radio>-->
-          <!--                <el-radio :label="0">不支持</el-radio>-->
-          <!--              </el-radio-group>-->
-          <!--            </el-form-item>-->
-          </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商品分组" prop="shopGroupId">
+                <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable style="width: 100%">
+                  <el-option
+                    v-for="(item,index) in groupList"
+                    :key="index"
+                    :label="item.groupName"
+                    :value="item.shopGroupId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="品牌">
+                <el-select
+                  v-model="form.brandId"
+                  clearable
+                  placeholder="请选择品牌"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.id"
+                    :label="item.brandName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="form-item-long" label="供应商">
+                <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
+                <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="需要物流" prop="ifLogistics">
+                <el-radio-group v-model="form.ifLogistics">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="上架状态" prop="shelveState">
+                <el-radio-group v-model="form.shelveState">
+                  <el-radio :label="1">上架</el-radio>
+                  <el-radio :label="0">下架</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="允许超卖" prop="ifOversold">
+                <el-radio-group v-model="form.ifOversold">
+                  <el-radio :label="1">允许</el-radio>
+                  <el-radio :label="0">不允许</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+           
+          </el-row>
+          <el-form-item label="卖点简介">
+            <el-input v-model="form.productBrief" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-form-item>
+            <Tinymce v-if="showTinymce" ref="content" v-model="form.productText" class="tinymce-wrap" :height="200" />
+          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="积分兑换" prop="ifCredit">
+                <el-radio-group v-model="form.ifCredit">
+                  <el-radio :label="1">允许</el-radio>
+                  <el-radio :label="0">不允许</el-radio>
+                </el-radio-group>
+                <p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="form.ifCredit">
+              <el-form-item class="form-item-long" label="单笔最大抵扣" prop="creditLimit">
+                <el-input-number v-model="form.creditLimit" :controls="false" :min="0" :precision="0" placeholder="请输入单笔最大抵扣" />
+                <p style="color: #cf0f0f; height: 25px; line-height: 25px;margin-top: 10px">限制一笔订单中该商品最多抵扣多少积分</p>
+                <p style="color: #cf0f0f; height: 25px; line-height: 25px">( 注：1积分 = {{ integralProportion }}元 请输入整数 )</p>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
         </el-form>
       </div>
-      <div v-if="!active" class="centerCom">
+      <div v-if="!active" style="width: 100%;">
         <el-form ref="form" :model="params" label-width="80px">
           <StyleInformation :form="params" />
         </el-form>
@@ -144,6 +145,12 @@
     >
       <img width="100%" :src="dialogImageUrl" alt>
     </el-dialog>
+    <div style="padding: 20px;">
+      <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
+      <el-button v-if="active"  style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
+      <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="save">保存</el-button>
+      <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
+    </div>
   </div>
 </template>
 
@@ -161,7 +168,7 @@ import {
   getSelect
 } from '@/api/account';
 import { uploadUrl } from '@/utils/request'
-import StyleInformation from './addComponent'
+import StyleInformation from '@/views/commodity/commoditySystem/addComponent'
 export default {
   components: {
     Tinymce,
@@ -634,6 +641,9 @@ export default {
 .stepsColor{
   font-size: 20px;
   line-height: 40px;
+  width: 50%;
+  margin: 0 auto;
+  padding: 15px 0;
   .one_class {
     width: 40px;
     background: #3F9B6A;
@@ -671,9 +681,11 @@ export default {
   margin: 10px 0;
   justify-content: space-around;
   align-items: unset;
-  width: 100%;
+  // width: 100%;
+  padding:0 20px;
+  
   .el-form{
-    display: flex;
+    //  display: flex;
     padding: 0px 10px 10px;
   }
   .leftCom {
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
index baab9e8..fd78335 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
@@ -1,41 +1,37 @@
 <template>
   <div class="style-information-component">
-    <el-form-item label="商品图片" />
-    <div class="upload-wrap">
-      <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
-                    @changimg="e=>changimg(e,'imgs')"></upimg>
-      <!-- <el-upload
-        list-type="picture-card"
-        :on-preview="handlePictureCardPreview"
-        :on-remove="handleRemove"
-        :headers="headers"
-        :data="dataObj"
-        :file-list="form.imgs"
-        :limit="20"
-        :on-success="handleImageSuccess"
-        :action="action"
-      >
-        <i slot="default" class="el-icon-plus" />
-        <div slot="file" slot-scope="{ file }">
-          <img class="el-upload-list__item-thumbnail" :src="file.imgPath">
-          <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-              <i class="el-icon-zoom-in" />
-            </span>
-            <span class="el-upload-list__item-delete" @click="handleRemove(file)">
-              <i class="el-icon-delete" />
+    <el-form-item label="商品图片" >
+      <div class="upload-wrap">
+        <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
+                      @changimg="e=>changimg(e,'imgs')"></upimg>
+        <!-- <el-upload
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :headers="headers"
+          :data="dataObj"
+          :file-list="form.imgs"
+          :limit="20"
+          :on-success="handleImageSuccess"
+          :action="action"
+        >
+          <i slot="default" class="el-icon-plus" />
+          <div slot="file" slot-scope="{ file }">
+            <img class="el-upload-list__item-thumbnail" :src="file.imgPath">
+            <span class="el-upload-list__item-actions">
+              <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                <i class="el-icon-zoom-in" />
+              </span>
+              <span class="el-upload-list__item-delete" @click="handleRemove(file)">
+                <i class="el-icon-delete" />
+              </span>
             </span>
-          </span>
-        </div>
-      </el-upload> -->
-    </div>
-    <el-form-item label="款式设置">
-      <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
-        <el-radio :label="0">单款式</el-radio>
-        <el-radio :label="1">多款式</el-radio>
-      </el-radio-group>
+          </div>
+        </el-upload> -->
+      </div>
     </el-form-item>
-    <div class="style-container">
+    <el-form-item label="规格设置">
+      <div class="style-container" >
       <div v-if="form.attrStyle === 0" class="single-style">
         <el-table
           :data="skuList"
@@ -137,61 +133,17 @@
           </el-form-item>
         </div>
         <el-button class="add-attr-btn" type="primary" @click="addSkuAttrList">添加规格</el-button>
-        <el-table
-          :data="skuList"
-          style="width: 100%"
-         :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-        >
-          <el-table-column
-            v-for="(skuAttr, index) in skuAttrName"
-            :key="index"
-            :label="skuAttr.skuName"
-          >
-            <template slot-scope="scope">
-              {{
-                scope.row.skuAttrCodeDTOList &&
-                  scope.row.skuAttrCodeDTOList[index]
-                  | attrValueFilter(form.skuAttrList)
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column label="售价">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
-              <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
-            </template>
-          </el-table-column>
-          <el-table-column label="原价">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
-              <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
-            </template>
-          </el-table-column>
-          <el-table-column label="库存">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.stockNumber" type="number" oninput="value=value.replace(/[^\d]/g,'')" /> -->
-              <el-input-number v-model="scope.row.stockNumber" :controls="false" :min="0" :precision="0" />
-            </template>
-          </el-table-column>
-          <el-table-column label="重量(KG)">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.weight" type="number" oninput="value=value.replace(/-/, '')" /> -->
-              <el-input-number v-model="scope.row.weight" :controls="false" :min="0" :precision="6" :step="0.01" />
-            </template>
-          </el-table-column>
-          <el-table-column label="国际条码">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.sku" />
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" @click="delAttrValue(scope.row,scope.$index,scope.row,scope)">删除</el-button>
-            </template>
-          </el-table-column> -->
-        </el-table>
+
       </div>
     </div>
+    </el-form-item>
+    <!-- <el-form-item label="款式设置" >
+      <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
+        <el-radio :label="0">单款式</el-radio>
+        <el-radio :label="1">多款式</el-radio>
+      </el-radio-group>
+    </el-form-item> -->
+
     <el-dialog
       :append-to-body="true"
       :visible.sync="dialogVisible"
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/index copy.vue b/merchant-web-master/src/views/commodity/commoditySystem/index copy.vue
new file mode 100644
index 0000000..abea067
--- /dev/null
+++ b/merchant-web-master/src/views/commodity/commoditySystem/index copy.vue
@@ -0,0 +1,776 @@
+<!--  -->
+<template>
+  <div style="padding: 0 10px;background-color:#f7f7f7;">
+    <div class="tab_show">
+      <!-- 搜索 -->
+      <div class="formSearch">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item label="商品名称">
+            <el-input v-model="formInline.search" placeholder="请输入商品名称" style="width:168px"/>
+          </el-form-item>
+          <el-form-item label="上架状态">
+            <el-select v-model="formInline.shelveState" placeholder="请选择上架状态" style="width:168px">
+              <el-option label="全部" :value="null" />
+              <el-option label="上架" value="1" />
+              <el-option label="下架" value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="官方分类">
+            <el-cascader
+              v-model="formInline.classifyId"
+              :options="categoryList"
+              clearable
+              :props="{
+                checkStrictly: true,
+                expandTrigger: 'hover',
+                label:'categoryName',
+                value:'id',
+                children:'childs'
+              }"
+            />
+          </el-form-item>
+
+        </el-form>
+        <div style="width:20%">
+          <el-button   @click="search" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
+          <el-button  @click="clear" class="buttonHover"
+                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
+
+        </div>
+      </div>
+      <div style="margin-bottom:20px;">
+        <el-button   @click="add" style="background-color: #3F9B6A;color: #fff;">新增商品</el-button>
+        <el-button   @click="sends" style="background-color: #3F9B6A;color: #fff;">批量导入</el-button>
+        <el-button   @click="productDataExport" style="background-color: #3F9B6A;color: #fff;">导出商品</el-button>
+      </div>
+      <!-- 表格 -->
+      <div class="tableBox">
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+
+          tooltip-effect="dark"
+           @selection-change="handleSelectionChange"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+        >
+        <!-- <el-table-column
+            type="selection"
+            v-if="teble_sel"
+            min-width="4%">
+          </el-table-column> -->
+          <el-table-column prop="productId" label="商品id" show-overflow-tooltip />
+          <el-table-column label="商品主图" width="150" align="center">
+            <template slot-scope="scope">
+              <img height="80" width="80" :src="$baseURL+msgList(scope.row.productImage)" alt srcset>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productName" label="商品名称" width="220" />
+          <el-table-column prop="section" label="售价区间" show-overflow-tooltip />
+          <el-table-column prop="memberSection" label="会员价" show-overflow-tooltip />
+          <el-table-column prop="ifCredit" label="积分兑换" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="scope.row.ifCredit == 1">允许</span>
+              <span v-if="scope.row.ifCredit == 0">不允许</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="stockNumber" label="库存" show-overflow-tooltip />
+          <el-table-column prop="volume" label="销量" show-overflow-tooltip />
+          <el-table-column prop="volume" label="上架状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="scope.row.shelveState==0">未上架</span>
+              <span v-if="scope.row.shelveState==1">已上架</span>
+              <span v-if="scope.row.shelveState==2">待审核</span>
+              <span v-if="scope.row.shelveState==3">审核失败</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
+          <el-table-column :formatter="row=>getBrandName(row)" label="品牌" show-overflow-tooltip />
+          <el-table-column prop="createTime" label="创建时间" width="180" />
+          <el-table-column label="操作" width="180" fixed="right">
+            <template slot-scope="scope">
+              <div class="btnList">
+                 <div @click="edit(scope.row)" class="tableBtn greens" >编辑</div>
+                 <div @click="down(scope.row)" v-if="scope.row.shelveState==0" class="tableBtn greens" >上架</div>
+                 <div @click="down(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >下架</div>
+                 <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >设置会员价</div>
+                 <div @click="del(scope.row)" v-if="scope.row.shelveState!=1" class="tableBtn greens" >删除</div>
+
+               <!-- <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.shelveState==0" type="text" @click="down(scope.row)">上架</el-button>
+                <el-button v-if="scope.row.shelveState==1" type="text" @click="down(scope.row)">下架</el-button>
+                <el-button v-if="scope.row.shelveState==1" type="text" @click="setVipPrice(scope.row)">设置会员价</el-button>
+                <el-button v-if="scope.row.shelveState!=1" type="text" @click="del(scope.row)">删除</el-button> -->
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination
+            :current-page="formInline.page"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="10"
+            background
+            layout="prev, pager, next,total"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+
+      </div>
+    </div>
+    <!-- 批量导入 -->
+    <el-dialog
+      title="批量导入商品"
+      :visible.sync="batchAdd"
+      :close-on-click-modal="false"
+      center
+      width="400px"
+    >
+      <div class="uploadDialog">
+        <el-upload
+          drag
+          :limit="1"
+          :auto-upload="false"
+          accept=".xlsx"
+          :headers="headers"
+          :action="UploadUrl"
+          :before-upload="beforeUploadFile"
+          :on-change="fileChange"
+          :on-remove="batchRemove"
+          :on-exceed="exceedFile"
+          :on-success="handleSuccess"
+          :on-error="handleError"
+          :file-list="batchFileList"
+        >
+          <i class="el-icon-upload" />
+          <div class="el-upload__text">
+            <em style="color:#3F9B6A;">点击上传</em>
+          </div>
+          <div slot="tip" class="el-upload__tip">只能上传xlsx文件，且不超过10M</div>
+          <div slot="tip" class="el-upload__tip">
+            上传前不知道excel模板的，请点击
+            <span class="clickMe" @click="poDownload">点我下载模板</span> 去下载
+          </div>
+        </el-upload>
+        <br>
+        <el-button size="small" type="primary" @click="uploadFile">立即上传</el-button>
+      </div>
+    </el-dialog>
+    <!-- 设置会员价弹窗 -->
+    <el-dialog
+      title="设置会员价"
+      :visible.sync="vipPriceVisible"
+      width="50%"
+      class="vipDialog"
+    >
+      <el-form ref="form" label-width="80px">
+        <el-form-item label="优惠方式">
+          <el-radio-group v-model="mode" @change="modeChange">
+            <el-radio :label="1">折扣</el-radio>
+            <!-- <el-radio :label="2">指定价格</el-radio> -->
+          </el-radio-group>
+        </el-form-item>
+        <div class="priceTable">
+          <table>
+            <tr>
+              <th>规格</th>
+              <th>售价</th>
+              <th v-for="(item,index) in gradeList" :key="index">
+                {{ item }}
+              </th>
+            </tr>
+            <tr v-for="(item,index) in productData" :key="index">
+              <td>
+                {{ item.value }}
+              </td>
+              <td>
+                {{ item.price }}
+              </td>
+              <td v-for="(itemJ,indexJ) in item.memberPrices" :key="indexJ" class="td-input">
+                <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?'折':'元' }}
+              </td>
+            </tr>
+          </table>
+        </div>
+        <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="vipPriceVisible = false" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+        <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 新增/修改商品弹窗 -->
+    <el-dialog
+      :title="!commId ? '新增商品' : '编辑商品'"
+      :visible.sync="commidyVisible"
+     custom-class="bian_css"  width="70%"
+      center
+      top="6vh"
+      :close-on-click-modal="false"
+      @before-close="closeModal"
+      @close="closeModal"
+    >
+      <CommAdd
+        ref="child"
+        :show-tinymce="showTinymce"
+        :product-id="commId"
+        @cancel="cancelForm"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import CommAdd from '@/views/commodity/commoditySystem/addCommodity.vue'
+import { getBtnList, getToken } from '@/utils/auth'
+import { uploadUrl } from '@/utils/request'
+import {
+  getClassifyGetAll,
+  getClassifyDelete,
+  getClassifyStart,
+  downloadTemplate,
+  importProduct,
+  getClassify,
+  getProductMembers,
+  setProductMember,
+  clearProductMember,
+  productExport,
+  getBrandList
+} from '@/api/commodity'
+export default {
+  components: {
+    CommAdd
+  },
+  data() {
+    // 这里存放数据
+    return {
+      showTinymce: false,
+      btnList: '',
+      activeName: 'first',
+      formInline: {
+        search: '', // 搜索字段
+        shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
+        stock: '', // 库存状态 1-有库存 0-无库存 null-全部
+        classifyId: '', // 最下级分类id
+        page: 1, // 当前页
+        pageSize: 10
+      },
+      batchAdd: false,
+      batchFileList: [],
+      total: 1,
+      tableData: [],
+      categoryList: [],
+      UploadUrl: uploadUrl,
+      headers: {
+        'Authorization-business': getToken()
+      },
+      vipPriceVisible: false,
+      productId: 0,
+      mode: 1,
+      productData: [],
+      gradeList: [],
+      commidyVisible: false,
+      commId: 0,
+      brandList: [],
+      teble_sel:false,
+      canst:'' //组合商品ID
+    }
+  },
+  computed: {
+    getBrandName() {
+      return (row) => {
+        const find = this.brandList.find(item => item.id === row.brandId);
+        if (find) return find.brandName
+        return '-'
+      }
+    }
+  },
+  mounted() {
+    this.getBrandList()
+    this.getAll(this.formInline)
+    this.queryAllCategory()
+    this.btnList = getBtnList()
+  },
+  // 方法集合
+  methods: {
+    msgList(list){
+      if(list && list!=''){
+        let strin = list.split(',')
+        return strin[0]
+      }
+    },
+    async getBrandList() {
+      const { data } = await getBrandList()
+      this.brandList = data
+    },
+    cancelForm() {
+      this.commidyVisible = false
+      this.formInline = {
+        search: '',
+        shelveState: '',
+        stock: '',
+        classifyId: '',
+        page: 1,
+        pageSize: 10
+      }
+      this.getAll(this.formInline)
+      this.closeModal()
+    },
+    closeModal() {
+      this.showTinymce = false
+      this.$refs.child.last()
+      this.$refs.child.reset()
+    },
+    btnClick(id) {
+      if (id.permissionName === '批量导入') {
+        this.sends()
+      } else if (id.permissionName === '新增商品') {
+        this.add()
+      }
+    },
+    handleSizeChange(val) {
+      this.formInline.pageSize = val
+      this.getAll(this.formInline)
+    },
+    handleCurrentChange(val) {
+      this.formInline.page = val
+      this.getAll(this.formInline)
+    },
+    //  查询
+    search() {
+      this.total = 1
+      this.formInline.page = 1
+      this.getAll(this.formInline)
+    },
+    // 重置
+    clear() {
+      this.formInline = {
+        search: '', // 搜索字段
+        shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
+        stock: '', // 库存状态 1-有库存 0-无库存 null-全部
+        classifyId: '', // 最下级分类id
+        page: 1, // 当前页
+        pageSize: 10
+      }
+    },
+    // 新增商品
+    add() {
+      this.showTinymce = true
+      if (this.commId) {
+        this.$refs.child.reset()
+      }
+      this.commidyVisible = true
+      this.commId = 0
+      // this.$router.push({ name: 'addCommodity', params: { id: '1' }})
+    },
+    // 导出商品
+    async productDataExport() {
+      this.$message({
+        message: '数据导出中，请勿重复操作！',
+        type: 'success'
+      })
+      const res = await productExport(this.formInline)
+      if (!res) { return }
+      const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+      const fileName = '商品数据明细表.xls'
+      if ('download' in document.createElement('a')) {
+        // 非IE下载
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.href = URL.createObjectURL(blob)
+        elink.style.display = 'none'
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href) // 释放URL 对象
+        document.body.removeChild(elink)
+      } else {
+        // IE10+下载
+        navigator.msSaveBlob(blob, fileName)
+      }
+    },
+    // 批量导入
+    sends() {
+      this.batchAdd = true
+      this.batchFileList = []
+    },
+    // 编辑商品
+    edit(row) {
+      this.showTinymce = true
+      this.commidyVisible = true
+      this.commId = row.productId
+      this.$nextTick(() => {
+        this.$refs.child?.details()
+      })
+      // this.$router.push({
+      //   name: 'addCommodity',
+      //   params: { productId: row.productId }
+      // })
+      // let res = await getClassifyGetById({ productId: row.productId });
+      // console.log(res);
+    },
+    // 设置会员价
+    setVipPrice(row) {
+      var _ = this
+      this.productId = row.productId
+      getProductMembers({ productId: row.productId }).then(res => {
+		  console.log(res,'11231312312312')
+        if (res.code === '') {
+          _.productData = res.data
+          if (_.productData && _.productData.length > 0) {
+            _.gradeList = []
+            const _memberPrices = _.productData[0].memberPrices
+            _memberPrices.forEach(function(item, i) {
+              _.gradeList.push(item.memberLevelName)
+            })
+            _.mode = _.productData[0].mode ? _.productData[0].mode : 1
+            _.vipPriceVisible = true
+          }
+        }
+      })
+    },
+    // 设置会员价提交
+    vipPriceSubmit() {
+      for (let i = 0; i < this.productData.length; i++) {
+        this.productData[i].mode = this.mode
+        for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
+          this.productData[i].memberPrices[j].mode = this.mode
+          var _price = this.productData[i].memberPrices[j].price
+          if (!_price) {
+            this.$message({
+              type: 'warning',
+              message: '会员价格不能为空！'
+            })
+            return false
+          } else if (this.productData[i].mode === 1) {
+            if (_price <= 0 || _price >= 10) {
+              this.$message({
+                type: 'warning',
+                message: '会员折数必须大于0小于10！'
+              })
+              return false
+            }
+          } else if (this.productData[i].mode === 2) {
+            if (_price > this.productData[i].price) {
+              this.$message({
+                type: 'warning',
+                message: '会员价格不能大于原价！'
+              })
+              return false
+            }
+          }
+        }
+      }
+      setProductMember({ productId: this.productId, members: this.productData }).then(res => {
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '设置成功!'
+          })
+          this.getAll(this.formInline)
+          this.vipPriceVisible = false
+        }
+      })
+    },
+    // 清空会员价
+    clearProductMember() {
+      console.log(this.productData, 'this.productData')
+      this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        clearProductMember({ productId: this.productId }).then(res => {
+          if (res.code === '') {
+            this.productData.map(item => {
+              item.memberPrices.map(itemChild => {
+                itemChild.price = null
+              })
+            })
+            this.$message.success('清除成功')
+            // this.vipPriceVisible = false
+          }
+        })
+      })
+    },
+    // 删除商品
+    del(row) {
+      this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          getClassifyDelete({ productId: row.productId }).then(res => {
+            if (res.code === '') {
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getAll(this.formInline)
+            }
+          })
+        })
+        .catch(() => {})
+    },
+    // 商品上下架
+    async down(row) {
+      console.log(row.shelveState)
+      if (row.shelveState) {
+        console.log(111)
+        const res = await getClassifyStart({
+          productId: row.productId,
+          shelveState: 0
+        })
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '下架成功!'
+          })
+          this.getAll(this.formInline)
+        }
+      } else {
+        const res = await getClassifyStart({
+          productId: row.productId,
+          shelveState: 1
+        })
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '上架成功!'
+          })
+          this.getAll(this.formInline)
+        }
+      }
+    },
+    // 初始化查询所有数据
+    async getAll(formInline) {
+      this.formInline.classifyId =
+        this.formInline.classifyId[2] ||
+        this.formInline.classifyId[1] ||
+        this.formInline.classifyId[0] ||
+        this.formInline.classifyId
+      const res = await getClassifyGetAll(formInline)
+      this.total = res.data.total
+      this.tableData = res.data.list
+      console.log(this.tableData)
+    },
+    // 初始化查询所有分类
+    async queryAllCategory() {
+      const res = await getClassify()
+      this.categoryList = res.data
+      this.handleRemoveEmptyChild(this.categoryList)
+    },
+    handleRemoveEmptyChild(arr) {
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].childs && Array.isArray(arr[i].childs)) {
+          this.handleRemoveEmptyChild(arr[i].childs)
+        }
+        if (arr[i].childs && Array.isArray(arr[i].childs) && arr[i].childs.length === 0) {
+          delete arr[i].childs
+        }
+      }
+    },
+    // *********************导入部分
+    UploadUrls: function() {
+      // 因为action参数是必填项，我们使用二次确认进行文件上传时，直接填上传文件的url会因为没有参数导致api报404，所以这里将action设置为一个返回为空的方法就行，避免抛错
+      return ''
+    },
+    // 下载模板
+    poDownload() {
+      downloadTemplate().then(res => {
+        console.log(res, 1111)
+        // const content = res
+        const blob = new Blob([res])
+        const fileName = '批量导入商品模板.xlsx'
+        if ('download' in document.createElement('a')) {
+          // 非IE下载
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'none'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href) // 释放URL 对象
+          document.body.removeChild(elink)
+        } else {
+          // IE10+下载
+          navigator.msSaveBlob(blob, fileName)
+        }
+      })
+    },
+    // 导入
+    uploadFile() {
+      if (this.batchFileList.length === 0) {
+        this.$message.warning('请上传文件')
+      } else {
+        const formDate = new FormData()
+        formDate.append('file', this.batchFileList[0])
+        console.log(formDate.get('file'))
+        importProduct(formDate).then(res => {
+          console.log(res)
+          if (res.code === '') {
+            this.$message.success('导入成功')
+            this.batchAdd = false
+            this.batchFileList = []
+            this.getAll(this.formInline)
+          }
+        })
+      }
+    },
+    // 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
+    beforeUploadFile(file) {
+      console.log('before upload')
+      console.log(file)
+      const extension = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const size = file.size / 1024 / 1024
+      if (extension !== 'xlsx') {
+        this.$message.warning('只能上传后缀是.xlsx的文件')
+      }
+      if (size > 10) {
+        this.$message.warning('文件大小不得超过10M')
+      }
+    },
+    // 文件状态改变时的钩子
+    fileChange(file, batchFileList) {
+      console.log(file.raw)
+      this.batchFileList.push(file.raw)
+      console.log(this.batchFileList)
+    },
+    batchRemove(file, batchFileList) {
+      this.batchFileList = []
+    },
+    // 文件超出个数限制时的钩子
+    exceedFile(files, batchFileList) {
+      this.$message.warning(`只能选择1个文件`)
+    },
+    // 文件上传成功时的钩子
+    handleSuccess(res, file, batchFileList) {
+      this.$message.success('文件上传成功')
+    },
+    // 文件上传失败时的钩子
+    handleError() {
+      this.$message.error('文件上传失败')
+    },
+    // 切换优惠方式清除内容
+    modeChange() {
+      this.productData.forEach(item => {
+        item.memberPrices.forEach(itemJ => {
+          itemJ.price = ''
+        })
+      })
+    },
+    handleSelectionChange(val) {
+           console.log(val)
+           let zuheId = ''
+           for(let i=0;i<val.length;i++){
+               zuheId += val[i].productId + ','
+           }
+           this.canst = zuheId
+          }
+  }
+}
+</script>
+<style lang='scss' scoped>
+//@import url(); 引入公共css类
+@import url("../../../styles/elDialog.scss");
+::v-deep .bian_css{
+      margin:auto;
+       max-height:840px;
+       overflow-y: auto;
+        .el-dialog__body {
+          padding: 0px;
+          background-color: #fff;
+        }
+        .el-dialog__header {
+          background-color: #fff;
+         padding:10px 20px 10px 20px;
+          border-bottom: 1px solid #EFEFEF;
+        }
+        .el-dialog__title {
+         font-size: 14px;
+         color: #000000e6;
+        }
+        .el-date-table td.available:hover{
+          background-color:#3F9B6A;
+        }
+      .el-date-table td.start-date span{
+          background-color:#3F9B6A;
+        }
+      }
+.tab_show {
+  padding: 0 20px 20px 20px;
+  background-color:#fff;
+}
+.fenye {
+  margin-top: 20px;
+  display: flex;
+  justify-content: flex-end;
+  position: relative;
+}
+  ::v-deep .el-pagination__total {
+    position: absolute;
+    left: 10px;
+  }
+  .formSearch {
+      display: flex;
+      width: 100%;
+      font-size: 14px;
+      justify-content: space-between;
+    }
+
+.uploadDialog{
+  // display: flex;
+  // flex-direction: column;
+  // justify-content: center;
+  >>>.el-upload__tip{
+    display: inline-block;
+    width: 360px;
+    margin: auto;
+  }
+}
+.vipDialog{
+  .priceTable{
+    table{
+      width: 100%;
+      text-align: center;
+      border-left: 1px solid #EBEEF5;
+      border-bottom: 1px solid #EBEEF5;
+      font-size: 14px;
+      color: #606266;
+      border-collapse: collapse;
+      tr{
+        border-top: 1px solid #EBEEF5;
+        th{
+          padding: 12px 0;
+          background: #F2F3F5;
+          color: #0009;
+          border-right: 1px solid #F2F3F5;
+        }
+        td{
+          padding: 12px 0;
+          border-right: 1px solid #EBEEF5;
+          &.td-input{
+            .el-input{
+              width: 80px;
+              margin-right: 0;
+            }
+          }
+          &:nth-child(1),&:nth-child(2){
+            width: 80px;
+          }
+          .el-input{
+            width: 100px;
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+  .clearBtn{
+    margin-top: 20px;
+  }
+}
+
+</style>
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/index.vue b/merchant-web-master/src/views/commodity/commoditySystem/index.vue
index abea067..44dc662 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/index.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/index.vue
@@ -1,12 +1,12 @@
 <!--  -->
 <template>
   <div style="padding: 0 10px;background-color:#f7f7f7;">
-    <div class="tab_show">
+    <div class="tab_show" v-if ="ontype == '1'">
       <!-- 搜索 -->
       <div class="formSearch">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item label="商品名称">
-            <el-input v-model="formInline.search" placeholder="请输入商品名称" style="width:168px"/>
+            <el-input v-model="formInline.search" placeholder="请输入商品名称" style="width:168px" />
           </el-form-item>
           <el-form-item label="上架状态">
             <el-select v-model="formInline.shelveState" placeholder="请选择上架状态" style="width:168px">
@@ -16,44 +16,33 @@
             </el-select>
           </el-form-item>
           <el-form-item label="官方分类">
-            <el-cascader
-              v-model="formInline.classifyId"
-              :options="categoryList"
-              clearable
-              :props="{
+            <el-cascader v-model="formInline.classifyId" :options="categoryList" clearable :props="{
                 checkStrictly: true,
                 expandTrigger: 'hover',
                 label:'categoryName',
                 value:'id',
                 children:'childs'
-              }"
-            />
+              }" />
           </el-form-item>
 
         </el-form>
         <div style="width:20%">
-          <el-button   @click="search" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
-          <el-button  @click="clear" class="buttonHover"
-                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
+          <el-button @click="search" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
+          <el-button @click="clear" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
 
         </div>
       </div>
       <div style="margin-bottom:20px;">
-        <el-button   @click="add" style="background-color: #3F9B6A;color: #fff;">新增商品</el-button>
-        <el-button   @click="sends" style="background-color: #3F9B6A;color: #fff;">批量导入</el-button>
-        <el-button   @click="productDataExport" style="background-color: #3F9B6A;color: #fff;">导出商品</el-button>
+        <el-button @click="add" style="background-color: #3F9B6A;color: #fff;">新增商品</el-button>
+        <el-button @click="sends" style="background-color: #3F9B6A;color: #fff;">批量导入</el-button>
+        <el-button @click="productDataExport" style="background-color: #3F9B6A;color: #fff;">导出商品</el-button>
       </div>
       <!-- 表格 -->
       <div class="tableBox">
-        <el-table
-          ref="multipleTable"
-          :data="tableData"
-
-          tooltip-effect="dark"
-           @selection-change="handleSelectionChange"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-        >
-        <!-- <el-table-column
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" @selection-change="handleSelectionChange"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <!-- <el-table-column
             type="selection"
             v-if="teble_sel"
             min-width="4%">
@@ -89,13 +78,13 @@
           <el-table-column label="操作" width="180" fixed="right">
             <template slot-scope="scope">
               <div class="btnList">
-                 <div @click="edit(scope.row)" class="tableBtn greens" >编辑</div>
-                 <div @click="down(scope.row)" v-if="scope.row.shelveState==0" class="tableBtn greens" >上架</div>
-                 <div @click="down(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >下架</div>
-                 <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >设置会员价</div>
-                 <div @click="del(scope.row)" v-if="scope.row.shelveState!=1" class="tableBtn greens" >删除</div>
+                <div @click="edit(scope.row)" class="tableBtn greens">编辑</div>
+                <div @click="down(scope.row)" v-if="scope.row.shelveState==0" class="tableBtn greens">上架</div>
+                <div @click="down(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens">下架</div>
+                <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens">设置会员价</div>
+                <div @click="del(scope.row)" v-if="scope.row.shelveState!=1" class="tableBtn greens">删除</div>
 
-               <!-- <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+                <!-- <el-button type="text" @click="edit(scope.row)">编辑</el-button>
                 <el-button v-if="scope.row.shelveState==0" type="text" @click="down(scope.row)">上架</el-button>
                 <el-button v-if="scope.row.shelveState==1" type="text" @click="down(scope.row)">下架</el-button>
                 <el-button v-if="scope.row.shelveState==1" type="text" @click="setVipPrice(scope.row)">设置会员价</el-button>
@@ -105,44 +94,19 @@
           </el-table-column>
         </el-table>
         <div class="fenye">
-          <el-pagination
-            :current-page="formInline.page"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-            background
-            layout="prev, pager, next,total"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
+            layout="prev, pager, next,total" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
         </div>
 
       </div>
     </div>
     <!-- 批量导入 -->
-    <el-dialog
-      title="批量导入商品"
-      :visible.sync="batchAdd"
-      :close-on-click-modal="false"
-      center
-      width="400px"
-    >
+    <el-dialog title="批量导入商品" :visible.sync="batchAdd" :close-on-click-modal="false" center width="400px">
       <div class="uploadDialog">
-        <el-upload
-          drag
-          :limit="1"
-          :auto-upload="false"
-          accept=".xlsx"
-          :headers="headers"
-          :action="UploadUrl"
-          :before-upload="beforeUploadFile"
-          :on-change="fileChange"
-          :on-remove="batchRemove"
-          :on-exceed="exceedFile"
-          :on-success="handleSuccess"
-          :on-error="handleError"
-          :file-list="batchFileList"
-        >
+        <el-upload drag :limit="1" :auto-upload="false" accept=".xlsx" :headers="headers" :action="UploadUrl"
+          :before-upload="beforeUploadFile" :on-change="fileChange" :on-remove="batchRemove" :on-exceed="exceedFile"
+          :on-success="handleSuccess" :on-error="handleError" :file-list="batchFileList">
           <i class="el-icon-upload" />
           <div class="el-upload__text">
             <em style="color:#3F9B6A;">点击上传</em>
@@ -158,12 +122,7 @@
       </div>
     </el-dialog>
     <!-- 设置会员价弹窗 -->
-    <el-dialog
-      title="设置会员价"
-      :visible.sync="vipPriceVisible"
-      width="50%"
-      class="vipDialog"
-    >
+    <el-dialog title="设置会员价" :visible.sync="vipPriceVisible" width="50%" class="vipDialog">
       <el-form ref="form" label-width="80px">
         <el-form-item label="优惠方式">
           <el-radio-group v-model="mode" @change="modeChange">
@@ -188,589 +147,625 @@
                 {{ item.price }}
               </td>
               <td v-for="(itemJ,indexJ) in item.memberPrices" :key="indexJ" class="td-input">
-                <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?'折':'元' }}
+                <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" />
+                {{ mode==1?'折':'元' }}
               </td>
             </tr>
           </table>
         </div>
-        <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn"
+          @click="clearProductMember">清除所有旧会员价</el-button>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="vipPriceVisible = false" class="buttonHover"
-        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
         <el-button type="primary" @click="vipPriceSubmit">确 定</el-button>
       </span>
     </el-dialog>
     <!-- 新增/修改商品弹窗 -->
-    <el-dialog
-      :title="!commId ? '新增商品' : '编辑商品'"
-      :visible.sync="commidyVisible"
-     custom-class="bian_css"  width="70%"
-      center
-      top="6vh"
-      :close-on-click-modal="false"
-      @before-close="closeModal"
-      @close="closeModal"
-    >
-      <CommAdd
-        ref="child"
-        :show-tinymce="showTinymce"
-        :product-id="commId"
-        @cancel="cancelForm"
-      />
-    </el-dialog>
+    <!-- <el-dialog :title="!commId ? '新增商品' : '编辑商品'" :visible.sync="commidyVisible" custom-class="bian_css" width="70%"
+      center top="6vh" :close-on-click-modal="false" @before-close="closeModal" @close="closeModal">
+      <CommAdd ref="child" :show-tinymce="showTinymce" :product-id="commId" @cancel="cancelForm" />
+    </el-dialog> -->
+    <div v-if ="ontype == '2'" class="tab_show">
+     
+      <CommAdd v-if ="ontype == '2'" ref="child" :show-tinymce="showTinymce" :product-id="commId" @cancel="cancelForm" />
+    </div>
   </div>
 </template>
 
 <script>
-import CommAdd from '@/views/commodity/commoditySystem/addCommodity.vue'
-import { getBtnList, getToken } from '@/utils/auth'
-import { uploadUrl } from '@/utils/request'
-import {
-  getClassifyGetAll,
-  getClassifyDelete,
-  getClassifyStart,
-  downloadTemplate,
-  importProduct,
-  getClassify,
-  getProductMembers,
-  setProductMember,
-  clearProductMember,
-  productExport,
-  getBrandList
-} from '@/api/commodity'
-export default {
-  components: {
-    CommAdd
-  },
-  data() {
-    // 这里存放数据
-    return {
-      showTinymce: false,
-      btnList: '',
-      activeName: 'first',
-      formInline: {
-        search: '', // 搜索字段
-        shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
-        stock: '', // 库存状态 1-有库存 0-无库存 null-全部
-        classifyId: '', // 最下级分类id
-        page: 1, // 当前页
-        pageSize: 10
-      },
-      batchAdd: false,
-      batchFileList: [],
-      total: 1,
-      tableData: [],
-      categoryList: [],
-      UploadUrl: uploadUrl,
-      headers: {
-        'Authorization-business': getToken()
-      },
-      vipPriceVisible: false,
-      productId: 0,
-      mode: 1,
-      productData: [],
-      gradeList: [],
-      commidyVisible: false,
-      commId: 0,
-      brandList: [],
-      teble_sel:false,
-      canst:'' //组合商品ID
-    }
-  },
-  computed: {
-    getBrandName() {
-      return (row) => {
-        const find = this.brandList.find(item => item.id === row.brandId);
-        if (find) return find.brandName
-        return '-'
-      }
-    }
-  },
-  mounted() {
-    this.getBrandList()
-    this.getAll(this.formInline)
-    this.queryAllCategory()
-    this.btnList = getBtnList()
-  },
-  // 方法集合
-  methods: {
-    msgList(list){
-      if(list && list!=''){
-        let strin = list.split(',')
-        return strin[0]
-      }
+  import CommAdd from '@/views/commodity/commoditySystem/addCommodity.vue'
+  import {
+    getBtnList,
+    getToken
+  } from '@/utils/auth'
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  import {
+    getClassifyGetAll,
+    getClassifyDelete,
+    getClassifyStart,
+    downloadTemplate,
+    importProduct,
+    getClassify,
+    getProductMembers,
+    setProductMember,
+    clearProductMember,
+    productExport,
+    getBrandList
+  } from '@/api/commodity'
+  export default {
+    components: {
+      CommAdd
     },
-    async getBrandList() {
-      const { data } = await getBrandList()
-      this.brandList = data
-    },
-    cancelForm() {
-      this.commidyVisible = false
-      this.formInline = {
-        search: '',
-        shelveState: '',
-        stock: '',
-        classifyId: '',
-        page: 1,
-        pageSize: 10
+    data() {
+      // 这里存放数据
+      return {
+        ontype:'1',
+        showTinymce: false,
+        btnList: '',
+        activeName: 'first',
+        formInline: {
+          search: '', // 搜索字段
+          shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
+          stock: '', // 库存状态 1-有库存 0-无库存 null-全部
+          classifyId: '', // 最下级分类id
+          page: 1, // 当前页
+          pageSize: 10
+        },
+        batchAdd: false,
+        batchFileList: [],
+        total: 1,
+        tableData: [],
+        categoryList: [],
+        UploadUrl: uploadUrl,
+        headers: {
+          'Authorization-business': getToken()
+        },
+        vipPriceVisible: false,
+        productId: 0,
+        mode: 1,
+        productData: [],
+        gradeList: [],
+        commidyVisible: false,
+        commId: 0,
+        brandList: [],
+        teble_sel: false,
+        canst: '' //组合商品ID
       }
-      this.getAll(this.formInline)
-      this.closeModal()
     },
-    closeModal() {
-      this.showTinymce = false
-      this.$refs.child.last()
-      this.$refs.child.reset()
-    },
-    btnClick(id) {
-      if (id.permissionName === '批量导入') {
-        this.sends()
-      } else if (id.permissionName === '新增商品') {
-        this.add()
+    computed: {
+      getBrandName() {
+        return (row) => {
+          const find = this.brandList.find(item => item.id === row.brandId);
+          if (find) return find.brandName
+          return '-'
+        }
       }
     },
-    handleSizeChange(val) {
-      this.formInline.pageSize = val
+    mounted() {
+      this.getBrandList()
       this.getAll(this.formInline)
+      this.queryAllCategory()
+      this.btnList = getBtnList()
     },
-    handleCurrentChange(val) {
-      this.formInline.page = val
-      this.getAll(this.formInline)
-    },
-    //  查询
-    search() {
-      this.total = 1
-      this.formInline.page = 1
-      this.getAll(this.formInline)
-    },
-    // 重置
-    clear() {
-      this.formInline = {
-        search: '', // 搜索字段
-        shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
-        stock: '', // 库存状态 1-有库存 0-无库存 null-全部
-        classifyId: '', // 最下级分类id
-        page: 1, // 当前页
-        pageSize: 10
-      }
-    },
-    // 新增商品
-    add() {
-      this.showTinymce = true
-      if (this.commId) {
+    // 方法集合
+    methods: {
+      msgList(list) {
+        if (list && list != '') {
+          let strin = list.split(',')
+          return strin[0]
+        }
+      },
+      async getBrandList() {
+        const {
+          data
+        } = await getBrandList()
+        this.brandList = data
+      },
+      cancelForm() {
+        this.commidyVisible = false
+        this.ontype = '1'
+        this.formInline = {
+          search: '',
+          shelveState: '',
+          stock: '',
+          classifyId: '',
+          page: 1,
+          pageSize: 10
+        }
+        this.getAll(this.formInline)
+        this.closeModal()
+      },
+      closeModal() {
+        this.showTinymce = false
+        this.$refs.child.last()
         this.$refs.child.reset()
-      }
-      this.commidyVisible = true
-      this.commId = 0
-      // this.$router.push({ name: 'addCommodity', params: { id: '1' }})
-    },
-    // 导出商品
-    async productDataExport() {
-      this.$message({
-        message: '数据导出中，请勿重复操作！',
-        type: 'success'
-      })
-      const res = await productExport(this.formInline)
-      if (!res) { return }
-      const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
-      const fileName = '商品数据明细表.xls'
-      if ('download' in document.createElement('a')) {
-        // 非IE下载
-        const elink = document.createElement('a')
-        elink.download = fileName
-        elink.href = URL.createObjectURL(blob)
-        elink.style.display = 'none'
-        document.body.appendChild(elink)
-        elink.click()
-        URL.revokeObjectURL(elink.href) // 释放URL 对象
-        document.body.removeChild(elink)
-      } else {
-        // IE10+下载
-        navigator.msSaveBlob(blob, fileName)
-      }
-    },
-    // 批量导入
-    sends() {
-      this.batchAdd = true
-      this.batchFileList = []
-    },
-    // 编辑商品
-    edit(row) {
-      this.showTinymce = true
-      this.commidyVisible = true
-      this.commId = row.productId
-      this.$nextTick(() => {
-        this.$refs.child?.details()
-      })
-      // this.$router.push({
-      //   name: 'addCommodity',
-      //   params: { productId: row.productId }
-      // })
-      // let res = await getClassifyGetById({ productId: row.productId });
-      // console.log(res);
-    },
-    // 设置会员价
-    setVipPrice(row) {
-      var _ = this
-      this.productId = row.productId
-      getProductMembers({ productId: row.productId }).then(res => {
-		  console.log(res,'11231312312312')
-        if (res.code === '') {
-          _.productData = res.data
-          if (_.productData && _.productData.length > 0) {
-            _.gradeList = []
-            const _memberPrices = _.productData[0].memberPrices
-            _memberPrices.forEach(function(item, i) {
-              _.gradeList.push(item.memberLevelName)
-            })
-            _.mode = _.productData[0].mode ? _.productData[0].mode : 1
-            _.vipPriceVisible = true
-          }
+      },
+      btnClick(id) {
+        if (id.permissionName === '批量导入') {
+          this.sends()
+        } else if (id.permissionName === '新增商品') {
+          this.add()
         }
-      })
-    },
-    // 设置会员价提交
-    vipPriceSubmit() {
-      for (let i = 0; i < this.productData.length; i++) {
-        this.productData[i].mode = this.mode
-        for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
-          this.productData[i].memberPrices[j].mode = this.mode
-          var _price = this.productData[i].memberPrices[j].price
-          if (!_price) {
-            this.$message({
-              type: 'warning',
-              message: '会员价格不能为空！'
-            })
-            return false
-          } else if (this.productData[i].mode === 1) {
-            if (_price <= 0 || _price >= 10) {
-              this.$message({
-                type: 'warning',
-                message: '会员折数必须大于0小于10！'
+      },
+      handleSizeChange(val) {
+        this.formInline.pageSize = val
+        this.getAll(this.formInline)
+      },
+      handleCurrentChange(val) {
+        this.formInline.page = val
+        this.getAll(this.formInline)
+      },
+      //  查询
+      search() {
+        this.total = 1
+        this.formInline.page = 1
+        this.getAll(this.formInline)
+      },
+      // 重置
+      clear() {
+        this.formInline = {
+          search: '', // 搜索字段
+          shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
+          stock: '', // 库存状态 1-有库存 0-无库存 null-全部
+          classifyId: '', // 最下级分类id
+          page: 1, // 当前页
+          pageSize: 10
+        }
+      },
+      // 新增商品
+      add() {
+        this.showTinymce = true
+        // if (this.commId) {
+        //   this.$refs.child.reset()
+        // }
+        this.commidyVisible = true
+        this.commId = null
+        this.ontype = '2'
+        // this.$router.push({ name: 'addCommodity', params: { id: '1' }})
+      },
+      // 导出商品
+      async productDataExport() {
+        this.$message({
+          message: '数据导出中，请勿重复操作！',
+          type: 'success'
+        })
+        const res = await productExport(this.formInline)
+        if (!res) {
+          return
+        }
+        const blob = new Blob([res], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '商品数据明细表.xls'
+        if ('download' in document.createElement('a')) {
+          // 非IE下载
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.href = URL.createObjectURL(blob)
+          elink.style.display = 'none'
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href) // 释放URL 对象
+          document.body.removeChild(elink)
+        } else {
+          // IE10+下载
+          navigator.msSaveBlob(blob, fileName)
+        }
+      },
+      // 批量导入
+      sends() {
+        this.batchAdd = true
+        this.batchFileList = []
+      },
+      // 编辑商品
+      edit(row) {
+        this.showTinymce = true
+        this.commidyVisible = true
+        this.ontype = '2'
+        this.commId = row.productId
+        this.$nextTick(() => {
+          this.$refs.child?.details()
+        })
+        // this.$router.push({
+        //   name: 'addCommodity',
+        //   params: { productId: row.productId }
+        // })
+        // let res = await getClassifyGetById({ productId: row.productId });
+        // console.log(res);
+      },
+      // 设置会员价
+      setVipPrice(row) {
+        var _ = this
+        this.productId = row.productId
+        getProductMembers({
+          productId: row.productId
+        }).then(res => {
+          console.log(res, '11231312312312')
+          if (res.code === '') {
+            _.productData = res.data
+            if (_.productData && _.productData.length > 0) {
+              _.gradeList = []
+              const _memberPrices = _.productData[0].memberPrices
+              _memberPrices.forEach(function(item, i) {
+                _.gradeList.push(item.memberLevelName)
               })
-              return false
+              _.mode = _.productData[0].mode ? _.productData[0].mode : 1
+              _.vipPriceVisible = true
             }
-          } else if (this.productData[i].mode === 2) {
-            if (_price > this.productData[i].price) {
+          }
+        })
+      },
+      // 设置会员价提交
+      vipPriceSubmit() {
+        for (let i = 0; i < this.productData.length; i++) {
+          this.productData[i].mode = this.mode
+          for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
+            this.productData[i].memberPrices[j].mode = this.mode
+            var _price = this.productData[i].memberPrices[j].price
+            if (!_price) {
               this.$message({
                 type: 'warning',
-                message: '会员价格不能大于原价！'
+                message: '会员价格不能为空！'
               })
               return false
+            } else if (this.productData[i].mode === 1) {
+              if (_price <= 0 || _price >= 10) {
+                this.$message({
+                  type: 'warning',
+                  message: '会员折数必须大于0小于10！'
+                })
+                return false
+              }
+            } else if (this.productData[i].mode === 2) {
+              if (_price > this.productData[i].price) {
+                this.$message({
+                  type: 'warning',
+                  message: '会员价格不能大于原价！'
+                })
+                return false
+              }
             }
           }
         }
-      }
-      setProductMember({ productId: this.productId, members: this.productData }).then(res => {
-        if (res.code === '') {
-          this.$message({
-            type: 'success',
-            message: '设置成功!'
-          })
-          this.getAll(this.formInline)
-          this.vipPriceVisible = false
-        }
-      })
-    },
-    // 清空会员价
-    clearProductMember() {
-      console.log(this.productData, 'this.productData')
-      this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        clearProductMember({ productId: this.productId }).then(res => {
+        setProductMember({
+          productId: this.productId,
+          members: this.productData
+        }).then(res => {
           if (res.code === '') {
-            this.productData.map(item => {
-              item.memberPrices.map(itemChild => {
-                itemChild.price = null
-              })
+            this.$message({
+              type: 'success',
+              message: '设置成功!'
             })
-            this.$message.success('清除成功')
-            // this.vipPriceVisible = false
+            this.getAll(this.formInline)
+            this.vipPriceVisible = false
           }
         })
-      })
-    },
-    // 删除商品
-    del(row) {
-      this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          getClassifyDelete({ productId: row.productId }).then(res => {
+      },
+      // 清空会员价
+      clearProductMember() {
+        console.log(this.productData, 'this.productData')
+        this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          clearProductMember({
+            productId: this.productId
+          }).then(res => {
             if (res.code === '') {
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
+              this.productData.map(item => {
+                item.memberPrices.map(itemChild => {
+                  itemChild.price = null
+                })
               })
-              this.getAll(this.formInline)
+              this.$message.success('清除成功')
+              // this.vipPriceVisible = false
             }
           })
         })
-        .catch(() => {})
-    },
-    // 商品上下架
-    async down(row) {
-      console.log(row.shelveState)
-      if (row.shelveState) {
-        console.log(111)
-        const res = await getClassifyStart({
-          productId: row.productId,
-          shelveState: 0
-        })
-        if (res.code === '') {
-          this.$message({
-            type: 'success',
-            message: '下架成功!'
+      },
+      // 删除商品
+      del(row) {
+        this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
-          this.getAll(this.formInline)
-        }
-      } else {
-        const res = await getClassifyStart({
-          productId: row.productId,
-          shelveState: 1
-        })
-        if (res.code === '') {
-          this.$message({
-            type: 'success',
-            message: '上架成功!'
+          .then(() => {
+            getClassifyDelete({
+              productId: row.productId
+            }).then(res => {
+              if (res.code === '') {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                this.getAll(this.formInline)
+              }
+            })
           })
-          this.getAll(this.formInline)
-        }
-      }
-    },
-    // 初始化查询所有数据
-    async getAll(formInline) {
-      this.formInline.classifyId =
-        this.formInline.classifyId[2] ||
-        this.formInline.classifyId[1] ||
-        this.formInline.classifyId[0] ||
-        this.formInline.classifyId
-      const res = await getClassifyGetAll(formInline)
-      this.total = res.data.total
-      this.tableData = res.data.list
-      console.log(this.tableData)
-    },
-    // 初始化查询所有分类
-    async queryAllCategory() {
-      const res = await getClassify()
-      this.categoryList = res.data
-      this.handleRemoveEmptyChild(this.categoryList)
-    },
-    handleRemoveEmptyChild(arr) {
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].childs && Array.isArray(arr[i].childs)) {
-          this.handleRemoveEmptyChild(arr[i].childs)
-        }
-        if (arr[i].childs && Array.isArray(arr[i].childs) && arr[i].childs.length === 0) {
-          delete arr[i].childs
-        }
-      }
-    },
-    // *********************导入部分
-    UploadUrls: function() {
-      // 因为action参数是必填项，我们使用二次确认进行文件上传时，直接填上传文件的url会因为没有参数导致api报404，所以这里将action设置为一个返回为空的方法就行，避免抛错
-      return ''
-    },
-    // 下载模板
-    poDownload() {
-      downloadTemplate().then(res => {
-        console.log(res, 1111)
-        // const content = res
-        const blob = new Blob([res])
-        const fileName = '批量导入商品模板.xlsx'
-        if ('download' in document.createElement('a')) {
-          // 非IE下载
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'none'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href) // 释放URL 对象
-          document.body.removeChild(elink)
+          .catch(() => {})
+      },
+      // 商品上下架
+      async down(row) {
+        console.log(row.shelveState)
+        if (row.shelveState) {
+          console.log(111)
+          const res = await getClassifyStart({
+            productId: row.productId,
+            shelveState: 0
+          })
+          if (res.code === '') {
+            this.$message({
+              type: 'success',
+              message: '下架成功!'
+            })
+            this.getAll(this.formInline)
+          }
         } else {
-          // IE10+下载
-          navigator.msSaveBlob(blob, fileName)
-        }
-      })
-    },
-    // 导入
-    uploadFile() {
-      if (this.batchFileList.length === 0) {
-        this.$message.warning('请上传文件')
-      } else {
-        const formDate = new FormData()
-        formDate.append('file', this.batchFileList[0])
-        console.log(formDate.get('file'))
-        importProduct(formDate).then(res => {
-          console.log(res)
+          const res = await getClassifyStart({
+            productId: row.productId,
+            shelveState: 1
+          })
           if (res.code === '') {
-            this.$message.success('导入成功')
-            this.batchAdd = false
-            this.batchFileList = []
+            this.$message({
+              type: 'success',
+              message: '上架成功!'
+            })
             this.getAll(this.formInline)
           }
-        })
-      }
-    },
-    // 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
-    beforeUploadFile(file) {
-      console.log('before upload')
-      console.log(file)
-      const extension = file.name.substring(file.name.lastIndexOf('.') + 1)
-      const size = file.size / 1024 / 1024
-      if (extension !== 'xlsx') {
-        this.$message.warning('只能上传后缀是.xlsx的文件')
-      }
-      if (size > 10) {
-        this.$message.warning('文件大小不得超过10M')
-      }
-    },
-    // 文件状态改变时的钩子
-    fileChange(file, batchFileList) {
-      console.log(file.raw)
-      this.batchFileList.push(file.raw)
-      console.log(this.batchFileList)
-    },
-    batchRemove(file, batchFileList) {
-      this.batchFileList = []
-    },
-    // 文件超出个数限制时的钩子
-    exceedFile(files, batchFileList) {
-      this.$message.warning(`只能选择1个文件`)
-    },
-    // 文件上传成功时的钩子
-    handleSuccess(res, file, batchFileList) {
-      this.$message.success('文件上传成功')
-    },
-    // 文件上传失败时的钩子
-    handleError() {
-      this.$message.error('文件上传失败')
-    },
-    // 切换优惠方式清除内容
-    modeChange() {
-      this.productData.forEach(item => {
-        item.memberPrices.forEach(itemJ => {
-          itemJ.price = ''
-        })
-      })
-    },
-    handleSelectionChange(val) {
-           console.log(val)
-           let zuheId = ''
-           for(let i=0;i<val.length;i++){
-               zuheId += val[i].productId + ','
-           }
-           this.canst = zuheId
+        }
+      },
+      // 初始化查询所有数据
+      async getAll(formInline) {
+        this.formInline.classifyId =
+          this.formInline.classifyId[2] ||
+          this.formInline.classifyId[1] ||
+          this.formInline.classifyId[0] ||
+          this.formInline.classifyId
+        const res = await getClassifyGetAll(formInline)
+        this.total = res.data.total
+        this.tableData = res.data.list
+        console.log(this.tableData)
+      },
+      // 初始化查询所有分类
+      async queryAllCategory() {
+        const res = await getClassify()
+        this.categoryList = res.data
+        this.handleRemoveEmptyChild(this.categoryList)
+      },
+      handleRemoveEmptyChild(arr) {
+        for (let i = 0; i < arr.length; i++) {
+          if (arr[i].childs && Array.isArray(arr[i].childs)) {
+            this.handleRemoveEmptyChild(arr[i].childs)
+          }
+          if (arr[i].childs && Array.isArray(arr[i].childs) && arr[i].childs.length === 0) {
+            delete arr[i].childs
           }
-  }
-}
-</script>
-<style lang='scss' scoped>
-//@import url(); 引入公共css类
-@import url("../../../styles/elDialog.scss");
-::v-deep .bian_css{
-      margin:auto;
-       max-height:840px;
-       overflow-y: auto;
-        .el-dialog__body {
-          padding: 0px;
-          background-color: #fff;
         }
-        .el-dialog__header {
-          background-color: #fff;
-         padding:10px 20px 10px 20px;
-          border-bottom: 1px solid #EFEFEF;
+      },
+      // *********************导入部分
+      UploadUrls: function() {
+        // 因为action参数是必填项，我们使用二次确认进行文件上传时，直接填上传文件的url会因为没有参数导致api报404，所以这里将action设置为一个返回为空的方法就行，避免抛错
+        return ''
+      },
+      // 下载模板
+      poDownload() {
+        downloadTemplate().then(res => {
+          console.log(res, 1111)
+          // const content = res
+          const blob = new Blob([res])
+          const fileName = '批量导入商品模板.xlsx'
+          if ('download' in document.createElement('a')) {
+            // 非IE下载
+            const elink = document.createElement('a')
+            elink.download = fileName
+            elink.style.display = 'none'
+            elink.href = URL.createObjectURL(blob)
+            document.body.appendChild(elink)
+            elink.click()
+            URL.revokeObjectURL(elink.href) // 释放URL 对象
+            document.body.removeChild(elink)
+          } else {
+            // IE10+下载
+            navigator.msSaveBlob(blob, fileName)
+          }
+        })
+      },
+      // 导入
+      uploadFile() {
+        if (this.batchFileList.length === 0) {
+          this.$message.warning('请上传文件')
+        } else {
+          const formDate = new FormData()
+          formDate.append('file', this.batchFileList[0])
+          console.log(formDate.get('file'))
+          importProduct(formDate).then(res => {
+            console.log(res)
+            if (res.code === '') {
+              this.$message.success('导入成功')
+              this.batchAdd = false
+              this.batchFileList = []
+              this.getAll(this.formInline)
+            }
+          })
         }
-        .el-dialog__title {
-         font-size: 14px;
-         color: #000000e6;
+      },
+      // 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
+      beforeUploadFile(file) {
+        console.log('before upload')
+        console.log(file)
+        const extension = file.name.substring(file.name.lastIndexOf('.') + 1)
+        const size = file.size / 1024 / 1024
+        if (extension !== 'xlsx') {
+          this.$message.warning('只能上传后缀是.xlsx的文件')
         }
-        .el-date-table td.available:hover{
-          background-color:#3F9B6A;
+        if (size > 10) {
+          this.$message.warning('文件大小不得超过10M')
         }
-      .el-date-table td.start-date span{
-          background-color:#3F9B6A;
+      },
+      // 文件状态改变时的钩子
+      fileChange(file, batchFileList) {
+        console.log(file.raw)
+        this.batchFileList.push(file.raw)
+        console.log(this.batchFileList)
+      },
+      batchRemove(file, batchFileList) {
+        this.batchFileList = []
+      },
+      // 文件超出个数限制时的钩子
+      exceedFile(files, batchFileList) {
+        this.$message.warning(`只能选择1个文件`)
+      },
+      // 文件上传成功时的钩子
+      handleSuccess(res, file, batchFileList) {
+        this.$message.success('文件上传成功')
+      },
+      // 文件上传失败时的钩子
+      handleError() {
+        this.$message.error('文件上传失败')
+      },
+      // 切换优惠方式清除内容
+      modeChange() {
+        this.productData.forEach(item => {
+          item.memberPrices.forEach(itemJ => {
+            itemJ.price = ''
+          })
+        })
+      },
+      handleSelectionChange(val) {
+        console.log(val)
+        let zuheId = ''
+        for (let i = 0; i < val.length; i++) {
+          zuheId += val[i].productId + ','
         }
+        this.canst = zuheId
       }
-.tab_show {
-  padding: 0 20px 20px 20px;
-  background-color:#fff;
-}
-.fenye {
-  margin-top: 20px;
-  display: flex;
-  justify-content: flex-end;
-  position: relative;
-}
+    }
+  }
+</script>
+<style lang='scss' scoped>
+  //@import url(); 引入公共css类
+  @import url("../../../styles/elDialog.scss");
+
+  ::v-deep .bian_css {
+    margin: auto;
+    max-height: 840px;
+    overflow-y: auto;
+
+    .el-dialog__body {
+      padding: 0px;
+      background-color: #fff;
+    }
+
+    .el-dialog__header {
+      background-color: #fff;
+      padding: 10px 20px 10px 20px;
+      border-bottom: 1px solid #EFEFEF;
+    }
+
+    .el-dialog__title {
+      font-size: 14px;
+      color: #000000e6;
+    }
+
+    .el-date-table td.available:hover {
+      background-color: #3F9B6A;
+    }
+
+    .el-date-table td.start-date span {
+      background-color: #3F9B6A;
+    }
+  }
+
+  .tab_show {
+    padding: 0 20px 20px 20px;
+    background-color: #fff;
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
+
   ::v-deep .el-pagination__total {
     position: absolute;
     left: 10px;
   }
+
   .formSearch {
-      display: flex;
-      width: 100%;
-      font-size: 14px;
-      justify-content: space-between;
-    }
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
 
-.uploadDialog{
-  // display: flex;
-  // flex-direction: column;
-  // justify-content: center;
-  >>>.el-upload__tip{
-    display: inline-block;
-    width: 360px;
-    margin: auto;
+  .uploadDialog {
+
+    // display: flex;
+    // flex-direction: column;
+    // justify-content: center;
+    >>>.el-upload__tip {
+      display: inline-block;
+      width: 360px;
+      margin: auto;
+    }
   }
-}
-.vipDialog{
-  .priceTable{
-    table{
-      width: 100%;
-      text-align: center;
-      border-left: 1px solid #EBEEF5;
-      border-bottom: 1px solid #EBEEF5;
-      font-size: 14px;
-      color: #606266;
-      border-collapse: collapse;
-      tr{
-        border-top: 1px solid #EBEEF5;
-        th{
-          padding: 12px 0;
-          background: #F2F3F5;
-          color: #0009;
-          border-right: 1px solid #F2F3F5;
-        }
-        td{
-          padding: 12px 0;
-          border-right: 1px solid #EBEEF5;
-          &.td-input{
-            .el-input{
+
+  .vipDialog {
+    .priceTable {
+      table {
+        width: 100%;
+        text-align: center;
+        border-left: 1px solid #EBEEF5;
+        border-bottom: 1px solid #EBEEF5;
+        font-size: 14px;
+        color: #606266;
+        border-collapse: collapse;
+
+        tr {
+          border-top: 1px solid #EBEEF5;
+
+          th {
+            padding: 12px 0;
+            background: #F2F3F5;
+            color: #0009;
+            border-right: 1px solid #F2F3F5;
+          }
+
+          td {
+            padding: 12px 0;
+            border-right: 1px solid #EBEEF5;
+
+            &.td-input {
+              .el-input {
+                width: 80px;
+                margin-right: 0;
+              }
+            }
+
+            &:nth-child(1),
+            &:nth-child(2) {
               width: 80px;
-              margin-right: 0;
             }
-          }
-          &:nth-child(1),&:nth-child(2){
-            width: 80px;
-          }
-          .el-input{
-            width: 100px;
-            margin-right: 10px;
+
+            .el-input {
+              width: 100px;
+              margin-right: 10px;
+            }
           }
         }
       }
     }
-  }
-  .clearBtn{
-    margin-top: 20px;
-  }
-}
 
+    .clearBtn {
+      margin-top: 20px;
+    }
+  }
 </style>
diff --git a/merchant-web-master/src/views/order/pending/index.vue b/merchant-web-master/src/views/order/pending/index.vue
index f2af655..be86085 100644
--- a/merchant-web-master/src/views/order/pending/index.vue
+++ b/merchant-web-master/src/views/order/pending/index.vue
@@ -64,10 +64,18 @@
            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
           tooltip-effect="dark"
         >
-          <el-table-column label="订单id" width="220">
+          <el-table-column label="订单id" width="80">
             <template slot-scope="scope">{{ scope.row.orderId }}</template>
           </el-table-column>
-          <el-table-column prop="price" label="支付金额（元）" width="220" />
+          <el-table-column label="商品名称" width="250" show-overflow-tooltip>
+            <template slot-scope="scope" v-if="scope.row.products &&scope.row.products.length > 0">
+              <span v-for="(item,index) in scope.row.products" :key="index">{{ item.productName || '暂无'}}</span>
+            </template>
+            <template slot-scope="scope" v-else>
+              暂无
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="支付金额（元）"/>
           <el-table-column prop="number" label="商品数量（件）" show-overflow-tooltip />
           <el-table-column label="订单状态" show-overflow-tooltip>
             <template slot-scope="scope">
diff --git a/merchant-web-master/src/views/salesSta/dataSta.vue b/merchant-web-master/src/views/salesSta/dataSta.vue
index d986b51..1b36151 100644
--- a/merchant-web-master/src/views/salesSta/dataSta.vue
+++ b/merchant-web-master/src/views/salesSta/dataSta.vue
@@ -3,81 +3,80 @@
   <div class="pending">
     <div class="tab_show">
       <div style="display: flex;margin: 15px 0;">
-         <el-form ref="formParams" :inline="true" :model="formParams">
-           <el-form-item label="日期">
-             <el-date-picker v-model="formParams.tongjiTime" type="daterange"  range-separator="至"
-               start-placeholder="开始时间" end-placeholder="结束时间" />
-           </el-form-item>
-
-           <el-form-item label-width="0">
-             <el-button plain @click="search(1)"
-               style="background-color: #3F9B6A;color: #fff;">查询</el-button>
-             <el-button plain @click="clear(1)"
-               class="buttonHover"
-                 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
-           </el-form-item>
-         </el-form>
+        <el-form ref="formParams" :inline="true" :model="formParams">
+          <el-form-item label="日期">
+            <el-date-picker v-model="formParams.tongjiTime" type="daterange" range-separator="至"
+              start-placeholder="开始时间" end-placeholder="结束时间" />
+          </el-form-item>
+
+          <el-form-item label-width="0">
+            <el-button plain @click="search(1)" style="background-color: #3F9B6A;color: #fff;">查询</el-button>
+            <el-button plain @click="clear(1)" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
+          </el-form-item>
+        </el-form>
       </div>
       <div style="padding:10px 40px 20px 20px;border:1px solid #EBEEF5;margin-bottom: 20px;">
-          <div class="titleTj">
-            销售额统计
-          </div>
+        <div class="titleTj">
+          销售额统计
+        </div>
 
-          <div class="">
-             <el-descriptions class="margin-top" title="" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                <el-descriptions-item>
-                  <template slot="label">
+        <div class="">
+          <el-descriptions class="margin-top" title="" :column="1" border :labelStyle="labelStyle"
+            :contentStyle="contentStyle">
+            <el-descriptions-item>
+              <template slot="label">
 
-                    销售总额
-                  </template>
-                  ￥{{tongji.transactionsCompleted + tongji.invalidOrderAmount}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
+                销售总额
+              </template>
+              ￥{{tongji.transactionsCompleted + tongji.invalidOrderAmount}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
 
-                    有效订单数
-                  </template>
-                  {{tongji.validOrders}}
-                </el-descriptions-item>
+                有效订单数
+              </template>
+              {{tongji.validOrders}}
+            </el-descriptions-item>
 
-                <el-descriptions-item>
-                  <template slot="label">
-                    有效订单总额
-                  </template>
-                  ￥{{tongji.transactionsCompleted}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    无效订单总数（关闭或取消）
-                  </template>
-                 {{tongji.invalidOrder}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    无效订单总额
-                  </template>
-                  ￥{{tongji.invalidOrderAmount}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    已成交订单总数
-                  </template>
-                  {{tongji.alreadyTransacted}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    已成交订单总额
-                  </template>
-                  ￥{{tongji.transactionsCompleted}}
-                </el-descriptions-item>
-              </el-descriptions>
-          </div>
+            <el-descriptions-item>
+              <template slot="label">
+                有效订单总额
+              </template>
+              ￥{{tongji.transactionsCompleted}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                无效订单总数（关闭或取消）
+              </template>
+              {{tongji.invalidOrder}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                无效订单总额
+              </template>
+              ￥{{tongji.invalidOrderAmount}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                已成交订单总数
+              </template>
+              {{tongji.alreadyTransacted}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                已成交订单总额
+              </template>
+              ￥{{tongji.transactionsCompleted}}
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
       </div>
       <div style="padding:10px 40px 20px 20px;border:1px solid #EBEEF5;margin-bottom: 20px;">
-          <div class="titleTj">
-            销售毛利润/率统计
-          </div>
-          <!-- <div style="display: flex;margin: 15px 0;">
+        <div class="titleTj">
+          销售毛利润/率统计
+        </div>
+        <!-- <div style="display: flex;margin: 15px 0;">
            <el-form ref="formParams" :inline="true" :model="formParams">
              <el-form-item label="日期">
                <el-date-picker v-model="formParams.maoliTime" type="daterange"  range-separator="至"
@@ -92,88 +91,89 @@
              </el-form-item>
            </el-form>
           </div> -->
-          <div class="">
-             <el-descriptions class="margin-top" title="" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                <el-descriptions-item>
-                  <template slot="label">
+        <div class="">
+          <el-descriptions class="margin-top" title="" :column="1" border :labelStyle="labelStyle"
+            :contentStyle="contentStyle">
+            <el-descriptions-item>
+              <template slot="label">
 
-                    销售总额
-                  </template>
-                  ￥{{tongji.transactionsCompleted + tongji.invalidOrderAmount}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
+                销售总额
+              </template>
+              ￥{{tongji.transactionsCompleted + tongji.invalidOrderAmount}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
 
-                    订单毛利润（总）
-                  </template>
-                  ￥{{maoli.subtract}}
-                </el-descriptions-item>
+                订单毛利润（总）
+              </template>
+              ￥{{maoli.subtract}}
+            </el-descriptions-item>
 
-                <el-descriptions-item>
-                  <template slot="label">
-                       订单毛利率（总）
-                  </template>
-                 毛利率：{{maoli.divide}}%
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    有效订单总数
-                  </template>
-                  {{tongji.validOrders}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    有效订单总额
-                  </template>
-                  ￥{{tongji.transactionsCompleted}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    无效订单总数（关闭或取消）
-                  </template>
-                  {{tongji.invalidOrder}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    无效订单总额
-                  </template>
-                  ￥{{tongji.invalidOrderAmount}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                    已成交订单总数
-                  </template>
-                  {{tongji.alreadyTransacted}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                     已成交订单总额
-                  </template>
-                  ￥{{tongji.transactionsCompleted}}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">
-                     毛利率排行
-                  </template>
+            <el-descriptions-item>
+              <template slot="label">
+                订单毛利率（总）
+              </template>
+              毛利率：{{maoli.divide}}%
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                有效订单总数
+              </template>
+              {{tongji.validOrders}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                有效订单总额
+              </template>
+              ￥{{tongji.transactionsCompleted}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                无效订单总数（关闭或取消）
+              </template>
+              {{tongji.invalidOrder}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                无效订单总额
+              </template>
+              ￥{{tongji.invalidOrderAmount}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                已成交订单总数
+              </template>
+              {{tongji.alreadyTransacted}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                已成交订单总额
+              </template>
+              ￥{{tongji.transactionsCompleted}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                毛利率排行
+              </template>
 
-                </el-descriptions-item>
-                 <el-descriptions-item v-for="item in maoli.salesRanking" :key="item.id">
-                      <template slot="label">
-                        <span v-for="(value, key) in item" :key="key">{{ key }}</span>
-                      </template>
-                      <span v-for="(value, key) in item" :key="key">毛利率：{{ value }}%</span>
-                    </el-descriptions-item>
-                <!-- <el-descriptions-item>
+            </el-descriptions-item>
+            <el-descriptions-item v-for="item in maoli.salesRanking" :key="item.id">
+              <template slot="label">
+                <span v-for="(value, key) in item" :key="key">{{ key }}</span>
+              </template>
+              <span v-for="(value, key) in item" :key="key">毛利率：{{ value }}%</span>
+            </el-descriptions-item>
+            <!-- <el-descriptions-item>
                   <template slot="label">
                      商品2
                   </template>
                   毛利率：21.01%
                 </el-descriptions-item> -->
-              </el-descriptions>
-          </div>
+          </el-descriptions>
+        </div>
       </div>
       <!-- 搜索 -->
-<!--       <div class="filter-container">
+      <!--       <div class="filter-container">
          <div style="display:flex;justify-content: space-between;background-color: #f5f5f5;padding:10px">
           <div style="line-height:200%">筛选查询</div>
           <div>
@@ -198,48 +198,41 @@
         </div> -->
       <!-- 表格 -->
       <div class="tableBox">
-        <el-table
-                      :data="tableData"
-                      :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                    >
-                      <el-table-column prop="id" label="排名">
-                         <template slot-scope="scope">
-                           {{scope.$index + 1 }}
-                           </template>
-                      </el-table-column>
-                      <el-table-column prop="shopnum" label="商品编号">
-                          <template slot-scope="scope">
-                            {{scope.row.products[0].productId}}
-                            </template>
-                      </el-table-column>
-                      <el-table-column prop="shopname" label="商品名称" width="300">
-        <template slot-scope="scope">
-                            {{scope.row.products[0].productName}}
-                            </template>
-                      </el-table-column>
-                      <el-table-column prop="fl" label="商品分类">
-                      <template slot-scope="scope">
-                                          {{scope.row.product.shopGroupName}}
-                                          </template>
-                                           </el-table-column>
-
-                      <el-table-column prop="createTime" label="商品创建时间">
-                      <template slot-scope="scope">
-                                          {{scope.row.product.createTime}}
-                                          </template>
-                         </el-table-column>
-                      <el-table-column prop="bigDecimal" label="销售数量" />
-                      <el-table-column prop="multiply" label="销售金额"  :sortable="true" :sort-method="sortMethod"/>
-                    </el-table>
+        <el-table :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column prop="id" label="排名">
+            <template slot-scope="scope">
+              {{scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="shopnum" label="商品编号">
+            <template slot-scope="scope">
+              {{scope.row.products[0].productId}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="shopname" label="商品名称" width="300">
+            <template slot-scope="scope">
+              {{scope.row.products[0].productName}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="fl" label="商品分类">
+            <template slot-scope="scope">
+              {{scope.row.product.shopGroupName}}
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="createTime" label="商品创建时间">
+            <template slot-scope="scope">
+              {{scope.row.product.createTime}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="bigDecimal" label="销售数量" />
+          <el-table-column prop="multiply" label="销售金额" :sortable="true" :sort-method="sortMethod" />
+        </el-table>
         <div class="fenye">
           <div>共{{ total }}条</div>
-          <el-pagination
-            :current-page="currentPage"
-            :page-size="10"
-            layout="prev, pager, next"
-            :total="total"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination :current-page="currentPage" :page-size="10" layout="prev, pager, next" :total="total"
+            @current-change="handleCurrentChange" />
         </div>
       </div>
     </div>
@@ -248,201 +241,222 @@
 </template>
 
 <script>
-  import {salesStatistics,
-  orderGetAll,
-  calculateGrossProfit} from '@/api/dataSta'
   import {
-  salesRanking,} from '@/api/psRanking'
-import { async } from 'q';
-export default {
-  data () {
-    // 这里存放数据
-    return {
-      formParams:{
-          maoliTime:'',
-          tongjiTime:''
-      },
-      currentPage:1,
-      formInline: {
-        searchType: '1',
-        search: '', // 搜索字段
-        state: '4',
-        // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
-        dates: [], // 下单时间数组
-        page: 1,
-        shopName: '',
-        pageSize: 10
-      },
-      fut:true,
-      total: 1,
-      tableData: [],
-      tableLoading: false,
-      dialogVisible:false,
-      tongji:{},
-      maoli:{},
-      pageindex: {
-        pageNumber: 1,
-        pageSize: 10,
-      },
-      labelStyle:{
-        width:'35%',
-        textAlign:'center',
-        color:'#000',
-        backgroundColor:'#F9FAFC',
-      },
-      contentStyle:{
-           textAlign:'center',
-      }
-
-    }
+    salesStatistics,
+    orderGetAll,
+    calculateGrossProfit
+  } from '@/api/dataSta'
+  import {
+    salesRanking,
+  } from '@/api/psRanking'
+  import {
+    async
+  } from 'q';
+  export default {
+    data() {
+      // 这里存放数据
+      return {
+        formParams: {
+          maoliTime: '',
+          tongjiTime: ''
+        },
+        currentPage: 1,
+        formInline: {
+          searchType: '1',
+          search: '', // 搜索字段
+          state: '4',
+          // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
+          dates: [], // 下单时间数组
+          page: 1,
+          shopName: '',
+          pageSize: 10
+        },
+        fut: true,
+        total: 1,
+        tableData: [],
+        tableLoading: false,
+        dialogVisible: false,
+        tongji: {},
+        maoli: {},
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        labelStyle: {
+          width: '35%',
+          textAlign: 'center',
+          color: '#000',
+          backgroundColor: '#F9FAFC',
+        },
+        contentStyle: {
+          textAlign: 'center',
+        }
 
-  },
-  // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    this.getAll()
-  },
-  // 方法集合
-  methods: {
-    sortMethod(before,after){
-        return  Number(after.multiply) - Number(before.multiply)
-    },
-    toggleFilter(){
-      this.fut = !this.fut
-    },
-    handleSizeChange (val) {
-      this.formInline.pageSize = val
-      // this.getAll(this.formInline)
-    },
-    handleCurrentChange (val) {
-      this.formInline.page = val
-      // this.getAll(this.formInline)
-    },
-    //重置
-    clear(val){
-      this.formInline = {
-        searchType: '1',
-        search: '', // 搜索字段
-        state: '',
-        // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
-        dates: [], // 下单时间数组
-        page: 1,
-        shopName: '',
-        pageSize: 10
       }
-      this.formParams.tongjiTime = ''
-       this.getAll()
-      // if(val == 1){
-      //  this.formParams.tongjiTime = ''
-      //   this.getAll()
-      // }else{
-      //   this.formParams.maoliTime = ''
-      //   this.getAll()
-      // }
+
     },
-    //  查询
-    search (val) {
-      this.formInline.dates = this.formParams.tongjiTime || []
+    // 生命周期 - 挂载完成（可以访问DOM元素）
+    mounted() {
       this.getAll()
-      // if(val ==1){
-      //   this.formInline.dates = this.formParams.tongjiTime
-      //   this.getAll()
-      // }else{
-      //   this.formInline.dates = this.formParams.maoliTime
-      //   this.getAll()
-      // }
+    },
+    // 方法集合
+    methods: {
+      sortMethod(before, after) {
+        return Number(after.multiply) - Number(before.multiply)
+      },
+      toggleFilter() {
+        this.fut = !this.fut
+      },
+      handleSizeChange(val) {
+        this.formInline.pageSize = val
+        // this.getAll(this.formInline)
+      },
+      handleCurrentChange(val) {
+        this.formInline.page = val
+        // this.getAll(this.formInline)
+      },
+      //重置
+      clear(val) {
+        this.formInline = {
+          searchType: '1',
+          search: '', // 搜索字段
+          state: '',
+          // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
+          dates: [], // 下单时间数组
+          page: 1,
+          shopName: '',
+          pageSize: 10
+        }
+        this.formParams.tongjiTime = ''
+        this.getAll()
+        // if(val == 1){
+        //  this.formParams.tongjiTime = ''
+        //   this.getAll()
+        // }else{
+        //   this.formParams.maoliTime = ''
+        //   this.getAll()
+        // }
+      },
+      //  查询
+      search(val) {
+        this.formInline.dates = this.formParams.tongjiTime || []
+        this.getAll()
+        // if(val ==1){
+        //   this.formInline.dates = this.formParams.tongjiTime
+        //   this.getAll()
+        // }else{
+        //   this.formInline.dates = this.formParams.maoliTime
+        //   this.getAll()
+        // }
         // console.log(this.formParams.tongjiTime)
         // console.log(this.formParams.maoliTime)
-    },
-    // 初始化查询所有数据
-    async getAll () {
-      const res = await orderGetAll(this.formInline)
-    const Orderlist = await calculateGrossProfit(res.data.list)
-     const tablelist = await salesStatistics(res.data.list)
-     this.maoli = Orderlist.data
-     this.tongji = tablelist.data
-     // this.loading = false;
+      },
+      // 初始化查询所有数据
+      async getAll() {
+        const res = await orderGetAll(this.formInline)
+        const Orderlist = await calculateGrossProfit(res.data.list)
+        const tablelist = await salesStatistics(res.data.list)
+        this.maoli = Orderlist.data
+        this.tongji = tablelist.data
+        // this.loading = false;
 
 
-     const list = await salesRanking(res.data.list)
-     this.tableData = list.data
-     this.total = list.data.length
+        const list = await salesRanking(res.data.list)
+        this.tableData = list.data
+        // console.log(list.data)
+        this.total = list.data.length
 
-    },
+      },
 
 
+    }
   }
-}
 </script>
 <style lang='scss' scoped>
-.pending{
-  padding-left: 15px;
-}
-.tab_show{
-  padding-top: 10px;
-  padding-left: 15px;
-  padding-right: 15px;
-  background-color: #fff;
-}
-.filter-container {
-font-size:12px;
-border:1px solid #EBEEF5;
-  margin-bottom:20px;
-
-}
-.formSearch{
-  padding: 0 20px;
-    height: 60px; /* 或者你想要的任何高度 */
+  .pending {
+    padding-left: 15px;
+  }
+
+  .tab_show {
+    padding-top: 10px;
+    padding-left: 15px;
+    padding-right: 15px;
+    background-color: #fff;
+  }
+
+  .filter-container {
+    font-size: 12px;
+    border: 1px solid #EBEEF5;
+    margin-bottom: 20px;
+
+  }
+
+  .formSearch {
+    padding: 0 20px;
+    height: 60px;
+    /* 或者你想要的任何高度 */
     /* 过渡效果 */
-    transition: height 0.3s ease-in-out; /* 动画的持续时间、类型 */
-    overflow: hidden; /* 隐藏溢出的内容，这样高度变化时内容不会显示出来 */
-
-}
-.collapsed {
-  padding: 0 10px;
-  margin-top: 0px;
-  height: 0;
-    transition: height 0.3s ease-in-out; /* 动画的持续时间、类型 */
-    overflow: hidden; /* 隐藏溢出的内容，这样高度变化时内容不会显示出来 */
-}
-::v-deep .collapsed{
-  .el-form--inline .el-form-item{
-        margin-top: 10px;
-    margin-right:20px;
-    margin-bottom:0px;
+    transition: height 0.3s ease-in-out;
+    /* 动画的持续时间、类型 */
+    overflow: hidden;
+    /* 隐藏溢出的内容，这样高度变化时内容不会显示出来 */
+
   }
-  .el-form-item__label{
-    font-size:12px;
+
+  .collapsed {
+    padding: 0 10px;
+    margin-top: 0px;
+    height: 0;
+    transition: height 0.3s ease-in-out;
+    /* 动画的持续时间、类型 */
+    overflow: hidden;
+    /* 隐藏溢出的内容，这样高度变化时内容不会显示出来 */
   }
-}
-::v-deep .formSearch{
-  .el-form--inline .el-form-item{
+
+  ::v-deep .collapsed {
+    .el-form--inline .el-form-item {
       margin-top: 10px;
-    margin-right:20px;
-    margin-bottom:0px;
+      margin-right: 20px;
+      margin-bottom: 0px;
+    }
+
+    .el-form-item__label {
+      font-size: 12px;
+    }
   }
-  .el-form-item__label{
-    font-size:12px;
+
+  ::v-deep .formSearch {
+    .el-form--inline .el-form-item {
+      margin-top: 10px;
+      margin-right: 20px;
+      margin-bottom: 0px;
+    }
+
+    .el-form-item__label {
+      font-size: 12px;
+    }
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .titleTj {
+    width: 100%;
+    color: #9C9C9C;
+    position: relative;
+    margin-bottom: 15px;
+  }
+
+  .titleTj::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: -10px;
+    width: 4px;
+    height: 100%;
+    background-color: #14BA99;
   }
-}
-.fenye{
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
-}
-.titleTj{
-  width:100%;
-  color:#9C9C9C;
-  position: relative;
-  margin-bottom:15px;
-}
-
-.titleTj::before {
-  content: "";
-   position: absolute;
-   top:0;
-   left:-10px;
-  width: 4px;
-  height: 100%;
-  background-color: #14BA99;
-}
 </style>
diff --git a/merchant-web-master/src/views/stockControl/inventory/addCommodity copy.vue b/merchant-web-master/src/views/stockControl/inventory/addCommodity copy.vue
new file mode 100644
index 0000000..c87d85a
--- /dev/null
+++ b/merchant-web-master/src/views/stockControl/inventory/addCommodity copy.vue
@@ -0,0 +1,706 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <div slot="header" style="display:flex;justify-content: space-between;">
+        <div>
+          <span v-if="!productId" class="addTitle">新增商品</span>
+          <span v-else class="addTitle">编辑商品</span>
+        </div>
+        <div>
+          <el-button v-if="active" style="background-color: #3F9B6A;color: #fff" @click="back">取消</el-button>
+          <el-button v-if="active" style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
+          <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="save">保存</el-button>
+          <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="last">上一步</el-button>
+        </div>
+      </div>
+      <!-- 步骤条 -->
+      <div class="stepsColor common">
+        <div class="stepsOne common">
+          <div :class="active ? 'one_class common' : 't_class common'">1</div>
+          <div :class="active ? 'two_class' : 'w_class'">基本属性&商品描述</div>
+        </div>
+        <div class="line" />
+        <div class="stepsTwo common">
+          <div :class="active ? 't_class common' : 'one_class common'">2</div>
+          <div :class="active ? 'w_class' : 'two_class' ">基本属性&商品描述</div>
+        </div>
+      </div>
+    </el-card>
+    <!-- 商品 -->
+    <div class="addCom common">
+      <div v-if="active">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding: 40px 40px;">
+          <div class="leftCom">
+            <el-form-item label="商品名称" prop="productName">
+              <el-input v-model="form.productName" maxlength="50" show-word-limit />
+            </el-form-item>
+            <el-form-item label="卖点简介">
+              <el-input v-model="form.productBrief" maxlength="50" show-word-limit />
+            </el-form-item>
+            <el-form-item>
+              <Tinymce v-if="showTinymce" ref="content" v-model="form.productText" class="tinymce-wrap" :height="200" />
+            </el-form-item>
+          </div>
+          <div class="rightCom">
+            <el-form-item label="官方分类" prop="classifyId">
+              <el-cascader
+                v-model="form.classifyId"
+                :options="classifyList"
+                clearable
+                :props="{
+                  checkStrictly: false,
+                  label:'categoryName',
+                  value:'id',
+                  children:'childs'
+                }"
+                @change="handleChangeCascader"
+              />
+            </el-form-item>
+
+            <el-form-item label="商品分组" prop="shopGroupId">
+              <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
+                <el-option
+                  v-for="(item,index) in groupList"
+                  :key="index"
+                  :label="item.groupName"
+                  :value="item.shopGroupId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="品牌">
+              <el-select
+                v-model="form.brandId"
+                clearable
+                placeholder="请选择品牌"
+              >
+                <el-option
+                  v-for="item in brandList"
+                  :key="item.id"
+                  :label="item.brandName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item class="form-item-long" label="供应商">
+              <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
+            </el-form-item>
+            <el-form-item class="form-item-long" label="成本价" prop="cost">
+              <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
+            </el-form-item>
+            <el-form-item label="需要物流" prop="ifLogistics">
+              <el-radio-group v-model="form.ifLogistics">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="上架状态" prop="shelveState">
+              <el-radio-group v-model="form.shelveState">
+                <el-radio :label="1">上架</el-radio>
+                <el-radio :label="0">下架</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="允许超卖" prop="ifOversold">
+              <el-radio-group v-model="form.ifOversold">
+                <el-radio :label="1">允许</el-radio>
+                <el-radio :label="0">不允许</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="积分兑换" prop="ifCredit">
+              <el-radio-group v-model="form.ifCredit">
+                <el-radio :label="1">允许</el-radio>
+                <el-radio :label="0">不允许</el-radio>
+              </el-radio-group>
+              <p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
+            </el-form-item>
+            <el-form-item v-if="form.ifCredit" class="form-item-long" label="单笔最大抵扣" prop="creditLimit">
+              <!-- <el-input v-model="form.creditLimit" type="number" placeholder="请输入单笔最大抵扣" /> -->
+              <el-input-number v-model="form.creditLimit" :controls="false" :min="0" :precision="0" placeholder="请输入单笔最大抵扣" />
+              <p style="color: #cf0f0f; height: 25px; line-height: 25px;margin-top: 10px">限制一笔订单中该商品最多抵扣多少积分</p>
+              <p style="color: #cf0f0f; height: 25px; line-height: 25px">( 注：1积分 = {{ integralProportion }}元 请输入整数 )</p>
+            </el-form-item>
+          <!--            <el-form-item label="花呗分期">-->
+          <!--              <el-radio-group v-model="form.ifHuabei">-->
+          <!--                <el-radio :label="1">支持</el-radio>-->
+          <!--                <el-radio :label="0">不支持</el-radio>-->
+          <!--              </el-radio-group>-->
+          <!--            </el-form-item>-->
+          </div>
+        </el-form>
+      </div>
+      <div v-if="!active" class="centerCom">
+        <el-form ref="form" :model="params" label-width="80px">
+          <StyleInformation :form="params" />
+        </el-form>
+      </div>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      class="check-image-dialog"
+      title="查看图片"
+      center="center"
+    >
+      <img width="100%" :src="dialogImageUrl" alt>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Tinymce from '@/components/Tinymce'
+import {
+  getGroupSelect,
+  getClassify,
+  getClassifyAdd,
+  getClassifyGetById,
+  getClassifyUpdate,
+  getBrandList
+} from '@/api/commodity'
+import {
+  getSelect
+} from '@/api/account';
+import { uploadUrl } from '@/utils/request'
+import StyleInformation from './addComponent'
+export default {
+  components: {
+    Tinymce,
+    StyleInformation
+  },
+  props: {
+    productId: {
+      type: Number,
+      default: 0
+    },
+    showTinymce: {
+      type: Boolean
+    },
+    message: {
+        type: String,
+        default: ''
+      }
+  },
+  data() {
+    // const checkCreditLimit = (rule, value, callback) => {
+    //   console.log(this.form.ifCredit)
+    //   if (this.form.ifCredit) {
+    //     callback(new Error('当选择允许积分兑换时，必须填写该值'))
+    //   }
+    //   const reg = /^[1-9]\d*$/
+    //   if (value === '' || value === undefined || value === null) {
+    //     callback();
+    //   } else {
+    //     if ((!reg.test(value)) && value !== '') {
+    //       callback(new Error('请输入正确的价格'));
+    //     } else {
+    //       callback();
+    //     }
+    //   }
+    //   callback()
+    // }
+    return {
+      brandList: [],
+      active: 1,
+      action: uploadUrl,
+      form: {
+        brandId: null, // 品牌ID
+        productName: '', // 商品名称
+        productBrief: '', // 商品简介
+        shopGroupId: '', // 商品分组id
+        classifyId: '', // 分类id
+        supplierName: '', // 供应商名称
+        cost:null,//成本价
+        ifLogistics: '', // 是否需要物流 1-是 0-否
+        shelveState: '', // 是否上架 1-上架 0-不上架
+        ifOversold: '', // 是否允许超卖 1-是 0-否
+        ifCredit: '', // 是否支持积分兑换 1-是 0-否
+        creditLimit: '', // 单笔订单限制使用多少积分
+        ifHuabei: 1, // 是否支持花呗分期 1-是 0-否
+        productText: '', // 商品描述（富文本）
+        images: [], // "图片地址"
+        deletes: [], // 删除的规格id数组
+        names: [
+          {
+            code: '', // 级别
+            skuName: '', // 规格名
+            values: [
+              {
+                valueCode: '', // 级别
+                skuValue: '', // 规格值
+                image: '' // 图片
+              }
+            ]
+          }
+        ],
+        skus: [
+          {
+            skuName: '', // 规格名称
+            skuValue: '', // 规格值
+            price: '', // 售价
+            originalPrice: '', // 原价
+            stockNumber: '', // 库存数量
+            weight: '', // 重量
+            skuImage: '', // 配图地址
+            style: '' // 款式  1-单款式 2-多款式
+          }
+        ]
+      },
+      params: {
+        applyPrice: 0,
+        attrStyle: 0,
+        categoryId: '',
+        oversold: 1,
+        collects: 0,
+        groupId: '',
+        imgs: [],
+        deletes: [], // 删除规格数据
+        isDelete: 0,
+        limitCount: 0,
+        minusStock: '',
+        needLogistics: 1,
+        platform: '',
+        price: 0,
+        productCode: '',
+        productName: '',
+        sellCount: 0,
+        sellDesc: '',
+        sellType: '',
+        shortName: '',
+        skuAttrList: [
+          {
+            code: '',
+            skuName: '',
+            needImg: false,
+            values: [
+              {
+                skuValue: '',
+                valueCode: '',
+                image: ''
+              }
+            ]
+          }
+        ],
+        skuList: [
+          {
+            isDelete: '',
+            skuAttrCodeDTOList: [
+              {
+                code: '',
+                valueCode: ''
+              }
+            ],
+            skuAttrList: [],
+            sku: '',
+            skuImg: '',
+            price: 0,
+            originalPrice: 0,
+            stockNumber: 0,
+            weight: 0
+          }
+        ],
+        sortOrder: '',
+        status: '',
+        stock: '',
+        supplierName: '',
+        cost:null,
+        views: '',
+        weight: ''
+      },
+      imgList: [],
+      groupList: [],
+      classifyList: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      rules: {
+        productName: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
+        shopGroupId: [{ required: true, message: '请选择商品分组', trigger: 'change' }],
+        classifyId: [{ required: true, message: '请选择商品分类', trigger: 'change' }],
+        cost:[{ required: true, message: '请输入成本价', trigger: 'change' }],
+        ifLogistics: [{ required: true, message: '请选择是否需要物流', trigger: 'change' }],
+        shelveState: [{ required: true, message: '请选择是否上架', trigger: 'change' }],
+        ifOversold: [{ required: true, message: '请选择是否允许超卖', trigger: 'change' }],
+        ifCredit: [{ required: true, message: '请选择是否支持积分兑换', trigger: 'change' }],
+        creditLimit: [{ required: true, message: '请输入单笔最大抵扣', trigger: 'blur' }]
+      },
+      integralList: [],
+      integralProportion: '' // 积分兑换金额比例
+    }
+  },
+  watch: {
+    productId: {
+      handler(nVal, oVal) {
+        if (nVal) {
+          // this.details()
+        }
+      }
+    },
+  },
+  mounted() {
+    this.groups()
+    this.selectList()
+    this.getBrandList()
+    // if (this.productId) {
+    //   this.details()
+    // }
+    this.getCredit()
+  },
+  methods: {
+    handleChangeCascader() {
+      console.log(this.form.classifyId)
+    },
+    async getBrandList() {
+      const { data } = await getBrandList()
+      this.brandList = data
+    },
+    async getCredit() {
+      const res = await getSelect({ dictName: 'CREDIT_CONFIG' })
+      this.integralList = res.data
+      this.integralList.forEach((item) => {
+        if (item.dictName === 'credit_exchange_rate') {
+          this.integralProportion = item.dictDescribe
+        }
+      })
+    },
+    handleImageSuccess(response) {
+      const { url } = response.data
+      this.imgList.push(url)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.imgPath
+      this.dialogVisible = true
+    },
+    // 移除图片
+    handleRemove(file) {
+      const { imgPath } = file
+      this.form.imgs = this.form.imgs.filter(item => {
+        return item.imgPath !== imgPath
+      })
+    },
+    // 下一步
+    next() {
+      this.$refs['form'].validate((valid) => {
+        console.log('val', valid)
+        if (valid) {
+          if (this.active === 1) {
+            this.active = 0
+            // console.log(this.form);
+            sessionStorage.setItem('form', JSON.stringify(this.form.skus))
+          }
+        } else {
+          this.$message({
+            message: '请填写正确的信息',
+            type: 'warning'
+          })
+          return false
+        }
+      })
+    },
+    // 点击新增商品时表单数据重置
+    reset() {
+      // this.form.productText = ''
+      this.form = {
+        productName: '',
+        productBrief: '',
+        shopGroupId: '',
+        classifyId: '',
+        supplierName: '',
+        ifLogistics: '',
+        shelveState: ' ',
+        ifOversold: '',
+        ifCredit: '',
+        creditLimit: '',
+        ifHuabei: 1,
+        cost:0,
+        productText: '',
+        images: [],
+        deletes: [],
+        names: [
+          {
+            code: '',
+            skuName: '',
+            values: [
+              {
+                valueCode: '',
+                skuValue: '',
+                image: ''
+              }
+            ]
+          }
+        ],
+        skus: [
+          {
+            skuName: '',
+            skuValue: '',
+            price: '',
+            originalPrice: '',
+            stockNumber: '',
+            weight: '',
+            skuImage: '',
+            style: ''
+          }
+        ]
+      }
+      this.params = {
+        applyPrice: 0,
+        attrStyle: 0,
+        categoryId: '',
+        oversold: 1,
+        collects: 0,
+        groupId: '',
+        imgs: [],
+        deletes: [],
+        isDelete: 0,
+        limitCount: 0,
+        minusStock: '',
+        needLogistics: 1,
+        platform: '',
+        price: 0,
+        productCode: '',
+        productName: '',
+        sellCount: 0,
+        sellDesc: '',
+        sellType: '',
+        shortName: '',
+        skuAttrList: [
+          {
+            code: '',
+            skuName: '',
+            needImg: false,
+            values: [
+              {
+                skuValue: '',
+                valueCode: '',
+                image: ''
+              }
+            ]
+          }
+        ],
+        skuList: [
+          {
+            isDelete: '',
+            skuAttrCodeDTOList: [
+              {
+                code: '',
+                valueCode: ''
+              }
+            ],
+            skuAttrList: [],
+            sku: '',
+            skuImg: '',
+            price: 0,
+            originalPrice: 0,
+            stockNumber: 0,
+            weight: 0
+          }
+        ],
+        sortOrder: '',
+        status: '',
+        stock: '',
+        supplierName: '',
+        views: '',
+        weight: ''
+      }
+      this.imgList = []
+      this.dialogImageUrl = ''
+      this.dialogVisible = false
+      this.active = 1
+    },
+    // 返回
+    back() {
+      this.active = 1
+      this.$emit('cancel')
+    },
+    // 上一步
+    last() {
+      if (this.active !== 1) {
+        this.active = 1
+      }
+    },
+    // 保存
+    async save() {
+      console.log(this.params.skuAttrList)
+      if (this.params.attrStyle === 1) {
+        for (let i = 0; i < this.params.skuAttrList.length; i++) {
+          if (this.params.skuAttrList[i].skuName === '') {
+            this.$message({
+              message: '规格名不能为空',
+              type: 'warning'
+            })
+            return false
+          }
+        }
+      }
+      this.form.names = this.params.skuAttrList
+      this.params.skuList.forEach(element => {
+        element.style = this.params.attrStyle
+      })
+      this.form.skus = this.params.skuList
+      this.form.images = this.params.imgs
+      this.form.deletes = this.params.deletes
+      this.form.classifyId = Array.isArray(this.form.classifyId) ? this.form.classifyId[this.form.classifyId.length - 1] : this.form.classifyId
+      if (this.productId) {
+        this.form.productId = this.productId
+        const sku = JSON.parse(sessionStorage.getItem('form'))
+        console.log(sku)
+        sku.forEach((element, i) => {
+          for (let index = 0; index < this.form.skus.length; index++) {
+            if (i === index) {
+              this.form.skus[index].skuId = element.skuId
+            }
+          }
+        })
+        console.log(this.form, 'this.form')
+        const res = await getClassifyUpdate(this.form)
+        console.log(res)
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+          this.back()
+        }
+      } else {
+        console.log('message1',this.message)
+        if(this.message != ''){
+           const formData = new FormData();
+           formData.append('combinationId', this.message);
+           for (let [key, value] of formData.entries()) {
+             this.form[key] = value;
+           }
+        }
+        const res = await getClassifyAdd(this.form)
+        if (res.code === '') {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+          this.reset()
+          this.back()
+        }
+      }
+    },
+    // 获取商品分组
+    async groups() {
+      const res = await getGroupSelect({
+      })
+      this.groupList = res.data
+    },
+    // 获取详情
+    async details() {
+      const res = await getClassifyGetById({ productId: this.productId })
+      this.form = res.data
+      this.$set(this.form, 'productText', res.data.productText)
+      // this.form.productText = res.data.productText
+      // console.log(this.form.productText, 'productText')
+      if (res.data.names.length !== 0) {
+        this.params.skuAttrList = res.data.names
+      }
+      // this.params.skuAttrList.forEach((item) => {
+      //   var data = {}
+      //   var arr = Object.keys(res.data)
+      //   if (arr.length === 0) {
+      //     item.needImg = false
+      //   }
+      // })
+      this.params.skuList = this.form.skus
+      this.params.attrStyle = res.data.skus[0].style
+      this.params.imgs = res.data.images
+    },
+    async selectList() {
+      const res = await getClassify()
+      this.classifyList = this.filterList(res.data)
+    },
+    filterList(data) {
+      data.forEach(i => {
+        if (i.childs.length) {
+          this.filterList(i.childs)
+        } else {
+          i.childs = null
+        }
+      })
+      return data
+    }
+  }
+}
+</script>
+
+<style scoped lang='scss'>
+@import url("../../../styles/elDialog.scss");
+.btnList {
+  float: right;
+  padding: 3px 0;
+  width: 100px;
+  height: 40px;
+  border-radius: 4px;
+  margin-right: 30px;
+}
+.addTitle {
+  font-size: 20px;
+  color: #333333;
+  line-height: 50px;
+}
+.stepsColor{
+  font-size: 20px;
+  line-height: 40px;
+  .one_class {
+    width: 40px;
+    background: #3F9B6A;
+    border-radius: 50%;
+    color: #ffffff;
+    margin: 0 10px;
+  }
+  .two_class {
+    color: #3F9B6A;
+  }
+  .line {
+    width: 230px;
+    height: 2px;
+    background: #e0e5eb;
+    margin: 0 20px;
+  }
+  .t_class {
+    width: 40px;
+    background: #dddddd;
+    border-radius: 50%;
+    color: #333333;
+    margin: 0 10px;
+  }
+  .w_class {
+    color: #666666;
+  }
+}
+.common {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.addCom {
+  margin: 10px 0;
+  justify-content: space-around;
+  align-items: unset;
+  .el-form{
+    display: flex;
+    padding: 40px 0;
+  }
+  .leftCom {
+    width: 65%;
+    background: #ffffff;
+  }
+  .rightCom {
+    width: 35%;
+    background: #ffffff;
+    margin-left: 80px;
+  }
+}
+.centerCom {
+  width: 1660px;
+  background: #ffffff;
+  box-shadow: 0px 5px 20px 0px rgba(51, 51, 51, 0.15);
+  border-radius: 4px;
+}
+</style>
+<style scoped>
+.form-item-long >>> .el-input {
+  width: 100%;
+}
+</style>
diff --git a/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue b/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
index c87d85a..8393107 100644
--- a/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
@@ -1,133 +1,135 @@
 <template>
   <div>
-    <el-card class="box-card">
-      <div slot="header" style="display:flex;justify-content: space-between;">
-        <div>
-          <span v-if="!productId" class="addTitle">新增商品</span>
-          <span v-else class="addTitle">编辑商品</span>
-        </div>
-        <div>
-          <el-button v-if="active" style="background-color: #3F9B6A;color: #fff" @click="back">取消</el-button>
-          <el-button v-if="active" style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
-          <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="save">保存</el-button>
-          <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="last">上一步</el-button>
-        </div>
+    <!-- 步骤条 -->
+    <div class="stepsColor common">
+      <div class="stepsOne common">
+        <div :class="active ? 'one_class common' : 't_class common'">1</div>
+        <div :class="active ? 'two_class' : 'w_class'">基本属性</div>
       </div>
-      <!-- 步骤条 -->
-      <div class="stepsColor common">
-        <div class="stepsOne common">
-          <div :class="active ? 'one_class common' : 't_class common'">1</div>
-          <div :class="active ? 'two_class' : 'w_class'">基本属性&商品描述</div>
-        </div>
-        <div class="line" />
-        <div class="stepsTwo common">
-          <div :class="active ? 't_class common' : 'one_class common'">2</div>
-          <div :class="active ? 'w_class' : 'two_class' ">基本属性&商品描述</div>
-        </div>
+      <div class="line" />
+      <div class="stepsTwo common">
+        <div :class="active ? 't_class common' : 'one_class common'">2</div>
+        <div :class="active ? 'w_class' : 'two_class' ">商品描述</div>
       </div>
-    </el-card>
+    </div>
     <!-- 商品 -->
     <div class="addCom common">
       <div v-if="active">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding: 40px 40px;">
-          <div class="leftCom">
-            <el-form-item label="商品名称" prop="productName">
-              <el-input v-model="form.productName" maxlength="50" show-word-limit />
-            </el-form-item>
-            <el-form-item label="卖点简介">
-              <el-input v-model="form.productBrief" maxlength="50" show-word-limit />
-            </el-form-item>
-            <el-form-item>
-              <Tinymce v-if="showTinymce" ref="content" v-model="form.productText" class="tinymce-wrap" :height="200" />
-            </el-form-item>
-          </div>
-          <div class="rightCom">
-            <el-form-item label="官方分类" prop="classifyId">
-              <el-cascader
-                v-model="form.classifyId"
-                :options="classifyList"
-                clearable
-                :props="{
-                  checkStrictly: false,
-                  label:'categoryName',
-                  value:'id',
-                  children:'childs'
-                }"
-                @change="handleChangeCascader"
-              />
-            </el-form-item>
-
-            <el-form-item label="商品分组" prop="shopGroupId">
-              <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
-                <el-option
-                  v-for="(item,index) in groupList"
-                  :key="index"
-                  :label="item.groupName"
-                  :value="item.shopGroupId"
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="padding:10px 20px;">
+          <el-form-item label="商品名称" prop="productName">
+            <el-input v-model="form.productName" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="官方分类" prop="classifyId">
+                <el-cascader
+                  v-model="form.classifyId"
+                  :options="classifyList"
+                  clearable
+                  :props="{
+                    checkStrictly: false,
+                    label:'categoryName',
+                    value:'id',
+                    children:'childs'
+                  }"
+                  style="width: 100%"
+                  @change="handleChangeCascader"
                 />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="品牌">
-              <el-select
-                v-model="form.brandId"
-                clearable
-                placeholder="请选择品牌"
-              >
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.id"
-                  :label="item.brandName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item class="form-item-long" label="供应商">
-              <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
-            </el-form-item>
-            <el-form-item class="form-item-long" label="成本价" prop="cost">
-              <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
-            </el-form-item>
-            <el-form-item label="需要物流" prop="ifLogistics">
-              <el-radio-group v-model="form.ifLogistics">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="上架状态" prop="shelveState">
-              <el-radio-group v-model="form.shelveState">
-                <el-radio :label="1">上架</el-radio>
-                <el-radio :label="0">下架</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="允许超卖" prop="ifOversold">
-              <el-radio-group v-model="form.ifOversold">
-                <el-radio :label="1">允许</el-radio>
-                <el-radio :label="0">不允许</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="积分兑换" prop="ifCredit">
-              <el-radio-group v-model="form.ifCredit">
-                <el-radio :label="1">允许</el-radio>
-                <el-radio :label="0">不允许</el-radio>
-              </el-radio-group>
-              <p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
-            </el-form-item>
-            <el-form-item v-if="form.ifCredit" class="form-item-long" label="单笔最大抵扣" prop="creditLimit">
-              <!-- <el-input v-model="form.creditLimit" type="number" placeholder="请输入单笔最大抵扣" /> -->
-              <el-input-number v-model="form.creditLimit" :controls="false" :min="0" :precision="0" placeholder="请输入单笔最大抵扣" />
-              <p style="color: #cf0f0f; height: 25px; line-height: 25px;margin-top: 10px">限制一笔订单中该商品最多抵扣多少积分</p>
-              <p style="color: #cf0f0f; height: 25px; line-height: 25px">( 注：1积分 = {{ integralProportion }}元 请输入整数 )</p>
-            </el-form-item>
-          <!--            <el-form-item label="花呗分期">-->
-          <!--              <el-radio-group v-model="form.ifHuabei">-->
-          <!--                <el-radio :label="1">支持</el-radio>-->
-          <!--                <el-radio :label="0">不支持</el-radio>-->
-          <!--              </el-radio-group>-->
-          <!--            </el-form-item>-->
-          </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="商品分组" prop="shopGroupId">
+                <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable style="width: 100%">
+                  <el-option
+                    v-for="(item,index) in groupList"
+                    :key="index"
+                    :label="item.groupName"
+                    :value="item.shopGroupId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="品牌">
+                <el-select
+                  v-model="form.brandId"
+                  clearable
+                  placeholder="请选择品牌"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.id"
+                    :label="item.brandName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="form-item-long" label="供应商">
+                <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
+                <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="需要物流" prop="ifLogistics">
+                <el-radio-group v-model="form.ifLogistics">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="上架状态" prop="shelveState">
+                <el-radio-group v-model="form.shelveState">
+                  <el-radio :label="1">上架</el-radio>
+                  <el-radio :label="0">下架</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="允许超卖" prop="ifOversold">
+                <el-radio-group v-model="form.ifOversold">
+                  <el-radio :label="1">允许</el-radio>
+                  <el-radio :label="0">不允许</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+           
+          </el-row>
+          <el-form-item label="卖点简介">
+            <el-input v-model="form.productBrief" maxlength="50" show-word-limit />
+          </el-form-item>
+          <el-form-item>
+            <Tinymce v-if="showTinymce" ref="content" v-model="form.productText" class="tinymce-wrap" :height="200" />
+          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="积分兑换" prop="ifCredit">
+                <el-radio-group v-model="form.ifCredit">
+                  <el-radio :label="1">允许</el-radio>
+                  <el-radio :label="0">不允许</el-radio>
+                </el-radio-group>
+                <p style="color: #cf0f0f">开启积分兑换后，积分所抵扣的金额由商户承担</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="form.ifCredit">
+              <el-form-item class="form-item-long" label="单笔最大抵扣" prop="creditLimit">
+                <el-input-number v-model="form.creditLimit" :controls="false" :min="0" :precision="0" placeholder="请输入单笔最大抵扣" />
+                <p style="color: #cf0f0f; height: 25px; line-height: 25px;margin-top: 10px">限制一笔订单中该商品最多抵扣多少积分</p>
+                <p style="color: #cf0f0f; height: 25px; line-height: 25px">( 注：1积分 = {{ integralProportion }}元 请输入整数 )</p>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
         </el-form>
       </div>
-      <div v-if="!active" class="centerCom">
+      <div v-if="!active" style="width: 100%;">
         <el-form ref="form" :model="params" label-width="80px">
           <StyleInformation :form="params" />
         </el-form>
@@ -143,6 +145,12 @@
     >
       <img width="100%" :src="dialogImageUrl" alt>
     </el-dialog>
+    <div style="padding: 20px;">
+      <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
+      <el-button v-if="active"  style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
+      <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="save">保存</el-button>
+      <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
+    </div>
   </div>
 </template>
 
@@ -160,7 +168,7 @@ import {
   getSelect
 } from '@/api/account';
 import { uploadUrl } from '@/utils/request'
-import StyleInformation from './addComponent'
+import StyleInformation from '@/views/stockControl/inventory/addComponent'
 export default {
   components: {
     Tinymce,
@@ -173,12 +181,11 @@ export default {
     },
     showTinymce: {
       type: Boolean
-    },
-    message: {
-        type: String,
-        default: ''
-      }
+    }
   },
+  watch: {
+
+      },
   data() {
     // const checkCreditLimit = (rule, value, callback) => {
     //   console.log(this.form.ifCredit)
@@ -409,7 +416,7 @@ export default {
         ifCredit: '',
         creditLimit: '',
         ifHuabei: 1,
-        cost:0,
+        cost:null,
         productText: '',
         images: [],
         deletes: [],
@@ -447,6 +454,7 @@ export default {
         collects: 0,
         groupId: '',
         imgs: [],
+        cost:null,
         deletes: [],
         isDelete: 0,
         limitCount: 0,
@@ -540,7 +548,6 @@ export default {
       if (this.productId) {
         this.form.productId = this.productId
         const sku = JSON.parse(sessionStorage.getItem('form'))
-        console.log(sku)
         sku.forEach((element, i) => {
           for (let index = 0; index < this.form.skus.length; index++) {
             if (i === index) {
@@ -549,8 +556,8 @@ export default {
           }
         })
         console.log(this.form, 'this.form')
+        
         const res = await getClassifyUpdate(this.form)
-        console.log(res)
         if (res.code === '') {
           this.$message({
             type: 'success',
@@ -559,14 +566,7 @@ export default {
           this.back()
         }
       } else {
-        console.log('message1',this.message)
-        if(this.message != ''){
-           const formData = new FormData();
-           formData.append('combinationId', this.message);
-           for (let [key, value] of formData.entries()) {
-             this.form[key] = value;
-           }
-        }
+
         const res = await getClassifyAdd(this.form)
         if (res.code === '') {
           this.$message({
@@ -634,13 +634,16 @@ export default {
   margin-right: 30px;
 }
 .addTitle {
-  font-size: 20px;
+  font-size: 14px;
   color: #333333;
   line-height: 50px;
 }
 .stepsColor{
   font-size: 20px;
   line-height: 40px;
+  width: 50%;
+  margin: 0 auto;
+  padding: 15px 0;
   .one_class {
     width: 40px;
     background: #3F9B6A;
@@ -678,9 +681,12 @@ export default {
   margin: 10px 0;
   justify-content: space-around;
   align-items: unset;
+  // width: 100%;
+  padding:0 20px;
+  
   .el-form{
-    display: flex;
-    padding: 40px 0;
+    //  display: flex;
+    padding: 0px 10px 10px;
   }
   .leftCom {
     width: 65%;
diff --git a/merchant-web-master/src/views/stockControl/inventory/addComponent copy.vue b/merchant-web-master/src/views/stockControl/inventory/addComponent copy.vue
new file mode 100644
index 0000000..7bacabf
--- /dev/null
+++ b/merchant-web-master/src/views/stockControl/inventory/addComponent copy.vue
@@ -0,0 +1,700 @@
+<template>
+  <div class="style-information-component">
+    <el-form-item label="商品图片" />
+    <div class="upload-wrap">
+      <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
+      @changimg="e=>changimg(e,'imgs')"></upimg>
+      <!-- <el-upload
+        list-type="picture-card"
+        :on-preview="handlePictureCardPreview"
+        :on-remove="handleRemove"
+        :headers="headers"
+        :data="dataObj"
+        :file-list="form.imgs"
+        :limit="20"
+        :on-success="handleImageSuccess"
+        :action="action"
+      >
+        <i slot="default" class="el-icon-plus" />
+        <div slot="file" slot-scope="{ file }">
+          <img class="el-upload-list__item-thumbnail" :src="file.imgPath">
+          <span class="el-upload-list__item-actions">
+            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+              <i class="el-icon-zoom-in" />
+            </span>
+            <span class="el-upload-list__item-delete" @click="handleRemove(file)">
+              <i class="el-icon-delete" />
+            </span>
+          </span>
+        </div>
+      </el-upload> -->
+    </div>
+    <el-form-item label="款式设置">
+      <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
+        <el-radio :label="0">单款式</el-radio>
+        <el-radio :label="1">多款式</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div class="style-container">
+      <div v-if="form.attrStyle === 0" class="single-style">
+        <el-table
+          :data="skuList"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+        >
+          <el-table-column label="规格">
+            <template slot-scope="scope">
+              <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
+            </template>
+          </el-table-column>
+          <el-table-column label="售价">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
+              <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
+          <el-table-column label="原价">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
+              <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
+          <el-table-column label="库存">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.stockNumber" type="number" oninput="value=value.replace(/[^\d]/g,'')" /> -->
+              <el-input-number v-model="scope.row.stockNumber" :controls="false" :min="0" :precision="0" />
+            </template>
+          </el-table-column>
+          <el-table-column label="重量(KG)">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.weight" type="number" oninput="value=value.replace(/-/, '')" /> -->
+              <el-input-number v-model="scope.row.weight" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
+          <el-table-column label="国际条码">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.sku" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-else class="multiple-styles">
+        <div v-for="(skuAttr, index) in form.skuAttrList" :key="index" class="sku-attr-list">
+          <el-form-item label="规格名">
+            <el-input v-model="skuAttr.skuName" maxlength="20" />
+            <i v-if="index != 0" class="el-icon-close delImg" @click="delSkuAttrList(index)" />
+            <el-checkbox
+              v-if="index === 0"
+              v-model="skuAttr.needImg"
+              style="margin-left: 20px;"
+            >需要配图</el-checkbox>
+          </el-form-item>
+          <el-form-item label="规格值">
+            <div class="attr-value-list">
+              <div
+                v-for="(sku, index1) in skuAttr.values"
+                :key="index + '-' + index1"
+                class="main-diagram m-8"
+              >
+                <el-input v-model="sku.skuValue" maxlength="10" />
+                <i v-if="index === 0 && index1 === 0" />
+                <i v-else class="el-icon-close delImg" @click="delValue(index,index1)" />
+                <div v-if="skuAttr.needImg && index === 0" class="upload-wrap diagram-upload">
+                  <div class="span-wrap">
+                    <el-upload
+                      list-type="picture-card"
+                      :show-file-list="false"
+                      :on-preview="handlePictureCardPreview"
+                      :on-remove="handleRemove"
+                      :headers="headers"
+                      :data="dataObj"
+                      :file-list="[sku]"
+                      :multiple="false"
+                      :on-success="handleImageSuccess1"
+                      :action="action"
+                    >
+                      <i v-if="!sku.image" slot="trigger" class="el-icon-plus" />
+                      <div v-else class="attr-value-img">
+                        <img class="attr-thumbnail" :src="sku.image">
+                      </div>
+                    </el-upload>
+                    <div v-if="sku.image" class="attr-actions">
+                      <span
+                        class="attr-preview"
+                        @click="handlePictureCardPreview({imgPath:sku.image})"
+                      >
+                        <i class="el-icon-zoom-in" />
+                      </span>
+                      <span class="attr-delete" @click="handleRemove1(sku)">
+                        <i class="el-icon-delete" />
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="tableBtn greens" style="margin-left: 10px;" @click="addAttrValue(index)">添加</div>
+            </div>
+          </el-form-item>
+        </div>
+        <el-button class="add-attr-btn" style="background-color: #3F9B6A;color: #fff" @click="addSkuAttrList">添加规格</el-button>
+        <el-table
+          :data="skuList"
+           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+        >
+          <el-table-column
+            v-for="(skuAttr, index) in skuAttrName"
+            :key="index"
+            :label="skuAttr.skuName"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.skuAttrCodeDTOList &&
+                  scope.row.skuAttrCodeDTOList[index]
+                  | attrValueFilter(form.skuAttrList)
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="售价">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
+              <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
+          <el-table-column label="原价">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
+              <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="成本">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.cost" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column> -->
+          <el-table-column label="库存">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.stockNumber" type="number" oninput="value=value.replace(/[^\d]/g,'')" /> -->
+              <el-input-number v-model="scope.row.stockNumber" :controls="false" :min="0" :precision="0" />
+            </template>
+          </el-table-column>
+          <el-table-column label="重量(KG)">
+            <template slot-scope="scope">
+              <!-- <el-input v-model="scope.row.weight" type="number" oninput="value=value.replace(/-/, '')" /> -->
+              <el-input-number v-model="scope.row.weight" :controls="false" :min="0" :precision="6" :step="0.01" />
+            </template>
+          </el-table-column>
+          <el-table-column label="国际条码">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.sku" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" @click="delAttrValue(scope.row,scope.$index,scope.row,scope)">删除</el-button>
+            </template>
+          </el-table-column> -->
+        </el-table>
+      </div>
+    </div>
+    <el-dialog
+      :append-to-body="true"
+      :visible.sync="dialogVisible"
+      title="查看图片"
+      center
+       custom-class="bian_css"
+    >
+      <img width="100%" :src="dialogImageUrl" alt>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { uploadUrl } from '@/utils/request'
+import { getToken } from '@/utils/auth'
+import upimg from "@/components/ImageUpload/index"
+export default {
+  components: {
+      upimg
+    },
+  filters: {
+    attrValueFilter(map, list) {
+      const hasChilds =
+        list &&
+        list.filter(skuAttr => {
+          const hasChild = skuAttr.values.some(attr => {
+            return attr.skuValue
+          })
+          return skuAttr.skuName && hasChild
+        })
+      if (!map) {
+        return ''
+      }
+      const { code, valueCode } = map
+      let codeStr = ''
+      hasChilds.map(item => {
+        const { values } = item
+        values &&
+          values.some(attr => {
+            const isSome = item.code === code && attr.valueCode === valueCode
+            if (isSome) {
+              codeStr = attr.skuValue
+            }
+            return isSome
+          })
+      })
+      return codeStr
+    }
+  },
+  props: {
+    form: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+      newform: this.form,
+      headers: {
+        'Authorization-business': getToken()
+      },
+      action: uploadUrl,
+      dataObj: {
+        folderId: 1
+      },
+      fileList: []
+    }
+  },
+  computed: {
+    skuAttrName() {
+      return (
+        this.form.skuAttrList &&
+        this.form.skuAttrList.filter(skuAttr => {
+          const hasChilds = skuAttr.values.some(attr => {
+            return attr.skuValue
+          })
+          return skuAttr.skuName && hasChilds
+        })
+      )
+    },
+    singleStyle() {
+      if (this.form.skuAttrList && this.form.skuAttrList[0]) {
+        return this.form.skuAttrList && this.form.skuAttrList[0].values[0]
+      }
+      return {
+        skuValue: ''
+      }
+    },
+    skuList() {
+      if (this.form.attrStyle === 0) {
+        return this.form.skuList.slice(0, 1)
+      }
+      return this.form.skuList
+    }
+  },
+  watch: {
+    'form.skuAttrList': {
+      handler(newVal, oldVal) {
+        // 判断是否有规格值
+        const hasChilds =
+          this.form.skuAttrList &&
+          this.form.skuAttrList.filter(skuAttr => {
+            const hasChild = skuAttr.values.some(attr => {
+              return attr.skuValue
+            })
+            return skuAttr.skuName && hasChild
+          })
+        if (this.form.attrStyle === 1 && hasChilds.length) {
+          this.skuFormat()
+        }
+        // console.log(newVal);
+        // console.log(oldVal);
+      },
+      deep: true
+    },
+    'form.skuList': {
+      handler(newVal, oldVal) {
+        // console.log(newVal);
+        // console.log(oldVal);
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.headers.tenant = 'MDAwMA=='
+  },
+  methods: {
+    imgsGeshi(val){
+      let arr = []
+      val.forEach(item => {
+        arr.push(item.imgPath)
+      });
+      arr = arr.join(',')
+      return arr
+    },
+    changimg(e, type) {
+      e = e.split(',')
+      this.form.imgs = []
+       e.map(item => {
+        this.form.imgs.push({
+          imgPath: item
+        })
+        })
+      },
+    // proving1(e) {
+    //   var keynum = window.event ? e.keyCode : e.which // 获取键盘码
+    //   // var keychar = String.fromCharCode(keynum) // 获取键盘码对应的字符
+    //   console.log(
+    //     e.key
+    //       .replace(/[^\d^\.]+/g, '')
+    //       .replace('.', '$#$')
+    //       .replace(/\./g, '')
+    //       .replace('$#$', '.')
+    //   )
+    //   console.log(keynum)
+    //   if (
+    //     e.key
+    //       .replace(/[^\d^\.]+/g, '')
+    //       .replace('.', '$#$')
+    //       .replace(/\./g, '')
+    //       .replace('$#$', '.') === '' &&
+    //     keynum !== 8
+    //   ) {
+    //     this.$message.warning('禁止输入中文或空')
+    //     e.target.value = ' '
+    //   }
+    // },
+    handleImageSuccess(response) {
+      const url = response.data.url
+      this.form.imgs.push({
+        imgPath: url
+      })
+    },
+    // 移除图片
+    handleRemove(file) {
+      const { imgPath } = file
+      this.form.imgs = this.form.imgs.filter(item => {
+        return item.imgPath !== imgPath
+      })
+    },
+    handleRemove1(file) {
+      file.image = ''
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.imgPath
+      this.dialogVisible = true
+    },
+    handleImageSuccess1(response, file, fileList) {
+      const url = response.data.url
+      fileList[0].image = url
+    },
+    del(row, index, arr) {
+      console.log(row, index)
+      // this.form.skuList.splice(index, 1);
+      // console.log(this.form.skuAttrList);
+      // console.log(this.form.skuList);
+      console.log(arr)
+    },
+    //
+    changeAttrStyle(index) {
+      console.log(index)
+      console.log(this.form)
+      // if (index === 0) {
+      //   this.form.skuAttrList = []
+      // }
+    },
+    addSkuAttrList() {
+      this.form.skuAttrList.push({
+        code: '',
+        skuName: '',
+        values: [
+          {
+            skuValue: '',
+            valueCode: '',
+            image: '',
+            isDelete: 0,
+            sortOrder: 0
+          }
+        ],
+        isDelete: 0,
+        needImg: 0,
+        sortOrder: 0
+      })
+    },
+    addAttrValue(index) {
+      this.form.skuAttrList[index].values.push({
+        skuValue: '',
+        valueCode: '',
+        image: ''
+      })
+    },
+    // 删除规格值
+    delValue(index, index1) {
+      const newList = JSON.parse(JSON.stringify(this.form.skuAttrList[index]))
+      const valueObj = {
+        code: newList.code,
+        skuId: newList.skuId,
+        valueCode: newList.values[index1].valueCode
+      }
+      this.form.deletes.push(valueObj)
+      this.form.skuAttrList[index].values.splice(index1, 1)
+    },
+    // 删除规格名
+    delSkuAttrList(index) {
+      const newList = JSON.parse(JSON.stringify(this.form.skuAttrList[index]))
+      newList.values.forEach(item => {
+        const valueObj = {
+          code: newList.code,
+          skuId: newList.skuId,
+          valueCode: ''
+        }
+        valueObj.valueCode = item.valueCode
+        this.form.deletes.push(valueObj)
+      })
+      this.form.skuAttrList.splice(index, 1)
+    },
+    delAttrValue1(row, index, arr) {
+
+    },
+    skuFormat() {
+      const skuListArray = []
+      const result = {
+        isDelete: 0,
+        productId: '',
+        skuAttrCodeDTOList: [
+          {
+            code: '',
+            valueCode: ''
+          }
+        ],
+        sku: '',
+        skuImg: '',
+        price: 0,
+        originalPrice: 0,
+        stockNumber: 0,
+        weight: 0
+      }
+      const doExchange = (arr, depth) => {
+        const map = {
+          arr: []
+        }
+        for (var i = 0; i < arr[depth].length; i++) {
+          map.arr.push(arr[depth][i])
+          const { code, valueCode, attrId } = arr[depth][i]
+          result.skuAttrCodeDTOList[depth] = {
+            code,
+            valueCode,
+            attrId
+          }
+          if (depth !== arr.length - 1) {
+            doExchange(arr, depth + 1)
+          } else {
+            skuListArray.push(JSON.parse(JSON.stringify(result)))
+          }
+        }
+      }
+      // this.form.skuList  = skuListArray
+      // 获取规格值的所有组合
+      const values = []
+      this.form.skuAttrList.map((skuItem, index) => {
+        const attrList = []
+        skuItem.code = skuItem.code || 'attr_code_' + index
+        const { code } = skuItem
+        skuItem.values &&
+          skuItem.values.map((attrItem, index1) => {
+            attrItem.valueCode = skuItem.valueCode || code + '_value_' + index1
+            const skuId = attrItem.skuId
+            const attrId = attrItem.attrId
+            if (attrItem.skuValue) {
+              attrList.push({
+                skuId,
+                attrId,
+                code,
+                valueCode: attrItem.valueCode
+              })
+            }
+          })
+        if (attrList.length) {
+          values.push(attrList)
+        }
+      })
+      // 相互组合
+      if (values.length) {
+        doExchange(values, 0)
+      }
+      this.form.skuList = skuListArray.map(sku1 => {
+        const { skuAttrList, skuAttrCodeDTOList } = sku1
+        const skuAttrList1 = skuAttrCodeDTOList || skuAttrList
+        const skuMap = this.form.skuList.filter(sku2 => {
+          const skuAttrList2 = sku2.skuAttrList
+          sku2.skuAttrCodeDTOList = skuAttrList2
+          if (!skuAttrList2) return false
+          const ids = []
+          skuAttrList1.filter(item => ids.push(item.id))
+          const result = skuAttrList2.every(
+            item => ids.indexOf(item.attrValueId) !== -1
+          )
+          return result
+        })
+        let selectMap = sku1
+        if (skuMap && skuMap.length) {
+          selectMap = JSON.parse(JSON.stringify(skuMap[0]))
+          selectMap.skuAttrCodeDTOList = skuAttrCodeDTOList
+        }
+        return selectMap
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import url("../../../styles/elDialog.scss");
+.style-information-component {
+  width: 100%;
+  min-height: 300px;
+  padding: 24px;
+  background-color: rgb(255, 255, 255);
+  .el-form-item {
+    margin-bottom: 10px;
+  }
+  .attr-value-list {
+    display: flex;
+    flex-wrap: wrap;
+    .main-diagram {
+      width: 180px;
+      .span-wrap {
+        position: relative;
+        display: inline-block;
+        margin-top: 10px;
+        .attr-actions {
+          line-height: 100px;
+          position: absolute;
+          width: 100%;
+          height: 100%;
+          left: 0;
+          top: 0;
+          cursor: default;
+          text-align: center;
+          color: #fff;
+          opacity: 0;
+          font-size: 20px;
+          background-color: rgba(0, 0, 0, 0.5);
+          -webkit-transition: opacity 0.3s;
+          transition: opacity 0.3s;
+          z-index: 1;
+          &:hover {
+            opacity: 1;
+            .attr-preview {
+              display: inline-block;
+            }
+            i {
+              color: #fff;
+              font-size: 20px;
+            }
+          }
+        }
+        .attr-preview {
+          display: none;
+          cursor: pointer;
+          font-size: 20px;
+          color: #fff;
+        }
+        .attr-delete {
+          margin-left: 15px;
+          color: #fff;
+        }
+      }
+      .attr-value-img {
+        width: 100%;
+        height: 100%;
+        img {
+          width: 100%;
+          height: 100%;
+          object-fit: contain;
+        }
+      }
+    }
+  }
+  .m-8 {
+    margin-right: 8px;
+  }
+  .upload-btn {
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 110px;
+    cursor: pointer;
+    border: 2px dashed #2e60f8;
+    border-radius: 2px;
+    background-color: #f8f9fb;
+    text-align: center;
+    font-size: 20px;
+    color: #2e60f8;
+    i {
+      color: #2e60f8;
+      font-size: 20px;
+    }
+    .upload-title {
+      margin-left: 10px;
+      font-size: 14px;
+    }
+  }
+  .upload-wrap {
+    margin-bottom: 25px;
+    .el-upload-list__item {
+      transition: none !important;
+    }
+    .el-upload,
+    .el-upload-list__item {
+      width: 100px;
+      height: 100px;
+      line-height: 100px;
+    }
+    .el-progress,
+    .el-progress-circle {
+      width: 80px !important;
+      height: 80px !important;
+    }
+  }
+  .sku-attr-list {
+    .el-input {
+      width: 180px;
+    }
+  }
+  .single-style {
+    .el-input {
+      max-width: 180px;
+    }
+  }
+  .add-attr-btn {
+    margin-bottom: 25px;
+  }
+  .check-image-dialog {
+    .el-dialog {
+      margin-top: 25px;
+      .el-dialog__body {
+        img {
+          max-width: 100%;
+          max-height: 100%;
+          height: 500px;
+          object-fit: contain;
+        }
+      }
+    }
+  }
+  .delImg{
+    position: absolute;
+    top: 12px;
+    margin-left: -24px
+  }
+  .delImg:hover{
+    border-radius: 50%;
+    color: #ffffff;
+    background:#2e60f8;
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/merchant-web-master/src/views/stockControl/inventory/addComponent.vue b/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
index 7bacabf..fd78335 100644
--- a/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
@@ -1,58 +1,55 @@
 <template>
   <div class="style-information-component">
-    <el-form-item label="商品图片" />
-    <div class="upload-wrap">
-      <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
-      @changimg="e=>changimg(e,'imgs')"></upimg>
-      <!-- <el-upload
-        list-type="picture-card"
-        :on-preview="handlePictureCardPreview"
-        :on-remove="handleRemove"
-        :headers="headers"
-        :data="dataObj"
-        :file-list="form.imgs"
-        :limit="20"
-        :on-success="handleImageSuccess"
-        :action="action"
-      >
-        <i slot="default" class="el-icon-plus" />
-        <div slot="file" slot-scope="{ file }">
-          <img class="el-upload-list__item-thumbnail" :src="file.imgPath">
-          <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-              <i class="el-icon-zoom-in" />
-            </span>
-            <span class="el-upload-list__item-delete" @click="handleRemove(file)">
-              <i class="el-icon-delete" />
+    <el-form-item label="商品图片" >
+      <div class="upload-wrap">
+        <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
+                      @changimg="e=>changimg(e,'imgs')"></upimg>
+        <!-- <el-upload
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :headers="headers"
+          :data="dataObj"
+          :file-list="form.imgs"
+          :limit="20"
+          :on-success="handleImageSuccess"
+          :action="action"
+        >
+          <i slot="default" class="el-icon-plus" />
+          <div slot="file" slot-scope="{ file }">
+            <img class="el-upload-list__item-thumbnail" :src="file.imgPath">
+            <span class="el-upload-list__item-actions">
+              <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                <i class="el-icon-zoom-in" />
+              </span>
+              <span class="el-upload-list__item-delete" @click="handleRemove(file)">
+                <i class="el-icon-delete" />
+              </span>
             </span>
-          </span>
-        </div>
-      </el-upload> -->
-    </div>
-    <el-form-item label="款式设置">
-      <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
-        <el-radio :label="0">单款式</el-radio>
-        <el-radio :label="1">多款式</el-radio>
-      </el-radio-group>
+          </div>
+        </el-upload> -->
+      </div>
     </el-form-item>
-    <div class="style-container">
+    <el-form-item label="规格设置">
+      <div class="style-container" >
       <div v-if="form.attrStyle === 0" class="single-style">
         <el-table
           :data="skuList"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+
+         :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         >
           <el-table-column label="规格">
             <template slot-scope="scope">
               <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
             </template>
           </el-table-column>
-          <el-table-column label="售价">
+          <el-table-column label="售价(/元)">
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
               <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
             </template>
           </el-table-column>
-          <el-table-column label="原价">
+          <el-table-column label="原价(/元)">
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
               <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
@@ -131,76 +128,28 @@
                   </div>
                 </div>
               </div>
-              <div class="tableBtn greens" style="margin-left: 10px;" @click="addAttrValue(index)">添加</div>
+              <el-button type="primary" style="margin-left: 10px;" @click="addAttrValue(index)">添加</el-button>
             </div>
           </el-form-item>
         </div>
-        <el-button class="add-attr-btn" style="background-color: #3F9B6A;color: #fff" @click="addSkuAttrList">添加规格</el-button>
-        <el-table
-          :data="skuList"
-           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-        >
-          <el-table-column
-            v-for="(skuAttr, index) in skuAttrName"
-            :key="index"
-            :label="skuAttr.skuName"
-          >
-            <template slot-scope="scope">
-              {{
-                scope.row.skuAttrCodeDTOList &&
-                  scope.row.skuAttrCodeDTOList[index]
-                  | attrValueFilter(form.skuAttrList)
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column label="售价">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
-              <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
-            </template>
-          </el-table-column>
-          <el-table-column label="原价">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
-              <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="成本">
-            <template slot-scope="scope">
-              <el-input-number v-model="scope.row.cost" :controls="false" :min="0" :precision="2" :step="0.01" />
-            </template>
-          </el-table-column> -->
-          <el-table-column label="库存">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.stockNumber" type="number" oninput="value=value.replace(/[^\d]/g,'')" /> -->
-              <el-input-number v-model="scope.row.stockNumber" :controls="false" :min="0" :precision="0" />
-            </template>
-          </el-table-column>
-          <el-table-column label="重量(KG)">
-            <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.weight" type="number" oninput="value=value.replace(/-/, '')" /> -->
-              <el-input-number v-model="scope.row.weight" :controls="false" :min="0" :precision="6" :step="0.01" />
-            </template>
-          </el-table-column>
-          <el-table-column label="国际条码">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.sku" />
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" @click="delAttrValue(scope.row,scope.$index,scope.row,scope)">删除</el-button>
-            </template>
-          </el-table-column> -->
-        </el-table>
+        <el-button class="add-attr-btn" type="primary" @click="addSkuAttrList">添加规格</el-button>
+
       </div>
     </div>
+    </el-form-item>
+    <!-- <el-form-item label="款式设置" >
+      <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
+        <el-radio :label="0">单款式</el-radio>
+        <el-radio :label="1">多款式</el-radio>
+      </el-radio-group>
+    </el-form-item> -->
+
     <el-dialog
       :append-to-body="true"
       :visible.sync="dialogVisible"
+      class="check-image-dialog"
       title="查看图片"
-      center
-       custom-class="bian_css"
+      center="center"
     >
       <img width="100%" :src="dialogImageUrl" alt>
     </el-dialog>
diff --git a/merchant-web-master/src/views/stockControl/inventory/index.vue b/merchant-web-master/src/views/stockControl/inventory/index.vue
index b9f6da9..1dc188f 100644
--- a/merchant-web-master/src/views/stockControl/inventory/index.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/index.vue
@@ -1,61 +1,48 @@
 <!--  -->
 <template>
   <div style="padding: 0 10px;background-color:#f7f7f7;">
-    <div class="pending">
+    <div class="pending" v-if ="ontype == '1'">
       <!-- 搜索 -->
       <div class="formSearch" style="margin-bottom:10px">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item label="商品名称">
-            <el-input v-model="formInline.search" placeholder="请输入商品名称"  />
+            <el-input v-model="formInline.search" placeholder="请输入商品名称" />
           </el-form-item>
           <el-form-item label="上架状态">
-            <el-select v-model="formInline.shelveState" placeholder="请选择上架状态" >
+            <el-select v-model="formInline.shelveState" placeholder="请选择上架状态">
               <el-option label="全部" :value="null" />
               <el-option label="上架" value="1" />
               <el-option label="下架" value="0" />
             </el-select>
           </el-form-item>
           <el-form-item label="官方分类">
-            <el-cascader
-
-              v-model="formInline.classifyId"
-              :options="categoryList"
-              clearable
-              :props="{
+            <el-cascader v-model="formInline.classifyId" :options="categoryList" clearable :props="{
                 checkStrictly: true,
                 expandTrigger: 'hover',
                 label:'categoryName',
                 value:'id',
                 children:'childs'
-              }"
-            />
+              }" />
           </el-form-item>
         </el-form>
         <div>
-          <el-button  style="background-color: #3F9B6A;color: #fff" @click="search"   >查询</el-button>
-          <el-button  @click="clear"   class="buttonHover"
+          <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
+          <el-button @click="clear" class="buttonHover"
             style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
         </div>
 
       </div>
       <div style="margin-bottom:20px;">
-        <el-button style="background-color: #3F9B6A;color: #fff" @click="rukdengji"  >入库登记</el-button>
-        <el-button style="background-color: #3F9B6A;color: #fff" @click="shopzuhe"  >商品组合</el-button>
-        <el-button  style="background-color: #3F9B6A;color: #fff" @click="productDataExport"   >导出商品</el-button>
+        <!-- <el-button style="background-color: #3F9B6A;color: #fff" @click="rukdengji"  >入库登记</el-button> -->
+        <el-button style="background-color: #3F9B6A;color: #fff" @click="rukdengji">补货</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff" @click="shopzuhe">商品组合</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff" @click="productDataExport">导出商品</el-button>
       </div>
       <!-- 表格 -->
       <div class="tableBox">
-        <el-table
-          ref="multipleTable"
-          :data="tableData"
-          tooltip-effect="dark"
-           @selection-change="handleSelectionChange"
-        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-        >
-        <el-table-column
-            type="selection"
-            v-if="teble_sel"
-            min-width="4%">
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" @selection-change="handleSelectionChange"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column type="selection" v-if="teble_sel" min-width="4%">
           </el-table-column>
           <el-table-column prop="productId" label="商品id" show-overflow-tooltip />
           <el-table-column label="商品主图" width="150" align="center">
@@ -85,10 +72,10 @@
           <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
           <el-table-column prop="registrationStatus" label="登记状态" show-overflow-tooltip>
             <template slot-scope="scope">
-                <span v-if="scope.row.registrationStatus==''">未入库</span>
-                <span v-if="scope.row.registrationStatus==1">已入库</span>
-              </template>
-            </el-table-column>
+              <span v-if="scope.row.registrationStatus==''">未入库</span>
+              <span v-if="scope.row.registrationStatus==1">已入库</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="180" />
           <el-table-column label="操作" width="200" fixed="right">
             <template slot-scope="scope">
@@ -96,71 +83,49 @@
                 <div class="tableBtn greens" @click="edit(scope.row)">编辑</div>
                 <div v-if="scope.row.shelveState==0" class="tableBtn greens" @click="down(scope.row)">上架</div>
                 <div v-if="scope.row.shelveState==1" class="tableBtn greens" @click="down(scope.row)">下架</div>
-                <div v-if="scope.row.combinationId != '' && scope.row.stockNumber != 0" class="tableBtn greens" @click="chaiFen(scope.row)" >拆分</div>
-                <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens" >设置会员价</div>
+                <div v-if="scope.row.combinationId != '' && scope.row.stockNumber != 0" class="tableBtn greens"
+                  @click="chaiFen(scope.row)">拆分</div>
+                <div @click="setVipPrice(scope.row)" v-if="scope.row.shelveState==1" class="tableBtn greens">设置会员价</div>
                 <div v-if="scope.row.shelveState!=1" class="tableBtn greens" @click="del(scope.row)">删除</div>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <div class="fenye">
-          <el-pagination
-            :current-page="formInline.page"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-           background
-           small
-           layout="prev, pager, next,total"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
+            small layout="prev, pager, next,total" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
         </div>
-        <div style="padding: 5px 10px 5px 20px;border:1px solid #EBEEF5;display: flex;justify-content: space-between;margin-top: 10px;" v-if="teble_sel">
-            <div style="font-size: 14px;">
-              <span>已选择{{this.zuheNum}}项</span>
-              <div
-             class="tableBtn greens"
-                style="color: #3F9B6A;font-size: 14px;margin-left: 10px;"
-                @click="toggleSelection"
-              >清楚选项</div>
-            </div>
-            <div>
-              <el-button   @click="zuheShop(index)"  style="background-color: #3F9B6A;color: #fff;">{{index==1?'确定登记':'确定组合'}}</el-button>
-              <el-button  @click="selClose"  class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
-            </div>
+        <div
+          style="padding: 5px 10px 5px 20px;border:1px solid #EBEEF5;display: flex;justify-content: space-between;margin-top: 10px;"
+          v-if="teble_sel">
+          <div style="font-size: 14px;">
+            <span>已选择{{this.zuheNum}}项</span>
+            <div class="tableBtn greens" style="color: #3F9B6A;font-size: 14px;margin-left: 10px;"
+              @click="toggleSelection">清楚选项</div>
+          </div>
+          <div>
+            <el-button @click="zuheShop(index)"
+              style="background-color: #3F9B6A;color: #fff;">{{index==1?'确定登记':'确定组合'}}</el-button>
+            <el-button @click="selClose" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+          </div>
         </div>
       </div>
     </div>
 
     <!-- 新增/修改商品弹窗 -->
-    <el-dialog
-      :title="!commId ? '新增商品' : '登记商品'"
-      :visible.sync="commidyVisible"
-      width="70%"
-      center
-   custom-class="bian_css"
-     top="6vh"
-      :close-on-click-modal="false"
-      @before-close="closeModal"
-      @close="closeModal"
-    >
-      <CommAdd
-        ref="child"
-        :show-tinymce="showTinymce"
-        :product-id="commId"
-        @cancel="cancelForm"
-        :message="parentMessage"
-      />
-    </el-dialog>
+    <!-- <el-dialog :title="!commId ? '新增商品' : '登记商品'" :visible.sync="commidyVisible" width="70%" center
+      custom-class="bian_css" top="6vh" :close-on-click-modal="false" @before-close="closeModal" @close="closeModal">
+      <CommAdd ref="child" :show-tinymce="showTinymce" :product-id="commId" @cancel="cancelForm"
+        :message="parentMessage" />
+    </el-dialog> -->
+    <div v-if ="ontype == '2'" class="pending">
+     
+     <CommAdd v-if ="ontype == '2'" ref="child" :show-tinymce="showTinymce" :product-id="commId" @cancel="cancelForm" />
+   </div>
     <!-- 设置会员价弹窗 -->
-    <el-dialog
-      title="设置会员价"
-      :visible.sync="vipPriceVisible"
-      width="50%"
-      class="vipDialog"
-    >
+    <el-dialog title="设置会员价" :visible.sync="vipPriceVisible" width="50%" class="vipDialog">
       <el-form ref="form" label-width="80px">
         <el-form-item label="优惠方式">
           <el-radio-group v-model="mode">
@@ -169,15 +134,15 @@
           </el-radio-group>
         </el-form-item>
         <div class="priceTable">
-          <table >
-            <tr >
-              <th >规格</th>
-              <th >售价</th>
+          <table>
+            <tr>
+              <th>规格</th>
+              <th>售价</th>
               <th v-for="(item,index) in gradeList" :key="index">
                 {{ item }}
               </th>
             </tr>
-            <tr v-for="(item,index) in productData" :key="index" >
+            <tr v-for="(item,index) in productData" :key="index">
               <td>
                 {{ item.value }}
               </td>
@@ -185,46 +150,59 @@
                 {{ item.price }}
               </td>
               <td v-for="(itemJ,indexJ) in item.memberPrices" :key="indexJ" class="td-input">
-                <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" /> {{ mode==1?'折':'元' }}
+                <el-input v-model="itemJ.price" oninput="value=value.replace(/([^\d|\.])/g, '')" />
+                {{ mode==1?'折':'元' }}
               </td>
             </tr>
           </table>
         </div>
-        <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn" @click="clearProductMember">清除所有旧会员价</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff;" class="clearBtn"
+          @click="clearProductMember">清除所有旧会员价</el-button>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="vipPriceVisible = false" class="buttonHover"
-        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
         <el-button style="background-color: #3F9B6A;color: #fff;" @click="vipPriceSubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="入库登记"
-      :visible.sync="rukuShow"
-      width="60%"
-      class="vipDialog"
-    >
-    <el-form ref="form" label-width="80px">
-      <el-form-item label="商品名称">
-  <el-select v-model="shopId" filterable placeholder="请选择">
-    <el-option
-      v-for="item in tableData"
-      :key="item.productId"
-      :label="item.productName"
-      :value="item.productId">
-    </el-option>
-  </el-select>
-      </el-form-item>
-      <el-form-item label="是否登记">
-        <el-radio-group v-model="dengjiMsg" >
-          <el-radio label="1">是</el-radio>
-          <el-radio label="">否</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
+    <!-- <el-dialog title="入库登记" :visible.sync="rukuShow" width="60%" class="vipDialog">
+      <el-form ref="form" label-width="80px">
+        <el-form-item label="商品名称">
+          <el-select v-model="shopId" filterable placeholder="请选择">
+            <el-option v-for="item in tableData" :key="item.productId" :label="item.productName"
+              :value="item.productId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否登记">
+          <el-radio-group v-model="dengjiMsg">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="rukuShow = false" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+        <el-button type="primary" @click="rukuCheck">确 定</el-button>
+      </span>
+    </el-dialog> -->
+    <el-dialog title="补货" :visible.sync="rukuShow" width="60%" class="vipDialog">
+      <el-form ref="form" label-width="80px">
+        <el-form-item label="商品名称">
+          <el-select v-model="shopId" filterable placeholder="请选择" @change="getShopData">
+            <el-option v-for="item in tableData" :key="item.productId" :label="item.productName"
+              :value="item.productId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数量">
+          <el-input-number v-model="num" :min="0" :max="9999" ></el-input-number>
+        </el-form-item>
+      </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="rukuShow = false" class="buttonHover"
-        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
         <el-button type="primary" @click="rukuCheck">确 定</el-button>
       </span>
     </el-dialog>
@@ -232,525 +210,610 @@
 </template>
 
 <script>
-import CommAdd from './addCommodity.vue'
-import { getBtnList, getToken } from '@/utils/auth'
-import { uploadUrl } from '@/utils/request'
-import {
-  getClassifyGetAll,
-  getClassifyDelete,
-  getClassifyStart,
-  downloadTemplate,
-  importProduct,
-  getClassify,
-  getProductMembers,
-  setProductMember,
-  productExport,
-  getBrandList,
-  chFen,
-  getClassifyUpdate
-} from '@/api/commodity'
-export default {
-  components: {
-    CommAdd
-  },
-  data() {
-    // 这里存放数据
-    return {
-      showTinymce: false,
-      btnList: '',
-      activeName: 'first',
-      formInline: {
-        search: '', // 搜索字段
-        shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
-        stock: '', // 库存状态 1-有库存 0-无库存 null-全部
-        classifyId: '', // 最下级分类id
-        page: 1, // 当前页
-        pageSize: 10
-      },
-      batchAdd: false,
-      total: 1,
-      tableData: [],
-      categoryList: [],
-      UploadUrl: uploadUrl,
-      headers: {
-        'Authorization-business': getToken()
-      },
-      productId: 0,
-      commidyVisible: false,
-      commId: 0,
-      brandList: [],
-      zuheNum:0,
-
-      parentMessage: '这是父组件传递给子组件的消息',
-      canst:'' ,//组合商品ID
-      index:1,
-      dengji:[],
-      vipPriceVisible: false,
-      mode: 1,
-      productData: [],
-      gradeList: [],
-      teble_sel:false,
-      rukuShow:false,
-      dengjiMsg:'',
-      shopId:''
-    }
-  },
-  computed: {
-  },
-  mounted() {
-    this.getBrandList()
-    this.getAll(this.formInline)
-    this.queryAllCategory()
-    this.btnList = getBtnList()
-  },
-  // 方法集合
-  methods: {
-    msgList(list){
-      if(list && list!=''){
-        let strin = list.split(',')
-        return strin[0]
-      }
-    },
-    async getBrandList() {
-      const { data } = await getBrandList()
-      this.brandList = data
-    },
-    cancelForm() {
-      this.commidyVisible = false
-      this.formInline = {
-        search: '',
-        shelveState: '',
-        stock: '',
-        classifyId: '',
-        page: 1,
-        pageSize: 10
-      }
-      this.getAll(this.formInline)
-      this.closeModal()
-    },
-    closeModal() {
-      this.showTinymce = false
-      this.$refs.child.last()
-      this.$refs.child.reset()
+  import CommAdd from './addCommodity.vue'
+  import {
+    getBtnList,
+    getToken
+  } from '@/utils/auth'
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  import {
+    getClassifyGetAll,
+    getClassifyDelete,
+    getClassifyStart,
+    downloadTemplate,
+    importProduct,
+    getClassify,
+    getProductMembers,
+    setProductMember,
+    productExport,
+    getBrandList,
+    chFen,
+    getClassifyUpdate,
+    getClassifyGetById
+  } from '@/api/commodity'
+  export default {
+    components: {
+      CommAdd
     },
-    btnClick(id) {
- if (id.permissionName === '新增商品') {
-        this.add()
+    data() {
+      // 这里存放数据
+      return {
+        ontype:'1',
+        num:0,
+        showTinymce: false,
+        btnList: '',
+        activeName: 'first',
+        formInline: {
+          search: '', // 搜索字段
+          shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
+          stock: '', // 库存状态 1-有库存 0-无库存 null-全部
+          classifyId: '', // 最下级分类id
+          page: 1, // 当前页
+          pageSize: 10
+        },
+        batchAdd: false,
+        total: 1,
+        tableData: [],
+        categoryList: [],
+        UploadUrl: uploadUrl,
+        headers: {
+          'Authorization-business': getToken()
+        },
+        productId: 0,
+        commidyVisible: false,
+        commId: 0,
+        brandList: [],
+        zuheNum: 0,
+
+        parentMessage: '这是父组件传递给子组件的消息',
+        canst: '', //组合商品ID
+        index: 1,
+        dengji: [],
+        vipPriceVisible: false,
+        mode: 1,
+        productData: [],
+        gradeList: [],
+        teble_sel: false,
+        rukuShow: false,
+        dengjiMsg: '',
+        shopId: ''
       }
     },
-    handleSizeChange(val) {
-      this.formInline.pageSize = val
-      this.getAll(this.formInline)
-    },
-    handleCurrentChange(val) {
-      this.formInline.page = val
+    computed: {},
+    mounted() {
+      this.getBrandList()
       this.getAll(this.formInline)
+      this.queryAllCategory()
+      this.btnList = getBtnList()
     },
-    //  查询
-    search() {
-      this.total = 1
-      this.formInline.page = 1
-      this.getAll(this.formInline)
-    },
-    // 重置
-    clear() {
-      this.formInline = {
-        search: '', // 搜索字段
-        shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
-        stock: '', // 库存状态 1-有库存 0-无库存 null-全部
-        classifyId: '', // 最下级分类id
-        page: 1, // 当前页
-        pageSize: 10
-      }
-      this.getAll(this.formInline)
-    },
-    // 新增商品
-    add() {
-      this.showTinymce = true
-      if (this.commId) {
+    // 方法集合
+    methods: {
+      getShopData(e){
+        const targetProduct = this.tableData.find(item => item.productId === e)
+        console.log(targetProduct)
+        this.num = targetProduct.stockNumber
+      },
+      msgList(list) {
+        if (list && list != '') {
+          let strin = list.split(',')
+          return strin[0]
+        }
+      },
+      async getBrandList() {
+        const {
+          data
+        } = await getBrandList()
+        this.brandList = data
+      },
+      cancelForm() {
+        this.commidyVisible = false
+        this.ontype = '1'
+        this.formInline = {
+          search: '',
+          shelveState: '',
+          stock: '',
+          classifyId: '',
+          page: 1,
+          pageSize: 10
+        }
+        this.getAll(this.formInline)
+        this.closeModal()
+      },
+      closeModal() {
+        this.showTinymce = false
+        this.$refs.child.last()
         this.$refs.child.reset()
-      }
-      this.commidyVisible = true
-      this.commId = 0
-      // this.$router.push({ name: 'addCommodity', params: { id: '1' }})
-    },
-    // 导出商品
-    async productDataExport() {
-      this.$message({
-        message: '数据导出中，请勿重复操作！',
-        type: 'success'
-      })
-      const res = await productExport(this.formInline)
-      if (!res) { return }
-      const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
-      const fileName = '商品数据明细表.xls'
-      if ('download' in document.createElement('a')) {
-        // 非IE下载
-        const elink = document.createElement('a')
-        elink.download = fileName
-        elink.href = URL.createObjectURL(blob)
-        elink.style.display = 'none'
-        document.body.appendChild(elink)
-        elink.click()
-        URL.revokeObjectURL(elink.href) // 释放URL 对象
-        document.body.removeChild(elink)
-      } else {
-        // IE10+下载
-        navigator.msSaveBlob(blob, fileName)
-      }
-    },
-    // 编辑商品
-    edit(row) {
-      console.log(row)
-      this.showTinymce = true
-      this.commidyVisible = true
-      this.commId = row.productId
-      this.$nextTick(() => {
-        this.$refs.child?.details()
-      })
-    },
-
-    // 删除商品
-    del(row) {
-      this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          getClassifyDelete({ productId: row.productId }).then(res => {
-            if (res.code === '') {
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              })
-              this.getAll(this.formInline)
-            }
-          })
+      },
+      btnClick(id) {
+        if (id.permissionName === '新增商品') {
+          this.add()
+        }
+      },
+      handleSizeChange(val) {
+        this.formInline.pageSize = val
+        this.getAll(this.formInline)
+      },
+      handleCurrentChange(val) {
+        this.formInline.page = val
+        this.getAll(this.formInline)
+      },
+      //  查询
+      search() {
+        this.total = 1
+        this.formInline.page = 1
+        this.getAll(this.formInline)
+      },
+      // 重置
+      clear() {
+        this.formInline = {
+          search: '', // 搜索字段
+          shelveState: '', // 上架状态 1-上架 0-不上架 null-全部
+          stock: '', // 库存状态 1-有库存 0-无库存 null-全部
+          classifyId: '', // 最下级分类id
+          page: 1, // 当前页
+          pageSize: 10
+        }
+        this.getAll(this.formInline)
+      },
+      // 新增商品
+      add() {
+        this.showTinymce = true
+        if (this.commId) {
+          this.$refs.child.reset()
+        }
+        this.commidyVisible = true
+        this.ontype = '2'
+        this.commId = 0
+        // this.$router.push({ name: 'addCommodity', params: { id: '1' }})
+      },
+      // 导出商品
+      async productDataExport() {
+        this.$message({
+          message: '数据导出中，请勿重复操作！',
+          type: 'success'
         })
-        .catch(() => {})
-    },
-    // 商品上下架
-    async down(row) {
-      console.log(row.shelveState)
-      if (row.shelveState) {
-        console.log(111)
-        const res = await getClassifyStart({
-          productId: row.productId,
-          shelveState: 0
+        const res = await productExport(this.formInline)
+        if (!res) {
+          return
+        }
+        const blob = new Blob([res], {
+          type: 'application/vnd.ms-excel'
         })
-        if (res.code === '') {
-          this.$message({
-            type: 'success',
-            message: '下架成功!'
-          })
-          this.getAll(this.formInline)
+        const fileName = '商品数据明细表.xls'
+        if ('download' in document.createElement('a')) {
+          // 非IE下载
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.href = URL.createObjectURL(blob)
+          elink.style.display = 'none'
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href) // 释放URL 对象
+          document.body.removeChild(elink)
+        } else {
+          // IE10+下载
+          navigator.msSaveBlob(blob, fileName)
         }
-      } else {
-        const res = await getClassifyStart({
-          productId: row.productId,
-          shelveState: 1
+      },
+      // 编辑商品
+      edit(row) {
+        console.log(row)
+        this.showTinymce = true
+        this.commidyVisible = true
+        this.ontype = '2'
+        this.commId = row.productId
+        this.$nextTick(() => {
+          this.$refs.child?.details()
         })
-        if (res.code === '') {
-          this.$message({
-            type: 'success',
-            message: '上架成功!'
+      },
+
+      // 删除商品
+      del(row) {
+        this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
-          this.getAll(this.formInline)
-        }
-      }
-    },
-    // 初始化查询所有数据
-    async getAll(formInline) {
-      this.formInline.classifyId =
-        this.formInline.classifyId[2] ||
-        this.formInline.classifyId[1] ||
-        this.formInline.classifyId[0] ||
-        this.formInline.classifyId
-      const res = await getClassifyGetAll(formInline)
-      this.total = res.data.total
-      this.tableData = res.data.list
-      console.log(this.tableData)
-    },
-    // 初始化查询所有分类
-    async queryAllCategory() {
-      const res = await getClassify()
-      this.categoryList = res.data
-      this.handleRemoveEmptyChild(this.categoryList)
-    },
-    handleRemoveEmptyChild(arr) {
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].childs && Array.isArray(arr[i].childs)) {
-          this.handleRemoveEmptyChild(arr[i].childs)
+          .then(() => {
+            getClassifyDelete({
+              productId: row.productId
+            }).then(res => {
+              if (res.code === '') {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                this.getAll(this.formInline)
+              }
+            })
+          })
+          .catch(() => {})
+      },
+      // 商品上下架
+      async down(row) {
+        console.log(row.shelveState)
+        if (row.shelveState) {
+          console.log(111)
+          const res = await getClassifyStart({
+            productId: row.productId,
+            shelveState: 0
+          })
+          if (res.code === '') {
+            this.$message({
+              type: 'success',
+              message: '下架成功!'
+            })
+            this.getAll(this.formInline)
+          }
+        } else {
+          const res = await getClassifyStart({
+            productId: row.productId,
+            shelveState: 1
+          })
+          if (res.code === '') {
+            this.$message({
+              type: 'success',
+              message: '上架成功!'
+            })
+            this.getAll(this.formInline)
+          }
         }
-        if (arr[i].childs && Array.isArray(arr[i].childs) && arr[i].childs.length === 0) {
-          delete arr[i].childs
+      },
+      // 初始化查询所有数据
+      async getAll(formInline) {
+        this.formInline.classifyId =
+          this.formInline.classifyId[2] ||
+          this.formInline.classifyId[1] ||
+          this.formInline.classifyId[0] ||
+          this.formInline.classifyId
+        const res = await getClassifyGetAll(formInline)
+        this.total = res.data.total
+        this.tableData = res.data.list
+        console.log(this.tableData)
+      },
+      // 初始化查询所有分类
+      async queryAllCategory() {
+        const res = await getClassify()
+        this.categoryList = res.data
+        this.handleRemoveEmptyChild(this.categoryList)
+      },
+      handleRemoveEmptyChild(arr) {
+        for (let i = 0; i < arr.length; i++) {
+          if (arr[i].childs && Array.isArray(arr[i].childs)) {
+            this.handleRemoveEmptyChild(arr[i].childs)
+          }
+          if (arr[i].childs && Array.isArray(arr[i].childs) && arr[i].childs.length === 0) {
+            delete arr[i].childs
+          }
         }
-      }
-    },
-    handleSelectionChange(val) {
-           // console.log(val)
-           if(this.index ==1){
-                 if (val.length > 1) {
-                     // 清除之前的选择
-                      this.$refs.multipleTable.clearSelection();
-                     // 保留最后一个选中的项目
-                     if (val.length > 0) {
-                        this.$refs.multipleTable.toggleRowSelection(val[val.length - 1], true);
-
-                     }
-           }
-             this.dengji = val
-           }else{
-             let zuheId = ''
-              for(let i=0;i<val.length;i++){
-                  zuheId += val[i].productId + ','
-              }
-              this.canst = zuheId
-              this.zuheNum = val.length
-             }
-           },
-    //清除选项
-    toggleSelection() {
+      },
+      handleSelectionChange(val) {
+        // console.log(val)
+        if (this.index == 1) {
+          if (val.length > 1) {
+            // 清除之前的选择
             this.$refs.multipleTable.clearSelection();
-          },
-          selClose(){
-             this.teble_sel = false
-          },
-          //商品组合
-          shopzuhe(){
-            this.index = 2
-            this.teble_sel = true
-          },
-          //确定组合
-          zuheShop(val){
-            if(this.index == 1){
-             this.edit(this.dengji[0])
-            }else{
-              this.parentMessage =this.canst.slice(0, -1)
-              this.add()
+            // 保留最后一个选中的项目
+            if (val.length > 0) {
+              this.$refs.multipleTable.toggleRowSelection(val[val.length - 1], true);
+
             }
-          },
-          //拆分
-          chaiFen(row){
-            let _=this
-           this.$confirm('是否拆分组合的商品', '提示', {
-             confirmButtonText: '确定',
-             cancelButtonText: '取消',
-             type: 'warning'
-           })
-             .then(() => {
-              const formData = new FormData();
-              formData.append('id', row.productId);
-               chFen(formData).then(res=>{
-                 this.getAll(this.formInline)
-               })
-
-             })
-             .catch(() => {})
-
-          },
-          //入库登记
-          rukdengji(){
-            this.rukuShow = true
-
-          },
-          // 设置会员价
-          setVipPrice(row) {
-            var _ = this
-            this.productId = row.productId
-            getProductMembers({ productId: row.productId }).then(res => {
-              if (res.code === '') {
-                _.productData = res.data
-                if (_.productData && _.productData.length > 0) {
-                  _.gradeList = []
-                  const _memberPrices = _.productData[0].memberPrices
-                  _memberPrices.forEach(function(item, i) {
-                    _.gradeList.push(item.memberLevelName)
-                  })
-                  _.mode = _.productData[0].mode ? _.productData[0].mode : 1
-                  _.vipPriceVisible = true
-                }
-              }
+          }
+          this.dengji = val
+        } else {
+          let zuheId = ''
+          for (let i = 0; i < val.length; i++) {
+            zuheId += val[i].productId + ','
+          }
+          this.canst = zuheId
+          this.zuheNum = val.length
+        }
+      },
+      //清除选项
+      toggleSelection() {
+        this.$refs.multipleTable.clearSelection();
+      },
+      selClose() {
+        this.teble_sel = false
+      },
+      //商品组合
+      shopzuhe() {
+        this.index = 2
+        this.teble_sel = true
+      },
+      //确定组合
+      zuheShop(val) {
+        if (this.index == 1) {
+          this.edit(this.dengji[0])
+        } else {
+          this.parentMessage = this.canst.slice(0, -1)
+          this.add()
+        }
+      },
+      //拆分
+      chaiFen(row) {
+        let _ = this
+        this.$confirm('是否拆分组合的商品', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            const formData = new FormData();
+            formData.append('id', row.productId);
+            chFen(formData).then(res => {
+              this.getAll(this.formInline)
             })
-          },
-          // 设置会员价提交
-          vipPriceSubmit() {
-            for (let i = 0; i < this.productData.length; i++) {
-              this.productData[i].mode = this.mode
-              for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
-                this.productData[i].memberPrices[j].mode = this.mode
-                var _price = this.productData[i].memberPrices[j].price
-                if (!_price) {
-                  this.$message({
-                    type: 'warning',
-                    message: '会员价格不能为空！'
-                  })
-                  return false
-                } else if (this.productData[i].mode === 1) {
-                  if (_price <= 0 || _price >= 10) {
-                    this.$message({
-                      type: 'warning',
-                      message: '会员折数必须大于0小于10！'
-                    })
-                    return false
-                  }
-                } else if (this.productData[i].mode === 2) {
-                  if (_price > this.productData[i].price) {
-                    this.$message({
-                      type: 'warning',
-                      message: '会员价格不能大于原价！'
-                    })
-                    return false
-                  }
-                }
-              }
+
+          })
+          .catch(() => {})
+
+      },
+      //入库登记
+      rukdengji() {
+        this.shopId = null;
+        this.num = 0
+        this.rukuShow = true
+
+      },
+      // 设置会员价
+      setVipPrice(row) {
+        var _ = this
+        this.productId = row.productId
+        getProductMembers({
+          productId: row.productId
+        }).then(res => {
+          if (res.code === '') {
+            _.productData = res.data
+            if (_.productData && _.productData.length > 0) {
+              _.gradeList = []
+              const _memberPrices = _.productData[0].memberPrices
+              _memberPrices.forEach(function(item, i) {
+                _.gradeList.push(item.memberLevelName)
+              })
+              _.mode = _.productData[0].mode ? _.productData[0].mode : 1
+              _.vipPriceVisible = true
             }
-            setProductMember({ productId: this.productId, members: this.productData }).then(res => {
-              if (res.code === '') {
+          }
+        })
+      },
+      // 设置会员价提交
+      vipPriceSubmit() {
+        for (let i = 0; i < this.productData.length; i++) {
+          this.productData[i].mode = this.mode
+          for (let j = 0; j < this.productData[i].memberPrices.length; j++) {
+            this.productData[i].memberPrices[j].mode = this.mode
+            var _price = this.productData[i].memberPrices[j].price
+            if (!_price) {
+              this.$message({
+                type: 'warning',
+                message: '会员价格不能为空！'
+              })
+              return false
+            } else if (this.productData[i].mode === 1) {
+              if (_price <= 0 || _price >= 10) {
                 this.$message({
-                  type: 'success',
-                  message: '设置成功!'
+                  type: 'warning',
+                  message: '会员折数必须大于0小于10！'
                 })
-                this.getAll(this.formInline)
-                this.vipPriceVisible = false
+                return false
               }
+            } else if (this.productData[i].mode === 2) {
+              if (_price > this.productData[i].price) {
+                this.$message({
+                  type: 'warning',
+                  message: '会员价格不能大于原价！'
+                })
+                return false
+              }
+            }
+          }
+        }
+        setProductMember({
+          productId: this.productId,
+          members: this.productData
+        }).then(res => {
+          if (res.code === '') {
+            this.$message({
+              type: 'success',
+              message: '设置成功!'
             })
-          },
-          // 清空会员价
-          clearProductMember() {
-            console.log(this.productData, 'this.productData')
-            this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              clearProductMember({ productId: this.productId }).then(res => {
-                if (res.code === '') {
-                  this.productData.map(item => {
-                    item.memberPrices.map(itemChild => {
-                      itemChild.price = null
-                    })
-                  })
-                  this.$message.success('清除成功')
-                  // this.vipPriceVisible = false
-                }
-              })
-            })
-          },
-        async  rukuCheck(){
-            const targetProduct = this.tableData.find(item => item.productId === this.shopId)
-            targetProduct.registrationStatus = this.dengjiMsg
-            await getClassifyUpdate(targetProduct)
-            this.$message.success('保存成功')
-            this.rukuShow = false
             this.getAll(this.formInline)
+            this.vipPriceVisible = false
           }
+        })
+      },
+      // 清空会员价
+      clearProductMember() {
+        console.log(this.productData, 'this.productData')
+        this.$confirm('该商品所有旧设置的会员价将被清除, 是否继续？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          clearProductMember({
+            productId: this.productId
+          }).then(res => {
+            if (res.code === '') {
+              this.productData.map(item => {
+                item.memberPrices.map(itemChild => {
+                  itemChild.price = null
+                })
+              })
+              this.$message.success('清除成功')
+              // this.vipPriceVisible = false
+            }
+          })
+        })
+      },
+      async rukuCheck() {
+        const res = await getClassifyGetById({ productId: this.shopId })
+        const form = res.data
+        const params = {}
+        if (res.data.names.length !== 0) {
+          params.skuAttrList = res.data.names
+        }
+        params.skuList = form.skus
+        params.attrStyle = res.data.skus[0].style
+        params.imgs = res.data.images
+
+        form.names = params.skuAttrList
+        params.skuList.forEach(element => {
+          element.style = params.attrStyle
+        })
+        form.skus = params.skuList
+        form.images = params.imgs
+        form.deletes = params.deletes
+        form.classifyId = Array.isArray(form.classifyId) ? form.classifyId[form.classifyId.length - 1] : form.classifyId
+        form.productId = this.shopId  
+        console.log(form, 'form')
+        if(form.skus.length>0) {
+          form.skus[0].stockNumber = this.num
+        }
+        await getClassifyUpdate(form)
+        this.$message.success('保存成功')
+        this.rukuShow = false
+        this.getAll(this.formInline)
+        return
+
+        const targetProduct = this.tableData.find(item => item.productId === this.shopId)
+        // targetProduct.registrationStatus = this.dengjiMsg
+       
+        
+        await getClassifyUpdate(targetProduct)
+        this.$message.success('保存成功')
+        this.rukuShow = false
+        this.getAll(this.formInline)
+      }
+    }
   }
-}
 </script>
 <style lang='scss' scoped>
-//@import url(); 引入公共css类
-@import url("../../../styles/elDialog.scss");
-.pending {
-  padding: 0 20px 20px 20px;
-  background-color:#fff;
-
-}
-.fenye {
-  margin-top: 20px;
-  display: flex;
-  justify-content: flex-end;
-  position: relative;
-}
+  //@import url(); 引入公共css类
+  @import url("../../../styles/elDialog.scss");
+
+  .pending {
+    padding: 0 20px 20px 20px;
+    background-color: #fff;
+
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
+
   ::v-deep .el-pagination__total {
     position: absolute;
     left: 10px;
   }
+
   .formSearch {
-      display: flex;
-      width: 100%;
-      font-size: 14px;
-      justify-content: space-between;
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
+
+  .clickMe {
+    color: #3F9B6A;
+    cursor: pointer;
+  }
+
+  .uploadDialog {
+
+    // display: flex;
+    // flex-direction: column;
+    // justify-content: center;
+    >>>.el-upload__tip {
+      display: inline-block;
+      width: 360px;
+      margin: auto;
     }
-.clickMe {
-  color: #3F9B6A;
-  cursor: pointer;
-}
-.uploadDialog{
-  // display: flex;
-  // flex-direction: column;
-  // justify-content: center;
-  >>>.el-upload__tip{
-    display: inline-block;
-    width: 360px;
-    margin: auto;
   }
-}
-.vipDialog{
-  .priceTable{
-    table{
-      width: 100%;
-      text-align: center;
-      border-left: 1px solid #EBEEF5;
-      border-bottom: 1px solid #EBEEF5;
-      font-size: 14px;
-      color: #606266;
-      border-collapse: collapse;
-      tr{
-        border-top: 1px solid #EBEEF5;
-        th{
-          padding: 12px 0;
-          background: #F2F3F5;
-          color: #0009;
-          border-right: 1px solid #F2F3F5;
-        }
-        td{
-          padding: 12px 0;
-          border-right: 1px solid #EBEEF5;
-          &.td-input{
-            .el-input{
+
+  .vipDialog {
+    .priceTable {
+      table {
+        width: 100%;
+        text-align: center;
+        border-left: 1px solid #EBEEF5;
+        border-bottom: 1px solid #EBEEF5;
+        font-size: 14px;
+        color: #606266;
+        border-collapse: collapse;
+
+        tr {
+          border-top: 1px solid #EBEEF5;
+
+          th {
+            padding: 12px 0;
+            background: #F2F3F5;
+            color: #0009;
+            border-right: 1px solid #F2F3F5;
+          }
+
+          td {
+            padding: 12px 0;
+            border-right: 1px solid #EBEEF5;
+
+            &.td-input {
+              .el-input {
+                width: 80px;
+                margin-right: 0;
+              }
+            }
+
+            &:nth-child(1),
+            &:nth-child(2) {
               width: 80px;
-              margin-right: 0;
             }
-          }
-          &:nth-child(1),&:nth-child(2){
-            width: 80px;
-          }
-          .el-input{
-            width: 100px;
-            margin-right: 10px;
+
+            .el-input {
+              width: 100px;
+              margin-right: 10px;
+            }
           }
         }
       }
     }
+
+    .clearBtn {
+      margin-top: 20px;
+    }
   }
-  .clearBtn{
-    margin-top: 20px;
+
+  ::v-deep .bian_css {
+    margin: auto;
+    max-height: 840px;
+    overflow-y: auto;
+
+    .el-dialog__body {
+      padding: 0px;
+      background-color: #fff;
+    }
+
+    .el-dialog__header {
+      background-color: #fff;
+      padding: 10px 20px 10px 20px;
+      border-bottom: 1px solid #EFEFEF;
+    }
+
+    .el-dialog__title {
+      font-size: 14px;
+      color: #000000e6;
+    }
+
+    .el-date-table td.available:hover {
+      background-color: #3F9B6A;
+    }
+
+    .el-date-table td.start-date span {
+      background-color: #3F9B6A;
+    }
   }
-}
-::v-deep .bian_css{
-      margin:auto;
-       max-height:840px;
-       overflow-y: auto;
-        .el-dialog__body {
-          padding: 0px;
-          background-color: #fff;
-        }
-        .el-dialog__header {
-          background-color: #fff;
-         padding:10px 20px 10px 20px;
-          border-bottom: 1px solid #EFEFEF;
-        }
-        .el-dialog__title {
-         font-size: 14px;
-         color: #000000e6;
-        }
-        .el-date-table td.available:hover{
-          background-color:#3F9B6A;
-        }
-      .el-date-table td.start-date span{
-          background-color:#3F9B6A;
-        }
-      }
 </style>