shish 1 year ago
parent
commit
c9b90595c2

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

@@ -100,10 +100,11 @@
 
 
       <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="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 default" @click="closeMore" style="margin:10upx auto 0 auto;">取消</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="addExpress(item)">顺丰下单</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="cancelExpress(item)">取消顺丰订单</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="fillNoFh(item)">填单发货</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="sim(item)">模拟</button></view>
+          <view style="text-align: center;"><button class="admin-button-com default" @click="closeMore" style="margin:10upx auto 0 auto;width:190upx;">取消</button></view>
         </view>
         </view>
       </uni-popup>
       </uni-popup>
 
 
@@ -161,7 +162,7 @@
 </template>
 </template>
 <script>
 <script>
 import { getUserDet } from "@/api/member";
 import { getUserDet } from "@/api/member";
-import { createExpressOrder,cancelExpressOrder } from "@/api/express";
+import { createExpressOrder,cancelExpressOrder,testUpdate } from "@/api/express";
 export default {
 export default {
 	name: "OrderItem",
 	name: "OrderItem",
 	components: {
 	components: {
@@ -228,6 +229,9 @@ export default {
     closeMore() {
     closeMore() {
       this.$refs.morePopup.close();
       this.$refs.morePopup.close();
     },
     },
+    sim(item){
+      //testUpdate({id:item.id}).then(res=>{ })
+    },
     addExpress(item) {
     addExpress(item) {
       this.closeMore()
       this.closeMore()
       getUserDet({id:item.customId}).then(res=>{
       getUserDet({id:item.customId}).then(res=>{

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

@@ -6,4 +6,8 @@ export const createExpressOrder = data => {
 
 
 export const cancelExpressOrder = data => {
 export const cancelExpressOrder = data => {
     return https.get('/express/cancel-way-bill', data)
     return https.get('/express/cancel-way-bill', data)
+}
+
+export const testUpdate = data => {
+    return https.get('/express/test-update', data)
 }
 }

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

@@ -1,5 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 import https from '@/plugins/luch-request_0.0.7/request'
 
 
+export const getCgExpressTrack = data => {
+	return https.get('/express/get-cg-express-track', data)
+}
+
 /** *
 /** *
  * 计算客户的距离和运费
  * 计算客户的距离和运费
  */
  */

+ 12 - 1
hdApp/src/pagesPurchase/purDetails.vue

@@ -22,9 +22,13 @@
           <view>发货状态:</view>
           <view>发货状态:</view>
           <view style="color:green;font-weight:bold;font-size:30upx;">待收货</view>
           <view style="color:green;font-weight:bold;font-size:30upx;">待收货</view>
         </view>
         </view>
+        <view class="order-info_box" v-if="detailInfo.fhType == 1">
+          <view>物流名称:</view>
+					<view>{{ detailInfo.fhWl }}</view>
+        </view>
         <view class="order-info_box" v-if="detailInfo.fhType == 1">
         <view class="order-info_box" v-if="detailInfo.fhType == 1">
           <view>物流单号:</view>
           <view>物流单号:</view>
-					<view>{{ detailInfo.fhWl }} {{detailInfo.fhWlNo}}</view>
+					<view>{{detailInfo.fhWlNo}}</view>
 					<view class="price">
 					<view class="price">
 						<button @click="copyWl(detailInfo.fhWlNo)" class="admin-button-com default">复制单号</button>
 						<button @click="copyWl(detailInfo.fhWlNo)" class="admin-button-com default">复制单号</button>
 					</view>
 					</view>
@@ -325,6 +329,7 @@
 </template>
 </template>
 <script>
 <script>
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
+import { getCgExpressTrack } from "@/api/express"
 import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder,confirmTake } from "@/api/purchase";
 import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder,confirmTake } from "@/api/purchase";
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListCell from "@/components/plugin/list-cell";
 import { getGhsDataApi } from "@/api/ghs";
 import { getGhsDataApi } from "@/api/ghs";
@@ -533,6 +538,12 @@ export default {
         that.settlePrice = parseFloat(that.settlePrice.toFixed(2))
         that.settlePrice = parseFloat(that.settlePrice.toFixed(2))
         that.afterSale = res.data.afterSale
         that.afterSale = res.data.afterSale
         that.$forceUpdate()
         that.$forceUpdate()
+
+        if (!this.$util.isEmpty(that.detailInfo.fhWlSn)){
+          //获取运单轨迹
+          //getCgExpressTrack({id:id}).then(res=>{ })
+        }
+
       })
       })
     },
     },
     toPay () {
     toPay () {