调整签收删除

api/apiList.js

@@ -170,6 +170,18 @@ export function getOrderPodDetailSign(data) {
   return Request( `/api/entry/{mini}/m-action/getOrderPodDetailSign`,data );
 }
 
+//签收操作按钮tm_ie_shipmentstatus
+export function getAppIeShipmentStatus(data) {
+  return Request( `/api/entry/{mini}/m-action/getAppIeShipmentStatus`,data );
+}
+
+
+//签收删除明细tm_ie_shipmentstatus
+export function getOrderPodDelete(data) {
+  return Request( `/api/entry/{mini}/m-action/getOrderPodDelete`,data );
+}
+
+
 // 查询货量明细
 // OM模式
 export function OMOrderDetail(data) {

components/orderPodItem/orderPodItem.vue

 <template>
-	<view class="orderPodItem box_shadow_card" >
+	<view class="orderPodItem box_shadow_card" @click="navToOrderPodDetail()">
 		<view class="shipment-header flex_sb" style="padding: 28rpx 24rpx 0;">
 			<view class="consumer_code flex_center">
 				<text selectable> 回单号：{{propData['pod_no'] || ''}}</text>
@@ -35,7 +35,6 @@
 		<view class="flex_cen flex_center orderItemButtonGroup" >
 			<button class="flex_cen flex_center" @click="onDetailPodSign()">明细上传</button>
 			<button class="flex_cen flex_center" @click="onAllPodSign()">整单上传</button>			
-<!-- 			<button class="flex_cen flex_center" style="margin-top: 24rpx;" @click="onChangeShippingDate()">修改船期</button> -->
 			
 		</view>
 	</view>
@@ -53,6 +52,13 @@
 			},
 		},
 		methods: {
+			//路由跳转==回单详情界面
+			navToOrderPodDetail() {		
+				getApp().globalData.orderPodSignEdit = this.propData
+				wx.navigateTo({
+					url: `/subpkg/orderPodSignEdit/orderPodSignEdit`,
+				})
+			},
 			//跳转明细签收界面
 			onDetailPodSign() {
 				getApp().globalData.orderDetailPodSign = this.propData

mixins/loginBehavior.js

-import { userLogin,authLogin, updateLocation } from "../api/apiList";
+import { userLogin,authLogin, updateLocation,userMobileOperation} from "../api/apiList";
 import { APP_ID, ENV_MODEL, TokenPrefix } from "../publicConfig/config";
 
 module.exports = {
@@ -7,7 +7,7 @@ module.exports = {
     getWxToken() {
       uni.login({
         success: (res) => {
-         // this.login(res.code);
+         this.login(res.code);
         },
       });
     },
@@ -65,6 +65,7 @@ module.exports = {
         // #endif
         //登录Action: loginByUserInfo已与手机号验证码登录实现互通, 故自动认证时默认为loginByUserInfo
 		let reqData = { entryName: projectMini }
+		reqData.code = code;
 	   authLogin("loginByUserInfo", code, reqData).then(res => {
             let XSRFToken = "";
             //#ifdef MP
@@ -86,15 +87,46 @@ module.exports = {
               // #ifdef MP
               uni.setStorageSync("cookies", res.cookies);
               // #endif
-              if (route && route !== "pages/login/login" && route !== "/") {
-                uni.reLaunch({
-                  url: pagePath,
-                }); //可跳转至任意页面
-              } else {
-                uni.switchTab({
-                  url: "/pages/order/order",
-                });
-              }
+             //获取用户信息
+             userMobileOperation('getUserInfo').then(res => {
+             	    var user = res.data.data
+             	   if(user.user_gid=="DEFAULT.CARRIER_ADMIN"){
+						getApp().globalData.tabList = [{
+								"pagePath": "pages/dirverMenu/dirverMenu",
+								"text": "司机",
+								"iconPath": "../../static/img/tabbar/receivebill.png",
+								"selectedIconPath": "../../static/img/tabbar/receivebill-active.png"
+							},
+							{
+								"pagePath": "pages/user/user",
+								"text": "我的",
+								 "iconPath": "../../static/img/tabbar/user.png",
+								 "selectedIconPath": "../../static/img/tabbar/user-active.png"
+							}
+						]
+						uni.switchTab({
+							url: "/pages/dirverMenu/dirverMenu",
+						})
+					}else {
+             			 getApp().globalData.tabList = [{
+             			 		"pagePath": "pages/carrierMenu/carrierMenu",
+             			 		"text": "承运商",
+             			 		"iconPath": "../../static/img/tabbar/shipment.png",
+             			 	 	"selectedIconPath": "../../static/img/tabbar/shipment-active.png"
+             			 	},
+             			 	{
+             			 		"pagePath": "pages/user/user",
+             			 		"text": "我的",
+             			 		 "iconPath": "../../static/img/tabbar/user.png",
+             			 		 "selectedIconPath": "../../static/img/tabbar/user-active.png"
+             			 	}
+             			 ]
+             			 uni.switchTab({
+             			 	url: "/pages/carrierMenu/carrierMenu",
+             			 })
+             			
+             		}
+             	})
               // #ifdef MP
               // _this.onUpdateLocation()
               // #endif

pages.json

@@ -158,6 +158,13 @@
 		  		"navigationBarTitleText": "明细签收",
 		  		"enablePullDownRefresh": false
 		  	}
+		  },
+		  {
+		  	"path": "orderPodSignEdit/orderPodSignEdit",
+		  	"style": {
+		  		"navigationBarTitleText": "签收信息",
+		  		"enablePullDownRefresh": false
+		  	}
 		  }
             ]
 	}],

subpkg/abnormalEvent/abnormalEvent.vue

@@ -604,7 +604,7 @@
 		/deep/.basicInfo,
 				/deep/.driverLicense,
 				/deep/.driverJobCertificate {
-					padding: 0 40rpx;
+					//padding: 0 40rpx;
 					background-color: #ffffff;
 		
 					.input-tip {