shish пре 1 година
родитељ
комит
a45dd46f6a
2 измењених фајлова са 27 додато и 5 уклоњено
  1. 23 5
      ghsApp/src/admin/home/components/OrderItem.vue
  2. 4 0
      ghsApp/src/api/express/index.js

+ 23 - 5
ghsApp/src/admin/home/components/OrderItem.vue

@@ -101,6 +101,7 @@
       <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
       <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
         <view style="padding:30upx 40upx;width:50vw;">
         <view style="padding:30upx 40upx;width:50vw;">
           <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="addExpress(item)">顺丰下单</button></view>
           <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="addExpress(item)">顺丰下单</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="cancelExpress(item)">取消顺丰订单</button></view>
           <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="fillNoFh(item)">填单发货</button></view>
           <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="fillNoFh(item)">填单发货</button></view>
           <view style="text-align: center;"><button class="admin-button-com default" @click="closeMore" style="margin:10upx auto 0 auto;">取消</button></view>
           <view style="text-align: center;"><button class="admin-button-com default" @click="closeMore" style="margin:10upx auto 0 auto;">取消</button></view>
         </view>
         </view>
@@ -160,7 +161,7 @@
 </template>
 </template>
 <script>
 <script>
 import { getUserDet } from "@/api/member";
 import { getUserDet } from "@/api/member";
-import { createExpressOrder } from "@/api/express";
+import { createExpressOrder,cancelExpressOrder } from "@/api/express";
 export default {
 export default {
 	name: "OrderItem",
 	name: "OrderItem",
 	components: {
 	components: {
@@ -239,6 +240,20 @@ export default {
       })
       })
       this.$refs.expressAddressRef.open('center');
       this.$refs.expressAddressRef.open('center');
     },
     },
+    cancelExpress(item){
+
+      this.$util.confirmModal({content:'确认取消?'},() => {
+
+        cancelExpressOrder({id:item.id}).then(res=>{
+          if(res.code == 1){
+                this.$msg(res.msg)
+                this.closeExpressPop()
+          }
+        })
+
+      })
+
+    },
     closeExpressPop() {
     closeExpressPop() {
       this.$refs.expressAddressRef.close();
       this.$refs.expressAddressRef.close();
     },
     },
@@ -247,10 +262,13 @@ export default {
           this.$msg('请填写重量')
           this.$msg('请填写重量')
           return false
           return false
         }
         }
-        createExpressOrder({id:item.id,weight:Number(this.wlWeight),length:this.wlLength,width:this.wlWidth,height:this.wlHeight,packageNum:this.wlPackageNum}).then(res=>{
-          if(res.code == 1){
-
-          }
+        this.$util.confirmModal({content:'确认提交?'},() => {
+          createExpressOrder({id:item.id,weight:Number(this.wlWeight),length:this.wlLength,width:this.wlWidth,height:this.wlHeight,packageNum:this.wlPackageNum}).then(res=>{
+            if(res.code == 1){
+              this.$msg(res.msg)
+              this.closeExpressPop()
+            }
+          })
         })
         })
     },
     },
 	}
 	}

+ 4 - 0
ghsApp/src/api/express/index.js

@@ -2,4 +2,8 @@ import https from '@/plugins/luch-request_0.0.7/request'
 
 
 export const createExpressOrder = data => {
 export const createExpressOrder = data => {
     return https.post('/express/create-way-bill', data)
     return https.post('/express/create-way-bill', data)
+}
+
+export const cancelExpressOrder = data => {
+    return https.get('/expend/cancel-way-bill', data)
 }
 }