diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 6bb5a18..fc68129 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -40,7 +40,7 @@ export default {
     /* 最小高度 */
     minHeight: {
       type: Number,
-      default: null,
+      default: 500,
     },
     /* 只读 */
     readOnly: {
@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_BASE_API + "/oss/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken()
       },
@@ -176,7 +176,7 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(length, "image", res.url);
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {
diff --git a/src/views/pms/product/AddProduct.vue b/src/views/pms/product/AddProduct.vue
index 72c81de..356bca7 100644
--- a/src/views/pms/product/AddProduct.vue
+++ b/src/views/pms/product/AddProduct.vue
@@ -43,7 +43,7 @@
           <oss-image-upload v-model="form.pic" :limit="1"></oss-image-upload>
         </el-form-item>
         <el-form-item label="轮播图" prop="albumPics">
-          <oss-image-upload v-model="form.albumPics" :limit="5"></oss-image-upload>
+          <oss-image-upload v-model="albumPics" :limit="5"></oss-image-upload>
         </el-form-item>
       </el-card>
       
@@ -71,7 +71,7 @@
           </div>
         </el-form-item>
         <el-form-item label="规格信息">
-          <el-button @click="refreshSku(null)">刷新列表</el-button>
+          <el-button @click="refreshSku(null)" class="mb20">刷新列表</el-button>
           <el-table :data="skuList" :max-height="400">
             <el-table-column v-for="s in skuAttr" :label="s.name" :key="s.name" :prop="s.name"></el-table-column>
             <el-table-column label="展示图片">
@@ -97,12 +97,13 @@
         <div slot="header">
           <span>详情页</span>
         </div>
-        <el-form-item label="产品详情网页内容" prop="detailHtml">
-          <el-input v-model="form.detailHtml" placeholder="请输入内容" type="textarea"></el-input>
+        <el-form-item label="移动端" prop="detailMobileHtml">
+          <Editor v-model="form.detailMobileHtml" placeholder="请输入内容" type="url"></Editor>
         </el-form-item>
-        <el-form-item label="移动端网页详情" prop="detailMobileHtml">
-          <el-input v-model="form.detailMobileHtml" placeholder="请输入内容" type="textarea"></el-input>
+        <el-form-item label="PC端" prop="detailHtml">
+          <Editor v-model="form.detailHtml" placeholder="请输入内容" type=""></Editor>
         </el-form-item>
+        
       </el-card>
       
       <div class="tc">
@@ -127,6 +128,7 @@ export default {
       form: {},
       skuList:[],
       skuAttr:[],
+      albumPics:null,
       productAttr: [
         {
           name: '颜色',
@@ -143,6 +145,8 @@ export default {
     const {id} = this.$route.query
     if (id) {
       this.getInfo(id);
+    }else{
+      this.form.publishStatus=0
     }
   },
   methods: {
@@ -199,7 +203,7 @@ export default {
       getPmsProduct(id).then(response => {
         const {albumPics } = response
         if (albumPics) {
-          response.albumPics = albumPics.split(',')
+          this.albumPics = albumPics.split(',')
         }
         this.form = response;
         if(this.form.productAttr){
@@ -212,6 +216,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.albumPics){
+            this.form.albumPics = this.albumPics.toString()
+          }
           this.form.skuList = this.skuList
           if(this.form.categoryId && Array.isArray(this.form.categoryId)){
             this.form.categoryId = this.form.categoryId.pop()
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index a7ac6f6..2a87a3c 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -63,10 +63,18 @@
     <el-table v-loading="loading" :data="pmsProductList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编码" align="center" prop="outProductId"/>
-      <el-table-column label="主图" align="center" prop="pic"/>
+      <el-table-column label="主图" align="center" prop="pic">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
       <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="价格" align="center" prop="price"/>
-      <el-table-column label="上架状态" align="center" prop="publishStatus"/>
+      <el-table-column label="上架状态" align="center" prop="publishStatus">
+        <template slot-scope="{ row }">
+          <dict-tag :value="row.publishStatus" prop-name="pms_publish_status" />
+        </template>
+      </el-table-column>
       <el-table-column label="排序" align="center" prop="sort"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">