2024.02.04

- 底层封装优化；
- 获取名片信息接口对接；

App.vue

@@ -38,6 +38,11 @@ export default {
 		// 画布设备 1 小程序，2 H5，3 App 4 电脑
 		terminal: ''
 	},
+	data() {
+		return {
+			scene: ''
+		}
+	},
 	mounted() {
 		this.$store.dispatch('app/getUserSystermInfo')
 		const launchOptions = uni.getLaunchOptionsSync()

another-tf/another-serve/bindPhone/index.vue

@@ -0,0 +1,290 @@
+<template>
+	<view class="bind-phone-container">
+		<BeeBack>
+			<view style="display: flex;align-items: center;justify-content: space-between;">
+				<BeeIcon name="arrowleft" :size="34" color="#222229" style="width: fit-content;">
+				</BeeIcon>
+				<text style="flex: 1;margin-left: -40rpx;text-align: center;line-height: 2.5;">绑定手机号</text>
+			</view>
+		</BeeBack>
+		<view class="loginInfo fs26 font-color-999">
+			<p>共建真实、安全的交易环境</p>
+			<p>本平台承诺不会滥用您授权的信息</p>
+		</view>
+		<view v-if="verifyType === 0" class="verifyTypeBox">
+			<view class="verifyItem" @click="verifyType = 1">
+				短信验证码
+			</view>
+			<view class="verifyItem verify-checked" @click="verifyType = 2">
+				小程序授权
+			</view>
+		</view>
+		<view v-else-if="verifyType === 1" class="phoneVerify">
+			<view class="iphoneNum-box flex-row-plus flex-items">
+				<tui-icon :size="50" color="#cccccc" name="mobile" unit="rpx" margin="0 30rpx 0 0"></tui-icon>
+				<view>
+					<input v-model="phone" maxlength="11" type="number" placeholder="请输入您的手机号" />
+				</view>
+			</view>
+			<view class="mar-top-20">
+				<view class="code-box">
+					<tui-icon :size="50" color="#cccccc" name="shield" unit="rpx" margin="0 30rpx 0 0"></tui-icon>
+					<tui-input
+						v-model="code" padding="26rpx 20rpx 26rpx 0" background-color="transparent" label-color="#ffffff"
+						placeholder="请输入验证码" style="flex: 1;border-bottom: 2rpx solid #ffffff;"
+					>
+						<template #right>
+							<tui-countdown-verify
+								ref="refBindPhoneVerify" width="188rpx" height="48rpx" border-width="0"
+								text="获取验证码"
+								:size="30" color="#dddddd" @send="handleSendVerify"
+							></tui-countdown-verify>
+						</template>
+					</tui-input>
+				</view>
+			</view>
+
+			<view class="mar-top-60">
+				<view
+					class="registerBut mar-top-100" :class="{ bindCls: (phone !== '') && (code !== '') }"
+					@click="handleBindPhone"
+				>
+					确认
+				</view>
+			</view>
+		</view>
+		<view v-else-if="verifyType === 2" class="mpVerify">
+			<button
+				v-if="[ 4 ].includes($store.state.app.terminal)" class="verifyPhone" open-type="getAuthorize"
+				scope="phoneNumber" @getAuthorize="onGetAuthorize" @error="() => { }"
+			>
+				授权手机号验证
+			</button>
+
+			<button
+				v-if="[ 2 ].includes($store.state.app.terminal)" class="verifyPhone fs28 mar-top-100"
+				open-type="getPhoneNumber" @getphonenumber="getWxPhoneNumber"
+			>
+				微信手机号授权
+			</button>
+		</view>
+		<view v-if="(verifyType !== 0) && [2, 4].includes($store.state.app.terminal)" class="backBtn" @click="verifyType = 0">
+			返回
+		</view>
+	</view>
+</template>
+
+<script>
+import { getVerifyCodeApi, updateAliPhoneAppApi, getSessionKeyAppApi, updateSetWxPhoneAppApi, updateWxPhoneAppApi } from '../../../api/anotherTFInterface'
+export default {
+	name: 'BindPhone',
+	data() {
+		return {
+			phone: '',
+			code: '',
+			wechatOpenId: '',
+			headImage: '',
+			wechatName: '',
+			verifyType: 0,
+			buyerUserId: 0
+		}
+	},
+	onLoad(options) {
+		this.wechatOpenId = options.wechatOpenId
+		this.headImage = options.headImage
+		this.wechatName = options.wechatName
+		this.buyerUserId = options.buyerUserId
+		if (![2, 4].includes(this.$store.state.app.terminal)) this.verifyType = 1
+	},
+	methods: {
+		// 获取验证码
+		handleSendVerify() {
+			if (!this.phone) {
+				this.$refs.refBindPhoneVerify.reset()
+				return this.$showToast('请填写手机号')
+			}
+			if (!/^1[3-9]\d{9}$/.test(this.phone)) {
+				this.$refs.refBindPhoneVerify.reset()
+				return this.$showToast('请输入正确的手机号')
+			}
+			getVerifyCodeApi({ phone: this.phone })
+				.then((res) => {
+					this.$refs.refBindPhoneVerify.success()
+					this.$showToast('发送成功，请注意查看手机短信')
+				})
+				.catch(() => {
+					this.$refs.refBindPhoneVerify.reset()
+				})
+		},
+
+		handleBindPhone() {
+			if ([ 4 ].includes(this.$store.state.app.terminal)) {
+				this.updateAliPhone(this.phone, false)
+			} else if ([2, 3].includes(this.$store.state.app.terminal)) {
+				this.updateWxPhone()
+			}
+		},
+
+		updateWxPhone() {
+			updateWxPhoneAppApi({
+				phone: this.phone,
+				wechatOpenId: this.wechatOpenId,
+				headImage: this.headImage,
+				wechatName: this.wechatName,
+				verificationCode: this.code,
+				channelCode: '',
+				terminal: 3
+			}).then((res) => {
+				this.$showToast('绑定成功')
+				this.$store.dispatch('auth/LoginAfterAction', { type: 'wx', data: res.data })
+			})
+		},
+
+		getWxPhoneNumber(e) {
+			if (e.detail.errMsg === 'getPhoneNumber:ok') {
+				uni.login({
+					provider: 'weixin',
+					success: (res) => {
+						getSessionKeyAppApi({
+							code: res.code
+						}).then((result) => {
+							updateSetWxPhoneAppApi({
+								wechatOpenId: result.data.wechatOpenId,
+								sessionKey: result.data.sessionKey,
+								encryptedData: e.detail.encryptedData,
+								iv: e.detail.iv,
+								headImage: this.headImage,
+								wechatName: this.wechatName
+							}).then((res) => {
+								this.$showToast('绑定成功')
+								this.$store.dispatch('auth/LoginAfterAction', { type: 'wx', data: res.data })
+							})
+						})
+					},
+					fail: () => {
+						this.$showToast('微信登录授权失败')
+					}
+				})
+			} else {
+				this.$showToast('获取手机授权失败')
+			}
+		},
+		onGetAuthorize() {
+			const that = this
+			uni.showLoading({
+				mask: true,
+				title: '验证中...'
+			})
+			my.getPhoneNumber({
+				success: (res) => {
+					uni.hideLoading()
+					that.updateAliPhone(res.response, true)
+				},
+				fail: (res) => {
+					uni.hideLoading()
+					this.$showToast('验证失败')
+				}
+			})
+		},
+		updateAliPhone(encryptedData, encrypted) {
+			uni.showLoading()
+			updateAliPhoneAppApi({
+				'phone': encryptedData,
+				'buyerUserId': this.buyerUserId,
+				encrypted
+			}).then((res) => {
+				uni.hideLoading()
+				this.$showToast('绑定成功')
+				this.$store.dispatch('auth/LoginAfterAction', { type: 'alipay', data: res.data })
+			})
+				.catch((e) => {
+					uni.hideLoading()
+				})
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.bind-phone-container {
+	min-height: 100vh;
+	box-sizing: border-box;
+
+	.loginInfo {
+		margin: 130rpx 0 50rpx 0;
+		text-align: center;
+	}
+
+	.verifyTypeBox {
+		width: 98%;
+
+		.verifyItem {
+			width: 80%;
+			display: block;
+			text-align: center;
+			border: 2rpx solid #F3F4F5;
+			padding: 30rpx;
+			font-size: 34rpx;
+			margin: 0 auto 30rpx auto;
+			color: #C5AA7B;
+		}
+
+		.verify-checked {
+			color: white;
+			background: #C5AA7B;
+		}
+	}
+
+	.phoneVerify {
+		padding: 20rpx 30rpx;
+
+		.iphoneNum-box {
+			border-bottom: 1rpx solid #DDDDDD;
+		}
+
+		.code-box {
+			border-bottom: 1rpx solid #DDDDDD;
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.registerBut {
+			background: #F3F4F5;
+			color: #999999;
+			height: 100rpx;
+			width: 600rpx;
+			text-align: center;
+			line-height: 100rpx;
+			margin: 30rpx auto;
+		}
+
+		.bindCls {
+			background: #333333;
+			color: #F5DEB2;
+		}
+	}
+
+	.mpVerify {
+		height: 300rpx;
+
+		.verifyPhone {
+			background: #333333;
+			color: #FFEBC4;
+			height: 100rpx;
+			width: 600rpx;
+			text-align: center;
+			line-height: 100rpx;
+			margin-top: 88rpx;
+			border-radius: 0;
+		}
+	}
+
+	.backBtn {
+		color: #C5AA7B;
+		text-align: center;
+		text-decoration: underline;
+	}
+}
+</style>

user/service/edit/edit.vue → another-tf/another-user/calling-card/edit.vue

@@ -1,48 +1,40 @@
 <template>
 	<view>
 		<view class="wrap">
-			<u--form ref="form1" label-position="left" :model="cardObj" :rules="rules" label-width="80">
-				<u-form-item label="姓名" prop="cardObj.name" border-bottom>
-					<u--input v-model="cardObj.name" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="电话" prop="cardObj.phone" border-bottom>
-					<u--input v-model="cardObj.phone" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="公司" prop="company" border-bottom>
-					<u--input v-model="cardObj.company" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="地址" prop="address" border-bottom>
-					<u--input v-model="cardObj.address" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="职位" prop="job" border-bottom>
-					<u--input v-model="cardObj.job" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="微信" prop="wechat" border-bottom>
-					<u--input v-model="cardObj.wechat" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="QQ" prop="wechat" border-bottom>
-					<u--input v-model="cardObj.qq" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="邮箱" prop="email" border-bottom>
-					<u--input v-model="cardObj.email" border="none"></u--input>
-				</u-form-item>
-				<u-form-item label="业务介绍" prop="intro" border-bottom>
-					<u--textarea v-model="cardObj.intro" border="none"></u--textarea>
-				</u-form-item>
-				<u-form-item label="头像" prop="intro" border-bottom>
-					<u-upload
-						:file-list="fileList1" name="5" :max-count="1" :preview-full-image="true"
-						@afterRead="afterRead"
-						@delete="deletePic"
-					>
-					</u-upload>
-				</u-form-item>
-			</u--form>
+			<tui-form ref="refLoginForm" :show-message="false">
+				<view>
+					<tui-input
+						v-model="cardObj.name" label="姓名" type="number" padding="26rpx 20rpx 26rpx 0"
+						placeholder-style="color: #f3c1c4;font-size: 32rpx;" label-color="#ffffff" border-color="#EA5B1D"
+						placeholder="请输入姓名" background-color="transparent" :border-top="false" color="#ffffff"
+						style="border-bottom: 2rpx solid #ffffff;"
+					></tui-input>
+				</view>
+				<view>
+					<tui-input
+						v-model="cardObj.phone" label="+ 86" type="number" padding="26rpx 20rpx 26rpx 0"
+						placeholder-style="color: #f3c1c4;font-size: 32rpx;" label-color="#ffffff" border-color="#EA5B1D"
+						placeholder="请输入电话" background-color="transparent" :border-top="false" color="#ffffff"
+						style="border-bottom: 2rpx solid #ffffff;"
+					></tui-input>
+				</view>
+				<view>
+					<JUpload
+						title="头像" :img-url="common.seamingImgUrl(cardObj.head_img)" @upload="handleSaveHeadImg"
+						@delete="cardObj.head_img = '' || $forceUpdate()"
+					></JUpload>
+				</view>
+			</tui-form>
 			<view class="wrap">
 				<view style="float:left;width: 40px;">
-					<u-checkbox-group v-model="checked" change="changeClick()">
-						<u-checkbox shape="circle"></u-checkbox>
-					</u-checkbox-group>
+					<tui-icon
+						v-if="checked" name="circle-fill" :size="34" unit="rpx"
+						color="#c5aa7b" margin="0 15rpx 0 0" @click="checked = false"
+					></tui-icon>
+					<tui-icon
+						v-else name="circle" :size="34" unit="rpx"
+						color="#cccccc" margin="0 15rpx 0 0" @click="checked = true"
+					></tui-icon>
 				</view>
 				<text style="float:left;color:#04498c" @click="goAgree()">同意用户服务协议&隐私政策</text>
 			</view>
@@ -103,6 +95,10 @@ export default {
 		}
 	},
 	methods: {
+		handleSaveHeadImg() {
+			this.cardObj.head_img = e
+			this.$forceUpdate()
+		},
 		goAgree() {
 			uni.navigateTo({
 				url: '/pages/agree'

api/anotherTFInterface/index.js

@@ -1,15 +1,5 @@
 import { AnotherTFRequest } from '../../utils'
 
-/**
- * @description 商城相关接口
- */
-
-// 登录拿 新团蜂的 token
-export const getAnotherTFTokenApi = (data) => AnotherTFRequest('/app/tmpLoginOrRegByPhone', data)
-
-// 判断用户是否是商家
-export const getIsShopByUserApi = (data) => AnotherTFRequest('/shop/getShopByUser', data)
-
 // 查询名片信息
 export const getIdEnterpriseUserApi = (data) => AnotherTFRequest('/dtsEnterpriseUser/getId', data)
 
@@ -36,3 +26,46 @@ export const updateByLabelEnterpriseUserLikeApi = (data) => AnotherTFRequest('/d
 
 // 取消点赞标签
 export const updateByIdCanEnterpriseUserLikeApi = (data) => AnotherTFRequest('/dtsEnterpriseUserLike/likeByIdCan', data, 'POST')
+
+/**
+ * @description 商城相关接口
+ */
+
+// 获取支付宝小程序手机号绑定
+export const updateAliPhoneAppApi = (data) => AnotherTFRequest('/app/updateAliPhone', data, 'POST')
+
+// 获取短信验证码
+export const getCodeBusinessApi = (data) => AnotherTFRequest('/app/getCode', data, 'POST')
+
+// 获取短信验证码
+export const getVerifyCodeApi = (data) => AnotherTFRequest('/app/getCode', data)
+
+// 手机号验证码登录、注册
+export const updatePhoneLoginRegisterApi = (data) => AnotherTFRequest('/app/login', data, 'POST')
+
+// 支付宝登录
+export const updateAlipayLoginApi = (data) => AnotherTFRequest('/app/alipayLogin', data, 'POST')
+
+// 微信登录
+export const updateWXLoginApi = (data) => AnotherTFRequest('/app/wxLogin', data, 'POST')
+
+// APP微信登录
+export const updateWXAppLoginApi = (data) => AnotherTFRequest('/app/wxAppLogin', data, 'POST')
+
+// 获取微信手机号绑定
+export const getSessionKeyAppApi = (data) => AnotherTFRequest('/app/getSessionKey', data, 'POST')
+
+// 获取微信手机号绑定
+export const updateSetWxPhoneAppApi = (data) => AnotherTFRequest('/app/setWxPhone', data, 'POST')
+
+// 获取微信手机号绑定
+export const updateWxPhoneAppApi = (data) => AnotherTFRequest('/app/updateWxPhone', data, 'POST')
+
+// 判断用户是否是商家
+export const getIsShopByUserApi = (data) => AnotherTFRequest('/shop/getShopByUser', data)
+
+// 个人系信息查询
+export const getUserInfoApi = (data) => AnotherTFRequest('/user/getUser', data)
+
+// 个人系信息修改
+export const updateUserInfoApi = (data) => AnotherTFRequest('/user/update', data, 'POST')

components/ATFMoreUpload/ATFMoreUpload.vue

@@ -0,0 +1,144 @@
+<template>
+	<view>
+		<view v-if="title" class="title">{{ title }}</view>
+		<view class="upload-pane">
+			<view class="left">
+				<view class="upload" @click="chooseImg">+</view>
+				<view v-for="item in imgs" :key="item" class="img-wrapper">
+					<img class="iamge-background img" :src="item" mode="" />
+					<JIcon
+						class="delete-icon"
+						width="40"
+						height="40"
+						type="delete"
+						@click="removeBackground(item)"
+					></JIcon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { ANOTHER_TF_UPLOAD } from '../../config'
+import { T_STORAGE_KEY } from '../../constant'
+
+export default {
+	name: 'ATFMoreUpload',
+	props: {
+		title: String,
+		imgs: {
+			type: Array,
+			required: true
+		}
+	},
+	methods: {
+		removeBackground(item) {
+			console.log(item)
+			const _this = this
+			uni.showModal({
+				title: '提示',
+				content: '确定删除当前图片吗？',
+				success(res) {
+					if (res.confirm) {
+						_this.$emit('delete', item)
+					}
+				}
+			})
+		},
+
+		chooseImg() {
+			const _this = this
+			uni.chooseImage({
+				extension: ['png', 'jpg', 'jpeg', 'webp', 'gif', 'image'],
+				success: (chooseImageRes) => {
+					uni.uploadFile({
+						url: ANOTHER_TF_UPLOAD,
+						filePath: chooseImageRes.tempFiles[0].path,
+						name: 'file',
+						header: {
+							Authorization: (uni.getStorageSync(T_STORAGE_KEY) || {}).token
+						},
+						formData: {
+							'folderId': -1
+						},
+						success: (uploadFileRes) => {
+							_this.$emit('upload', JSON.parse(uploadFileRes.data).data.url)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.title {
+  color: #3d3d3d;
+  font-size: 24upx;
+  margin: 48upx 0 20upx 0;
+
+}
+
+.upload-pane {
+  border: 1upx solid #d8d8d8;
+  padding: 32upx 24upx;
+  box-sizing: border-box;
+  border-radius: 20upx;
+
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+
+  .delete-icon {
+    width: 32upx;
+    height: 36upx;
+  }
+
+  .left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+
+  .upload {
+    margin: 0;
+    width: 160upx;
+    // height: 160upx;
+    background-color: #ececec;
+    border-radius: 20upx;
+    color: #767676;
+    text-align: center;
+    line-height: 160upx;
+    font-size: 60upx;
+    margin-right: 40upx;
+    margin-bottom: 20upx;
+  }
+
+  .iamge-background {
+    width: 160upx;
+    height: 160upx;
+    object-fit: cover;
+  }
+
+  .img-wrapper {
+    margin-right: 40upx;
+    position: relative;
+
+    .delete-icon {
+      position: absolute;
+      top: -10upx;
+      right: -10px;
+      border-radius: 50%;
+      background-color: #ffffff;
+    }
+
+    .img {
+      border-radius: 20upx;
+      margin-bottom: 20upx;
+    }
+  }
+}
+</style>

components/ATFUpload/ATFUpload.vue

@@ -0,0 +1,108 @@
+<template>
+	<view>
+		<view v-if="title" class="title">{{ title }}</view>
+		<view class="upload-pane">
+			<view class="left">
+				<view v-if="!imgUrl" class="upload" @click="chooseImg">+</view>
+				<image v-else-if="imgUrl" class="iamge-background" :src="imgUrl" mode="" />
+			</view>
+			<tui-icon v-show="imgUrl" name="delete" color="#767676" :size="18" @click="removeBackground"></tui-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+import { ANOTHER_TF_UPLOAD } from '../../config'
+import { T_STORAGE_KEY } from '../../constant'
+
+export default {
+	name: 'ATFUpload',
+	props: {
+		imgUrl: String,
+		title: String
+	},
+	methods: {
+		removeBackground() {
+			const _this = this
+			uni.showModal({
+				title: '提示',
+				content: '确定删除当前图片吗？',
+				success(res) {
+					if (res.confirm) {
+						_this.$emit('delete')
+					}
+				}
+			})
+		},
+
+		chooseImg() {
+			const _this = this
+			uni.chooseImage({
+				success: (chooseImageRes) => {
+					uni.uploadFile({
+						url: ANOTHER_TF_UPLOAD,
+						filePath: chooseImageRes.tempFiles[0].path,
+						name: 'file',
+						header: {
+							Authorization: (uni.getStorageSync(T_STORAGE_KEY) || {}).token
+						},
+						formData: {
+							'folderId': -1
+						},
+						success: (uploadFileRes) => {
+							_this.$emit('upload', JSON.parse(uploadFileRes.data).data.url)
+						}
+					})
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.title {
+  color: #3d3d3d;
+  font-size: 24upx;
+  margin: 48upx 0 20upx 0;
+}
+
+.upload-pane {
+  border: 1upx solid #d8d8d8;
+  padding: 32upx 24upx;
+  box-sizing: border-box;
+  border-radius: 20upx;
+
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+
+  .delete-icon {
+    width: 32upx;
+    height: 36upx;
+  }
+
+  .left {
+    display: flex;
+    align-items: center;
+  }
+
+  .upload {
+    margin: 0;
+    width: 160upx;
+    height: 160upx;
+    background-color: #ececec;
+    border-radius: 20upx;
+    color: #767676;
+    text-align: center;
+    line-height: 160upx;
+    font-size: 60upx;
+  }
+
+  .iamge-background {
+    width: 160upx;
+    height: 160upx;
+    object-fit: cover;
+  }
+}
+</style>

components/Avatar/Avatar.vue

@@ -0,0 +1,53 @@
+<template>
+  <view class="avatar-container" @click="$emit('click')">
+    <image
+		
+      :src="src"
+      :mode="mode"
+      :style="{
+        borderRadius: radius * 2 + 'rpx',
+        width: size * 2 + 'rpx',
+        height: size * 2 + 'rpx',
+        margin: margin,
+      }"
+    />
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    src: {
+      type: String,
+      required: true,
+    },
+
+    radius: {
+      type: Number,
+      default: 100,
+    },
+
+    mode: {
+      type: String,
+    },
+
+    size: {
+      type: Number,
+      default: 60,
+    },
+
+    margin: {
+      type: String,
+      default: '',
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.avatar-container {
+  image {
+    flex-shrink: 0;
+  }
+}
+</style>

components/BeeBack/BeeBack.vue

@@ -0,0 +1,74 @@
+<template>
+	<view class="back-container" @click="handleBack">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+// import { tabbarList } from '../../common/globalData'
+
+export default {
+	name: 'BeeBack',
+	props: {
+		url: {
+			type: String,
+			default: ''
+		},
+		tab: {
+			type: String,
+			default: ''
+		},
+		redirect: {
+			type: String,
+			default: ''
+		},
+		successCb: {
+			type: Function,
+			default: () => {}
+		}
+	},
+	methods: {
+		handleBack() {
+			if (this.tab) {
+				this.$switchTab(this.url)
+			} else if (this.redirect) {
+				uni.redirectTo({
+					url: this.url
+				})
+			} else if (this.url) {
+				uni.navigateTo({
+					url: this.url
+				})
+			}
+
+			const pages = getCurrentPages()
+			const pagesLength = pages.length
+			let backLevel = 1
+			if (pages.length === 1) {
+				this.$switchTab('/pages/index/index')
+			} else {
+				const lastUrl = pages[pagesLength - 1].route + this.getParams(pages[pagesLength - 1].options)
+				for (
+					let index = pages.length - 1;
+					index > 0 && index < pages.length;
+					index--
+				) {
+					if (pages[index].route + this.getParams(pages[index].options) === lastUrl) {
+						backLevel += 1
+					} else {
+						break
+					}
+				}
+				uni.navigateBack({
+					delta: backLevel - 1,
+					success: this.successCb
+				})
+			}
+		},
+
+		getParams(options) {
+			return JSON.stringify(options)
+		}
+	}
+}
+</script>

components/BeeIcon/BeeIcon.vue

@@ -0,0 +1,67 @@
+<template>
+  <view class="icon-container" @click="$emit('click')">
+    <image
+      :src="src"
+      :style="{
+        width: width ? width : size * 2 + 'rpx',
+        height: width ? height : size * 2 + 'rpx',
+      }"
+      v-if="src"
+      mode=""
+    />
+
+    <tui-icon
+      v-if="name"
+      :name="name"
+      :color="color"
+      :size="size"
+    ></tui-icon>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    src: {
+      type: String,
+      default: '',
+    },
+
+    name: {
+      type: String,
+      default: '',
+    },
+
+    size: {
+      type: Number,
+      default: 20,
+    },
+
+    color: {
+      type: String,
+      default: '#ccc',
+    },
+
+    width: {
+      type: String,
+      default: '',
+    },
+
+    height: {
+      type: String,
+      default: '',
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.icon-container {
+  flex-shrink: 0;
+  line-height: inherit;
+
+  image {
+    vertical-align: middle;
+  }
+}
+</style>

components/JAvatar/JAvatar.vue

@@ -0,0 +1,46 @@
+<template>
+	<view class="j-avatar">
+		<image
+			:style="{
+				'width': size * 1 + 'rpx',
+				'height': size * 1 + 'rpx',
+				'border-radius': radius.includes('%') ? radius : radius * 1 + 'rpx',
+				border
+			}"
+			class="img"
+			:src="src"
+		/>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		src: {
+			type: String,
+			required: true
+		},
+
+		size: {
+			type: [Number, String],
+			default: 60
+		},
+
+		radius: {
+			type: [Number, String],
+			default: '50%'
+		},
+
+		border: {
+			type: String,
+			default: ''
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.img {
+  object-fit: cover;
+}
+</style>

components/JBack/JBack.vue

@@ -0,0 +1,42 @@
+<template>
+	<view class="j-back-container">
+		<image
+			:style="{
+				width: width * 1 + 'rpx',
+				height: height * 1 + 'rpx'
+			}" :src="dark
+				? require('../../static/images/store/chevron-states.png')
+				: require('../../static/images/common/back.png')
+			" mode="" @click="handleBack"
+		/>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'JBack',
+	props: {
+		tabbar: {
+			type: String
+		},
+		width: {
+			type: [Number, String],
+			default: 16
+		},
+		height: {
+			type: [Number, String],
+			default: 28
+		},
+		dark: Boolean
+	},
+	methods: {
+		handleBack() {
+			if (this.tabbar) {
+				this.$switchTab(this.tabbar)
+				return
+			}
+			uni.navigateBack()
+		}
+	}
+}
+</script>

components/JHeader/JHeader.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="j-header-container">
+		<JBack :width="$attrs.width" :height="$attrs.height" :tabbar="$attrs.tabbar" :dark="dark"></JBack>
+		<view
+			class="title" :style="{
+				color: !dark ? '#fff' : ''
+			}"
+		>
+			{{ title }}
+		</view>
+		<view class="footerFn">
+			<slot name="ftFn"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'JHeader',
+	props: {
+		dark: {
+			type: Boolean,
+			default: true
+		},
+		title: {
+			type: String,
+			required: true
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+@import "../../style/mixin.less";
+
+.j-header-container {
+	position: relative;
+	// display: flex;
+	// justify-content: space-between;
+
+	.flex(center, center);
+
+	.title {
+		font-size: 32upx;
+		color: #3d3d3d;
+		font-weight: bold;
+		// margin-top: -8upx;
+		flex: 1;
+		text-align: center;
+		margin-left: -50upx;
+	}
+	.footerFn {
+		position: absolute;
+		right: 0rpx;
+	}
+}
+</style>

components/JIcon/JIcon.vue

@@ -0,0 +1,35 @@
+<template>
+  <image
+    @click="$emit('click')"
+    v-if="iconUrl"
+    :style="{
+      width: width + 'rpx',
+      height: height + 'rpx',
+    }"
+    :src="iconUrl"
+    mode=""
+    class="j-icon"
+  />
+</template>
+
+<script>
+import { types } from "./icons";
+
+export default {
+  props: {
+    type: {
+      type: String,
+      required: true,
+    },
+
+    width: [String, Number],
+    height: [String, Number],
+  },
+
+  computed: {
+    iconUrl() {
+      return types[this.type];
+    },
+  },
+};
+</script>

components/JIcon/icons.js

@@ -0,0 +1,19 @@
+export const types = {
+	'right-arrow': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/nnykqa10hv024q7pvtqh.png', // 右，灰色，箭头
+	'close': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/q5n6tmqehph8ty2nokal.png', // 关闭
+	'delete': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/tzyw7gxj87akhja5cl55.png', // 删除
+	'share': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/w1l9jhs5w7w7v2z8qt71.png', // 分享
+	'red-modal': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/eefc6ub7z9qprfscgr03.png',
+	'phone': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/vv5xwu9a6qqzpzho6x75.png', // 蓝色-phone
+	'main-locale': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/zp9ytk6g2z05bp0gi631.png',
+	'tuanfeng': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/na0ctefkhoyxslb4bthz.png', // 团蜂
+	'edit': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/eerrn9k4wio38zy6kg3k.png',
+	'mobile': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/zxaumfzs792kmow7mkvt.png', // 触屏手机
+	'weiXin': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/cn6pi0k9jkuu3jfsv3wr.png', // 微信，灰
+	'gray-locale': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/gie52p3486xt4huyx5bn.png', // 定位 灰
+	'active': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/0kut8emy01lkcxd0gvxg.png', // 选中时显示勾
+	'modal': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/vmdsaejtrqyluz8uhfkb.png', // 勋章
+	'local-black': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/2lvq1mi90v8e73xx7ozh.png', // 黑色定位
+	'empty': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/8vht7teaqd7nrqxxdfhg.png', // 空
+	'order-shop': 'https://www.tuanfengkeji.cn:9527/jf-admin-api/admin/storage/fetch/au0lt13ad4mjposzwh8p.webp' // gouwuche
+}

components/LoadingMore/LoadingMore.vue

@@ -0,0 +1,103 @@
+<template>
+  <view
+    class="loading-more-container"
+    v-show="['loading', 'no-more'].includes(status)"
+  >
+    <div id="loading-wrapper" v-show="status === 'loading'">
+      <div class="dot"></div>
+      <div class="dot"></div>
+      <div class="dot"></div>
+      <div class="dot"></div>
+      <div class="dot"></div>
+    </div>
+
+    <view class="no-more" v-show="status === 'no-more'">{{ text }}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    status: {
+      type: String,
+      default: 'loading',
+      validate(value) {
+        if (!['loading', 'no-more'].includes(value)) {
+          console.warn('loading的取值必须是loading或者no-more')
+        }
+        return true
+      },
+    },
+
+    text: {
+      type: String,
+      default: '没有更多了',
+    },
+  },
+
+  watch: {
+    status(value) {
+      // console.log(value)
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.loading-more-container {
+  width: 100%;
+  height: 120upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.dot {
+  width: 4px;
+  height: 4px;
+  border-radius: 2px;
+  background: #ffc117;
+  float: left;
+  margin: 0 3px;
+  animation: dot linear 1s infinite;
+  -webkit-animation: dot linear 1s infinite;
+}
+.dot:nth-child(1) {
+  animation-delay: 0s;
+}
+.dot:nth-child(2) {
+  animation-delay: 0.15s;
+}
+.dot:nth-child(3) {
+  animation-delay: 0.3s;
+}
+.dot:nth-child(4) {
+  animation-delay: 0.45s;
+}
+.dot:nth-child(5) {
+  animation-delay: 0.6s;
+}
+@keyframes dot {
+  0%,
+  60%,
+  100% {
+    transform: scale(1);
+  }
+  30% {
+    transform: scale(2.5);
+  }
+}
+@-webkit-keyframes dot {
+  0%,
+  60%,
+  100% {
+    transform: scale(1);
+  }
+  30% {
+    transform: scale(2.5);
+  }
+}
+
+.no-more {
+  color: #ccc;
+}
+</style>

components/TuanAppShim/TuanAppShim.vue

@@ -0,0 +1,35 @@
+<template>
+	<view
+		class="tuan-app-shim-container" :style="{
+			height: (systermInfo.statusBarHeight || 0) + add * 1 + 'px',
+			background: bg
+		}" style="width: 100%"
+	>
+	</view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+
+export default {
+	name: 'TuanAppShim',
+	props: {
+		add: {
+			type: [Number, String],
+			default: 0
+		},
+
+		bg: {
+			type: String,
+			default: 'transparent'
+		}
+	},
+	computed: {
+		...mapGetters([ 'systermInfo' ])
+	}
+}
+</script>
+
+<style lang="less">
+.tuan-app-shim-container {}
+</style>

components/uni-agreements/uni-agreements.vue

@@ -1,62 +0,0 @@
-<template>
-	<view class="root">
-		<checkbox-group @change="setAgree" class="checkbox-group">
-			<checkbox  style="transform: scale(0.7);" />
-			<text>同意</text>
-		</checkbox-group>
-		<template v-for="(agreement,index) in agreements">
-			<text class="agreement" @click="navigateTo(agreement)">{{agreement.title}}</text>
-			<text class="hint" v-if="hasAnd(agreements,index)">和</text>
-		</template>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"uni-agreements",
-		computed:{
-			agreements(){
-				return getApp().globalData.config.about.agreements||[]
-			}
-		},
-		methods:{
-			navigateTo({url,title}){
-				uni.navigateTo({
-					url: '/pages/common/webview/webview?url='+url+'&title='+title,
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			hasAnd(agreements,index){
-				return agreements.length-1>index
-			},
-			setAgree(e){
-				this.isAgree = !this.isAgree
-				this.$emit('setAgree',this.isAgree)
-			}
-		},
-		data() {
-			return {
-				isAgree:false
-			};
-		}
-	}
-</script>
-
-<style>
-.root{
-	flex-direction: row;
-	align-items: center;
-	font-size: 28rpx;
-	color: #8a8f8b;
-}
-.checkbox-group{
-	align-items: center;
-	display: flex;
-	flex-direction: row;
-}
-.agreement{
-	color:#04498c;
-}
-</style>

components/uni-quick-login/uni-quick-login.vue

@@ -1,368 +0,0 @@
-<template>
-	<view class="quick-login-box">
-		<view class="item" v-for="(item,index) in servicesList" :key="index"
-			@click="item.path?to(item.path):login_before(item.id,false)">
-			<image class="logo" :src="item.logo" mode="widthFix"></image>
-			<text class="login-title">{{item.text}}</text>
-		</view>
-	</view>
-</template>
-<script>
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
-	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
-	import loginSuccess from '@/pages/ucenter/login-page/common/loginSuccess.js';
-	export default {
-		computed: {
-			loginConfig() {
-				return getApp().globalData.config.router.login
-			},
-			agreements() {
-				return getApp().globalData.config.about.agreements || []
-			}
-		},
-		data() {
-			return {
-				servicesList: [{
-						"id": "username",
-						"text": "账号登录",
-						"logo": "/static/uni-quick-login/user.png",
-						"path": "/pages/ucenter/login-page/pwd-login/pwd-login"
-					},
-					{
-						"id": "smsCode",
-						"text": "短信验证码",
-						"logo": "/static/uni-quick-login/sms.png",
-						"path": "/pages/ucenter/login-page/index/index"
-					}
-				],
-				oauthServices: [],
-				config: {
-					"weixin": {
-						"text": "微信登录",
-						"logo": "/static/uni-quick-login/wechat.png",
-					},
-					"apple": {
-						"text": "苹果登录",
-						"logo": "/static/uni-quick-login/apple.png",
-					},
-					"univerify": {
-						"text": "一键登录",
-						"logo": "/static/uni-quick-login/univerify.png",
-					},
-					"qq": {
-						"text": "QQ登录",//暂未提供该登录方式的接口示例
-						"logo": "/static/uni-quick-login/univerify.png",
-					},
-					"xiaomi": {
-						"text": "小米登录",//暂未提供该登录方式的接口示例
-						"logo": "/static/uni-quick-login/univerify.png",
-					},
-					"sinaweibo": {
-						"text": "微博登录",//暂未提供该登录方式的接口示例
-						"logo": "/static/uni-quick-login/univerify.png",
-					}
-				},
-				univerifyStyle:{ //一键登录弹出窗的样式配置参数
-					"fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
-					"backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff
-					"buttons": { // 自定义登陆按钮
-						"iconWidth": "45px", // 图标宽度（高度等比例缩放） 默认值：45px
-						"list": []
-					},
-					"privacyTerms": {
-						"defaultCheckBoxState": false, // 条款勾选框初始状态 默认值： true   
-						"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB  
-						"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3  
-						"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”  
-						"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”  
-						"privacyItems": []
-					}
-				}
-			}
-		},
-		watch: {
-			agree(agree) {
-				this.univerifyStyle.privacyTerms.defaultCheckBoxState = agree
-			}
-		},
-		props: {
-			agree: {
-				type: Boolean,
-				default () {
-					return false
-				}
-			}
-		},
-		async created() {
-			this.univerifyStyle.privacyTerms.privacyItems = this.agreements
-			
-			let servicesList = this.servicesList
-			//获取当前环境能用的快捷登录方式
-			// #ifdef MP-WEIXIN
-			let id = 'weixin'
-			if (this.loginConfig.includes(id)) {
-				servicesList.push({
-					...this.config[id],
-					id
-				})
-			}
-			// #endif
-			// #ifdef APP-PLUS
-			this.oauthServices = await new Promise((callBack)=>{
-				plus.oauth.getServices(oauthServices => {
-					callBack(oauthServices.filter(({nativeClient,id})=>nativeClient&&this.loginConfig.includes(id))) 
-					//只返回1.应用支持 && 2.手机已安装对应客户端 && 3.uni-card.config.js配置项中存在的快捷登录方式
-				}, err => {
-					callBack([])
-					uni.hideLoading()
-					uni.showModal({
-						title: '获取服务供应商失败：' + JSON.stringify(err),
-						showCancel: false,
-						confirmText: '知道了'
-					});
-					console.error('获取服务供应商失败：' + JSON.stringify(err));
-				})
-			})
-			// #endif
-			//添加已配置且可用的第三方快捷登陆项
-			servicesList = servicesList.concat(this.oauthServices.map( ({id})=>{
-				return {...this.config[id],id}
-			}))
-			//设置一键登录功能底下的快捷登陆按钮
-			servicesList.forEach(({id,logo})=>{
-				if(id != 'univerify'){
-					this.univerifyStyle.buttons.list.push({"iconPath":logo,"provider":id})
-				}
-			})
-			//去掉当前页面对应的登录选项
-			this.servicesList = servicesList.filter(item=>{
-				return item.path != this.getRoute(1)
-			})
-			// console.log('servicesList',servicesList,this.servicesList);
-		},
-		methods: {
-			...mapMutations({
-				setUserInfo: 'user/login'
-			}),
-			getRoute(n = 0) {
-				let pages = getCurrentPages();
-				// console.log('route-pages-length', pages.length);
-				if (n > pages.length) {
-					return ''
-				}
-				return '/' + pages[pages.length - n].route
-			},
-			to(path) {
-				// console.log('比较', this.getRoute(2), path)
-				if (this.getRoute(2) == path) { // 控制路由是重新打开还是返回，避免重复打开页面
-					uni.navigateBack();
-				} else {
-					uni.navigateTo({
-						url: path
-					})
-				}
-			},
-			login_before(type, navigateBack = true) {
-				if (!this.agree&&type!='univerify') {
-					return uni.showToast({
-						title: '你未同意隐私政策协议',
-						icon: 'none'
-					});
-				}
-				uni.showLoading({
-					mask: true
-				})
-				// console.log(arguments);
-				let oauthService = this.oauthServices.find((service) => service.id == type)
-				// console.log(type);
-
-				// #ifdef APP-PLUS
-				//请勿直接使用前端获取的unionid或openid直接用于登录，前端的数据都是不可靠的
-				if (type == 'weixin') {
-					return oauthService.authorize(({
-							code
-						}) => {
-							// console.log(code);
-							this.login({
-								code
-							}, type)
-						},
-						err => {
-							uni.hideLoading()
-							console.log(err);
-							uni.showModal({
-								content: JSON.stringify(err),
-								showCancel: false
-							});
-						})
-				}
-				// #endif
-
-				uni.login({
-					"provider": type,
-					"univerifyStyle": this.univerifyStyle,
-					complete: (e) => {
-						console.log(e);
-					},
-					success: async e => {
-						console.log(e);
-						if (type == 'apple') {
-							let res = await this.getUserInfo({
-								provider: "apple"
-							})
-							uni.hideLoading()
-							Object.assign(e.authResult, res.userInfo)
-						}
-						// #ifdef MP-WEIXIN
-						if (type == 'weixin') {
-							return this.login({
-								code: e.code
-							}, type)
-						}
-						// #endif
-						this.login(e.authResult, type)
-					},
-					fail: (err) => {
-						uni.hideLoading()
-						console.log(err);
-
-						if (type == 'univerify') {
-							if (err.metadata && err.metadata.error_data) {
-								uni.showToast({
-									title: "一键登录:" + err.metadata.error_data,
-									icon: 'none'
-								});
-							}
-							if (err.errMsg) {
-								uni.showToast({
-									title: "一键登录:" + err.errMsg,
-									icon: 'none'
-								});
-							}
-							switch (err.errCode) {
-								case 30002:
-									console.log('在一键登录界面，点击其他登录方式');
-									break;
-								case 30003:
-									console.log('关闭了登录');
-									if (navigateBack) {
-										uni.navigateBack()
-									}
-									break;
-								case 30006:
-									uni.showModal({
-										title: "登录服务初始化错误",
-										content: err.metadata.error_data,
-										showCancel: false,
-										confirmText: '知道了',
-									});
-									break;
-								case "30008":
-									uni.showToast({
-										title: '点击了第三方登陆',
-										icon: 'none'
-									});
-									console.log('点击了第三方登陆，provider：',err.provider);
-									let {path} = this.servicesList.find(item=>item.id==err.provider)||{}
-									console.log('path',path);
-									if(path&&path!=this.getRoute(1)){ //存在路径，且并不是当前已经打开的路径
-										this.to(path)
-									}else{
-										this.login_before(err.provider)
-									}
-									break;
-								default:
-									console.log(9527, err);
-									break;
-							}
-						}
-					}
-				})
-			},
-			login(params, type) { //联网验证登录
-				console.log({
-					params,
-					type
-				});
-				let action = 'loginBy' + type.trim().toLowerCase().replace(type[0], type[0].toUpperCase())
-				uniCloud.callFunction({
-					name: 'uni-id-cf',
-					data: {
-						action,
-						params
-					},
-					success: ({
-						result
-					}) => {
-						console.log(result);
-						if (result.code === 0) {
-							if (type == 'univerify') {
-								uni.closeAuthView()
-							}
-							uni.hideLoading()
-							loginSuccess(result)
-							delete result.userInfo.token
-							this.setUserInfo(result.userInfo)
-						} else {
-							uni.showModal({
-								content: result.msg,
-								showCancel: false
-							});
-						}
-					},
-					complete: () => {
-						uni.hideLoading()
-					}
-				})
-			},
-			async getUserInfo(e) {
-				return new Promise((resolve, reject) => {
-					uni.getUserInfo({
-						...e,
-						success: (res) => {
-							resolve(res);
-						},
-						fail: (err) => {
-							uni.showModal({
-								content: JSON.stringify(err),
-								showCancel: false
-							});
-							reject(err);
-						}
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.quick-login-box {
-		flex-direction: row;
-		width: 750rpx;
-		justify-content: space-around;
-		position: fixed;
-		bottom: 10rpx;
-		left: 0;
-	}
-
-	.item {
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		height: 200rpx;
-	}
-
-	.logo {
-		width: 60rpx;
-		height: 60rpx;
-	}
-
-	.login-title {
-		margin-top: 4px;
-		font-size: 26rpx;
-	}
-</style>

components/uni-send-sms-code/uni-send-sms-code.vue

@@ -1,137 +0,0 @@
-<template>
-	<view class="short-code-btn" hover-class="hover" @click="start">
-		<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
-	</view>
-</template>
-
-<script>
-	function debounce(func, wait) {
-		let timer;
-		wait = wait || 500;
-		return function() {
-			let context = this;
-			let args = arguments;
-			if (timer) clearTimeout(timer);
-			let callNow = !timer;
-			timer = setTimeout(() => {
-				timer = null;
-			}, wait)
-			if (callNow) func.apply(context, args);
-		}
-	}
-	export default {
-		name: "uni-send-sms-code",
-		props: {
-			/**
-			 * 倒计时时长 s
-			 */
-			count: {
-				type: [String, Number],
-				default: 60
-			},
-			/**
-			 * 手机号码
-			 */
-			phone: {
-				type: [String, Number],
-				default: ''
-			},
-			/*
-				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定手机、unbind解绑手机
-			*/
-			codeType:{
-				type: String,
-				default(){
-					return 'login'
-				}
-			}
-		},
-		data() {
-			return {
-				reverseNumber: 0,
-				reverseTimer: null
-			};
-		},
-		computed: {
-			innerText() {
-				if (this.reverseNumber == 0) return '获取验证码';
-				return '重新发送('+this.reverseNumber+'s)';
-			}
-		},
-		created() {
-			this.initClick();
-		},
-		methods: {
-			initClick() {
-				this.start = debounce(() => {
-					if (this.reverseNumber != 0) return;
-					this.sendMsg();
-				})
-			},
-			sendMsg() {
-				let reg_phone = /^1\d{10}$/;
-				if(!reg_phone.test(this.phone))return uni.showToast({
-					title: '手机号格式错误',
-					icon: 'none'
-				});
-				uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'sendSmsCode',
-						params:{
-							"mobile": this.phone,
-							"type": this.codeType
-						},
-					},
-					success: ({result}) => {
-						console.log(result);
-						if(result.code===0){
-							uni.showToast({
-								title: "短信验证码发送成功",
-								icon: 'none'
-							});
-							this.reverseNumber = Number(this.count);
-							this.getCode();
-							this.$emit('getCode');
-						}else{
-							uni.showModal({
-								content: result.msg,
-								showCancel: false
-							});
-						}
-					}
-				})
-			},
-			getCode() {
-				if (this.reverseNumber == 0) {
-					clearTimeout(this.reverseTimer);
-					this.reverseTimer = null;
-					return;
-				}
-				this.reverseNumber--;
-				this.reverseTimer = setTimeout(() => {
-					this.getCode();
-				}, 1000)
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.short-code-btn {
-		width: 200rpx;
-		height: 85rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-	}
-	.inner-text {
-		font-size: 28rpx;
-		color: #AAAAAA;
-	}
-	.inner-text-active {
-		color: #007aff;
-	}
-</style>

constant/index.js

@@ -5,6 +5,9 @@ export const USER_INFO = 'user_INFO'
 export const T_STORAGE_KEY = 'T_STORAGE_KEY'
 export const T_USER_TOKEN = 'T_USER_TOKEN'
 
+// 绑定
+export const T_REDIRECT_TYPE = 'T_REDIRECT_TYPE'
+
 export const clearAllCache = () => {
 	[
 		USER_ID,
@@ -12,6 +15,7 @@ export const clearAllCache = () => {
 		USER_INFO,
 		T_STORAGE_KEY,
 		T_USER_TOKEN,
+		T_REDIRECT_TYPE
 	].forEach((item) => {
 		uni.removeStorageSync(item)
 	})

main.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import App from './App'
 import store from './store'
 import globalMixin from './mixin/global'
+Vue.prototype.$store = store
 
 Vue.config.productionTip = false
 Vue.mixin({

pages.json

@@ -25,20 +25,26 @@
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
+		},
+		{
+			"path": "pages/login/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
 		}
 	],
 	"subPackages": [
 		{
-			"root": "user",
+			"root": "another-tf",
 			"pages": [
 				{
-					"path": "account/agree/agree",
+					"path": "another-user/calling-card/agree",
 					"style": {
 						"navigationBarTitleText": "用户协议"
 					}
 				},
 				{
-					"path": "service/edit/edit",
+					"path": "another-user/calling-card/edit",
 					"style": {
 						"navigationBarTitleText": "编辑名片"
 					}

pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="content">
+	<view class="index-container">
+		<TuanAppShim bg="transparent"></TuanAppShim>
 		<view class="content-box">
 			<view class="top-main-box">
 				<view class="zzbg">
@@ -7,7 +8,7 @@
 				</view>
 				<view class="topmain">
 					<view class="leftimg">
-						<u-avatar size="60" :src="cardObj.head_img" shape="square"></u-avatar>
+						<image style="width: 60rpx;height: 60rpx;" :src="cardObj.head_img"></image>
 					</view>
 					<view class="rightcont">
 						<view class="name">{{ cardObj.name }}</view>
@@ -16,7 +17,7 @@
 					</view>
 				</view>
 				<view class="btnmain">
-					<u-icon name="map-fill"></u-icon><text>{{ cardObj.address }}</text>
+					<text>{{ cardObj.address }}</text>
 				</view>
 			</view>
 
@@ -24,7 +25,6 @@
 				<view class="conta">
 					<view v-if="cardObj.phone" class="cont" @click="onPhone()">
 						<view class="box">
-							<u-icon name="phone-fill" color="#007AFF" size="40"> </u-icon>
 							<view class="right">
 								<text class="tit">拨打电话</text>
 								<text>{{ cardObj.phone }}</text>
@@ -33,7 +33,6 @@
 					</view>
 					<view v-if="cardObj.wechat" class="cont" @click="onCopy(cardObj.wechat)">
 						<view class="box">
-							<u-icon name="weixin-fill" color="#007AFF" size="40"> </u-icon>
 							<view class="right">
 								<text class="tit">加微信</text>
 								<text>{{ cardObj.wechat }}</text>
@@ -42,7 +41,6 @@
 					</view>
 					<view v-if="cardObj.qq" class="cont" @click="onCopy(cardObj.qq)">
 						<view class="box">
-							<u-icon name="qq-fill" color="#007AFF" size="40"> </u-icon>
 							<view class="right">
 								<text class="tit">QQ</text>
 								<text>{{ cardObj.qq }}</text>
@@ -51,7 +49,6 @@
 					</view>
 					<view v-if="cardObj.email" class="cont" @click="onCopy(cardObj.email)">
 						<view class="box">
-							<u-icon name="email-fill" color="#007AFF" size="40"> </u-icon>
 							<view class="right">
 								<text class="tit">邮箱</text>
 								<text>{{ cardObj.email }}</text>
@@ -70,19 +67,20 @@
 			</view>
 			<view class="top-mainc">
 				<view class="left">
-					<u-avatar-group :urls="headerList" size="35" gap="0.4" :default-url="headerImg" random-bg-color>
-					</u-avatar-group>
+					<tui-image-group
+						:image-list="headerList.map((item, index) => ({ id: index, src: item || headerImg }))"
+						width="35rpx" height="35rpx" radius="0"
+					></tui-image-group>
 					<text>{{ visitorCount }}人浏览</text>
 				</view>
 			</view>
 			<view class="top-main-tit">
-				<u-icon name="file-text-fill" color="#007AFF" size="40"> </u-icon>
 				<text>业务介绍</text>
 			</view>
 			<view class="top-maind">
 				<view class="topmain">
 					<view class="leftimg">
-						<u-avatar size="60" :src="cardObj.head_img" shape="square"></u-avatar>
+						<image style="width: 60rpx;height: 60rpx;" :src="cardObj.head_img"></image>
 					</view>
 					<view class="rightcont">
 						<view v-if="!cardObj.intro" class="name">Hi~欢迎访问我的名片，了解更多内容请直接咨询我。</view>
@@ -114,56 +112,56 @@ export default {
 	},
 	async onShow(options) {
 		console.log('onLoad options', options)
-		if (uni.getStorageSync(USER_INFO)) {
-			var user = uni.getStorageSync(USER_INFO)
-			if (id != null && id != '') {
-				this.id = id
-				const card = await request('uni-card', 'getCard', {
-					id,
-					uid: user.id
-				}, {
-					showloading: true
-				})
-				if (card._id == '') {
-					this.getDefault()
-				} else {
-					const visitorList = await request('uni-card', 'getVisitorList', {
-						card_id: id,
-						skip: 0,
-						limit: 8
-					}, {
-						showloading: true
-					})
-					this.cardObj = card
-					this.visitorCount = visitorList.total
-					visitorList.items.forEach((arr, index) => {
-						if (arr.head_img) { this.headerList.push(arr.head_img) } else { this.headerList.push(require('../../static/images/userimg.png')) }
-					})
-				}
-			} else {
-				const mycard = await request('uni-card', 'getMyCard', {
-					uid: user.id
-				}, {
-					showloading: true
-				})
-				if (mycard._id == '') {
-					this.getDefault()
-				} else {
-					const myVisitorList = await request('uni-card', 'getMyVisitorList', {
-						uid: user.id,
-						skip: 0,
-						limit: 8
-					}, {
-						showloading: true
-					})
-					this.cardObj = mycard
-					this.visitorCount = myVisitorList.total
-					myVisitorList.items.forEach((arr, index) => {
-						if (arr.head_img) { this.headerList.push(arr.head_img) } else { this.headerList.push(require('../../static/images/userimg.png')) }
-					})
-				}
-			}
-		}
+		// if (uni.getStorageSync(USER_INFO)) {
+		// 	var user = uni.getStorageSync(USER_INFO)
+		// 	if (id != null && id != '') {
+		// 		this.id = id
+		// 		const card = await request('uni-card', 'getCard', {
+		// 			id,
+		// 			uid: user.id
+		// 		}, {
+		// 			showloading: true
+		// 		})
+		// 		if (card._id == '') {
+		// 			this.getDefault()
+		// 		} else {
+		// 			const visitorList = await request('uni-card', 'getVisitorList', {
+		// 				card_id: id,
+		// 				skip: 0,
+		// 				limit: 8
+		// 			}, {
+		// 				showloading: true
+		// 			})
+		// 			this.cardObj = card
+		// 			this.visitorCount = visitorList.total
+		// 			visitorList.items.forEach((arr, index) => {
+		// 				if (arr.head_img) { this.headerList.push(arr.head_img) } else { this.headerList.push(require('../../static/images/userimg.png')) }
+		// 			})
+		// 		}
+		// 	} else {
+		// 		const mycard = await request('uni-card', 'getMyCard', {
+		// 			uid: user.id
+		// 		}, {
+		// 			showloading: true
+		// 		})
+		// 		if (mycard._id == '') {
+		// 			this.getDefault()
+		// 		} else {
+		// 			const myVisitorList = await request('uni-card', 'getMyVisitorList', {
+		// 				uid: user.id,
+		// 				skip: 0,
+		// 				limit: 8
+		// 			}, {
+		// 				showloading: true
+		// 			})
+		// 			this.cardObj = mycard
+		// 			this.visitorCount = myVisitorList.total
+		// 			myVisitorList.items.forEach((arr, index) => {
+		// 				if (arr.head_img) { this.headerList.push(arr.head_img) } else { this.headerList.push(require('../../static/images/userimg.png')) }
+		// 			})
+		// 		}
+		// 	}
+		// }
 	},
 	onShareAppMessage(res) {
 		if (this.id == '' || this.id == null) {
@@ -257,334 +255,330 @@ export default {
 }
 </script>
 
-<style>
-page {
-	background: #f7f7f7;
-}
-
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-
-.content-box {
-	width: 100%;
+<style lang="less" scoped>
+.index-container {
+	min-height: 100vh;
+	padding: 0 0 120rpx;
+	background-color: #fefefe;
 	box-sizing: border-box;
-	padding: 0 5%;
-}
 
-.content-box .top-main-box {
-	width: 100%;
-	box-sizing: border-box;
-	border-radius: 15rpx;
-	height: 52vw;
-	overflow: hidden;
-	position: relative;
-	box-shadow: 0px 0px 10px #cccccc;
-}
+	.content-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 0 5%;
+	}
 
-.content-box .top-main-box .zzbg {
-	width: 100%;
-	position: absolute;
-	top: 0;
-	left: 0;
-	background: rgba(139, 139, 139, 0.5);
-	z-index: 1;
-}
+	.content-box .top-main-box {
+		width: 100%;
+		box-sizing: border-box;
+		border-radius: 15rpx;
+		height: 52vw;
+		overflow: hidden;
+		position: relative;
+		box-shadow: 0px 0px 10px #cccccc;
+	}
 
-.content-box .top-main-box .mpimg {
-	width: 100%;
-}
+	.content-box .top-main-box .zzbg {
+		width: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		background: rgba(139, 139, 139, 0.5);
+		z-index: 1;
+	}
 
-.content-box .top-main-box .topmain {
-	width: 100%;
-	box-sizing: border-box;
-	padding: 40rpx 5%;
-	display: flex;
-	align-items: flex-start;
-	position: relative;
-	z-index: 4;
-}
+	.content-box .top-main-box .mpimg {
+		width: 100%;
+	}
 
-.content-box .top-main-box .topmain .leftimg {
-	width: 150rpx;
-	height: 150rpx;
-	border-radius: 15rpx;
-	overflow: hidden;
-}
+	.content-box .top-main-box .topmain {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx 5%;
+		display: flex;
+		align-items: flex-start;
+		position: relative;
+		z-index: 4;
+	}
 
-.content-box .top-main-box .topmain .leftimg .tximg {
-	width: 100%;
-}
+	.content-box .top-main-box .topmain .leftimg {
+		width: 150rpx;
+		height: 150rpx;
+		border-radius: 15rpx;
+		overflow: hidden;
+	}
 
-.content-box .top-main-box .topmain .rightcont {
-	color: #fff;
-	flex: 1;
-	box-sizing: border-box;
-	padding-left: 25rpx;
-}
+	.content-box .top-main-box .topmain .leftimg .tximg {
+		width: 100%;
+	}
 
-.content-box .top-main-box .topmain .rightcont .name {
-	font-size: 42rpx;
-	padding-bottom: 10rpx;
-}
+	.content-box .top-main-box .topmain .rightcont {
+		color: #fff;
+		flex: 1;
+		box-sizing: border-box;
+		padding-left: 25rpx;
+	}
 
-.content-box .top-main-box .topmain .rightcont .tip,
-.content-box .top-main-box .topmain .rightcont .tipa {
-	font-size: 34rpx;
-	text-shadow: 1px 1px 1px #000;
-}
+	.content-box .top-main-box .topmain .rightcont .name {
+		font-size: 42rpx;
+		padding-bottom: 10rpx;
+	}
 
-.content-box .top-main-box .btnmain {
-	width: 100%;
-	position: absolute;
-	left: 0;
-	bottom: 0px;
-	z-index: 5;
-	box-sizing: border-box;
-	padding: 25rpx 5%;
-	background: #fff;
-	display: inline;
-	align-items: center;
-	justify-content: space-between;
-	text-align: left;
-}
+	.content-box .top-main-box .topmain .rightcont .tip,
+	.content-box .top-main-box .topmain .rightcont .tipa {
+		font-size: 34rpx;
+		text-shadow: 1px 1px 1px #000;
+	}
 
-.content-box .top-main-box .btnmain view {
-	float: left;
-}
+	.content-box .top-main-box .btnmain {
+		width: 100%;
+		position: absolute;
+		left: 0;
+		bottom: 0px;
+		z-index: 5;
+		box-sizing: border-box;
+		padding: 25rpx 5%;
+		background: #fff;
+		display: inline;
+		align-items: center;
+		justify-content: space-between;
+		text-align: left;
+	}
 
-.content-box .top-main-box .btnmain text {
-	font-size: 24rpx;
-	color: #333333;
-	padding-left: 10rpx;
-	float: left;
-}
+	.content-box .top-main-box .btnmain view {
+		float: left;
+	}
 
-.content-box .top-maina {
-	width: 100%;
-	box-sizing: border-box;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin: 20rpx auto;
-}
+	.content-box .top-main-box .btnmain text {
+		font-size: 24rpx;
+		color: #333333;
+		padding-left: 10rpx;
+		float: left;
+	}
 
-.content-box .top-maina view {
-	width: 48%;
-	border-radius: 15rpx;
-	text-align: center;
-	padding: 25rpx 0;
-	font-size: 18px;
-}
+	.content-box .top-maina {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: 20rpx auto;
+	}
 
-.content-box .top-maina .left {
-	border: 1px solid #007AFF;
-	color: #007AFF;
-	width: 48%;
-}
+	.content-box .top-maina view {
+		width: 48%;
+		border-radius: 15rpx;
+		text-align: center;
+		padding: 25rpx 0;
+		font-size: 18px;
+	}
 
-.content-box .top-maina .right {
-	background: #007AFF;
-	border: 1px solid #007AFF;
-	color: #fff;
-	width: 48%;
-}
+	.content-box .top-maina .left {
+		border: 1px solid #007AFF;
+		color: #007AFF;
+		width: 48%;
+	}
 
-.content-box .top-mainb {
-	width: 100%;
-	overflow: scroll;
-	padding: 15rpx 0;
-	overflow-x: hidden;
-}
+	.content-box .top-maina .right {
+		background: #007AFF;
+		border: 1px solid #007AFF;
+		color: #fff;
+		width: 48%;
+	}
 
-.content-box .top-mainb .conta {
-	width: 100%;
-	overflow-x: auto;
-	word-break: keep-all;
-	/* 不换行 */
-	white-space: nowrap;
-	/* 不换行 */
-	padding-bottom: 20rpx;
-}
+	.content-box .top-mainb {
+		width: 100%;
+		overflow: scroll;
+		padding: 15rpx 0;
+		overflow-x: hidden;
+	}
 
-.content-box .top-mainb .conta .cont {
-	display: inline-block;
-	margin-right: 20rpx;
-	background: #fff;
-	box-shadow: 0px 0px 8px #cccccc;
-	border-radius: 10rpx;
-	overflow: hidden;
-}
+	.content-box .top-mainb .conta {
+		width: 100%;
+		overflow-x: auto;
+		word-break: keep-all;
+		/* 不换行 */
+		white-space: nowrap;
+		/* 不换行 */
+		padding-bottom: 20rpx;
+	}
 
-.content-box .top-mainb .conta .cont .box {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	box-sizing: border-box;
-	padding: 15rpx 20rpx;
-}
+	.content-box .top-mainb .conta .cont {
+		display: inline-block;
+		margin-right: 20rpx;
+		background: #fff;
+		box-shadow: 0px 0px 8px #cccccc;
+		border-radius: 10rpx;
+		overflow: hidden;
+	}
 
-.content-box .top-mainb .conta .cont .box image {
-	width: 80rpx;
-	height: 80rpx;
-}
+	.content-box .top-mainb .conta .cont .box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 15rpx 20rpx;
+	}
 
-.content-box .top-mainb .conta .cont .box .right {
-	flex: 1;
-	box-sizing: border-box;
-	padding-left: 10rpx;
-}
+	.content-box .top-mainb .conta .cont .box image {
+		width: 80rpx;
+		height: 80rpx;
+	}
 
-.content-box .top-mainb .conta .cont .box .right text {
-	display: block;
-	font-size: 30rpx;
-}
+	.content-box .top-mainb .conta .cont .box .right {
+		flex: 1;
+		box-sizing: border-box;
+		padding-left: 10rpx;
+	}
 
-.content-box .top-mainb .conta .cont .box .right .tit {
-	font-size: 34rpx;
-}
+	.content-box .top-mainb .conta .cont .box .right text {
+		display: block;
+		font-size: 30rpx;
+	}
 
-.content-box .top-mainc {
-	width: 100%;
-	box-sizing: border-box;
-	padding: 20rpx 10rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin: 10rpx auto;
-	background: #fff;
-}
+	.content-box .top-mainb .conta .cont .box .right .tit {
+		font-size: 34rpx;
+	}
 
-.content-box .top-mainc .left {
-	flex: 1;
-	display: flex;
-	align-items: center;
-}
+	.content-box .top-mainc {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 20rpx 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: 10rpx auto;
+		background: #fff;
+	}
 
-.content-box .top-mainc .left text {
-	font-size: 28rpx;
-	color: #555555;
-}
+	.content-box .top-mainc .left {
+		flex: 1;
+		display: flex;
+		align-items: center;
+	}
 
-.content-box .top-mainc .left image {
-	width: 60rpx;
-	height: 60rpx;
-	margin-right: 5rpx;
-	border-radius: 10rpx;
-}
+	.content-box .top-mainc .left text {
+		font-size: 28rpx;
+		color: #555555;
+	}
 
-.content-box .top-mainc .right {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
+	.content-box .top-mainc .left image {
+		width: 60rpx;
+		height: 60rpx;
+		margin-right: 5rpx;
+		border-radius: 10rpx;
+	}
 
-.content-box .top-mainc .right text {
-	font-size: 28rpx;
-	color: #555555;
-	padding-right: 10rpx;
-}
+	.content-box .top-mainc .right {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 
-.content-box .top-mainc .right image {
-	width: 40rpx;
-	height: 40rpx;
-}
+	.content-box .top-mainc .right text {
+		font-size: 28rpx;
+		color: #555555;
+		padding-right: 10rpx;
+	}
 
-.content-box .top-main-tit {
-	width: 100%;
-	box-sizing: border-box;
-	padding: 20rpx 10rpx;
-	display: flex;
-	align-items: center;
-}
+	.content-box .top-mainc .right image {
+		width: 40rpx;
+		height: 40rpx;
+	}
 
-.content-box .top-main-tit image {
-	width: 60rpx;
-	height: 60rpx;
-}
+	.content-box .top-main-tit {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 20rpx 10rpx;
+		display: flex;
+		align-items: center;
+	}
 
-.content-box .top-main-tit text {
-	color: #333;
-	font-size: 18px;
-	padding-left: 10rpx;
-}
+	.content-box .top-main-tit image {
+		width: 60rpx;
+		height: 60rpx;
+	}
 
-.content-box .top-maind {
-	width: 100%;
-	box-sizing: border-box;
-	padding: 40rpx 5%;
-	background: #fff;
-	box-shadow: 0px 0px 8px #cccccc;
-}
+	.content-box .top-main-tit text {
+		color: #333;
+		font-size: 18px;
+		padding-left: 10rpx;
+	}
 
-.content-box .top-maind .topmain {
-	width: 100%;
-	box-sizing: border-box;
-	display: flex;
-	align-items: flex-start;
-}
+	.content-box .top-maind {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx 5%;
+		background: #fff;
+		box-shadow: 0px 0px 8px #cccccc;
+	}
 
-.content-box .top-maind .topmain .leftimg {
-	width: 120rpx;
-	height: 120rpx;
-	border-radius: 15rpx;
-	overflow: hidden;
-}
+	.content-box .top-maind .topmain {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-items: flex-start;
+	}
 
-.content-box .top-maind .topmain .leftimg .tximg {
-	width: 100%;
-}
+	.content-box .top-maind .topmain .leftimg {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 15rpx;
+		overflow: hidden;
+	}
 
-.content-box .top-maind .topmain .rightcont {
-	color: #555;
-	flex: 1;
-	box-sizing: border-box;
-	padding-left: 25rpx;
-	line-height: 42rpx;
-	font-size: 28rpx;
-}
+	.content-box .top-maind .topmain .leftimg .tximg {
+		width: 100%;
+	}
 
-.content-box .top-maind .toptip {
-	width: 100%;
-}
+	.content-box .top-maind .topmain .rightcont {
+		color: #555;
+		flex: 1;
+		box-sizing: border-box;
+		padding-left: 25rpx;
+		line-height: 42rpx;
+		font-size: 28rpx;
+	}
 
-.content-box .top-maind .toptip .box {
-	display: inline-block;
-	margin-top: 25rpx;
-	padding: 10rpx 15rpx;
-	background: #e6e6e6;
-	border-radius: 10rpx;
-	overflow: hidden;
-	margin-right: 20rpx;
-}
+	.content-box .top-maind .toptip {
+		width: 100%;
+	}
 
-.content-box .top-maind .toptip .box image {
-	width: 30rpx;
-	height: 30rpx;
-}
+	.content-box .top-maind .toptip .box {
+		display: inline-block;
+		margin-top: 25rpx;
+		padding: 10rpx 15rpx;
+		background: #e6e6e6;
+		border-radius: 10rpx;
+		overflow: hidden;
+		margin-right: 20rpx;
+	}
 
-.content-box .top-maind .toptip .box text {
-	font-size: 28rpx;
-	padding-left: 10rpx;
-}
+	.content-box .top-maind .toptip .box image {
+		width: 30rpx;
+		height: 30rpx;
+	}
 
-.bottombtn {
-	position: fixed;
-	bottom: 0;
-	width: 100%;
-	height: 60px;
-	background: #007AFF;
-	color: #fff;
-	line-height: 60px;
-	text-align: center;
-}
+	.content-box .top-maind .toptip .box text {
+		font-size: 28rpx;
+		padding-left: 10rpx;
+	}
 
-.bottom-block {
-	display: block;
-	width: 100%;
-	height: 80px;
+	.bottombtn {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 60px;
+		background: #007AFF;
+		color: #fff;
+		line-height: 60px;
+		text-align: center;
+	}
+
+	.bottom-block {
+		display: block;
+		width: 100%;
+		height: 80px;
+	}
 }
 </style>

pages/login/accountLogin.vue

@@ -1,214 +0,0 @@
-<template>
-	<view class="container flex-column">
-		<view style="padding: 30upx 20upx 0;color: #000000;">
-			<JHeader width="50" height="50" title=""></JHeader>
-		</view>
-		<view class="register" @click="handleClickRegister">
-			注册
-		</view>
-		<view class="PhoneAuthentication">
-			<text class="textRL">手机号快捷登录</text>
-			<text class="textTips">请先注册账号再登录</text>
-		</view>
-		<view class="LoginForm">
-			<view class="iphoneNum-box">
-				<text class="labels">手机号</text>
-				<input v-model="loginForm.username" type="text" placeholder="请输入手机号">
-			</view>
-			<view class="iphoneNum-box">
-				<text class="labels">密码</text>
-				<input v-model="loginForm.password" password type="text" placeholder="请输入密码">
-			</view>
-			<view class="ReadingAgreement">
-				<radio
-					style="transform:scale(0.8)" color="#CE2601" :checked="isReadAgreement"
-					@click="isReadAgreement = !isReadAgreement"
-				/>
-				<view class="Agreement">
-					我已阅读并同意<text class="redText">《巨蜂商城用户服务协议》</text>以及<text class="redText">《隐私政策》</text>
-				</view>
-			</view>
-		</view>
-		<tui-button
-			:disabled="!isReadAgreement" type="danger" width="650rpx" margin="0 auto"
-			height="82rpx"
-			style="margin-top: 60rpx;" @click="handleLogin"
-		>
-			立即登录
-		</tui-button>
-		<view class="problem">
-			<text @click="handleClickRegister">没有账号？<text class="redText">去注册</text></text>
-			<text>无法接收验证码？</text>
-		</view>
-	</view>
-</template>
-
-<script>
-import { userLoginApi } from '../../api/auth'
-import {
-	J_USER_INFO,
-	J_USER_TOKEN,
-	J_TOKEN_EXPIRE,
-	J_USER_ID,
-	J_BRAND_ID,
-	J_NEW_BIND_TYPE
-} from '../../constant'
-export default {
-	name: 'Login',
-	data() {
-		return {
-			redirect: '',
-			loginForm: {
-				username: '',
-				password: ''
-			},
-			isReadAgreement: false
-		}
-	},
-	onLoad(options) {
-		this.redirect = options.redirect
-	},
-
-	methods: {
-		handleClickRegister() {
-			uni.reLaunch({ url: '/pages/register/register?type=register' })
-		},
-		handleLogin() {
-			const { username, password } = this.loginForm
-			if (!username || !password) {
-				this.$showToast('手机号或密码不能为空')
-				return
-			}
-			if (
-				!/^1[3456789]\d{9}$/.test(username)
-			) {
-				uni.showToast({
-					title: '手机号格式不正确',
-					duration: 2000,
-					icon: 'none'
-				})
-				return
-			}
-			if (password.length < 6) {
-				this.$showToast('密码不能小于六位')
-				return
-			}
-			userLoginApi({
-				...this.loginForm
-			}).then((res) => {
-				uni.setStorageSync(J_USER_INFO, res.data.userInfo)
-				uni.setStorageSync(J_USER_TOKEN, res.data.token)
-				uni.setStorageSync(J_USER_ID, res.data.userInfo.userId)
-				uni.setStorageSync(J_BRAND_ID, res.data.userInfo.brandId)
-				uni.setStorageSync(J_TOKEN_EXPIRE, new Date(res.data.tokenExpire).getTime())
-				this.$parent.$root.connectSocket()
-				this.$showToast('登录成功', 'success')
-				setTimeout(() => {
-					if (uni.getStorageSync(J_NEW_BIND_TYPE)) {
-						uni.redirectTo({ url: '/pages/jump/jump' })
-					} else if (this.redirect) {
-						uni.redirectTo({
-							url: this.redirect
-						})
-					} else {
-						this.$switchTab('/pages/store/store')
-					}
-				}, 2000)
-			})
-		}
-	}
-}
-</script>
-
-<style lang="less" scoped>
-.container {
-	box-sizing: border-box;
-	background-color: #FFFFFF;
-
-	.redText {
-		color: #CE2601;
-	}
-
-	.register {
-		margin-top: 30rpx;
-		position: relative;
-		text-align: right;
-		padding-right: 40rpx;
-	}
-
-	.PhoneAuthentication {
-		margin-top: 15rpx;
-		font-family: Source Han Sans CN;
-		width: 466rpx;
-		height: 100rpx;
-		display: flex;
-		flex-direction: column;
-		padding: 0px 30rpx;
-		gap: 8rpx;
-
-		.textRL {
-			font-size: 44rpx;
-			font-weight: 600;
-			line-height: 60rpx;
-			color: #222229;
-		}
-
-		.textTips {
-			font-size: 24rpx;
-			font-weight: 350;
-			line-height: 32rpx;
-			color: #888889;
-		}
-	}
-
-	.LoginForm {
-		margin-top: 50rpx;
-		width: 750rpx;
-
-		.iphoneNum-box {
-			/* 自动布局 */
-			margin: 0 auto;
-			height: 114rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			gap: 32rpx;
-			border-bottom: 2rpx solid #E6E6E8;
-			width: 690rpx;
-			color: #222229;
-
-			.labels {
-				font-size: 32rpx;
-				font-weight: normal;
-				line-height: 48rpx;
-			}
-		}
-
-		.ReadingAgreement {
-			width: 710rpx;
-			margin: 0 auto;
-			margin-top: 33rpx;
-			gap: 32rpx;
-			display: flex;
-			align-items: center;
-			font-size: 24rpx;
-
-			.Agreement {
-				margin-left: -15rpx;
-			}
-		}
-	}
-
-	.problem {
-		margin: 0 auto;
-		margin-top: 30rpx;
-		width: 654rpx;
-		display: flex;
-		justify-content: space-between;
-		font-size: 24rpx;
-		font-weight: 350;
-		line-height: 32rpx;
-		color: #878788;
-	}
-}
-</style>

pages/login/bind-phone.vue

@@ -1,294 +0,0 @@
-<template>
-	<view class="login-container">
-		<image class="back-icon" src="../../static/back.png" mode="" @click="handleBack" />
-
-		<view class="login-main-area">
-			<h1>绑定手机号</h1>
-
-			<tui-form ref="form">
-				<tui-input
-					v-model="bindForm.phone" label="手机号码" padidng="0 0 28rpx 0" border-top
-					placeholder="请输入手机号码"
-					color="#141000"
-				></tui-input>
-
-				<tui-input
-					v-model="bindForm.code" class="reset-wrapper" label="验证码" padidng="0 0 28rpx 0"
-					border-top
-					placeholder="请输入验证码" color="#141000"
-				>
-					<block slot="right">
-						<button v-show="!timer" class="uni-btn get-code" @click="onGetCode">
-							获取验证码
-						</button>
-
-						<view v-show="timer" class="awaiting">
-							<text class="second-text">{{ awaitSecond }}s</text>
-							<text>后重新获取</text>
-						</view>
-					</block>
-				</tui-input>
-			</tui-form>
-
-			<button class="bind-btn uni-btn" :style="{ background: btnStatus ? '#FFC117' : '' }" @click="onBind">
-				确定
-			</button>
-		</view>
-		<tui-toast ref="toast"></tui-toast>
-	</view>
-</template>
-
-<script>
-import {
-	getCodeApi,
-	bindMobileForWXApi
-} from '../../api/auth'
-import {
-	throttle
-} from '../../utils'
-import { J_USER_ID, J_USER_INFO, J_USER_TOKEN, J_NEW_BIND_TYPE } from '../../constant'
-
-export default {
-	name: 'BindPhone',
-	data() {
-		return {
-			bindForm: {
-				'openId': '',
-				'phone': '',
-				'code': ''
-			},
-			onGetCode: '',
-			onBind: '',
-			timer: null,
-			awaitSecond: 60,
-			userId: null
-		}
-	},
-
-	onLoad(options) {
-		this.onGetCode = throttle(this.handleGetCode, 1000)
-		this.onBind = throttle(this.handleBindMobile, 1000)
-		this.bindForm.openId = options.openId
-		this.userId = options.userId
-	},
-
-	onUnload() {
-		this.timer && clearInterval(this.timer)
-	},
-
-	computed: {
-		btnStatus() {
-			return this.bindForm.code && this.bindForm.phone
-		}
-	},
-
-	methods: {
-		// 获取验证码
-		async handleGetCode() {
-			if (this.bindForm.phone.length !== 11) {
-				this.ttoast({
-					type: 'fail',
-					title: '请输入合法的手机号码'
-				})
-				return
-			}
-			uni.showLoading({
-				title: '加载中...'
-			})
-			try {
-				await getCodeApi({
-					phone: this.bindForm.phone,
-					flag: 2
-				})
-				this.timer = setInterval(() => {
-					this.awaitSecond--
-					if (this.awaitSecond === 0) {
-						this.awaitSecond = 60
-						clearInterval(this.timer)
-						this.timer = null
-					}
-				}, 1000)
-			} catch (error) {
-				this.ttoast({
-					type: 'fail',
-					title: '验证码发送失败',
-					content: '请稍后重试'
-				})
-			} finally {
-				uni.hideLoading()
-			}
-		},
-
-		handleBack() {
-			uni.navigateBack()
-		},
-
-		async handleBindMobile() {
-			if (!this.bindForm.code) {
-				this.ttoast({
-					type: 'fail',
-					title: '请输入验证码'
-				})
-				return
-			}
-			if (!this.bindForm.phone) {
-				this.ttoast({
-					type: 'fail',
-					title: '请输入绑定的手机号'
-				})
-				return
-			}
-			if (this.bindForm.phone.length !== 11) {
-				this.ttoast({
-					type: 'fail',
-					title: '请输入合法的手机号码'
-				})
-				return
-			}
-			const { data } = await bindMobileForWXApi(this.bindForm)
-			this.ttoast('绑定成功')
-			uni.setStorageSync(J_USER_ID, data.userInfo.userId)
-			uni.setStorageSync(J_USER_INFO, data.userInfo)
-			uni.setStorageSync(J_USER_TOKEN, data.token)
-			if (uni.getStorageSync(J_NEW_BIND_TYPE)) {
-				setTimeout(() => {
-					uni.redirectTo({
-						url: '/pages/jump/jump'
-					})
-				}, 1000)
-			} else {
-				setTimeout(() => {
-					this.$switchTab('/')
-				}, 1000)
-			}
-		}
-	}
-}
-</script>
-
-<style lang="less" scoped>
-view,
-text {
-	line-height: 1.5;
-}
-
-.login-container {
-	width: 100vw;
-	min-height: 100vh;
-	background: url('../../static/bg.png') no-repeat;
-	background-size: cover;
-
-	.back-icon {
-		position: relative;
-		top: 30upx;
-		left: 20upx;
-		width: 80upx;
-		height: 80upx;
-		z-index: 1000;
-	}
-
-	.login-main-area {
-		padding: 90upx 80upx 0;
-
-		h1 {
-			color: #141000;
-			font-size: 64upx;
-			font-weight: 400;
-			margin-bottom: 120upx;
-		}
-
-		/deep/ .tui-input__wrap {
-			padding: 0 0 28upx 0 !important;
-			flex-direction: column;
-			align-items: flex-start;
-			background: transparent !important;
-			margin-bottom: 72upx !important;
-
-			&::before {
-				display: none;
-			}
-		}
-
-		/deep/ .tui-input__label {
-			text {
-				margin-bottom: 12upx;
-				font-size: 24upx !important;
-				color: #b3b2ad !important;
-			}
-		}
-
-		/deep/ .uni-input-wrapper {
-			margin-top: 12upx;
-
-			input {
-				padding-bottom: 28upx !important;
-			}
-		}
-
-		/deep/ .tui-line__left::after {
-			left: 0 !important;
-		}
-
-		.reset-wrapper {
-			/deep/ .tui-input__wrap {
-				flex-wrap: wrap !important;
-				flex-direction: row !important;
-				margin-bottom: 10upx !important;
-
-				.tui-input__label {
-					flex: 0 0 100%;
-				}
-			}
-		}
-
-		.password-status {
-			width: 48upx;
-			height: 48upx;
-			flex-shrink: 0;
-			margin-top: 12upx;
-		}
-	}
-
-	.bind-btn {
-		width: 606upx;
-		height: 96upx;
-		border-radius: 100px;
-		margin: 80upx 0 40upx 0;
-		background-color: #ffe6a2;
-		color: #fff;
-		line-height: 96upx;
-		font-size: 32upx;
-		font-weight: 500;
-		transition: all 100ms;
-		opacity: 1;
-
-		&:active {
-			opacity: 0.3;
-		}
-	}
-
-	.get-code {
-		color: #ffc117;
-		font-size: 28upx;
-		margin-top: 24upx;
-	}
-
-	.awaiting {
-		font-size: 28upx;
-		color: #b3b2ad;
-		margin-top: 12upx;
-
-		.second-text {
-			color: #605d52;
-		}
-	}
-}
-
-.skip {
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	font-size: 24upx;
-	color: rgb(153, 153, 153);
-}
-</style>

pages/login/login copy.vue

@@ -1,296 +0,0 @@
-<template>
-	<view class="container">
-		<view style="padding: 68upx 0 0 56upx;color: #ffffff;">
-			<view style="font-weight: bold;font-style: oblique;">
-				<view style="font-size: 58upx;">欢迎来到</view>
-				<view style="font-size: 62upx;">巨蜂本地生活</view>
-			</view>
-			<view style="margin-top: 12upx;;font-size: 30upx;">
-				<text>数字化营销的领跑者</text>
-			</view>
-		</view>
-
-		<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 80upx;">
-			<view
-				v-if="(loginForm.terminal === 3) || (loginForm.terminal === 2)" style="text-align: center;"
-				@click="handleWXLogin"
-			>
-				<image style="width: 118upx;height: 98upx;" src="../../static/images/icon/we-chat.png" mode="" />
-				<tui-button type="white" width="480rpx" height="82rpx" margin="40upx 0 0" shape="circle" @click="handleWXLogin">
-					微信一键登录
-				</tui-button>
-			</view>
-			<!-- #ifdef MP-ALIPAY -->
-			<tui-button type="danger" width="480rpx" height="82rpx" margin="70upx 0 0" shape="circle">
-				支付宝登录
-			</tui-button>
-			<!-- #endif -->
-			<tui-button
-				type="white" width="480rpx" height="82rpx" margin="70upx 0 0"
-				shape="circle"
-				@click="$switchTab('/pages/index/index')"
-			>
-				去首页逛逛
-			</tui-button>
-		</view>
-
-		<view class="otherLoginButton">
-			<view class="orderButtonItem">
-				<view style="display: flex;flex-direction: column;align-items: center;">
-					<view style="width: fit-content;padding: 12upx;background-color: #ffffff;border-radius: 48upx;">
-						<tui-icon name="pwd" color="#ce2601" :size="24" @click="go('/pages/login/accountLogin')"></tui-icon>
-					</view>
-					<view style="margin-top: 12upx;font-size: 26upx;color: #ffffff;">密码登录</view>
-				</view>
-				<view style="display: flex;flex-direction: column;align-items: center;">
-					<view style="width: fit-content;padding: 12upx;background-color: #ffffff;border-radius: 48upx;">
-						<tui-icon
-							name="wealth-fill" color="#ce2601" :size="24"
-							@click="$redirectTo('/pages/register/register?type=register')"
-						></tui-icon>
-					</view>
-					<view style="margin-top: 12upx;font-size: 26upx;color: #ffffff;">注册</view>
-				</view>
-				<view style="display: flex;flex-direction: column;align-items: center;">
-					<view style="width: fit-content;padding: 12upx;background-color: #ffffff;border-radius: 48upx;">
-						<tui-icon
-							name="mail-fill" color="#ce2601" :size="24"
-							@click="$redirectTo('/pages/register/register?type=forgetPwd')"
-						></tui-icon>
-					</view>
-					<view style="margin-top: 12upx;font-size: 26upx;color: #ffffff;">找回密码</view>
-				</view>
-			</view>
-		</view>
-		<view class="agreement">
-			登录即同意<text class="colorText">《联通统一认证服务条款》</text>和<text class="colorText">《巨蜂商城用户 服务协议》</text>、<text
-				class="colorText"
-			>
-				《隐私政策》
-			</text>并使用本机号码登陆
-		</view>
-	</view>
-</template>
-
-<script>
-import { userLoginApi, wxLoginApi, updateNotBindingWxPhone } from '../../api/auth'
-import {
-	J_USER_INFO,
-	J_USER_TOKEN,
-	J_TOKEN_EXPIRE,
-	J_USER_ID,
-	J_BRAND_ID,
-	J_NEW_BIND_TYPE
-} from '../../constant'
-import { getUrlCode, isInWx } from '../../utils'
-export default {
-	name: 'Login',
-	data() {
-		return {
-			type: '',
-			redirect: '',
-			loginForm: {
-				username: '',
-				password: '',
-				terminal: ''
-			}
-		}
-	},
-	onLoad(options) {
-		if (isInWx()) {
-			this.loginForm.terminal = 3
-		} else {
-			// #ifdef H5
-			this.loginForm.terminal = 5 // H5包含pc和移动端浏览器和微信浏览器的可能
-			// #endif
-			// #ifdef APP
-			this.loginForm.terminal = 1
-			// #endif
-			// #ifdef MP-WEIXIN
-			this.loginForm.terminal = 2
-			// #endif
-			// #ifdef MP-ALIPAY
-			this.loginForm.terminal = 4
-			// #endif
-		}
-		this.type = options.type
-		this.redirect = options.redirect
-		if (this.type === 'register') {
-			this.$showToast('注册成功', 'success')
-		} else if (uni.getStorageSync(J_NEW_BIND_TYPE)) {
-			if (uni.getStorageSync(J_USER_ID) && uni.getStorageSync(J_USER_INFO)) {
-				uni.redirectTo({ url: '/pages/jump/jump' })
-			}
-		} else if (this.type === 'forget') {
-			this.$showToast('密码重置成功', 'success')
-		}
-	},
-	onShow() {
-		// #ifdef H5
-		const code = getUrlCode().code
-		if (code) this.handleWXLogin()
-		// #endif
-	},
-
-	methods: {
-		handleLogin() {
-			const { username, password } = this.loginForm
-			if (!username || !password) {
-				this.$showToast('手机号或密码不能为空')
-				return
-			}
-			if (
-				!/^1[3456789]\d{9}$/.test(username)
-			) {
-				uni.showToast({
-					title: '手机号格式不正确',
-					duration: 2000,
-					icon: 'none'
-				})
-				return
-			}
-			if (password.length < 6) {
-				this.$showToast('密码不能小于六位')
-				return
-			}
-			userLoginApi({
-				...this.loginForm
-			}).then((res) => {
-				uni.setStorageSync(J_USER_INFO, res.data.userInfo)
-				uni.setStorageSync(J_USER_TOKEN, res.data.token)
-				uni.setStorageSync(J_USER_ID, res.data.userInfo.userId)
-				uni.setStorageSync(J_BRAND_ID, res.data.userInfo.brandId)
-				uni.setStorageSync(J_TOKEN_EXPIRE, new Date(res.data.tokenExpire).getTime())
-				this.$parent.$root.connectSocket()
-				this.$showToast('登录成功', 'success')
-				this.handleLoginSuccess()
-			})
-		},
-
-		// 点击微信登录
-		async handleWXLogin() {
-			// #ifdef H5
-			const appid = 'wx603b04a561e4683e'
-			const local = 'https://h5.jfcmei.com/#/pages/login/login'
-			const code = getUrlCode().code
-			// console.log('获取code', code)
-			if (code === null || code === undefined || code === '') {
-				window.location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
-					appid +
-					'&redirect_uri=' +
-					encodeURIComponent(local) +
-					'&response_type=code&scope=snsapi_userinfo#wechat_redirect'
-			} else {
-				const { data } = await wxLoginApi({ code })
-				console.log(data) // {token,status,userInfo}
-				uni.setStorageSync(J_USER_ID, data.userInfo.userId)
-				uni.setStorageSync(J_USER_INFO, data.userInfo)
-				uni.setStorageSync(J_USER_TOKEN, data.token)
-				this.$parent.$root.connectSocket()
-				// ofxYi6eg9rdj8qZx3rwSecysgePo
-				if (!data.status) {
-					uni.showModal({
-						title: '提示',
-						content: '您还未绑定手机号，请先绑定',
-						success: ({ confirm }) => {
-							if (confirm) {
-								uni.navigateTo({
-									url: '/pages/login/bind-phone?openId=' + data.userInfo.openId
-								})
-							} else {
-								uni.showLoading()
-								updateNotBindingWxPhone({
-									// openId: data.userInfo.openId,
-									// nickname: data.userInfo.nickname,
-									// sex: data.userInfo.gender,
-									// headimgurl: data.userInfo.avatarUrl,
-									// unionid: data.userInfo.unionid
-									...data.userInfo
-								})
-									.then((res) => {
-										uni.hideLoading()
-										this.$showToast('正在跳转...')
-										this.handleLoginSuccess('WX')
-									})
-									.catch(() => {
-										uni.removeStorageSync(J_USER_ID, data.userInfo.userId)
-										uni.removeStorageSync(J_USER_INFO, data.userInfo)
-										uni.removeStorageSync(J_USER_TOKEN, data.token)
-										uni.hideLoading()
-									})
-							}
-						}
-					})
-				} else {
-					this.$showToast('登录成功', 'success')
-					this.handleLoginSuccess('WX')
-				}
-			}
-			// #endif
-		},
-
-		handleLoginSuccess(type) {
-			if (type === 'WX') {
-				setTimeout(() => {
-					if (uni.getStorageSync(J_NEW_BIND_TYPE)) {
-						window.location.replace('https://h5.jfcmei.com/#/pages/jump/jump')
-					} else if (this.redirect) {
-						window.location.replace(`https://h5.jfcmei.com/#${this.redirect}`)
-					} else {
-						window.location.replace('https://h5.jfcmei.com/#/pages/store/store')
-					}
-				}, 2000)
-			} else {
-				setTimeout(() => {
-					if (uni.getStorageSync(J_NEW_BIND_TYPE)) {
-						uni.redirectTo({ url: '/pages/jump/jump' })
-					} else if (this.redirect) {
-						uni.redirectTo({
-							url: this.redirect
-						})
-					} else {
-						this.$switchTab('/pages/store/store')
-					}
-				}, 2000)
-			}
-		}
-	}
-}
-</script>
-
-<style lang="less" scoped>
-.container {
-	background-color: #b9452b;
-	min-height: 100vh;
-
-	.otherLoginButton {
-		margin-top: 195rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.orderButtonItem {
-			display: flex;
-			justify-content: space-around;
-			white-space: nowrap;
-
-			&>view:not(:first-child) {
-				padding-left: 48upx;
-			}
-		}
-	}
-
-	.agreement {
-		margin-top: 120rpx;
-		padding: 75upx;
-		font-size: 24rpx;
-		text-align: center;
-		color: #000000;
-
-		.colorText {
-			color: #faf9f9;
-		}
-	}
-}
-</style>

pages/login/login.vue

@@ -1,133 +1,354 @@
 <template>
-	<view>
-		<view class="login-main">
-			<image class="user" src="../../static/images/userimg.png"></image>
-			<view class="name">您好 </view>
-			<view class="tip">为了您的最佳体验，请登录</view>
+	<view class="containers" style="min-height: 100vh;">
+		<view class="header" style="width: 100vw;height: 122rpx">
+			<image class="backFn" src="../../static/images/common/back.png" @click="$switchTab('/pages/index/index')"></image>
+		</view>
+		<view class="logoText">
+			<view class="texts" style="font-weight: bold;">
+				<view class="txt">欢迎来到</view>
+				<view class="txt">团蜂社区</view>
+			</view>
+			<view class="" style="margin-top: 48rpx;margin-left: -6rpx;">
+				<text class="appTitle">年轻的社区生活元宇宙</text>
+			</view>
+		</view>
+		<view class="login-form">
+			<tui-form ref="refLoginForm" :show-message="false">
+				<view>
+					<tui-input
+						v-model="loginQuery.phone" label="+ 86" type="number" padding="26rpx 20rpx 26rpx 0"
+						placeholder-style="color: #f3c1c4;font-size: 32rpx;" label-color="#ffffff" border-color="#EA5B1D"
+						placeholder="请输入手机号码" background-color="transparent" :border-top="false" color="#ffffff"
+						style="border-bottom: 2rpx solid #ffffff;"
+					></tui-input>
+				</view>
+				<view v-if="loginType === 'password'">
+					<tui-input
+						v-model="loginQuery.password" type="password" padding="26rpx 20rpx 26rpx 0"
+						placeholder-style="color: #f3c1c4;font-size: 32rpx;" background-color="transparent" :border-top="false"
+						border-color="#EA5B1D" label-color="#ffffff" placeholder="请输入密码" color="#ffffff"
+						style="border-bottom: 2rpx solid #ffffff;"
+					>
+						<template #right>
+							<text style="font-size: 30rpx;color: #dddddd;" @click="isShowResettingPasswordDialog = true">忘记密码</text>
+						</template>
+					</tui-input>
+				</view>
+				<view v-if="loginType === 'verificationCode'">
+					<tui-input
+						v-model="loginQuery.verificationCode" padding="26rpx 20rpx 26rpx 0"
+						placeholder-style="color: #f3c1c4;font-size: 32rpx;" background-color="transparent" :border-top="false"
+						border-color="#EA5B1D" label-color="#ffffff" placeholder="请输入验证码" color="#ffffff"
+						style="border-bottom: 2rpx solid #ffffff;"
+					>
+						<template #right>
+							<tui-countdown-verify
+								v-if="loginType === 'verificationCode'" ref="refLoginVerify" width="188rpx"
+								height="48rpx" border-width="0" text="获取验证码" :size="30"
+								color="#dddddd"
+								@send="handleSendVerify"
+							></tui-countdown-verify>
+						</template>
+					</tui-input>
+				</view>
+			</tui-form>
+		</view>
+		<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 80rpx;">
+			<view style="text-align: center;">
+				<tui-button
+					type="white" width="640rpx" height="82rpx" :size="38"
+					margin="40rpx 0 0" shape="circle"
+					style="font-weight: bold;color: #ea5b1d!important;" @click="handleLogin"
+				>
+					登录
+				</tui-button>
+			</view>
+		</view>
+		<view style="margin-top: 120rpx;display: flex;flex-direction: column;align-items: center;">
+			<view style="display: flex;justify-content: space-around;white-space: nowrap;">
+				<view style="display: flex;flex-direction: column;align-items: center;">
+					<view style="width: fit-content;padding: 14rpx;border: 1rpx solid #ffffff;border-radius: 48rpx;">
+						<tui-icon name="friendadd-fill" color="#ffffff" :size="22" @click="go('/pages/login/register')"></tui-icon>
+					</view>
+					<view style="margin-top: 12rpx;font-size: 26rpx;color: #ffffff;">密码注册</view>
+				</view>
+				<view
+					v-if="!(loginType === 'password')"
+					style="display: flex;flex-direction: column;align-items: center;padding-left: 48rpx;"
+				>
+					<view style="width: fit-content;padding: 14rpx;border: 1rpx solid #ffffff;border-radius: 48rpx;">
+						<tui-icon name="pwd" color="#ffffff" :size="22" @click="loginType = 'password'"></tui-icon>
+					</view>
+					<view style="margin-top: 12rpx;font-size: 26rpx;color: #ffffff;">密码登录</view>
+				</view>
+				<view
+					v-if="!(loginType === 'verificationCode')"
+					style="display: flex;flex-direction: column;align-items: center;padding-left: 48rpx;"
+				>
+					<view style="width: fit-content;padding: 14rpx;border: 1rpx solid #ffffff;border-radius: 48rpx;">
+						<tui-icon name="mobile" color="#ffffff" :size="22" @click="loginType = 'verificationCode'"></tui-icon>
+					</view>
+					<view style="margin-top: 12rpx;font-size: 26rpx;color: #ffffff;">短信登录</view>
+				</view>
+				<!-- #ifdef MP-ALIPAY -->
+				<view
+					v-if="!(loginType === 'verificationCode')"
+					style="display: flex;flex-direction: column;align-items: center;padding-left: 48rpx;"
+				>
+					<view style="width: fit-content;padding: 14rpx;border: 1rpx solid #ffffff;border-radius: 48rpx;">
+						<tui-icon name="mobile" color="#ffffff" :size="22" @click="handleAliPayLogin"></tui-icon>
+					</view>
+					<view style="margin-top: 12rpx;font-size: 26rpx;color: #ffffff;">支付宝登录</view>
+				</view>
+				<!-- #endif -->
+				<view
+					v-if="(terminal === 3) || (terminal === 2)"
+					style="display: flex;flex-direction: column;align-items: center;padding-left: 48rpx;"
+				>
+					<view style="width: fit-content;padding: 14rpx;border: 1rpx solid #ffffff;border-radius: 48rpx;">
+						<tui-icon name="wechat" color="#ffffff" :size="22" @click="handleWXLogin"></tui-icon>
+					</view>
+					<view style="margin-top: 12rpx;font-size: 26rpx;color: #ffffff;">微信登录</view>
+				</view>
+			</view>
 		</view>
 
-		<button class="lgin-btn" open-type="getUserInfo" lang="zh_CN" withCredentials="true" @getuserinfo="mpWxLogin">
-			<view class="text">微信一键登录</view>
-		</button>
+		<tui-dialog
+			style="position: relative;z-index: 888;" :buttons="[{ text: '取消' }, { text: '确定', color: '#586c94' }]"
+			:show="isShowResettingPasswordDialog" title="重置密码" @click="handleResettingPassword"
+		>
+			<template #content>
+				<tui-input v-model="resettingFormData.phone" label="手机号" type="number" placeholder="请输入手机号"></tui-input>
+				<tui-input v-model="resettingFormData.password" label="密码" type="password" placeholder="请输入密码"></tui-input>
+				<tui-input
+					v-model="resettingFormData.passwordAgain" label="确认密码" type="password"
+					placeholder="请再次输入密码"
+				></tui-input>
+				<tui-input v-model="resettingFormData.verificationCode" label="验证码" type="number" placeholder="请输入验证码">
+					<template #right>
+						<tui-countdown-verify
+							ref="refResettingPasswordVerify" width="144rpx"
+							@send="handleSendVerifyResettingPassword"
+						></tui-countdown-verify>
+					</template>
+				</tui-input>
+			</template>
+		</tui-dialog>
 	</view>
 </template>
 
 <script>
-import { USER_INFO } from '../../constant'
+import { mapGetters } from 'vuex'
+import { T_REDIRECT_TYPE, USER_ID, T_STORAGE_KEY } from '../../constant'
+import { getVerifyCodeApi, updatePasswordUserApi } from '../../api/anotherTFInterface'
+import { CHANGE_IS_IN_MINIPROGRAM } from '../../store/modules/type'
+import { getUrlCode } from '../../utils'
+
 export default {
 	name: 'Login',
 	data() {
 		return {
+			loginType: 'verificationCode', // password,verificationCode
+			loginQuery: {
+				phone: '',
+				verificationCode: '',
+				password: ''
+			},
+			resettingFormData: {
+				phone: '',
+				password: '',
+				passwordAgain: '',
+				verificationCode: ''
+			},
+			isShowResettingPasswordDialog: false
 		}
 	},
-	methods: {
-		async mpWxLogin(userInfoData) {
-			console.log('登陆')
-			await this.mpWxGetUserInfo(userInfoData)
-			this.$showToast('登陆成功')
-			uni.navigateTo({
-				url: '/pages/index'
+	onLoad(options) {
+		if (options.to) uni.setStorageSync(T_REDIRECT_TYPE, options.to)
+		if (options.miniProgram) {
+			this.$store.commit(`app/${CHANGE_IS_IN_MINIPROGRAM}`, !!options.miniProgram)
+		}
+	},
+	onShow() {
+		const userId = uni.getStorageSync(USER_ID)
+		const userInfo = uni.getStorageSync(T_STORAGE_KEY)
+		if (userId && userInfo && userInfo.token) {
+			uni.switchTab({
+				url: '/pages/index/index'
 			})
+		} else if (this.$store.state.app.terminal === 3) {
+			const code = getUrlCode().code
+			if (code) this.handleWXLogin()
+		}
+	},
+	computed: {
+		...mapGetters([ 'terminal' ])
+	},
+	methods: {
+		// 获取验证码
+		handleSendVerify() {
+			if (!this.loginQuery.phone) {
+				this.$refs.refLoginVerify.reset()
+				return this.$showToast('请填写手机号')
+			}
+			if (!/^1[3-9]\d{9}$/.test(this.loginQuery.phone)) {
+				this.$refs.refLoginVerify.reset()
+				return this.$showToast('请输入正确的手机号')
+			}
+			getVerifyCodeApi({ phone: this.loginQuery.phone })
+				.then((res) => {
+					this.$refs.refLoginVerify.success()
+					this.$showToast('发送成功，请注意查看手机短信')
+				})
+				.catch(() => {
+					this.$refs.refLoginVerify.reset()
+				})
 		},
-		// 获取用户信息
-		async mpWxGetUserInfo(userInfoData) {
-			return new Promise(async (resolve, reject) => {
-				if (!userInfoData.detail.userInfo) {
-					reject(new Error('未拿到用户信息'))
+		// 点击登录
+		handleLogin() {
+			const validateRules = [ {
+				name: 'phone',
+				rule: ['required', 'isMobile'],
+				msg: ['请输入手机号', '请输入正确的手机号']
+			} ]
+			let loginFilterQuery
+			if (this.loginType === 'verificationCode') {
+				validateRules.push({
+					name: 'verificationCode',
+					rule: ['required', 'isNum'],
+					msg: [ '请输入验证码' ]
+				})
+				loginFilterQuery = {
+					phone: this.loginQuery.phone,
+					verificationCode: this.loginQuery.verificationCode
 				}
-				try {
-					uni.showLoading({
-						mask: true,
-						title: '请稍候...'
+			} else if (this.loginType === 'password') {
+				validateRules.push({
+					name: 'password',
+					rule: ['required', 'isEnAndNo'],
+					msg: ['请输入密码', '密码为8~20位英文和数字组合']
+				})
+				loginFilterQuery = {
+					phone: this.loginQuery.phone,
+					password: this.loginQuery.password
+				}
+			}
+			this.$refs.refLoginForm
+				.validate(this.loginQuery, validateRules)
+				.then(() => {
+					this.$store.dispatch('auth/phoneLoginRegisterAction', {
+						isAfter: true,
+						loginData: {
+							type: 2, // 1注册，2登录
+							...loginFilterQuery
+						}
 					})
-					const [loginErr, loginData] = await uni.login({ provider: 'weixin' })
-					const [err, userData] = await uni.getUserInfo()
-					const res = await request('uni-card', 'loginByWx', {
-						code: loginData.code,
-						encryptedData: userData.encryptedData,
-						iv: userData.iv
-					}, {
-						showLoading: true
+				})
+				.catch((e) => {
+					this.$showToast(JSON.stringify(e.errorMsg))
+				})
+		},
+		async handleAliPayLogin() {
+			await this.$store.dispatch('auth/aliPayLoginAction', { isAfter: true })
+		},
+		async handleWXLogin() {
+			await this.$store.dispatch('auth/wxLoginAction', { isAfter: true })
+		},
+		handleSendVerifyResettingPassword() {
+			if (!this.resettingFormData.phone) {
+				this.$refs.refResettingPasswordVerify.reset()
+				return this.$showToast('请填写手机号')
+			}
+			if (!/^1[3-9]\d{9}$/.test(this.resettingFormData.phone)) {
+				this.$refs.refResettingPasswordVerify.reset()
+				return this.$showToast('请输入正确的手机号')
+			}
+			getVerifyCodeApi({ phone: this.resettingFormData.phone })
+				.then((res) => {
+					this.$refs.refResettingPasswordVerify.success()
+					this.$showToast('发送成功，请注意查看手机短信')
+				})
+				.catch(() => {
+					this.$refs.refResettingPasswordVerify.reset()
+				})
+		},
+		handleResettingPassword(e) {
+			if (e.index === 0) { } else if (e.index === 1) {
+				if (!this.resettingFormData.phone) return this.$showToast('请填写手机号')
+				if (!this.resettingFormData.verificationCode) return this.$showToast('请填写验证码')
+				if (!this.resettingFormData.password) return this.$showToast('请设置密码！')
+				if (this.resettingFormData.password !== this.resettingFormData.passwordAgain) return this.$showToast('密码不一致')
+				uni.showLoading({
+					title: '操作中'
+				})
+				updatePasswordUserApi({ ...this.resettingFormData })
+					.then(({ data }) => {
+						uni.hideLoading()
+						this.$showToast('重置成功')
 					})
-					console.log('res', res)
-					uni.hideLoading()
-					resolve(res)
-				} catch (e) {
-					uni.hideLoading()
-					reject(e)
-				}
-			}).then(async (userInfo) => {
-				this.$store.dispatch('setUserData', userInfo)
-				await uni.setStorageSync(USER_INFO, userInfo)
-				return userInfo
-			})
+					.catch(() => {
+						uni.hideLoading()
+					})
+			}
+			this.resettingFormData.phone = ''
+			this.resettingFormData.verificationCode = ''
+			this.resettingFormData.password = ''
+			this.resettingFormData.passwordAgain = ''
+			this.isShowResettingPasswordDialog = false
 		}
 	}
 }
 </script>
 
-<style>
-	page {
-		background: #fff;
-	}
-</style>
+<style lang="less" scoped>
+.containers {
+	display: flex;
+	flex-direction: column;
+	position: relative;
+	box-sizing: border-box;
+	padding-bottom: 66rpx;
+	background-color: #EA5B1D;
 
-<style scoped>
-	.login-main {
-		width: 100%;
-		padding-top: 200rpx;
+	.backFn {
+		padding: 30rpx 30rpx;
+		width: 62rpx;
+		height: 62rpx;
 	}
 
-	.login-main .user {
-		width: 180rpx;
-		height: 180rpx;
-		margin: 0 auto;
-		display: block;
-	}
+	.logoText {
+		width: 100vw;
+		height: 280rpx;
+		box-sizing: border-box;
+		padding: 30rpx 0 0 56rpx;
+		color: #ffffff;
+		clear: both;
 
-	.login-main .name {
-		text-align: center;
-		font-size: 40rpx;
-	}
+		.texts {
 
-	.login-main .name text {
-		padding: 0 0 0 20rpx;
-	}
-
-	.login-main .tip {
-		color: #999;
-		padding: .9em 0;
-		text-align: center;
-		padding-bottom: 50rpx;
-	}
+			/* font-style: oblique; */
+			.txt {
+				transform: skewX(-6deg);
+			}
 
-	.lgin-btn {
-		width: 80%;
-		margin: 0 auto;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background: #DBA871;
-		border-radius: 10rpx;
-		padding: 15rpx 0;
-	}
-
-	.lgin-btn image {
-		width: 50rpx;
-		height: 50rpx;
-		display: block;
+			line-height: 80rpx;
+			font-size: 74rpx;
+			letter-spacing: 6rpx;
+			-webkit-box-reflect: below 2px -webkit-linear-gradient(top, rgba(250, 250, 250, 0), rgba(250, 250, 250, 0) 70%, rgba(255, 255, 255, 0.644));
+			box-reflect: below 0px linear-gradient(top, rgba(250, 250, 250, 0), rgba(250, 250, 250, .05) 70%, rgba(250, 250, 250, 0.3));
+		}
 	}
 
-	.lgin-btn .text {
-		color: #fff;
-		font-size: 32rpx;
-		padding-left: 10rpx;
+	.appTitle {
+		font-family: 思源黑体;
+		font-size: 34rpx;
+		font-weight: normal;
+		line-height: 42rpx;
+		color: rgba(255, 255, 255, 0.914);
 	}
 
-	.lgin-tip {
-		color: #DBA871;
-		text-align: center;
-		padding: 20rpx 0;
-		font-size: 28rpx;
+	.login-form {
+		margin-top: 20rpx;
+		padding: 146rpx 48rpx 10rpx 48rpx;
 	}
+}
 </style>

pages/login/register.vue

@@ -0,0 +1,241 @@
+<template>
+	<view class="register-container">
+		<JHeader title="" width="50" height="50" style="padding: 24rpx 0 0;"></JHeader>
+		<view class="titleBox">
+			<p class="bigTitle">填写注册信息</p>
+			<p class="tips">请仔细填写以下信息，以免后期登陆异常</p>
+		</view>
+		<view class="formBox">
+			<tui-form ref="form" :show-message="false">
+				<view class="formItem">
+					<tui-input
+						v-model="registerQuery.phone" placeholder-class="inputs" label="" border-color="#EA5B1D"
+						placeholder="请输入电话号码" :border-top="false" color="#222229" clearable
+						size="34"
+					></tui-input>
+				</view>
+				<view class="formItem">
+					<tui-input
+						v-model="registerQuery.verificationCode" padding="26rpx 20rpx 26rpx 0"
+						placeholder-style="color: #f3c1c4;font-size: 32rpx;" background-color="transparent" :border-top="false"
+						border-color="#EA5B1D" label-color="#ffffff" placeholder="请输入验证码" color="#222229"
+						style="border-bottom: 2rpx solid #ffffff;"
+					>
+						<template #right>
+							<tui-countdown-verify
+								ref="refRegisterVerify" width="188rpx" height="48rpx" border-width="0"
+								text="获取验证码"
+								:size="30" color="#EF530E" @send="handleSendVerify"
+							></tui-countdown-verify>
+						</template>
+					</tui-input>
+				</view>
+				<view class="formItem">
+					<tui-input
+						v-model="registerQuery.password" placeholder-class="inputs" type="password" label=""
+						border-color="#EA5B1D" placeholder="请输入密码" :border-top="false" color="#222229"
+						clearable
+						size="34"
+					></tui-input>
+				</view>
+				<view class="formItem">
+					<tui-input
+						v-model="registerQuery.passwordAgain" placeholder-class="inputs" type="password" label=""
+						border-color="#EA5B1D" placeholder="请再次确认密码" :border-top="false" color="#222229"
+						clearable
+						size="34"
+					></tui-input>
+				</view>
+			</tui-form>
+			<view class="tips">密码长度8-16位,必须同时含有字母和数字</view>
+		</view>
+		<button
+			class="loginBtn"
+			:class="{ disbleds: !!(registerQuery.password && registerQuery.passwordAgain && registerQuery.phone && registerQuery.verificationCode) }"
+			@click="addAcount"
+		>
+			确定
+		</button>
+		<view class="agreement">
+			登录即代表你已阅读并同意<text style="color: #222229;">《用户服务协议》</text>
+		</view>
+		<tui-toast ref="toast"></tui-toast>
+		<tui-modal :show="hasRegister" custom fade-i :button="[]" @cancel="hasRegister = false">
+			<view style="padding: 28rpx 0;text-align: center;">
+				<image style="width: 240rpx;height: 144rpx;" src="../../static/images/icon/acount.png"></image>
+				<view
+					style="margin-top: 46rpx;font-size: 36rpx;font-weight: normal;line-height: 52rpx;text-align: center;color: #222229;"
+				>
+					注册完成
+				</view>
+				<view
+					style="margin-top: 18rpx;font-size: 28fpx;font-weight: 350;line-height: 40fpx;text-align: center;color: #888889;"
+				>
+					您已完成注册，请前往首页
+				</view>
+				<button
+					style="width: 484rpx;height: 80rpx;border-radius: 8rpx;background: #EF530E;color: #fff;line-height: 80rpx;margin-top: 80rpx;"
+					@click="$switchTab('/pages/index/index')"
+				>
+					立即跳转
+				</button>
+			</view>
+		</tui-modal>
+	</view>
+</template>
+
+<script>
+import { updatePhoneLoginRegisterApi, getVerifyCodeApi } from '../../api/anotherTFInterface'
+
+export default {
+	name: 'Register',
+	data() {
+		return {
+			registerQuery: {
+				password: '',
+				passwordAgain: '',
+				phone: '',
+				verificationCode: ''
+			},
+			hasRegister: false
+		}
+	},
+	methods: {
+		// 获取验证码
+		handleSendVerify() {
+			if (!this.registerQuery.phone) {
+				this.$refs.refRegisterVerify.reset()
+				return this.$showToast('请填写手机号')
+			}
+			if (!/^1[3-9]\d{9}$/.test(this.registerQuery.phone)) {
+				this.$refs.refRegisterVerify.reset()
+				return this.$showToast('请输入正确的手机号')
+			}
+			getVerifyCodeApi({ phone: this.registerQuery.phone })
+				.then((res) => {
+					this.$refs.refRegisterVerify.success()
+					this.$showToast('发送成功，请注意查看手机短信')
+				})
+				.catch(() => {
+					this.$refs.refRegisterVerify.reset()
+				})
+		},
+
+		addAcount() {
+			this.$refs.form.validate(this.registerQuery, [
+				{
+					name: 'phone',
+					rule: ['required', 'isMobile'],
+					msg: ['请输入手机号', '请输入正确的手机号']
+				},
+				{
+					name: 'verificationCode',
+					rule: [ 'required' ],
+					msg: [ '请输入验证码' ]
+				},
+				{
+					name: 'password',
+					rule: ['required', 'isEnAndNo'],
+					msg: ['请输入密码', '密码为8~20位英文和数字组合']
+				},
+				{
+					name: 'passwordAgain',
+					rule: ['required', 'isSame:password'],
+					msg: ['请再次确认密码', '两次密码不一致']
+				}
+			])
+				.then(() => {
+					updatePhoneLoginRegisterApi({
+						type: 1,
+						phone: this.registerQuery.phone,
+						verificationCode: this.registerQuery.verificationCode,
+						password: this.registerQuery.password
+					}).then((res) => {
+						this.$store.dispatch('auth/LoginAfterAction', { type: 'phone', data: res.data })
+						this.hasRegister = true
+					})
+				})
+				.catch((e) => {
+					this.$showToast(JSON.stringify(e.errorMsg))
+				})
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.register-container {
+	position: relative;
+	min-height: 100vh;
+	box-sizing: border-box;
+
+	.disbleds {
+		background-color: #EF530E !important;
+	}
+
+	.titleBox {
+		width: 100vw;
+		box-sizing: border-box;
+		padding: 64rpx;
+
+		.bigTitle {
+			font-family: Source Han Sans;
+			font-size: 64rpx;
+			font-weight: normal;
+			line-height: 90rpx;
+			color: #303030;
+		}
+
+		.tips {
+			font-family: Source Han Sans;
+			font-size: 28rpx;
+			font-weight: normal;
+			line-height: 40rpx;
+			color: #303030;
+		}
+	}
+
+	.formBox {
+		width: 100vw;
+		box-sizing: border-box;
+		padding: 0rpx 40rpx;
+
+		.formItem {
+			height: 120rpx;
+		}
+
+		.tips {
+			margin-left: 26rpx;
+			font-family: Source Han Sans;
+			font-size: 24rpx;
+			font-weight: normal;
+			line-height: 32rpx;
+			color: #646466;
+		}
+	}
+
+	.loginBtn {
+		margin-top: 64rpx;
+		width: 622rpx;
+		height: 96rpx;
+		border-radius: 16rpx;
+		background: #C6C7CB;
+		color: #FFFFFF;
+		font-size: 32rpx;
+	}
+
+	.agreement {
+		position: absolute;
+		bottom: 48rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		white-space: nowrap;
+		font-size: 28rx;
+		font-weight: 350;
+		line-height: 36rpx;
+		text-align: center;
+		letter-spacing: 0rpx;
+		color: #888889;
+	}
+}
+</style>

pages/user/cpns/BaseInfo.vue

@@ -1,274 +0,0 @@
-<template>
-	<view class="base-info-container">
-		<!-- <view style="font-size: 36upx;font-weight: bold;color: #2A2B23;">个人中心</view> -->
-		<view class="op-container">
-			<view class="wrapper" @click="go('/another-tf/another-serve/messageCenter/index')">
-				<tui-icon name="message" :size="60" unit="upx" color="##222229" margin="0"></tui-icon>
-				<tui-badge
-					v-show="$store.getters.userInfo.notRead" type="danger" right="-6rpx" absolute
-					:scale-ratio="0.8"
-					translate-x="38%" top="-6rpx"
-				>
-					{{ $store.getters.userInfo.notRead > 99 ? '99+' : $store.getters.userInfo.notRead }}
-				</tui-badge>
-			</view>
-			<view class="wrapper" @click="go('/another-tf/another-serve/personalDetails/index')">
-				<tui-icon name="setup" :size="60" unit="upx" color="##222229" margin="0"></tui-icon>
-			</view>
-		</view>
-
-		<view class="user-info">
-			<Avatar
-				margin="0 12upx 0 0" :size="49"
-				:src="$store.getters.userInfo.token ? common.seamingImgUrl($store.getters.userInfo.headImage) : require('../../../static/images/new-user/default-user-avatar.png')"
-				@click="$store.getters.userInfo.token && go('/another-tf/another-serve/personalDetails/index')"
-			></Avatar>
-
-			<view class="right-wrapper">
-				<view v-if="!$store.getters.userInfo.token">
-					<view class="logout-title">您好!</view>
-					<view class="logout-tip">您目前暂未登录，请<text @click="go('/pages/login/login')">前往登录</text></view>
-				</view>
-
-				<view v-else style="display: flex;justify-content: space-between;align-items: center;">
-					<view style="color: #222229;" @click="go('/another-tf/another-serve/personalDetails/index')">
-						<view
-							style="display: flex;align-items: center;align-items: center;box-sizing: border-box;margin-top: 12upx;flex-wrap: wrap;font-size: 20upx;"
-						>
-							<!-- <view>成长值</view> -->
-							<!-- {{ $store.getters.userInfo.growth || 0 }} / {{ $store.getters.userInfo.nextLevelGrowth || 0 }} -->
-							<view style="padding: 6upx 20upx;margin-right: 16upx;background-color: #ffffff;border-radius: 18upx;">
-								ID：{{ $store.getters.userInfo.buyerUserId }}
-							</view>
-							<view
-								style="padding: 6upx 20upx;background-color: #ffffff;border-radius: 18upx;"
-								@click.stop="go('/another-tf/another-user/user-upgrade/user-upgrade-application')"
-							>
-								<text>当前等级：</text>
-								<text v-if="[1, 2].includes($store.getters.levelType)">普通会员</text>
-								<text v-if="[3, 4].includes($store.getters.levelType)">团长</text>
-								<text v-if="[ 5 ].includes($store.getters.levelType)">合伙人</text>
-								<text style="margin-left: 4upx;">></text>
-							</view>
-						</view>
-					</view>
-					<view style="flex: 1;text-align: right;">
-						<tui-button
-							type="warning" width="128rpx" height="64upx" margin="0"
-							shape="circle" :size="24"
-							style="display: inline-block;background: linear-gradient(270deg, #FE4013 0%, #F86D3A 100%)!important;box-shadow: 0px 2px 2px 0px #FA6842,0px 5px 20px 0px rgba(250, 104, 66, 0.8);"
-							@click="go('/another-tf/another-user/user-upgrade/user-upgrade-application')"
-						>
-							升级
-						</tui-button>
-					</view>
-				</view>
-			</view>
-			<!-- 团长或合伙人才有 -->
-			<!-- <view
-				v-if="$store.getters.userInfo.token"
-				style="text-align: center;" @click="$refs.codeCreateRef.getCode('teamMembersInvitation')"
-				>
-				<tui-icon name="qrcode" :size="24" color="#222229"></tui-icon>
-				<view style="font-size: 24upx;color: #8f8d85;">
-				<text>入驻码</text>
-				</view>
-				</view> -->
-		</view>
-
-		<view class="account-container">
-			<view class="account-item" @click="go('/another-tf/another-user/platform-recharge/index')">
-				<view class="account-number"> {{ $store.getters.pricePlatformInfo.totalPrice || 0 }} </view>
-				<view class="account-title">余额</view>
-			</view>
-
-			<view class="account-item" @click="go('/user/sever/goldButler/gold-butler')">
-				<view class="account-number">
-					{{ isBuy ? 1 : 0 }}
-				</view>
-				<view class="account-title">家庭小卫士</view>
-			</view>
-
-			<!-- <view class="account-item" @click="go('/another-tf/another-serve/integral/index')">
-				<view class="account-number">
-				{{ $store.getters.userInfo.credit || 0 }}
-				</view>
-				<view class="account-title">积分</view>
-				</view> -->
-
-			<view class="account-item" @click="go('/another-tf/another-user/voucher/voucher')">
-				<view class="account-number">
-					{{ $store.getters.pricePlatformInfo.voucherPrice || 0 }}
-				</view>
-				<view class="account-title">代金劵</view>
-			</view>
-		</view>
-
-		<tui-modal
-			:show="$data._isShowTuiModel" title="提示" content="您还未登录，是否先去登录？"
-			@click="_handleClickTuiModel($event, 'login', '/pages/user/user')"
-		></tui-modal>
-
-		<tui-modal :show="isShow" title="提示" content="您已开通家庭小卫士" @click="handleToVip"></tui-modal>
-	</view>
-</template>
-
-<script>
-import { userIsPurchaseApi } from '../../../api/user'
-import { USER_ID } from '../../../constant'
-import showModalMixin from 'mixin/showModal'
-import { convertToDecimal } from '../../../utils'
-
-export default {
-	name: 'BaseInfo',
-	data() {
-		return {
-			isBuy: false,
-			isShow: false,
-			isShowGloryFrame: false,
-			frameType: ''
-		}
-	},
-	mixins: [ showModalMixin() ],
-	mounted() {
-		console.log(this.$store.getters.userInfo)
-		this.userIsPurchase()
-	},
-	methods: {
-		convertToDecimal,
-		handleToVip(e) {
-			if (e.index) {
-				uni.navigateTo({ url: '/user/sever/goldButler/gold-butler' })
-			}
-			this.isShow = false
-		},
-
-		// 查询用户是否购买过家庭小卫士套餐
-		async userIsPurchase() {
-			try {
-				const userId = uni.getStorageSync(USER_ID)
-				const res = await userIsPurchaseApi({
-					userId,
-					price: 399
-				})
-				if (res.statusCode === 20000) {
-					if (res.data && Array.isArray(res.data) && res.data.length) {
-						this.isBuy = true
-					}
-				} else {
-					this.isBuy = false
-				}
-			} catch (error) {
-				this.isBuy = false
-			}
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.rotation-box {
-	position: absolute;
-	top: -45vh;
-	left: 50%;
-	margin-left: -60vh;
-	display: block;
-	width: 120vh;
-	height: 120vh;
-	opacity: 0.4;
-	background: repeating-conic-gradient(from 0deg, white 0deg 19deg, transparent 15deg 53deg);
-	mask-image: radial-gradient(rgb(0, 0, 0), rgb(0, 0, 0) 50%);
-	animation: rotate 20s linear infinite;
-}
-
-@keyframes rotate {
-	to {
-		transform: rotate(1turn)
-	}
-}
-
-.base-info-container {
-	position: relative;
-	background: linear-gradient(138deg, #FFFCE7 13%, #F7EBDF 54%);
-	background-size: cover;
-	padding: 48upx 32upx 0upx;
-	box-sizing: border-box;
-
-	.op-container {
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		padding-top: 20upx;
-
-		.wrapper {
-			position: relative;
-
-			&:nth-child(1) {
-				margin-right: 24upx;
-			}
-		}
-	}
-
-	.user-info {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 38upx;
-
-		/deep/ .avatar-container {
-			image {
-				border: 2upx solid #f1f1f0;
-				background-color: #fff;
-				box-sizing: border-box;
-			}
-		}
-
-		.right-wrapper {
-			flex: 1;
-
-			.logout-title {
-				font-size: 28upx;
-				font-weight: bold;
-				line-height: 42upx;
-			}
-
-			.logout-tip {
-				font-size: 24upx;
-				line-height: 36upx;
-				margin-top: 6upx;
-
-				text {
-					color: #ffc117;
-				}
-			}
-		}
-	}
-
-	.account-container {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 32upx;
-		color: #222229;
-
-		.account-item {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-
-			.account-number {
-				font-size: 42upx;
-				font-weight: bold;
-			}
-
-			.account-title {
-				margin-top: 10upx;
-				font-size: 24upx;
-			}
-		}
-	}
-}
-</style>

pages/user/user.vue

@@ -1,153 +1,76 @@
 <template>
 	<view class="user-page-container">
-		<TuanAppShim bg="#f6eadf"></TuanAppShim>
-		<BaseInfo ref="baseInfoRef" @handleNavigate="handleNavigate"></BaseInfo>
-		<view class="main-area">
-			111
-		</view>
-		<tui-modal
-			:show="$data._isShowTuiModel" title="提示" content="您还未登录，是否先去登录？"
-			@click="_handleClickTuiModel($event, 'login', '/pages/user/user')"
-		></tui-modal>
-
-		<TuanChatKF ref="tuanChatKFRef"></TuanChatKF>
-		<tui-toast ref="toast"></tui-toast>
+		<TuanAppShim bg="transparent"></TuanAppShim>
+		<view
+			style="position: relative;background: linear-gradient(138deg, #FFFCE7 13%, #F7EBDF 54%);background-size: cover;padding: 48rpx 32rpx 20rpx;"
+		>
+			<view style="display: flex;align-items: center;justify-content: space-between;margin-top: 38rpx;">
+				<Avatar
+					margin="0 32rpx 0 0" :size="49"
+					:src="userInfo.token ? common.seamingImgUrl(userInfo.headImage) : require('../../static/images/new-user/default-user-avatar.png')"
+				>
+				</Avatar>
 
-		<!-- 特殊code的 menu 操作 -->
-		<CodeCreatePopup ref="codeCreateRef"></CodeCreatePopup>
+				<view style="flex: 1;">
+					<view v-if="!userInfo.token">
+						<view style="font-size: 28rpx;font-weight: bold;line-height: 42rpx;">您好!</view>
+						<view style="font-size: 24rpx;line-height: 36rpx;margin-top: 6rpx;">
+							您目前暂未登录，请<text style="color: #ffc117;" @click="go('/pages/login/login')">
+								前往登录
+							</text>
+						</view>
+					</view>
 
-		<!-- 参与抽奖输入暗语 -->
-		<tui-dialog
-			style="position: relative;z-index: 888;" :buttons="[{ text: '取消' }, { text: '确定', color: '#586c94' }]"
-			:show="isShowLotteryDialog" title="暗语" @click="handleLotteryDialog"
-		>
-			<template #content>
-				<tui-input v-model="codeWordLottery" label="" type="text" placeholder="请输入抽奖暗语"></tui-input>
-			</template>
-		</tui-dialog>
+					<view v-else style="display: flex;justify-content: space-between;align-items: center;">
+						<view style="color: #222229;">
+							<view style="display: flex;align-items: flex-end;">
+								<view style="margin-right: 12rpx;font-size: 34rpx;font-weight: bold;">
+									{{ userInfo.name || userInfo.wechatName || '--' }}
+								</view>
+							</view>
+							<view
+								style="display: flex;align-items: center;align-items: center;box-sizing: border-box;margin-top: 12rpx;flex-wrap: wrap;font-size: 20rpx;"
+							>
+								<view style="padding: 6rpx 20rpx;margin-right: 16rpx;background-color: #ffffff;border-radius: 18rpx;">
+									ID：{{ userInfo.buyerUserId }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="userInfo.token" style="margin-top: 44rpx;">
+			<tui-button type="blue" plain :size="40" width="650rpx" height="88rpx" margin="0 auto" @click="handleQuit">
+				退出登录
+			</tui-button>
+		</view>
 	</view>
 </template>
 
 <script>
-// import { getStorageKeyToken, jumpToOtherProject } from '../../utils'
-// import BaseInfo from './cpns/BaseInfo'
-// import Pane from './cpns/Pane.vue'
-// import showModalMixin from '../../mixin/showModal'
-// import { T_STORAGE_KEY } from '../../constant'
-// import { myFunction, myServe, additionalFunction, shopServe, myPreferential, otherFunction } from './data'
-// import { Encrypt } from '../../utils/secret'
+import { mapGetters } from 'vuex'
 
 export default {
 	name: 'User',
-	components: {
-		BaseInfo,
-		Pane
-	},
-	// mixins: [ showModalMixin() ],
 	onShow() {
 		this.init()
 	},
 	data() {
 		return {
-			timer: null,
-			myFunction,
-			myServe,
-			shopServe,
-			additionalFunction,
-			myPreferential,
-			otherFunction,
-			isShowOther: false,
-			userInfo: {},
-			bindingCode: '',
-
-			// 参与抽奖
-			isShowLotteryDialog: false,
-			codeWordLottery: ''
 		}
 	},
+	computed: {
+		...mapGetters([ 'userInfo' ])
+	},
 	methods: {
 		init() {
-			this.userInfo = uni.getStorageSync(T_STORAGE_KEY) || {}
-			if (this.isLogin()) {
-				this.$refs.baseInfoRef && this.$refs.baseInfoRef.userIsPurchase()
-				this.$store.dispatch('auth/refrshUserInfoAction')
-				this.$store.dispatch('user/count')
-			}
-			this.$forceUpdate()
-		},
-		handleNavigate(item, cb) {
-			// if (['/user/sever/customer-service/customer-service', '/user/sever/chat/chat'].includes(item.url)) {
-			//   this.$refs.tuanChatKFRef.show();
-			//   return;
+			// if (this.isLogin()) {
+			this.$store.dispatch('auth/refrshUserInfoAction')
 			// }
-			if (item.navigate) {
-				item.navigate()
-				return
-			}
-			if (item.type === 'external') {
-				this.go('/user/view?target=' + item.url)
-				return
-			}
-			if (this.isLogin()) {
-				if (item.type === 'participateLottery') {
-					this.isShowLotteryDialog = true
-					return
-				} else if (item.type === 'userInvitation') {
-					if (this.$store.state.auth.identityInfo.type.includes(1)) {
-						uni.showActionSheet({
-							title: '* 请选择业务 *',
-							itemList: ['关系链绑定', '绑定加盟商'],
-							itemColor: '#2c3e50',
-							success: (res) => {
-								if (res.tapIndex === 0) {
-									this.go('/another-tf/another-user/user-invitation/index')
-								} else if (res.tapIndex === 1) {
-									this.$refs.codeCreateRef.getCode('franchiseeInvitation')
-								}
-							}
-						})
-					} else {
-						this.go('/another-tf/another-user/user-invitation/index')
-					}
-					return
-				} else if (item.type === 'flyToService') {
-					// this.$store.dispatch('app/getCustomerServiceAction', { isToService: true })
-					this.go('/another-tf/another-user/chat/chat-detail?chat=serviceAssistant')
-					return
-				} else if (item.type === 'settle') {
-					const storageKeyToken = getStorageKeyToken()
-					if (storageKeyToken) {
-						jumpToOtherProject(`${item.url}/#/?username=${this.userInfo.name}&user=${Encrypt(storageKeyToken)}`)
-					}
-					return
-				} else if (item.type === 'shopInvitation') {
-					this.$refs.codeCreateRef.getCode('shopInvitation')
-					return
-				}
-				if (!item.url) {
-					this.empty()
-					return
-				}
-				if (cb && typeof cb === 'function' && cb()) {
-					uni.navigateTo({
-						url: item.url
-					})
-				} else {
-					uni.navigateTo({
-						url: item.url
-					})
-				}
-			} else {
-				this.$data._isShowTuiModel = true
-			}
 		},
-		handleLotteryDialog(e) {
-			if (e.index === 0) { } else if (e.index === 1) {
-				if (!(this.codeWordLottery === '新年快乐')) return this.$showToast('暗语错误')
-				this.go(`/pages/jump/jump?userId=${this.userInfo.buyerUserId}&type=participateLottery&code=`)
-			}
-			this.codeWordLottery = ''
-			this.isShowLotteryDialog = false
+		handleQuit() {
+			this.$store.dispatch('auth/logoutAction', true)
 		}
 	}
 }
@@ -155,59 +78,9 @@ export default {
 
 <style lang="less" scoped>
 .user-page-container {
-	widows: 100vw;
 	min-height: 100vh;
-	background-color: #f6f6f5;
-	padding-bottom: 120upx;
-
-	.main-area {
-		width: 100%;
-		padding: 0 32upx 32upx;
-		box-sizing: border-box;
-
-		/deep/ .menu-title {
-			font-size: 24upx;
-			color: #3a3629;
-		}
-
-		/deep/ .menu-icon {
-			width: 64upx;
-			height: 64upx;
-		}
-
-		/deep/ .menu-item {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-		}
-
-		/deep/ .order-pane {
-			margin-top: 20upx;
-		}
-	}
-}
-
-/deep/ .tui-loading-init {
-	position: inherit;
-	transform: translate(0, 0);
-	background-color: transparent;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 100vw;
-	min-width: 100vw;
-	max-width: 100vw;
-	flex-direction: row;
-	// padding-top: 30upx;
-}
-
-/deep/ .tui-loadmore-tips {
-	color: #ff7a4e;
-	margin-bottom: 40upx;
-}
-
-/deep/ .tui-loading-center {
-	border-color: #ff7a4e;
+	padding: 0 0 120rpx;
+	background-color: #fefefe;
+	box-sizing: border-box;
 }
 </style>

store/getters.js

@@ -0,0 +1,11 @@
+export default {
+  userInfo: (state) => state.auth.userInfo,
+  userToken: (state) => state.auth.userToken,
+
+  // 个人中心
+  electronicCardInfo: (state) => state.user.electronicCardInfo,
+
+  // app
+  systermInfo: (state) => state.app.systermInfo,
+  terminal: (state) => state.app.terminal
+};

store/index.js

@@ -1,143 +1,18 @@
-import { T_STORAGE_KEY, USER_INFO } from '../constant'
-import { getAnotherTFTokenApi } from '../api/anotherTFInterface'
-import Vue from 'vue'
-import Vuex from 'vuex'
-
-Vue.use(Vuex)
-
-const store = new Vuex.Store({
-	state: {
-		userInfo: uni.getStorageSync(USER_INFO)
-	},
-	getters: {
-		userId(state) {
-			return state.userInfo.id || null
-		}
-	},
-	mutations: {
-		// 更新state数据
-		setStateAttr(state, param) {
-			if (param instanceof Array) {
-				for (const item of param) {
-					state[item.key] = item.val
-				}
-			} else {
-				state[param.key] = param.val
-			}
-		},
-
-		'CHNAGE_USER_INFO'(state, userInfo) {
-			state.userInfo = userInfo
-			uni.setStorageSync(USER_INFO, userInfo)
-		}
-	},
-	actions: {
-		setUserData({ state, commit }, data) {
-			commit('setStateAttr', {
-				key: 'userInfo',
-				val: data
-			})
-			uni.setStorageSync(USER_INFO, data)
-		},
-
-		// 密码登录
-		loginAction({ commit, dispatch }, loginData) {
-			return new Promise((resolve, reject) => {
-				loginApi({ ...loginData })
-					.then(async ({ data }) => {
-						commit('CHNAGE_USER_INFO', data.userInfo)
-						uni.showToast({
-							title: '登录成功'
-						})
-						console.log(data)
-						await dispatch('updateStorageKeyToken')
-						resolve(data)
-					})
-					.catch((err) => {
-						reject(err)
-					})
-			})
-		},
-
-		// 验证码登录
-		codeLoginAction({ commit, dispatch }, loginData) {
-			return new Promise((resolve, reject) => {
-				verificationCodeApi({ ...loginData })
-					.then(async ({ data }) => {
-						commit('CHNAGE_USER_INFO', data.userInfo)
-						uni.showToast({
-							title: '登录成功'
-						})
-						console.log(data)
-						await dispatch('updateStorageKeyToken')
-						resolve(data)
-					})
-					.catch((err) => {
-						reject(err)
-					})
-			})
-		},
-
-		// 微信登陆
-		wxLogin({ commit, dispatch }, code) {
-			return new Promise((resolve, reject) => {
-				wxLoginApi({ code })
-					.then(async ({ data }) => {
-						commit('CHNAGE_USER_INFO', data.userInfo)
-						uni.showToast({
-							title: '登录成功'
-						})
-						await dispatch('updateStorageKeyToken')
-						resolve(data)
-					})
-					.catch((err) => {
-						reject(err)
-					})
-			})
-		},
-
-		logout({ commit }, isQuiet) {
-			uni.removeStorageSync(USER_INFO)
-			commit(CHNAGE_USER_INFO, '')
-			clearAllCache()
-			if (isQuiet) {
-				uni.showToast({
-					title: '退出成功'
-				})
-				setTimeout(() => {
-					uni.switchTab({
-						url: '/pages/community-center/community-centerr'
-					})
-				}, 2000)
-			}
-		},
-
-		// 获取新团蜂token
-		updateStorageKeyToken({ state, dispatch, commit }) {
-			return new Promise((resolve, reject) => {
-				const userInfo = uni.getStorageSync(USER_INFO)
-				if (userInfo && userInfo.phone) {
-					uni.showLoading({ mask: true })
-					getAnotherTFTokenApi({ phone: userInfo.phone })
-						.then((res) => {
-							uni.setStorageSync(T_STORAGE_KEY, res.data)
-							uni.hideLoading()
-							resolve(res.data)
-						})
-						.catch((err) => {
-							uni.hideLoading()
-							resolve(err)
-						})
-					dispatch('updateIdentityInfo')
-				} else {
-					uni.showToast({
-						title: '缺少用户手机号码'
-					})
-					resolve('缺少用户手机号码')
-				}
-			})
-		}
-	}
-})
-
-export default store
+import Vue from "vue";
+import VueX from "vuex";
+import getters from "./getters";
+import auth from "./modules/auth";
+import user from "./modules/user";
+import app from "./modules/app";
+
+Vue.use(VueX);
+
+export default new VueX.Store({
+  state: () => {},
+  getters,
+  modules: {
+    auth,
+    user,
+    app,
+  },
+});

store/modules/app.js

@@ -0,0 +1,68 @@
+import { CHANGE_IS_IN_MINIPROGRAM, CHANGE_SYSTERM_INFO, CHANGE_SYSTERM_TERMINAL } from './type'
+import { isInWx } from '../../utils'
+
+export default {
+	namespaced: true,
+	state() {
+		return {
+			isInMiniProgram: false, // 是否套壳的
+			systermInfo: {},
+			terminal: 0,
+			platformOperationShopId: 186
+		}
+	},
+
+	mutations: {
+		[CHANGE_IS_IN_MINIPROGRAM](state, tag) {
+			if (tag) {
+				state.isInMiniProgram = tag
+			}
+		},
+
+		[CHANGE_SYSTERM_INFO](state, system) {
+			state.systermInfo = system
+			console.log(system)
+		},
+
+		[CHANGE_SYSTERM_TERMINAL](state, terminal) {
+			state.terminal = terminal
+		}
+	},
+
+	actions: {
+		getUserSystermInfo({ commit }) {
+			return new Promise((resolve, reject) => {
+				uni.getSystemInfo({
+					success: (systermInfo) => {
+						commit(CHANGE_SYSTERM_INFO, systermInfo)
+						resolve()
+					},
+					fail: () => {
+						commit(CHANGE_SYSTERM_INFO, {})
+						resolve()
+					}
+				})
+			})
+		},
+		getSystermTerminal({ commit }) {
+			return new Promise((resolve, reject) => {
+				if (isInWx()) {
+					commit(CHANGE_SYSTERM_TERMINAL, 3)
+				} else {
+					// #ifdef H5
+					commit(CHANGE_SYSTERM_TERMINAL, 5) // H5包含pc和移动端浏览器和微信浏览器的可能
+					// #endif
+					// #ifdef APP
+					commit(CHANGE_SYSTERM_TERMINAL, 1)
+					// #endif
+					// #ifdef MP-WEIXIN
+					commit(CHANGE_SYSTERM_TERMINAL, 2)
+					// #endif
+					// #ifdef MP-ALIPAY
+					commit(CHANGE_SYSTERM_TERMINAL, 4)
+					// #endif
+				}
+			})
+		}
+	}
+}

store/modules/auth.js

@@ -0,0 +1,420 @@
+import { T_REDIRECT_TYPE, USER_INFO, USER_ID, USER_TOKEN, T_USER_TOKEN, T_STORAGE_KEY, clearAllCache } from '../../constant'
+import { A_TF_MAIN } from '../../config'
+import { CHNAGE_USER_INFO, CHNAGE_USER_TOKEN, CHNAGE_USER_IDENTITY } from './type'
+import store from '../index'
+import { getUrlCode } from '../../utils'
+import { getIsShopByUserApi, updatePhoneLoginRegisterApi, updateWXLoginApi, updateWXAppLoginApi, updateAlipayLoginApi, getUserInfoApi, updateUserInfoApi } from '../../api/anotherTFInterface'
+
+export default {
+	namespaced: true,
+	state() {
+		return {
+			userInfo: uni.getStorageSync(T_STORAGE_KEY) || {}, // 新团蜂的
+			userToken: uni.getStorageSync(T_USER_TOKEN) || '', // 新团蜂的
+			identityInfo: {
+				type: [], // 9商家或8商家员工，1加盟商，2代理商
+				shopInfo: {}
+			}
+		}
+	},
+
+	mutations: {
+		[CHNAGE_USER_INFO](state, userInfo) {
+			state.userInfo = userInfo
+			uni.setStorageSync(T_STORAGE_KEY, userInfo)
+		},
+
+		[CHNAGE_USER_TOKEN](state, token) {
+			state.userToken = token
+			uni.setStorageSync(T_USER_TOKEN, token)
+		},
+
+		[CHNAGE_USER_IDENTITY](state, data) {
+			if (data.type) state.identityInfo.type = data.type
+			if (data.shopInfo) state.identityInfo.shopInfo = data.shopInfo
+		}
+	},
+
+	actions: {
+		// 手机验证码登录或手机密码登录或手机验证码密码注册
+		phoneLoginRegisterAction({ state, commit, dispatch }, { isAfter, loginData } = { loginData: {} }) {
+			return new Promise((resolve, reject) => {
+				uni.showLoading({ mask: true })
+				updatePhoneLoginRegisterApi({ ...loginData })
+					.then(({ data }) => {
+						console.log(data)
+						if (data.phone && data.oldShopUserInfo && data.oldShopUserInfo.userInfo && data.oldShopUserInfo.userInfo.phone) {
+							try {
+								uni.hideLoading()
+								uni.showToast({ title: '登录成功', icon: 'none' })
+								if (isAfter) dispatch('LoginAfterAction', { type: 'phone', data })
+								resolve(data)
+							} catch (err) {
+								uni.hideLoading()
+								uni.showToast({ title: JSON.stringify(err), icon: 'none' })
+								reject(err)
+							}
+						} else {
+							uni.hideLoading()
+							uni.showToast({ title: '系统错误，未能注册手机号', icon: 'none' })
+							reject()
+						}
+					})
+					.catch((err) => {
+						uni.hideLoading()
+						reject(err)
+					})
+			})
+		},
+
+		// 微信登陆
+		wxLoginAction({ state, commit, dispatch }, { isAfter, pageUrl } = {}) {
+			uni.showLoading({ mask: true })
+			return new Promise((resolve, reject) => {
+				const loginData = {
+					terminal: store.state.app.terminal,
+					headImage: '',
+					code: ''
+				}
+				if (loginData.terminal === 3) {
+					const appid = 'wxb19ccb829623be12' // 团蜂wxb19ccb829623be12，新巨蜂wx603b04a561e4683e，别的wxdf390bb4f8a67641
+					const local = store.state.app.isInMiniProgram ? `${A_TF_MAIN}/#${pageUrl || '/pages/login/login'}?miniProgram=1` : `${A_TF_MAIN}/#${pageUrl || '/pages/login/login'}`
+					const code = getUrlCode().code
+					if (!code) {
+						// 如https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb19ccb829623be12&redirect_uri=http%3A%2F%2Flocalhost%3A8988%2FTFShop_Uni_H5%2F%23%2Fpages%2Flogin%2Flogin&response_type=code&scope=snsapi_userinfo#wechat_redirect
+						window.location.href =
+							'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
+							appid +
+							'&redirect_uri=' +
+							encodeURIComponent(local) +
+							'&response_type=code&scope=snsapi_userinfo#wechat_redirect'
+					} else {
+						updateWXLoginApi({ ...loginData, code })
+							.then(({ data }) => {
+								try {
+									uni.hideLoading()
+									if (isAfter) dispatch('LoginAfterAction', { type: 'wx', data })
+									resolve(data)
+								} catch (err) {
+									uni.hideLoading()
+									uni.showToast({ title: JSON.stringify(err), icon: 'none' })
+									reject(err)
+								}
+							})
+							.catch((err) => {
+								uni.hideLoading()
+								reject(err)
+							})
+					}
+				} else if (loginData.terminal === 5) {
+					uni.hideLoading()
+					uni.showToast({ title: '暂不支持！', icon: 'none' })
+					reject()
+				} else if (loginData.terminal === 1) {
+					uni.login({
+						provider: 'weixin',
+						success(loginRes) {
+							uni.getUserInfo({ // 获取用户信息
+								provider: 'weixin',
+								success(infoRes) {
+									updateWXAppLoginApi({ wechatOpenId: infoRes.userInfo.openId }).then(({ data }) => {
+										uni.hideLoading()
+										if (isAfter) dispatch('LoginAfterAction', { type: 'wx', data: { ...data, wechatOpenId: infoRes.userInfo.openId, headImage: infoRes.userInfo.avatarUrl } })
+										resolve(data)
+									})
+										.catch((err) => {
+											uni.hideLoading()
+											reject(err)
+										})
+								},
+								fail: (err) => {
+									uni.hideLoading()
+									uni.showToast({ title: '微信登录授权失败', icon: 'none' })
+									reject(err)
+								}
+							})
+						},
+						fail: (err) => {
+							uni.hideLoading()
+							uni.showToast({ title: '微信登录授权失败', icon: 'none' })
+							reject(err)
+						}
+					})
+				} else if (loginData.terminal === 2) {
+					uni.login({
+						provider: 'weixin',
+						success: (res) => {
+							uni.hideLoading()
+							loginData.code = res.code
+						},
+						fail: (err) => {
+							uni.showToast({ title: '微信登录授权失败', icon: 'none' })
+						}
+					})
+					uni.getUserProfile({
+						desc: '正在获取', // 不写不弹提示框
+						success: (res) => {
+							updateWXLoginApi({ ...loginData, headImage: res.userInfo.avatarUrl })
+								.then((data) => {
+									uni.hideLoading()
+									if (isAfter) dispatch('LoginAfterAction', { type: 'wx', data })
+									resolve(data)
+								})
+								.catch((err) => {
+									uni.hideLoading()
+									reject(err)
+								})
+						},
+						fail: (err) => {
+							uni.hideLoading()
+							uni.showToast({ title: '微信登录授权失败', icon: 'none' })
+							reject(err)
+						}
+					})
+				} else if (loginData.terminal === 4) {
+					uni.hideLoading()
+					uni.showToast({ title: '暂不支持！', icon: 'none' })
+					reject()
+				} else {
+					uni.hideLoading()
+					uni.showToast({ title: '未能获取系统信息', icon: 'none' })
+					reject()
+				}
+			})
+		},
+
+		// 支付宝登陆
+		aliPayLoginAction({ commit, dispatch }, { isAfter } = {}) {
+			uni.showLoading({ mask: true })
+			return new Promise((resolve, reject) => {
+				uni.login({
+					provider: 'alipay',
+					scopes: 'auth_user',
+					success(res) {
+						updateAlipayLoginApi({
+							code: res.authCode
+						})
+							.then(({ data }) => {
+								uni.hideLoading()
+								if (isAfter) dispatch('LoginAfterAction', { type: 'alipay', data })
+								resolve(data)
+							})
+							.catch((err) => {
+								uni.hideLoading()
+								reject(err)
+							})
+					}
+				})
+			})
+		},
+
+		LoginAfterAction({ state, commit, dispatch }, { type, data }) {
+			try {
+				const tabbarList = ['pages/index/index', 'pages/business-district/business-district', '/pages/community-center/community-center', 'pages/order/order', '/pages/user/user']
+				const redirect = uni.getStorageSync(T_REDIRECT_TYPE)
+				console.log(type)
+				if (type === 'phone') {
+					setTimeout(() => {
+						uni.setStorageSync(USER_ID, data.oldShopUserInfo.userInfo.userId)
+						uni.setStorageSync(USER_TOKEN, data.oldShopUserInfo.token)
+						uni.setStorageSync(USER_INFO, data.oldShopUserInfo.userInfo)
+						commit(CHNAGE_USER_TOKEN, data.token)
+						commit(CHNAGE_USER_INFO, data)
+						if (data.roleId) commit(CHNAGE_USER_IDENTITY, { type: [ ...new Set([...state.identityInfo.type, data.roleId]) ] })
+						dispatch('updateIdentityInfo')
+						if (redirect) {
+							uni.removeStorageSync(T_REDIRECT_TYPE)
+							if (tabbarList.includes(this.redirect)) {
+								uni.switchTab({
+									url: this.redirect
+								})
+							} else {
+								uni.redirectTo({
+									url: this.redirect
+								})
+							}
+						// } else if (uni.getStorageSync(T_NEW_BIND_TYPE)) {
+						// 	uni.redirectTo({
+						// 		url: '/pages/jump/jump'
+						// 	})
+						} else {
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+						}
+					}, 2000)
+				} else if (type === 'wx') {
+					if (data.ifFirst == 0) {
+						if (data.phone && data.oldShopUserInfo && data.oldShopUserInfo.userInfo && data.oldShopUserInfo.userInfo.phone) {
+							uni.setStorageSync(USER_ID, data.oldShopUserInfo.userInfo.userId)
+							uni.setStorageSync(USER_TOKEN, data.oldShopUserInfo.token)
+							uni.setStorageSync(USER_INFO, data.oldShopUserInfo.userInfo)
+							commit(CHNAGE_USER_TOKEN, data.token)
+							commit(CHNAGE_USER_INFO, data)
+							if (data.roleId) commit(CHNAGE_USER_IDENTITY, { type: [ ...new Set([...state.identityInfo.type, data.roleId]) ] })
+							dispatch('updateIdentityInfo')
+							if (this.redirect) {
+								uni.removeStorageSync(T_REDIRECT_TYPE)
+								window.location.replace(`${A_TF_MAIN}/#${this.redirect}`)
+							// } else if (uni.getStorageSync(T_NEW_BIND_TYPE)) {
+							// 	window.location.replace(`${A_TF_MAIN}/#/pages/jump/jump`)
+							} else {
+								window.location.replace(`${A_TF_MAIN}/#/`)
+							}
+						} else if (data.phone && (!data.oldShopUserInfo || !data.oldShopUserInfo.userInfo)) {
+							uni.showToast({ title: '系统错误，未能同步用户数据', icon: 'none' })
+						} else if (data.phone && data.oldShopUserInfo && data.oldShopUserInfo.userInfo && !data.oldShopUserInfo.userInfo.phone) {
+							uni.showToast({ title: '系统错误，未能同步用户手机号', icon: 'none' })
+						} else {
+							uni.showToast({ title: '未能识别的错误', icon: 'none' })
+						}
+					} else {
+						window.location.replace(`${A_TF_MAIN}/#/another-tf/another-serve/bindPhone/index?wechatOpenId=${data.wechatOpenId || ''}&headImage=${data.headImage || ''}&wechatName=${data.wechatName || ''}&buyerUserId=${data.buyerUserId || ''}`) // data=${JSON.stringify(data)}&
+					}
+				} else if (type === 'alipay') {
+					if (data.ifFirst == 0) {
+						uni.setStorageSync(USER_ID, data.oldShopUserInfo.userInfo.userId)
+						uni.setStorageSync(USER_TOKEN, data.oldShopUserInfo.token)
+						uni.setStorageSync(USER_INFO, data.oldShopUserInfo.userInfo)
+						commit(CHNAGE_USER_TOKEN, data.token)
+						commit(CHNAGE_USER_INFO, data)
+						if (data.roleId) commit(CHNAGE_USER_IDENTITY, { type: [ ...new Set([...state.identityInfo.type, data.roleId]) ] })
+						dispatch('updateIdentityInfo')
+						if (redirect) {
+							uni.removeStorageSync(T_REDIRECT_TYPE)
+							if (tabbarList.includes(this.redirect)) {
+								uni.switchTab({
+									url: this.redirect
+								})
+							} else {
+								uni.redirectTo({
+									url: this.redirect
+								})
+							}
+						// } else if (uni.getStorageSync(T_NEW_BIND_TYPE)) {
+						// 	uni.redirectTo({
+						// 		url: '/pages/jump/jump'
+						// 	})
+						} else {
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+						}
+					} else { // 第一次登录，绑定手机号
+						uni.redirectTo({
+							url: `/another-tf/another-serve/bindPhone/index?wechatOpenId=${data.wechatOpenId || ''}&headImage=${data.headImage || ''}&wechatName=${data.wechatName || ''}&buyerUserId=${data.buyerUserId || ''}`
+						})
+					}
+				}
+			} catch (err) {
+				uni.showToast({ title: JSON.stringify(err), icon: 'none' })
+			}
+		},
+
+		logoutAction({ commit }, isQuiet) {
+			uni.removeStorageSync(USER_ID)
+			uni.removeStorageSync(USER_INFO)
+			uni.removeStorageSync(USER_TOKEN)
+			uni.removeStorageSync(T_USER_TOKEN)
+			commit(CHNAGE_USER_INFO, {})
+			commit(CHNAGE_USER_TOKEN, '')
+			clearAllCache()
+			if (isQuiet) {
+				uni.showToast({ title: '退出成功', icon: 'none' })
+				setTimeout(() => {
+					uni.switchTab({
+						url: '/pages/index/index'
+					})
+				}, 2000)
+			}
+		},
+
+		updateUserInfoAction({ state, dispatch }, updateData) {
+			return new Promise((resolve, reject) => {
+				uni.showLoading()
+				updateUserInfoApi(updateData)
+					.then((res) => {
+						uni.hideLoading()
+						uni.showToast({ title: '修改成功', icon: 'success' })
+						dispatch('refrshUserInfoAction')
+						resolve(res)
+					})
+					.catch((err) => {
+						uni.hideLoading()
+						reject(err)
+					})
+			})
+		},
+
+		// 刷新用户信息
+		refrshUserInfoAction({ state, dispatch, commit }, cb) {
+			return new Promise((resolve, reject) => {
+				getUserInfoApi({})
+					.then((res) => {
+						// if (uni.getStorageSync(USER_ID)) {
+						// refrshUserInfoApi({
+						// 	userId: uni.getStorageSync(USER_ID)
+						// })
+						// 	.then((result) => {
+						// uni.setStorageSync(USER_ID, result.data.userId)
+						// uni.setStorageSync(USER_INFO, result.data)
+						const tempUserInfo = uni.getStorageSync(T_STORAGE_KEY)
+						commit(CHNAGE_USER_INFO, Object.assign(res.data, {
+							ifFirst: tempUserInfo.ifFirst,
+							oldShopUserInfo: tempUserInfo.oldShopUserInfo,
+							refreshToken: tempUserInfo.refreshToken,
+							sessionKey: tempUserInfo.sessionKey,
+							ssoUserInfo: tempUserInfo.ssoUserInfo,
+							token: tempUserInfo.token
+						}))
+						if (res.data.roleId) commit(CHNAGE_USER_IDENTITY, { type: [ ...new Set([...state.identityInfo.type, res.data.roleId]) ] })
+						dispatch('updateIdentityInfo')
+						// 	cb && typeof cb === 'function' && cb(result.data)
+						// 	resolve(result.data)
+						cb && typeof cb === 'function' && cb()
+						resolve()
+						// })
+						// .catch((err) => {
+						// 	reject(err)
+						// })
+						// } else {
+						// 	reject()
+						// }
+					})
+					.catch((err) => {
+						reject(err)
+					})
+			})
+		},
+
+		// 获取身份（是否商家）等
+		updateIdentityInfo({ state, dispatch, commit }) {
+			return new Promise(async (resolve, reject) => {
+				// const userInfo = uni.getStorageSync(T_STORAGE_KEY)
+				// if (userInfo && userInfo.phone) {
+				// 	getIsShopByUserApi({ mobile: userInfo.phone })
+				// 		.then(async (res) => {
+				// 			if (res.data && res.data.shopId) {
+				// 				if (res.data.staff) {
+				// 					commit(CHNAGE_USER_IDENTITY, { type: [ ...new Set([...state.identityInfo.type, 8]) ], shopInfo: res.data || {} })
+				// 				} else {
+				// 					commit(CHNAGE_USER_IDENTITY, { type: [ ...new Set([...state.identityInfo.type, 9]) ], shopInfo: res.data || {} })
+				// 				}
+				// 			}
+				// 			resolve(res.data)
+				try {
+					await store.dispatch('user/getElectronicCardAction')
+					resolve()
+				} catch (err) {
+					reject(err)
+				}
+				// 		})
+				// 		.catch((err) => {
+				// 			uni.hideToast()
+				// 			reject(err)
+				// 		})
+				// }
+			})
+		}
+	}
+}

store/modules/type.js

@@ -0,0 +1,11 @@
+export const CHNAGE_USER_INFO = 'CHNAGE_USER_INFO'
+export const CHNAGE_USER_TOKEN = 'CHNAGE_USER_TOKEN'
+export const CHNAGE_USER_IDENTITY = 'CHNAGE_USER_IDENTITY'
+
+// 个人中心
+export const CHNAGE_ELECTRONIC_CARD_INFO = 'CHNAGE_ELECTRONIC_CARD_INFO'
+
+// app
+export const CHANGE_IS_IN_MINIPROGRAM = 'CHANGE_IS_IN_MINIPROGRAM'
+export const CHANGE_SYSTERM_INFO = 'CHANGE_SYSTERM_INFO'
+export const CHANGE_SYSTERM_TERMINAL = 'CHANGE_SYSTERM_TERMINAL'

store/modules/user.js

@@ -0,0 +1,36 @@
+import {
+	CHNAGE_ELECTRONIC_CARD_INFO
+} from './type'
+import { getStorageKeyToken, getStorageUserId } from '../../utils'
+import { getIdEnterpriseUserApi } from '../../api/anotherTFInterface'
+
+export default {
+	namespaced: true,
+	state() {
+		return {
+			electronicCardInfo: {}
+		}
+	},
+
+	mutations: {
+		[CHNAGE_ELECTRONIC_CARD_INFO](state, electronicCardInfo) {
+			state.electronicCardInfo = electronicCardInfo
+		}
+	},
+
+	actions: {
+		getElectronicCardAction({ state, dispatch, commit }) {
+			return new Promise((resolve, reject) => {
+				if (!getStorageKeyToken()) return reject('缺少个人信息')
+				getIdEnterpriseUserApi({ id: getStorageUserId() })
+					.then((res) => {
+						commit(CHNAGE_ELECTRONIC_CARD_INFO, res.data)
+						resolve(res.data)
+					})
+					.catch((err) => {
+						reject(err)
+					})
+			})
+		}
+	}
+}

style/mixin.less

@@ -0,0 +1,33 @@
+.flex(@align: center, @justify: space-between, @direction: row) {
+  display: flex;
+  align-items: @align;
+  justify-content: @justify;
+  flex-direction: @direction;
+}
+
+.border(@color: #000, @line: 1upx, @style: solid) {
+  border: @line @style @color;
+}
+
+.border-bottom(@color: #000, @line: 1upx, @style: solid) {
+  border-bottom: @line @style @color;
+}
+
+.img(@size: 200upx, @radius: 0) {
+  width: @size;
+  height: @size;
+  object-fit: cover;
+  border-radius: @radius;
+}
+
+.margin(@top, @bottom) {
+  margin: @top 0 @bottom 0;
+}
+
+.h-flex(@justifyContent: space-between, @direction: row, @wrap: nowrap) {
+  display: flex;
+  align-items: center;
+  justify-content: @justifyContent;
+  flex-wrap: @wrap;
+  flex-direction: @direction;
+}

style/var.less

@@ -0,0 +1,16 @@
+@f14:28upx;
+@f12:24upx;
+@f16:32upx;
+@f10:20upx;
+
+@c3d:#3d3d3d;
+@c9:#999;
+@c0:#000;
+@cd8:#D8D8D8;
+@cw:#fff;
+
+@r5:10upx;
+@r10:20upx;
+@r20:40upx;
+@r30:60upx;
+@hw24:48upx;

utils/Commonutils.js

@@ -140,7 +140,7 @@ export const getStorageKeyToken = () => {
 			success(res) {
 				if (res.confirm) {
 					uni.switchTab({
-						url: '/'
+						url: '/pages/index/index'
 					})
 				} else if (res.cancel) {
 					// uni.navigateBack();

utils/index.js

@@ -22,5 +22,6 @@ export {
 	jumpToOtherProject,
 	isH5InWebview,
 	isVideo,
-	saveImg
+	saveImg,
+	getUrlCode
 } from './Commonutils'