调整邀请关系

src/pages/accumulate-income/index.vue

@@ -68,7 +68,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   getUserInviteProfitList({
     ...params
   }).then(res => {
-    accumulateIncome.value = res
+	      accumulateIncome.value = res
     if (action === 'page') {
       state.list = state.list.concat(res.pageInfo.list)
     }

src/pages/home/index.vue

@@ -366,6 +366,9 @@ function Tomsindex() {
   uni.navigateTo({
     url: '/pages/miaosha/index?type_show=2'
   })
+  // uni.navigateTo({
+  //   url: `/pages/user/login/invite-login`
+  // })
 }
 
 //秒杀跳转详情页

src/pages/invite-friends/index.vue

@@ -164,7 +164,7 @@ function handleItemClick(item) {
     uid: userStore.uid,
     imgId: item.id
   }).then(res => {
-    console.log(res)
+    console.log('生成的二维码',res)
     if (res && res.shareImgs) {
       state.currentImg = res.shareImgs
     }

src/pages/order_addcart/index.vue

@@ -731,7 +731,7 @@ function handlePageClick() {
   <div @tap="handlePageClick">
     <div class="">
       <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
-      <div v-if="hasShopping" class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end ">
+      <div v-if="hasShopping" class="bg-white h-10 fixed top-0 w-full z-999 flex justify-end ">
         <div class="pr-3">
           <FButton size="small" @click="handleManageCart">
             <div>{{ state.isManage ? '管理' : '完成' }}</div>

src/pages/user/login/invite-login.vue

@@ -0,0 +1,237 @@
+<template>
+	<div v-if="showPage == true">
+		<div class="page_title">手机号登录</div>
+		<div class="flex flex-col justify-center items-center py-25">
+			<image src="https://test.bjtdba.com/applet/static/home/404986b1e3aeaf4b3829efa2c2ac6bf.png" mode="widthFix"
+				class="w-35 h-35"></image>
+		</div>
+
+		<nut-input v-model="state.phone" placeholder="请输入手机号" 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>
+
+		<div class="flex w-full">
+			<div class="p-3 w-full">
+				<nut-button type="primary" @click="handleLogin" block :disabled="!isFormVerify">登录</nut-button>
+				<!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
+				<!--          <div>-->
+				<!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
+				<!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
+				<!--          </div>-->
+				<!--        </div>-->
+
+			</div>
+
+		</div>
+
+	</div>
+</template>
+<script setup lang="ts">
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
+import { authSmsLogin, authVerify } from "~/apis/auth.api";
+import Cache from "~/utils/cache";
+import { getUserUnionId } from "~/apis/user";
+const userStore = useUserStore()
+const pageStore = usePageStoreWidthOut()
+const state = reactive({
+	phone: '',
+	code: '',
+	spread: '',
+	isAuthVerify: false,
+	buttonText: '获取验证码',
+})
+const showPage = ref(false)
+onLoad((options: any) => {
+	uni.showLoading({
+		title: '加载中',
+	});
+	console.log(userStore.uid);
+	pageStore.setPageConfig({
+		currentPage: {
+			type: 'tab',
+			url: '/pages/home/index'
+		}
+	})
+	if (userStore.uid) {
+		uni.hideLoading()
+		return uni.switchTab({
+			url: '/pages/home/index'
+		})
+	}
+	showPage.value = true
+	console.log(options);
+	uni.setNavigationBarTitle({
+		title: '手机登录'
+	})
+	if (options.scene) {
+		let queryString = decodeURIComponent(options.scene)
+		console.log(queryString);
+
+		// 将字符串按 '&' 分割成数组
+		state.spread = queryString.split('=')[1];
+		console.log(state.spread);
+	}
+	uni.hideLoading()
+})
+function sendCode() {
+	if (state.isAuthVerify) return
+	// if (this.disabled) return;
+	// this.disabled = true;
+	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 handleViewXieyi(type: number) {
+	uni.navigateTo({
+		url: `/pages/user/login/user-agreement?type=${type}`
+	})
+}
+
+function handleLogin() {
+	uni.showLoading({
+		title: '登录中'
+	});
+	const shareId = Cache.get('SHARE_ID')
+	// uni.login({
+	//   provider: 'weixin',
+	//   univerifyStyle: {
+	//     fullScreen: true
+	//   },
+	//   success: result => {
+	//     // console.log(result)
+	//     getUserUnionId({
+	//       code: result.code,
+	//       source: 'cxb'
+	//     }).then(unionRes => {
+	//       console.log(111111, unionRes)
+	//       // const shareId = Cache.get('SHARE_ID')
+	//       //存储openid
+	//       userStore.setOpenid(unionRes.openid)
+	//     })
+	//   }
+	// })
+	let params = {
+		phone: state.phone,
+		sms_code: state.code,
+		// share_id:
+	}
+	if (shareId && shareId !== '') {
+		params.share_id = shareId
+	}
+	if (state.spread && state.spread !== '' && state.spread != '0') {
+		params.spread = state.spread
+	}
+	authSmsLogin({
+		...params
+	}).then(authRes => {
+		console.log(111111, authRes)
+		userStore.login(authRes.token, authRes.exp)
+		userStore.setUID(authRes.user.uid)
+		userStore.setUserInfo(authRes.user)
+		uni.hideLoading();
+		uni.showToast({
+			title: '登录成功',
+			icon: 'none'
+		})
+		Cache.clear('SHARE_ID')
+		state.isAuthVerify = false
+		let redirectPageObj: { page: string, type: 'page' | 'tab' }
+		if (Cache.get('SHARE_REDIRECT_PAGE')) {
+			redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
+		}
+		setTimeout(() => {
+			if (redirectPageObj) {
+				if (redirectPageObj.type === 'page') {
+					return uni.redirectTo({
+						url: redirectPageObj.page
+					})
+				}
+				if (redirectPageObj.type === 'tab') {
+					return uni.switchTab({
+						url: redirectPageObj.page
+					})
+				}
+			} else {
+				uni.switchTab({
+					url: '/pages/home/index'
+				})
+			}
+		}, 200)
+
+
+	}).catch((errorMsg) => {
+		console.log(errorMsg)
+		uni.showToast({
+			title: errorMsg,
+			icon: 'none'
+		})
+	})
+}
+</script>
+  
+<route lang="yaml">
+style:
+  navigationBarTitleText: 手机号登录
+  navigationStyle: custom
+  enablePullDownRefresh: false
+</route>
+  
+<style>
+page {
+	background: #f8f8f8;
+}
+
+.page_title {
+	width: 182rpx;
+	height: 48rpx;
+	position: absolute;
+	top: 20%;
+	left: 284rpx;
+}
+</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="showPage == true">
     <CXBBanner />
 
     <nut-input v-model="state.phone" placeholder="请输入手机号" type="number">
@@ -35,7 +35,7 @@ import { authSmsLogin, authVerify } from "~/apis/auth.api";
 import Cache from "~/utils/cache";
 import { getUserUnionId } from "~/apis/user";
 const userStore = useUserStore()
-
+const pageStore = usePageStoreWidthOut()
 const state = reactive({
   phone: '',
   code: '',
@@ -43,16 +43,40 @@ const state = reactive({
   isAuthVerify: false,
   buttonText: '获取验证码',
 })
+const showPage = ref(false)
 onLoad((options: any) => {
+  uni.showLoading({
+    title: '加载中',
+  });
+
+  console.log(userStore.uid);
+
+  if (userStore.uid) {
+    pageStore.setPageConfig({
+      currentPage: {
+        type: 'tab',
+        url: '/pages/home/index'
+      }
+    })
+    uni.hideLoading()
+    return uni.switchTab({
+      url: '/pages/home/index'
+    })
+  }
+  showPage.value = true
   console.log(options);
+  uni.setNavigationBarTitle({
+    title: '手机登录'
+  })
   if (options.scene) {
     let queryString = decodeURIComponent(options.scene)
     console.log(queryString);
-    
+
     // 将字符串按 '&' 分割成数组
     state.spread = queryString.split('=')[1];
     console.log(state.spread);
   }
+  uni.hideLoading()
 })
 function sendCode() {
   if (state.isAuthVerify) return
@@ -138,8 +162,8 @@ function handleLogin() {
   if (shareId && shareId !== '') {
     params.share_id = shareId
   }
-  if(state.spread&&state.spread!==''&&state.spread!='0'){
-    params.spread=state.spread
+  if (state.spread && state.spread !== '' && state.spread != '0') {
+    params.spread = state.spread
   }
   authSmsLogin({
     ...params
@@ -191,7 +215,7 @@ function handleLogin() {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 手机登录
+  navigationBarTitleText: 储蓄保
 </route>
 
 <style>

src/pages/user/login/register-agreement.vue

@@ -1,2 +1,239 @@
-<script lang="ts" setup></script>
-<template></template>
+<template>
+	<div v-if="showPage == true">
+		<div class="page_title">手机号登录</div>
+		<div class="flex flex-col justify-center items-center py-25">
+			<image src="https://test.bjtdba.com/applet/static/home/404986b1e3aeaf4b3829efa2c2ac6bf.png" mode="widthFix"
+				class="w-35 h-35"></image>
+		</div>
+
+		<nut-input v-model="state.phone" placeholder="请输入手机号" 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>
+
+		<div class="flex w-full">
+			<div class="p-3 w-full">
+				<nut-button type="primary" @click="handleLogin" block :disabled="!isFormVerify">登录</nut-button>
+				<!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
+				<!--          <div>-->
+				<!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
+				<!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
+				<!--          </div>-->
+				<!--        </div>-->
+
+			</div>
+
+		</div>
+
+	</div>
+</template>
+<script setup lang="ts">
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
+import { authSmsLogin, authVerify } from "~/apis/auth.api";
+import Cache from "~/utils/cache";
+import { getUserUnionId } from "~/apis/user";
+const userStore = useUserStore()
+const pageStore = usePageStoreWidthOut()
+const state = reactive({
+	phone: '',
+	code: '',
+	spread: '',
+	isAuthVerify: false,
+	buttonText: '获取验证码',
+})
+const showPage = ref(false)
+onLoad((options: any) => {
+	uni.showLoading({
+		title: '加载中',
+	});
+	console.log(userStore.uid);
+	pageStore.setPageConfig({
+		currentPage: {
+			type: 'tab',
+			url: '/pages/home/index'
+		}
+	})
+	if (userStore.uid) {
+		uni.hideLoading()
+		return uni.switchTab({
+			url: '/pages/home/index'
+		})
+	}
+	showPage.value = true
+	console.log(options);
+	uni.setNavigationBarTitle({
+		title: '手机登录'
+	})
+	if (options.scene) {
+		let queryString = decodeURIComponent(options.scene)
+		console.log(queryString);
+
+		// 将字符串按 '&' 分割成数组
+		state.spread = queryString.split('=')[1];
+		console.log(state.spread);
+	}
+	uni.hideLoading()
+})
+function sendCode() {
+	if (state.isAuthVerify) return
+	// if (this.disabled) return;
+	// this.disabled = true;
+	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 handleViewXieyi(type: number) {
+	uni.navigateTo({
+		url: `/pages/user/login/user-agreement?type=${type}`
+	})
+}
+
+function handleLogin() {
+	uni.showLoading({
+		title: '登录中'
+	});
+	const shareId = Cache.get('SHARE_ID')
+	// uni.login({
+	//   provider: 'weixin',
+	//   univerifyStyle: {
+	//     fullScreen: true
+	//   },
+	//   success: result => {
+	//     // console.log(result)
+	//     getUserUnionId({
+	//       code: result.code,
+	//       source: 'cxb'
+	//     }).then(unionRes => {
+	//       console.log(111111, unionRes)
+	//       // const shareId = Cache.get('SHARE_ID')
+	//       //存储openid
+	//       userStore.setOpenid(unionRes.openid)
+	//     })
+	//   }
+	// })
+	let params = {
+		phone: state.phone,
+		sms_code: state.code,
+		// share_id:
+	}
+	if (shareId && shareId !== '') {
+		params.share_id = shareId
+	}
+	if (state.spread && state.spread !== '' && state.spread != '0') {
+		params.spread = state.spread
+	}
+	authSmsLogin({
+		...params
+	}).then(authRes => {
+		console.log(111111, authRes)
+		userStore.login(authRes.token, authRes.exp)
+		userStore.setUID(authRes.user.uid)
+		userStore.setUserInfo(authRes.user)
+		uni.hideLoading();
+		uni.showToast({
+			title: '登录成功',
+			icon: 'none'
+		})
+		Cache.clear('SHARE_ID')
+		state.isAuthVerify = false
+		let redirectPageObj: { page: string, type: 'page' | 'tab' }
+		if (Cache.get('SHARE_REDIRECT_PAGE')) {
+			redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
+		}
+		setTimeout(() => {
+			if (redirectPageObj) {
+				if (redirectPageObj.type === 'page') {
+					return uni.redirectTo({
+						url: redirectPageObj.page
+					})
+				}
+				if (redirectPageObj.type === 'tab') {
+					return uni.switchTab({
+						url: redirectPageObj.page
+					})
+				}
+			} else {
+				uni.switchTab({
+					url: '/pages/home/index'
+				})
+			}
+		}, 200)
+
+
+	}).catch((errorMsg) => {
+		console.log(errorMsg)
+		uni.showToast({
+			title: errorMsg,
+			icon: 'none'
+		})
+	})
+}
+</script>
+  
+<route lang="yaml">
+style:
+  navigationBarTitleText: 手机号登录
+  navigationStyle: custom
+  enablePullDownRefresh: false
+</route>
+  
+<style>
+page {
+	background: #f8f8f8;
+}
+
+.page_title {
+	width: 180rpx;
+	height: 48rpx;
+	position: absolute;
+	margin-top: 110rpx;
+	left: 50%;
+    text-align: center;
+    margin-left: -90rpx;
+}
+</style>