feat:提交代码，完善后续需求

pages.config.ts

@@ -41,7 +41,7 @@ export default defineUniPages({
   globalStyle: {
     navigationBarBackgroundColor: '@navBgColor',
     navigationBarTextStyle: '@navTxtStyle',
-    navigationBarTitleText: '储蓄保',
+    navigationBarTitleText: '幸福保',
     backgroundColor: '@bgColor',
     backgroundTextStyle: '@bgTxtStyle',
     backgroundColorTop: '@bgColorTop',

src/apis/home.ts

@@ -11,10 +11,47 @@ enum API {
 	GET_WPH_PRODUCT = '/api/vip/goods',//唯品会
 	GET_DENOMINATION = '/api/huafei/denomination',//充值话费lab
 	RECHARGE_INFO = '/api/huafei/recharge',//充值话费
+	BUSINESS_SCHOOL_LIST ='/api/business_school/list',//商学院列表
+	BUSINESS_SCHOOL_CLASSIFY_LIST ='/api/business_school/classify_list',//商学院列表类型
+	
+	BUSINESS_SCHOOL_DETAIL ='/api/business_school/detail',//列表详情
 }
 
 
 /**
+ * 商学院列表详情
+ */
+export function apiBusinessSchoolDetail(id:any) {
+	return defHttp.post({
+		url: API.BUSINESS_SCHOOL_DETAIL,
+		data:{id:id}
+	})
+}
+/**
+ * 商学院列表类型
+ */
+export function apiBusinessSchoolClassify() {
+	return defHttp.post({
+		url: API.BUSINESS_SCHOOL_CLASSIFY_LIST,
+	})
+}
+
+/**
+ * 商学院列表
+ */
+export function apiBusinessSchool(page:any,classify:any) {
+	let data={}
+	if(classify){
+		 data ={limit:10,page:page,classify:classify}
+	}else{
+		 data ={limit:10,page:page}
+	}
+	return defHttp.post({
+		url: API.BUSINESS_SCHOOL_LIST,
+		data:data
+	})
+}
+/**
  * 充值充值话费lab
  */
 export function apiRecharge(phone:any,money:any) {

src/apis/model/common.model.ts

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

src/apis/model/dacang.model.ts

@@ -150,7 +150,7 @@ export interface DcIntroduce {
       id: number
       uid: number //用户id
       user_name: string//负责人
-      account: string//储蓄保账号
+      account: string//幸福保账号
       create_time: number//创建时间
       update_time: number//修改时间
       warehouse_name: string//大仓名称

src/apis/quickLink.ts

@@ -16,6 +16,7 @@ enum API {
 	GET_VIP_BANNER = '/api/newhome/nologin/banner/user_banner',
 
 	GET_PRODUCT = '/api/store/merchant/product/type_lst?type=jingpin&',
+	GET_RE_PRODUCT = '/api/store/merchant/product/type_lst?type=fugou&',
 	GET_VIP_PRODUCT = '/api/store/merchant/product/lst/496?limit=10&',
 
 
@@ -130,6 +131,21 @@ export function apiGetJPProduct(data : any) {
 		url: API.GET_PRODUCT + params
 	})
 }
+
+
+/**
+ * 复购区产品列表
+ */
+export function apiGetReProduct(data : any) {
+
+	let params = `pageNum=${data.pageNum}&pageSize=${data.pageSize}&keyword=${data.keyword}`
+	if (data.cate_id) {
+		params = `pageNum=${data.pageNum}&pageSize=${data.pageSize}&keyword=${data.keyword}&cate_id=${data.cate_id}`
+	}
+	return defHttp.get({
+		url: API.GET_RE_PRODUCT + params
+	})
+}
 /**
  * 精彩生活产品列表
  */

src/apis/user.ts

@@ -192,7 +192,7 @@ enum API {
 	VR_INFO ='/api/user/vr_info',
 	//获取相关的列表
 	VR_LIST='/api/user/vr_list?limit=10&',
-    VR_NAME='/vr_name?uid=',
+    VR_NAME='/api/user/vr_name?uid=',
 	
 	//获取复购金
 	FGJ_INFO ='/api/user/fugou_info',

src/components/CXBBanner/CXBBanner.vue

@@ -1,11 +1,21 @@
 <script lang="ts" setup>
+	import {IMG_CDN_URL} from '~/config/app'
 </script>
 <template>
-  <div class="flex flex-col justify-center items-center py-22">
+  <div class="flex flex-col justify-center items-center py-22 mt-20">
     <image
-        src="https://test.bjtdba.com/applet/static/home/404986b1e3aeaf4b3829efa2c2ac6bf.png"
+        :src="IMG_CDN_URL+'logo_220607.png'"
         mode="widthFix"
-        class="w-35 h-35"
+        class="w-20 h-20"
     ></image>
+	<text class="login-title">华夏幸福保</text>
   </div>
-</template>
+</template>
+<style>
+	
+	.login-title{
+		font-size: 60rpx;
+		color: #333;
+		font-weight: bolder;
+	}
+</style>

src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "储蓄保",
+    "name" : "幸福保",
     "appid" : "__UNI__26118FF",
     "description" : "",
     "versionName" : "1.0.0",

src/pages/account-cancel/index.vue

@@ -34,14 +34,14 @@ function onOk() {
   <CXBBasePage>
     <div class="p-3 leading-6">
       <div>
-        <div class="font-bold">注销储蓄保账号服务</div>
+        <div class="font-bold">注销幸福保账号服务</div>
         <div class="text-sm py-3">
-          操作后储蓄保商户服务无法使用，所有商品、资金数据直接清零，历史信息无法恢复。
+          操作后幸福保商户服务无法使用，所有商品、资金数据直接清零，历史信息无法恢复。
         </div>
       </div>
 
       <div>
-        <div class="font-bold">注销储蓄保账号服务</div>
+        <div class="font-bold">注销幸福保账号服务</div>
         <div class="text-sm py-3" v-if="userStore && userStore.userInfo && userStore.userInfo.phone">
           将 {{ userStore.userInfo.phone }} 所注册绑定的账号注销。
         </div>

src/pages/article/detail.vue

@@ -46,5 +46,5 @@ onLoad((option: any) => {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
 </route>

src/pages/article/list.vue

@@ -45,6 +45,6 @@ page {
 </style>
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: true
 </route>

src/pages/bangfuzhongxin/index.vue

@@ -172,6 +172,6 @@ page {
 </style>
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: true
 </route>

src/pages/download.html

@@ -0,0 +1,190 @@
+<!doctype html>
+<html class="no-js">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <title>华夏幸福保</title>
+</head>
+<style>
+    .wxtip {
+			background: rgba(0, 0, 0, 0.8);
+			text-align: center;
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 998;
+			display: none;
+		}
+		
+		.wxtip-icon {
+			width: 52px;
+			height: 67px;
+			background: url(weixin-tip.png) no-repeat;
+			display: block;
+			position: absolute;
+			right: 20px;
+			top: 20px;
+		}
+		
+		.wxtip-txt {
+			color: #fff;
+			font-size: 16px;
+			line-height: 1.5;
+		}
+		
+		html,
+		body {
+			height: 100%;
+			overflow: hidden;
+			padding: 0;
+			margin: 0 auto;
+		}
+		
+		body {
+			max-width: 750px;
+			overflow: hidden;
+			margin: 0 auto;
+			text-align: center;
+		}
+		
+		.down_box {
+			position: absolute;
+			top: 70% !important;
+			text-align: center;
+			width: 98%;
+			left: 1%;
+		}
+		
+		.down_box a {
+			display: block;
+			width: 42%;
+			margin: 0 4%;
+			float: left;
+			position: relative;
+			padding-bottom: 11%;
+			background: #e2231a;
+			border-radius: 30px;
+		}
+		
+		.down_box a img {
+			display: block;
+			position: absolute;
+			height: 24px;
+			width: 24px;
+			top: 50%;
+			margin-top: -12px;
+			left: 18px;
+		}
+		
+		.down_box a p {
+			display: block;
+			position: absolute;
+			height: 20px;
+			font-size: 15px;
+			line-height: 20px;
+			top: 50%;
+			margin-top: -10px;
+			left: 60px;
+			color: #fff;
+		}
+		
+		@media only screen and (min-width: 100px) and (max-width: 360px) {
+			.down_box a p {
+				font-size: 13px;
+				left: 48px;
+			}
+			.down_box a img {
+				left: 14px;
+			}
+		}
+		.yqm{text-align: center;font-size: 16px;color: #000;font-weight: bold;width: 200px;    position: absolute;top: 48%;left: 50%;margin-left: -100px;}
+		.yqm span{font-size: 16px;color: #000;font-weight: bold;}
+	</style>
+
+<body style="position: relative;">
+	<div> 您已经注册成功，可以下载APP使用</div> 
+	<p /><p/>
+
+	
+    <img src="https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png" 
+	alt="" style="position: absolute; top:18%;width: 150px;left: 50%;margin-left: -75px;border-radius: 20px;">
+	
+  
+	
+
+
+  <div class="down_box" style="">
+        <a href="https://cdn.bjtdba.com/chuxubao/package/20250221012417106.apk" >
+            <img src="./img/android_icon.png" />
+            <p>安卓端下载</p>
+        </a>
+		<!--
+	商家端：http://qingyongcan.cn/down/shop/shop_1.1.9.apk
+	用户端：http://qingyongcan.cn/down/user/user_1.1.9.apk
+ -->
+   <!--     <a href="https://apps.apple.com/cn/app/%E5%82%A8%E8%93%84%E4%BF%9D/id1543690638" id="ios_click">
+            <img src="./img/android_icon.png" />
+            <p>IOS端下载</p>
+        </a> -->
+    </div>
+	
+	<div style="position: absolute; top:50%; height: 500px;margin-left: -75px;border-radius: 20px;"><span style="font-size: 24px;color: red;">下载提示:如果点击安卓端下载后提示以下选项时：</span>
+	<img style="width: 90%;" src="https://cdn.bjtdba.com/vod/image/2025-02-24/20250224151318641.png"/></div>
+	
+    <!--<div class="down_box" style="top:80%!important">
+		<a href="javascript:alert('暂未开放~')" id="JdownApp2">
+				<img src="uploads/images/ios_icon.png" />
+				<p>商户端下载</p>
+			</a>
+			<a href="http://wisdom.zhengdazikaowang.net/wisdom_shop.apk" id="JdownApp">
+				<img src="uploads/images/android_icon.png" />
+				<p>商户端下载</p> 
+			</a>
+		</div>-->
+    <div class="wxtip" id="JweixinTip">
+        <p class="wxtip-txt"><img src="./img/weixin-tip.png" style="width: 100%"></p>
+    </div>
+    <script type="text/javascript" src="./js/jquery-2.1.1.min.js"></script>
+    <script>
+    // $('#ios_click').on('click', function() {
+    //     alert('IOS开发中...');
+    // })
+    $(function() {
+        var u = navigator.userAgent,
+            app = navigator.appVersion;
+        var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
+        var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+        // 这里是安卓浏览器
+        if (isAndroid) {
+            //window.location.href = ''; // 跳安卓端下载地址
+        }
+        // 这里是iOS浏览器
+        if (isIOS) {
+            // window.location.href = ''; // 跳AppStore下载地址
+        }
+        //var ua = navigator.userAgent;
+        //var isWeixin = !!/MicroMessenger/i.test(ua);
+        //if (isWeixin) {
+        //    document.getElementById('JweixinTip').style.display = 'block';
+        //}
+        var ua = window.navigator.userAgent.toLowerCase();
+        if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.match(/AlipayClient/i) == "alipayclient") {
+            document.getElementById('JweixinTip').style.display = 'block';
+        }
+
+
+        $.get("https://api.hxxfb.com/api/common/edition", { type: 1},
+            function(data){
+                let about_link_android = data.data.about_link_android;
+                $('#JdownApp').attr('href',about_link_android);
+            }
+        );
+
+    })
+    </script>
+</body>
+
+</html>

src/pages/home/components/navs.vue

@@ -27,12 +27,24 @@
 	function handleItemClick(item : any) {
 	
 		switch (item.key) {
+			case KINGKONGKEY.FGQ:{
+				uni.navigateTo({
+					url: `/subPages/pages/quick-fuc/repurchase`,
+				})
+				break
+			}
 			case KINGKONGKEY.RECHARGE:{
 				uni.navigateTo({
 					url: `/subPages/pages/phone-bill/index`,
 				})
 				break
 			}
+			case KINGKONGKEY.SXY:{
+				uni.navigateTo({
+					url: `/subPages/pages/business-school/index`,
+				})
+				break
+			}
 			case KINGKONGKEY.VIP:{
 				uni.navigateTo({
 					url: `/subPages/pages/quick-fuc/vip`,

src/pages/home/components/product-new.vue

@@ -148,9 +148,11 @@
 				<text class="shop-name">{{item.shopName}}</text>
 			</view>
 
-			<view class="annuity-content">
-				<view v-if="item.yanglaojin" class="annuity-value-x mr-10">养老金:￥{{dealNum(item.yanglaojin+'')}}</view>
-				<view v-if="item.pv" class="annuity-value">pv:{{dealNum(item.pv+'')}}</view>
+			<view class="annuity-content" v-if="item.yanglaojin">
+				<view  class="annuity-value-x mr-10">养老金:￥{{dealNum(item.yanglaojin+'')}}</view>
+			</view>
+			<view class="annuity-content" v-if="item.pv">
+				<view  class="annuity-value">pv:{{dealNum(item.pv+'')}}</view>
 			</view>
 
 			<view class="price-content">

src/pages/home/constants.js

@@ -130,6 +130,10 @@ export const NAVS_HOT_ARR = [{
 	title: '复购区',
 	key: KINGKONGKEY.FGQ,
 }, {
+	image: `${IMG_CDN_URL}icon_sxy.png`,
+	title: '商学院',
+	key: KINGKONGKEY.SXY,
+}, {
 	image: `${ICON_CDN_URL}icon_rx.png`,
 	title: '热销榜单',
 	key: KINGKONGKEY.RXBD,
@@ -162,10 +166,6 @@ export const NAVS_HOT_ARR = [{
 	title: '打车代价',
 	key: KINGKONGKEY.KS,
 }, {
-	image: `${ICON_CDN_URL}icon_mdl.png`,
-	title: '麦当劳KFC',
-	key: KINGKONGKEY.MDL,
-}, {
 	image: `${ICON_CDN_URL}icon_jkd.png`,
 	title: '寄快递',
 	key: KINGKONGKEY.JKD,

src/pages/home/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-	import { getNewSignInInfo, getUserInfo, getYanglaojinStatistics } from '~/apis/user'
+	import { getNewSignInInfo, getUserInfo} from '~/apis/user'
 	import { getProduct } from '~/apis/home'
 	import { computed } from "vue";
 	import Navs from '~/pages/home/components/navs.vue'
@@ -7,14 +7,12 @@
 	import Banner from '~/pages/home/components/banner.vue'
 	import Header from '~/pages/home/components/header.vue'
 	import ProductList from '~/pages/home/components/product-new.vue'
-	import { getHomeBanner, getHomeQuickLink, getProductShare } from '~/apis/common'
+	import { getHomeBanner, getProductShare } from '~/apis/common'
 	import { useUserStore } from '~/stores/userStore'
 	import CXBDialogSIgnIn from '~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue'
 	import { CDM_URL, CDN_URL } from '~/config/app'
 	import CXBPrivacyPopup from '~/components/CXBPrivacyPopup/CXBPrivacyPopup.vue'
 	import { PRODUCT_TAB_ARR } from "./constants.js"
-	// import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
-	// import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 	import Cache from '~/utils/cache'
 
 	import CXBBackTop from '~/components/CXBBackTop/CXBBackTop.vue'
@@ -29,9 +27,6 @@
 		},
 	})
 
-	// 限时秒杀  https://cdn.bjtdba.com/vod/image/2023-12-08/20231208174028968.png
-	// 秒杀背景  https://cdn.bjtdba.com/vod/image/2023-12-08/20231208174007505.png
-	// 秒杀价格  https://cdn.bjtdba.com/vod/image/2023-12-08/20231208173948533.png
 
 	const msbkImg = `${CDM_URL}/image/2023-12-08/20231208174007505.png`
 	const xsmsImg = `${CDM_URL}/image/2023-12-08/20231208174028968.png`
@@ -55,7 +50,6 @@
 	const msStatus = ref('')
 	const productTabList = ref(PRODUCT_TAB_ARR)
 	const currentTopIndex = ref(0)
-	// const list = ref([])
 	const state = reactive({
 		shareId: '',
 		yanglaojine: {},
@@ -73,7 +67,6 @@
 		isShowSignIn: false,
 		banners: [],
 		announcementList: [],
-
 		indicatorDots: true,
 		circular: true,
 		autoplay: true,
@@ -101,9 +94,6 @@
 			getUserInfo().then((res) => {
 				userStore.setUserInfo(res)
 			})
-			getYanglaojinStatistics().then((res) => {
-				state.all_yanglao = res.all_yanglao
-			})
 			// 加载秒杀数据
 			loadList('reload')
 		}
@@ -117,24 +107,18 @@
 	}
 
 	function checkSignIn() {
-		// if (userStore.uid && state.isEject === 1) {
 		// 2 检查用户签到信息
 		getNewSignInInfo().then((res) => {
-			// console.log(res)
 			const { today, day } = res
 			state.signToday = today
 			if (today === 0)
 				state.isShowSignIn = true
-
 			state.day = day
 
-			// // if (today === 0) {
-			//   2.1 弹出签到窗口
-			// }
+			
 		}).catch((error) => {
 			console.error(`${error}->GetNewsSignInInfo`)
 		})
-		// }
 	}
 	const navBarStyle = ref({})
 
@@ -142,16 +126,10 @@
 		dealSystemInfo()
 		if (option && option.shareId)
 			userStore.setShareId(option.shareId)
-
-		// getLocal()
 		getIsShow()
 		getHomeBanner().then((res) => {
 			state.banners = res
 		})
-		// 加载地址数据
-		// orderStore.getCurrentAddress()
-		// 1加载首页数据
-		getHomeQuickLink().then((res) => { })
 		state.page = 1
 		loadProductList()
 		loadList('reload')
@@ -182,7 +160,6 @@
 			title: '消费储蓄 保障未来',
 			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-11/20231011062523504.png',
 			query: `from=share&shareId=${shareId}`,
-			// imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
 		}
 	})
 
@@ -217,8 +194,6 @@
 				msProductList.value = msData.list[0].product_data
 				msSeckillDate.value = msData.list[0].seckill_date.slice(0, 5)
 				msStatus.value = msData.list[0].status
-				// console.log(11221111, msProductList.value);
-				// console.log(11221111, msSeckillDate.value);
 			}
 		})
 	}
@@ -227,12 +202,9 @@
 	function getCountdown() {
 		const now = new Date()
 		const startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), parseHours(msSeckillDate.value), 0, 0)
-		// const startDate = new Date('2023-12-26 10:55:00');
 		const endDate = new Date(startDate.getTime() + 60 * 60 * 1000) // 结束时间为开始时间的一小时后
-
 		if (now > startDate && now < endDate) {
 			const milliseconds = endDate - now
-
 			const hours = Math.floor(milliseconds / (1000 * 60 * 60))
 			const minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60))
 			const seconds = Math.floor((milliseconds % (1000 * 60)) / 1000)
@@ -288,7 +260,6 @@
 	const headerClass = ref('')
 
 	onPageScroll((page) => {
-		// console.log(page.scrollTop.toFixed(),'距离顶部的距离')
 		Scroll_X.value = Number(page.scrollTop.toFixed())
 		// page.scrollTop
 		if (page.scrollTop >= 76)
@@ -748,6 +719,6 @@
 <route lang="yaml" type="home">
 style:
   navigationStyle: custom
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: true
 </route>

src/pages/my-rules/index.vue

@@ -392,7 +392,7 @@ function onCancel() {
 <route lang="yaml">
 style:
   navigationBarBackgroundColor: "#f8f3f3"
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: false
 
 </route>

src/pages/payment/index.vue

@@ -21,15 +21,11 @@ const state = reactive({
 onLoad((options) => {
   // console.log('我是options',options)
   if (options) {
-	  
-	  console.log("===options",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)
     if (options.tabIndex)
       state.tabIndex = options.tabIndex
 
@@ -100,11 +96,7 @@ function onClickLeft() {
         uni.$emit('cart-reload')
       }
       if (res.cancel) {
-        // uni.navigateBack()
         uni.$emit('cart-reload')
-        
-        console.log(state.tabIndex)
-
         if (state.tabIndex) {
           pageStore.setPageConfig({
             orderBack: {
@@ -113,9 +105,8 @@ function onClickLeft() {
             },
           })
         }
-        // setTimeout(() => {
         if (state.tabIndex == 0) {
-          uni.navigateTo({
+          uni.redirectTo({
             url: '/subPages/pages/order/index',
           })
         }
@@ -126,19 +117,16 @@ function onClickLeft() {
             })
           }
           else {
-            uni.navigateTo({
+            uni.redirectTo({
 				  url: `/subPages/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
             })
           }
         }
         else {
-          uni.navigateTo({
+          uni.redirectTo({
             url: '/subPages/pages/order/index?tabIndex=1&from=payment',
           })
         }
-        // const tabIndex =
-
-        // }, 300)
       }
     },
   })

src/pages/pension_choice_platform/index.vue

@@ -27,7 +27,7 @@ const list = [{
   icon: CDN_URL + '/static/assets/pinduoduo_d.png'
 }, {
   type: '90',
-  title: '储蓄保',
+  title: '幸福保',
   icon: CDN_URL + '/static/assets/cxb_logo_230316.png'
 }]
 

src/pages/real-name-authentication/index.vue

@@ -49,8 +49,8 @@ onLoad(async () => {
 
       formData.user_card = res.user_card.replace(/^(\d{4})\d+(\d{4})$/, '$1********$2')
       formData.user_name = formatName(res.user_name)
-      // formData.card_positive = res.card_positive
-      // formData.card_reverse = res.card_reverse
+      formData.card_positive = res.card_positive
+      formData.card_reverse = res.card_reverse
 
     }
   }).catch(error => {
@@ -194,6 +194,7 @@ function handleSubmit () {
       card_positive: formData.card_positive,
       card_reverse: formData.card_reverse
     }
+	console.log("===certificationRequest",certificationRequest);
     submitCertification(certificationRequest).then(res => {
       // state.isLoading = false
       uni.hideLoading()
@@ -201,6 +202,8 @@ function handleSubmit () {
       if (res && res.user_card && res.user_name) {
         formData.user_card = res.user_card
         formData.user_name = res.user_name
+		formData.card_positive = formData.card_positive
+		formData.card_reverse = formData.card_reverse
       }
       state.isLoading = false
 	  state.isCertified = true
@@ -228,7 +231,7 @@ function formatName (str) {
 <template>
   <AuthenticationSuccess v-if="state.isCertified"/>
 
-  <div class="flex flex-col pt-3 gap-3 pb-safe text-sm">
+  <div  class="flex flex-col pt-3 gap-3 pb-safe text-sm">
     <div class="bg-white flex flex-col  px-3">
       <div class="f-hairline-bottom py-3 flex">
         <div>真实姓名：</div>
@@ -239,15 +242,7 @@ function formatName (str) {
                :class="state.isCertified && 'text-gray'"
         />
       </div>
-<!--      <div class="f-hairline-bottom py-3 flex" v-if="!state.isCertified">-->
-<!--        <div>手机号码：</div>-->
-<!--        <input v-model="formData.mobile"-->
-<!--               :disabled="state.isCertified"-->
-<!--               placeholder="请输入证件号码" class="text-sm"-->
-<!--               :class="state.isCertified && 'text-gray'"-->
-
-<!--        />-->
-<!--      </div>-->
+
       <div class="f-hairline-bottom py-3 flex">
         <div>证件号码：</div>
         <input v-model="formData.user_card"
@@ -257,7 +252,6 @@ function formatName (str) {
         />
       </div>
 
-
     </div>
 
     <div class="bg-white flex flex-col  p-3 gap-3">

src/pages/store/nearby/index-bak.vue

@@ -297,7 +297,7 @@ function handleScrollToLower() {
 </template>
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: false
 </route>
 

src/pages/store/nearby/index.vue

@@ -380,7 +380,7 @@ function searchAction() {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: false
 </route>
 

src/pages/user/index.vue

@@ -776,6 +776,6 @@
 <route lang="yaml">
 style:
   navigationStyle: custom
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: false
 </route>

src/pages/user/login/other-phone.vue

@@ -215,7 +215,7 @@ function handleLogin() {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
 </route>
 
 <style>

src/pages/version-update/index.vue

@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 import {getAboutConfig} from "~/apis/user";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {CDN_URL} from "~/config/app";
+import {CDN_URL,IMG_CDN_URL} from "~/config/app";
 
 const state = reactive({
-  version: '3.2.3.3',
-  name: '储蓄保',
-  logo: CDN_URL + '/static/assets/logo_220608.png',
+  version: '1.0.0.0',
+  name: '幸福保',
+  logo: IMG_CDN_URL+'logo_220607.png',
 })
 
 onLoad(() => {

src/pages/vip/index.vue

@@ -339,7 +339,7 @@ onShow(() => {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: true
 </route>
 <style>

src/subPages/pages/bankDetail/index.vue

@@ -52,13 +52,13 @@
 		account:'',
 	})
 	onLoad((option) => {
-		if(option.item){
+		if(option.item!= 'null'){
+			console.log("===option.item",option.item);
 			cardInfo.value =JSON.parse(option.item)
 		}
 	})
 	
 	function onSubmitClick(){
-		console.log("===onSubmitClick",cardInfo.value);
 		if(!cardInfo.value.user_name){
 			uni.showToast({
 				title:"请输入持卡人姓名",

src/subPages/pages/business-school/detail.vue

@@ -0,0 +1,80 @@
+<template>
+	<view class="business-container " v-if="detailInfo">
+		<text class="title">{{detailInfo.name}}</text>
+		<text class="data">{{detailInfo.create_time}}</text>
+		<image class="banner" :src="detailInfo.image" mode="aspectFill"></image>
+		
+		<rich-text class="video-content" :nodes="videoHtml"></rich-text>
+		<video :poster="detailInfo.cover"  class="video-content" :src="detailInfo.mp4" controls></video>
+	</view>
+</template>
+
+<script setup>
+	import {
+		apiBusinessSchoolDetail,
+	} from '~/apis/home'
+	const detailInfo=ref()
+	const state = reactive({
+		id: '',
+	})
+
+	onLoad((option) => {
+		state.id=option.id
+		if(state.id){
+			getDetailInfo()
+		}
+	})
+
+	function getDetailInfo(){
+		uni.showLoading({
+			title:'加载中...'
+		})
+		apiBusinessSchoolDetail(state.id).then(res=>{
+			detailInfo.value = res
+			uni.hideLoading()
+		})
+	}
+	
+</script>
+
+<style lang="scss" scoped>
+	.business-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+		
+		.title{
+			font-size: 38rpx;
+			color:#333;
+			margin-top: 30rpx;
+			margin-bottom: 30rpx;
+		}
+		
+		.data{
+			font-size: 30rpx;
+			color:#999;
+			margin-bottom: 30rpx;
+		}
+		.banner{
+			width: 100%;
+			height: 500rpx;
+			margin-bottom: 20rpx;
+		}
+		
+		.video-content{
+			width: 100%;
+		}
+		
+
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 详情
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/business-school/index.vue

@@ -0,0 +1,244 @@
+<template>
+	<view class="business-container">
+		<view class="lab-content">
+			<scroll-view scroll-x="true" class="lab-item">
+				<view class="lab-item-x" v-for="(item,index) in tabList" :key="'lab-item-x-'+index">
+					<view class="lab-item-small" @click="onTabClick(index,item.id)">
+						<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{item.name}}</text>
+						<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		
+		<view  v-if="goodsList&& goodsList.length!=0" v-for="(item,index) in goodsList" :key="'goods-x-'+index">
+			<view class="item-content-out" @click="onItemClick(item)">
+				<view class="item-content">
+					<image class="item-img" :src="item.image" mode="aspectFill"></image>
+					<view class="right-content">
+						<text class="title">{{item.name}}</text>
+						<view class="bottom-content">
+							<text class="date">{{item.create_time}}</text>
+							<image class="eye-icon" :src="IMG_CDN_URL+'icon_eyes.png'" mode="widthFix"></image>
+							<text class="see-num">{{item.reading}}</text>
+						</view>
+					</view>
+				</view>
+				<view v-if="index != goodsList.length-1" class="item-line"></view>
+			</view>
+		</view>
+		<CXBEmpty v-else />
+	</view>
+</template>
+
+<script setup>
+	import {
+		apiBusinessSchool,
+		apiBusinessSchoolClassify,
+	} from '~/apis/home'
+	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+	import {IMG_CDN_URL} from '~/config/app'
+	const currentIndex = ref(0)
+	const tabList = ref([])
+	const goodsList = ref([])
+	const state = reactive({
+		page: 1,
+		id: '',
+		count:1,
+	})
+
+	onLoad((option) => {
+		getBusinessSchoolClassify()
+		getGoodsList()
+	})
+
+	onReachBottom(() => {
+		if(pageList.value.length <count.value){
+			state.page += 1
+		    getGoodsList()
+		}
+	})
+
+	onPullDownRefresh(() => {
+		state.page =1
+		getGoodsList()
+		uni.stopPullDownRefresh()
+	})
+
+	function onTabClick(position, id) {
+		currentIndex.value = position
+		state.page =1
+		state.id =id
+		getGoodsList()
+	}
+	
+	function getGoodsList(){
+		uni.showLoading({
+			title:'加载中...'
+		})
+		apiBusinessSchool(state.page,state.id).then(res=>{
+			goodsList.value = res.list
+			state.count =res.count
+			uni.hideLoading()
+		})
+	}
+	
+	function getBusinessSchoolClassify(){
+		apiBusinessSchoolClassify().then(res=>{
+			tabList.value=[{
+				name: '全部',
+				id: ''
+			},...res]
+		})
+	}
+
+	
+	function onItemClick(item) {
+		uni.navigateTo({
+			url: `/subPages/pages/business-school/detail?id=${item.id}`
+		})
+	}
+
+	
+</script>
+
+<style lang="scss" scoped>
+	.business-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		padding-top: 90rpx;
+		box-sizing: border-box;
+		
+		.item-content-out{
+			display: flex;
+			flex-direction: column;
+			background-color: #fff;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			box-sizing: border-box;
+			width: 100%;
+			
+			.item-line{
+				width: 100%;
+				height: 2rpx;
+				background-color: #f8f8f8;
+			}
+			.item-content{
+				display: flex;
+				flex-direction: row;
+				margin-top: 20rpx;
+				margin-bottom: 20rpx;
+				
+				.item-img{
+					width: 300rpx;
+					height: 200rpx;
+					border-radius: 20rpx;
+					margin-right: 20rpx;
+					min-width: 300rpx;
+				}
+				
+				.right-content{
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					width: 100%;
+					
+					.title{
+						font-size: 30rpx;
+						color:#333;
+					}
+					
+					.bottom-content{
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						width: 100%;
+						
+						.date{
+							font-size: 26rpx;
+							color:#999;
+							flex: 1;
+						}
+						
+						.eye-icon{
+							width: 30rpx;
+							margin-right: 10rpx;
+							height: 30rpx;
+						}
+						.see-num{
+							font-size: 26rpx;
+							color: #333;
+						}
+					}
+				}
+			}
+		}
+		
+		.lab-content {
+			width: 100%;
+			height: 90rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			position: fixed;
+			top: 0;
+			left: 0;
+			background-color: #fff;
+			z-index: 99999;
+		
+			.lab-item {
+				display: flex;
+				flex-direction: row;
+				white-space: nowrap;
+				width: 100%;
+			}
+		
+			.lab-item-x {
+				display: inline-block;
+				margin-right: 10px;
+				text-align: center;
+			}
+		
+			.lab-item-small {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 124rpx;
+		
+				.lab-default-title {
+					font-size: 28rpx;
+					margin-bottom: 10rpx;
+				}
+		
+				.lab-title {
+					font-size: 32rpx;
+					margin-bottom: 10rpx;
+					color: #FE0032;
+				}
+		
+				.lab-line {
+					width: 50rpx;
+					height: 6rpx;
+					background-color: #FE0032;
+					border-radius: 4rpx;
+				}
+		
+				.lab-default-line {
+					width: 50rpx;
+					height: 6rpx;
+					border-radius: 4rpx;
+				}
+		
+			}
+		}
+
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 商学院
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/immediate-withdrawal/index.vue

@@ -447,6 +447,7 @@ function onSubmitClick(){
 		  <view class="bank-item" v-else>
 			  <image class="bank-icon" :src="IMG_CDN_NEW_URL+'icon_bank_card.png'" mode="widthFix"></image>
 			  <view class="bank-info">
+				    <text class="bank-name">银行卡</text>
 			  		<text class="bank-hint" @click="onBankItemClick(null)">点击添加银行卡信息</text>
 			  </view>
 		  </view>

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

@@ -138,12 +138,16 @@
 			if(res==200){
 				getInfo()
 			}
+		}).catch(res=>{
+			uni.showToast({
+				title:res,
+				icon:'none'
+			})
 		})
 	}
 	
 
 	function onTopClick(position) {
-		console.log("==onTopClick",position);
 		if (position == 0) {
          handleClickTomo()
 		} else if (position == 1) {
@@ -152,7 +156,6 @@
          	title:'请输入佣金转VR数量',
 			placeholderText:'请输入佣金转VR数量',
 			complete: (e) => {
-				console.log("e===",e);
 				if(e.confirm){//去转换
 					transitionVr(e.content)
 				}

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

@@ -0,0 +1,17 @@
+<template>
+	<web-view :src="url"  />
+</template>
+<script setup lang="ts">
+	const url = ref('')
+	const title = ref('')
+	onLoad((option : any) => {
+		if(option.info){
+			let data =  JSON.parse(decodeURIComponent(option.info)) 
+			url.value =data.url
+			title.value = data.name
+		}
+		uni.setNavigationBarTitle({
+			title: title.value + ''
+		})
+	})
+</script>

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

@@ -2,6 +2,7 @@
 	<view class="contribute-container">
 		
 		<view class="top-content-x">
+			<view @click="onSignClick" class="sign-btn">{{isShowSignIn?'已签到':'签到'}}</view>
 			<view class="top-card-content">
 				<view class="card-item">
 					<text class="item-title">{{dataInfo.total_source}}</text>
@@ -45,6 +46,8 @@
 	import {
 		apiGetJFInfo,
 		apiGetJFList,
+		getNewSignIn,
+		getNewSignInInfo,
 	} from '~/apis/user'
 	import {formatDate} from '~/utils/util'
 	import { getProductShare } from "~/apis/common";
@@ -56,9 +59,10 @@
     const dataInfo=ref({})
 	const listInfo=ref([])
 	const dataNameInfo =ref()
+	const isShowSignIn =ref(false)
 	const state = reactive({
 		pm :0,
-		page :1
+		page :1,
 	})
 	onLoad((option) => {
 		if (option && option.shareId) {
@@ -69,8 +73,19 @@
 		})
 		getInfo()
 		getList()
+		getSignInInfo()
 	})
 	
+	
+	function getSignInInfo(){
+		getNewSignInInfo().then((res) => {
+			console.log("==res",res);
+			const { today, day } = res
+			if (today == 1){
+				isShowSignIn.value = true
+			}
+		})
+	}
 	function getInfo(){
 			apiGetJFInfo().then(res=>{
 				dataInfo.value= res
@@ -120,6 +135,23 @@
 		state.page=1
 		getList()
 	}
+	
+	function onSignClick(){
+		if(!isShowSignIn.value ){
+			getNewSignIn().then(res=>{
+				isShowSignIn.value=true
+				uni.showToast({
+					title:'签到成功',
+					icon:'none'
+				})
+			})
+		}else {
+			uni.showToast({
+				title:'您今天已经签到了',
+				icon:'none'
+			})
+		}
+	}
 
 	
 </script>
@@ -139,7 +171,7 @@
 		.list-content{
 			display: flex;
 			flex-direction: column;
-			margin-top:350rpx ;
+			margin-top:450rpx ;
 			padding-left: 20rpx;
 			padding-right: 20rpx;
 			.list-item-x{
@@ -185,7 +217,7 @@
 			align-items: center;
 			position: fixed;
 			z-index: 222;
-			margin-top: 260rpx;
+			margin-top: 349rpx;
 			width: 100%;
 			background-color: #fff;
 			top: 0;
@@ -231,7 +263,7 @@
 			flex-direction: column;
 			background-color:#fe0032;
 			width: 100%;
-			height: 260rpx;
+			height: 350rpx;
 			padding: 20rpx;
 			box-sizing: border-box;
 			position: fixed;
@@ -239,6 +271,17 @@
 			left: 0;
 			z-index: 222;
 		}
+		
+		.sign-btn{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			height: 90rpx;
+			justify-content: flex-end;
+			padding-right: 30rpx;
+			color: #fff;
+			font-size: 32rpx;
+		}
 		.top-card-content{
 			background-color: #fdddc4;
 			border-radius: 20rpx;

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

@@ -45,6 +45,7 @@
 	import {
 		apiGetHBInfo,
 		apiGetHBList,
+		apiTransitionVr
 	} from '~/apis/user'
 	import {formatDate} from '~/utils/util'
 	import { getProductShare } from "~/apis/common";
@@ -74,12 +75,73 @@
 	})
 	
 	function onItemClick(index){
-		uni.showToast({
-			title:'升级中',
-			icon:'none'
+		if(index==0){
+			handleClickTomo()
+		}else if(index ==1){
+			uni.showModal({
+				editable:true,
+				title:'请输入佣金转VR数量',
+						placeholderText:'请输入佣金转VR数量',
+						complete: (e) => {
+							if(e.confirm){//去转换
+								transitionVr(e.content)
+							}
+						}
+			})
+		}
+		
+	}
+	
+	function transitionVr(num){
+		if(!num || num==0){
+			uni.showToast({
+				title:''
+			})
+			return
+		}
+		apiTransitionVr(num).then(res=>{
+			if(res==200){
+				getInfo()
+			}
+		}).catch(res=>{
+			uni.showToast({
+				title:res,
+				icon:'none'
+			})
 		})
 	}
 	
+	function handleClickTomo() {
+	  if (userStore.userInfo.is_ertification == 1) {
+	    uni.navigateTo({
+	      url: '/subPages/pages/immediate-withdrawal/index?type=1'
+	    })
+	  } else {
+	    setTimeout(() => {
+	      uni.showModal({
+	        title: '温馨提示',
+	        content: '实名认证后才可提现',
+	        cancelText: "取消", // 取消按钮的文字
+	        confirmText: "去认证", // 确认按钮的文字
+	        showCancel: true, // 是否显示取消按钮，默认为 true
+	        confirmColor: '#f55850',
+	        success: (res) => {
+	          if (res.confirm) {
+	            console.log('comfirm') //点击确定之后执行的代码
+	            setTimeout(() => {
+	              uni.navigateTo({
+	                url: '/pages/real-name-authentication/index'
+	              })
+	            }, 300);
+	          } else {
+	            console.log('cancel') //点击取消之后执行的代码
+	          }
+	        }
+	      })
+	    }, 300);
+	  }
+	}
+	
 	function getInfo(){
 			apiGetHBInfo().then(res=>{
 				dataInfo.value= res

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

@@ -7,8 +7,8 @@
 					<text class="item-title">{{dataInfo.total_source}}</text>
 					<text class="item-value">我的VR</text>
 				</view>
-				<view class="card-item-x">
-					<text class="red-btn" @click="onItemClick(0)">VR转账</text>
+				<view class="card-item-x" v-if="dataNameInfo">
+					<text class="red-btn" @click="onItemClick(0)">{{dataNameInfo.name}}</text>
 				</view>
 			</view>
 		</view>
@@ -80,7 +80,14 @@
 	
 	
 	function onItemClick(){
-		
+		console.log("===dataNameInfo",dataNameInfo.value);
+		let info ={
+			url:dataNameInfo.value.url,
+			name:dataNameInfo.value.name
+		}
+		uni.navigateTo({
+			url:`/subPages/pages/mine-top/common-webView?info=${encodeURIComponent(JSON.stringify(info))}`
+		})
 	}
 	
 	function getInfo(){

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

@@ -2,7 +2,7 @@
 	<view class="contribute-container">
 		<view class="top-bg"></view>
 		<text @click="onHistoryClick" class="history-title">充值记录</text>
-		<image class="top-banner" src="/static/img/img_recharge_top.png" mode="aspectFill"></image>
+		<image class="top-banner" :src="IMG_CDN_URL+'img_recharge_top.png'" mode="aspectFill"></image>
 		<view class="card-info">
 			<text class="hint-title">请您输入充值手机号</text>
 			<input placeholder="请您输入充值手机号" class="input-sty" type="text" v-model="phoneNum" />

src/subPages/pages/quick-fuc/components/life-product.vue

@@ -22,7 +22,7 @@
 	
 	function handleProductItemClick(item) {
 		 uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}&type=${props.pageType}`
 		})
 	}
 </script>
@@ -40,10 +40,13 @@
 				<image class="shop-icon" src="/static/icon/icon_shop_name.png" mode="widthFix"></image>
 				<text class="shop-name">{{item.shopName}}</text>
 			</view> -->
-
-			<view class="annuity-content">
-				<view v-if="item.yanglao" class="annuity-value-x mr-10">养老金:￥{{dealNum(item.yanglao+'')}}</view>
-				<view v-if="item.pv" class="annuity-value">pv:{{dealNum(item.pv+'')}}</view>
+              
+				
+			<view class="annuity-content" v-if="item.yanglao">
+				 <text  class="annuity-value-x">养老金:￥{{dealNum(item.yanglao+'')}}</text>
+			</view>
+			<view class="annuity-content" v-if="item.pv">
+				<text  class="annuity-value">pv:{{dealNum(item.pv+'')}}</text>
 			</view>
 
 			<view class="price-content">
@@ -121,7 +124,23 @@
 					margin-right: 10rpx;
 				}
 			}
-
+            .annuity-value {
+            	background-color: antiquewhite;
+            	color: #F83554;
+            	font-size: 24rpx;
+            	border-radius: 4rpx;
+            	padding-left: 4rpx;
+            	padding-right: 4rpx;
+            }
+            .annuity-value-x {
+            	background-color: #faf0f1;
+            	color: #F83554;
+				display: flex;
+            	font-size: 24rpx;
+            	border-radius: 4rpx;
+            	padding-left: 4rpx;
+            	padding-right: 4rpx;
+            }
 			.annuity-content {
 				display: flex;
 				margin-left: 20rpx;
@@ -129,22 +148,7 @@
 				align-items: center;
 				margin-top: 20rpx;
 
-				.annuity-value {
-					background-color: antiquewhite;
-					color: #F83554;
-					font-size: 24rpx;
-					border-radius: 4rpx;
-					padding-left: 4rpx;
-					padding-right: 4rpx;
-				}
-				.annuity-value-x {
-					background-color: #faf0f1;
-					color: #F83554;
-					font-size: 24rpx;
-					border-radius: 4rpx;
-					padding-left: 4rpx;
-					padding-right: 4rpx;
-				}
+				
 
 				.mr-10 {
 					margin-right: 10rpx;

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

@@ -93,7 +93,7 @@
 		getBanner()
 		getProduct()
 		getProductShareInfo()
-		userStore.setRedirectPage(`/pages/vip/index?type` + state.type, 'page')
+		userStore.setRedirectPage(`/subPages/pages/quick-fuc/life?type` + state.type, 'page')
 	})
 	
    function getProductShareInfo(){

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

@@ -0,0 +1,298 @@
+<template>
+
+	<div class="flex flex-col gap-3 ">
+		<div style="height: 80rpx;">
+			<div style="background-color: transparent  " class="overflow-hidden fixed top-0 w-full z-10">
+				<nut-searchbar v-model="state.keyword" @search="searchkwd" @clear="clearSearch">
+					<template v-slot:rightout>
+						<div @tap="searchkwd">
+							搜索
+						</div>
+					</template>
+				</nut-searchbar>
+			</div>
+		</div>
+
+		<view class="lab-content">
+			<scroll-view scroll-x="true" class="lab-item">
+				<view class="lab-item-x" v-for="(item,index) in tabList" :key="'lab-item-x-'+index">
+					<view class="lab-item-small" @click="onTabClick(index,item.store_category_id)">
+						<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{item.cate_name}}</text>
+						<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<div class="w-screen swiper-height mt-90" v-if='state.banners && state.banners.length!=0'>
+			<div class="px-3 swiper-height">
+				<swiper v-if="state.banners" :indicator-dots="state.indicatorDots" indicator-active-color="#e93323"
+					:autoplay="state.autoplay" :circular="state.circular" :interval="state.interval"
+					:duration="state.duration" class="w-full h-full rounded-md overflow-hidden ">
+					<swiper-item v-for="(item, index) in state.banners" :key="index">
+						<image :src="item.pic" class="w-full h-full object-cover swiper-bg" mode="aspectFill" />
+					</swiper-item>
+				</swiper>
+			</div>
+		</div>
+		
+		<CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+		
+		<ProductList :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
+		
+        <CXBEmpty v-else></CXBEmpty>
+		
+	</div>
+
+</template>
+
+<script setup lang="ts">
+	import FSearch from "~/components/FSearch/FSearch.vue";
+	import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+	import { getProductShare } from "~/apis/common";
+	import { useUserStore } from "~/stores/userStore";
+	import Cache from "~/utils/cache";
+	import { apiGetClassity, apiBanner, apiGetReProduct } from '~/apis/quickLink'
+	import ProductList from './components/life-product.vue'
+	import { IMG_CDN_URL} from '~/config/app.ts'
+	
+	const userStore = useUserStore()
+	const state = reactive({
+		currentPage: 1,
+		pageSize: 10,
+		page: 1,
+		limit: 10,
+		cid: 0,
+		totalPage: 1,
+		banners: [],
+		count: 0,
+		pageType: 0,
+		keyword: '',
+		status: 'noMore',
+		indicatorDots: true,
+		circular: true,
+		autoplay: true,
+		interval: 5000,
+		duration: 500,
+		currents: "0",
+		title: '',
+		type: '',
+	})
+	
+	const pageList = ref([])
+	const tabList = ref([{ category_name: '测试' }])
+	const currentIndex = ref(0)
+	const count = ref(1)
+	
+	onLoad((option) => {
+		if (option && option.shareId) {
+			userStore.setShareId(option.shareId)
+		}
+		getClassity()
+		getBanner()
+		getProduct()
+		getProductShareInfo()
+		userStore.setRedirectPage(`/subPages/pages/quick-fuc/repurchase?type` + state.type, 'page')
+	})
+	
+   function getProductShareInfo(){
+	   getProductShare().then(res => {
+	   	if (res) {
+	   		userStore.setShareId(res.share_id)
+	   	}
+	   }).catch(message => {
+	   	console.log(message)
+	   })
+   }
+   
+	function getProduct() {
+		uni.showLoading()
+		apiGetReProduct({
+			pageNum:state.page,
+			pageSize:state.limit,
+			cate_id:state.cid,
+			keyword:state.keyword
+		}).then(res => {
+			count.value = res.count
+			if (state.page === 1) {
+				pageList.value = res.list
+			} else {
+				setTimeout(() => {
+					pageList.value.push(...res.list)
+				}, 300)
+			}
+			uni.hideLoading()
+		})
+	}
+
+	function getBanner() {
+		apiBanner().then(res => {
+			state.banners = res
+		})
+	}
+	
+	function getClassity() {
+		apiGetClassity().then(res => {
+			tabList.value = [{ cate_name: '全部' }, ...res]
+		})
+	}
+
+	function onTabClick(index,store_category_id) {
+		state.cid = store_category_id
+		state.page = 1
+		currentIndex.value = index
+		getProduct()
+	}
+	//搜索全部筛选
+	function searchkwd() {
+		if (!state.keyword) {
+			return uni.showToast({
+				title: '请输入搜索关键字',
+				icon: 'none'
+			})
+		}
+		state.page = 1
+		getProduct()
+	}
+
+	onShareAppMessage(() => {
+		const shareId = Cache.get('SHARE_ID')
+		return {
+			title: `消费储蓄 保障未来`,
+			path: `/pages/vip/index?shareId=${shareId}`,
+			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
+		}
+	})
+
+	onShareTimeline(() => {
+		const shareId = Cache.get('SHARE_ID')
+		return {
+			title: `消费储蓄 保障未来`,
+			query: `from=share&shareId=${shareId}`,
+			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-11/20231011062523504.png'
+		}
+	})
+
+	function handleItemClick(item) {
+		console.log("===item",item);
+		uni.navigateTo({
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}type=1`
+		})
+	}
+
+	function clearSearch() {
+		state.page = 1
+		getProduct()
+	}
+
+	onPullDownRefresh(() => {
+		state.page = 1
+		getClassity()
+		getBanner()
+		getProduct()
+		uni.stopPullDownRefresh()
+	})
+	
+	onReachBottom(() => {
+		if(pageList.value.length <count.value){
+			state.page += 1
+			getProduct()
+		}
+	})
+	// 距离顶部距离
+	let Scroll_X = ref(0)
+	const headerClass = ref('')
+	onPageScroll((page) => {
+		Scroll_X.value = Number(page.scrollTop.toFixed())
+		// page.scrollTop
+		if (page.scrollTop >= 76) {
+			headerClass.value = '!bg-primary !text-white'
+		} else {
+			headerClass.value = ''
+		}
+	})
+</script>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 精彩生活
+  enablePullDownRefresh: true
+</route>
+
+<style>
+	page {
+		background: #f8f8f8;
+		--nut-searchbar-background: #fff;
+		--nut-searchbar-input-background: #f8f8f8;
+		--nut-searchbar-input-box-shadow: none;
+	}
+</style>
+<style scoped lang="scss">
+	.mt-90 {
+		margin-top: 90rpx;
+	}
+
+	.swiper-height {
+		height: 320rpx;
+	}
+
+	.lab-content {
+		width: 100%;
+		height: 90rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		position: fixed;
+		top: 0;
+		margin-top: 80rpx;
+		left: 0;
+		background-color: #fff;
+		z-index: 99999;
+
+		.lab-item {
+			display: flex;
+			flex-direction: row;
+			white-space: nowrap;
+			width: 100%;
+		}
+
+		.lab-item-x {
+			display: inline-block;
+			margin-right: 10px;
+			text-align: center;
+		}
+
+		.lab-item-small {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			width: 124rpx;
+
+			.lab-default-title {
+				font-size: 28rpx;
+				margin-bottom: 10rpx;
+			}
+
+			.lab-title {
+				font-size: 32rpx;
+				margin-bottom: 10rpx;
+				color: #FE0032;
+			}
+
+			.lab-line {
+				width: 50rpx;
+				height: 6rpx;
+				background-color: #FE0032;
+				border-radius: 4rpx;
+			}
+
+			.lab-default-line {
+				width: 50rpx;
+				height: 6rpx;
+				border-radius: 4rpx;
+			}
+
+		}
+	}
+</style>

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

@@ -151,15 +151,15 @@
 	function getBanner() {
 		let _banner=''
 		if(state.type ==KINGKONGKEY.JD ){//京东
-			_banner='https://api.gdjbp.com/mweb/img/jingdong.jpg'
+			_banner='https://api.hxxfb.com/mweb/img/jingdong.jpg'
 		}else if(state.type ==KINGKONGKEY.PDD ){//拼多多
-			_banner='https://api.gdjbp.com/mweb/img/pinduoduo.jpg '
+			_banner='https://api.hxxfb.com/mweb/img/pinduoduo.jpg '
 		}else if(state.type==KINGKONGKEY.WPH){//唯品会
-			_banner='https://api.gdjbp.com/mweb/img/weipinhui.png'
+			_banner='https://api.hxxfb.com/mweb/img/weipinhui.png'
 		}else if(state.type==KINGKONGKEY.SN){//苏宁易购
-			_banner='https://api.gdjbp.com/mweb/img/suning.jpg'
+			_banner='https://api.hxxfb.com/mweb/img/suning.jpg'
 		}else if(state.type==KINGKONGKEY.TB){//淘宝
-			_banner='https://api.gdjbp.com/mweb/img/taobao.png'
+			_banner='https://api.hxxfb.com/mweb/img/taobao.png'
 		}
 		
 		topBanner.value =_banner
@@ -198,7 +198,7 @@
 		let res = uni.getSystemInfoSync();
 		let navBarHeight = (custom.top - res.statusBarHeight) * 2 + custom.height //计算得出导航栏高度
 		titleContentStyle.value = { marginTop: `${res.statusBarHeight }px`,height:`${navBarHeight}px`}
-		navBarStyle.value = { marginTop: `${custom.bottom}px` }
+		navBarStyle.value = { marginTop: `${custom.bottom-1}px` }
 	}
 	
 	function onBackClick(){uni.navigateBack()}

src/subPages/pages/refund/drawback.vue

@@ -322,7 +322,7 @@ function handleshowReasonPopup() {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
 </route>
 
 <style lang="scss">

src/subPages/pages/store/home/index.vue

@@ -511,7 +511,7 @@ function handleItemClick(item) {
 </template>
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 幸福保
   enablePullDownRefresh: true
 </route>
 

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

@@ -112,6 +112,7 @@ onLoad((option: any) => {
   // console.log("我是商品详情页");
   //二维码扫码传id/shareid
   console.log("===option",option);
+  
   if (option.scene) {
     let queryString = decodeURIComponent(option.scene)
     // 将字符串按 '&' 分割成数组
@@ -228,16 +229,6 @@ onShareAppMessage(async () => {
       }
     }
   }).catch(error => {
-    // uni.showToast({
-    //   title: '请登录后分享',
-    //   icon: 'none'
-    // }).then(() => {
-    //   setTimeout(() => {
-    //     uni.navigateTo({
-    //       url: '/pages/user/login/index'
-    //     })
-    //   }, 500)
-    // })
     uni.hideLoading()
 	return {
 		title: `${detail.value.store_name}`,
@@ -249,20 +240,6 @@ onShareAppMessage(async () => {
 })
 
 onShareTimeline(() => {
-
-  // if (!userStore.uid) {
-  //   return uni.showToast({
-  //     title: '请登录后分享',
-  //     icon: 'none'
-  //   }).then(() => {
-  //     setTimeout(() => {
-  //       uni.navigateTo({
-  //         url: '/pages/user/login/index'
-  //       })
-  //     }, 500)
-  //   })
-  // }
-
   return {
     title: `${detail.value.store_name}`,
     imageUrl: state.shareImage,
@@ -284,11 +261,6 @@ function loadCartCount() {
         title: '请登录',
         icon: 'none'
       })
-      // setTimeout(() => {
-      //   uni.navigateTo({
-      //     url: '/pages/user/login/index?key=4'
-      //   })
-      // }, 500)
     }
   })
 }
@@ -341,20 +313,6 @@ onReachBottom(() => {
 })
 
 
-// const skuData = computed(() => {
-//   const skuList = []
-//   if (detail.value && detail.sku) {
-//     for (let key in detail.sku) {
-//       const skuItem: SkuModel = detail.sku[key]
-//       skuList.push({
-//         name: skuItem.sku,
-//         id: skuItem.unique
-//       })
-//
-//       state.currentSku = skuList[0]
-//     }
-//   }
-// })
 
 const is148Merchant = computed(() => {
   return detail.value && detail.value.mer_id && detail.value.mer_id == '148'
@@ -404,6 +362,7 @@ function handleSubQg() {
 
 function handleCreateShopping() {
   // console.log(state.flag)
+  state.isShowSku=false
   console.log('我是detail数据', detail.value)
   createShopping({
     product_id: detail.value.product_id,
@@ -466,21 +425,16 @@ function handleBuyshow() {
   console.log('我是detail数据', detail.value)
   createShopping({
     product_id: detail.value.product_id,
-    // product_attr_unique: JSON.stringify(state.currentSku),
     product_attr_unique: state.currentSku.unique,
     cart_num: state.cartNum,
     is_new: (state.flag === '1' || state.flag === '3') ? '1' : '0'
   }).then(res => {
-    console.log('resres', res)
-
     if (res.cart_id) {
       uni.navigateTo({
         url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
       })
     }
   }).catch(error => {
-
-    console.log('我是error>>>', error);
     userStore.setRedirectPage(`/subPages/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
       uni.showToast({
@@ -935,12 +889,6 @@ onUnload(() => {
       <template #title>
         <div class="flex items-center" v-if="state.currentSku">
           <div class="font-bold">规格：</div>
-          <!--          <div v-for="(key, index) in Object.keys(detail.sku)"-->
-          <!--               :key="index"-->
-          <!--               class="pl-2 text-sm"-->
-          <!--          >-->
-          <!--            {{ key }}-->
-          <!--          </div>-->
           {{ state.currentSku.sku }}
         </div>
 
@@ -1181,46 +1129,13 @@ onUnload(() => {
   <CXBSkuPopup v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku" @subQg="handleSubQg"
     @submit="handleCreateShopping" @count-change="handleCountChange" @subBuy="handleBuyshow" @subAdd="handleAddshow"
     :isTo="isTo" />
-  <!--  <nut-sku-->
-  <!--      v-model:visible="state.isShowSku"-->
-  <!--      :goods="state.goods"-->
-  <!--      @selectSku="selectSku"-->
-  <!--  >-->
-  <!--    &lt;!&ndash; 商品展示区，价格区域 &ndash;&gt;-->
-  <!--    <template #sku-header-price>-->
-  <!--      <div>-->
-  <!--        <nut-price :price="goods.price" :needSymbol="true" :thousands="false"> </nut-price>-->
-  <!--        <span class="tag"></span>-->
-  <!--      </div>-->
-  <!--    </template>-->
-  <!--  </nut-sku>-->
+
 
 
   <nut-overlay v-model:visible="shareShowTips" :lock-scroll="true">
     <image :lazy-load="true" src="https://cdn.bjtdba.com/vod/image/2023-09-16/20230916194347287.png" mode="widthFix"
       class="absolute top-0 right-0"></image>
-
-    <!--    <div class="flex flex-col justify-center items-center w-full h-full"-->
-    <!--    >-->
-    <!--      <div class="bg-white">-->
-    <!--        <image :src="currentItem.image_fake" mode="widthFix" class="w-60"></image>-->
-    <!--        <div class="bg-white p-3 flex justify-around gap-3">-->
-    <!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">-->
-    <!--            <image :src="wechatImg" mode="widthFix" class="w-8 h-8"></image>-->
-    <!--            <div>微信</div>-->
-    <!--          </div>-->
-    <!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">-->
-    <!--            <image :src="pyqImg" mode="widthFix" class="w-8 h-8"></image>-->
-    <!--            <div>朋友圈</div>-->
-    <!--          </div>-->
-    <!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">-->
-    <!--            <image :src="bctpImg" mode="widthFix" class="w-8 h-8"></image>-->
-    <!--            <div>保存图片</div>-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--      </div>-->
-
-    <!--    </div>-->
+  
   </nut-overlay>
 </template>
 <style lang="scss">

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

@@ -1,11 +1,11 @@
 <script lang="ts" setup>
 import {getAboutConfig} from "~/apis/user";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {CDN_URL} from "~/config/app";
+import {CDN_URL,IMG_CDN_URL} from "~/config/app";
 const state = reactive({
-  version: '3.2.3.3',
-  name: '储蓄保',
-  logo: CDN_URL + '/static/assets/logo_220608.png',
+  version: '1.0.0.0',
+  name: '幸福保',
+ logo: IMG_CDN_URL+'logo_220607.png',
 })
 
 onLoad(() => {

uni-pages.d.ts

@@ -87,12 +87,15 @@ interface NavigateToOptions {
        "/pages/store/home/components/MerchantProductCard" |
        "/pages/store/home/components/MerchantProductList" |
        "/subPages/pages/bankDetail/index" |
+       "/subPages/pages/business-school/detail" |
+       "/subPages/pages/business-school/index" |
        "/subPages/pages/feedback/index" |
        "/subPages/pages/guest_member_new/index" |
        "/subPages/pages/help-center/index" |
        "/subPages/pages/immediate-withdrawal/index" |
        "/subPages/pages/income/index" |
        "/subPages/pages/mine-top/brokerage" |
+       "/subPages/pages/mine-top/common-webView" |
        "/subPages/pages/mine-top/contribute" |
        "/subPages/pages/mine-top/department" |
        "/subPages/pages/mine-top/jifen" |
@@ -113,6 +116,7 @@ interface NavigateToOptions {
        "/subPages/pages/phone-bill/list" |
        "/subPages/pages/quick-fuc/business" |
        "/subPages/pages/quick-fuc/life" |
+       "/subPages/pages/quick-fuc/repurchase" |
        "/subPages/pages/quick-fuc/shop" |
        "/subPages/pages/quick-fuc/vip" |
        "/subPages/pages/record-detail/detail" |