商家端-立即发货修改种

src/views/businessOrder/details.vue

@@ -224,7 +224,6 @@
     methods: {
     methods: {
       // 取消订单提交事件
       // 取消订单提交事件
       confirmCancelOrderSubmit(){
       confirmCancelOrderSubmit(){
-        console.log("+++"+this.form.orderNo)
         cancelOrderMethod(
         cancelOrderMethod(
       {orderNo:this.form.orderNo,
       {orderNo:this.form.orderNo,
             refundRemark:this.refundRemark,
             refundRemark:this.refundRemark,
@@ -263,23 +262,25 @@
         this.$axios.get("/admin/merchantMallOrder/isVirtualGoods",{
         this.$axios.get("/admin/merchantMallOrder/isVirtualGoods",{
           params:{orderNo:this.id},
           params:{orderNo:this.id},
         }).then(response => {
         }).then(response => {
-          if(response.data.data){
-            this.form.orderNo=this.id
-            this.dialogVisibleShipsImmediately = true
-          }else {
-            // 虚拟商品 二次确认直接发货
-            this.$confirm('是否确认发货？', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(data => {
-              shipsImmediately(this.form).then(r => {
-                this.$message.success('发货成功')
-              }).catch(e =>{
-                console.log('错误', e.message)
-              })
-            })
-          }
+
+          console.log("结果返回："+JSON.stringify(response))
+          // if(response.data.data){
+          //   this.form.orderNo=this.id
+          //   this.dialogVisibleShipsImmediately = true
+          // }else {
+          //   // 虚拟商品 二次确认直接发货
+          //   this.$confirm('是否确认发货？', '提示', {
+          //     confirmButtonText: '确定',
+          //     cancelButtonText: '取消',
+          //     type: 'warning'
+          //   }).then(data => {
+          //     shipsImmediately(this.form).then(r => {
+          //       this.$message.success('发货成功')
+          //     }).catch(e =>{
+          //       console.log('错误', e.message)
+          //     })
+          //   })
+          // }
         }, error => {
         }, error => {
           console.log('错误', error.message)
           console.log('错误', error.message)
         })
         })

src/views/businessOrder/index.vue

@@ -192,9 +192,12 @@
           // 立即发货-对话框
           // 立即发货-对话框
           shipsImmediately(row){
           shipsImmediately(row){
             this.form.orderNo=row.orderNo
             this.form.orderNo=row.orderNo
-            this.$axios.get("/admin/merchantMallOrder/isVirtualGoods",{
+
+            this.$axios.get("/admin/merchantMallOrder/isNeedMailed",{
               params:{orderNo:row.orderNo},
               params:{orderNo:row.orderNo},
             }).then(response => {
             }).then(response => {
+              alert(JSON.stringify(response.data))
+              if(response.data){console.log("需邮寄，填写信息")}else {console.log("无需邮寄，二次确认即可")}
               // if(response.data.data){
               // if(response.data.data){
               //   this.form.orderNo=row.orderNo
               //   this.form.orderNo=row.orderNo
               //   this.dialogVisibleShipsImmediately = true
               //   this.dialogVisibleShipsImmediately = true