diff --git a/src/api/marketIng.js b/src/api/marketIng.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/product/info.js b/src/api/product/info.js
index c668d71..0f1cf09 100644
--- a/src/api/product/info.js
+++ b/src/api/product/info.js
@@ -38,7 +38,7 @@ export function updateInfo(data) {
   return request({
     url: '/product/info/'+data.projectAddModel.id,
     method: 'put',
-    data: data.projectAddModel
+    data: data
   })
 }
 
diff --git a/src/views/marketIng/index.vue b/src/views/marketIng/index.vue
new file mode 100644
index 0000000..9cce60d
--- /dev/null
+++ b/src/views/marketIng/index.vue
@@ -0,0 +1,265 @@
+<template>
+
+  <div>
+    <el-button type="primary" @click="centerDialogVisible = true" plain>添加拼团</el-button>
+    <el-dialog title="添加拼团" :visible.sync="centerDialogVisible" width="100%" center>
+      <div>
+
+        <el-steps :active="active" finish-status="success">
+          <el-step title="选择商品"></el-step>
+          <el-step title="添加详情"></el-step>
+          <el-step title="修改详情"></el-step>
+        </el-steps>
+        <el-divider></el-divider>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <!-- 1:添加详情-->
+          <div v-show="active === 0">
+            <!-- 图片-->
+            <div class="demo-image" >
+              <div class="block" v-for="fit in fits" :key="fit">
+                <span class="demonstration">{{ fit }}</span>
+                <!-- 点击图片触发 商品列表-->
+                <el-image type="getGoods"  @click="getListSelectGoods = true" plain style="width: 100px; height: 100px" :src="url" :fit="fits"
+                ></el-image>
+                <el-dialog title="选择拼团商品" :visible.sync="getListSelectGoods" width="50%" center>
+                  <!-- 商品列表-->
+                  <el-table :data="infoList" >
+                    <el-table-column type="selection" width="55" align="center" />
+                    <el-table-column label="主键" align="center" prop="id" />
+                    <el-table-column label="商品名称" align="center" prop="name" />
+                    <el-table-column label="商品描述" align="center" prop="introduction" />
+                    <el-table-column label="主类型" align="center" prop="mianType" />
+                    <el-table-column label="父类型" align="center" prop="parentType" />
+                    <el-table-column label="商品类型" align="center" prop="type" />
+                    <el-table-column label="商品图片" align="center" prop="image" width="100">
+                      <template slot-scope="scope">
+                        <image-preview :src="scope.row.image" :width="50" :height="50"/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="规格" align="center" prop="ruleId" />
+                    <el-table-column label="品牌" align="center" prop="brandId" />
+                  </el-table>
+                  <el-button @click="addGoodsIdYes = false">取 消</el-button>
+                  <el-button type="getGoods" @click="getGoods()">确 定</el-button>
+                </el-dialog>
+
+              </div>
+            </div>
+          </div>
+          <!-- 2:添加详情-->
+          <div v-show="active === 1">
+            <el-form-item label="拼团活动名称">
+              <el-input v-model="form.activityName"></el-input>
+            </el-form-item>
+            <el-form-item label="拼团活动简介">
+              <el-input type="textarea" v-model="form.activities"></el-input>
+            </el-form-item>
+
+            <el-form-item label="商品单位">
+              <el-select v-model="form.projectUnit" placeholder="请选择商品单位">
+                <el-option label="件" value="shanghai"></el-option>
+                <el-option label="个" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="商品轮播图">
+              <el-upload action="#" list-type="picture-card" :auto-upload="false">
+                <el-icon>
+                  <Plus/>
+                </el-icon>
+                <template #file="{ file }">
+                  <div>
+                    <img class="el-upload-list__item-thumbnail" :src="file.carouselImages" alt=""/>
+                    <span class="el-upload-list__item-actions">
+                     <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+            <el-icon><zoom-in/></el-icon>
+          </span>
+          <span
+            v-if="!disabled"
+            class="el-upload-list__item-delete"
+            @click="handleDownload(file)"
+          >
+            <el-icon><Download/></el-icon>
+          </span>
+          <span
+            v-if="!disabled"
+            class="el-upload-list__item-delete"
+            @click="handleRemove(file)"
+          >
+            <el-icon><Delete/></el-icon>
+          </span>
+        </span>
+                  </div>
+                </template>
+              </el-upload>
+
+              <el-dialog v-model="dialogVisible">
+                <img w-full :src="dialogImageUrl" alt="Preview Image"/>
+              </el-dialog>
+            </el-form-item>
+
+            <el-divider></el-divider>
+
+
+            <el-form-item label="活动时间">
+              <el-col :span="11">
+                <el-date-picker
+                  v-model="form.endTime"
+                  type="date"
+                  aria-label="Pick a date"
+                  placeholder="Pick a date"
+                  style="width: 70%"
+                />
+                <br>设置活动开启结束时间，用户可以在设置时间内发起参与拼团
+              </el-col>
+            </el-form-item>
+
+            <el-form-item label="拼团时效">
+              <el-col :span="11">
+                <el-date-picker
+                  v-model="form.date1"
+                  type="date"
+                  aria-label="Pick a date"
+                  placeholder="Pick a date"
+                  style="width: 100%"
+                />
+                <br> 用户发起拼团后开始计时，需在设置时间内邀请到规定好友人数参团，超过时效时间，则系统判定拼团失败，自动发起退款
+              </el-col>
+            </el-form-item>
+            <el-form-item label="拼团人数" style="width: 70%">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+
+            <el-form-item label="总购买数量限制" style="width: 70%">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="单次购买数量限制" style="width: 70%">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="补齐人数" style="width: 70%">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+
+            <el-form-item label="规格" style="width: 70%">
+
+            </el-form-item>
+            <el-divider></el-divider>
+            <el-form-item label="排序" style="width: 70%">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+          <!-- 3:修改详情-->
+          <div v-show="active === 2">
+            <div class="common-layout">
+              <el-container>
+                <el-aside style="width: 70%">
+                  <el-form-item label="编辑详情">
+                    <el-input type="textarea" v-model="form.goodsDetails" style="width: 70%"></el-input>
+                  </el-form-item>
+                </el-aside>
+
+                <el-main style="width: 70%">
+                  <div>
+                    <span>商品详情:</span>
+                    <br>
+                    <img :src="url">
+                  </div>
+                </el-main>
+              </el-container>
+            </div>
+          </div>
+        </el-form>
+        <el-button style="margin-top: 12px;" @click="last" v-if="active > 0">上一步</el-button>
+        <el-button style="margin-top: 12px;" @click="next" v-if="active < 3">下一步</el-button>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="centerDialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+import { listInfo } from '@/api/product/info'
+export default {
+  data() {
+    return {
+      loading: true,
+      fits: [''],
+      //添加拼团
+      form: {},
+      //商品列表
+      infoList: [],
+      url: 'https://qianqiao.obs.cn-east-3.myhuaweicloud.com/8f8577e412e64fefbbeb7ec0ce015d58~tplv-p14lwwcsbr-x2-q75-r_248_332_q75.jpg',
+
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        introduction: null,
+        mianType: null,
+        parentType: null,
+        type: null,
+        image: null,
+        carouselImages: null,
+        status: null,
+        ruleId: null,
+        brandId: null,
+      },
+      //添加拼团
+      ActivityTeamInfoReq: {},
+      goods: {},
+      //步骤条下标
+      active: 0,
+      //对话框
+      centerDialogVisible: false,
+      getListSelectGoods: false,
+      addGoodsIdYes: false,
+      addGoodsIdNo: false,
+    }
+
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getGoods(){
+     this.addGoodsIdYes = false
+    },
+    /** 查询商品信息列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+
+
+    next() {
+      if (this.active++ > 2) this.active = 0
+    },
+    last() {
+      if (this.active-- < 0) this.active = 0
+    }
+  }
+
+}
+</script>
+
+<style>
+.el-select-dropdown__item {
+  height: 45px;
+}
+
+.box-card {
+  margin: 10px;
+}
+</style>
diff --git a/src/views/product/attribute/index.vue b/src/views/product/attribute/index.vue
index d1b259f..453ec91 100644
--- a/src/views/product/attribute/index.vue
+++ b/src/views/product/attribute/index.vue
@@ -181,12 +181,17 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
-        code: null,
-        name: null,
-        createBy: null,
-        createTime: null,
-        remark: null
+        projectImage: null,
+        activityName: null,
+        activities: null,
+        projectUnit: null,
+        carouselImages: null,
+        endTime: null,
+        strategyId: null,
+        strategyType: null,
+        projectSkuList: null,
+        weight: null,
+        goodsDetails: null
       };
       this.resetForm("form");
     },
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index 1108899..cba2583 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -246,7 +246,7 @@ export default {
   watch: {
     'form.parentId': {
       handler(val){
-        if (val !== undefined && val !== 0 && val != null){
+        if (val !== undefined && val !== null && val !== 0 && val != null && this.id ===null ){
           parentCommonElement(val).then(response => {
             this.attributeInfoList = response.data.attributeInfoList;
             this.attributeGroupList = response.data.attributeGroupList;
@@ -358,11 +358,17 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.parentId;
-      }
+
       getCategory(row.id).then(response => {
         this.form = response.data;
+        if (row != null) {
+          this.form.parentId = row.parentId;
+        }
+        parentCommonElement(row.id).then(response => {
+          this.attributeInfoList = response.data.attributeInfoList;
+          this.attributeGroupList = response.data.attributeGroupList;
+          this.brandInfoList = response.data.brandInfoList;
+        })
         this.open = true;
         this.title = "修改品类信息";
       });
diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index 370b6eb..cd97b4e 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -312,7 +312,7 @@
         </div>
         <div v-show="stepNumber === 2">
           <el-form-item label="规格" prop="ruleId">
-            <el-select v-model="form.ruleId" placeholder="请选择" @change="changeRule" style="width: 100%;">
+            <el-select :v-model="form.ruleId" placeholder="请选择" @change="changeRule" style="width: 100%;">
               <el-option
                 v-for="rule in ruleList"
                 :key="rule.id"
@@ -363,6 +363,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
+
         <el-button style="margin-top: 12px;" @click="last" v-if="stepNumber > 0">上一步</el-button>
         <el-button style="margin-top: 12px;" @click="next" v-if="stepNumber < 3">下一步</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -460,10 +461,10 @@ export default {
       customAttributeFormStatus: false,
       attributeIdCheckedList: [],
       attributeCheckedList: [],
-      categoryCommonElement: {
-        templateAttributeGroupList: [],
-        templateAttributeList: [],
-        attributeList: []
+      categoryCommonElement: {//类别
+        templateAttributeGroupList: [],//属性组
+        templateAttributeList: [],//
+        attributeList: []//属性
       },
       templateTitleList: [
         {
@@ -519,6 +520,7 @@ export default {
   },
   created() {
     this.getList();
+
   },
   methods: {
     toProjectDetail(detailId){
@@ -545,7 +547,7 @@ export default {
         })
         skuTotal = skuTotal * ruleAttrInfo.valueList.length;
       }
-      this.titleList.push(...this.templateTitleList) ;
+      this.titleList.push(...this.templateTitleList);
       console.log(this.titleList);
       this.skuList = [];
       for (let i = 0; i < skuTotal; i++) {
@@ -726,7 +728,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getInfo(id).then(response => {
+        alert(response.data.type)
         this.form = response.data;
+        this.changeRule(response.data.type);
+
         this.open = true;
         this.title = "修改商品信息";
       });