diff --git a/src/views/system/goods/add/components/goodsaftersale.vue b/src/views/system/goods/add/components/goodsaftersale.vue
index 4a15ea36d1a451e4c804b75767fa5d49818a70b8..2fdaf3b6f908e60f7cd6f327dad0524fd57632bc 100644
--- a/src/views/system/goods/add/components/goodsaftersale.vue
+++ b/src/views/system/goods/add/components/goodsaftersale.vue
@@ -79,7 +79,8 @@
     },
     mounted() {
       this.getFreightData();
-      //console.log('售后数据：',this.goodsaftersale);
+      //debugger
+      console.log('售后数据：',this.goodsaftersale);
       if(this.goodsaftersale && this.goodsaftersale.stags.length > 0) {
         this.goodsAfterSaleForm = this.goodsaftersale;
       }
diff --git a/src/views/system/goods/add/components/goodsinfomation.vue b/src/views/system/goods/add/components/goodsinfomation.vue
index a2e83afc71f802e362b9f29f5bbdc547ebda434f..435bf09517e9e8788f6e5f1a0ff820fedb84594d 100644
--- a/src/views/system/goods/add/components/goodsinfomation.vue
+++ b/src/views/system/goods/add/components/goodsinfomation.vue
@@ -447,7 +447,7 @@
         for (let i = 0; i < this.goodsImgFileList.length; i++) {
           if (file.uid === this.goodsImgFileList[i].uid) {
             this.goodsImgFileList.splice(i, 1)
-            this.goodsImgFileList.imgs.splice(i, 1);
+            this.goodsInfoForm.imgs.splice(i, 1);
           }
         }
         if(this.goodsImgFileList.length === 0) {
diff --git a/src/views/system/goods/add/components/goodsparameter.vue b/src/views/system/goods/add/components/goodsparameter.vue
index 06c7e028c62f9a16441a3f84fe018b7afbed6b7b..52c11e457a2ba9131ea7ab1d3dbbe236f1f5e5a8 100644
--- a/src/views/system/goods/add/components/goodsparameter.vue
+++ b/src/views/system/goods/add/components/goodsparameter.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="goods-parameter">
     <p class="tip-p">
-      <el-link class="edit-type-span el-icon-search" type="primary" :underline="false">查看各类价格说明</el-link>
+      <el-link class="edit-type-span el-icon-search" type="primary" :underline="false" @click="viewPriceExp">查看各类价格说明
+      </el-link>
       <span class="tip-span">所有商品价格均为含税价，必须开具发票</span>
     </p>
 
@@ -19,8 +20,9 @@
         </el-table-column>
         <el-table-column align="center" prop="sl_price" label="结算价">
           <template slot-scope="scope">
-<!--            <el-input size="mini" style="width:90%" v-model="scope.row.sl_price" :disabled="true" placeholder="根据结算价自动计算"></el-input>-->
-            <span class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
+            <!--            <el-input size="mini" style="width:90%" v-model="scope.row.sl_price" :disabled="true" placeholder="根据结算价自动计算"></el-input>-->
+            <span
+              class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="price" label="指导价">
@@ -45,95 +47,136 @@
           </template>
         </el-table-column>
 
-<!--        <el-table-column align="center" prop="imgs9" label="图片">-->
-<!--          <template slot-scope="scope">-->
-<!--            &lt;!&ndash;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&ndash;&gt;-->
-<!--            <el-upload-->
-<!--              action="/"-->
-<!--              class="uploadData50"-->
-<!--              list-type="picture-card"-->
-<!--              :limit="5"-->
-<!--              :on-exceed="limit5"-->
-<!--              :file-list="singleSpecImgList"-->
-<!--              :http-request="(file)=> { return upLoadSingleSpecImg(file,scope.row) }"-->
-<!--              :on-remove=" (file) => { return removeSingleSpeImg(file,scope.row)}"-->
-<!--            ></el-upload>-->
-<!--            &lt;!&ndash;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&ndash;&gt;-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column align="center" prop="imgs9" label="图片">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            &lt;!&ndash;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&ndash;&gt;-->
+        <!--            <el-upload-->
+        <!--              action="/"-->
+        <!--              class="uploadData50"-->
+        <!--              list-type="picture-card"-->
+        <!--              :limit="5"-->
+        <!--              :on-exceed="limit5"-->
+        <!--              :file-list="singleSpecImgList"-->
+        <!--              :http-request="(file)=> { return upLoadSingleSpecImg(file,scope.row) }"-->
+        <!--              :on-remove=" (file) => { return removeSingleSpeImg(file,scope.row)}"-->
+        <!--            ></el-upload>-->
+        <!--            &lt;!&ndash;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&ndash;&gt;-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
     </div>
 
-      <div v-show="orgGoodsPam.pamTableList.length > 0" v-for="(item,index) in orgGoodsPam.pamTableList" :key="index" class="single-spe-con">
-        <p style="margin: 10px 0;color: #333;font-size: 14px;font-weight: 400;">
+    <div v-show="orgGoodsPam.pamTableList.length > 0" v-for="(item,index) in orgGoodsPam.pamTableList" :key="index"
+         class="single-spe-con">
+      <p style="margin: 10px 0;color: #333;font-size: 14px;font-weight: 400;">
           <span v-show="orgGoodsPam.pamNameList.length === 1">
             {{ orgGoodsPam.pamNameList[0].spec_name }} <span>：</span>{{ orgGoodsPam.pamDataList[index]}}
           </span>
-          <span v-show="orgGoodsPam.pamNameList.length > 1">
+        <span v-show="orgGoodsPam.pamNameList.length > 1">
             <span v-for="(itemv,indexv) in orgGoodsPam.pamNameList" style="margin-right:20px;">
             {{ orgGoodsPam.pamNameList[indexv].spec_name }} <span>：</span>{{ orgGoodsPam.pamDataList[index][indexv]}}
           </span>
           </span>
-        </p>
-        <el-table
-          border
-          size="small"
-          :data="item"
-          style="width: 80%"
-        >
-          <el-table-column align="center" prop="js_price" label="协议价">
-            <template slot-scope="scope">
-              <el-input size="mini" style="width:90%" v-model="scope.row.js_price" placeholder="请输入协议价"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="sl_price" label="结算价">
-            <template slot-scope="scope">
-<!--              <el-input size="mini" style="width:90%" v-model="scope.row.hh2" :disabled="true" placeholder="根据结算价自动计算"></el-input>-->
-              <span class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="price" label="指导价">
-            <template slot-scope="scope">
-              <el-input size="mini" style="width:90%" v-model="scope.row.price" placeholder="请输入指导价"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="sc_price" label="市场价">
-            <template slot-scope="scope">
-              <el-input size="mini" style="width:90%" v-model="scope.row.sc_price" placeholder="请输入市场价"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="stock" label="库存量">
-            <template slot-scope="scope">
-              <el-input size="mini" style="width:90%" v-model="scope.row.stock" placeholder="请输入库存量"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="weight" label="重量">
-            <template slot-scope="scope">
-              <el-input size="mini" style="width:90%" v-model="scope.row.weight" placeholder="请输入重量"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="thumb" label="图片">
-            <template slot-scope="scope">
+      </p>
+      <el-table
+        border
+        size="small"
+        :data="item"
+        style="width: 80%"
+      >
+        <el-table-column align="center" prop="js_price" label="协议价">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model="scope.row.js_price" placeholder="请输入协议价"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="sl_price" label="结算价">
+          <template slot-scope="scope">
+            <!--              <el-input size="mini" style="width:90%" v-model="scope.row.hh2" :disabled="true" placeholder="根据结算价自动计算"></el-input>-->
+            <span
+              class="sl-price-span-input">{{ scope.row.sl_price = scope.row.js_price ? scope.row.js_price : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="price" label="指导价">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model="scope.row.price" placeholder="请输入指导价"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="sc_price" label="市场价">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model="scope.row.sc_price" placeholder="请输入市场价"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="stock" label="库存量">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model="scope.row.stock" placeholder="请输入库存量"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="weight" label="重量">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model="scope.row.weight" placeholder="请输入重量"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="thumb" label="图片">
+          <template slot-scope="scope">
               <span
                 v-show="!scope.row.thumb"
                 class="span-img"
                 @click="upPreSpeImg(index,scope.row)"
               ></span>
-              <span v-show="scope.row.thumb" class="span-img-con">
+            <span v-show="scope.row.thumb" class="span-img-con">
                 <img
                   class="spec-img"
                   :src="scope.row.thumb"
                   alt=""
                   @click="changeSpeImg(index,scope.row)"
                 />
-                <span class="span-img-del el-icon-delete del-span-block" @click="hxz"></span>
+                <span class="span-img-del el-icon-delete del-span-block" @click="delSingleSpecImg(index,scope.row)"></span>
               </span>
 
-              <input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*" @change="changeIMG(index,scope.row)">
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+            <input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*"
+                   @change="changeIMG(index,scope.row)">
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 查看各类价格说明 -->
+    <el-dialog
+      v-loading="loading"
+      title="各类价格说明"
+      :visible.sync="isViewPriceExp"
+      width="40%"
+      center
+      append-to-body
+    >
+      <el-form ref="workOrderForm" size="small" label-width="150px">
+
+        <el-form-item label="协议价：">
+          <span>指您供货给下游的价格</span>
+        </el-form-item>
+
+        <el-form-item label="结算价：">
+          <span>与云仓平台结算的价格，根据协议价自动计算</span>
+        </el-form-item>
+
+        <el-form-item label="指导售价：">
+          <span>指导下游商户制定销售的价格</span>
+        </el-form-item>
+
+        <el-form-item label="市场价：">
+          <span>市场售价，参考京东、天猫等平台的售价</span>
+        </el-form-item>
+
+        <el-form-item>
+          <span class="pre-price-tip">商品价格均为含税价，必须开具发票。请准确填写并更新商品实际库存，超卖导致的虚假及延迟发货会引起用户投诉与平台判罚。</span>
+        </el-form-item>
+
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="isViewPriceExp = false" size="mini">取 消</el-button>
+      </span>
+    </el-dialog>
 
   </div>
 </template>
@@ -165,25 +208,32 @@ export default {
         }
       ],
       singleSpecImgList: [],
+      isViewPriceExp: false
     } // return end
   },
   watch:{
     'parameterdata': function(val) {
       //debugger
       this.orgGoodsPam = val;
-      console.log("监听",this.orgGoodsPam);
+      //console.log("监听",this.orgGoodsPam);
     },
   },
   created() {
     //this.orgGoodsPam = this.parameterdata;
   },
   mounted() {
-    console.log("加载后，",this.parameterdata);
-    if(this.parameterdata.singleSpecTable && this.parameterdata.singleSpecTable.length > 0) {
-      this.singleSpecTable = this.parameterdata.singleSpecTable;
+    //console.log("加载后，",this.parameterdata);
+    if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
+      this.orgGoodsPam = this.parameterdata;
+    }else {
+      this.singleSpecTable  = this.parameterdata.singleSpecTable
     }
   },
   methods: {
+    // 查看各类价格说明
+    viewPriceExp() {
+      this.isViewPriceExp = true;
+    },
     // ------  无规格，上传图片相关  ------
     limit5() {
       this.$message({type: 'warning',message: '只能上传5张图片'});
@@ -270,8 +320,12 @@ export default {
       //console.log(3333,file);
     },
 
-    hxz() {
-
+    // 删除 单个规格的图片
+    delSingleSpecImg(index,row) {
+      if( row.thumb ) {
+        row.thumb = '';
+        this.$message({type: 'success',message: '删除成功'});
+      }
     },
     speImgHover(index,row) {
       this.isHoverSpeImg = true;
@@ -406,6 +460,11 @@ p {
   font-size: 12px;
 }
 
+.pre-price-tip {
+  color: #F56C6C;
+  font-size: 12px;
+}
+
 // 上传图片样式
 .uploadData50 {
   display: inline-block;
diff --git a/src/views/system/goods/add/components/goodsspecifications.vue b/src/views/system/goods/add/components/goodsspecifications.vue
index 792c9d2dfbea821213d17eb816eb26d4d310ce90..051f9f1b6764b84c8aa600de2e989b4a7fff2b67 100644
--- a/src/views/system/goods/add/components/goodsspecifications.vue
+++ b/src/views/system/goods/add/components/goodsspecifications.vue
@@ -56,6 +56,7 @@
       :before-close="cancelSpec"
       width="500px"
       center
+      append-to-body
     >
       <div>
         <p class="add-spec-dialog-con">
diff --git a/src/views/system/goods/add/index.vue b/src/views/system/goods/add/index.vue
index 710a80aee7c79c419be6e72ade4952ba8fdb3ed6..be9d605952716b14cf46cd7e0248dbeb5e981edd 100644
--- a/src/views/system/goods/add/index.vue
+++ b/src/views/system/goods/add/index.vue
@@ -173,8 +173,8 @@
               goods_des: res.data.goods_des,       // 关键词
               goods_name: res.data.goods_name,      // 商品标题
               category_id: res.data.category_id,
-              producing_area: res.data.producing_area,   // 产地
-              deliver_area: res.data.deliver_area,     // 发货地
+              producing_area: Number(res.data.producing_area),   // 产地
+              deliver_area: Number(res.data.deliver_area),     // 发货地
               unit: res.data.unit,             // 单位
               goods_brand: res.data.goods_brand,      // 品牌
               web_url: res.data.web_url,          // 外部链接
@@ -194,18 +194,29 @@
             }
 
             // 商品售价
+           // debugger
             if(res.data.specs_group && res.data.specs_group.length > 0) {
               //this.parameterdata
               let prePriceArr = [];
               this.parameterdata.pamTableList = [];
-              res.data.specs_group.forEach((item,index)=> {
+              this.parameterdata.pamDataList = [];
+              res.data.specs_group.forEach((item)=> {
+                //
+                item.js_price = item.js_price / 100;
+                item.sl_price = item.js_price / 100;
+                item.price = item.price / 100;
+                item.sc_price = item.sc_price / 100;
+                // item.stock = item.stock;
+                // item.weight = item.weight;
                 prePriceArr = [];
                 prePriceArr.push(item);
-                this.parameterdata.pamTableList[index] = prePriceArr.push(item);
+                this.parameterdata.pamTableList.push( prePriceArr );
+                this.parameterdata.pamDataList.push(item.spec_values);
+
               })
+              this.parameterdata.pamNameList = res.data.specs;
             }else {
               this.parameterdata.pamTableList = [];
-
               let singleSpecObj = {
                 js_price:'',
                 sl_price:'',
@@ -215,17 +226,15 @@
                 weight:'',
               }
               this.parameterdata.singleSpecTable = [];
-              singleSpecObj.js_price = res.data.js_price * 100;
-              singleSpecObj.sl_price = res.data.js_price * 100;
-              singleSpecObj.price = res.data.price * 100;
-              singleSpecObj.sc_price = res.data.sc_price * 100;
+              singleSpecObj.js_price = res.data.js_price / 100;
+              singleSpecObj.sl_price = res.data.js_price / 100;
+              singleSpecObj.price = res.data.price / 100;
+              singleSpecObj.sc_price = res.data.sc_price / 100;
               singleSpecObj.stock = res.data.stock;
               singleSpecObj.weight = res.data.weight;
               this.parameterdata.singleSpecTable.push(singleSpecObj);
             }
 
-
-
             // 商品详情
             this.imgdata.description = res.data.description;
             //this.goodsinfodata = res.data;
@@ -233,10 +242,6 @@
             //this.goodsaftersale = res.data;
 
             // 售后服务
-            // stags: [],
-            //   freight_id: 310,
-            //   delay_compensate: 24,
-            //   aftersale_time: 7
             this.goodsaftersale.freight_id = res.data.freight_id;
             this.goodsaftersale.delay_compensate = res.data.delay_compensate;
             this.goodsaftersale.aftersale_time = res.data.aftersale_time;
@@ -251,9 +256,8 @@
                   }
                 })
               }else {
-                stagArr.push( Number(res.data.stags) )
+                this.goodsaftersale.stags.push( Number(res.data.stags) )
               }
-
             }else {
               this.goodsaftersale.stags = [];
             }
@@ -383,14 +387,8 @@
         this.goodsinfodata.categoryStr = ssqLabelList[0] + '/' + ssqLabelList[1] + '/' + ssqLabelList[2];
         this.isShowGoodsDetails = true;
         // console.log(232,this.goodsinfodata.categoryStr,this.goodsinfodata.categoryList);
-
       },
 
-      //
-      // getGoodsAfterSaleData(data) {
-      //   console.log("售后子组件给的：",data);
-      // },
-      //
       save() {
 
         // let spxxDataId = this.$refs.goodsInfo.goodsInfoForm.goods_id;
@@ -399,6 +397,7 @@
         //
         // }
 
+        debugger
 
         // 此处变量 有顺序 校验时，电梯至某处
         // 商品信息 是否填写完整
@@ -414,19 +413,23 @@
         //debugger
         // 如果有，则说明有规格组合数据
         if ( spsjData2.pamTableList && spsjData2.pamTableList.length > 0 ) {
-          //console.log(25522,spsjData2);
           for(let i = 0; i < spsjData2.pamTableList.length; i++) {
-            //console.log("外",spsjData2.pamTableList[i]);
             let itemObj = spsjData2.pamTableList[i][0];
             for (let itemKey in itemObj) {
-              // 长度判断，可以校验规格是否上传了图片
-              // if ( !itemObj[itemKey] || itemObj[itemKey].length === 0) {
-              if ( !itemObj[itemKey] && itemKey !== 'thumb') {
+            //----------------
+              // 有多余字段，可能为空，需要对有效字段单独判断
+              if ( !itemObj['js_price'] || !itemObj['sl_price'] || !itemObj['price'] || !itemObj['sc_price'] || !itemObj['stock'] || !itemObj['weight']) {
                 isGoodsPrice = false;
                 break
               } else {
+                // 所有校验通过，对价格进行处理，*100
+                if ( itemKey === 'js_price' || itemKey === 'sl_price' || itemKey === 'price' || itemKey === 'sc_price') {
+                  itemObj[itemKey] = itemObj[itemKey] * 100;
+                }
                 isGoodsPrice = true;
               }
+
+            //  ---------------
             }
             if (!isGoodsPrice) {
               break
@@ -436,12 +439,14 @@
           // 无规格组合数据
           let slingleSpeObj = spsjData1[0];
           for (let key in slingleSpeObj) {
-            // 长度判断，可以校验规格是否上传了图片
-            // if ( !slingleSpeObj[key] || (slingleSpeObj[key].length === 0) ) {
-            if ( !slingleSpeObj[key] && ( key !== 'imgs') ) {
+            if ( !slingleSpeObj[key] ) {
               isGoodsPrice = false;
               break
             } else {
+              // 所有校验通过，对价格进行处理，*100
+              if ( key === 'js_price' || key === 'sl_price' || key === 'price' || key === 'sc_price') {
+                slingleSpeObj[key] = slingleSpeObj[key] * 100;
+              }
               isGoodsPrice = true;
             }
           }
diff --git a/src/views/system/goodsimport/goodsgement.vue b/src/views/system/goodsimport/goodsgement.vue
index 68977b14e9e9ce6c97413f6028dd0d08d01e47f6..ba8d872ee058d549a64766945cc0eb063f0c38e0 100644
--- a/src/views/system/goodsimport/goodsgement.vue
+++ b/src/views/system/goodsimport/goodsgement.vue
@@ -2,24 +2,24 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-          <el-radio-group v-model="radiomodel" class="radiomodels" @change="radiomodelbtn">
-            <el-radio-button label="1">上架销售中（{{onsale_count}}）</el-radio-button>
-            <el-radio-button label="2">仓库中的商品（{{downsale_count}}）</el-radio-button>
-            <el-radio-button label="3">审核记录</el-radio-button>
-            <el-radio-button label="4">最近删除（{{del_count}}）</el-radio-button>
-          </el-radio-group>
+        <el-radio-group v-model="radiomodel" class="radiomodels" @change="radiomodelbtn">
+          <el-radio-button :label="1">上架销售中（{{onsale_count}}）</el-radio-button>
+          <el-radio-button :label="2">仓库中的商品（{{downsale_count}}）</el-radio-button>
+          <el-radio-button :label="3">审核记录</el-radio-button>
+          <el-radio-button :label="4">最近删除（{{del_count}}）</el-radio-button>
+        </el-radio-group>
       </div>
-     <el-form :inline="true" class="queryFormInline" :model="formInline" >
-          <el-row :span="24" type="flex" align="middle" justify="space-between">
-            <el-col :span="20">
-              <el-form-item label="商品编号">
+      <el-form :inline="true" class="queryFormInline" :model="formInline">
+        <el-row :span="24" type="flex" align="middle" justify="space-between">
+          <el-col :span="20">
+            <el-form-item label="商品编号">
               <el-input v-model="formInline.goods_id" size="mini" placeholder="填写商品编号"></el-input>
             </el-form-item>
             <el-form-item label="商品名称">
               <el-input v-model="formInline.goods_name" size="mini" placeholder="填写商品编号"></el-input>
             </el-form-item>
             <el-form-item label="商品状态" v-show="radiomodel==3">
-               <el-select v-model="formInline.status" placeholder="请选择" size="mini" style='width:100px;'>
+              <el-select v-model="formInline.status" placeholder="请选择" size="mini" style='width:100px;'>
                 <el-option label="全部" value="5" v-if='radiomodel==3'></el-option>
                 <el-option label="审核中" value="1" v-if='radiomodel==3'></el-option>
                 <el-option label="审核拒绝" value="2" v-if='radiomodel==3'></el-option>
@@ -28,7 +28,7 @@
             </el-form-item>
             <el-form-item label="发布时间">
               <el-date-picker
-              style='width:315px;'
+                style='width:315px;'
                 v-model="formInline.uptime"
                 type="daterange"
                 range-separator="至"
@@ -40,71 +40,71 @@
               </el-date-picker>
             </el-form-item>
 
-             <el-form-item label="价格区间">
+            <el-form-item label="价格区间">
               <el-input v-model="formInline.price_min" size="mini" placeholder="最小价格" style="width:100px;"></el-input>
               -
               <el-input v-model="formInline.price_max" size="mini" placeholder="最大价格" style="width:100px;"></el-input>
             </el-form-item>
-            <el-form-item >
-               <el-button
-                  type="primary"
-                  size="mini"
-                  @click="handleQuery"
-                >查询
-                </el-button>
+            <el-form-item>
+              <el-button
+                type="primary"
+                size="mini"
+                @click="handleQuery"
+              >查询
+              </el-button>
             </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <div style="float: right">
-                <el-button
-                  style="float:right;margin-left: 10px;"
-                  type="danger"
-                  v-if='radiomodel!=4&&radiomodel!=1'
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handledelsale('9','del','all')"
-                >批量删除
-                </el-button>
-                <el-button
-                  style="float:right;margin-left: 10px;"
-                  type="danger"
-                  v-if='radiomodel==4'
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handledelgrain('9','all')"
-                >彻底删除
-                </el-button>
-                <el-button
-                 v-if='radiomodel==1'
-                  style="float:right;margin-left: 20px;"
-                  type="primary"
-                   :disabled="multiple"
-                  size="mini"
-                  @click="handleUpsale('9','down','all')"
-                >批量下架
-                </el-button>
-                 <el-button
-                 v-if='radiomodel==2'
-                  style="float:right;margin-left: 20px;"
-                  type="primary"
-                   :disabled="multiple"
-                  size="mini"
-                  @click="handleUpsale('9','up','all')"
-                >批量上架
-                </el-button>
-                <el-button
-                  v-if='radiomodel==4'
-                  :disabled="multiple"
-                  style="float:right;margin-left: 20px;"
-                  type="primary"
-                  size="mini"
-                  @click="handledelsale('9','return','all')"
-                >批量还原
-                </el-button>
-              </div>
-            </el-col>
-          </el-row>
-        </el-form>
+          </el-col>
+          <el-col :span="4">
+            <div style="float: right">
+              <el-button
+                style="float:right;margin-left: 10px;"
+                type="danger"
+                v-if='radiomodel!=4&&radiomodel!=1'
+                size="mini"
+                :disabled="multiple"
+                @click="handledelsale('9','del','all')"
+              >批量删除
+              </el-button>
+              <el-button
+                style="float:right;margin-left: 10px;"
+                type="danger"
+                v-if='radiomodel==4'
+                size="mini"
+                :disabled="multiple"
+                @click="handledelgrain('9','all')"
+              >彻底删除
+              </el-button>
+              <el-button
+                v-if='radiomodel==1'
+                style="float:right;margin-left: 20px;"
+                type="primary"
+                :disabled="multiple"
+                size="mini"
+                @click="handleUpsale('9','down','all')"
+              >批量下架
+              </el-button>
+              <el-button
+                v-if='radiomodel==2'
+                style="float:right;margin-left: 20px;"
+                type="primary"
+                :disabled="multiple"
+                size="mini"
+                @click="handleUpsale('9','up','all')"
+              >批量上架
+              </el-button>
+              <el-button
+                v-if='radiomodel==4'
+                :disabled="multiple"
+                style="float:right;margin-left: 20px;"
+                type="primary"
+                size="mini"
+                @click="handledelsale('9','return','all')"
+              >批量还原
+              </el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
       <el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="商品主图" width="95" align="center">
@@ -120,7 +120,7 @@
           </template>
         </el-table-column>
         <!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> -->
-        <el-table-column label="库存量" align="center"  prop="stock"/>
+        <el-table-column label="库存量" align="center" prop="stock"/>
         <el-table-column label="商品状态" align="center" prop>
           <template slot-scope="scope">
             <span v-if="radiomodel==1||radiomodel==2">
@@ -136,74 +136,74 @@
         </el-table-column>
         <el-table-column label="发布时间" align="center" :formatter="formatTime" prop="add_time"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope" >
-             <div v-if='radiomodel==3&&scope.row.up_onsale===1'>
-                 <el-button
-              size="mini"
-              type="text"
-              @click="btncancelOnsale(scope.row)"
-            >取消上架申请
-            </el-button>
-             <!-- <el-button
-              size="mini"
-              type="text"
-              disabled="true"
-            >审核中
-            </el-button> -->
-             </div>
-           <div v-else>
-            <el-button
-              v-if="radiomodel==1"
-              size="mini"
-              type="text"
-              @click="handleUpsale(scope.row,'down','one')"
-            >下架
-            </el-button>
-            <el-button
-              v-if="radiomodel==2"
-              size="mini"
-              type="text"
-              @click="handleUpsale(scope.row,'up','one')"
-            >上架
-            </el-button>
-            <el-button
-              v-if="radiomodel==4"
-              size="mini"
-              type="text"
-              @click="handledelsale(scope.row,'return','one')"
-            >还原
-            </el-button>
-             <el-divider direction="vertical" v-if="radiomodel!=3"></el-divider>
-            <el-button
-            v-if="radiomodel!=4"
-              size="mini"
-              type="text"
-              @click="editgoods(scope.row)"
-            >编辑
-            </el-button>
-             <el-divider direction="vertical" v-if="radiomodel!=4"></el-divider>
-            <el-button
-              size="mini"
-              type="text"
-              @click="lookdetail(scope.row)"
-            >预览
-            </el-button>
-            <el-divider direction="vertical"  v-if="radiomodel!=1"></el-divider>
-            <el-button
-             v-if="radiomodel!=4&&radiomodel!=1"
-              size="mini"
-              type="text"
-              @click="handledelsale(scope.row,'del','one')"
-            >删除
-            </el-button>
-            <el-button
-             v-if="radiomodel==4"
-              size="mini"
-              type="text"
-              @click="handledelgrain(scope.row,'one')"
-            >彻底删除
-            </el-button>
-          </div>
+          <template slot-scope="scope">
+            <div v-if='radiomodel==3&&scope.row.up_onsale===1'>
+              <!-- <el-button
+           size="mini"
+           type="text"
+           @click="handleUpdate(scope.row)"
+         >取消上架申请
+         </el-button> -->
+              <el-button
+                size="mini"
+                type="text"
+                disabled="true"
+              >审核中
+              </el-button>
+            </div>
+            <div v-else>
+              <el-button
+                v-if="radiomodel==1"
+                size="mini"
+                type="text"
+                @click="handleUpsale(scope.row,'down','one')"
+              >下架
+              </el-button>
+              <el-button
+                v-if="radiomodel==2"
+                size="mini"
+                type="text"
+                @click="handleUpsale(scope.row,'up','one')"
+              >上架
+              </el-button>
+              <el-button
+                v-if="radiomodel==4"
+                size="mini"
+                type="text"
+                @click="handledelsale(scope.row,'return','one')"
+              >还原
+              </el-button>
+              <el-divider direction="vertical" v-if="radiomodel!=3"></el-divider>
+              <el-button
+                v-if="radiomodel!=4 && radiomodel!=1"
+                size="mini"
+                type="text"
+                @click="editgoods(scope.row)"
+              >编辑
+              </el-button>
+              <el-divider direction="vertical" v-if="radiomodel!=4 && radiomodel!=1"></el-divider>
+              <el-button
+                size="mini"
+                type="text"
+                @click="lookdetail(scope.row)"
+              >预览
+              </el-button>
+              <el-divider direction="vertical" v-if="radiomodel!=1"></el-divider>
+              <el-button
+                v-if="radiomodel!=4&&radiomodel!=1"
+                size="mini"
+                type="text"
+                @click="handledelsale(scope.row,'del','one')"
+              >删除
+              </el-button>
+              <el-button
+                v-if="radiomodel==4"
+                size="mini"
+                type="text"
+                @click="handledelgrain(scope.row,'one')"
+              >彻底删除
+              </el-button>
+            </div>
           </template>
 
         </el-table-column>
@@ -217,10 +217,11 @@
       />
       <!-- 商品编辑-->
       <el-dialog title="编辑商品" :visible.sync="editisOpen" v-if="editisOpen" width="70%" class="freightTemplate-add">
-        <editGood :option="goodsid" @closeIndexbtn="closeDialog" ></editGood>
+        <editGood :option="goodsid" @closeIndexbtn="closeDialog"></editGood>
       </el-dialog>
-       <el-dialog title="商品详情" :visible.sync="isOpen"  center v-if="isOpen" width="70%" class="freightTemplate-add" :close-on-click-modal="false">
-        <goodDetail :goods-id="goodDetails" @closeIndexbtn="closeDialog" ></goodDetail>
+      <el-dialog title="商品详情" :visible.sync="isOpen" center v-if="isOpen" width="70%" class="freightTemplate-add"
+                 :close-on-click-modal="false">
+        <goodDetail :goods-id="goodDetails" @closeIndexbtn="closeDialog"></goodDetail>
       </el-dialog>
     </el-card>
   </div>
@@ -235,23 +236,23 @@
     name: "freight",
     data() {
       return {
-        goodDetails:{
-          goods_id:''
+        goodDetails: {
+          goods_id: ''
         },
         editisOpen: false,//编辑
-        downsale_count:'',//仓库数量
-        onsale_count:'',//上架数量
-        del_count:'',//删除数量
-        radiomodel:'1',
+        downsale_count: '',//仓库数量
+        onsale_count: '',//上架数量
+        del_count: '',//删除数量
+        radiomodel: '1',
         formInline: {
-           page: 1,
+          page: 1,
           limit: 20,
           goods_name: '',
           goods_id: '',
-          status:'5',
-          uptime:'',
-          price_min:'',
-          price_max:''
+          status: '5',
+          uptime: '',
+          price_min: '',
+          price_max: ''
         },
         fullHeight: 0,
         tableHeight: 0,
@@ -318,56 +319,42 @@
       }
     },
     methods: {
-      btncancelOnsale(row){
-        let data={
-            goods_id:row.goods_id
-        }
-        cancelOnsale(data).then(res=>{
-          if(res.code==1){
-            this.$message({
-                type: 'success',
-                message: '操作成功！'
-              });
-            this.getList()
-          }
-        })
-      },
-      handledelgrain(row,isall){ //彻底删除
-         let good_id,is_on,title,message
-         if(isall=='one'){
-             good_id = [row.goods_id]
-               is_on = 2
-               title ="彻底删除"
-               message = "此操作将彻底删除该商品，是否继续？"
+      handledelgrain(row, isall) { //彻底删除
+        let good_id, is_on, title, message
+        if (isall == 'one') {
+          good_id = [row.goods_id]
+          is_on = 2
+          title = "彻底删除"
+          message = "此操作将彻底删除该商品，是否继续？"
 
-           }else if(isall=='all'){
-             good_id = this.ids
+        } else if (isall == 'all') {
+          good_id = this.ids
 
-                 is_on = 2
-                 title ="彻底删除"
-                 message = "此操作将彻底删除选中的商品，是否继续？"
+          is_on = 2
+          title = "彻底删除"
+          message = "此操作将彻底删除选中的商品，是否继续？"
 
 
-           }
-         let data={
-           'goods_id':good_id,
-           'is_on':is_on
-         }
+        }
+        let data = {
+          'goods_id': good_id,
+          'is_on': is_on
+        }
         this.$msgbox({
           title: title,
           message: message,
-          center:true,
+          center: true,
           showCancelButton: true,
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
-                delgoodsStatus(data).then(res=>{
-                  if(res.code==1){
-                    done()
-                    this.getList()
-                  }
-        })
+              delgoodsStatus(data).then(res => {
+                if (res.code == 1) {
+                  done()
+                  this.getList()
+                }
+              })
             } else {
               done();
             }
@@ -379,122 +366,122 @@
           });
         });
       },
-      handledelsale(row,status,isall){//删除还原
-      let good_id,is_on,title,message
-       if(isall=='one'){
-           good_id = [row.goods_id]
-           if(status=='del'){ // 0 删除 1还原
-             is_on = 0
-             title ="删除"
-             message = "是否删除该商品！"
-           }
-           if(status=='return'){
-             is_on = 1
-             title ="还原"
-             message = "是否还原该商品！"
-           }
-         }else if(isall=='all'){
-           good_id = this.ids
-           if(status=='del'){
-               is_on = 0
-               title ="批量删除"
-               message = "是否删除选中的商品！"
-             }
-           if(status=='return'){
-             is_on = 1
-              title ="批量还原"
-               message = "是否还原选中的商品！"
-           }
-         }
-       let data={
-         'goods_id':good_id,
-         'is_on':is_on
-       }
-       this.$msgbox({
-         title: title,
-         message: message,
-         center:true,
-         showCancelButton: true,
-         confirmButtonText: '确定',
-         cancelButtonText: '取消',
-         beforeClose: (action, instance, done) => {
-           if (action === 'confirm') {
-               delgoodsStatus(data).then(res=>{
-                 if(res.code==1){
-                   done()
+      handledelsale(row, status, isall) {//删除还原
+        let good_id, is_on, title, message
+        if (isall == 'one') {
+          good_id = [row.goods_id]
+          if (status == 'del') { // 0 删除 1还原
+            is_on = 0
+            title = "删除"
+            message = "是否删除该商品！"
+          }
+          if (status == 'return') {
+            is_on = 1
+            title = "还原"
+            message = "是否还原该商品！"
+          }
+        } else if (isall == 'all') {
+          good_id = this.ids
+          if (status == 'del') {
+            is_on = 0
+            title = "批量删除"
+            message = "是否删除选中的商品！"
+          }
+          if (status == 'return') {
+            is_on = 1
+            title = "批量还原"
+            message = "是否还原选中的商品！"
+          }
+        }
+        let data = {
+          'goods_id': good_id,
+          'is_on': is_on
+        }
+        this.$msgbox({
+          title: title,
+          message: message,
+          center: true,
+          showCancelButton: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              delgoodsStatus(data).then(res => {
+                if (res.code == 1) {
+                  done()
 
-                   this.$message({
+                  this.$message({
                     type: 'success',
                     message: '操作成功！'
                   });
-                   this.getList()
-                 }else{
-                   done()
-                   this.$message({
+                  this.getList()
+                } else {
+                  done()
+                  this.$message({
                     type: 'warning',
                     message: res.message
                   });
-                 }
+                }
 
-                })
-           } else {
-             done();
-           }
-         }
-       }).then(action => {
-        //  this.$message({
-        //    type: 'success',
-        //    message: '操作成功！'
-        //  });
-       });
-      },
-      handleUpsale(row,status,isall){ //上下架
-      debugger
-          let good_id,is_onsale,title,message
-          if(isall=='one'){
-            good_id = [row.goods_id]
-            if(status=='up'){ // 0 下架 1上架
-              is_onsale = 1
-              title ="商品上架"
-              message = "是否上架该商品"
-            }
-            if(status=='down'){
-              is_onsale = 0
-              title ="商品下架"
-              message = "是否下架该商品！"
-            }
-          }else if(isall=='all'){
-            good_id = this.ids
-            if(status=='up'){
-                is_onsale = 1
-                title ="商品批量上架"
-                message = "是否上架选中的商品！"
-              }
-            if(status=='down'){
-              is_onsale = 0
-               title ="商品批量下架"
-                message = "是否下架选中的商品！"
+              })
+            } else {
+              done();
             }
           }
-        let data={
-          'goods_id':good_id,
-          'is_onsale':is_onsale
+        }).then(action => {
+          //  this.$message({
+          //    type: 'success',
+          //    message: '操作成功！'
+          //  });
+        });
+      },
+      handleUpsale(row, status, isall) { //上下架
+        debugger
+        let good_id, is_onsale, title, message
+        if (isall == 'one') {
+          good_id = [row.goods_id]
+          if (status == 'up') { // 0 下架 1上架
+            is_onsale = 1
+            title = "商品上架"
+            message = "是否上架该商品"
+          }
+          if (status == 'down') {
+            is_onsale = 0
+            title = "商品下架"
+            message = "是否下架该商品！"
+          }
+        } else if (isall == 'all') {
+          good_id = this.ids
+          if (status == 'up') {
+            is_onsale = 1
+            title = "商品批量上架"
+            message = "是否上架选中的商品！"
+          }
+          if (status == 'down') {
+            is_onsale = 0
+            title = "商品批量下架"
+            message = "是否下架选中的商品！"
+          }
         }
-         this.$msgbox({
+        let data = {
+          'goods_id': good_id,
+          'is_onsale': is_onsale
+        }
+        this.$msgbox({
           title: title,
           message: message,
-          center:true,
+          center: true,
           showCancelButton: true,
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
-               shelvesStatus(data).then(res=>{
-                  if(res.code==1){
-                    done()
-                    this.getList()
-                  }
-        })
+              shelvesStatus(data).then(res => {
+                if (res.code == 1) {
+                  done()
+                  this.getList()
+                }
+              })
             } else {
               done();
             }
@@ -507,25 +494,25 @@
         });
 
       },
-      editgoods(row){//商品编辑
+      editgoods(row) {//商品编辑
         this.editisOpen = true
         this.goodsid = Number(row.goods_id);
       },
-      lookdetail(row){//预览商品详情
+      lookdetail(row) {//预览商品详情
         this.isOpen = true
         this.goodDetails.goods_id = row.goods_id
       },
-      radiomodelbtn(val){ //头部切换
-        console.log(val)
-        this.formInline= {
-              page: 1,
-              limit: 20,
-              goods_name: '',
-              goods_id: '',
-              status:'5',
-              uptime:'',
-              price_min:'',
-              price_max:''
+      radiomodelbtn(val) { //头部切换
+        //console.log(505,val)
+        this.formInline = {
+          page: 1,
+          limit: 20,
+          goods_name: '',
+          goods_id: '',
+          status: '5',
+          uptime: '',
+          price_min: '',
+          price_max: ''
         }
         this.getList()
       },
@@ -555,55 +542,45 @@
       },
       /** 查询freight列表 */
       getList() {
-        // formInline: {
-        //    page: 1,
-        //   limit: 20,
-        //   goods_name: '',
-        //   goods_id: '',
-        //   status:'',
-        //   uptime:''
-        // price_min:'',
-        //   price_max:''
-        // },
         let data = {
-            page: this.formInline.page,
-            limit: this.formInline.limit,
+          page: this.formInline.page,
+          limit: this.formInline.limit,
         }
 
-       if(this.radiomodel==='1'){
-          data['is_onsale']  = 1
-          data['is_on']  = 1
-          data['up_onsale']  = 0
-       }
-       if(this.radiomodel==2){
-          data['is_onsale']  = 0
-          data['is_on']  = 1
-          data['up_onsale']  = 0
-       }
-       if(this.radiomodel==3){
-        data['up_onsale'] = Number(this.formInline.status)
-        data['is_onsale']  = 0
-        data['is_on']  = 1
-       }
-       if(this.radiomodel==4){
-         data['is_on'] = 0
-       }
-        if(this.formInline.goods_name){
-         data['goods_name'] = this.formInline.goods_name
-       }
-       if(this.formInline.goods_id){
-         data['goods_id'] = this.formInline.goods_id
-       }
-       if(this.formInline.uptime&&this.formInline.uptime.length==2){
-          data['start_time'] = this.formInline.uptime[0]/1000
-          data['end_time'] = this.formInline.uptime[1]/1000
-       }
-       if(this.formInline.price_min &&this.formInline.price_max){
+        if (this.radiomodel === 1) {
+          data['is_onsale'] = 1
+          data['is_on'] = 1
+          data['up_onsale'] = 0
+        }
+        if (this.radiomodel === 2) {
+          data['is_onsale'] = 0
+          data['is_on'] = 1
+          data['up_onsale'] = 0
+        }
+        if (this.radiomodel === 3) {
+          data['up_onsale'] = Number(this.formInline.status)
+          data['is_onsale'] = 0
+          data['is_on'] = 1
+        }
+        if (this.radiomodel === 4) {
+          data['is_on'] = 0
+        }
+        if (this.formInline.goods_name) {
+          data['goods_name'] = this.formInline.goods_name
+        }
+        if (this.formInline.goods_id) {
+          data['goods_id'] = this.formInline.goods_id
+        }
+        if (this.formInline.uptime && this.formInline.uptime.length == 2) {
+          data['start_time'] = this.formInline.uptime[0] / 1000
+          data['end_time'] = this.formInline.uptime[1] / 1000
+        }
+        if (this.formInline.price_min && this.formInline.price_max) {
           data['price_min'] = this.formInline.price_min
           data['price_max'] = this.formInline.price_max
-       }
+        }
         getlistGoods(data).then(res => {
-          if(res.data) {
+          if (res.data) {
             this.freightList = res.data.list;
             this.total = res.data.count;
             this.downsale_count = res.data.downsale_count//仓库数量
@@ -635,34 +612,37 @@
       },
 
 
-
-
     } //methods结束
   };
 </script>
 <style scoped lang="scss" type="text/stylus">
   .freightTemplate-add {
-    /deep/.el-dialog {
+    /deep/ .el-dialog {
       height: 80%;
-      overflow : hidden;
+      overflow: hidden;
     }
-    /deep/.el-dialog__body{
+
+    /deep/ .el-dialog__body {
       height: calc(100% - 60px);
       overflow-x: hidden;
       overflow-y: scroll;
     }
   }
-  .radiomodels .el-radio-button{
-      margin:0 10px;
+
+  .radiomodels .el-radio-button {
+    margin: 0 10px;
   }
-  /deep/ .radiomodels .el-radio-button .el-radio-button__inner{
-        border: 1px solid #DCDFE6 !important;
-        border-radius: 4px !important;
+
+  /deep/ .radiomodels .el-radio-button .el-radio-button__inner {
+    border: 1px solid #DCDFE6 !important;
+    border-radius: 4px !important;
   }
-   /deep/ .radiomodels .el-radio-button  .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+
+  /deep/ .radiomodels .el-radio-button .el-radio-button__orig-radio:checked + .el-radio-button__inner {
     box-shadow: none;
   }
-  .queryFormInline{
-    padding-bottom:20px;
+
+  .queryFormInline {
+    padding-bottom: 20px;
   }
 </style>
diff --git a/src/views/system/goodsimport/index.vue b/src/views/system/goodsimport/index.vue
index a0138fd13cd46ea0eb47f8cd7f3dbf92bd73db13..975d0e6cdf2a798df7896ee5e4ebd61f66c32f5e 100644
--- a/src/views/system/goodsimport/index.vue
+++ b/src/views/system/goodsimport/index.vue
@@ -98,9 +98,9 @@ export default {
       let urlarr
       if (this.form.desc) {
         urlarr = this.form.desc.split(',')
-        //debugger
+        debugger
         if (urlarr.length > 0 && urlarr.length <= 10) {
-          if( Number(urlarr) > Number(this.collect_num)) {
+          if( Number(urlarr.length) > Number(this.collect_num)) {
             this.$message({type: 'warning',message:'您好，准备导入的商品条数过多，当前剩余次数不足，请重新输入'});
             return;
           }