feat:提交代码，完成花费充值相关开发

src/apis/user.ts

@@ -237,10 +237,21 @@ enum API {
 	AUTH_VERIFY ='/api/auth/verify',
 	//提现
 	EXTRACT_CREATE='/api/user/extract/create',
+	//获取话费数据
+	HUAFEI_RECORD ='/api/huafei/record',
 	
-	
 }
 
+export function apiGetHuafeiList(data:any) {
+    return defHttp.post({
+        url: API.HUAFEI_RECORD,
+		data:{
+			limit:10,
+		page:data.page}
+    })
+}
+
+
 export function apiExtractCreate(data:any) {
     return defHttp.post({
         url: API.EXTRACT_CREATE,

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -3,6 +3,7 @@ import { authAppletPhone, bindPhone, getUserUnionId } from "~/apis/user";
 import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 const userStore = useUserStore()
+let openId =''
 const props = defineProps({
   text: {
     type: String,
@@ -29,6 +30,7 @@ function getPhoneNumber(e) {
             encryptedData: e.detail.encryptedData,
             iv: e.detail.iv,
           }
+		  openId= unionRes.openid
           if (shareId) {
             params.share_id = shareId
           }
@@ -45,6 +47,7 @@ function getPhoneNumber(e) {
             userStore.login(authRes.token, authRes.exp)
             userStore.setUID(authRes.user.uid)
             userStore.setUserInfo(authRes.user)
+			console.log("===unionRes",unionRes);
 
             // 绑定手机号
             bindPhone({
@@ -52,7 +55,7 @@ function getPhoneNumber(e) {
               sms: 1,
               sms_code: '1024',
               password: '12345678',
-              third_user_id: unionRes.unionid,
+              third_user_id: openId,
               type: 1
             }).then(bindRes => {
               Cache.clear('SHARE_ID')

src/pages/my-rules/index.vue

@@ -4,7 +4,7 @@ import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
 
 import { encodePhone } from "../../utils";
 import { getAgentInfo, getRules, getUserInfo } from "~/apis/user";
-import { CDM_URL ,ICON_CDN_URL} from '~/config/app';
+import { CDM_URL ,IMG_CDN_NEW_URL} from '~/config/app';
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -38,20 +38,20 @@ const userType = computed(() => {
   // console.log('我是大哥',userStore.userInfo)
   const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
   // console.log('我是帮扶',bangfu);
-
+ 
   // 普通用户
   if (userRichType == 0) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return [ICON_CDN_URL+'用户.png']
+    return [IMG_CDN_NEW_URL+'用户.png']
   }
   // 会员
   if (userRichType == 1) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return [ICON_CDN_URL+'会员.png']
+    return [IMG_CDN_NEW_URL+'会员.png']
 
   }
   // 创始人
@@ -59,7 +59,7 @@ const userType = computed(() => {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return [ICON_CDN_URL+'创始人.png']
+    return [IMG_CDN_NEW_URL+'创始人.png']
   }
   // 合伙人
   if (userRichType == 4) {
@@ -67,19 +67,19 @@ const userType = computed(() => {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return [ICON_CDN_URL+'高级会员.png']
+    return [IMG_CDN_NEW_URL+'高级会员.png']
   }
   if (userRichType == 8) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return [ICON_CDN_URL+'合伙人.png']
+    return [IMG_CDN_NEW_URL+'合伙人.png']
   }
   if (userRichType == 9) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return [ICON_CDN_URL+'联合创始人.png']
+    return [IMG_CDN_NEW_URL+'联合创始人.png']
   }
   if (!userRichType) {
     // if (bangfu) {

src/pages/payment/index.vue

@@ -15,7 +15,7 @@ const state = reactive({
   orderId: '',
   code: '',
   memberType: 0,
-
+  initType:0,
   tabIndex: Number.NaN,
 })
 onLoad((options) => {
@@ -26,6 +26,7 @@ onLoad((options) => {
     state.orderList = options.OrderList
     state.payPrice = options.pay_price
     state.orderId = options.order_id
+	state.initType =options.initType
 
     console.log('options')
     console.log(options)
@@ -80,6 +81,13 @@ function handleConfirm() {
 }
 
 function onClickLeft() {
+	
+	if(	state.initType==1){
+	 uni.navigateBack({
+	   delta: 1,
+	 })
+		return
+	}
   uni.showModal({
     title: '确认要离开收银台?',
     content: '您的订单在24小时内未支付将被取消，请尽快完成支付。',

src/pages/user/index.vue

@@ -226,29 +226,29 @@
 		// 普通用户
 		if (userRichType == 0)
 
-			return ICON_CDN_URL+'用户.png'
+			return IMG_CDN_NEW_URL+'用户.png'
 
 		// 会员
 		if (userRichType == 1)
 
-			return ICON_CDN_URL+'会员.png'
+			return IMG_CDN_NEW_URL+'会员.png'
 
 		if (userRichType == 3)
 
-			return ICON_CDN_URL+'创始人.png'
+			return IMG_CDN_NEW_URL+'创始人.png'
 
 		// 高级会员
 		if (userRichType == 4)
 
-			return ICON_CDN_URL+'高级会员.png'
+			return IMG_CDN_NEW_URL+'高级会员.png'
 
 		if (userRichType == 8)
 
-			return ICON_CDN_URL+'合伙人.png'
+			return IMG_CDN_NEW_URL+'合伙人.png'
 
 		if (userRichType == 9)
 
-			return ICON_CDN_URL+'联合创始人.png'
+			return IMG_CDN_NEW_URL+'联合创始人.png'
 
 		if (!userRichType)
 
@@ -266,7 +266,7 @@
 			return ''
 		// 股东
 		if (stockholder == 1)
-			return ICON_CDN_URL+'股东.png'
+			return IMG_CDN_NEW_URL+'股东.png'
 	})
 	// '':普通用户 district-区/县代 city-市代',
 	const areaType = computed(() => {
@@ -473,7 +473,7 @@
 							<div class="group_2 flex-col lolr ">
 								<div class="div_box pong1 ">
 									<div class="blue_1">
-										<image lazy-load class="off_3" :src="ICON_CDN_URL+'DLqy.png'" />
+										<image lazy-load class="off_3" :src="IMG_CDN_NEW_URL+'DLqy.png'" />
 										<span class="pan">代理区域</span>
 									</div>
 									<div class="blue_2 height1 ">
@@ -482,7 +482,7 @@
 								</div>
 								<div class="div_box pong2 ">
 									<div class="blue_1">
-										<image lazy-load class="off_3" :src="ICON_CDN_URL+'QYDL.png'" />
+										<image lazy-load class="off_3" :src="IMG_CDN_NEW_URL+'QYDL.png'" />
 										<span class="pan">代理权益</span>
 									</div>
 									<div class="block_1 flex-col blue_2 height2 ">
@@ -499,7 +499,7 @@
 							</div>
 						</div>
 						<div class="off_1" @click="onCancel">
-							<image lazy-load class="off_2" src="../../static/img-hy/关闭.png" />
+							<image lazy-load class="off_2" :src="IMG_CDN_NEW_URL+'关闭.png'" />
 						</div>
 					</FPopup>
 				</div>

src/pages/user/login/index.vue

@@ -82,7 +82,7 @@ async function handleWexinLogin() {
         // params.share_id = shareId
         // params = Object.assign({}, params, { shareId })
         // }
-        wechatCheck(unionRes.unionid).then((checkRes) => {
+        wechatCheck(unionRes.openid).then((checkRes) => {
           userStore.login(checkRes.token, checkRes.exp)
           userStore.setUID(checkRes.user.uid)
           userStore.setUserInfo(checkRes.user)
@@ -163,7 +163,7 @@ async function handleWexinLogin() {
 
             setTimeout(() => {
               uni.navigateTo({
-                url: `/pages/user/login/bind-phone?type=1&third_user_id=${unionRes.unionid}&key=0`,
+                url: `/pages/user/login/bind-phone?type=1&third_user_id=${unionRes.openid}&key=0`,
               })
             }, 1000)
           }

src/subPages/pages/order/index.vue

@@ -202,8 +202,6 @@ function onClickLeft() {
       uni.navigateBack()
     }
   } else {
-    // uni.navigateBack({
-    // })
     uni.switchTab({
       url: '/pages/user/index'
     })

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

@@ -59,8 +59,15 @@
 	}
 	
 	function onHistoryClick(){
-		
+		uni.navigateTo({url:'/subPages/pages/phone-bill/list'})
+	}
+	
+	function isValidChineseMobile(phone) {
+	    const regex = /^1[3-9]\d{9}$/;
+	    return regex.test(phone);
 	}
+	 
+	
 	
 	function onSubmitClick(){
 		
@@ -72,9 +79,17 @@
 			})
 			 return
 		}
+		if(!isValidChineseMobile(phoneNum.value)){
+			uni.showToast({
+				title:'请输入正确手机号',
+				icon:'none'
+			})
+			 return
+		}
+		
 		apiRecharge(phoneNum.value,tabList.value[currentIndex.value ].money).then(res=>{
 				uni.navigateTo({
-					url: '/pages/payment/index?' + `pay_price=${tabList.value[currentIndex.value ].money}&order_id=${res.oid}&OrderList=${JSON.stringify({group_order_sn:order_sn})}`,
+					url: '/pages/payment/index?' + `initType=1&pay_price=${tabList.value[currentIndex.value ].money}&order_id=${res.oid}`,
 				})
 		})
 	}

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

@@ -0,0 +1,141 @@
+<template>
+	<view class="contribute-container">
+		<view @click='onItemClick(item)' v-if="listInfo && listInfo.length!=0" class="phone-item-out" :key="'phone-item-'+index" v-for="(item,index) in listInfo">
+			<text class="phone">{{item.mobile}}</text>
+			<view class="phone-item">
+				<text class="price">充值金额:{{item.pay_money}}</text>
+				<text class="phone">{{dealType(item.status)}}</text>
+			</view>
+			<text class="data">{{item.create_time}}</text>
+			<view  class="item-line"></view>
+		</view>
+		<CXBEmpty v-else />
+	</view>
+</template>
+
+<script setup>
+	
+	import {
+		apiGetHuafeiList
+	} from '~/apis/user'
+	import {formatDate} from '~/utils/util'
+	import { getProductShare } from "~/apis/common";
+	import { useUserStore } from '~/stores/userStore'
+	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+	import{IMG_CDN_URL} from '~/config/app.ts'
+	
+	const currentIndex = ref(0)
+	const count=ref(1)
+    
+	const listInfo=ref([])
+	const state = reactive({
+		page :1
+	})
+	
+	onLoad((option) => {
+		getList()
+	})
+	
+	function onItemClick (item){
+		if(item.type==0){
+			// uni.navigateTo({
+			// 	url: '/pages/payment/index?' + `initType=1&pay_price=${tabList.value[currentIndex.value ].money}&order_id=${res.oid}`,
+			// })
+		}
+	}
+	
+	function dealType(types){
+		let type=''
+		if(types==0){
+			type='待支付'
+		}else if(types==1){
+			type='充值中'
+		}else if(types==2){
+			type='充值成功'
+		}else if(types==3){
+			type='充值失败'
+		}
+		return type
+	}
+	
+	function getList(){
+		uni.showLoading({
+			title:'加载中...'
+		})
+	    apiGetHuafeiList({page:state.page}).then(res => {
+			console.log("+==",res);
+	    	listInfo.value= res.list
+			count.value = res.count
+			uni.hideLoading()
+	    })
+	}
+	
+	
+	onReachBottom(() => {
+		if(dataList.value.length <count.value ){
+			state.page += 1
+			getList()
+		}
+	})
+	
+	onPullDownRefresh(() => {
+	   state.page=1
+	   getList()
+	   uni.stopPullDownRefresh()
+	})
+	
+</script>
+
+<style lang="scss" scoped>
+	.contribute-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #fff;
+		box-sizing: border-box;
+		position: relative;
+		
+		.phone-item-out{
+			display: flex;
+			flex-direction: column;
+			padding-left: 20rpx;
+			box-sizing: border-box;
+			padding-right: 20rpx;
+			
+			.phone{
+				font-size: 28rpx;
+				color:#333;
+				margin-bottom: 20rpx;
+				margin-top: 20rpx;
+			}
+			.price{
+				font-size: 28rpx;
+				color:#333;
+				margin-bottom: 24rpx;
+				flex: 1;
+			}
+			.phone-item{
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+			}
+			.data{
+				font-size: 26rpx;
+				color:#999;
+				margin-bottom: 20rpx;
+			}
+			.item-line{
+				height: 2rpx;
+				width: 100%;
+				background-color: #f8f8f8;
+			}
+		}
+		
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 充值记录
+  enablePullDownRefresh: true
+</route>

uni-pages.d.ts

@@ -110,6 +110,7 @@ interface NavigateToOptions {
        "/subPages/pages/order/third-order" |
        "/subPages/pages/pension_account/index" |
        "/subPages/pages/phone-bill/index" |
+       "/subPages/pages/phone-bill/list" |
        "/subPages/pages/quick-fuc/business" |
        "/subPages/pages/quick-fuc/life" |
        "/subPages/pages/quick-fuc/shop" |