9901

datas/9901Jump.js

@@ -10,11 +10,11 @@ export function jump(type,item){
 	
 	if(type=="17"){
 		uni.navigateTo({
-			url:`plugin://issuer-plugin/login?redirectUrl=/pages/index/index&type=1`
+			url:`plugin://issuer-plugin/login?redirectUrl=/pages/index/index&type=1&mobile=${getItem("mobile")}`
 		})
 	}else if(type=="16"){
 		uni.navigateTo({
-			url:`plugin://issuer-plugin/login?redirectUrl=/pages/index/index&wechatSignNo=${item}`
+			url:`plugin://issuer-plugin/login?redirectUrl=/pages/index/index&wechatSignNo=${item}&mobile=${getItem("mobile")}`
 		})
 	}else{
 		let data=""//传递过来的数据
@@ -102,7 +102,7 @@ export function jump(type,item){
 			}
 			console.log("data.promoteId",data.promoteId)
 			uni.navigateTo({
-				url:`plugin://issuer-plugin/login?redirectUrl=${redirectUrl}&plateNum=${data.vehicleId?data.vehicleId:""}&handleType=${handleType}&orderNo=${(handleType!='continuation' && data.orderId)?data.orderId:""}&orderType=${orderType}&afterType=${afterType}&accountType=${accountType}&carType=${carType}&etcProductId=${data.promoteId?data.promoteId:data.productId}`
+				url:`plugin://issuer-plugin/login?redirectUrl=${redirectUrl}&plateNum=${data.vehicleId?data.vehicleId:""}&handleType=${handleType}&orderNo=${(handleType!='continuation' && data.orderId)?data.orderId:""}&orderType=${orderType}&afterType=${afterType}&accountType=${accountType}&carType=${carType}&etcProductId=${data.promoteId?data.promoteId:data.productId}&mobile=${getItem("mobile")}`
 			})
 	}
 }

pages.json

@@ -1906,8 +1906,8 @@
 			"root": "subpackage/carPark",
 			"plugins": {
 			  "issuer-plugin": {
-			   "version": "dev-c968a95bd8b2e12ed880d15141e81dcd",
-			   // "version": "1.0.1",
+			   // "version": "dev-c968a95bd8b2e12ed880d15141e81dcd",
+			   "version": "1.0.2",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }
 			 },

pages/order/components/order-list-item-new.vue

@@ -95,7 +95,7 @@
 				<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活">
 					<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)" v-if="item.applyReturn">申请退货</view>
 					<view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
-					<view class="btn btn-primary" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType == deviceType">申请补货</view>
+					<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType == deviceType">申请补货</view>
 					<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
 					<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
 				</view>

subpackage/carPark/etc/etcDeviceInfo.vue

@@ -456,7 +456,7 @@
 			data: {
 				obuId: num,
 				encryptedInfo: data,
-				wxOpenId:state.openid
+				wxOpenId:getItem("mobile")
 			},
 			method: "POST",
 			showLoading: true,

subpackage/orders/cancel-order.vue

@@ -77,7 +77,7 @@ import { deviceType } from "@/utils/network/difference";
 					showLoading: true,
 				};
                 if(state.deviceType==deviceType){
-					options.data['wxOpenId'] =getItem("QYorder").openid
+					options.data['wxOpenId'] =getItem("mobile")
 				}
 				// #ifdef MP-WEIXIN
 				options.data['source'] = 'WECHAT'

subpackage/orders/order-detail-logistics.vue

@@ -52,7 +52,7 @@
 	import popupBottom from "./components/popup-bottom.vue";
 	import { msg, getOrderTypeName, getCarTypeName, getOrderStatusName, getOrderTime } from "@/utils/utils";
 	import { onLoad } from "@dcloudio/uni-app";
-
+import {getCodeName} from "@/datas/queryKey.js";
 	const state = reactive({
 		orderInfo: "",
 		//是否显示更多订单信息
@@ -161,7 +161,7 @@
 
 		state.orderShowInfo[6].value = getOrderTime(state.orderInfo['insertTime'])
 		state.orderShowInfo[7].value = state.orderInfo['trackingNumber']
-		state.orderShowInfo[8].value = state.orderInfo['courierCompany']
+		state.orderShowInfo[8].value = getCodeName('快递物流公司',state.orderInfo.courierCompany)
 	})
 </script>
 

subpackage/orders/order-details-new.vue

@@ -181,8 +181,9 @@
 							<view class="d-row">
 								<text class="d-label">物流公司：</text>
 								<text
-									class="d-value">{{state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ''}}</text>
+									class="d-value">{{getCodeName('快递物流公司',state.orderInfo.courierCompany) ?getCodeName('快递物流公司',state.orderInfo.courierCompany): ''}}</text>
 							</view>
+
 						</view>
 
 						<!-- 订单已完成 -->
@@ -236,8 +237,9 @@
 							<view class="d-row">
 								<text class="d-label">物流公司：</text>
 								<text
-									class="d-value">{{state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ''}}</text>
+									class="d-value">{{getCodeName('快递物流公司',state.orderInfo.courierCompany) ?getCodeName('快递物流公司',state.orderInfo.courierCompany): ''}}</text>
 							</view>
+
 						</view>
 					</view>
 
@@ -527,6 +529,10 @@
 	import { getETCStatusName, getOBUStatusName, msg, getOrderTypeName, getCarTypeName, getOrderTime, isBlank, timesDiff } from "@/utils/utils";
 	import { OrderStatus } from "@/datas/enum";
 	import {deviceType} from "@/utils/network/difference";
+	import {
+			getCodeName
+		} from "@/datas/queryKey.js";
+
 	const state = reactive({
 		orderInfo: {
 			orderInfoExt: {}

utils/network/request.js

@@ -71,8 +71,8 @@ export function request(code, options = {}, start = false) {
 
 	}
 
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-	options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
+	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
+	// options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'