diff --git a/src/utils/api.js b/src/utils/api.js
index f5967a8..5620b19 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -432,4 +432,31 @@ export default {
     saveScheme: `nakadai/nakadai/partner/schemeManagement/save`,
     schemeList: `nakadai/nakadai/partner/schemeManagement/schemeList`,
     updateScheme: `nakadai/nakadai/partner/schemeManagement/update`,
+
+    // 商城管理
+    addProductCategory: `nakadai/productClassification/addProductCategory`,
+    deleteProductCategory: `nakadai/productClassification/deleteProductCategory`,
+    productCategoryList: `nakadai/productClassification/productCategoryList`,
+    addProductType: `nakadai/productType/addProductType`,
+    deleteProductType: `nakadai/productType/deleteProductType`,
+    productTypeList: `nakadai/productType/productTypeList`,
+    addSupplier: `nakadai/supplier/addSupplier`,
+    deleteSupplier: `nakadai/supplier/deleteSupplier`,
+    supplierList: `nakadai/supplier/supplierList`,
+    addTags: `nakadai/tags/addTags`,
+    deleteTags: `nakadai/tags/deleteTags`,
+    tagsList: `nakadai/tags/tagsList`,
+    addGoods: `nakadai/mall/addGoods`,
+    listOfGoods: `nakadai/mall/listOfGoods`,
+    deletionOfGoods: `nakadai/mall/deletionOfGoods`,
+    detailsOfGoods: `nakadai/mall/detailsOfGoods`,
+    renewalOfGoods: `nakadai/mall/renewalOfGoods`,
+    goodsOffTheShelf: `nakadai/mall/goodsOffTheShelf`,
+    
+    // 营销推广
+    delMarketing: `nakadai/nakadai/mall/marketing/promotion/batchDeletion`,
+    findByIdMarketing: `nakadai/nakadai/mall/marketing/promotion/findById`,
+    listMarketing: `nakadai/nakadai/mall/marketing/promotion/pagingQueryList`,
+    saveMarketing: `nakadai/nakadai/mall/marketing/promotion/save`,
+    updateMarketing: `nakadai/nakadai/mall/marketing/promotion/update`,
 };
\ No newline at end of file
diff --git a/src/utils/editor.js b/src/utils/editor.js
index 109d3c5..f7b9386 100644
--- a/src/utils/editor.js
+++ b/src/utils/editor.js
@@ -376,7 +376,8 @@ export default {
       ed.target.editorCommands.execCommand("fontName", false, "Microsoft Yahei")
       ed.target.editorCommands.execCommand("fontSize", false, "19px")
       ed.target.editorCommands.execCommand("lineHeight", false, "1.5")
-      top.document.querySelector('#articleTitle').focus() // 第一个字段聚焦
+      const el = top.document.querySelector('#articleTitle')
+      el && el.focus() // 第一个字段聚焦
     })
   },
 }
\ No newline at end of file
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index fe8b242..aa95183 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -706,6 +706,11 @@
                                 <el-table-column label="操作" align="center" width="180">
                                     <template slot-scope="scope">
                                         <div class="flex-c-c">
+                                            <!-- <el-button
+                                                type="text"
+                                                @click="delPracticalCourses(scope.$index)"
+                                                style="margin-right:10px;"
+                                            >删除</el-button> -->
                                             <el-button
                                                 v-if="!editDisabled&&!viewDisabled"
                                                 type="text"
@@ -1201,6 +1206,14 @@
         </div>
         <!-- 选择客户 -->
         <select-client ref="client" @back="backToOrder" v-show="showSelectClient" :refresh="showSelectClient"></select-client>
+
+        <el-dialog title="发货信息填写" :visible.sync="shipVisible" width="380px" class="dialog" :close-on-click-modal="false">
+            <el-input v-model="shipContent" placeholder="请填写需交付的产品登录地址、账号、密码等内容...（300个字以内）" type="textarea" :rows="10" maxlength="300"></el-input>
+            <span slot="footer" class="dialog-footer" v-if="!isDetail">
+                <el-button @click="shipVisible = false">取消</el-button>
+                <el-button type="primary" @click="submitShip">确定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -1392,7 +1405,10 @@ export default {
             repeatMsg: '',
             clients: [],
             valueList: [],
-            rate: ''
+            rate: '',
+            shipVisible: false,
+            shipContent: '',
+            curRow: {},
         };
     },
     watch: {
@@ -2452,6 +2468,7 @@ export default {
           if(row.ship === 1)  {
             row.isEnable = 1
           }
+          if (type == 3 && row.ship) this.shipVisible = true // 非集成课程发货了后显示填写发货信息弹框
         },
         // 如果非数字，则返回0
         handleNaN(val) {
@@ -2601,6 +2618,17 @@ export default {
                 })
             }
         },
+        // 打开填写发货信息弹框
+        showShip(row) {
+          this.curRow = row
+          this.shipContent = row.shipContent
+          this.shipVisible = true
+        },
+        // 发货信息弹框提交
+        submitShip() {
+          this.curRow.shipContent = this.shipContent
+          this.shipVisible = false
+        },
         // 清除省份
         clearprovince() {
             this.form.cityId = "";
diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue
index a4a40b9..93a4878 100644
--- a/src/views/shop/addProduct/index.vue
+++ b/src/views/shop/addProduct/index.vue
@@ -7,292 +7,307 @@
         </el-card>
 
         <el-card shadow="hover" class="m-b-20">
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-              <el-col :span="6" :offset="5">
-                  <el-form-item label="关联产品" prop="curriculumName">
-                      <el-input placeholder="请输入课程名称" v-model.trim="form.curriculumName"></el-input>
-                  </el-form-item>
+          <el-form class="model" ref="form" label-width="110px">
+              <el-row>
+                <el-col :span="6" :offset="5">
+                    <el-form-item class="req" label="关联产品" prop="curriculumName">
+                      <div>
+                        <el-radio v-model="form.mall.isAssociatedProduct" :label="0">是</el-radio>
+                        <el-button class="m-l-5" type="primary" @click="setProduct">请选择</el-button>
+                        <span class="m-l-5">{{ form.mall.associatedProductName }}</span>
+                      </div>
+                      <div>
+                        <el-radio v-model="form.mall.isAssociatedProduct" :label="1">否</el-radio>
+                      </div>
+                    </el-form-item>
 
-                  <el-form-item label="产品名称" prop="categoryId">
-                      <el-input placeholder="请输入产品名称" v-model.trim="form.curriculumName"></el-input>
-                  </el-form-item>
+                    <el-form-item class="req" label="产品名称" prop="categoryId">
+                        <el-input placeholder="请输入产品名称" v-model.trim="form.mall.productName"></el-input>
+                    </el-form-item>
 
-                  <el-form-item label="分类标签" prop="professionalId">
-                      <el-select style="width: 234px;" v-model="form.classificationId">
-                        <template v-for="item in classifications">
-                          <el-option
-                            v-if="item.id"
-                            :key="item.id"
-                            :label="item.classificationName"
-                            :value="item.id">
-                          </el-option>
-                        </template>
+                    <el-form-item label="分类标签" prop="professionalId">
+                        <el-select style="width: 234px;" v-model="form.tagsIds" multiple>
+                          <template v-for="item in labels">
+                            <el-option
+                              v-if="item.tagsId"
+                              :key="item.tagsId"
+                              :label="item.tagsName"
+                              :value="item.tagsId">
+                            </el-option>
+                          </template>
+                        </el-select>
+                        <el-button style="margin-left: 5px" type="primary" @click="setLabel">自定义</el-button>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6" :offset="2">
+                    <el-form-item class="req" label="产品分类">
+                        <el-select v-model="form.classificationIds" clearable placeholder="请选择产品分类" :disabled="!!form.mall.associatedProduct">
+                            <el-option v-for="(item, i) in productCategoryList" :key="i" :label="item.classificationName" :value="item.classificationId"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="req" label="产品类型" prop="professionalCategoryId">
+                        <el-select style="width: 234px;" v-model="form.typeIds">
+                          <template v-for="item in classifications">
+                            <el-option
+                              v-if="item.typeId"
+                              :key="item.typeId"
+                              :label="item.typeName"
+                              :value="item.typeId">
+                            </el-option>
+                          </template>
+                        </el-select>
+                        <el-button style="margin-left: 5px" type="primary" @click="setClass">自定义</el-button>
+                    </el-form-item>
+                    <el-form-item class="req" label="供应厂商" prop="supplier">
+                      <el-select v-model="form.supplierIds" clearable placeholder="请选择供应厂商" multiple :disabled="!!form.mall.associatedProduct">
+                          <el-option v-for="(item, i) in suppliers" :key="i" :label="item.supplierName" :value="item.supplierId"></el-option>
                       </el-select>
-                      <el-button style="margin-left: 5px" type="primary" @click="setClass">自定义</el-button>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="14" :offset="5">
+                  <el-form-item class="req" label="适用学科专业" prop="supplier">
+                    <div class="subject">
+                      <div v-for="(item, i) in form.mallDisciplines" :key="i" class="line">
+                        <el-form-item label="学科类别" prop="supplier">
+                          <el-select v-model="item.categoryId" clearable
+                                      @change="getProfessionalClass(item)">
+                              <el-option v-for="(item,index) in subjectList" :key="index"
+                                          :label="item.disciplineName"
+                                          :value="item.disciplineId"></el-option>
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="专业类" prop="supplier">
+                          <el-select v-model="item.professionalCategoryId" clearable
+                                      :disabled="item.categoryId ? false : true"
+                                      @change="getProfessional(item)">
+                              <el-option v-for="(item,index) in item.professionalClassList" :key="index"
+                                          :label="item.professionalClassName"
+                                          :value="item.professionalClassId"></el-option>
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="专业" prop="supplier">
+                          <el-select v-model="item.professionalId" clearable
+                                      :disabled="item.professionalCategoryId ? false : true">
+                              <el-option v-for="(item,index) in item.professionalList" :key="index"
+                                          :label="item.professionalName"
+                                          :value="item.professionalId"></el-option>
+                          </el-select>
+                        </el-form-item>
+                      </div>
+                    </div>
+                    <div class="subject-plus" @click="addSubject">
+                      <i class="el-icon-circle-plus-outline"></i>
+                    </div>
                   </el-form-item>
-              </el-col>
-              <el-col :span="6" :offset="2">
-                  <el-form-item label="产品分类">
-                      <el-select v-model="form.curriculumType" clearable placeholder="请选择产品分类">
-                          <el-option label="理论课程" :value="0"></el-option>
-                          <el-option label="实训课程" :value="1"></el-option>
-                      </el-select>
+                </el-col>
+                <el-col :span="6" :offset="5">
+                  <el-form-item label="匹配课程" prop="briefIntroduction">
+                      <el-input placeholder="请输入匹配课程"
+                                v-model="form.mall.matchingCourse"></el-input>
                   </el-form-item>
-                  <el-form-item label="产品类型" prop="professionalCategoryId">
-                      <el-select v-model="form.professionalCategoryId" clearable placeholder="请选择产品类型">
-                          <el-option v-for="(item,index) in ProfessionalClassList" :key="index"
-                                      :label="item.professionalClassName"
-                                      :value="item.professionalClassId"></el-option>
+                </el-col>
+                <el-col :span="6" :offset="2">
+                  <el-form-item label="预计课时" prop="briefIntroduction">
+                      <el-select v-model="form.mall.courseHours" clearable placeholder="请选择预计课时">
+                          <el-option label="32课时" value="32课时"></el-option>
+                          <el-option label="64课时" value="64课时"></el-option>
                       </el-select>
                   </el-form-item>
-                  <el-form-item label="供应厂商" prop="supplier">
-                    <el-select v-model="form.supplier" clearable placeholder="请选择供应厂商" multiple>
-                        <el-option v-for="(item, i) in suppliers" :key="i" :label="item.supplierName" :value="item.supplierId"></el-option>
-                    </el-select>
-                  </el-form-item>
-              </el-col>
-              <el-col :span="14" :offset="5">
-                <div class="subject" style="display: flex;">
-                  <el-form-item label="学科类别" prop="supplier">
-                    <el-select
-                      v-model="form.disciplineId"
-                      placeholder="选择专业学科"
-                      @change="id => getItemProfessionalClass(id,index)"
-                      @clear="() => clearItemClass(index)"
-                  >
-                      <el-option
-                          v-for="item in subjectList"
-                          :key="item.value"
-                          :label="item.disciplineName"
-                          :value="item.disciplineId"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="专业类" prop="supplier">
-                    <el-select
-                        v-model="form.professionalClassId"
-                        placeholder="选择专业类"
-                        :disabled="form.disciplineId ? false : true"
-                        @change="id => getItemProfessional(id,index)"
-                        @clear="() => clearItemProfess(index)"
-                    >
-                        <el-option
-                            v-for="item in ProfessionalClassList"
-                            :key="item.professionalClassId"
-                            :label="item.professionalClassName"
-                            :value="item.professionalClassId"
-                        ></el-option>
-                    </el-select>
+                </el-col>
+                <el-col :span="14" :offset="5">
+                  <el-form-item label="适用场景" prop="briefIntroduction">
+                      <el-input placeholder="请输入适用场景"
+                                v-model="form.mall.applicationScenario"></el-input>
                   </el-form-item>
-                  <el-form-item label="专业类" prop="supplier">
-                    <el-select
-                        v-model="form.professionalId"
-                        placeholder="选择专业"
-                        :disabled="form.professionalClassId ? false : true"
-                        @change="getItemStuGrade"
-                    >
-                        <el-option
-                            v-for="item in ProfessionalList"
-                            :key="item.professionalId"
-                            :label="item.professionalName"
-                            :value="item.professionalId"
-                        ></el-option>
-                    </el-select>
+                  <el-form-item class="req" label="封面图">
+                      <el-upload
+                          class="avatar-uploader"
+                          accept=".jpg,.png,.jpeg"
+                          :on-success="uploadSuccess"
+                          :limit="1"
+                          :action="api.fileupload"
+                          :headers="headers"
+                          name="file"
+                      >
+                          <img v-if="form.mall.coverDrawing" :src="form.mall.coverDrawing" class="avatar">
+                          <div class="uploader-default" v-else>
+                              <i class="el-icon-plus"></i>
+                              <p>上传封面</p>
+                          </div>
+
+                          <div slot="tip" class="el-upload__tip">
+                              <p>只能上传jpg/png文件</p>
+                              <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
+                          </div>
+                      </el-upload>
                   </el-form-item>
-                </div>
-              </el-col>
-              <el-col :span="6" :offset="5">
-                <el-form-item label="匹配课程" prop="briefIntroduction">
-                    <el-input placeholder="请输入匹配课程"
-                              v-model.trim="form.briefIntroduction"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6" :offset="2">
-                <el-form-item label="预计课时" prop="briefIntroduction">
-                    <el-select v-model="form.supplier" clearable placeholder="请选择预计课时" multiple>
-                        <el-option label="48" value="48"></el-option>
-                        <el-option label="64" value="64"></el-option>
-                    </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="14" :offset="5">
-                <el-form-item label="适用场景" prop="briefIntroduction">
-                    <el-input placeholder="请输入适用场景"
-                              v-model.trim="form.briefIntroduction"></el-input>
-                </el-form-item>
-                <el-form-item label="课程封面" prop="coverUrl">
-                    <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg"
-                        :on-remove="handleRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccess"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="api.fileupload"
-                        :headers="headers"
-                        name="file"
-                    >
-                        <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
+                  <el-form-item label="界面图" prop="miniProgramPictureAddress">
+                      <el-upload
+                          accept=".jpg,.png,.jpeg"
+                          :on-remove="handleRemove"
+                          :on-error="uploadError"
+                          :on-success="uploadSuccessInterface"
+                          :before-remove="beforeRemove"
+                          :limit="4"
+                          :on-exceed="handleExceed"
+                          :action="api.fileupload"
+                          :headers="headers"
+                          name="file"
+                      >
+                        <div style="text-align: left;">
+                          <el-button>上传界面图</el-button>
                         </div>
+                          <div v-if="form.mall.interfaceDiagrams.length" class="avatars">
+                            <img v-for="(item, i) in form.mall.interfaceDiagrams" :key="i" :src="item">
+                          </div>
+                      </el-upload>
+                  </el-form-item>
+                  <el-form-item label="小程序图标" prop="miniProgramPictureAddress">
+                      <el-upload
+                          class="avatar-uploader"
+                          accept=".jpg,.png,.jpeg"
+                          :on-success="uploadSuccessMini"
+                          :limit="1"
+                          :action="api.fileupload"
+                          :headers="headers"
+                          name="file"
+                      >
+                          <img v-if="form.mall.appletIcon" :src="form.mall.appletIcon" class="avatar">
+                          <div class="uploader-default" v-else>
+                              <i class="el-icon-plus"></i>
+                              <p>上传封面</p>
+                          </div>
 
-                        <div slot="tip" class="el-upload__tip">
-                            <p>只能上传jpg/png文件</p>
-                            <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
-                        </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item label="界面图" prop="miniProgramPictureAddress">
-                    <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg"
-                        :on-remove="handleRemoveMini"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccessMini"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="api.fileupload"
-                        :headers="headers"
-                        name="file"
-                    >
-                        <img v-if="form.miniProgramPictureAddress" :src="form.miniProgramPictureAddress" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传界面图</p>
+                          <div slot="tip" class="el-upload__tip">
+                              <p>只能上传jpg/png文件</p>
+                              <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
+                          </div>
+                      </el-upload>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="14" :offset="5">
+                  <el-form-item class="req" label="市场建议单价" prop="briefIntroduction">
+                      <el-input style="width: 250px" placeholder="请输入市场建议单价" v-model.trim="form.mall.marketUnitPrice">
+                        <template slot="append">元/年</template> 
+                      </el-input>
+                  </el-form-item>
+                  <el-form-item class="req" label="厂商结算价" prop="briefIntroduction">
+                    <template v-for="(item, i) in form.mallPrices">
+                      <div v-if="!item.settlementPriceType && item.area === 0" :key="i">
+                        普适地区
+                        <el-select style="width: 250px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择">
+                            <el-option label="手动录入" :value="0"></el-option>
+                            <el-option label="按折扣" :value="1"></el-option>
+                        </el-select>
+                        <el-input style="width: 200px" v-model.trim="item.settlementPrice">
+                            <template slot="append">{{ item.entryType ? '折' : '元/年' }}</template>
+                        </el-input>
+                      </div>
+                    </template>
+                    <div style="display: flex;align-items: center;margin-top: 10px;">
+                      除外地区
+                      <i class="el-icon-circle-plus-outline plus" style="margin: 0 0 0 10px;" @click="addArea(0)"></i>
+                    </div>
+                    <div v-if="form.mallPrices.length" class="subject">
+                      <template v-for="(item, i) in form.mallPrices">
+                        <div v-if="!item.settlementPriceType && item.area !== 0" :key="i" class="line">
+                          <el-select style="width: 150px" v-model="item.area" clearable placeholder="请选择地区">
+                            <el-option v-for="(item, i) in provinces" :key="i" :label="item.provinceName" :value="item.provinceId"></el-option>
+                          </el-select>
+                          <el-select style="width: 150px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择">
+                            <el-option v-for="(item, i) in entryTypes" :key="i" :label="item.name" :value="item.id"></el-option>
+                          </el-select>
+                          <el-input style="width: 200px" v-model.trim="item.settlementPrice">
+                              <template slot="append">{{ item.entryType ? '折' : '元/年' }}</template>
+                          </el-input>
                         </div>
-
-                        <div slot="tip" class="el-upload__tip">
-                            <p>只能上传jpg/png文件</p>
+                      </template>
+                    </div>
+                  </el-form-item>
+                  <el-form-item class="req" label="平台结算价" prop="briefIntroduction">
+                    <template v-for="(item, i) in form.mallPrices">
+                      <div v-if="item.settlementPriceType && item.area === 0" :key="i">
+                        普适地区
+                        <el-select style="width: 250px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择">
+                            <el-option label="手动录入" :value="0"></el-option>
+                            <el-option label="按折扣" :value="1"></el-option>
+                        </el-select>
+                        <el-input style="width: 200px" v-model.trim="item.settlementPrice">
+                            <template slot="append">{{ item.entryType ? '折' : '元/年' }}</template>
+                        </el-input>
+                      </div>
+                    </template>
+                    <div style="display: flex;align-items: center;margin-top: 10px;">
+                      除外地区
+                      <i class="el-icon-circle-plus-outline plus" style="margin: 0 0 0 10px;" @click="addArea(1)"></i>
+                    </div>
+                    <div v-if="form.mallPrices.length" class="subject">
+                      <template v-for="(item, i) in form.mallPrices">
+                        <div v-if="item.settlementPriceType && item.area !== 0" :key="i" class="line">
+                          <el-select style="width: 150px" v-model="item.area" clearable placeholder="请选择地区">
+                            <el-option v-for="(item, i) in provinces" :key="i" :label="item.provinceName" :value="item.provinceId"></el-option>
+                          </el-select>
+                          <el-select style="width: 150px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择">
+                            <el-option v-for="(item, i) in entryTypes" :key="i" :label="item.name" :value="item.id"></el-option>
+                          </el-select>
+                          <el-input style="width: 200px" v-model.trim="item.settlementPrice">
+                              <template slot="append">{{ item.entryType ? '折' : '元/年' }}</template>
+                          </el-input>
                         </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item label="小程序图标" prop="miniProgramPictureAddress">
+                      </template>
+                    </div>
+                  </el-form-item>
+                  <el-form-item class="req" label="产品简介" prop="briefIntroduction">
+                      <el-input type="textarea" placeholder="请输入产品简介" v-model="form.mall.productIntroduction"></el-input>
+                  </el-form-item>
+                  <el-form-item class="req" label="详情介绍" prop="briefIntroduction">
+                      <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mall.detailedIntroduction" :init="editorConfig" />
+                  </el-form-item>
+                  <el-form-item prop="file" label="产品参数">
                     <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg"
-                        :on-remove="handleRemoveMini"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccessMini"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="api.fileupload"
-                        :headers="headers"
-                        name="file"
+                      :on-success="uploadSuccessFile"
+                      :action="api.fileUploadNakadai"
+                      :file-list="form.fileList"
+                      :headers="headers"
                     >
-                        <img v-if="form.miniProgramPictureAddress" :src="form.miniProgramPictureAddress" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
-                        </div>
-
-                        <div slot="tip" class="el-upload__tip">
-                            <p>只能上传jpg/png文件</p>
-                            <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
-                        </div>
+                      <el-button>上传文件</el-button>
                     </el-upload>
-                </el-form-item>
-              </el-col>
-              <el-col :span="14" :offset="5">
-                <el-form-item label="市场建议单价" prop="briefIntroduction">
-                    <el-input style="width: 250px" placeholder="请输入市场建议单价" v-model.trim="form.briefIntroduction">
-                      <template slot="append">元/年</template> 
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="厂商结算价" prop="briefIntroduction">
-                  <div class="flex">
-                    普适地区
-                    <el-select style="width: 250px;margin: 0 10px;" v-model="form.supplier" clearable placeholder="请选择">
-                        <el-option label="手动录入" value="48"></el-option>
-                        <el-option label="按折扣" value="64"></el-option>
-                    </el-select>
-                    <el-input style="width: 250px" v-model.trim="form.settlementPrice">
-                        <template slot="append">元/年</template>
-                    </el-input>
-                  </div>
-                </el-form-item>
-                <el-form-item label="产品简介" prop="briefIntroduction">
-                    <el-input type="textarea" placeholder="请输入产品简介" v-model.trim="form.briefIntroduction"></el-input>
-                </el-form-item>
-                <el-form-item label="详情介绍" prop="briefIntroduction">
-                    <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mainBody" :init="editorConfig" />
-                </el-form-item>
-                <el-form-item prop="file" label="产品参数">
-                  <el-upload
-                    :before-upload="fileBeforeUpload"
-                    :on-remove="handleRemove"
-                    :on-success="uploadSuccessFile"
-                    :action="api.fileUploadNakadai"
-                    :file-list="form.fileList"
-                    :headers="headers"
-                  >
-                    <el-button>上传文件</el-button>
-                  </el-upload>
-                </el-form-item>
-              </el-col>
+                  </el-form-item>
+                </el-col>
+              </el-row>
           </el-form>
+          <div class="btns">
+            <el-button v-if="form.mall.isShelves" type="primary" @click="submit(0, 1)">保存并上架</el-button>
+            <template v-else>
+              <el-button type="primary" @click="submit(0)">确认</el-button>
+              <el-button @click="submit(1)">保存草稿</el-button>
+            </template>
+            <el-button @click="back">取消</el-button>
+          </div>
         </el-card>
         
-        <el-dialog title="请勾选院校" :visible.sync="rangeVisible" width="580px" custom-class="range-dia" :close-on-click-modal="false">
-          <div class="range-wrap">
-            <el-cascader
-              ref="range"
-              class="range-cas"
-              key="range"
-              v-model="range"
-              :props="props"
-              :show-all-levels="false"
-              clearable
-              filterable
-              :before-filter="beforeFilter"
-              :options="rangeList"
-              @change="rangeChange"
-              @visible-change="rangeViChange"
-              @input.native="rangeSearch"></el-cascader>
-              <el-tag
-                v-for="(tag, i) in rangeChecked"
-                :key="tag.value"
-                class="range-check"
-                closable
-                :disable-transitions="false"
-                @close="val => closeRange(i)">
-                {{tag.label}}
-              </el-tag>
-          </div>
-          
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" @click="rangeVisible = false">取 消</el-button>
-            <el-button size="small" type="primary" @click="rangeSubmit">确 定</el-button>
-          </span>
-        </el-dialog>
-        <el-dialog title="所属分类设置" :visible.sync="classVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeClass">
+        <el-dialog title="产品类型设置" :visible.sync="classVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeClass">
           <div class="plus">
             <i class="el-icon-circle-plus-outline" @click="addClass"></i>
           </div>
           <el-table :data="classifications" ref="table" header-align="center" row-key="id">
             <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="classificationName" label="分类名称" align="center" min-width="130">
+            <el-table-column prop="typeName" label="类型名称" align="center" min-width="130">
               <template slot-scope="scope">
                 <el-input
                   v-if="scope.row.edit"
-                  placeholder="请输入分类名称"
-                  v-model="scope.row.classificationName"
+                  placeholder="请输入类型名称"
+                  v-model="scope.row.typeName"
                   clearable
                   maxlength="30"
                 ></el-input>
-                <span v-else>{{ scope.row.classificationName }}</span>
+                <span v-else>{{ scope.row.typeName }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="updateTime1" label="是否引用" align="center" min-width="60">否</el-table-column>
             <el-table-column label="操作" align="center" min-width="60">
               <template slot-scope="scope">
                 <i v-if="scope.row.edit" class="el-icon-check edit" @click="submitClass(scope.row)"></i>
-                <i v-else class="el-icon-edit edit" @click="editClass(scope.row)"></i>
+                <!-- <i v-else class="el-icon-edit edit" @click="editClass(scope.row)"></i> -->
                 <i class="el-icon-delete del" @click="delClass(scope.row, scope.$index)"></i>
               </template>
             </el-table-column>
@@ -301,11 +316,70 @@
             <el-button @click="closeClass">返回</el-button>
           </span>
         </el-dialog>
+        
+        <el-dialog title="分类标签设置" :visible.sync="labelVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeLabel">
+          <div class="plus">
+            <i class="el-icon-circle-plus-outline" @click="addLabel"></i>
+          </div>
+          <el-table :data="labels" ref="table" header-align="center" row-key="id">
+            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+            <el-table-column prop="tagsName" label="主题名称" align="center" min-width="130">
+              <template slot-scope="scope">
+                <el-input
+                  v-if="scope.row.edit"
+                  placeholder="请输入主题名称"
+                  v-model="scope.row.tagsName"
+                  clearable
+                  maxlength="30"
+                ></el-input>
+                <span v-else>{{ scope.row.tagsName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" min-width="60">
+              <template slot-scope="scope">
+                <i v-if="scope.row.edit" class="el-icon-check edit" @click="submitLabel(scope.row)"></i>
+                <!-- <i v-else class="el-icon-edit edit" @click="editLabel(scope.row)"></i> -->
+                <i class="el-icon-delete del" @click="delLabel(scope.row, scope.$index)"></i>
+              </template>
+            </el-table-column>
+          </el-table>
+          <span slot="footer">
+            <el-button @click="closeLabel">返回</el-button>
+          </span>
+        </el-dialog>
+        
+        <el-dialog title="关联产品" :visible.sync="productVisible" width="800px" :close-on-click-modal="false" class="manage-dia">
+          <div class="tabs">
+              <a class="item" v-for="(item, i) in tabs" :key="i" :class="{active: i == productActive}" @click="tabChange(i)">{{ item }}</a>
+          </div>
+          <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="productKeyword" clearable style="width: 200px;margin-bottom: 10px;"></el-input>
+          <el-table :data="products" class="table" ref="table" stripe header-align="center" row-key="id">
+            <el-table-column width="80" align="center">
+              <template slot-scope="scope">
+                <el-radio class="product-radio" v-model="selectProduct" :label="scope.row.cid"></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column type="index" width="100" label="序号" align="center">
+                <template slot-scope="scope">
+                    {{ scope.$index + (page - 1) * pageSize + 1 }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="curriculumName" label="产品名称" min-width="150" align="center"></el-table-column>
+        </el-table>
+        <div class="pagination">
+            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
+            </el-pagination>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="productVisible = false">取消</el-button>
+            <el-button type="primary" @click="submitProduct">确定</el-button>
+        </span>
+      </el-dialog>
     </div>
 </template>
 
 <script>
-import util from "@/libs/util";
+import Util from "@/libs/util";
 import Setting from "@/setting";
 import quill from "@/components/quill";
 import Editor from '@tinymce/tinymce-vue'
@@ -313,125 +387,93 @@ import editorConfig from '@/utils/editor'
 export default {
     name: "courseAddEdit",
     data() {
-        const that = this
         return {
             headers: {
                 token: sessionStorage.getItem("token")
             },
+            editorConfig,
             isDetail: Boolean(this.$route.query.show),
             form: {
               id: this.$route.query.id,
-              courseIntroduction: '',
-              courseName: '',
-              courseType: 0,
-              coverUrl: '',
-              platformSource: Setting.platformSource,
-              platformClassificationIds: [],
-              schoolClassificationsIds: [],
-              visibleRange: 1
-            },
-            rules: {
-              courseName: [
-                { required: true, message: '请输入课程名称', trigger: 'blur' }
-              ],
-              platformClassificationIds: [
-                { required: true, message: '请选择课程分类', trigger: 'change' }
-              ],
-              coverUrl: [
-                { required: true, message: '请选择课程封面', trigger: 'change' }
-              ],
-              courseType: [
-                { required: true, message: '请选择课程类型', trigger: 'change' }
+              supplierIds: [],
+              tagsIds: [],
+              typeIds: [],
+              mall: {
+                isAssociatedProduct: 0,
+                appletIcon: '',
+                applicationScenario: '',
+                associatedProduct: '',
+                associatedProductName: '',
+                authority: '',
+                courseHours: '',
+                coverDrawing: '',
+                detailedIntroduction: '',
+                interfaceDiagram: '',
+                interfaceDiagrams: [],
+                isShelves: '',
+                marketUnitPrice: '',
+                matchingCourse: '',
+                productIntroduction: '',
+                productName: '',
+                state: 1,
+              },
+              mallDisciplines: [
+                {
+                  professionalClassList: [],
+                  professionalList: [],
+                  categoryId: '',
+                  professionalCategoryId: '',
+                  professionalId: '',
+                }
               ],
-              visibleRange: [
-                { required: true, message: '请选择可见范围', trigger: 'change' }
+              mallPrices: [
+                {
+                  area: 0,
+                  entryType: 0,
+                  settlementPrice: '',
+                  settlementPriceType: 0
+                },
+                {
+                  area: 0,
+                  entryType: 0,
+                  settlementPrice: '',
+                  settlementPriceType: 1
+                }
               ],
-              courseIntroduction: [
-                { required: true, message: '请输入课程介绍', trigger: 'blur' }
-              ]
             },
+            productVisible: false,
+            tabs: ['理论课程', '实训课程', '数据前瞻', '职站增值应用'],
+            products: [],
+            multipleSelection: [],
+            page: 1,
+            pageSize: 10,
+            total: 0,
+            selectProduct: '',
+            productKeyword: '',
+            productActive: 0,
+            productCategoryList: [],
+            suppliers: [],
+            labels: [],
+            labelVisible: false,
+            classifications: [],
+            classVisible: false,
             subjectList: [], //专业学科
             ProfessionalClassList: [], //专业类
             ProfessionalList: [], //专业
             classificationList: [],
+            provinces: [],
+            entryTypes: [
+              {
+                id: 0,
+                name: '手动录入'
+              },{
+                id: 1,
+                name: '折扣价'
+              }
+            ],
             uploadList: [],
             submiting: false,
             updateTime: 0,
-            
-            rangeVisible: false,
-            range: [],
-            rangeInit: [],
-            rangeName: '',
-            rangeChecked: [],
-            schools: [],
-            rangeList: [],
-            rangeTimer: null,
-            // 选择区域懒加载
-            props: {
-              multiple: true,
-              checkStrictly: true,
-              lazy: true,
-              lazyLoad (node, resolve) {
-                // 如果是在模糊搜索中，则不再用懒加载请求数据
-                const input = document.querySelector('.el-cascader__search-input')
-                const checked = that.rangeChecked
-                
-                if (input && input.value.trim()) {
-                  const val = input.value.trim()
-                  return that.schools.filter(e => e.label.includes(val))
-                }
-                
-                const { level, value } = node
-                // 省份
-                if (!level) {
-                  that.$get(that.api.queryProvince).then(({ list }) => {
-                    const data = []
-                    list.map(e => {
-                      e.value = e.provinceId
-                      e.label = e.provinceName
-                      e.children = []
-                      e.disabled = !!checked.find(n => n.provinceId == e.provinceId && !n.cityId)
-                      data.push(e)
-                    })
-                    resolve(data)
-                  }).catch(res => {})
-                } else if (level === 1) {
-                  // 城市
-                  that.$get(that.api.queryCity, {
-                    provinceId: value
-                  }).then(({ list }) => {
-                    const data = []
-                    list.map(e => {
-                      e.value = e.cityId
-                      e.label = e.cityName
-                      e.children = []
-                      e.disabled = !!checked.find(n => n.cityId == e.cityId && n.provinceId == e.provinceId && !n.schoolId)
-                      data.push(e)
-                    })
-                    resolve(data)
-                  }).catch(res => {})
-                } else if (level === 2) {
-                  // 学校
-                  that.$get(that.api.getSchoolsByProvince, {
-                    provinceId: node.data.provinceId,
-                    cityId: value,
-                    schoolName: ''
-                  }).then(({ list }) => {
-                    const data = []
-                    list.map(e => {
-                      e.value = e.schoolId
-                      e.label = e.schoolName
-                      e.leaf = true
-                      e.disabled = !!checked.find(n => n.schoolId == e.schoolId && n.cityId == e.cityId && n.provinceId == e.provinceId)
-                      data.push(e)
-                    })
-                    resolve(data)
-                  }).catch(res => {})
-                } else {
-                  resolve([])
-                }
-              }
-            },
             nameRepeat: false
         };
     },
@@ -445,184 +487,362 @@ export default {
       }
     },
     mounted() {
-      this.getClassification();
-      this.form.id && this.getData();
-      this.getSchool()
+      this.form.id && this.getData()
+      this.getCategory()
+      this.getLabel()
+      this.getClass()
+      this.getSupplier()
+      this.getSubject()
+      this.getProvince()
     },
     components: {
         Editor
     },
     methods: {
-      getClassification() {
-        this.$post(this.api.listClassification, {
-          pageNum: 1,
-          pageSize: 1000,
-          platformSource: Setting.platformSource
-        }).then(({ page }) => {
-            this.classificationList = page.records
-        }).catch(res => {})
-      },
       getData() {
-          this.$post(`${this.api.findTheoreticalCourse}?id=${this.form.id}`).then(({ data }) => {
-            // 分类id处理
-            if (data.platformClassificationList) {
-              data.platformClassificationIds = data.platformClassificationList.map(e => e.classificationId)
-              delete data.platformClassificationList
-            }
-            this.form = data
-
-            // 选择范围name
-            const rangeName = data.courseRangeList
-            if (rangeName) {
-              const range = []
-              const rangeChecked = []
-              rangeName.map(e => {
-                const name = e.type ? (e.cityName || e.provinceName) : e.schoolName
-                range.push(name)
-                rangeChecked.push({
-                  value: e.type ? (e.cityId || e.provinceId) : e.schoolId,
-                  label: name,
-                  cityId: e.cityId,
-                  provinceId: e.provinceId,
-                  schoolId: e.schoolId,
-                })
+          this.$get(`${this.api.detailsOfGoods}?mallId=${this.form.id}`).then(res => {
+            const e = res.orderDetails
+            if (e.classificationIds && e.classificationIds.length) e.classificationIds = e.classificationIds[0]
+            if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0]
+            e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : []
+            this.form = e
+            this.$nextTick(() => {
+              this.form.mallDisciplines.forEach(e => {
+                this.$set(e, 'professionalClassList', [])
+                this.$set(e, 'professionalList', [])
+                this.getProfessionalClassData(e)
+                this.getProfessionalData(e)
               })
-              this.rangeName = range.join('，')
-
-              this.rangeChecked = rangeChecked
-            }
+            })
+            console.log("🚀 ~ file: index.vue:503 ~ this.$get ~ this.form:", this.form)
+          }).catch(err => {})
+      },
 
-            this.uploadList.push({
-                name: "cover.jpg",
-                url: data.coverUrl
+      
+      // 显示关联产品弹框
+      setProduct() {
+        this.productVisible = true
+        this.getProduct()
+      },
+      // 获取关联产品
+      getProduct() {
+        const active = this.productActive
+        const keyword = this.productKeyword
+        if (!active || active == 1) {
+          const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
+          this.$post(this.api.curriculumList, {
+              curriculumName: keyword,
+              curriculumType: active,
+              pageNum: this.page,
+              pageSize: this.pageSize,
+              supplierId: sid ? sid.supplierId : ''
+          }).then(({ page }) => {
+              this.products = page.records
+              this.total = page.total
+          }).catch(err => {})
+        } else if (active == 2) {
+          this.$post(this.api.listByEntity,{
+            pageNum: this.page,
+            pageSize: this.pageSize,
+            productName: keyword,
+            supplierId: '1'
+          }).then(res => {
+            const list = res.pageList.records
+            list.forEach(e => {
+              e.cid = e.id
+              e.curriculumName = e.productName
+            })
+            this.products = list
+            this.total = res.pageList.total
+          }).catch(res => {})
+        } else {
+          this.$post(this.api.getValueModule + '?platformId=1').then(res => {
+            const list = res.valueList
+            list.forEach(e => {
+              e.cid = e.id
+              e.curriculumName = e.moduleName
             })
+            this.products = list
+            this.total = list.length
           }).catch(err => {})
+        }
+      },
+      // 关联产品切换
+      tabChange(i) {
+        this.productActive = i
+        this.getProduct()
+      },
+      // 关联产品分页
+      handleCurrentChange(val) {
+        this.page = val;
+        this.getProduct();
+      },
+      // 关联产品提交
+      submitProduct() {
+        const id = this.selectProduct
+        if (!id) return Util.errorMsg('请选择产品！')
+        const { form } = this
+        const { mall } = form
+        const active = this.productActive
+        // 实训、理论需要查询课程详情，把课程信息带过来
+        if (!active || active == 1) {
+          this.$post(`${this.api.curriculumDetail}?cid=${id}`).then(({ data }) => {
+            form.supplierIds = data.supplier.split(',').map(e => +e)
+            form.classificationIds = !data.curriculumType ? 2 : data.curriculumType
+            form.mallDisciplines = [{
+              professionalClassList: [],
+              professionalList: [],
+              categoryId: data.categoryId,
+              professionalId: data.professionalId,
+              professionalCategoryId: data.professionalCategoryId,
+            }]
+            this.getProfessionalClassData(form.mallDisciplines[0])
+            this.getProfessionalData(form.mallDisciplines[0])
+            mall.courseHours = data.expectedCourse
+            mall.coverDrawing = data.coverUrl
+            mall.appletIcon = data.miniProgramPictureAddress
+            mall.productIntroduction = data.briefIntroduction
+          }).catch(err => {})
+        }
+        mall.associatedProduct = id
+        mall.associatedProductName = this.products.find(e => e.cid == id).curriculumName
+        this.productVisible = false
+      },
+
+      // 获取产品分类
+      getCategory() {
+        this.$get(this.api.productCategoryList).then(res => {
+          this.productCategoryList = res.classificationList
+        }).catch(err => {})
+      },
+
+      
+      // 获取供应厂商
+      getSupplier() {
+        this.$get(this.api.supplierList).then(res => {
+          this.suppliers = res.supplierList
+        }).catch(err => {})
+      },
+
+      
+      // 获取分类标签
+      getLabel() {
+        this.$get(this.api.tagsList).then(res => {
+          this.labels = res.tagsList
+        }).catch(err => {})
+      },
+      // 显示标签弹框
+      setLabel() {
+        this.labelVisible = true
       },
-      // 选择范围
-      showRange() {
-        this.rangeVisible = true
-      },
-      // 范围勾选回调
-      rangeChange(val, e) {
-        const checked = this.$refs.range.getCheckedNodes()
-        const name = []
-        const { rangeChecked } = this
-        checked.map(e => {
-          rangeChecked.find(n => n.value === e.value && n.label == e.label) || name.push(e.data) // 未勾选的，则push
+      // 新增标签
+      addLabel() {
+        this.labels.push({
+          edit: true,
+          tagsId: '',
+          tagsName: ''
         })
-        this.rangeChecked.push(...name)
-        console.log("🚀 ~ file: index.vue:306 ~ rangeChange ~ this.rangeChecked", this.rangeChecked)
-      },
-      // 范围展开收缩回调
-      rangeViChange(e) {
-        // 展开的时候清空搜索结果
-        if (e) {
-          this.rangeList = []
+      },
+      // 编辑标签
+      editLabel(row) {
+        this.$set(row, 'edit', 1)
+      },
+      // 删除标签
+      delLabel(row, i) {
+        if (row.tagsId) {
+          this.$confirm('确定要删除吗？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.$post(`${this.api.deleteTags}?tagsId=${row.tagsId}`).then(res => {
+              Util.successMsg('删除成功')
+              this.getLabel()
+            }).catch(res => {})
+          }).catch(() => {})
+        } else {
+          this.labels.splice(i, 1)
         }
       },
-      // 获取学校列表
-      getSchool() {
-        this.$get(this.api.querySchoolData).then(({ list }) => {
-          const result = []
-          list.map(e => {
-            e.value = e.schoolId
-            e.label = e.schoolName
-            e.leaf = true
-            result.push(e)
-          })
-          this.schools = result
+      // 提交标签
+      submitLabel(row, showMsg = 1) {
+        if (!row.tagsName) return Util.errorMsg('请输入主题名称')
+        this.$post(`${this.api.addTags}?tagsName=${row.tagsName}`).then(res => {
+          showMsg && Util.successMsg('新增成功')
+          this.getLabel()
         }).catch(res => {})
       },
-      // 范围模糊查询前置钩子
-      beforeFilter() {
-        return false
-      },
-      // 范围筛选
-      rangeSearch(el) {
-        const val = el.target.value.trim()
-        const checked = this.rangeChecked
-        if (!val) {
-          this.rangeList = []
-          return false
-        }
-        clearTimeout(this.rangeTimer)
-        this.rangeTimer = setTimeout(() => {
-          let result = this.schools.filter(e => {
-            if (e.label.includes(val)) {
-              e.disabled = !!checked.find(n => n.schoolId == e.schoolId)
-              return e
-            }
-          }) // 用学校列表做比对
-          this.rangeList = result
-        }, 100)
-      },
-      closeRange(i) {
-        this.rangeChecked.splice(i, 1)
-      },
-      // 范围确定
-      rangeSubmit() {
-        // 处理提交需要的id
-        const data = []
-        const checked = this.rangeChecked
-        const promises = []
-        checked.map(e => {
-          if (e.cityId && !e.schoolId) {
-            promises.push(new Promise((resolve, reject) => {
-              this.$get(this.api.getSchoolsByProvince, {
-                provinceId: e.provinceId,
-                cityId: e.cityId,
-                schoolName: ''
-              }).then(({ list }) => {
-                list.map(e => {
-                  data.push({
-                    provinceId: e.provinceId || '',
-                    cityId: e.cityId || '',
-                    schoolId: e.schoolId || '',
-                    type: e.schoolId ? 0 : 1
-                  })
-                })
-                resolve()
-              }).catch(res => {})
-            }))
-          } else {
-            data.push({
-              provinceId: e.provinceId || '',
-              cityId: e.cityId || '',
-              schoolId: e.schoolId || '',
-              type: e.schoolId ? 0 : 1
+      // 关闭标签
+      closeLabel() {
+        const list = this.labels
+        if (list.find(e => e.edit && e.tagsName)) {
+          this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            list.map(e => {
+              e.edit && e.tagsName && this.submitLabel(e, 0)
             })
-          }
-        })
-        Promise.all(promises).then(_ => {
-          this.form.courseRangeList = data
-          console.log("🚀 ~ file: index.vue ~ line 343 ~ rangeSubmit ~ data", data)
-          // 处理显示的name
-          const name = []
-          checked.map(e => {
-            name.push(e.label)
+            this.labelVisible = false
+          }).catch(() => {
+            this.labelVisible = false
           })
-          this.rangeName = name.join('、')
+        } else {
+          this.labelVisible = false
+        }
+      },
 
-          this.rangeVisible = false
+
+
+      
+      // 获取产品类型
+      getClass() {
+        this.$get(this.api.productTypeList).then(res => {
+          this.classifications = res.typeList
+        }).catch(err => {})
+      },
+      // 显示产品类型弹框
+      setClass() {
+        this.classVisible = true
+      },
+      // 新增产品类型
+      addClass() {
+        this.classifications.push({
+          edit: true,
+          typeId: '',
+          classificationName: ''
         })
       },
-      // 名称判重
-      nameChange(val) {
-        this.$post(this.api.checkRepeatTheoreticalCourse, {
-          id: this.form.id,
-          courseName: val,
-          platformSource: this.form.platformSource
+      // 编辑产品类型
+      editClass(row) {
+        this.$set(row, 'edit', 1)
+      },
+      // 删除产品类型
+      delClass(row, i) {
+        if (row.typeId) {
+          this.$confirm('确定要删除吗？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.$post(`${this.api.deleteProductType}?typeId=${row.typeId}`).then(res => {
+              Util.successMsg('删除成功')
+              this.getClass()
+            }).catch(res => {})
+          }).catch(() => {})
+        } else {
+          this.classifications.splice(i, 1)
+        }
+      },
+      // 提交产品类型
+      submitClass(row, showMsg = 1) {
+        if (!row.typeName) return Util.errorMsg('请输入分类名称')
+        this.$post(`${this.api.addProductType}?typeName=${row.typeName}`).then(res => {
+          showMsg && Util.successMsg((row.id ? '修改' : '新增') + '成功')
+          this.getClass()
+        }).catch(res => {})
+      },
+      // 关闭产品类型
+      closeClass() {
+        const list = this.classifications
+        if (list.find(e => e.edit && e.typeName)) {
+          this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            list.map(e => {
+              e.edit && e.typeName && this.submitClass(e, 0)
+            })
+            this.classVisible = false
+          }).catch(() => {
+            this.classVisible = false
+          })
+        } else {
+          this.classVisible = false
+        }
+        // 所选的分类被删了后，要清空所选的分类id
+        if (!list.find(e => e.id == this.form.classificationId)) this.form.classificationId = ''
+      },
+
+
+      // 添加学科
+      addSubject() {
+        this.form.mallDisciplines.push(
+          {
+            professionalClassList: [],
+            professionalList: [],
+            categoryId: '',
+            professionalCategoryId: '',
+            professionalId: '',
+          }
+        )
+      },
+      // 获取学科类别
+      getSubject() {
+          this.$get(this.api.courseDiscipline).then(res => {
+              this.subjectList = res.list;
+          }).catch(err => {
+          });
+      },
+      // 清除学科类别
+      clearClass(item) {
+          item.professionalCategoryId = "";
+          item.professionalId = "";
+      },
+      // 获取专业类
+      getProfessionalClass(item) {
+          this.clearClass(item);
+          this.getProfessionalClassData(item);
+      },
+      getProfessionalClassData(item) {
+        this.$get(this.api.courseProfessionalClass, {
+          disciplineId: item.categoryId
         }).then(res => {
-          this.nameRepeat = false
-        }).catch(err => {
-          this.nameRepeat = true
+          item.professionalClassList = res.list
+        }).catch(err => {})
+      },
+      // 清除专业类
+      clearProfess(item) {
+        item.professionalId = "";
+      },
+      // 获取专业
+      getProfessional(item) {
+          this.clearProfess(item);
+          this.getProfessionalData(item);
+      },
+      getProfessionalData(item) {
+        this.$get(this.api.courseProfessional, {
+          professionalClassId: item.professionalCategoryId
+        }).then(res => {
+          item.professionalList = res.list
+        }).catch(err => {})
+      },
+
+
+      // 添加厂商结算价
+      addArea(type) {
+        this.form.mallPrices.push({
+          area: '',
+          entryType: 0,
+          settlementPrice: '',
+          settlementPriceType: type
         })
       },
+      // 查询省份
+      getProvince(){
+        this.$get(this.api.queryProvince).then(({ list }) => {
+          this.provinces = list
+        }).catch(res => {})
+      },
+
       handleExceed(files, fileList) { // 上传文件
-          util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
+          Util.warningMsg("当前限制选择 4 个文件，如需更换，请删除上一个文件再重新选择！");
+      },
+      uploadSuccess(res) {
+          this.form.mall.coverDrawing = res.data.filesResult.fileUrl
       },
-      uploadSuccess(res, file, fileList) {
-          this.form.coverUrl = res.data.filesResult.fileUrl
+      uploadSuccessMini(res) { // 文件上传成功时的钩子
+          this.form.mall.appletIcon = res.data.filesResult.fileUrl;
+      },
+      uploadSuccessInterface(res) { // 文件上传成功时的钩子
+          this.form.mall.interfaceDiagrams.push(res.data.filesResult.fileUrl)
+      },
+      uploadSuccessFile(res) { // 文件上传成功时的钩子
+          this.form.mall.appletIcon = res.data.filesResult.fileUrl;
       },
       uploadError(err, file, fileList) {
           this.$message({
@@ -635,45 +855,68 @@ export default {
           return this.$confirm(`确定移除 ${file.name}？`);
       },
       handleRemove(file, fileList) {
-          let fileName = this.form.coverUrl.replace('https://huoran.oss-cn-shenzhen.aliyuncs.com/', "");
-          this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-              this.form.coverUrl = ''
-          }).catch(res => {});
-      },
-      save() {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            if (this.nameRepeat) return util.errorMsg('当前课程名已存在!')
-            if (this.submiting) return false
-            const { form } = this
-            this.submiting = true
-            if (form.id) {
-                form.courseId = form.id
-                this.$post(this.api.updateTheoreticalCourse, form).then(res => {
-                    this.submiting = false;
-                    util.successMsg("修改成功");
-                    this.$router.back();
-                }).catch(err => {
-                    this.submiting = false;
-                });
-            } else {
-                this.$post(this.api.saveTheoreticalCourse, form).then(({ courseId }) => {
-                    this.submiting = false;
-                    this.$confirm("课程创建成功，是否马上进行课程内容设置？", "提示", {
-                        type: "success",
-                        confirmButtonText: "马上设置",
-                        cancelButtonText: "稍后操作"
-                    }).then(() => {
-                        this.$router.replace(`/setTheoreticalCourse?id=${courseId}`);
-                    }).catch(() => {
-                        this.$router.back();
-                    });
-                }).catch(err => {
-                    this.submiting = false;
-                });
+          // let fileName = this.form.mall.coverDrawing.replace('https://huoran.oss-cn-shenzhen.aliyuncs.com/', "");
+          // this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
+          //     this.form.mall.coverDrawing = ''
+          // }).catch(res => {});
+      },
+      submit(state, isShelves) {
+        const { form } = this
+        const { mall } = form
+        if (!mall.productName) return Util.errorMsg('请输入产品名称！')
+        if (!state) {
+          if (!mall.isAssociatedProduct && !mall.associatedProduct) return Util.errorMsg('请选择产品！')
+          if (!form.classificationIds) return Util.errorMsg('请选择产品分类！')
+          if (!form.typeIds) return Util.errorMsg('请选择产品类型！')
+          if (!form.supplierIds.length) return Util.errorMsg('请选择供应厂商！')
+          let invalid = 0
+          for (const e of form.mallDisciplines) {
+            if (!e.categoryId) {
+              invalid = 1
+              Util.errorMsg('请选择学科类别！')
+              break
+            }
+            if (!e.professionalCategoryId) {
+              invalid = 1
+              Util.errorMsg('请选择专业类！')
+              break
+            }
+            if (!e.professionalId) {
+              invalid = 1
+              Util.errorMsg('请选择专业！')
+              break
             }
           }
-        })
+          if (invalid) return
+          if (!mall.coverDrawing) return Util.errorMsg('请上传封面图！')
+          if (!mall.marketUnitPrice) return Util.errorMsg('请输入市场建议单价！')
+          if (!mall.productIntroduction) return Util.errorMsg('请输入产品简介！')
+          if (!mall.detailedIntroduction) return Util.errorMsg('请输入详情介绍！')
+        }
+        form.classificationIds = [form.classificationIds]
+        form.typeIds = [form.typeIds]
+        mall.interfaceDiagram = mall.interfaceDiagrams.join()
+        form.mall.state = state
+        if (isShelves) form.mall.isShelves = 0
+        if (this.submiting) return false
+        this.submiting = true
+        if (form.mall.mallId) {
+            this.$post(this.api.renewalOfGoods, form).then(res => {
+                this.submiting = false;
+                Util.successMsg("修改成功");
+                this.$router.back();
+            }).catch(err => {
+                this.submiting = false;
+            });
+        } else {
+            this.$post(this.api.addGoods, form).then(res => {
+                this.submiting = false;
+                Util.successMsg("修改成功");
+                this.$router.back();
+            }).catch(err => {
+                this.submiting = false;
+            });
+        }
       },
       // 返回上一页
       backPage() {
@@ -700,6 +943,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.m-l-5 {
+  margin-left: 5px;
+}
+.model {
+  height: calc(100vh - 350px);
+  overflow: auto;
+}
 $avatar-width: 104px;
 /deep/ .avatar-uploader {
     .el-upload {
@@ -736,7 +986,6 @@ $avatar-width: 104px;
                 line-height: 1;
             }
         }
-
         .avatar {
             width: $avatar-width;
             height: $avatar-width;
@@ -758,6 +1007,14 @@ $avatar-width: 104px;
         }
     }
 }
+.avatars {
+  margin-top: 10px;
+  img {
+    width: $avatar-width;
+    height: $avatar-width;
+    margin-right: 10px;
+  }
+}
 
 /deep/ .d-inline-block {
     width: 216px;
@@ -766,13 +1023,63 @@ $avatar-width: 104px;
         width: 100%;
     }
 }
-.range-check {
-  display: inline-block;
-  margin: 0 0 10px 10px;
+.manage-dia {
+  .edit, .del {
+    font-size: 14px;
+    cursor: pointer;
+  }
+  .edit {
+    margin-right: 10px;
+  }
+}
+.plus {
+  margin-bottom: 10px;
+  font-size: 18px;
+  color: #9278FF;
+  text-align: right;
+  cursor: pointer;
+}
+.subject {
+  padding: 10px;
+  border: 1px dashed #ccc;
+  .line {
+    display: flex;
+    margin-bottom: 10px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .el-form-item {
+    margin-bottom: 0;
+  }
+}
+.subject-plus {
+  margin-top: 5px;
+  text-align: center;
+  font-size: 18px;
+  color: #9076FF;
+  cursor: pointer;
 }
-/deep/.range-cas {
-  .el-tag {
+/deep/.req {
+  .el-form-item__label {
+    &:before {
+      content: '*';
+      margin-right: 5px;
+      font-size: 18px;
+      vertical-align: middle;
+      color: #f00;
+    }
+  }
+}
+.tabs {
+  margin-bottom: 20px;
+}
+/deep/.product-radio {
+  .el-radio__label {
     display: none;
   }
 }
+.btns {
+  text-align: center;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/shop/list/market/index.vue b/src/views/shop/list/market/index.vue
index dd087b7..842ed2b 100644
--- a/src/views/shop/list/market/index.vue
+++ b/src/views/shop/list/market/index.vue
@@ -1,52 +1,66 @@
 <template>
     <!--   营销推广管理     -->
     <div style="padding-top: 24px">
+        <div style="margin-bottom: 10px;text-align: right;">
+          <el-button v-auth="'平台自建:新增'" type="primary" round @click="add">新增</el-button>
+        </div>
         <el-table :data="list" class="table" ref="table" stripe header-align="center" row-key="id">
             <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
             <el-table-column prop="courseName" label="图片" min-width="150" align="center">
               <template slot-scope="scope">
-                <el-upload
-                  class="avatar-uploader"
-                  accept=".jpg,.png,.jpeg"
-                  :on-success="res => uploadSuccess(res, scope.row)"
-                  :limit="1"
-                  :action="api.fileupload"
-                  :headers="headers"
-                  :show-file-list="false"
-                  name="file"
-                >
-                  <img v-if="scope.row.pic" :src="scope.row.pic" class="avatar">
-                  <div class="uploader-default" v-else>
-                      <i class="el-icon-plus"></i>
-                      <p>上传图片</p>
-                  </div>
-                </el-upload>
-              </template>
-            </el-table-column>
-            <el-table-column prop="courseName" label="标题" min-width="150" align="center">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.title" placeholder="请输入标题" maxlength="100"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column prop="courseName" label="链接" min-width="150" align="center">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.title" placeholder="请输入链接" maxlength="100"></el-input>
+                <img width="100" :src="scope.row.banner" alt="">
               </template>
             </el-table-column>
+            <el-table-column prop="title" label="标题" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="url" label="链接" min-width="150" align="center"></el-table-column>
             <el-table-column label="操作" align="center" width="250">
                 <template slot-scope="scope">
                     <el-switch
-                        v-model="scope.row.isShelves"
-                        :active-value="1"
-                        :inactive-value="0"
+                        v-model="scope.row.isOpen"
+                        :active-value="0"
+                        :inactive-value="1"
                         @change="switchOff($event, scope.row)"
                         v-auth="'/curriculum:上下架'">
                     </el-switch>
-                    <el-button class="m-l-10" v-auth="'平台自建:编辑信息'" type="text" @click="editCourse(scope.row)">编辑</el-button>
+                    <el-button style="margin-left: 10px;" v-auth="'平台自建:删除'" type="text" @click="edit(scope.row)">编辑</el-button>
                     <el-button v-auth="'平台自建:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
+
+        
+        <el-dialog :title="(form.id ? '编辑' : '新增') + 'banner'" :visible.sync="bannerVisible" width="500px" class="dialog" :close-on-click-modal="false">
+            <el-form ref="form" label-width="60px">
+                <el-form-item label="图片">
+                  <el-upload
+                    class="avatar-uploader"
+                    accept=".jpg,.png,.jpeg"
+                    :on-success="uploadSuccess"
+                    :limit="1"
+                    :action="api.fileupload"
+                    :headers="headers"
+                    :show-file-list="false"
+                    name="file"
+                  >
+                    <img v-if="form.banner" :src="form.banner" class="avatar">
+                    <div class="uploader-default" v-else>
+                        <i class="el-icon-plus"></i>
+                        <p>上传图片</p>
+                    </div>
+                  </el-upload>
+                </el-form-item>
+                <el-form-item label="标题">
+                  <el-input v-model="form.title" placeholder="请输入标题" maxlength="100"></el-input>
+                </el-form-item>
+                <el-form-item label="链接">
+                  <el-input v-model="form.url" placeholder="请输入链接" maxlength="100"></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="bannerVisible = false">取消</el-button>
+                <el-button type="primary" @click="submitBanner">确定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -59,36 +73,35 @@ export default {
           headers: {
               token: sessionStorage.getItem("token")
           },
-          list: [{}],
+          list: [],
+          bannerVisible: false,
+          form: {
+            id: '',
+            banner: '',
+            title: '',
+            url: '',
+          }
         };
     },
     mounted() {
-      
+      this.getList()
     },
     methods: {
         getList() {
-            this.$post(this.api.listTheoreticalCourse, {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              keyWord: this.keyword,
-              createPlatform: 0,
-              platformSource: Setting.platformSource,
-              ...this.form
+            this.$post(this.api.listMarketing, {
+              pageNum: 1,
+              pageSize: 1000
             }).then(({ page }) => {
                 this.list = page.records;
                 this.total = page.total;
-                if (!this.list.length && this.total) {
-                    this.page--;
-                    this.getData();
-                }
             }).catch(res => {
             });
         },
         handleExceed() { // 文件超出个数限制时的钩子
             this.$message.warning("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
         },
-        uploadSuccess(res, row) { // 文件上传成功时的钩子
-          row.pic = res.data.filesResult.fileUrl;
+        uploadSuccess(res) { // 文件上传成功时的钩子
+          this.form.banner = res.data.filesResult.fileUrl;
         },
         uploadError(err, file, fileList) { // 文件上传失败时的钩子
             this.$message({
@@ -103,20 +116,37 @@ export default {
         handleRemove(file, fileList) { // 文件列表移除文件时的钩子
           // this.form.coverUrl = ''
         },
-        addCourse() {
-            this.$router.push("/addTheoreticalCourse");
+        add() {
+          this.form = {
+            id: '',
+            banner: '',
+            title: '',
+            url: '',
+          }
+          this.bannerVisible = true
+        },
+        edit(row) {
+          this.form = JSON.parse(JSON.stringify(row))
+          this.bannerVisible = true
         },
-        editCourse(row) {
-            this.$router.push(`/addTheoreticalCourse?id=${row.id}`);
+        // banner弹框提交
+        submitBanner() {
+          const { form } = this
+          if (!form.banner) return util.errorMsg('请上传图片')
+          if (!form.title) return util.errorMsg('请输入标题')
+          this.$post(this.api[form.id ? 'updateMarketing' : 'saveMarketing'], form).then(res => {
+            this.getList()
+            this.bannerVisible = false
+          }).catch(res => {})
         },
         handleDelete(row) {
             this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
                 type: "warning"
             })
                 .then(() => {
-                    this.$post(`${this.api.delTheoreticalCourse}?ids=${row.id}`).then(res => {
+                    this.$post(`${this.api.delMarketing}?ids=${row.id}`).then(res => {
                         util.successMsg("删除成功");
-                        this.initData();
+                        this.getList();
                     }).catch(res => {
                     });
                 })
diff --git a/src/views/shop/list/product/index.vue b/src/views/shop/list/product/index.vue
index 66443e3..6ea5758 100644
--- a/src/views/shop/list/product/index.vue
+++ b/src/views/shop/list/product/index.vue
@@ -41,20 +41,24 @@
                     {{ scope.$index + (page - 1) * pageSize + 1 }}
                 </template>
             </el-table-column>
-            <el-table-column prop="courseName" label="产品名称" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="厂商" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="产品类型" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="关联产品" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="状态" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="productName" label="产品名称" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="supplierName" label="厂商" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="typeName" label="产品类型" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="associatedProductName" label="关联产品" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="courseName" label="状态" min-width="150" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.isShelves ? '下架' : '上架' }}
+              </template>
+            </el-table-column>
             <el-table-column prop="courseName" label="订单量" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="最近编辑人" min-width="150" align="center"></el-table-column>
+            <el-table-column prop="userName" label="最近编辑人" min-width="150" align="center"></el-table-column>
             <el-table-column prop="courseName" label="精选" min-width="150" align="center"></el-table-column>
             <el-table-column label="上架/下架" align="center">
                 <template slot-scope="scope">
                     <el-switch
                         v-model="scope.row.isShelves"
-                        :active-value="1"
-                        :inactive-value="0"
+                        :active-value="0"
+                        :inactive-value="1"
                         @change="changeSwitch($event, scope.row)"
                         v-auth="'/curriculum:上下架'">
                     </el-switch>
@@ -135,47 +139,23 @@ export default {
     },
     mounted() {
         this.getClassification();
-        this.getData();
-        this.$once('hook:beforeDestroy', function() {
-          clearInterval(this.timer)
-        })
+        this.initData();
     },
     methods: {
-        //原理论课程需求:
-        // 用户创建的理论课程，禁用时职站首页以及学生登录后的理论课程模块看不到对应的课程，创建的老师在理论课程管理还是可以看到该理论课程，可以编辑，但是无法启用。
-        // 即中台禁用的理论课程，即使是该院校老师创建的，老师端也不能自己启用，需要中台启用。
-        //1.判断当前院校禁启用状态为要启用时候再判断当前课程中台禁启用的状态
-        getList() {
-            this.$post(this.api.listTheoreticalCourse, {
+        getData() {
+            this.$post(this.api.listOfGoods, {
               pageNum: this.page,
               pageSize: this.pageSize,
-              keyWord: this.keyword,
-              createPlatform: 0,
-              platformSource: Setting.platformSource,
+              // keyWord: this.keyword,
+              // createPlatform: 0,
+              // platformSource: Setting.platformSource,
               ...this.form
             }).then(({ page }) => {
                 this.list = page.records;
                 this.total = page.total;
-                if (!this.list.length && this.total) {
-                    this.page--;
-                    this.getData();
-                }
             }).catch(res => {
             });
         },
-        // 获取redis缓存
-        getRedis() {
-          this.$post(this.api.getRedisCache).then(({ data }) => {
-            data && this.getList()
-          }).catch(res => {})
-        },
-        getData() {
-          this.getList()
-          if (!Setting.isDev) {
-            clearInterval(this.timer)
-            this.timer = setInterval(this.getRedis, 1000)
-          }
-        },
         initData() {
             this.page = 1;
             this.getData();
@@ -203,14 +183,14 @@ export default {
             this.$router.push("/shop/addProduct");
         },
         editCourse(row) {
-            this.$router.push(`/addTheoreticalCourse?id=${row.id}`);
+            this.$router.push(`/shop/addProduct?id=${row.mallId}`);
         },
         handleDelete(row) {
             this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
                 type: "warning"
             })
                 .then(() => {
-                    this.$post(`${this.api.delTheoreticalCourse}?ids=${row.id}`).then(res => {
+                    this.$post(this.api.deletionOfGoods, row.mallId).then(res => {
                         util.successMsg("删除成功");
                         this.initData();
                     }).catch(res => {
@@ -251,7 +231,7 @@ export default {
         },
         // 上下架
         changeSwitch(value, row) {
-            this.$post(`${this.api.isShelves}?cid=${row.cid}&isShelves=${value}`).then((res) => {
+            this.$post(`${this.api.goodsOffTheShelf}?mallId=${row.mallId}&isShelves=${value}`).then((res) => {
                 this.getData();
                 this.$message.success("修改上下架状态成功！");
             }).catch((res) => {