feat:提交代码，

src/apis/model/common.model.ts

@@ -16,6 +16,7 @@ export enum KINGKONGKEY  {
 	SMZQ= 'SMZQ', //商贸专区
 	FGQ= 'FGQ', //复购区
 	SXY= 'SXY', //商学院
+	XFXD='XFXD',
 	JPSC= 'JPSC', //精品商城
 	XSMS= 'XSMS', //限时秒杀
 	LNZQ= 'LNZQ', //老年专区

src/apis/order.api.ts

@@ -73,6 +73,7 @@ enum API {
     // 三方订单
    // USER_THIRD_ORDER = '/api/user/third_order',
 	USER_THIRD_ORDER = '/api/user/third_order_bill',
+	USER_THIRD_NEW_ORDER = '/api/user/third_order',
     // 全部订单
     ORDER_ALL = '/api/order/all',
     // 获取微信支付小程序原始id和支付链接
@@ -225,6 +226,19 @@ export function getThirdOrder(params: { type: string, page: number, limit: 20 |
     })
 }
 
+/**
+ * 三方订单
+ * @param params
+ */
+export function getThirdOrderNew(params: { type: string, page: number, limit: 20 | number }): Promise<ThirdOrderResult> {
+    return defHttp.get({
+        url: API.USER_THIRD_NEW_ORDER,
+        data: {
+            ...params
+        }
+    })
+}
+
 // 检查大仓会员
 export function checkGroupOrder(id: string) {
     return defHttp.get({

src/apis/user.ts

@@ -54,6 +54,8 @@ enum API {
 	USER_TOKEN = '/api/tokenList',
     // 个人资料编辑
     UPDATE_USER = '/api/user/update/user',
+	// 修改密码
+	CHANGE_PWD = '/api/auth/reset',
     // 获取协议
     GET_XIEYI = '/api/xieyi/detail',
     GET_USER_UNION_ID = '/api/userMp/getUserUnionid',
@@ -242,6 +244,9 @@ enum API {
 	//获取话费数据
 	HUAFEI_RECORD ='/api/huafei/record',
 	
+	
+	
+	
 }
 
 export function apiGetHuafeiList(data:any) {
@@ -1038,6 +1043,19 @@ export function getUserInfo(): Promise<UserInfoModel> {
     })
 }
 
+
+/**
+ * 修改密码
+ * @param params
+ */
+export function apiChangePwd(params:any) {
+    return defHttp.post({
+        url: API.CHANGE_PWD,
+        data: {
+            ...params
+        }
+    })
+}
 /**
  * 更新用户信息
  * @param params

src/pages/home/components/navs.vue

@@ -63,6 +63,12 @@
 				})
 				break
 			}
+			case KINGKONGKEY.XFXD:{
+				uni.navigateTo({
+					url: `/subPages/pages/quick-fuc/store?id=3279&title=幸福小店`
+				})
+				break
+			}
 			case KINGKONGKEY.JD:
 			case KINGKONGKEY.PDD:
 			case KINGKONGKEY.WPH:

src/pages/home/constants.js

@@ -135,8 +135,8 @@ export const NAVS_HOT_ARR = [{
 	key: KINGKONGKEY.SXY,
 }, {
 	image: `${ICON_CDN_URL}icon_rx.png`,
-	title: '热销榜单',
-	key: KINGKONGKEY.RXBD,
+	title: '幸福小店',
+	key: KINGKONGKEY.XFXD,
 }, {
 	image: `${ICON_CDN_URL}icon_jd.png`,
 	title: '京东',

src/pages/order/components/AllItemList.vue

@@ -2,6 +2,7 @@
 import { getAllOrder } from "~/apis/order.api";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
+import OrderObligationItem from "~/pages/order/components/OrderObligationItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
 const props = defineProps({
@@ -142,8 +143,9 @@ onUnmounted(() => {
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
-        <OrderItem :receivegoods="0" :order-item="orderItem" v-if="orderItem.source == 7" />
-        <OtherOrderItem :item="orderItem" v-else />
+		  {{orderItem.status }}
+       <OrderItem :receivegoods="0" :order-item="orderItem" v-if="orderItem.source == 7" />
+		<OtherOrderItem :item="orderItem" v-else />
       </div>
       <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
         <div v-if="state.status === 'loading'">

src/pages/order/components/OrderObligationItem.vue

@@ -116,8 +116,30 @@ function handleCancelOrder() {
 
 function handlePayment() {
   const { orderItem } = props
+  console.log("====orderItem",orderItem);
+  
+let labItem = orderItem.fzone_paytype
+  let showPrice=''
+  if (labItem.type == 'b1') {
+  	showPrice = '￥' +labItem.price + 'VR+' + labItem.other + '积分'
+  } else if (labItem.type == 'b2') {
+  	showPrice = '￥' + labItem.price + '+' + labItem.other + '积分'
+  } else if (labItem.type == 'b3') {
+  	showPrice = '￥' + labItem.price + 'VR+' + labItem.other + '京豆'
+  } else if (labItem.type == 'b4') {
+  	showPrice = '￥' + labItem.price + '+' + labItem.other + '京豆'
+  }  else if (labItem.type == 'b5'|| labItem.type == 'a1') {
+  	showPrice = '￥' +labItem.price + 'VR'
+  } else if (labItem.type == 'b6' ||  labItem.type == 'a2') {
+  	showPrice= '￥' + labItem.price
+  }else if (labItem.type == 'c1') {
+  	showPrice = '￥' +labItem.price +  '复购金'
+  }else if(labItem.type == 'a3'){
+  	showPrice = '￥' + labItem.price +'+'+  labItem.other + 'VR'
+  
+  }
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}&OrderList=${JSON.stringify(orderItem)}&tabIndex=${props.tabValue}`
+    url: '/pages/payment/index?' + `pay_price=${showPrice}&order_id=${orderItem.group_order_id}&OrderList=${JSON.stringify(orderItem)}&tabIndex=${props.tabValue}`
     // url: `/pages/payment/index`
   })
 }

src/pages/order/index.vue

@@ -52,10 +52,11 @@ const state = reactive({
 const nomore = ref('')
 const toshow = ref(false)
 onLoad(options => {
-  console.log('我是options》》', options)
+  
   if (options && options.tabIndex) {
     state.tabvalue = options.tabIndex
   }
+  console.log('我是options》》', state.tabvalue)
   if (options && options.from) {
     state.from = options.from
   }

src/pages/payment/index.vue

@@ -72,15 +72,15 @@ function handleConfirm() {
     success(res) {
 		console.log("res===",res);
       // 打开成功
-      uni.showToast({
-        title: '跳转成功',
-      })
+      // uni.showToast({
+      //   title: '跳转成功',
+      // })
     },
     fail(err) {
       // 打开失败/取消
-      uni.showToast({
-        title: '跳转不成功',
-      })
+      // uni.showToast({
+      //   title: '跳转不成功',
+      // })
     },
   })
 }

src/pages/pension_choice_platform/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import {CDN_URL} from "~/config/app";
+import {CDN_URL,IMG_CDN_URL,ICON_CDN_URL} from "~/config/app";
 
 const list = [{
   title: '京东',
@@ -14,21 +14,17 @@ const list = [{
   title: '苏宁易购',
   icon: CDN_URL + '/static/assets/suningyigou_d.png'
 }, {
-  type: '5',
-  title: '淘宝',
-  icon: CDN_URL + '/static/assets/taobaoyanglao_d.png'
-}, {
-  type: '9',
-  title: '抖音',
-  icon: CDN_URL + '/static/assets/douyin_d_230313.png'
-}, {
   type: '1',
   title: '拼多多',
   icon: CDN_URL + '/static/assets/pinduoduo_d.png'
 }, {
   type: '90',
-  title: '华夏幸福保',
-  icon: CDN_URL + '/static/assets/cxb_logo_230316.png'
+  title: '幸福保',
+  icon: IMG_CDN_URL + 'logo_220607.png'
+}, {
+  type: '10',
+  title: '话费充值',
+  icon: ICON_CDN_URL + 'icon_recharge.png'
 }]
 
 function handleItemClick(item) {

src/pages/pension_record/list.vue

@@ -6,8 +6,10 @@ import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import {encodeBase64} from "~/utils/http/helper";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {searchProductList} from "~/apis/product";
+import {CDN_URL,IMG_CDN_URL,ICON_CDN_URL} from "~/config/app";
 
 const list = ref([])
+const defaultImg =ref(ICON_CDN_URL + 'icon_recharge.png')
 const state = reactive({
   type: '',
 
@@ -21,6 +23,8 @@ const state = reactive({
 })
 onLoad((options) => {
   state.type = options.type
+  
+  console.log("=== state.type",state.type);
   loadList('reload')
 })
 
@@ -272,7 +276,7 @@ function handleItemClick(item) {
           @tap="handleItemClick(item)"
           v-for="(item, index) in state.list" :key="index" class="bg-white rounded p-3 text-[12px]">
         <div class="flex items-center gap-3 text-[12px]">
-          <image :src="item.goods_img" mode="widthFix" class="w-15 h-15"></image>
+          <image :src="state.type==10?defaultImg:item.goods_img" mode="widthFix" class="w-15 h-15"></image>
           <div class="flex flex-col">
             <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.goods_name }}</div>
             <CXBYaojinTag :amount="item.yanglao"/>
@@ -287,7 +291,7 @@ function handleItemClick(item) {
           </div>
           <div class="flex justify-between items-center">
             <div>
-              养老金来源：购买商品
+              养老金来源：{{state.type==10?'话费充值':'购买商品'}}
             </div>
             <div class="flex items-center text-gray">
               <div>详情</div>

src/pages/setting/index.vue

@@ -5,7 +5,10 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {reLogin} from "~/apis/user";
 
 const modalVisible = ref(false)
-const list = [{
+const list =ref( [{
+  title: '设置密码',
+  url: '/subPages/pages/user/changePwd'
+},{
   title: '反馈回复',
   url: '/subPages/pages/feedback/index'
 }, {
@@ -29,15 +32,50 @@ const list = [{
 }, {
   title: '隐私协议',
   url: '/pages/webview/agreement?type=1'
+},{
+  title: '清除缓存',
+  url: '/pages/webview/agreement?type=1'
 }, {
   title: '账号注销',
   url: '/pages/account-cancel/index'
-}]
+}])
+
+onLoad(()=>{
+	let storageInfo = uni.getStorageInfoSync()
+	console.log(storageInfo)
+    console.log(storageInfo.currentSize)
+	list.value[9].title =`清除缓存(${storageInfo.currentSize}KB)`
+})
 
 function handleClick(item: any) {
-  uni.navigateTo({
-    url: item.url
-  })
+	if(item.title.indexOf('清除缓存')!=-1){
+		uni.showModal({
+			title:'温馨提示',
+			content:'是否清除本地缓存',
+			complete: (res) => {
+				if(res.confirm){
+					uni.showToast({
+					  title: '修改成功',
+					  icon: 'none'
+					}).then(() => {
+					  setTimeout(() => {
+						  uni.clearStorageSync()
+					    const userStore = useUserStore()
+					    userStore.logout()
+					    uni.switchTab({
+					        url: '/pages/home/index'
+					    })
+					  }, 200)
+					})
+				}
+			}
+		})
+	}else {
+		uni.navigateTo({
+		  url: item.url
+		})
+	}
+ 
 }
 
 function handleLogout() {

src/subPages/pages/order/third-order.vue

@@ -41,7 +41,7 @@
 </template>
 <script setup lang="ts">
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {getOrderListFromStatus, getThirdOrder} from "~/apis/order.api";
+import {getOrderListFromStatus, getThirdOrderNew} from "~/apis/order.api";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
@@ -163,7 +163,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     params.keyword = state.keyword
   }
 
-  getThirdOrder({
+  getThirdOrderNew({
     page: state.currentPage,
     limit: state.pageSize,
     type: state.type,

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

@@ -16,9 +16,14 @@
 				</view>
 			</view>
 			<text class="bottom-title">特别提醒:</text>
-			<text class="bottom-title">为了给大家带来更多的优惠，我们会结合三大运营商的市场政策，话费可能有阶段性的上下浮动，请大家多多理解~</text>
-			<text class="bottom-title">需要特别提醒大家，在充值时一定要仔细核对电话号码，一旦充错号码，费用无法追回，还望大家多多留意，避免给自己造成不必要的损失</text>
-			<text class="bottom-title">关于话费到账时间，一般时1-72小时内，若到账时间稍有延迟，也请您耐心等待</text>
+			<text class="bottom-title">1、为了给大家带来更多的优惠，我们会结合三大运营商的市场政策，话费可能会有阶段性的上下浮动，请大家多多理解。</text>
+			<text class="bottom-title">2、需要提别提醒大家，在充值时一定要仔细核对充值号码，一旦充错号码，费用无法追回，还望大家多多留意，避免给自己造成不必要的损失。</text>
+			<text class="bottom-title">3、不支持虚拟号，空号，携号转网，集团代充值号码，副卡充值，一旦提交无法修改，退款，不支持售后。</text>
+			<text class="bottom-title">4、如果同一个号码需要提交多笔充值，必须等前一笔充值成功才能提交下一笔，否则造成纠纷不做售后处理。</text>
+			<text class="bottom-title">5、若您已在我司提交充值,请勿再提交其他渠道充包括但不限于微信支付等渠道，否则售后不处理。</text>
+			<text class="bottom-title">6、月初月末订单量巨大，会导致充值到账延迟，并且会加长充值时间呢，请错峰提交。</text>
+			<text class="bottom-title">7、该充值为慢充，1~72小时到账，急用勿充。</text>
+			<text class="bottom-title">8、若发现充值话费72小时未到账，请及时与我们客服联系。</text>
 		</view>
 		
 		<view @click="onSubmitClick" class="bottom-btn">立即购买</view>
@@ -235,7 +240,7 @@
 			.bottom-title{
 				font-size: 26rpx;
 				color: #333;
-				margin-bottom: 30rpx;
+				margin-bottom: 10rpx;
 			}
 			.lab-content{
 				display: flex;

src/subPages/pages/store/product/other.vue

@@ -145,7 +145,7 @@ function mergeProductDetail(data: Partial<IProductDetail> = {}) {
 }
 function mergeProductDetailclone(data: Partial<IProductDetail> = {}) {
   detail.value = merge(detailclone.value, data)
-  // console.log(detail.value);
+  console.log("mergeProductDetailclone===",detail.value);
 }
 
 function loadProductDetail(product: Partial<IProductDetail>) {
@@ -278,8 +278,9 @@ function loadProductDetail(product: Partial<IProductDetail>) {
           images: product.goodsDetailPictures,
           mallName: '唯品自营',
           ...product,
-          ...res,
+          ...data,
         })
+		
         if (product.couponInfo) {
           mergeProductDetailclone({
             coupon: {

src/subPages/pages/user/about/index.vue

@@ -27,7 +27,7 @@ onLoad(() => {
     </div>
     <div class="absolute bottom-0 pb-safe w-full">
       <div class="text-center text-xs flex flex-col text-gray">
-        地址：北京市通州区北京经开壹中心14号楼<br />北京天地博爱科技有限公司 <br />客服电话：4000013088 <br />Email:tdba@tiandiboa
+        地址：北京市通州区经济技术开发区南区漷兴三街1号-B2178室<br />北京融合华夏数字文化科技有限公司 <br />客服电话：4000013088 
       </div>
     </div>
   </CXBBasePage>

src/subPages/pages/user/changePwd.vue

@@ -0,0 +1,240 @@
+<template>
+	<div  class="login-container">
+		<view class="input-content" >
+			<nut-input  v-model="state.phone" placeholder="请输入手机号" clearable type="number">
+				<template #right>
+					<nut-button type='primary' size="small" @click="handleGetCode" :loading="state.isAuthVerify">
+						{{ state.buttonText }}
+					</nut-button>
+				</template>
+			</nut-input>
+			
+			<nut-input v-model="state.code" placeholder="请输入验证码" clearable type="number">
+			</nut-input>
+			
+			<nut-input v-model="state.pwd" placeholder="请输入密码" clearable type="number">
+			</nut-input>
+			
+			<nut-input v-model="state.newPwd" placeholder="请再次输入密码" clearable type="number">
+			</nut-input>
+		</view>
+		<div class="flex w-full" >
+			<div class="p-3 w-full">
+				<nut-button type="primary" @click="handleLogin" block :disabled="!isFormVerify">确定</nut-button>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+	import {authVerify } from "~/apis/auth.api";
+	import {apiChangePwd} from "~/apis/user";
+	import Cache from "~/utils/cache";
+	import { IMG_CDN_URL } from '~/config/app'
+	import { useUserStore } from "~/stores/userStore";
+	const state = reactive({
+		phone: '',
+		code: '',
+		spread: '',
+		pwd: '',
+		newPwd:'',
+		isAuthVerify: false,
+		buttonText: '获取验证码',
+	})
+	
+	
+
+	function sendCode() {
+		if (state.isAuthVerify) return
+		state.isAuthVerify = true
+		let n = 60;
+		state.buttonText = "剩余 " + n + "s";
+		const run = setInterval(() => {
+			n = n - 1;
+			if (n < 0) {
+				clearInterval(run);
+				n = 0
+			}
+			state.buttonText = "剩余 " + n + "s";
+			if (state.buttonText === "剩余 " + 0 + "s") {
+				state.isAuthVerify = false;
+				state.buttonText = "重新获取";
+			}
+		}, 1000);
+	}
+
+	const isFormVerify = computed(() => {
+		if (state.phone !== '' && state.code !== '') {
+			return true
+		}
+	})
+	
+	
+	
+	function handleGetCode() {
+		if (!state.phone) {
+			return uni.showToast({
+				title: '请填写手机号码',
+				icon: 'none'
+			})
+		}
+		if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(state.phone)) {
+			return uni.showToast({
+				title: '请输入正确的手机号码',
+				icon: 'none'
+			})
+		}
+
+		state.isAuthVerify = true
+		authVerify(state.phone).then(res => {
+			state.isAuthVerify = false
+			sendCode()
+		}).catch(res => {
+		})
+	}
+	
+	
+	function handleLogin() {
+		uni.showLoading({
+			title: '提交中...'
+		});
+		
+		if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(state.phone)) {
+			return uni.showToast({
+				title: '请输入正确的手机号码',
+				icon: 'none'
+			})
+		}
+		
+		if(state.pwd != state.newPwd){
+			uni.showToast({
+				title:'两次密码不一致',
+				icon:'none'
+			})
+			return
+		}
+		
+		let params = {
+			account: state.phone,
+			password: state.pwd,
+			captcha:state.code
+		}
+		apiChangePwd({
+			...params
+		}).then(authRes => {
+			uni.showToast({
+			  title: '修改成功',
+			  icon: 'none'
+			}).then(() => {
+			//	uni.$emit('isUploadInfo')
+			  setTimeout(() => {
+			    const userStore = useUserStore()
+			    userStore.logout()
+			    uni.switchTab({
+			        url: '/pages/home/index'
+			    })
+			  }, 200)
+			})
+		}).catch((errorMsg) => {
+			console.log(errorMsg)
+			uni.showToast({
+				title: errorMsg,
+				icon: 'none'
+			})
+		})
+	}
+	
+	
+</script>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 密码设置
+</route>
+
+<style>
+	page {
+		background: #f8f8f8;
+	}
+</style>
+<style scoped lang="scss">
+	.login-container {
+		display: flex;
+		flex-direction: column;
+		
+		
+		.phone-content{
+			display: flex;
+			flex-direction: column;
+			margin-top: 20rpx;
+			padding-top: 48rpx;
+			padding-left: 40rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx 8rpx 0rpx 0rpx;
+		}
+		
+		.item-title{
+			font-size:22rpx ;
+			color: #7B7B7B;
+			margin-bottom: 28rpx;
+		}
+		
+		.item-value{
+			font-size:30rpx ;
+			color: #333;
+		}
+		
+		.item-content{
+			display: flex;
+			width: 100%;
+			flex-direction: row;
+			align-items: center;
+			
+		}
+		.item-line{
+			height: 1rpx;
+			color: #D8D8D8;
+			width: 100%;
+			margin-top: 36rpx;
+			margin-bottom: 36rpx;
+		}
+
+		.input-content {
+			display: flex;
+			flex-direction: column;
+			width:100%;
+		}
+
+		.logo-icon {
+			width: 200rpx;
+			height: 200rpx;
+			margin-top: 160rpx;
+			margin-bottom: 120rpx;
+		}
+
+		.choose-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-bottom: 20rpx;
+
+			.choose-item {
+				font-size: 32rpx;
+				color: #333;
+				padding: 20rpx;
+				font-weight: bolder;
+			}
+
+			.choose-default-item {
+				font-size: 32rpx;
+				color: #999;
+				padding: 20rpx;
+			}
+
+			.choose-line {
+				width: 1rpx;
+				background-color: #999;
+				height: 30rpx;
+			}
+		}
+	}
+</style>

uni-pages.d.ts

@@ -138,6 +138,7 @@ interface NavigateToOptions {
        "/subPages/pages/search/index" |
        "/subPages/pages/search/search-dacang" |
        "/subPages/pages/submit-order/index" |
+       "/subPages/pages/user/changePwd" |
        "/subPages/pages/vr-list/index" |
        "/subPages/pages/withdrawal-record/index" |
        "/subPages/pages/order/components/AllItemList" |