优化

src/api/module/goodsgement.js

@@ -8,6 +8,7 @@ export function getlistGoods(query) {
         params: query
     })
 }
+
 //上下架商品
 export function shelvesStatus(data) {
     return request({
@@ -16,6 +17,7 @@ export function shelvesStatus(data) {
         data: data
     })
 }
+
 //删除还原商品
 export function delgoodsStatus(data) {
     return request({
@@ -43,8 +45,6 @@ export function goodsjdAddress(query) {
     })
 }
 
-
-
 // 商品导入
 export function goodsimport(data) {
     return request({
@@ -54,9 +54,6 @@ export function goodsimport(data) {
     })
 }
 
-
-
-
 // 取消审核
 export function cancelOnsale(data) {
     return request({
@@ -64,4 +61,4 @@ export function cancelOnsale(data) {
         method: 'post',
         data: data
     })
-}
+}
\ No newline at end of file

src/utils/request.js

@@ -54,7 +54,7 @@ service.interceptors.response.use(res => {
 
    // debugger
     // 未设置状态码则默认成功状态
-    const code = ( res.data.code === 0 ? 0 : res.data.code ) || 200;
+    const code = res.data.code || 200;
     // 返回所有数据的统一处理
     const data = res.data;
     // 获取错误信息

src/views/entry/fillShopInf.vue

@@ -312,12 +312,18 @@
         this.getBase64(param.file).then((res) => {
           let result = res.split(",");
           this.Base64img = result[1];
-          let data = {"image":this.Base64img};
+          let data = {"img_data":this.Base64img};
           upLoadImg(data).then((res) => {
+            //console.log("可以过来了",this.logoImgFileList);
             if(res && res.code ===  1){
               this.logoImgFileList.push({'url':res.data.image_url});
               this.$message({type:'success',message:'上传成功'});
               this.$refs.storeForm.clearValidate('shop_logo');
+            }else {
+              let msg = '';
+              msg = res.message || '上传失败'
+              this.$message({type:'success',message: msg });
+              //this.$refs.storeForm.clearValidate('shop_logo');
             }
           });
         });
@@ -328,7 +334,7 @@
         this.getBase64(param.file).then((res) => {
           let result = res.split(",");
           this.Base64img = result[1];
-          let data = {"image":this.Base64img};
+          let data = {"img_data":this.Base64img};
           upLoadImg(data).then((res) => {
             if(res && res.code ===  1){
               this.businessImgFileList.push({'url':res.data.image_url});

src/views/system/goodsimport/goodsgement.vue

@@ -59,7 +59,7 @@
               <el-button
                 style="float:right;margin-left: 10px;"
                 type="danger"
-                v-if='radiomodel!=4&&radiomodel!=1'
+                v-if='radiomodel===2'
                 size="mini"
                 :disabled="multiple"
                 @click="handledelsale('9','del','all')"
@@ -138,17 +138,11 @@
         <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="handleUpdate(scope.row)"
-         >取消上架申请
-         </el-button> -->
               <el-button
                 size="mini"
                 type="text"
-                disabled="true"
-              >审核中
+                @click="handleCancelUpsale(scope.row)"
+              >取消上架申请
               </el-button>
             </div>
             <div v-else>
@@ -309,9 +303,6 @@
         let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
         this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
       })
-
-      console.log("come on");
-
     },
     watch: {
       fullHeight(val) {
@@ -499,6 +490,42 @@
         });
 
       },
+      // 取消上架申请
+      handleCancelUpsale(row) {
+        let id = {
+          goods_id: 0
+        };
+        id.goods_id = row.goods_id ? row.goods_id : 0;
+        this.$msgbox({
+          title: '取消商品上架申请',
+          message: "是否取消选中商品的上架申请！",
+          center: true,
+          showCancelButton: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              cancelOnsale(id).then(res => {
+                console.log(510,res);
+                if (res.code == 1) {
+                  done()
+                  this.getList()
+                }
+              })
+            } else {
+              done();
+            }
+          }
+        }).then(action => {
+          this.$message({
+            type: 'success',
+            message: '操作成功！'
+          });
+        });
+
+
+        //cancelOnsale().then();
+      },
       editgoods(row) {//商品编辑
         this.editisOpen = true
         this.goodsid = Number(row.goods_id);