feat:提交代码

src/apis/user.ts

@@ -50,6 +50,8 @@ enum API {
     GET_YANGLAO_LOG = '/api/user/yanglaolog',
     // 获取用户信息
     USER = '/api/user',
+	// 获取用户信息
+	USER_TOKEN = '/api/tokenList',
     // 个人资料编辑
     UPDATE_USER = '/api/user/update/user',
     // 获取协议
@@ -1019,7 +1021,14 @@ export function getYanglaojinStatistics(): Promise<YanglaoStatisticsResult> {
         url: API.GET_YANGLAOJIN_STATISTICS,
     })
 }
-
+/**
+ * 获取用户信息
+ */
+export function apiGetUserToken(){
+    return defHttp.post({
+        url: API.USER_TOKEN
+    })
+}
 /**
  * 获取用户信息
  */

src/pages/home/components/header.vue

@@ -31,8 +31,9 @@
 		// return propsHeight || defaultHeight
 		return defaultHeight
 	})
+	const heightInfo = ref({height:`${menuButtonInfo.bottom*2+164}rpx`})
 	const currentIndex=ref(0)
-
+    
 	const navBarStyle = computed(() => {
 		return {
 			paddingTop: `${statusBarHeight}px`,
@@ -91,22 +92,10 @@
 </script>
 <template>
 	<div class="home-header-content home-header fixed w-screen text-white z-10" :style="navBarStyle">
-		<image  class="top-bg" :src="topBannerBg" mode="widthFix"></image>
+		<image  class="top-bg" :src="topBannerBg" mode="aspectFill" :style="heightInfo"></image>
+<!-- 		<image  class="top-bg-x" :src="topBannerBg" mode="aspectFill"  :style="mHeightInfo"></image> -->
 		<div class="flex user-info">
 			<div @click="handleClick" class="flex gap-2 mb-2 pl-2 flex-1">
-				<!-- <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar"
-					:src="userStore.userInfo.avatar" style="width:74rpx; height:74rpx;" class="rounded-full" />
-				<image v-else src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix"
-					class="w-9 h-9 rounded-full" />
-				<div class="flex flex-col ">
-					<div class="text-sm" v-if="userStore &&userStore.userInfo && userStore.userInfo.nickname">{{ userStore.userInfo.nickname ?
-            userStore.userInfo.nickname : '登录' }}</div>
-					<div class="text-sm" v-else>登录</div>
-					<div class="text-xs" v-if="!isNaN(yanglaojin) && userStore &&userStore.userInfo">{{ yanglaojin }}元养老金</div>
-					<div v-else class="text-xs">
-						领取养老金
-					</div>
-				</div> -->
 				<image @click="handleShowMessage" :src="IMG_CDN_NEW_URL+'icon_msg_white.png'" mode="widthFix" class="w-6 h-6" ></image>
 			</div>
 			<div class=" right-26 flex flex-col text-[10px] justify-center items-center " 
@@ -124,9 +113,6 @@
 						class="w-5 h-5  pl-2 py-1"></image>
 					<div class="flex flex-1 w-100%">
 						<div class="flex-1 guand ">输入商品名称查找全球好货</div>
-						<!-- <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center p-1.5  mr-0.5 ">
-							搜索
-						</div> -->
 					</div>
 				</div>
 			</div>
@@ -174,6 +160,7 @@
 		flex-direction: row;
 		align-items: center;
 		margin-top: 20rpx;
+		z-index: 9999999;
 
 		.lab-item {
 			display: flex;
@@ -230,9 +217,15 @@
 
 	.top-bg {
 		width: 100%;
-		height: 100rpx;
 		position: absolute;
 		top: 0;
 		left: 0;
 	}
+	.top-bg-x {
+		width: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		height: 180rpx;
+	}
 </style>

src/pages/home/index.vue

@@ -103,7 +103,7 @@
 		let res = uni.getSystemInfoSync();
 		let custom = uni.getMenuButtonBoundingClientRect() //胶囊按钮位置信息
 		let navBarHeight = (custom.top - res.statusBarHeight) * 2 + custom.height //计算得出导航栏高度
-		navBarStyle.value = { marginTop: `${res.statusBarHeight + navBarHeight}px` }
+		navBarStyle.value = { marginTop: `${custom.bottom *2 +156}rpx` }
 	}
 
 	function checkSignIn() {
@@ -114,8 +114,6 @@
 			if (today === 0)
 				state.isShowSignIn = true
 			state.day = day
-
-			
 		}).catch((error) => {
 			console.error(`${error}->GetNewsSignInInfo`)
 		})
@@ -387,7 +385,6 @@
 		<CXBBackTop :Scroll_X="Scroll_X" :is-css="1" />
 		<Header @onTabClick='onHeadTabClick' :yanglaojin="state.all_yanglao" :ex-class="headerClass" />
 		<div class="page-content " :style="navBarStyle">
-			<view class="empty-height"/>
 			<view class="" v-if="currentTopIndex==0">
 				<div class="swiper-content">
 					<view class="swiper-bg"></view>

src/pages/user/index.vue

@@ -1,13 +1,14 @@
 <script lang="ts" setup>
 	import type { Ref } from 'vue'
 	import { useUserStore } from '~/stores/userStore'
-	import { getUserInfo } from '~/apis/user'
+	import { getUserInfo ,apiGetUserToken} from '~/apis/user'
 	import { CDM_URL, CDN_URL,IMG_CDN_NEW_URL,ICON_CDN_URL } from '~/config/app'
 	import { totalOrderNumber } from '~/apis/order.api'
 	import type { OrderQuantityModel } from '~/apis/model/order.model'
 	import FPopup from '~/components/FPopup/FPopup.vue'
 	const pageStore = usePageStoreWidthOut()
 	const userStore = useUserStore()
+	const userTokenInfo =ref()
 	const currentType = ref('')
 	const myOrderList = [{
 		id: 'noPay',
@@ -80,11 +81,18 @@
 		icon: `${CDN_URL}/static/assets/invite_friends_221023.png`,
 		text: '邀请好友',
 		url: '/pages/invite-friends/index',
-	}, {
+	},
+	// {
+	// 	icon: `${CDN_URL}/static/assets/dianpuruzhu_220620.png`,
+	// 	text: userStore.userInfo?.is_merchant == '-1' ? '店铺入驻' : '我的店铺',
+	// 	url: '',
+	// }, 
+	{
 		icon: `${CDN_URL}/static/assets/dianpuruzhu_220620.png`,
-		text: userStore.userInfo?.is_merchant == '-1' ? '店铺入驻' : '我的店铺',
+		text: '店铺管理',
 		url: '',
-	}, {
+	}, 
+	{
 		icon: `${CDN_URL}/static/assets/mine_setting_220620.png`,
 		text: '设置',
 		url: '/pages/setting/index',
@@ -99,6 +107,7 @@
 	onShow(() => {
 		if (uni.getStorageSync('UID')) {
 			getUserInfoX()
+			getUserToken()
 			totalOrderNumber().then((res) => {
 				orderQuantity.value = res
 			})
@@ -121,6 +130,11 @@
 			userInfo.value = res
 		})
 	}
+	function getUserToken(){
+		apiGetUserToken().then(res=>{
+			userTokenInfo.value =res
+		})
+	}
 
 	function checkAuth() {
 		uni.navigateTo({
@@ -135,19 +149,34 @@
 		if (uni.getStorageSync('UID')) {
 			console.log('进来了1')
 			console.log(item.text)
-			if (item.text === '店铺入驻' || item.text === '我的店铺') {
-				return uni.navigateToMiniProgram({
-					appId: 'wx9a3e4ab07f8a9ba2',
-					path: 'pages/index/index',
-					success(res) {
-						// 打开成功
-						console.log(res)
-					},
-					fail: (error) => {
-						console.log('error = ', error)
-					},
+			// if (item.text === '店铺入驻' || item.text === '我的店铺') {
+			// 	return uni.navigateToMiniProgram({
+			// 		appId: 'wx9a3e4ab07f8a9ba2',
+			// 		path: 'pages/index/index',
+			// 		success(res) {
+			// 			// 打开成功
+			// 			console.log(res)
+			// 		},
+			// 		fail: (error) => {
+			// 			console.log('error = ', error)
+			// 		},
+			// 	})
+			// }
+			console.log("==userTokenInfo",userTokenInfo.value);
+			let _token  = userTokenInfo.value
+			console.log("===_token",_token);
+			if (item.text === '店铺管理' ) {
+				let url =`https://api.hxxfb.com/mweb/#/?data=${encodeURIComponent(JSON.stringify(userTokenInfo.value.mweb_info))}`
+				let info ={
+					url:url,
+					name:'店铺管理'
+				}
+				uni.navigateTo({
+					url:`/subPages/pages/mine-top/common-webView?info=${encodeURIComponent(JSON.stringify(info))}`
 				})
+				return 
 			}
+			
 
 			uni.navigateTo({
 				url: item.url,

src/subPages/pages/mine-top/common-webView.vue

@@ -8,6 +8,7 @@
 		if(option.info){
 			let data =  JSON.parse(decodeURIComponent(option.info)) 
 			url.value =data.url
+			console.log("===url.value ",url.value );
 			title.value = data.name
 		}
 		uni.setNavigationBarTitle({

src/subPages/pages/mine-top/jifen.vue

@@ -86,6 +86,7 @@
 			}
 		})
 	}
+	
 	function getInfo(){
 			apiGetJFInfo().then(res=>{
 				dataInfo.value= res

src/subPages/pages/phone-bill/list.vue

@@ -54,7 +54,27 @@
 			type='充值成功'
 		}else if(types==3){
 			type='充值失败'
+		}else if(types==4){
+			type='充值失败'
+		}else if(types==5){
+			type='已超时'
+		}else if(types==6){
+			type='待充值'
+		}else if(types==7){
+			type='已匹配 '
+		}else if(types==8){
+			type='已存单'
+		}else if(types==9){
+			type='已取消'
+		}else if(types==10){
+			type='返销'
+		}else if(types==11){
+			type='部分到账'
+		}else if(types==12){
+			type='取消中'
 		}
+		
+		
 		return type
 	}
 	

src/subPages/pages/quick-fuc/business.vue

@@ -187,6 +187,7 @@
 <style lang="scss" scoped>
 	.business-container {
 		display: flex;
+		padding-bottom: 60rpx;
 		flex-direction: column;
 		min-height: 100VH;
 		background-color: #f8f8f8;
@@ -217,7 +218,7 @@
 				height: 230rpx;
 				border-top-right-radius: 20rpx;
 				border-top-left-radius: 20rpx;
-				background-color: #333;
+				background-color: #999;
 			}
 
 			.goods-title {

src/utils/http/http.ts

@@ -49,13 +49,11 @@ export class VRequest {
             configTemp.url = `${urlPrefix}${configTemp.url}`
 
         const params = configTemp.params || {}
-		
-		console.log("===params",params);
 
         if (apiUrl && isString(apiUrl))
             configTemp.url = `${apiUrl}${configTemp.url}`
-			console.log("=== configTemp.url", configTemp.url);
-
+			console.log("===url", configTemp.url);
+            console.log("===data", configTemp.data);
         return new Promise((resolve, reject) => {
             uni.request({
                 url: configTemp.url,
@@ -63,7 +61,7 @@ export class VRequest {
                 method: configTemp.method?.toUpperCase() as UniApp.RequestOptions['method'],
                 header: configTemp.header || {},
                 success: (res) => {
-                    // console.log('我是res数据',res);
+                    console.log('===res数据',res);
                     const data = res.data as Result
                     const _message: string = data?.message ?? ''
 					
@@ -80,8 +78,6 @@ export class VRequest {
                         resolve(res.data as any)
                     }
                     else {
-						
-						console.log("===else",data);
                         //  这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
                         // @ts-expect-error
                         const { status: code, data: result, message } = data