2025年7月21日11:04:10

composables/order/useOrderSkip.ts

@@ -109,7 +109,7 @@ export default function useOrderSkip() {
 			obuId: orderInfo.obuId,
 		}
 		console.log('orderInfo==',orderInfo)
-		navTo(`/subpackage/orders/ord	er-confirm-receipt?id=${orderInfo.orderNo}`)
+		navTo(`/subpackage/orders/order-confirm-receipt?id=${orderInfo.orderNo}`)
 		// })
 	}
 

pages/index/index.vue

@@ -509,13 +509,8 @@
 		requestNew(infoQuery, options)
 			.then((res) => {
 				let data = res
-<<<<<<< HEAD
-				state.notice = data.text
-				console.log(data, state.notice, '公告', state.notice == '无');
-=======
 				state.notice=data.list[0].text
 				console.log(data, state.notice, '公告',state.notice=='无');
->>>>>>> 411a8fa6537e0c27d4f7c09b41367b8b40793b0a
 			})
 			.catch((err) => {
 				console.log(err, '错误');

utils/network/api.js

@@ -418,10 +418,6 @@ export const infoQuery = "/iaw/api/promptText/query"; //8.212.文本信息查询
 export const querySwiper = "/iaw/api/flash/querySlideShow"; //MTS-轮播图查询所有启用信息
 export const queryHighMsg = "/iaw/api/address/highspeednewsflashqiery" //高速快讯查询接口
 //字典
-<<<<<<< HEAD
-// export const queryKey = '/iaw/api/afterSale/comm/listDict' //全量KEY
-=======
->>>>>>> 411a8fa6537e0c27d4f7c09b41367b8b40793b0a
 export const queryKey = '/iaw/api/dic/itemGetAll' //全量KEY
 export const outletList = '/iaw/api/afterSale/comm/queryServiceHall'; //根据机构号获取服务网点信息
 // 登录模块
@@ -437,7 +433,8 @@ export const userInfoIndex = "/iaw/portal/findAccountInfoByToken"; //USER-获取
 export const appPage = "/iaw/issue/order/wchatorderapppage" //app分页
 export const orderinfosumquery = "/iaw/issue/order/orderinfosumquery" //个人订单信息数据查询(待发货，待收货，待激活，退换货)
 //菜单配置
-export const queryMenuConfig = '/iaw/rbac/menuListBySystemTypeAndOpenId'
+// export const queryMenuConfig = '/iaw/rbac/menuListBySystemTypeAndOpenId'
+export const queryMenuConfig = '/iaw/portal/menuListBySystemTypeAndOpenId'
 // export const getGlobalParam = "/iaw/rbac/portalConfigLoginSource" //全局配置
 export const getGlobalParam = "/iaw/api/protalConfig/getPortalConfig" //全局配置--获取门户信息
 export const updateTokenNew = "/iaw/portal/phoneLogin"; //统一会员平台登录确认接口（用于换取openId和token）

utils/utils.ts

@@ -420,15 +420,9 @@ export const strReplace = (str : string) => {
 
 //增加图片路径
 export const imgPathMontage = (str : string) => {
-<<<<<<< HEAD
-	let imgUrl = `${envs[process.env.NODE_ENV].baseUrl}/${str}`;
-	// return imgUrl;
-	return str;
-=======
 	// let imgUrl = `${envs[process.env.NODE_ENV].baseUrl}/${str}`;
 	let imgUrl = `${str}`;
 	return imgUrl;
->>>>>>> 411a8fa6537e0c27d4f7c09b41367b8b40793b0a
 }
 // 身份证号脱敏
 export const desensitization = (val) => {