??修改

components/form-builder/form-builder.vue

@@ -31,7 +31,7 @@
             <view
               class="text-title"
               :style="{
-                color: `#${item.labelColor ?? '333333'}`,
+                color: `#${item.labelColor ?item.labelColor:'333333'}`,
                 width: '100%',
               }"
             >
@@ -732,14 +732,14 @@ const formSubmit = () => {
       let newMsg = data.title.replace(reg, "");
       if (data.value.indexOf(",") != -1 && data.type === 8) {
         if (!data[data.value.split(",")[0]]) {
-          showToast(data.emptyHint ?? `${data.hint1}不能为空`);
+          showToast(data.emptyHint ?data.emptyHint :`${data.hint1}不能为空`);
           return;
         } else if (!data[data.value.split(",")[1]]) {
-          showToast(data.emptyHint ?? `${data.hint2}不能为空`);
+          showToast(data.emptyHint ? data.emptyHint:`${data.hint2}不能为空`);
           return;
         }
       } else if (!data[data.value]) {
-        showToast(data.emptyHint ?? `${newMsg}不能为空`);
+        showToast(data.emptyHint ?data.emptyHint: `${newMsg}不能为空`);
         return;
       }
     }

composables/common/useMeScroll.ts

@@ -9,18 +9,18 @@ export default function useMeScroll(option?: any) {
 	const meScrollData = reactive({
 		//下拉刷新配置 
 		downOption: {
-			autoShowLoading: (option && option.autoShowLoading) ?? true,
-			auto: (option && option.auto) ?? false,
+			autoShowLoading: (option && option.autoShowLoading) ? (option && option.autoShowLoading) : true,
+			auto: (option && option.auto) ? (option && option.auto) : false,
 			offset: 50,
 			textLoading: '亲亲，稍等加载中...'
 		},
 
 		//上拉加载配置
 		upOption: {
-			auto: (option && option.auto) ?? true,
+			auto: (option && option.auto) ? (option && option.auto) : true,
 			textLoading: '努力加载中...',
 			textNoMore: '-- 我是有底线的 --',
-			noMoreSize: (option && option.noMoreSize) ?? PageData.NO_MORE_SIZE,
+			noMoreSize: (option && option.noMoreSize) ? (option && option.noMoreSize) : PageData.NO_MORE_SIZE,
 			page: {
 				num: PageData.NUM, //当前页码
 				size: PageData.SIZE, //每页加载条数
@@ -28,9 +28,9 @@ export default function useMeScroll(option?: any) {
 			},
 			empty: {
 				use: (option && option.use) || true, //是否显示空布局
-				icon: (option && option.icon) , // 图标路径
-				tip: (option && option.tip) , // 提示
-				btnText: (option && option.btnText) , // 按钮
+				icon: (option && option.icon), // 图标路径
+				tip: (option && option.tip), // 提示
+				btnText: (option && option.btnText), // 按钮
 				//是否使用fixed定位 为true下面两个才生效
 				fixed: (option && option.fixed) || false,
 				top: (option && option.top) || "100rpx",

composables/order/useOrderSkip.ts

@@ -38,12 +38,12 @@ export default function useOrderSkip() {
 	//跳转到修改地址页面
 	const gotoEditAddress = (orderInfo: any) => {
 		const item = {
-			id: orderInfo.orderInfoExt.id ?? '',
-			consignee: orderInfo.orderInfoExt.consignee ?? '',
-			consigneeTel: orderInfo.orderInfoExt.consigneeTel ?? '',
-			region: orderInfo.orderInfoExt.region ?? '',
-			address: orderInfo.orderInfoExt.address ?? '',
-			postalCode: orderInfo.orderInfoExt.postalCode ?? '',
+			id: orderInfo.orderInfoExt.id ? orderInfo.orderInfoExt.id : '',
+			consignee: orderInfo.orderInfoExt.consignee ? orderInfo.orderInfoExt.consignee : '',
+			consigneeTel: orderInfo.orderInfoExt.consigneeTel ? orderInfo.orderInfoExt.consigneeTel : '',
+			region: orderInfo.orderInfoExt.region ? orderInfo.orderInfoExt.region : '',
+			address: orderInfo.orderInfoExt.address ? orderInfo.orderInfoExt.address : '',
+			postalCode: orderInfo.orderInfoExt.postalCode ? orderInfo.orderInfoExt.postalCode : '',
 			fromOrder: true, //是否来自订单
 		}
 		navTo(`/subpackage/personal-center/setting/addressManager?fromOrder=true`);

pages.json

@@ -774,181 +774,6 @@
 				}
 			]
 		},
-		// {
-		// 	"root": "subpackage/applyCard", //ETC申办下单
-		// 	"pages": [
-		// 		{
-		// 			"path": "essential-information",
-		// 			"style": {
-		// 				"navigationBarTitleText": "基本信息",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "signUserAgreement",
-		// 			"style": {
-		// 				"navigationBarTitleText": "签署用户协议"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "deductionAccountAssociation",
-		// 			"style": {
-		// 				"navigationBarTitleText": "扣款账户关联",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "release-products",
-		// 			"style": {
-		// 				"navigationBarTitleText": "支付账户签约",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "addAddress",
-		// 			"style": {
-		// 				"navigationBarTitleText": "新增收货地址"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "editAddress",
-		// 			"style": {
-		// 				"navigationBarTitleText": "修改收货地址"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "opening-account-unit",
-		// 			"style": {
-		// 				"navigationBarTitleText": "ETC开户新办申请-单位",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "opening-account-people",
-		// 			"style": {
-		// 				"navigationBarTitleText": "ETC开户新办申请-个人",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "car-release",
-		// 			"style": {
-		// 				"navigationBarTitleText": "行驶证信息上传",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "sign-up",
-		// 			"style": {
-		// 				"navigationBarTitleText": "微信车主服务"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "interestsList",
-		// 			"style": {
-		// 				"navigationBarTitleText": "加购权益产品"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "choice-product",
-		// 			"style": {
-		// 				"navigationBarTitleText": "选择产品",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "product-detail",
-		// 			"style": {
-		// 				"navigationBarTitleText": "产品详情",
-		// 				"navigationStyle": "custom"
-		// 			}
-		// 		}
-		// 	]
-		// },
-		// {
-		// 	"root": "subpackage/invoice", //发票管理
-		// 	"pages": [
-		// 		{
-		// 			"path": "invoiceApply/create-invoice-header-company",
-		// 			"style": {
-		// 				"navigationBarTitleText": "创建抬头-单位"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/create-invoice-header-individual",
-		// 			"style": {
-		// 				"navigationBarTitleText": "创建抬头-个人"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/edit-invoice-header-company",
-		// 			"style": {
-		// 				"navigationBarTitleText": "编辑抬头-单位"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/edit-invoice-header-individual",
-		// 			"style": {
-		// 				"navigationBarTitleText": "编辑抬头-个人"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/invoice-header",
-		// 			"style": {
-		// 				"navigationBarTitleText": "选择抬头"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/invoiceList",
-		// 			"style": {
-		// 				"navigationBarTitleText": "开票申请"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/invoice-step1",
-		// 			"style": {
-		// 				"navigationBarTitleText": "开票申请"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoiceApply/invoice-step2",
-		// 			"style": {
-		// 				"navigationBarTitleText": "开票申请"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoice-download",
-		// 			"style": {
-		// 				"navigationBarTitleText": "下载发票"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "Invoice-mannager",
-		// 			"style": {
-		// 				"navigationBarTitleText": "发票管理"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "moreHighMsg/moreHighMsg",
-		// 			"style": {
-		// 				"navigationBarTitleText": "高速快讯",
-		// 				"enablePullDownRefresh":true
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "invoicing-record",
-		// 			"style": {
-		// 				"navigationBarTitleText": "开票记录"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "verification-apply",
-		// 			"style": {
-		// 				"navigationBarTitleText": "验证申请"
-		// 			}
-		// 		}
-		// 	]
-		// },
 		{
 			"root": "subpackage/orders", //订单管理模块
 			"pages": [
@@ -1687,69 +1512,6 @@
 				}
 			]
 		}
-		// {
-		// 	//发行激活模块
-		// 	"root": "subpackage/issueActivation",
-		// 	"pages": [
-		// 		{
-		// 			"path": "old-user",
-		// 			"style": {
-		// 				"navigationBarTitleText": "历史用户申请",
-		// 				"enablePullDownRefresh": true
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "address",
-		// 			"style": {
-		// 				"navigationBarTitleText": "邮寄地址",
-		// 				"enablePullDownRefresh": true
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "install-activation-order",
-		// 			"style": {
-		// 				"navigationBarTitleText": "安装激活-选择订单",
-		// 				"enablePullDownRefresh": true
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "car-submit-record",
-		// 			"style": {
-		// 				"navigationBarTitleText": "车辆提交记录"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "official-car-issue",
-		// 			"style": {
-		// 				"navigationBarTitleText": "公务车发行"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "query-company-list",
-		// 			"style": {
-		// 				"navigationBarTitleText": "单位查询"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "add-company",
-		// 			"style": {
-		// 				"navigationBarTitleText": "新增单位"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "add-car",
-		// 			"style": {
-		// 				"navigationBarTitleText": "新增车辆"
-		// 			}
-		// 		},
-		// 		{
-		// 			"path": "official-car-issue-result",
-		// 			"style": {
-		// 				"navigationBarTitleText": "公务车发行-查询结果"
-		// 			}
-		// 		}
-		// 	]
-		// }
 	],
 	"tabBar": {
 		"color": "#666666",

pages/index/index.vue

@@ -415,7 +415,7 @@
 				console.log(stringToJson(res.bizContent));
 				const data = stringToJson(res.bizContent)
 				console.log("轮播图",data)
-				state.swiperList = data.swipers ?? []
+				state.swiperList = data.swipers ?data.swipers:[]
 			})
 			.catch((err) => {
 				console.log(err);

pages/order/components/order-list-item-cancel-numberplate.vue

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 			<view class="status text-green" :class="{'text-orange':item.orderStep == OrderStatus.已完成 || item.orderStep == OrderStatus.已结束 
 			 || item.orderStep == OrderStatus['换货-设备已回收'] || item.orderStep == OrderStatus.退款成功 || item.orderStep == OrderStatus.退货成功}">

pages/order/components/order-list-item-cancel-recharge.vue

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 			<view class="status text-green" :class="{'text-orange':item.orderStep == OrderStatus.已完成 || item.orderStep == OrderStatus.已结束 
 			 || item.orderStep == OrderStatus['换货-设备已回收'] || item.orderStep == OrderStatus.退款成功 || item.orderStep == OrderStatus.退货成功}">

pages/order/components/order-list-item-card-sign.vue

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 			<view class="status text-orange" v-if="item.orderStatus == OrderStatus.已取消">已取消</view>
 			<view class="status text-green" v-else
@@ -28,7 +28,7 @@
 					<text class="value">{{item.vehiclePlate}}</text>
 				</view>
 			</view>
-			<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?? '0.00'}}</text></view>
+			<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?item.amount / 100 : '0.00'}}</text></view>
 		</view>
 		
 		<template v-if="item.orderStatus != OrderStatus.已取消">

pages/order/components/order-list-item-edit-car.vue

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName:''}}</text>
 			</view>
 			<view class="status text-orange" v-if="item.orderStatus == OrderStatus.已取消">已取消</view>
 			<view class="status text-green" v-else

pages/order/components/order-list-item-logoff-etc.vue

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 			<view class="status text-green" :class="{'text-orange':item.orderStep == OrderStatus.已完成 || item.orderStep == OrderStatus.已结束 
 			 || item.orderStep == OrderStatus['换货-设备已回收'] || item.orderStep == OrderStatus.退款成功 || item.orderStep == OrderStatus.退货成功}">
@@ -26,7 +26,7 @@
 					<text class="value">{{item.vehiclePlate}}</text>
 				</view>
 			</view>
-			<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?? '0.00'}}</text></view>
+			<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?item.amount / 100: '0.00'}}</text></view>
 		</view>
 		
 		<!-- 审核不通过 -->

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

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 
 			<view class="status text-orange" v-if="item.orderStatus == OrderStatus.已取消">已取消</view>

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

@@ -5,7 +5,7 @@
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-				<text class="title">{{item.productName ?? ''}}</text>
+				<text class="title">{{item.productName ?item.productName: ''}}</text>
 			</view>
 			<view class="status text-orange" v-if="item.orderStatus == OrderStatus.已取消">已取消</view>
 			<view class="status text-green" v-else
@@ -28,7 +28,7 @@
 					<text class="value">{{item.vehiclePlate}}</text>
 				</view>
 			</view>
-			<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?? '0.00'}}</text></view>
+			<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?item.amount / 100: '0.00'}}</text></view>
 		</view>
 		
 		<template v-if="item.orderStatus != OrderStatus.已取消">

pages/recharge/recharge.vue

@@ -671,7 +671,7 @@
 				orderInfo: "",
 				timeStamp: data.timestamp,
 				nonceStr: data.noncestr,
-				package: data.wxPackage ?? "",
+				package: data.wxPackage ?data.wxPackage: "",
 				signType: data.signType,
 				paySign: data.sign,
 				success: function() {

pages/service/service.vue

@@ -73,7 +73,7 @@
 
 	onLoad(() => {
 		queryMenuConfigAction().then((val : any) => {
-			menu.list = val.menuList??[]
+			menu.list = val.menuList?val.menuList:[]
 		})
 	});
 

subpackage/after-sale/activation/operation-upload.vue

@@ -9,7 +9,7 @@
 			</view>
 			<view class="item-right" @click="chooseImage(1)">
 				<view class="empty-node"></view>
-				<image :src="state.headstockImg ?? defHeadstockImg" :data-url="state.headstockImg ?? defHeadstockImg">
+				<image :src="state.headstockImg ?state.headstockImg: defHeadstockImg" :data-url="state.headstockImg ?state.headstockImg: defHeadstockImg">
 				</image>
 			</view>
 		</view>
@@ -21,7 +21,7 @@
 			</view>
 			<view class="item-right" @click="chooseImage(2)">
 				<view class="empty-node"></view>
-				<image :src="state.installImg ?? defInstallImg"></image>
+				<image :src="state.installImg ?state.installImg: defInstallImg"></image>
 			</view>
 		</view>
 		<view class="hint">

subpackage/after-sale/arrears/arrears.vue

@@ -302,7 +302,7 @@
 					orderInfo: "",
 					timeStamp: data.timestamp,
 					nonceStr: data.noncestr,
-					package: data.wxPackage ?? "",
+					package: data.wxPackage ?data.wxPackage: "",
 					signType: data.signType,
 					paySign: data.sign,
 					success: function(e) {

subpackage/after-sale/to-bookkeeping-card/detail.vue

@@ -188,7 +188,7 @@ const wxPayment = () => {
       orderInfo: "",
       timeStamp: data.timestamp,
       nonceStr: data.noncestr,
-      package: data.wxPackage ?? "",
+      package: data.wxPackage ?data.wxPackage: "",
       signType: data.signType,
       paySign: data.sign,
       success: function (e) {

subpackage/orders/apply-ex-goods.vue

@@ -327,7 +327,7 @@ const radioChange = (e: any, item: any) => {
     //退货方式
     state.exchangeMode =
       item.exchangeMode === "ON_LINE"
-        ? state.formData[6][state.formData[6].value] ?? "SELF"
+        ? state.formData[6][state.formData[6].value] ?state.formData[6][state.formData[6].value]: "SELF"
         : item.exchangeMode;
   } else if (item.value === "exchangeRgMode") {
     //收货方式

subpackage/orders/cancel-order.vue

@@ -105,7 +105,7 @@ const cancelOrderSuccess = () => {
 };
 
 onLoad((options) => {
-  state.orderInfo = JSON.parse(options.data) ?? {};
+  state.orderInfo = JSON.parse(options.data) ?JSON.parse(options.data): {};
   state.formData[0].hint = state.orderInfo.orderId;
   state.formData[1].hint = state.orderInfo.vehiclePlate;
   state.formData[2].hint = getOrderStatusName(state.orderInfo.orderStep);

subpackage/orders/choice-product.vue

@@ -112,7 +112,7 @@ onLoad((option: any) => {
   // 	const data = stringToJson(res.bizContent);
   // 	console.log(data);
   // 	console.log(typeof(data));
-  // 	state.dataArray = data??[];
+  // 	state.dataArray = data?data:[];
   // });
 
   var data = {
@@ -131,7 +131,7 @@ onLoad((option: any) => {
     const data = stringToJson(res.bizContent);
     console.log(data);
     // console.log(typeof(data));
-    state.dataArray = data.csmsnPromoteDistPro ?? [];
+    state.dataArray = data.csmsnPromoteDistPro ?data.csmsnPromoteDistPro: [];
 	for(var i=0;i<state.dataArray.length;i++){
 		const cardTypeArr=[]
 		for(var j=0;j<state.dataArray[i].cardType.length;j++){

subpackage/orders/essential-information.vue

@@ -384,7 +384,7 @@ onShow((option) => {
     request(addressQuery, options).then((res) => {
       const data = stringToJson(res.bizContent);
       console.log("111",data);
-      state.addressArray = data.data ?? [];
+      state.addressArray = data.data ?data.data: [];
     });
   }
   uni.$on('updateData',function(data){

subpackage/orders/opening-account-people.vue

@@ -468,7 +468,7 @@
 		state.form.orderId = option.orderId;
 		state.orderId = option.orderId;
 		state.vehiclePlateColor = option.vehiclePlateColor;
-		state.form.opId = getItem('openId')??'';
+		state.form.opId = getItem('openId')?getItem('openId'):'';
 		state.isSign=option.isSign;
 		state.type=option.type;
 		//state.fromOrder = option.fromOrder //是否来自订单-修改资料

subpackage/orders/opening-account-unit.vue

@@ -254,7 +254,7 @@ import {
 		state.form.orderId = option.orderId;
 		state.orderId = option.orderId;
 		state.vehiclePlateColor = option.vehiclePlateColor;
-		state.form.opId = getItem('openId')??'';
+		state.form.opId = getItem('openId')?getItem('openId'):'';
 		state.isSign=option.isSign;
 	});
 	

subpackage/orders/order-card-sign-payment.vue

@@ -7,11 +7,11 @@
 		</view>
 		<view class="center" style="flex:1">
 			<view class="as-layout-horizontal">
-				<view class="name">{{state.orderInfo.orderInfoExt.consignee ?? ''}}</view>
-				<view class="phone">{{state.orderInfo.orderInfoExt.consigneeTel ?? ''}}</view>
+				<view class="name">{{state.orderInfo.orderInfoExt.consignee ?state.orderInfo.orderInfoExt.consignee: ''}}</view>
+				<view class="phone">{{state.orderInfo.orderInfoExt.consigneeTel ?state.orderInfo.orderInfoExt.consigneeTel: ''}}</view>
 			</view>
-			<view class="addr">{{state.orderInfo.orderInfoExt.region ?? ''}}
-				{{state.orderInfo.orderInfoExt.address ?? ''}}</view>
+			<view class="addr">{{state.orderInfo.orderInfoExt.region ?state.orderInfo.orderInfoExt.region: ''}}
+				{{state.orderInfo.orderInfoExt.address ?state.orderInfo.orderInfoExt.address: ''}}</view>
 		</view>
 		<image :src="`${$imgUrl}applyCard/edit.png`" mode="" class="edit" @click="gotoEditAddress(state.orderInfo)"></image>
 	</view>

subpackage/orders/order-confirm-receipt.vue

@@ -104,8 +104,8 @@ const getOrderDetails = (id) => {
     state.list[0].value = state.orderInfo.orderId;
     state.list[1].value = state.orderInfo.vehiclePlate;
     state.list[2].value = getOrderStatusName(state.orderInfo.orderStep);
-    state.list[3].value = state.orderInfo.cardId ?? "";
-    state.list[4].value = state.orderInfo.obuId ?? "";
+    state.list[3].value = state.orderInfo.cardId ?state.orderInfo.cardId: "";
+    state.list[4].value = state.orderInfo.obuId ?state.orderInfo.obuId: "";
   });
 };
 

subpackage/orders/order-details-card-sign.vue

@@ -11,11 +11,11 @@
 				</view>
 				<view class="center" style="flex: 1">
 					<view class="as-layout-horizontal">
-						<view class="name">{{  state.orderInfo.orderInfoExt.consignee ?? ""}}</view>
-						<view class="phone">{{ state.orderInfo.orderInfoExt.consigneeTel ?? "" }}</view>
+						<view class="name">{{  state.orderInfo.orderInfoExt.consignee ?state.orderInfo.orderInfoExt.consignee: ""}}</view>
+						<view class="phone">{{ state.orderInfo.orderInfoExt.consigneeTel ?state.orderInfo.orderInfoExt.consigneeTel: "" }}</view>
 					</view>
-					<view class="addr">{{ state.orderInfo.orderInfoExt.region ?? "" }}
-						{{ state.orderInfo.orderInfoExt.address ?? "" }}
+					<view class="addr">{{ state.orderInfo.orderInfoExt.region ?state.orderInfo.orderInfoExt.region : "" }}
+						{{ state.orderInfo.orderInfoExt.address ?state.orderInfo.orderInfoExt.address: "" }}
 					</view>
 				</view>
 				<image :src="`${$imgUrl}applyCard/edit.png`" mode="" class="edit"
@@ -26,7 +26,7 @@
 		<view class="detail-box">
 			<view class="detail-header">
 				<image class="d-img" :src="`${$imgUrl}order/icon-star-green.png`"></image>
-				<text class="detail-name">{{ state.orderInfo.productName ?? "" }}</text>
+				<text class="detail-name">{{ state.orderInfo.productName ?state.orderInfo.productName: "" }}</text>
 			</view>
 			<view class="detail-content">
 				<view class="base-info-box">
@@ -61,11 +61,11 @@
 						<template v-if="state.orType !== 3">
 							<view class="d-row">
 								<text class="d-label">原卡号：</text>
-								<text class="d-value">{{state.orderInfo.insertTime ?? "" }}</text>
+								<text class="d-value">{{state.orderInfo.insertTime ?state.orderInfo.insertTime: "" }}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">原卡状态：</text>
-								<text class="d-value">{{  state.orderInfo.insertTime ?? ""}}</text>
+								<text class="d-value">{{  state.orderInfo.insertTime ?state.orderInfo.insertTime: ""}}</text>
 							</view>
 						</template>
 
@@ -73,11 +73,11 @@
 						<template v-if="state.orType !== 2">
 							<view class="d-row">
 								<text class="d-label">原OBU号：</text>
-								<text class="d-value">{{ state.orderInfo.insertTime ?? "" }}</text>
+								<text class="d-value">{{ state.orderInfo.insertTime ?state.orderInfo.insertTime:"" }}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">原OBU状态：</text>
-								<text class="d-value">{{state.orderInfo.insertTime ?? ""}}</text>
+								<text class="d-value">{{state.orderInfo.insertTime ?state.orderInfo.insertTime: ""}}</text>
 							</view>
 						</template>
 					</view>
@@ -87,11 +87,11 @@
 						<!-- 通用信息 -->
 						<view class="d-row">
 							<text class="d-label">售后单号：</text>
-							<text class="d-value">{{ state.orderInfo.XX ?? "没有这个字段"}}</text>
+							<text class="d-value">{{ state.orderInfo.XX ?state.orderInfo.XX: "没有这个字段"}}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">业务类型：</text>
-							<text class="d-value">{{ state.orderInfo.orderType ?? "" }}</text>
+							<text class="d-value">{{ state.orderInfo.orderType ?state.orderInfo.orderType: "" }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单状态：</text>
@@ -99,11 +99,11 @@
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单金额：</text>
-							<text class="d-value text-orange">{{state.orderInfo.amount / 100 ?? "0.00" }}</text>
+							<text class="d-value text-orange">{{state.orderInfo.amount / 100 ?state.orderInfo.amount / 100: "0.00" }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">创建时间：</text>
-							<text class="d-value">{{ state.orderInfo.insertTime ?? ""}}</text>
+							<text class="d-value">{{ state.orderInfo.insertTime ?state.orderInfo.insertTime: ""}}</text>
 						</view>
 
 						<!-- 根据状态显示不同信息 -->
@@ -112,19 +112,19 @@
 							<view v-if="state.orderInfo.orderStatus == OrderStatus.已取消">
 								<view class="d-row">
 									<text class="d-label">付款时间：</text>
-									<text class="d-value">{{ state.orderInfo.orderInfoExt.payTime ?? ""}}</text>
+									<text class="d-value">{{ state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime: ""}}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">发货时间：</text>
-									<text class="d-value">{{ state.orderInfo.orderInfoExt.deliveryTime ?? "" }}</text>
+									<text class="d-value">{{ state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime: "" }}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">取消时间：</text>
-									<text class="d-value">{{ state.orderInfo.orderInfoExt.cancelTime ?? ""}}</text>
+									<text class="d-value">{{ state.orderInfo.orderInfoExt.cancelTime ?state.orderInfo.orderInfoExt.cancelTime: ""}}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">取消原因：</text>
-									<text class="d-value">{{ state.orderInfo.orderInfoExt.cancelReason ?? "" }}</text>
+									<text class="d-value">{{ state.orderInfo.orderInfoExt.cancelReason ?state.orderInfo.orderInfoExt.cancelReason: "" }}</text>
 								</view>
 							</view>
 
@@ -133,16 +133,16 @@
 								<view v-if="state.orderInfo.orderStep == OrderStatus.待发货">
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.payTime ?? "" }}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime: "" }}</text>
 										<!-- 换签 显示 -->
 										<template v-if="state.orType === 3">
 											<view class="d-row">
 												<text class="d-label">快递单号：</text>
-												<text class="d-value">{{ state.orderInfo.trackingNumber ?? ""}}</text>
+												<text class="d-value">{{ state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ""}}</text>
 											</view>
 											<view class="d-row">
 												<text class="d-label">物流公司：</text>
-												<text class="d-value">{{state.orderInfo.courierCompany ?? "" }}</text>
+												<text class="d-value">{{state.orderInfo.courierCompany ?state.orderInfo.courierCompany: "" }}</text>
 											</view>
 										</template>
 									</view>
@@ -151,21 +151,21 @@
 								<view v-if="state.orderInfo.orderStep == OrderStatus.待收货">
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.payTime ?? ""}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime: ""}}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">发货时间：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.deliveryTime ?? "" }}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime: "" }}</text>
 									</view>
 									<!-- 换签、换卡 显示 -->
 									<template v-if="state.orType === 3 || state.orType === 2">
 										<view class="d-row">
 											<text class="d-label">快递单号：</text>
-											<text class="d-value">{{ state.orderInfo.trackingNumber ?? "" }}</text>
+											<text class="d-value">{{ state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: "" }}</text>
 										</view>
 										<view class="d-row">
 											<text class="d-label">物流公司：</text>
-											<text class="d-value">{{ state.orderInfo.courierCompany ?? "" }}</text>
+											<text class="d-value">{{ state.orderInfo.courierCompany ?state.orderInfo.courierCompany: "" }}</text>
 										</view>
 									</template>
 								</view>
@@ -173,25 +173,25 @@
 								<view v-if="state.orderInfo.orderStep == OrderStatus.待激活">
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.payTime ?? ""}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime:""}}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">发货时间：</text>
-										<text class="d-value">{{ state.orderInfo.orderInfoExt.deliveryTime ?? "" }}</text>
+										<text class="d-value">{{ state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime :"" }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">收货时间：</text>
-										<text class="d-value">{{ state.orderInfo.orderInfoExt.receivingTime ?? ""}}</text>
+										<text class="d-value">{{ state.orderInfo.orderInfoExt.receivingTime ?state.orderInfo.orderInfoExt.receivingTime: ""}}</text>
 									</view>
 									<!-- 换签、换卡 显示 -->
 									<template v-if="state.orType === 3 || state.orType === 2">
 										<view class="d-row">
 											<text class="d-label">快递单号：</text>
-											<text class="d-value">{{ state.orderInfo.trackingNumber ?? ""  }}</text>
+											<text class="d-value">{{ state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ""  }}</text>
 										</view>
 										<view class="d-row">
 											<text class="d-label">物流公司：</text>
-											<text class="d-value">{{ state.orderInfo.courierCompany ?? "" }}</text>
+											<text class="d-value">{{ state.orderInfo.courierCompany ?state.orderInfo.courierCompany: "" }}</text>
 										</view>
 									</template>
 								</view>
@@ -199,29 +199,29 @@
 								<view v-if="state.orderInfo.orderStep == OrderStatus.已完成">
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
-										<text class="d-value">{{ state.orderInfo.orderInfoExt.payTime ?? ""}}</text>
+										<text class="d-value">{{ state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime: ""}}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">发货时间：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.deliveryTime ?? ""}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime: ""}}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">收货时间：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.receivingTime ?? "" }}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.receivingTime ?state.orderInfo.orderInfoExt.receivingTime: "" }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">激活时间：</text>
-										<text class="d-value">{{  state.orderInfo.cardEnableTime ?? "" }}</text>
+										<text class="d-value">{{  state.orderInfo.cardEnableTime ?state.orderInfo.cardEnableTime: "" }}</text>
 									</view>
 									<!-- 换签、换卡 显示 -->
 									<template v-if="state.orType === 3 || state.orType === 2">
 										<view class="d-row">
 											<text class="d-label">快递单号：</text>
-											<text class="d-value">{{ state.orderInfo.trackingNumber ?? ""}}</text>
+											<text class="d-value">{{ state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ""}}</text>
 										</view>
 										<view class="d-row">
 											<text class="d-label">物流公司：</text>
-											<text class="d-value">{{ state.orderInfo.courierCompany ?? ""}}</text>
+											<text class="d-value">{{ state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ""}}</text>
 										</view>
 									</template>
 								</view>
@@ -231,21 +231,21 @@
 						<!-- TODO 更换卡签时收费展示的字段 邮寄收 -->
 						<view class="d-row" v-if="false">
 							<text class="d-label">更换原因：</text>
-							<text class="d-value">{{ state.orderInfo.reason ?? "" }}</text>
+							<text class="d-value">{{ state.orderInfo.reason ?state.orderInfo.reason: "" }}</text>
 						</view>
 
 						<!-- TODO 更换卡签时不收费展示的字段 线上换-邮寄收-->
 						<view class="d-row">
 							<text class="d-label">退货物流公司：</text>
-							<text class="d-value">{{ state.orderInfo.courierCompany ?? "" }}</text>
+							<text class="d-value">{{ state.orderInfo.courierCompany ?state.orderInfo.courierCompany: "" }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">退货快递单号：</text>
-							<text class="d-value">{{state.orderInfo.trackingNumber ?? "" }}</text>
+							<text class="d-value">{{state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: "" }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">更换原因：</text>
-							<text class="d-value">{{ state.orderInfo.reason ?? "" }}</text>
+							<text class="d-value">{{ state.orderInfo.reason ?state.orderInfo.reason: "" }}</text>
 						</view>
 					</view>
 				</view>

subpackage/orders/order-details-new.vue

@@ -11,11 +11,11 @@
 				</view>
 				<view class="center" style="flex:1">
 					<view class="as-layout-horizontal">
-						<view class="name">{{state.orderInfo.orderInfoExt.consignee ?? ''}}</view>
-						<view class="phone">{{state.orderInfo.orderInfoExt.consigneeTel ?? ''}}</view>
+						<view class="name">{{state.orderInfo.orderInfoExt.consignee ?state.orderInfo.orderInfoExt.consignee: ''}}</view>
+						<view class="phone">{{state.orderInfo.orderInfoExt.consigneeTel ?state.orderInfo.orderInfoExt.consigneeTel: ''}}</view>
 					</view>
-					<view class="addr">{{state.orderInfo.orderInfoExt.region ?? ''}}
-						{{state.orderInfo.orderInfoExt.address ?? ''}}</view>
+					<view class="addr">{{state.orderInfo.orderInfoExt.region ?state.orderInfo.orderInfoExt.region: ''}}
+						{{state.orderInfo.orderInfoExt.address ?state.orderInfo.orderInfoExt.address: ''}}</view>
 				</view>
 				<image :src="`${$imgUrl}applyCard/edit.png`" mode="" class="edit" @click="gotoEditAddress(state.orderInfo)"></image>
 			</view>
@@ -24,7 +24,7 @@
 		<view class="detail-box">
 			<view class="detail-header">
 				<image class="d-img" :src="`${$imgUrl}order/icon-star-green.png`"></image>
-				<text class="detail-name">{{state.orderInfo.productName ?? ''}}</text>
+				<text class="detail-name">{{state.orderInfo.productName ?state.orderInfo.productName: ''}}</text>
 			</view>
 			<view class="detail-content">
 				<view class="base-info-box">
@@ -53,7 +53,7 @@
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单金额：</text>
-							<text class="d-value text-orange">¥ {{state.orderInfo.amount / 100 ?? '0.00'}}</text>
+							<text class="d-value text-orange">¥ {{state.orderInfo.amount / 100 ?state.orderInfo.amount / 100: '0.00'}}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单状态：</text>
@@ -82,7 +82,7 @@
 						</view>
 						<view class="d-row">
 							<text class="d-label">取消原因：</text>
-							<text class="d-value">{{state.orderInfo.orderInfoExt.cancelReason ?? ''}}</text>
+							<text class="d-value">{{state.orderInfo.orderInfoExt.cancelReason ?state.orderInfo.orderInfoExt.cancelReason: ''}}</text>
 						</view>
 					</view>
 
@@ -95,7 +95,7 @@
 							</view>
 							<view class="d-row" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过">
 								<text class="d-label">不通过原因：</text>
-								<text class="d-value">{{state.orderInfo.XXX ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.XXX ?state.orderInfo.XXX: ''}}</text>
 							</view>
 						</view>
 
@@ -131,7 +131,7 @@
 							</view>
 							<view class="d-row">
 								<text class="d-label">卡 号：</text>
-								<text class="d-value">{{state.orderInfo.cardId ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.cardId ?state.orderInfo.cardId: ''}}</text>
 							</view>
 													
 							<view class="d-row">
@@ -140,7 +140,7 @@
 							</view>
 							<view class="d-row">
 								<text class="d-label">OBU 号：</text>
-								<text class="d-value">{{state.orderInfo.obuId ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.obuId ?state.orderInfo.obuId: ''}}</text>
 							</view>
 							
 							<view class="d-row">
@@ -154,11 +154,11 @@
 							</view>
 							<view class="d-row">
 								<text class="d-label">快递单号：</text>
-								<text class="d-value">{{state.orderInfo.trackingNumber ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ''}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">物流公司：</text>
-								<text class="d-value">{{state.orderInfo.courierCompany ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ''}}</text>
 							</view>
 						</view>
 
@@ -182,7 +182,7 @@
 							</view>
 							<view class="d-row">
 								<text class="d-label">卡 号：</text>
-								<text class="d-value">{{state.orderInfo.cardId ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.cardId ?state.orderInfo.cardId: ''}}</text>
 							</view>
 						
 							<view class="d-row">
@@ -191,7 +191,7 @@
 							</view>
 							<view class="d-row">
 								<text class="d-label">OBU 号：</text>
-								<text class="d-value">{{state.orderInfo.obuId ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.obuId ?state.orderInfo.obuId: ''}}</text>
 							</view>
 							
 							<view class="d-row">
@@ -204,11 +204,11 @@
 							</view>
 							<view class="d-row">
 								<text class="d-label">快递单号：</text>
-								<text class="d-value">{{state.orderInfo.trackingNumber ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ''}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">物流公司：</text>
-								<text class="d-value">{{state.orderInfo.courierCompany ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ''}}</text>
 							</view>
 						</view>
 					</view>
@@ -221,7 +221,7 @@
 						<view v-if="state.orderInfo.orderStep == OrderStatus['已申请-退货'] || !isBlank(state.orderInfo.orderInfoExt.returnMode)">
 							<view class="d-row" v-if="state.orderInfo.XXX">
 								<text class="d-label">售后单号：</text>
-								<text class="d-value">{{state.orderInfo.XXX ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.XXX ?state.orderInfo.XXX: ''}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">业务类型：</text>
@@ -238,23 +238,23 @@
 							<template v-if="state.orderInfo.orderInfoExt.returnMode === 'ON_LINE'">
 								<view class="d-row">
 									<text class="d-label">物流公司：</text>
-									<text class="d-value">{{state.orderInfo.orderInfoExt.returnLogisticsCompany ?? ''}}</text>
+									<text class="d-value">{{state.orderInfo.orderInfoExt.returnLogisticsCompany ?state.orderInfo.orderInfoExt.returnLogisticsCompany: ''}}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">快递单号：</text>
-									<text class="d-value">{{state.orderInfo.orderInfoExt.returnLogisticsNumber ?? ''}}</text>
+									<text class="d-value">{{state.orderInfo.orderInfoExt.returnLogisticsNumber ?state.orderInfo.orderInfoExt.returnLogisticsNumber: ''}}</text>
 								</view>
 							</template>
 							<template v-if="state.orderInfo.orderInfoExt.returnMode === 'OFFLINE'">
 								<view class="d-row">
 									<text class="d-label">退货网点：</text>
-									<text class="d-value">{{state.orderInfo.orderInfoExt.returnNetworkName ?? ''}}</text>
+									<text class="d-value">{{state.orderInfo.orderInfoExt.returnNetworkName ?state.orderInfo.orderInfoExt.returnNetworkName: ''}}</text>
 								</view>
 							</template>
 							
 							<view class="d-row">
 								<text class="d-label">退货原因：</text>
-								<text class="d-value">{{state.orderInfo.orderInfoExt.returnReason ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.orderInfoExt.returnReason ?state.orderInfo.orderInfoExt.returnReason: ''}}</text>
 							</view>
 							<view class="d-row" v-if="state.orderInfo.staffName">
 								<text class="d-label">业 务 员：</text>
@@ -266,7 +266,7 @@
 						<view v-if="state.orderInfo.orderStep == OrderStatus['已申请-换货'] || !isBlank(state.orderInfo.orderInfoExt.exchangeMode)">
 							<view class="d-row" v-if="state.orderInfo.XXX">
 								<text class="d-label">售后单号：</text>
-								<text class="d-value">{{state.orderInfo.XXX ?? ''}}</text>
+								<text class="d-value">{{state.orderInfo.XXX ?state.orderInfo.XXX: ''}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">业务类型：</text>
@@ -285,11 +285,11 @@
 							<template v-if="state.orderInfo.orderInfoExt.exchangeMode === 'ON_LINE'">
 								<view class="d-row">
 									<text class="d-label">物流公司：</text>
-									<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeLogisticsCompany ?? ''}}</text>
+									<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeLogisticsCompany ?state.orderInfo.orderInfoExt.exchangeLogisticsCompany: ''}}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">快递单号：</text>
-									<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeLogisticsNumber ?? ''}}</text>
+									<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeLogisticsNumber ?state.orderInfo.orderInfoExt.exchangeLogisticsNumber: ''}}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">收货方式：</text>
@@ -298,17 +298,17 @@
 								<template v-if="state.orderInfo.orderInfoExt.exchangeRgMode === 'SELF'">
 									<view class="d-row">
 										<text class="d-label">自提网点：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeRgNetworkName ?? ''}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeRgNetworkName ?state.orderInfo.orderInfoExt.exchangeRgNetworkName: ''}}</text>
 									</view>
 								</template>
 								<template v-if="state.orderInfo.orderInfoExt.exchangeRgMode === 'MAIL'">
 									<view class="d-row">
 										<text class="d-label">收件人姓名：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.consignee ?? ''}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.consignee ?state.orderInfo.orderInfoExt.consignee: ''}}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">收件人电话：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.consigneeTel ?? ''}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.consigneeTel ?state.orderInfo.orderInfoExt.consigneeTel: ''}}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">收件人地址：</text>
@@ -316,7 +316,7 @@
 									</view>
 									<view class="d-row">
 										<text class="d-label">邮政编码：</text>
-										<text class="d-value">{{state.orderInfo.orderInfoExt.postalCode ?? ''}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.postalCode ?state.orderInfo.orderInfoExt.postalCode: ''}}</text>
 									</view>
 								</template>
 							</template>
@@ -325,7 +325,7 @@
 							<template v-if="state.orderInfo.orderInfoExt.exchangeMode === 'OFFLINE'">
 								<view class="d-row">
 									<text class="d-label">退货网点：</text>
-									<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeNetworkName ?? ''}}</text>
+									<text class="d-value">{{state.orderInfo.orderInfoExt.exchangeNetworkName ?state.orderInfo.orderInfoExt.exchangeNetworkName: ''}}</text>
 								</view>
 							</template>
 							<view class="d-row">
@@ -338,7 +338,7 @@
 							</view>
 						</view>
 
-						<!-- 已完成订单的售后??怎么判断 -->
+						<!-- 已完成订单的售后怎么判断 -->
 						<!-- TODO 已完成订单存在售后信息的要显示售后信息，但是不知道用什么字段来来判断已完成订单有没有售后信息及哪一种售后信息，需走完订单所有流程在进行测试修改 -->
 					</view>
 				</view>
@@ -476,7 +476,7 @@
 	
 	//是否有售后信息
 	const isHaveAfterSaleInfo = () =>{
-		if(isBlank(state.orderInfo.orderInfoExt.returnMode ?? null) && isBlank(state.orderInfo.orderInfoExt.exchangeMode ?? null)){
+		if(isBlank(state.orderInfo.orderInfoExt.returnMode ?state.orderInfo.orderInfoExt.returnMode: null) && isBlank(state.orderInfo.orderInfoExt.exchangeMode ?state.orderInfo.orderInfoExt.exchangeMode: null)){
 			return false;
 		}
 		return true;

subpackage/orders/order-details-obu.vue

@@ -17,14 +17,14 @@
 				<view class="center" style="flex: 1">
 					<view class="as-layout-horizontal">
 						<view class="name">{{
-              state.orderInfo.orderInfoExt.consignee ?? ""
+              state.orderInfo.orderInfoExt.consignee ?state.orderInfo.orderInfoExt.consignee: ""
             }}</view>
 						<view class="phone">{{
-              state.orderInfo.orderInfoExt.consigneeTel ?? ""
+              state.orderInfo.orderInfoExt.consigneeTel ?state.orderInfo.orderInfoExt.consigneeTel: ""
             }}</view>
 					</view>
-					<view class="addr">{{ state.orderInfo.orderInfoExt.region ?? "" }}
-						{{ state.orderInfo.orderInfoExt.address ?? "" }}
+					<view class="addr">{{ state.orderInfo.orderInfoExt.region ?state.orderInfo.orderInfoExt.region: "" }}
+						{{ state.orderInfo.orderInfoExt.address ?state.orderInfo.orderInfoExt.address: "" }}
 					</view>
 				</view>
 				<image :src="`${$imgUrl}applyCard/edit.png`" mode="" class="edit"
@@ -35,7 +35,7 @@
 		<view class="detail-box">
 			<view class="detail-header">
 				<image class="d-img" :src="`${$imgUrl}order/icon-star-green.png`"></image>
-				<text class="detail-name">{{ state.orderInfo.productName ?? "" }}</text>
+				<text class="detail-name">{{ state.orderInfo.productName ?state.orderInfo.productName: "" }}</text>
 			</view>
 			<view class="detail-content">
 				<view class="base-info-box">
@@ -74,13 +74,13 @@
 						<view class="d-row">
 							<text class="d-label">卡号：</text>
 							<text class="d-value">{{
-                state.orderInfo.insertTime ?? ""
+                state.orderInfo.insertTime ?state.orderInfo.insertTime: ""
               }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">卡状态：</text>
 							<text class="d-value">{{
-                state.orderInfo.insertTime ?? ""
+                state.orderInfo.insertTime ?state.orderInfo.insertTime: ""
               }}</text>
 						</view>
 					</view>
@@ -91,12 +91,12 @@
 						<view class="d-row">
 							<text class="d-label">售后单号：</text>
 							<text class="d-value">{{
-                state.orderInfo.orderId ?? "没有这个字段"
+                state.orderInfo.orderId ?state.orderInfo.orderId: "没有这个字段"
               }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">业务类型：</text>
-							<text class="d-value">{{ getOrderTypeName(state.orderInfo.orderType) ?? "" }}</text>
+							<text class="d-value">{{ getOrderTypeName(state.orderInfo.orderType) ?getOrderTypeName(state.orderInfo.orderType): "" }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单状态：</text>
@@ -107,13 +107,13 @@
 						<view class="d-row">
 							<text class="d-label">订单金额：</text>
 							<text class="d-value text-orange">{{
-                state.orderInfo.amount / 100 ?? "0.00"
+                state.orderInfo.amount / 100 ?state.orderInfo.amount / 100: "0.00"
               }}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">创建时间：</text>
 							<text class="d-value">{{
-                state.orderInfo.insertTime ?? ""
+                state.orderInfo.insertTime ? state.orderInfo.insertTime:""
               }}</text>
 						</view>
 
@@ -124,19 +124,19 @@
 								<view class="d-row">
 									<text class="d-label">发货时间：</text>
 									<text class="d-value">{{
-                    state.orderInfo.orderInfoExt.deliveryTime ?? ""
+                    state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime: ""
                   }}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">取消时间：</text>
 									<text class="d-value">{{
-                    state.orderInfo.orderInfoExt.cancelTime ?? ""
+                    state.orderInfo.orderInfoExt.cancelTime ?state.orderInfo.orderInfoExt.cancelTime: ""
                   }}</text>
 								</view>
 								<view class="d-row">
 									<text class="d-label">取消原因：</text>
 									<text class="d-value">{{
-                    state.orderInfo.orderInfoExt.cancelReason ?? ""
+                    state.orderInfo.orderInfoExt.cancelReason ?state.orderInfo.orderInfoExt.cancelReason: ""
                   }}</text>
 								</view>
 							</view>
@@ -150,7 +150,7 @@
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.payTime ?? ""
+                      state.orderInfo.orderInfoExt.payTime ? state.orderInfo.orderInfoExt.payTime:""
                     }}</text>
 									</view>
 								</view>
@@ -160,25 +160,25 @@
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.payTime ?? ""
+                      state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">发货时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.deliveryTime ?? ""
+                      state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">快递单号：</text>
 										<text class="d-value">{{
-                      state.orderInfo.trackingNumber ?? ""
+                      state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">物流公司：</text>
 										<text class="d-value">{{
-                      state.orderInfo.courierCompany ?? ""
+                      state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ""
                     }}</text>
 									</view>
 								</view>
@@ -188,31 +188,31 @@
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.payTime ?? ""
+                      state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime :""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">发货时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.deliveryTime ?? ""
+                      state.orderInfo.orderInfoExt.deliveryTime ?state.orderInfo.orderInfoExt.deliveryTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">收货时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.receivingTime ?? ""
+                      state.orderInfo.orderInfoExt.receivingTime ?state.orderInfo.orderInfoExt.receivingTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">快递单号：</text>
 										<text class="d-value">{{
-                      state.orderInfo.trackingNumber ?? ""
+                      state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">物流公司：</text>
 										<text class="d-value">{{
-                      state.orderInfo.courierCompany ?? ""
+                      state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ""
                     }}</text>
 									</view>
 								</view>
@@ -221,37 +221,37 @@
 									<view class="d-row">
 										<text class="d-label">付款时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.payTime ?? ""
+                      state.orderInfo.orderInfoExt.payTime ?state.orderInfo.orderInfoExt.payTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">发货时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.deliveryTime ?? ""
+                      state.orderInfo.orderInfoExt.deliveryTime ?orderInfo.orderInfoExt.deliveryTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">收货时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.orderInfoExt.receivingTime ?? ""
+                      state.orderInfo.orderInfoExt.receivingTime ?state.orderInfo.orderInfoExt.receivingTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">激活时间：</text>
 										<text class="d-value">{{
-                      state.orderInfo.cardEnableTime ?? ""
+                      state.orderInfo.cardEnableTime ?state.orderInfo.cardEnableTime: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">快递单号：</text>
 										<text class="d-value">{{
-                      state.orderInfo.trackingNumber ?? ""
+                      state.orderInfo.trackingNumber ?state.orderInfo.trackingNumber: ""
                     }}</text>
 									</view>
 									<view class="d-row">
 										<text class="d-label">物流公司：</text>
 										<text class="d-value">{{
-                      state.orderInfo.courierCompany ?? ""
+                      state.orderInfo.courierCompany ?state.orderInfo.courierCompany: ""
                     }}</text>
 									</view>
 								</view>
@@ -261,12 +261,12 @@
 						<!-- 增补OBU时展示字段 -->
 						<view class="d-row">
 							<text class="d-label">收货方式：</text>
-							<text class="d-value">{{ state.orderInfo.XXX ?? "" }}</text>
+							<text class="d-value">{{ state.orderInfo.XXX ?state.orderInfo.XXX: "" }}</text>
 						</view>
 						<!-- 如果是自提收的时候显示 -->
 						<view class="d-row" v-if="true">
 							<text class="d-label">自提网点：</text>
-							<text class="d-value">{{ state.orderInfo.XXX ?? "" }}</text>
+							<text class="d-value">{{ state.orderInfo.XXX ?state.orderInfo.XXX: "" }}</text>
 						</view>
 					</view>
 				</view>

subpackage/orders/order-evaluate-salesman.vue

@@ -29,8 +29,8 @@
 			<view class="user as-layout-horizontal">
 				<image class="avatar" :src="`${$imgUrl}default_head.png`" mode="aspectFill"></image>
 				<view class="user-info">
-					<view class="name">{{state.orderInfo.nickName ?? ''}}</view>
-					<view class="name">{{state.orderInfo.tell ?? ''}}</view>
+					<view class="name">{{state.orderInfo.nickName ?state.orderInfo.nickName: ''}}</view>
+					<view class="name">{{state.orderInfo.tell ?state.orderInfo.tell: ''}}</view>
 					<!-- <view class="name">张三</view>
 					<view class="name">18712345678</view> -->
 				</view>

subpackage/orders/order-evaluate.vue

@@ -20,8 +20,8 @@
 			<view class="user as-layout-horizontal">
 				<image class="avatar" :src="`${$imgUrl}default_head.png`" mode="aspectFill"></image>
 				<view class="user-info">
-					<view class="name">{{state.orderInfo.staffName ?? ''}}</view>
-					<view class="name">{{state.orderInfo.staffPhone ?? ''}}</view>
+					<view class="name">{{state.orderInfo.staffName ?state.orderInfo.staffName: ''}}</view>
+					<view class="name">{{state.orderInfo.staffPhone ?state.orderInfo.staffPhone: ''}}</view>
 				</view>
 			</view>
 			<evaluate-star v-model="state.user.score" title="进行评价"></evaluate-star>

subpackage/orders/order-v1.vue

@@ -29,7 +29,7 @@
 						<view class="head">
 							<view class="name">
 								<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-								<text class="title">{{item.productName ?? ''}}</text>
+								<text class="title">{{item.productName ?item.productName: ''}}</text>
 							</view>
 						
 							<template v-if="item.orderStatus == -1">
@@ -65,7 +65,7 @@
 									<text class="value">{{item.vehiclePlate}}</text>
 								</view>
 							</view>
-							<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?? '0.00'}}</text></view>
+							<view class="money"><text class="cny">￥</text><text class="amount">{{item.amount / 100 ?item.amount / 100: '0.00'}}</text></view>
 						</view>
 						
 						<template v-if="item.orderStatus != -1">

subpackage/orders/payment.vue

@@ -6,7 +6,7 @@
     <view class="money">
       <text class="money-title">需支付金额(元)</text>
       <text class="money-value"
-        >￥{{ state.orderData.amount / 100 ?? "0.00" }}</text
+        >￥{{ state.orderData.amount / 100 ?state.orderData.amount / 100: "0.00" }}</text
       >
     </view>
     <view class="bankcard">
@@ -177,7 +177,7 @@ const wxPayment = () => {
       orderInfo: "",
       timeStamp: data.timestamp,
       nonceStr: data.noncestr,
-      package: data.wxPackage ?? "",
+      package: data.wxPackage ?data.wxPackage: "",
       signType: data.signType,
       paySign: data.sign,
       success: function (e) {

subpackage/orders/product-detail.vue

@@ -188,7 +188,7 @@
 				orderInfo: "",
 				timeStamp: data.timestamp,
 				nonceStr: data.noncestr,
-				package: data.wxPackage ?? "",
+				package: data.wxPackage ?data.wxPackage: "",
 				signType: data.signType,
 				paySign: data.sign,
 				success: function(e) {

subpackage/personal-center/install-activation-order.vue

@@ -6,7 +6,7 @@
 			<view class="head">
 				<view class="name">
 					<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon"></image>
-					<text class="title">{{item.productName ?? ''}}</text>
+					<text class="title">{{item.productName ?item.productName: ''}}</text>
 				</view>
 				<view class="status text-orange">{{getOrderStatusName(item.orderStep)}}</view>
 			</view>
@@ -26,7 +26,7 @@
 					</view>
 					<view class="order-text ">
 						<text class="type">订单金额：</text>
-						<text class="value">￥ {{item.amount / 100 ?? '0.00'}}</text>
+						<text class="value">￥ {{item.amount / 100 ?item.amount / 100: '0.00'}}</text>
 					</view>
 				</view>
 			</view>

subpackage/personal-center/operation-upload.vue

@@ -9,7 +9,7 @@
 			</view>
 			<view class="item-right" @click="chooseImage(1)">
 				<view class="empty-node"></view>
-				<image :src="state.headstockImg ?? defHeadstockImg" :data-url="state.headstockImg ?? defHeadstockImg" ></image>
+				<image :src="state.headstockImg ?state.headstockImg: defHeadstockImg" :data-url="state.headstockImg ?state.headstockImg: defHeadstockImg" ></image>
 			</view>
 		</view>
 		<view class="item-row">
@@ -20,7 +20,7 @@
 			</view>
 			<view class="item-right" @click="chooseImage(2)">
 				<view class="empty-node"></view>
-				<image :src="state.installImg ?? defInstallImg" ></image>
+				<image :src="state.installImg ?state.installImg: defInstallImg" ></image>
 			</view>
 		</view>
 		<view class="hint">

subpackage/personal-center/setting/car-information/car-card.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="item-right" @click="chooseImage(1)">
 				<view class="empty-node"></view>
-				<image :src="state.headstockImg ?? defHeadstockImg" :data-url="state.headstockImg ?? defHeadstockImg">
+				<image :src="state.headstockImg ?state.headstockImg: defHeadstockImg" :data-url="state.headstockImg ?state.headstockImg: defHeadstockImg">
 				</image>
 			</view>
 		</view>
@@ -20,7 +20,7 @@
 			</view>
 			<view class="item-right" @click="chooseImage(2)">
 				<view class="empty-node"></view>
-				<image :src="state.installImg ?? defInstallImg"></image>
+				<image :src="state.installImg ?state.installImg: defInstallImg"></image>
 			</view>
 		</view>
 		<view class="btn">

subpackage/personal-center/setting/car-information/car-manage.vue

@@ -62,7 +62,7 @@
 			</view>
 			<view class="item-right">
 				<view class="empty-node"></view>
-				<image :src="state.installImg ?? defInstallImg"></image>
+				<image :src="state.installImg ?state.installImg: defInstallImg"></image>
 			</view>
 		</view> -->
 		<!-- 		<view class="btn">

subpackage/personal-center/trajectory/trajectory.vue

@@ -67,7 +67,7 @@
 	import {request} from "@/utils/network/request.js";
 	import {stringToJson} from "@/utils/network/encryption.js";
 	import { onLoad} from "@dcloudio/uni-app";
-	import {} from "@/utils/network/api.js";
+	import {orderList} from "@/utils/network/api.js";
 	const state = reactive({
 		array: ['贵Z11111', '贵Z22222'],
 		index: 0,

subpackage/service/search/etcFlowingWater.vue

@@ -142,7 +142,7 @@
 			console.log(res);
 			let result = stringToJson(res.bizContent)
 			console.log(result);
-			state.list = result.data ?? []
+			state.list = result.data ?result.data: []
 			console.log(result.data);
 
 			// let orderInfo = JSON.parse(res.bizContent);
@@ -162,9 +162,9 @@
 		};
 		request(passBillCount, options).then((res) => {
 			let result = stringToJson(res.bizContent)
-			state.aggregateAmount = result.aggregateAmount ?? 0
-			state.passTotal = result.passTotal ?? 0
-			state.parkTotal = result.parkTotal ?? 0
+			state.aggregateAmount = result.aggregateAmount ?result.aggregateAmount: 0
+			state.passTotal = result.passTotal ? result.passTotal: 0
+			state.parkTotal = result.parkTotal ?result.parkTotal: 0
 			console.log(result);
 		})
 	}

subpackage/service/search/select-card.vue

@@ -74,7 +74,7 @@
 		};
 		request(cardList, options).then((res) => {
 			let result = stringToJson(res.bizContent);
-			state.cards = result.cards ?? null;
+			state.cards = result.cards ?result.cards: null;
 			console.log(result.cards);
 		})
 	}

utils/utils.ts

@@ -17,7 +17,7 @@ export const confirm = (content: string, callback: Function, title: string = "",
 	uni.showModal({
 		title: title,
 		content: content,
-		showCancel: showCancel ?? true,
+		showCancel: showCancel ? showCancel : true,
 		confirmText: confimTxt,
 		success: function(res) {
 			if (res.confirm) {
@@ -226,7 +226,7 @@ export const getOrderTypeName = (orderType = 'ISSUE') => {
 }
 
 //根据车辆类型获取车辆名称
-export const getCarTypeName = (carType:any) => {
+export const getCarTypeName = (carType: any) => {
 	switch (carType) {
 		case 1:
 			return '客车';