删除冗余代码

src/pages.json

@@ -172,18 +172,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/index/details",
-			"style": {
-				"navigationBarTitleText": "项目详情",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
 		//订单详情
 		{
 			"path": "pages/order/order_detail",
@@ -224,70 +212,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		//商户评论客户
-		{
-			"path": "pages/my/js_user",
-			"style": {
-				"navigationBarTitleText": "评论客户",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		//收藏
-		{
-			"path": "pages/my/collect",
-			"style": {
-				"navigationBarTitleText": "我的收藏",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		//我的优惠券
-		{
-			"path": "pages/my/coupon",
-			"style": {
-				"navigationBarTitleText": "我的优惠券",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		//优惠券使用记录
-		{
-			"path": "pages/my/record",
-			"style": {
-				"navigationBarTitleText": "使用记录",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/staff/index",
-			"style": {
-				"navigationBarTitleText": "商户中心",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
 
 		{
 			"path": "pages/staff/income",
@@ -313,14 +237,6 @@
 				}
 			}
 		},
-
-		{
-			"path": "pages/join/team",
-			"style": {
-				"navigationBarTitleText": "招商合作",
-				"navigationStyle": "default"
-			}
-		},
 		{
 			"path": "pages/join/staff",
 			"style": {
@@ -436,30 +352,7 @@
 		{
 			"root": "setting",
 			"pages": [
-				{
-					"path": "myNew/index",
-					"style": {
-						"navigationBarTitleText": "设置",
-						"navigationBarBackgroundColor": "#2cb8d4",
-						"navigationBarTextStyle": "white",
-						"app-plus": {
-							"softinputNavBar": "none",
-							"titleNView": false
-						}
-					}
-				},
-				{
-					"path": "myNew/security",
-					"style": {
-						"navigationBarTitleText": "账号安全",
-						"navigationBarBackgroundColor": "#2cb8d4",
-						"navigationBarTextStyle": "white",
-						"app-plus": {
-							"softinputNavBar": "none",
-							"titleNView": false
-						}
-					}
-				},
+				
 				{
 					"path": "myNew/phone",
 					"style": {

src/pages/index/details.vue

@@ -1,924 +0,0 @@
-<template>
-	<view class="details">
-		<view class="content_top">
-			
-		
-		<view class="detail-content">
-			<view class="show_img">
-				<image :src="$globalData.publicUrl+ detail.cCover" />
-			</view>
-			<view class="content">
-				<view class="name">
-					<view class="names"> <text></text> {{detail.cTitle}}</view>
-					<view class="price">
-						<!-- <image src="/static/identify/time.png" />{{detail.nMinute}}分钟 -->
-						￥<text>{{price}}</text> 
-					</view>
-				</view>
-				<view class="time">{{detail.nMinute}}分钟/超{{detail.nSaleNumber}}人选择</view>
-				<view class="state">
-					<!-- <view class="state1">适用说明</view> -->
-					<view class="state2">性别限制：不限</view>
-					<view class="state2">
-						适用人群：{{detail.cSyrq}}
-					</view>
-					<view class="state2">
-						功能作用：{{detail.cLdList}}
-					</view>
-				</view>
-				<view class="service">
-					服务履约保障
-				</view>
-				<view class="three">
-					<view>
-						<image src="/static/identify/approve.png" mode=""></image>实名认证
-					</view>
-					<view>
-						<image src="/static/identify/approve.png" mode="">爽约包赔
-					</view>
-					<view @click="goApprove(details.id)">
-						<image src="/static/identify/approve.png" mode="">商户认证
-							<!-- <image src="/static/identify/more.png" mode=""></image> -->
-					</view>
-				</view>
-			</view>
-
-<!-- 			<view class="bottom">
-				<view class="recommend">
-					<view class="option" :class="current == 0?'cleck_recommend':''" @click="current =0">
-						项目介绍
-					</view>
-					<view class="option" :class="current == 1?'cleck_recommend':''" @click="current =1">
-						推荐商户
-					</view>
-				</view>
-				<view class="cDetail" style="width: 100%;" v-if="current == 0">
-					<image :src="$globalData.publicUrl + detail.cDetail" style="" />
-				</view>
-				<view class="recommend_js" v-else>
-					<view class="item" v-for="(item,index) in jsList" :key="index" @click.stop="godetails(item.id)">
-						<view class="itemL">
-							<view class="hot" v-if="item.nB3 == 1">
-								<image src="https://moxiaoxiang.com/h5/static/xg.gif" mode="" />
-							</view>
-							<view class="img">
-								<image :src="$globalData.publicUrl + item.cPortrait" />
-							</view>
-							<view class="new" v-if="item.nB2 == 1">
-								new
-							</view>
-							<view class="status">{{item.nStatus ===1?'服务中' :'可服务'}}</view>
-						</view>
-						<view class="itemR">
-							<view class="title">
-								<view class="name">{{item.cName}}</view>
-								<view class="address">
-									<image src="/static/identify/address.png" mode="" />{{item.distance}}km
-								</view>
-							</view>
-							<view class="mark">
-								<view class="center">
-									<image src="/static/identify/star.png" mode="" />{{item.nStar}}
-								</view>
-								<view class="right">
-									已服务 <text>{{item.nNum}}</text> 单
-								</view>
-								<view class="right">
-									<text>{{item.number}}</text> 收藏
-								</view>
-							</view>
-							<view class="num">
-								<view class="free_box">
-								</view>
-
-								<view class="btn" @click.stop="bookNow(item)">
-									<text>立即预约</text>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="more" @click="more">
-						更多
-					</view>
-				</view>
-			</view> -->
-
-		</view>
-		</view>
-		<!-- <view class="reserved">
-			<view @click="choose">选择商户</view>
-		</view> -->
-		<view class="dialog" v-if="dialogShow">
-			<view class="back" @click="dialogShow = false">
-
-			</view>
-			<!-- <view class="closebox" @click="closeDialog"></view> -->
-			<view class="dialog_content">
-				<view class="box">
-					<view class="lists" v-for="(item,index) in projects" :key="index">
-						<view class="imgs">
-							<image :src="$globalData.publicUrl + item.cCover" mode="" />
-						</view>
-						<view class="right">
-							<view class="list_title">
-								<view class="title">{{item.cTitle}}</view>
-								<view class="time">{{item.nMinute}}分钟</view>
-							</view>
-							<view class="price">
-								<view class="money">￥{{item.dPrice}}</view>
-								<view class="counter">
-									<view @click="decrease(item,index)">-</view>
-									<text>{{item.number}}</text>
-									<view @click="increase(index)">＋</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="now" @click="nowYuyue"><text>立即预约</text></view>
-
-			</view>
-
-		</view>
-		<view class="cDetail">
-			
-			<image :src="$globalData.publicUrl+ detail.cDetail" ></image>
-		</view>
-		<view class="reserved">
-			<view @click="nowYuyue()">立即预约</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		projectDetails,
-		engineerDetails,
-		addOrder,
-		engineer
-	} from '@/api/index'
-	import {
-		getAddrList,
-	} from '@/api/address';
-	export default {
-		data() {
-			return {
-				detail: [],
-				price: 0,
-				cDetail: '',
-				current: 0,
-				jsList: [],
-				deptName: '',
-				distance: '',
-				projects: [],
-				details: '',
-				dialogShow: false,
-				isAddress:false,
-				longitude: '',
-				latitude:'',
-				cid:'',
-				recommendTechnicianList:[]
-			}
-		},
-		methods: {
-			//选择商户
-			bookNow(item) {
-				this.distance = item.distance
-				if (!uni.getStorageSync('access-token')) {
-					uni.showModal({
-						title: '请先登录！',
-						success: (res) => {
-							if (res.confirm) {
-								uni.switchTab({
-									url: '/pages/my/my'
-								})
-							} else if (res.cancel) {
-								return
-							}
-						}
-					})
-					return
-				} else if (item.nStatus === 1) {
-					uni.showToast({
-						title: '该商户不可预约！',
-						icon: 'none'
-					})
-					return
-				}
-				this.projects = []
-				var id = {
-					id: item.id
-				}
-				engineerDetails(id).then(res => {
-					res.data.data.projects.forEach(element => {
-						element.number = 0
-					});
-					this.details = res.data.data,
-						this.projects = res.data.data.projects,
-						this.dialogShow = true
-				})
-			},
-			// 选择项目加一
-			decrease(item, index) {
-				if (item.number == 0) {
-					return
-				}
-				let list = this.projects
-				this.projects[index].number--
-				// this.projects = list
-			},
-			//选择项目减一
-			increase(index) {
-				this.projects[index].number++
-				//   let list = this.projects
-				// console.log(list[index])
-				//   // list[index].number++; 
-				//     this.projects=list 
-			},
-			// 预约
-			nowYuyue() {
-				uni.setStorageSync('projectId',this.cid)
-				uni.switchTab({
-					url: '/pages/identify/identify',
-				})
-				
-				
-				
-				
-			// 	const allCountsZero = this.projects.every(item => item.number === 0);
-			// 	if (!uni.getStorageSync('access-token')) {
-			// 		uni.showModal({
-			// 			title: '请先登录！',
-			// 		})
-			// 		return
-			// 	} else if (allCountsZero) {
-			// 		uni.showToast({
-			// 			title: '请先选择项目！',
-			// 			duration: 1000,
-			// 			icon: 'none',
-			// 		})
-			// 		return
-			// 	} else if (!this.isAddress) {
-			// 		uni.showModal({
-			// 			title: '提示',
-			// 			content: '你还没有添加地址哦！是否去添加？',
-			// 			confirmText: '确定', // 确定按钮的文字
-			// 			cancelText: '取消', // 取消按钮的文字
-			// 			success(res) {
-			// 				if (res.confirm) {
-			// 					setTimeout(() => {
-			// 						uni.navigateTo({
-			// 							url: '/pages/address/address-edit'
-			// 						})
-			// 					}, 100)
-			// 					// 用户点击确定按钮后的操作
-			// 				} else if (res.cancel) {}
-			// 			}
-			// 		})
-			// 		return
-			// 	} else {
-			// 		// console.log(this.data.projects,"project")
-			// 		var list = []
-			// 		this.projects.forEach(element => {
-			// 			if (element.number > 0) {
-			// 				element.sum = element.number * element.dPrice
-			// 				list.push(element)
-			// 			}
-			// 		});
-			// 		var total = 0
-			// 		for (let i = 0; i < list.length; i++) {
-			// 			total += list[i].sum;
-			// 		}
-			// 		var data = {
-			// 			cJsId: this.details.id,
-			// 			cGoods: list,
-			// 			cOpenId: uni.getStorageSync('wx_copenid'),
-			// 			dTotalMoney: total,
-			// 			distance: this.distance
-			// 		}
-			// 		addOrder(data).then(res => {
-			// 			if (res.data.code == 200) {
-			// 				uni.navigateTo({
-			// 					url: '/pages/identify/pay_order?orderNo=' + res.data.data.orderNo
-			// 					// url:'/pages/identify/pay_order'
-			// 				})
-			// 				this.dialogShow = true
-			// 			} else {
-			// 				uni.showModal({
-			// 					title: res.data.msg,
-			// 				})
-			// 			}
-			// 		})
-			// 	}
-			
-			},
-			more(){
-				uni.setStorageSync('projectId', this.cid)
-				uni.switchTab({
-					url:'/pages/identify/identify'
-				})
-			},
-			//商户详情
-			godetails(id) {
-				if (!uni.getStorageSync('access-token')) {
-					uni.showModal({
-						title: '请先登录！',
-						success: (res) => {
-							if (res.confirm) {
-								this.list = []
-								uni.switchTab({
-									url: '/pages/my/my'
-								})
-							} else if (res.cancel) {
-								return
-							}
-
-						}
-					})
-					return
-				} else {
-					uni.navigateTo({
-						url: '../../pages/identify/details?id=' + id
-					})
-				}
-
-			},
-			choose() {
-				uni.switchTab({
-					url: '../identify/identify',
-				})
-			},
-			getAddress() {
-				var that = this
-				var data = {
-					openId: uni.getStorageSync('wx_copenid'),
-				}
-				getAddrList(data).then(res => {
-					if (res.data.data[0]) {
-						this.isAddress = true
-					} else {
-						this.isAddress = false
-					}
-				}).catch(err => {})
-			},
-			getDetails(cid, deptName) {
-				const cId = {
-					cId: cid,
-					deptName: deptName,
-					nStatus:0,
-					longitude: uni.getStorageSync('longitude'),
-					latitude: uni.getStorageSync('latitude'),
-				}
-				projectDetails(cId).then(res => {
-					if (res.data.code == 200) {
-						this.detail = res.data.data,
-						this.recommendTechnicianList = res.data.data.recommendTechnicianList
-						
-						// res.data.data.jsList.length>3? this.jsList = res.data.data.jsList.slice(0,3):this.jsList = res.data.data.jsList
-						this.price = res.data.data.dPrice.toFixed(2)
-						this.getJsList()
-					}
-				})
-			},
-			getJsList(){
-				let data = {
-					recommendTechnicianList: this.recommendTechnicianList,
-					longitude: uni.getStorageSync('longitude'),
-					latitude: uni.getStorageSync('latitude'),
-					projectId:this.cid
-					
-				}
-				engineer(data).then(res=>{
-					res.data.data.records.length>3? this.jsList = res.data.data.records.slice(0,3):this.jsList = res.data.data.records
-				})
-			},
-			getlocaltion() {
-				uni.getLocation({
-					type: 'wgs84', // 默认为 wgs84 返回 gps 坐标，可以设置为 gcj02 返回可用于 `uni.openLocation` 的坐标
-					success: function(res) {
-						this.latitude = res.latitude
-						this.longitude = res.longitude
-						// this.current = 0
-						// this.city = res.address.city
-					},
-				});
-			},
-		},
-		onLoad: function(options) {
-			this.cid = options.cid
-			this.getDetails(options.cid, options.deptName)
-			// this.getDetails(09493ab2baf94e03b4c014a76b801cc4)
-		},
-		onShow() {
-			this.getAddress()
-			this.getlocaltion()
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.details {
-		width: 100vw;
-		height: 100vh;
-		overflow-y: auto;
-		.content_top{
-			width: 100%;
-			height: auto;
-			background: #F7FFFF;
-			padding: 30rpx 32rpx;
-				box-sizing: border-box;
-		}
-	}
-	.detail-content {
-		width: 100%;
-		height: 100%;
-		padding: 24rpx;
-		box-sizing: border-box;
-		background-color: #E5FDFB;
-		// display: flex;
-		// flex-direction: column;
-		.show_img {
-			width: 638rpx;
-			height: 638rpx;
-			border-radius: 24rpx;
-			overflow: hidden;
-			margin-bottom: 20rpx;
-			image {
-				width: 638rpx;
-				height: 638rpx;
-			}
-		}
-
-		.recommend_js {
-			flex: 1;
-			background: linear-gradient(to bottom right, rgb(246, 249, 242), rgb(210, 241, 243));
-			padding: 10rpx;
-			box-sizing: border-box;
-			.more{
-				width: 100px;
-				height: 30px;
-				background: #35c99d;
-				border-radius: 10rpx;
-				text-align: center;
-				line-height: 30px;
-				margin: 0 auto;
-				color:#fff;
-			}
-			.item {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				// border: 1px solid rgb(212, 211, 211);
-				margin-bottom: 20rpx;
-				border-radius: 30rpx;
-				padding: 30rpx;
-				background-color: #fff;
-				box-sizing: border-box;
-				.itemL {
-					position: relative;
-					width: 150rpx;
-					height: 220rpx;
-					margin-right: 30rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: space-between;
-					.hot {
-						position: absolute;
-						width: 150px;
-						height: 150px;
-						top: -36px;
-						left: -36px;
-						// display: flex;
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-					.img {
-						width: 150rpx;
-						height: 150rpx;
-						border-radius: 50%;
-						overflow: hidden;
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-					.status {
-						font-size: 24rpx;
-						position: absolute;
-						bottom: 0px;
-						background-color: #59b7b6;
-						color: #fff;
-						padding: 3px 10px;
-						border-radius: 20px;
-						// margin: 10px 0px;
-					}
-					.new {
-						position: absolute;
-						top: -20rpx;
-						left: -16rpx;
-						padding: 0rpx 5rpx;
-						background-color: #f9792d;
-						opacity: .8;
-						border-radius: 10rpx;
-						color: #f3f3f3;
-					}
-				}
-				.itemR {
-					flex: 1;
-					height: 220rpx;
-					.title {
-						display: flex;
-						justify-content: space-between;
-						.name {
-							width: 30%;
-							font-size: 30rpx;
-							font-weight: bold;
-							overflow: hidden;
-							white-space: nowrap;
-							text-overflow: ellipsis;
-						}
-						.address {
-							// width: 40%;
-							font-size: 26rpx;
-							color: #585858;
-							image {
-								width: 30rpx;
-								height: 30rpx;
-								vertical-align: text-bottom;
-							}
-						}
-						.status {
-							color: #fff;
-							background-color: #0ec891;
-							font-size: 18rpx;
-							padding: 5rpx 15rpx;
-							border-radius: 30px;
-							height: 30rpx;
-							line-height: 30rpx;
-						}
-					}
-					.mark {
-						display: flex;
-						justify-content: space-between;
-						margin: 20px 0;
-						.right {
-							text {
-								color: #f9792d;
-								margin-right: 5px;
-							}
-						}
-						.center {
-							display: flex;
-							align-items: center;
-							image {
-								width: 30rpx;
-								height: 30rpx;
-								margin-right: 5px;
-							}
-						}
-					}
-					.num {
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						// padding-left: 30rpx;
-						color: #9e9e9e;
-						.free_box {
-							font-size: 24rpx;
-							color: #59b7b6;
-						}
-						image {
-							width: 30rpx;
-							height: 30rpx;
-						}
-						.btn {
-							background-color: #59b7b6;
-							padding: 10px;
-							border-radius: 3px 10px 10px 10px;
-						}
-					}
-					.items {
-						display: flex;
-						justify-content: space-between;
-						padding: 10rpx 0;
-						image {
-							width: 30rpx;
-							height: 30rpx;
-							margin-right: 10rpx;
-							vertical-align: text-top;
-						}
-						view {
-							display: flex;
-							align-items: center;
-						}
-					}
-					.btn {
-						font-size: 26rpx;
-						background-color: #2cb8d4;
-						border-radius: 30px;
-						color: #fff;
-						text-align: center;
-						padding: 10rpx 0;
-					}
-				}
-			}
-		}
-		.slogan {
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			font-size: 22rpx;
-			padding: 20rpx 0;
-			view {
-				&:before {
-					content: '';
-					display: inline-block;
-					width: 20rpx;
-					height: 20rpx;
-					background-color: #2cb8d4;
-					border-radius: 10px;
-					margin-right: 5px;
-				}
-			}
-		}
-		.content {
-			// padding: 0 30rpx;
-			.name {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 8rpx;
-				.names {
-					font-size: 36rpx;
-					font-weight: bold;
-					display: flex;
-					align-items: center;
-					text{
-						display: inline-block;
-						width: 6rpx;
-						height: 34rpx;
-						background: #20CBC2;
-						margin-right: 24rpx;
-					}
-				}
-				.price {
-					font-size: 24rpx;
-					color: #F53E54;
-					font-weight: bold;
-					display: flex;
-					align-items: center;
-					text{
-						font-weight: 600;
-						font-size: 44rpx;
-						color: #F53E54;
-						line-height: 24rpx;
-					}
-				}
-			}
-			.time {
-				font-size: 24rpx;
-				color: #45BBB5;
-				margin-top: 8rpx;
-				padding-left: 30rpx;
-				margin-bottom: 20rpx;
-			}
-
-			.state {
-				width: 100%;
-				background: #FFFFFF;
-				box-shadow: 0px 4rpx 12rpx 0px rgba(88,209,187,0.1);
-				border-radius: 16rpx ;
-				padding: 20rpx;
-				box-sizing: border-box;
-				.state1 {
-					font-size: 32rpx;
-					// font-weight: bold;
-				}
-				.state2 {
-					font-size: 28rpx;
-					color: #2F3437;
-					line-height: 33rpx;
-				}
-				.state2:nth-child(2){
-					margin: 16rpx 0px;
-				}
-			}
-			.service {
-				font-size: 28rpx;
-				color: #2F3437;
-				line-height: 33rpx;
-				margin: 20rpx 0;
-			}
-			
-			.three {
-				width: 100%;
-				height: 80rpx;
-				display: flex;
-				justify-content: space-around;
-				align-items: center;
-				font-size: 28rpx;
-				color: #2F3437;
-				padding: 20rpx 0;
-				background-color: #ffffff;
-				box-sizing: border-box;
-				border-radius: 16rpx;
-			
-				view {
-					display: flex;
-					align-items: center;
-			
-					image {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 8rpx;
-					}
-				}
-			}
-		}
-		.bottom {
-			flex: 1;
-			width: 100vw;
-			display: flex;
-			flex-direction: column;
-			margin-top: 32rpx;
-			.recommend {
-				width: 100%;
-				height: 50px;
-				display: flex;
-				align-items: center;
-				justify-content: space-around;
-				.option {
-					font-size: 26rpx;
-					color: #333;
-				}
-				.cleck_recommend {
-					color: #2cb8d4;
-				}
-			}
-		}
-	}
-	
-	.cDetail {
-		width: 100vw;
-		margin-bottom: 130rpx;
-		image {
-			width: 100%;
-			height: 2600rpx;
-			// object-fit: cover;
-		}
-	}
-	.reserved {
-		width: 100%;
-		height: 116rpx;
-		background: #FFFFFF;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		padding: 20rpx 40rpx;
-		text-align: center;
-		box-shadow: 0 0 30rpx #ece9e9;
-		background-color: #fff;
-		box-sizing: border-box;
-	
-		view {
-			background: linear-gradient( 90deg, #1AD7CE 0%, #21C9C1 100%);
-			color: #fff;
-			width: 100%;
-			height: 76rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 106rpx;
-			font-weight: bold;
-			font-size: 32rpx;
-		}
-	}
-	.dialog {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, .5);
-		z-index: 10;
-		transition: transform 0.3s ease-out;
-		display: flex;
-		flex-direction: column;
-		.back {
-			flex: 1;
-		}
-		.closebox {
-			height: calc(50vh - 60rpx);
-			width: 100%;
-		}
-		.dialog_content {
-			background-color: #fff;
-			position: absolute;
-			bottom: 0;
-			width: calc(100% - 60rpx);
-			height: 50vh;
-			border-top-left-radius: 20rpx;
-			border-top-right-radius: 20rpx;
-			padding: 30rpx;
-			background-color: #f3f3f3;
-			// padding-bottom: 100rpx;
-			display: flex;
-			flex-direction: column;
-			.box {
-				height: 90%;
-				overflow-y: auto;
-				.lists {
-					// height: 90%;
-					background-color: #fff;
-					margin-bottom: 20rpx;
-					display: flex;
-					justify-content: space-between;
-					padding: 20rpx 10rpx;
-					border-radius: 10rpx;
-					// overflow-y: auto;
-					.imgs {
-						width: 240rpx;
-						height: 160rpx;
-						border-radius: 20rpx;
-						overflow: hidden;
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-					.right {
-						flex: 1;
-						padding-left: 30rpx;
-						.list_title {
-							display: flex;
-							justify-content: space-between;
-							align-items: center;
-							.title {
-								width: 280rpx;
-								font-size: 34rpx;
-								font-weight: bold;
-								overflow: hidden;
-								white-space: nowrap;
-								text-overflow: ellipsis;
-							}
-							.time {
-								font-size: 24rpx;
-								color: #45BBB5;
-							}
-						}
-						.price {
-							padding-top: 50rpx;
-							display: flex;
-							justify-content: space-between;
-							.money {
-								font-size: 42rpx;
-								color: #e61b1b;
-								font-weight: bold;
-							}
-							.counter {
-								display: flex;
-								view {
-									width: 60rpx;
-									height: 60rpx;
-									line-height: 60rpx;
-									background-color: #f7f8fa;
-									text-align: center;
-									border-radius: 60rpx;
-									font-size: 50rpx;
-								}
-								text {
-									display: block;
-									width: 100rpx;
-									text-align: center;
-									line-height: 60rpx;
-									font-size: 30rpx
-								}
-							}
-						}
-					}
-				}
-			}
-			.now {
-				height: 10%;
-				left: 0;
-				width: 100%;
-				text-align: center;
-				height: 100rpx;
-				padding-top: 10rpx;
-				text {
-					display: inline-block;
-					height: 80rpx;
-					line-height: 80rpx;
-					width: 90%;
-					background-color: #2cb8d4;
-					color: #fff;
-					border-radius: 50rpx;
-				}
-			}
-		}
-	}
-</style>

src/pages/index/index.vue

@@ -208,6 +208,24 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- 未入驻提示 -->
+		<u-popup :show="showModal" mode="center" border-radius="16rpx" :mask-close-able="false">
+			<view class="modal-wrap">
+				<!-- 标题居中 -->
+				<view class="title">提示</view>
+				<!-- 正文 -->
+				<view class="content">
+					请提交入驻资料并由后台人员审核通过后,<br>即可开通操作权限
+				</view>
+				<!-- 底部双按钮（必显示） -->
+				<view class="btn-box">
+					<view class="btn left" @click="cancel">我在想想</view>
+					<view class="btn right" @click="goEnter">立即入驻</view>
+				</view>
+			</view>
+		</u-popup>
+
 	</view>
 </template>
 
@@ -227,6 +245,7 @@ import { orderDeatails, takeOrder, refuseOrder } from '@/api/order.js'
 export default {
 	data() {
 		return {
+			showModal: false, // 控制弹窗显隐
 			merchantInfo: {},
 			cJsId: '',
 			isWorking: false,
@@ -260,7 +279,7 @@ export default {
 				{ label: '免车费', icon: '免', path: '/workbench/fare/index' },
 				{ label: '开通新技能', icon: '技', path: '/workbench/skill/add' },
 				{ label: '我的合同', icon: '合', path: '/workbench/contract/index' },
-				{ label: '我的资料', icon: '资', path: '/pages/my/indent?title=编辑资料' },
+				{ label: '我的资料', icon: '资', path: '/pages/join/applyJoin?title=编辑资料' },
 				{ label: '城市管理', icon: '城', path: '/workbench/city/index' },
 			],
 		}
@@ -296,7 +315,25 @@ export default {
 	onShow() {
 		this.loadPageData()
 	},
+	onLoad() {
+		setTimeout(() => {
+			console.log('666')
+			this.showModal = true
+		}, 500);
+	},
 	methods: {
+		// 我在想想：关闭弹窗
+		cancel() {
+			console.log('5555')
+			this.showModal = false
+		},
+		// 立即入驻：跳转入驻页
+		goEnter() {
+			this.showModal = false
+			uni.navigateTo({
+				url: '/pages/join/applyJoin' // 替换你的入驻页面路径
+			})
+		},
 		loadPageData() {
 			this.fetchMerchantInfo()
 			this.fetchWalletInfo()
@@ -582,6 +619,52 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// 弹窗
+.modal-wrap {
+	width: 620rpx;
+	background: #fff;
+	border-radius: 16rpx;
+	overflow: hidden;
+
+	.title {
+		font-size: 42rpx;
+		text-align: center;
+		padding: 40rpx 30rpx 20rpx;
+		font-weight: 500;
+		color: #333;
+	}
+
+	.content {
+		font-size: 36rpx;
+		color: #333;
+		padding: 0 40rpx 40rpx;
+		line-height: 1.7;
+	}
+
+	.btn-box {
+		display: flex;
+		border-top: 1rpx solid #eee;
+	}
+
+	.btn {
+		flex: 1;
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 36rpx;
+	}
+
+	.left {
+		color: #333;
+		border-right: 1rpx solid #eee;
+	}
+
+	.right {
+		color: #007aff;
+	}
+
+}
 .workbench {
 	min-height: 100vh;
 	padding: 24rpx 24rpx 40rpx;

src/pages/join/team.vue

@@ -1,216 +0,0 @@
-<template>
-    <view class="page-container">
-        <!-- <u-navbar title="招商加盟" :autoBack="true" placeholder bgColor="#fff"></u-navbar> -->
-
-        <view class="banner-box">
-            <image src="/static/other/work.png" mode="widthFix"
-                class="banner-img"></image>
-        </view>
-
-        <view class="form-box">
-            <u--form ref="uForm" 
-                labelPosition="top"
-				:model="form" :rules="rules"
-			>
-                <u-form-item prop="city">
-                    <view class="label required" slot="label">意向代理城市</view>
-                    <u-input v-model="form.city" placeholder="请输入您的首选城市" border="none"
-                        class="input-gray"></u-input>
-                </u-form-item>
-
-                <u-form-item prop="resource">
-                    <view class="label" slot="label">城市资源介绍</view>
-                    <u-textarea v-model="form.resource" placeholder="请输入城市资源介绍" border="none" height="80"
-                        class="input-gray"></u-textarea>
-                </u-form-item>
-
-                <u-form-item prop="name">
-                    <view class="label required" slot="label">合伙人姓名</view>
-                    <u-input v-model="form.name" placeholder="请输入您的名字" border="none" class="input-gray"></u-input>
-                </u-form-item>
-
-                <u-form-item prop="phoneNum">
-                    <view class="label required" slot="label">手机号</view>
-                    <u-input v-model="form.phoneNum" placeholder="请输入您的手机号" type="number" border="none"
-                        class="input-gray"></u-input>
-                </u-form-item>
-
-                <u-form-item prop="company">
-                    <view class="label" slot="label">公司</view>
-                    <u-input v-model="form.company" placeholder="请输入公司名称" border="none" class="input-gray"></u-input>
-                </u-form-item>
-
-                <u-form-item prop="isMassage">
-                    <view class="label" slot="label">是否从事过按摩行业</view>
-                    <u-radio-group v-model="form.isMassage" activeColor="#e1b876">
-                        <u-radio label="是" :name="1" customStyle="margin-right: 40px"></u-radio>
-                        <u-radio label="否" :name="0"></u-radio>
-                    </u-radio-group>
-                </u-form-item>
-
-                <u-form-item prop="years">
-                    <view class="label" slot="label">有几年按摩行业管理经验</view>
-                    <u-radio-group v-model="form.years" activeColor="#e1b876">
-                        <u-radio label="1-3年" name="1" customStyle="margin-right: 20px"></u-radio>
-                        <u-radio label="4-10年" name="2" customStyle="margin-right: 20px"></u-radio>
-                        <u-radio label="10年以上" name="3"></u-radio>
-                    </u-radio-group>
-                </u-form-item>
-
-                <u-form-item prop="isEntity">
-                    <view class="label" slot="label">是否正在经营实体门店</view>
-                    <u-radio-group v-model="form.isEntity" activeColor="#e1b876">
-                        <u-radio label="是" :name="1" customStyle="margin-right: 40px"></u-radio>
-                        <u-radio label="否" :name="0"></u-radio>
-                    </u-radio-group>
-                </u-form-item>
-
-                <view class="btn-box">
-                    <u-button text="提交" color="#FFCA64" shape="circle"
-                        customStyle="color: #000; font-size: 32rpx;"
-                        @click="onSubmit"
-                    ></u-button>
-                </view>
-            </u--form>
-        </view>
-    </view>
-</template>
-
-<script>
-import {
-    netBusinessAdd,
-    netBusinessUpdate,
-    getBusinessByOpenId,
-} from '@/api/staff';
-export default {
-    data() {
-        return {
-            form: {
-                city: '',
-                name: '',
-                years: '',
-                company: '',
-                isEntity: '',
-                resource: '',
-                phoneNum: '',
-                isMassage: '',
-            },
-            rules: {
-				city: [
-					{
-						required: true,
-						message: '请输入意向代理城市',
-						trigger: ['blur', 'change']
-					}
-				],
-				name: [
-					{
-						required: true,
-						message: '请输入姓名',
-						trigger: ['blur', 'change']
-					}
-				],
-				phoneNum: [
-					{
-						required: true,
-						message: '请输入手机号',
-						trigger: ['blur', 'change']
-					},
-                    {
-                        pattern: /^1([3589]\d|4[01456879]|6[0-9]|7[0-8])\d{8}$/, 
-                        message: '请输入正确的手机号格式', 
-                        trigger: ['blur', 'change']
-					}
-				]
-			}
-        };
-    },
-    onShow() {
-        this.getData();
-    },
-	onReady() {
-		// 页面加载完成后为表单设置规则
-		this.$refs.uForm.setRules(this.rules);
-	},
-    methods: {
-        getData() {
-            let params = {
-                openId: uni.getStorageSync('wx_copenid')
-            }
-            getBusinessByOpenId(params).then(res => {
-                if (res.data.code === 200 && res.data.data) {
-                    this.form = res.data.data;
-                }
-            });
-        },
-        onSubmit() {
-			this.$refs.uForm.validate().then(res => {
-                let api = netBusinessAdd;
-                if (this.form.id) api = netBusinessUpdate;
-                api(this.form).then(res => {
-                    uni.$u.toast(res.data.msg);
-                    if (res.data.code == 200) {
-                        setTimeout(() => {
-                            uni.navigateBack();
-                        }, 1000);
-                    } else {
-                        
-                    }
-                });
-			}).catch(errors => {
-				// uni.$u.toast('校验失败')
-			})
-		}
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.page-container {
-    min-height: 100vh;
-    background-color: #1a1a1a;
-}
-
-.banner-box {
-    width: 100%;
-    height: 360rpx;
-
-    .banner-img {
-        width: 100%;
-        display: block;
-    }
-}
-
-.form-box {
-    min-height: 800rpx;
-    margin: 0 24rpx;
-    padding: 40rpx 24rpx;
-    border-radius: 16rpx;
-    background-color: #F4F5F6;
-    position: relative;
-    z-index: 10;
-
-    .label {
-        font-size: 28rpx;
-        color: #333;
-        margin-bottom: 16rpx;
-        font-weight: bold;
-    }
-
-    .required::after {
-        content: '*';
-        color: #ff4d4f;
-        margin-left: 4rpx;
-    }
-
-    .input-gray {
-        background-color: #fff;
-        border-radius: 8rpx;
-        padding: 10rpx 20rpx !important;
-    }
-}
-
-.btn-box {
-    margin-top: 60rpx;
-}
-</style>

src/pages/my/collect.vue

@@ -1,649 +0,0 @@
-<template>
-	<view class="listAll">
-		<view class="nodata" v-if="list.length == 0">
-			<view>暂无记录</view>
-		</view>
-		<view class="list" v-else>
-			<view class="item" v-for="(item,index) in list" :key="index">
-				<view class="hot">
-					<image src="/static/identify/hot.png" mode="" />
-				</view>
-				<view class="itemL">
-					<!-- <view class="hot" v-if="item.nB3 == 1"> -->
-
-					<view class="img">
-						<image :src="$globalData.publicUrl + item.js.cPortrait" />
-					</view>
-					<!-- <view class="new" v-if="item.nB2 == 1">
-								new
-							</view> -->
-					<!-- <view class="status">{{item.nStatus ===1?'服务中' :'可服务'}}</view> -->
-				</view>
-				<view class="itemR">
-					<view class="title">
-						<view class="name">{{item.js.cNickName}}</view>
-						<view class="intro_box">
-							<view class="intro">
-								简介
-							</view>
-							<view class="intro_content">
-								{{item.js.cJianjie}}
-							</view>
-						</view>
-						<!-- <view class="address">
-									<image src="/static/identify/address.png" mode="" />{{item.distance}}km
-								</view> -->
-					</view>
-					<view class="mark">
-						<!-- 评分，默认5星 -->
-						<view class="center">
-							<image src="/static/identify/star.png" mode="" />{{item.js.nStar}}人
-						</view>
-						<!-- 收藏数量 -->
-						<view class=" center right">
-							<image src="/static/identify/my1.png" mode="" />
-							<text>{{item.js.number}}</text> 人
-						</view>
-						<!-- 服务数量 -->
-						<view class="right">
-							<!-- <image src="/static/identify/serve.png" mode="" /> -->
-							已服务: <text>{{item.js.nNum}}</text> 人
-						</view>
-
-					</view>
-					<view class="num">
-						<!-- <view class="free_box">
-									<view class="free" v-if="free == 1">
-										07:30-20:00 &nbsp; {{item.daytimeMileage}}公里免出行费
-									</view>
-									<view class="free" v-if="free == 1">
-										20:00-07:30 &nbsp; {{item.nigthMileage}}公里免出行费
-									</view>
-								</view> -->
-						<view class="free_box">
-							<image src="/static/identify/length.png" mode="" />
-							{{item.js.distance}}km
-						</view>
-
-						<view class="btn" @click.stop="bookNow(item)">
-							<!-- <view class="btn" @click="bookNow" data-id="{{item.id}}" data-fuwu="{{item.nStatus}}" data-distance="{{item.distance}}"> -->
-							<text>立即预约</text>
-						</view>
-					</view>
-
-				</view>
-				<!-- 	<view class="itemL" @click="godetails(item.js.id)">
-							<image :src="$globalData.publicUrl + item.js.cPortrait" mode="scaleToFill" />
-						</view>
-						<view class="itemR">
-							<view class="title" @click="godetails(item.js.id)">
-								<view class="name">{{item.js.cName}}</view>
-								<view class="status">{{item.js.nStatus ===1?'服务中' :'可服务'}}</view>
-							</view>
-							<view class="items" @click="godetails(item.js.id)">
-								<view class="">
-									<image src="/static/identify/star.png" mode="" />{{item.js.nStar}}
-								</view>
-								<view class="">
-									<image src="/static/identify/serve.png" mode="" />{{item.js.nNum}}
-								</view>
-								<view class="">
-									<image src="/static/identify/collect.png" mode="" />{{item.js.number || '0'}}
-								</view>
-							</view>
-							<view class="btn" @click="bookNow(item.js.id,item.js.nStatus)">
-								<text>立即预约</text>
-							</view>
-						</view> -->
-			</view>
-		</view>
-		<view class="dialog" v-if="dialogShow">
-			<view class="closebox" @click="closeDialog"></view>
-			<view class="dialog_content">
-				<view class="lists" v-for="(item,index) in projects" :key="index">
-					<view class="imgs">
-						<image :src="$globalData.publicUrl + item.cCover" mode="" />
-					</view>
-					<view class="right">
-						<view class="list_title">
-							<view class="title">{{item.cTitle}}</view>
-							<view class="time">{{item.nMinute}}分钟</view>
-						</view>
-						<view class="price">
-							<view class="money">￥{{item.dPrice}}</view>
-							<view class="counter">
-								<view @click="decrease(index)">-</view>
-								<text>{{ item.number }}</text>
-								<view @click="increase(index)">＋</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="now" @click="nowYuyue"><text>立即预约</text></view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getCollect,
-		engineerDetails,
-		addOrder
-	} from '../.././api/index.js'
-	export default {
-		data() {
-			return {
-				list: [],
-				imageUrl: '',
-				publicUrl: 'https://1910ca70.r6.cpolar.top', //图片前缀
-				projects: [],
-				dialogShow: false,
-				count: 0,
-				details: '',
-				sum: 0,
-			}
-		},
-		methods: {
-			//预约
-			nowYuyue() {
-				const allCountsZero = this.projects.every(item => item.number === 0);
-				if (allCountsZero) {
-					uni.showToast({
-						title: '请先选择项目！',
-						duration: 1000,
-						icon: 'none',
-					})
-					return
-				} else {
-					// console.log(this.data.projects,"project")
-					var list = []
-					this.projects.forEach(element => {
-						if (element.number > 0) {
-							element.sum = element.number * element.dPrice
-							list.push(element)
-						}
-					});
-					var total = 0
-					for (let i = 0; i < list.length; i++) {
-						total += list[i].sum;
-					}
-					var data = {
-						cJsId: this.details.id,
-						cGoods: list,
-						cOpenId: uni.getStorageSync('wx_copenid'),
-						dTotalMoney: total,
-					}
-					addOrder(data).then(res => {
-						if (res.data.code == 200) {
-							uni.navigateTo({
-								// url: '../identify/orderDeatails/orderDeatails?orderNo=' + res.data.data.orderNo,
-								url: '../identify/pay_order?orderNo=' + res.data.data.orderNo,
-							})
-						} else {
-							uni.showModal({
-								title: '提示',
-								content: '你还没有添加地址哦！是否去添加？',
-								confirmText: '确定', // 确定按钮的文字
-								cancelText: '取消', // 取消按钮的文字
-								success(res) {
-									if (res.confirm) {
-										setTimeout(() => {
-											uni.navigateTo({
-												url: '../my/addAddress/addAddress?type=1'
-											})
-										}, 100)
-										// 用户点击确定按钮后的操作
-									} else if (res.cancel) {}
-								}
-							})
-						}
-					})
-				}
-			},
-			//预约弹窗关闭
-			closeDialog() {
-				this.dialogShow = false
-			},
-			//预约+1
-			increase(idx) {
-				this.projects[idx].number++;
-			},
-			//预约-1
-			decrease(idx) {
-				if (this.projects[idx].number > 0) {
-					this.projects[idx].number--;
-				}
-			},
-			//获取收藏列表
-			getcollectList() {
-				var data = {
-					cWxOpenId: uni.getStorageSync('wx_copenid')
-				}
-				getCollect(data).then(res => {
-					if (res.data.code == 200) {
-						this.list = res.data.data
-						console.log(this.list)
-					}
-				})
-			},
-			//跳转至商户详情
-			godetails(id) {
-				uni.navigateTo({
-					url: '../identify/details?id=' + id
-				})
-			},
-			//立即预约
-			bookNow(id, nStatus) {
-				if (nStatus === 1) {
-					uni.showToast({
-						title: '该商户不可预约！',
-						icon: 'none'
-					})
-					return
-				}
-				this.projects = []
-				var id = {
-					id: id
-				}
-				engineerDetails(id).then(res => {
-					// console.log(res.data.data,"1111111111111111")
-					res.data.data.projects.forEach(element => {
-						element.number = 0
-					})
-					this.details = res.data.data,
-						this.projects = res.data.data.projects,
-						this.dialogShow = true
-				})
-			},
-		},
-		onLoad() {},
-		onShow() {
-			this.getcollectList()
-		},
-		onHide() {
-			this.dialogShow = false
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.listAll {
-		height: 100vh;
-
-		background: linear-gradient(152deg, #DCFFF8 0%, #F1FEFF 100%);
-	}
-
-	.nodata {
-		text-align: center;
-		padding: 200rpx 0;
-	}
-
-	.list {
-		height: 100%;
-		overflow-y: auto;
-		// height: 100%;
-		padding: 20rpx;
-		// background: #F7FFFF;
-
-		.item {
-			width: 100%;
-			// height: 208rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.1);
-			border-radius: 24rpx 24rpx 24rpx 24rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			// border: 1px solid rgb(212, 211, 211);
-			margin-bottom: 20rpx;
-			padding: 24rpx 32rpx;
-			box-sizing: border-box;
-			position: relative;
-
-			.hot {
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 80rpx;
-				height: 40rpx;
-				z-index: 9;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-
-			}
-
-			.itemL {
-				position: relative;
-				width: 160rpx;
-				height: 100%;
-				margin-right: 30rpx;
-				display: flex;
-				// flex-direction: column;
-				align-items: center;
-				justify-content: center;
-
-
-				.img {
-					width: 160rpx;
-					height: 160rpx;
-					// border-radius: 50%;
-					// overflow: hidden;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.status {
-					font-size: 24rpx;
-					position: absolute;
-					bottom: 0px;
-					background-color: #59b7b6;
-					color: #fff;
-					padding: 3px 10px;
-					border-radius: 20px;
-					// margin: 10px 0px;
-				}
-
-				.new {
-					position: absolute;
-					top: -20rpx;
-					left: -16rpx;
-					padding: 0rpx 5rpx;
-					background-color: #f9792d;
-					opacity: .8;
-					border-radius: 10rpx;
-					color: #f3f3f3;
-				}
-			}
-
-			.itemR {
-				flex: 1;
-				height: 100%;
-
-				.title {
-					width: 100%;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					margin-bottom: 24rpx;
-
-					.name {
-						width: 70rpx;
-						font-size: 32rpx;
-						font-weight: 500;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						margin-right: 24rpx;
-					}
-
-					.intro_box {
-						flex: 1;
-						display: flex;
-						align-items: center;
-
-						.intro {
-							width: 64rpx;
-							height: 32rpx;
-							background: #DCFFFD;
-							border-radius: 4rpx 4rpx 4rpx 4rpx;
-							font-size: 24rpx;
-							color: #20CAC2;
-							text-align: center;
-							line-height: 32rpx;
-							margin-right: 20rpx;
-						}
-
-						.intro_content {
-							width: 280rpx;
-							white-space: nowrap;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							font-size: 24rpx;
-							color: #666666;
-						}
-					}
-
-					.address {
-						// width: 40%;
-						font-size: 26rpx;
-						color: #585858;
-
-						image {
-							width: 30rpx;
-							height: 30rpx;
-							vertical-align: text-bottom;
-						}
-					}
-
-					.status {
-						color: #fff;
-						background-color: #0ec891;
-						font-size: 18rpx;
-						padding: 5rpx 15rpx;
-						border-radius: 30px;
-						height: 30rpx;
-						line-height: 30rpx;
-					}
-				}
-
-				.mark {
-					display: flex;
-					color: #666666;
-
-					.right {
-						font-size: 24rpx;
-						color: #666666;
-
-						text {
-							color: #666666;
-							margin-right: 5px;
-						}
-					}
-
-					.center {
-						display: flex;
-						align-items: center;
-						margin-right: 20rpx;
-						font-size: 24rpx;
-						color: #666666;
-
-						image {
-							width: 30rpx;
-							height: 30rpx;
-							margin-right: 4rpx;
-						}
-					}
-				}
-
-				.num {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					// padding-left: 30rpx;
-					color: #9e9e9e;
-					margin-top: 24rpx;
-
-					.free_box {
-						font-size: 24rpx;
-						color: #999999;
-						display: flex;
-						align-items: center;
-
-						image {
-							width: 32rpx;
-							height: 32rpx;
-						}
-					}
-
-
-
-					.btn {
-						font-size: 30rpx;
-						line-height: 24rpx;
-						padding: 16rpx 24rpx;
-						background: linear-gradient(135deg, #FF8B66 0%, #EE5B2D 100%);
-						border-radius: 98rpx 98rpx 98rpx 98rpx;
-					}
-				}
-
-				.items {
-					display: flex;
-					justify-content: space-between;
-					padding: 10rpx 0;
-
-					image {
-						width: 30rpx;
-						height: 30rpx;
-						margin-right: 10rpx;
-						vertical-align: text-top;
-					}
-
-					view {
-						display: flex;
-						align-items: center;
-					}
-				}
-
-				.btn {
-					font-size: 26rpx;
-					background-color: #2cb8d4;
-					border-radius: 30px;
-					color: #fff;
-					text-align: center;
-					padding: 10rpx 0;
-				}
-			}
-		}
-	}
-
-	.dialog {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, .5);
-		z-index: 10;
-		transition: transform 0.3s ease-out;
-
-		.closebox {
-			height: calc(50vh - 60rpx);
-			width: 100%;
-		}
-
-		.now {
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			width: 100%;
-			text-align: center;
-			height: 100rpx;
-			background-color: #f7f8fa;
-			padding-top: 10rpx;
-
-			text {
-				display: inline-block;
-				height: 80rpx;
-				line-height: 80rpx;
-				width: 90%;
-				background-color: #2cb8d4;
-				color: #fff;
-				border-radius: 50rpx;
-			}
-		}
-
-		.dialog_content {
-			background-color: #fff;
-			position: absolute;
-			bottom: 0;
-			width: calc(100% - 60rpx);
-			height: 50vh;
-			overflow-y: scroll;
-			border-top-left-radius: 20rpx;
-			border-top-right-radius: 20rpx;
-			padding: 30rpx;
-			background-color: #f3f3f3;
-			padding-bottom: 100rpx;
-
-			.lists {
-				background-color: #fff;
-				margin-bottom: 20rpx;
-				display: flex;
-				justify-content: space-between;
-				padding: 20rpx 10rpx;
-				border-radius: 10rpx;
-
-				.imgs {
-					width: 240rpx;
-					height: 160rpx;
-					border-radius: 20rpx;
-					overflow: hidden;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.right {
-					flex: 1;
-					padding-left: 30rpx;
-
-					.list_title {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.title {
-							font-size: 34rpx;
-							font-weight: bold;
-						}
-
-						.time {
-							font-size: 24rpx;
-						}
-					}
-
-					.price {
-						padding-top: 50rpx;
-						display: flex;
-						justify-content: space-between;
-
-						.money {
-							font-size: 42rpx;
-							color: #e61b1b;
-							font-weight: bold;
-						}
-
-						.counter {
-							display: flex;
-
-							view {
-								width: 60rpx;
-								height: 60rpx;
-								line-height: 60rpx;
-								background-color: #f7f8fa;
-								text-align: center;
-								border-radius: 60rpx;
-								font-size: 50rpx;
-							}
-
-							text {
-								width: 100rpx;
-								text-align: center;
-								line-height: 60rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

src/pages/my/coupon.vue

@@ -1,291 +0,0 @@
-<template>
-	<view class="coupon-page">
-		<view class="list-container">
-			<view v-for="(item, index) in couponList" :key="index"
-				:class="['coupon-box']">
-				<view class="coupon-card">
-					<view v-if="query.title == 'select'" :class="{ 'radio-selected': item.selected, 'radio-select': !item.selected }" @click="handleSelect(item, index)">
-						<image v-show="item.selected" src="../../static/other/selected.png"></image>
-					</view>
-					<view class="left-content">
-						<view class="coupon-title">
-							<view>{{ item.couponName }}</view>
-							<!-- <view v-if="item.discountType == 3">满{{ item.thresholdAmount }}减{{ item.discountValue }}</view>
-							<view v-else>满{{ item.thresholdAmount }}可用</view> -->
-						</view>
-						<view class="coupon-time">
-							<view v-if="item.validityType == 2">领券{{item.validDays }}天后失效</view>
-							<view v-else-if="item.validityType == 3">长期有效</view>
-							<view v-else>有效期至{{ item.expirationTimeString }}</view>
-						</view>
-						<view class="coupon-msg">
-							<view v-if="item.couponType== '1'">满减券*1</view>
-							<view v-if="item.couponType== '2'">折扣券*1</view>
-							<view v-if="item.couponType== '3'">兑换券*1</view>
-							<view class="icon-circle" @click="item.showMsg = !item.showMsg">
-								详细信息
-								<view :class="{ 'circle': item.showMsg, 'default': !item.showMsg }"></view>
-							</view>
-						</view>
-					</view>
-
-					<view class="right-action">
-						<view class="amount-box" v-if="item.couponType == '1'">
-							<text class="unit">¥</text>
-							<text class="val">{{ item.discountValue }}</text>
-						</view>
-						<view class="amount-box" v-else-if="item.couponType == '2'">
-							<text class="val">{{ item.ruleDiscountRate }}</text>
-							<text class="unit">折</text>
-						</view>
-						<view class="amount-box" v-else>
-							<text class="val">兑换</text>
-						</view>
-
-						<view class="action-btn active" @click.stop="goIdentify(item)">去使用</view>
-					</view>
-				</view>
-				<view class="coupon-message" v-show="item.showMsg">
-					<view class="message-item">
-						<view>券类型：{{ item.couponType== '1'?'兑换券':item.couponType== '2'?'折扣券':item.couponType== '3'?'满减券':'' }}</view>
-						<view v-if="item.locality">限定地区：仅{{ item.locality }}地区使用</view>
-						<view v-if="item.relatedName">限定项目：{{ item.relatedName }}</view>
-						<view>限定手机：仅限登录手机号为{{ getPhone() }}使用</view>
-					</view>
-				</view>
-			</view>
-
-			<u-empty v-if="couponList.length === 0" mode="coupon" marginTop="100"></u-empty>
-		</view>
-		<view v-if="couponList.length != 0" class="usedRecord" @click="toRecord">使用记录<u-icon name="arrow-right" size="28rpx" top="1" color="#333"></u-icon></view>
-	</view>
-</template>
-
-<script>
-	import {
-		getCoupon
-	} from '@/api/index';
-	export default {
-		data() {
-			return {
-				query: {},
-				couponList: [],
-			}
-		},
-		onLoad(query) {
-			this.query = query;
-			getApp().globalData.couponSelected = {}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getPhone() {
-				const phone = uni.getStorageSync('phone')
-				const phoneStr = `${phone.slice(0,3)}****${phone.slice(7,11)}`
-				return phoneStr
-			},
-			getData() {
-				let params = {
-					receiveOpenId: uni.getStorageSync('wx_copenid')
-				}
-				getCoupon(params).then(res => {
-					if (res.data.code == 200) {
-						if(res.data.data && res.data.data.length > 0) {
-							this.couponList = res.data.data.map(item => {
-								return {
-									...item,
-									selected: false,
-									showMsg: false
-								}
-							})
-						}
-					}
-				});
-			},
-			goIdentify(item) {
-				if (this.query.title == 'select') {
-                    uni.setStorageSync('couponData', item);
-					uni.navigateBack();
-					// uni.navigateTo({
-					// 	url: `/pages/identify/pay_order?couponId=${item.id}&couponMoney=${item.discountValue}`
-					// })
-					// uni.$emit('returnData', item)
-				} else {
-					uni.switchTab({
-						url: '/pages/identify/identify'
-					})
-				}
-			},
-			handleSelect(item, index) {
-				this.couponList[index].selected = !this.couponList[index].selected
-				this.couponList.map((sub, ind) => {
-					if(sub.id != item.id) {
-						sub.selected = false
-					}
-				})
-				const selectObj = this.couponList.filter(a => a.selected)
-				if(selectObj) {
-					uni.navigateBack(-1)
-					getApp().globalData.couponSelected = selectObj
-				}
-			},
-			toRecord() {
-				uni.navigateTo({
-					url: '/pages/my/record',
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.coupon-page {
-	min-height: 100vh;
-	background: linear-gradient(to bottom, #d7f3f9, #f3f3f3);
-
-	.list-container {
-		padding: 20rpx 24rpx;
-		height: calc(100vh - 4vh);
-		.coupon-box{
-			margin-bottom: 24rpx;
-			position: relative;
-			border-radius: 16rpx;
-			background-color: #fff;
-		}
-		.coupon-card {
-			display: flex;
-			align-items: center;
-			flex-wrap: wrap;
-			overflow: hidden;
-			transition: opacity 0.3s;
-			.radio-select{
-				width: 36rpx;
-				height: 36rpx;
-				border-radius: 50%;
-				margin-left: 20rpx;
-				border: 2rpx solid #869198;
-			}
-			.radio-selected{
-				width: 36rpx;
-				height: 36rpx;
-				border-radius: 50%;
-				margin-left: 20rpx;
-				image{
-					display: block;
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 50%;
-				}
-			}
-			.left-content {
-				flex: 1;
-				padding: 30rpx;
-				border-right: 2rpx dashed #eee;
-
-				.coupon-title {
-					font-size: 30rpx;
-					font-weight: bold;
-					color: #333;
-					margin-bottom: 10rpx;
-				}
-
-				.coupon-time {
-					font-size: 22rpx;
-					color: #999;
-					margin-bottom: 20rpx;
-				}
-				.coupon-msg{
-					color: #333;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					font-size: 24rpx;
-					.icon-circle{
-						color: #999;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						.circle{
-							width: 0;
-							height: 0;
-							border-left: 10rpx solid transparent;
-							border-right: 10rpx solid transparent;
-							border-bottom: 16rpx solid #999;
-							transform: rotate(180deg);
-						}
-						.default{
-							width: 0;
-							height: 0;
-							border-left: 10rpx solid transparent;
-							border-right: 10rpx solid transparent;
-							border-bottom: 16rpx solid #999;
-						}
-					}
-				}
-			}
-
-			.right-action {
-				width: 220rpx;
-				padding: 28rpx;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				justify-content: center;
-				background-color: #E8FBFA;
-				border-radius: 0 16rpx 16rpx 0;
-				.amount-box {
-					color: #03C8BE;
-					margin-bottom: 16rpx;
-
-					.unit {
-						font-size: 24rpx;
-						margin-right: 4rpx;
-					}
-
-					.val {
-						font-size: 50rpx;
-						font-weight: bold;
-					}
-				}
-
-				.action-btn {
-					width: 140rpx;
-					height: 54rpx;
-					border-radius: 40rpx;
-					font-size: 24rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-
-					&.active {
-						background-color: #03C8BE;
-						color: #fff;
-					}
-
-					&.disabled {
-						background-color: transparent;
-						border: 2rpx solid #03C8BE;
-						color: #03C8BE;
-					}
-				}
-			}
-		}
-		.coupon-message{
-			border-top: 1rpx solid #EEEEEE;
-			padding: 30rpx;
-			color: #999;
-			font-size: 24rpx;
-		}
-	}
-	.usedRecord{
-		height: 4vh;
-		text-align: center;
-		color: #333;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 28rpx;
-	}
-}
-</style>

src/pages/my/js_user.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

src/pages/my/record.vue

@@ -1,359 +0,0 @@
-<template>
-	<view class="record">
-		<view class="tips">
-			<view class="tips-item" :class="{ 'active': typeIndex === index }" v-for="(item, index) in type" @click="handleIndex(item, index)">{{ item }}</view>
-		</view>
-		<view class="list-container" v-if="typeIndex == 0">
-			<view v-for="(item, index) in couponList" :key="index"
-				:class="['coupon-box']">
-				<view class="coupon-card">
-					<view class="left-content">
-						<view class="coupon-title">
-							<view>{{ item.couponName }}</view>
-							<!-- <view v-if="item.discountType == 3">满{{ item.thresholdAmount }}减{{ item.discountValue }}</view>
-							<view v-else>满{{ item.thresholdAmount }}可用</view> -->
-						</view>
-						<view class="coupon-time">
-							<view v-if="item.validityType == 2">领券{{item.validDays }}天后失效</view>
-							<view v-else-if="item.validityType == 3">长期有效</view>
-							<view v-else>有效期至{{ item.expirationTimeString }}</view>
-						</view>
-						<view class="coupon-msg">
-							<view v-if="item.couponType== 1">满减券*1</view>
-							<view v-if="item.couponType== 2">折扣券*1</view>
-							<view v-if="item.couponType== 3">兑换券*1</view>
-							<view class="icon-circle" @click="item.showMsg = !item.showMsg">
-								详细信息
-								<view :class="{ 'circle': item.showMsg, 'default': !item.showMsg }"></view>
-							</view>
-						</view>
-					</view>
-
-					<view class="right-action">
-						<view class="amount-box" v-if="item.couponType == 1">
-							<text class="unit">¥</text>
-							<text class="val">{{ item.discountValue }}</text>
-						</view>
-						<view class="amount-box" v-else-if="item.couponType == 2">
-							<text class="val">{{ item.ruleDiscountRate }}</text>
-							<text class="unit">折</text>
-						</view>
-						<view class="amount-box" v-else>
-							<text class="val">兑换</text>
-						</view>
-
-						<view class="action-btn active">已使用</view>
-					</view>
-				</view>
-				<view class="coupon-message" v-show="item.showMsg">
-					<view class="message-item">
-						<view>券类型：{{ item.couponType== '1'?'兑换券':item.couponType== '2'?'折扣券':item.couponType== '3'?'满减券':'' }}</view>
-						<view v-if="item.locality">限定地区：仅{{ item.locality }}地区使用</view>
-						<view v-if="item.relatedName">限定项目：{{ item.relatedName }}</view>
-						<view>限定手机：仅限登录手机号为{{ getPhone() }}使用</view>
-					</view>
-				</view>
-			</view>
-
-			<u-empty v-if="couponList.length === 0" mode="coupon" marginTop="100"></u-empty>
-		</view>
-
-		<view class="list-container" v-if="typeIndex == 1">
-			<view v-for="(item, index) in couponList" :key="index"
-				:class="['coupon-box']">
-				<view class="coupon-card">
-					<view class="left-content">
-						<view class="coupon-title">
-							<view>{{ item.couponName }}</view>
-							<!-- <view v-if="item.discountType == 3">满{{ item.thresholdAmount }}减{{ item.discountValue }}</view>
-							<view v-else>满{{ item.thresholdAmount }}可用</view> -->
-						</view>
-						<view class="coupon-time">
-							<view v-if="item.validityType == 2">领券{{item.validDays }}天后失效</view>
-							<view v-else-if="item.validityType == 3">长期有效</view>
-							<view v-else>有效期至{{ item.expirationTimeString }}</view>
-						</view>
-						<view class="coupon-msg">
-							<view v-if="item.couponType== 1">满减券*1</view>
-							<view v-if="item.couponType== 2">折扣券*1</view>
-							<view v-if="item.couponType== 3">兑换券*1</view>
-							<view class="icon-circle" @click="item.showMsg = !item.showMsg">
-								详细信息
-								<view :class="{ 'circle': item.showMsg, 'default': !item.showMsg }"></view>
-							</view>
-						</view>
-					</view>
-
-					<view class="right-action-lose">
-						<view class="amount-box" v-if="item.couponType == 1">
-							<text class="unit">¥</text>
-							<text class="val">{{ item.discountValue }}</text>
-						</view>
-						<view class="amount-box" v-else-if="item.couponType == 2">
-							<text class="val">{{ item.ruleDiscountRate }}</text>
-							<text class="unit">折</text>
-						</view>
-						<view class="amount-box" v-else>
-							<text class="val">兑换</text>
-						</view>
-
-						<view class="action-btn active">已失效</view>
-					</view>
-				</view>
-				<view class="coupon-message" v-show="item.showMsg">
-					<view class="message-item">
-						<view>券类型：{{ item.couponType== '1'?'兑换券':item.couponType== '2'?'折扣券':item.couponType== '3'?'满减券':'' }}</view>
-						<view v-if="item.locality">限定地区：仅{{ item.locality }}地区使用</view>
-						<view v-if="item.relatedName">限定项目：{{ item.relatedName }}</view>
-						<view>限定手机：仅限登录手机号为{{ getPhone() }}使用</view>
-					</view>
-				</view>
-			</view>
-
-			<u-empty v-if="couponList.length === 0" mode="coupon" marginTop="100"></u-empty>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getCoupon
-	} from '@/api/index';
-	export default{
-		data() {
-			return {
-				type: ['已使用','已失效'],
-				typeIndex: 0,
-				list: [],
-				couponList: [],
-			}
-		},
-		onShow() {
-			this.getData(0);
-		},
-		methods:{
-			getPhone() {
-				const phone = uni.getStorageSync('phone')
-				const phoneStr = `${phone.slice(0,3)}****${phone.slice(7,11)}`
-				return phoneStr
-			},
-			getData(type) {
-				let params = {
-					receiveOpenId: uni.getStorageSync('wx_copenid')
-				}
-				getCoupon(params).then(res => {
-					if (res.data.code == 200) {
-						if(res.data.data && res.data.data.length > 0) {
-							this.list = res.data.data.map(item => {
-								return {
-									...item,
-									showMsg: false
-								}
-							})
-							this.changeType(type)
-						}
-					}
-				});
-			},
-			changeType(type) {
-				if(!type) {
-					this.couponList = this.list.filter(item => item.couponStatus == 2)
-				}
-				if(type==1) {
-					this.couponList = this.list.filter(item => item.couponStatus == 3)
-				}
-			},
-			handleIndex(item, index) {
-				this.typeIndex = index
-				this.changeType(index)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.record {
-		width: 100%;
-		height: 100vh;
-		overflow: hidden;
-		background-color: #F6F7F9;
-		.tips{
-			height: 90rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			background-color: #ffffff;
-			border-radius: 0 0 24rpx 24rpx;
-			.tips-item{
-				line-height: 90rpx;
-				border-bottom: 4rpx solid #ffffff;
-			}
-			.active{
-				color: #03C8BE;
-				border-bottom: 4rpx solid #03C8BE;
-			}
-		}
-		.list-container {
-			padding: 20rpx 24rpx;
-			height: calc(100vh - 90rpx);
-			overflow-y: auto;
-			.coupon-box{
-				margin-bottom: 24rpx;
-				position: relative;
-				border-radius: 16rpx;
-				background-color: #fff;
-				opacity: .6;
-			}
-			.coupon-card {
-				display: flex;
-				flex-wrap: wrap;
-				overflow: hidden;
-
-				.left-content {
-					flex: 1;
-					padding: 30rpx;
-					border-right: 2rpx dashed #eee;
-
-					.coupon-title {
-						font-size: 30rpx;
-						font-weight: bold;
-						color: #333;
-						margin-bottom: 10rpx;
-					}
-
-					.coupon-time {
-						font-size: 22rpx;
-						color: #999;
-						margin-bottom: 20rpx;
-					}
-					.coupon-msg{
-						color: #333;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						font-size: 24rpx;
-						.icon-circle{
-							color: #999;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-							.circle{
-								width: 0;
-								height: 0;
-								border-left: 10rpx solid transparent;
-								border-right: 10rpx solid transparent;
-								border-bottom: 16rpx solid #999;
-								transform: rotate(180deg);
-							}
-							.default{
-								width: 0;
-								height: 0;
-								border-left: 10rpx solid transparent;
-								border-right: 10rpx solid transparent;
-								border-bottom: 16rpx solid #999;
-							}
-						}
-					}
-				}
-
-				.right-action {
-					width: 220rpx;
-					padding: 20rpx;
-					display: flex;
-					align-items: center;
-					flex-direction: column;
-					justify-content: center;
-					background-color: #E8FBFA;
-
-					.amount-box {
-						color: #03C8BE;
-						margin-bottom: 16rpx;
-
-						.unit {
-							font-size: 24rpx;
-							margin-right: 4rpx;
-						}
-
-						.val {
-							font-size: 50rpx;
-							font-weight: bold;
-						}
-					}
-
-					.action-btn {
-						width: 140rpx;
-						height: 54rpx;
-						border-radius: 40rpx;
-						font-size: 24rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						&.active {
-							background-color: #03C8BE;
-							color: #fff;
-						}
-
-						&.disabled {
-							background-color: transparent;
-							border: 2rpx solid #03C8BE;
-							color: #03C8BE;
-						}
-					}
-				}
-				.right-action-lose {
-					width: 220rpx;
-					padding: 20rpx;
-					display: flex;
-					align-items: center;
-					flex-direction: column;
-					justify-content: center;
-					background-color: #F4F9F9;
-
-					.amount-box {
-						color: #BBBBBB;
-						margin-bottom: 16rpx;
-
-						.unit {
-							font-size: 24rpx;
-							margin-right: 4rpx;
-						}
-
-						.val {
-							font-size: 50rpx;
-							font-weight: bold;
-						}
-					}
-
-					.action-btn {
-						width: 140rpx;
-						height: 54rpx;
-						border-radius: 40rpx;
-						font-size: 24rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-
-						&.active {
-							border: 2rpx solid #BBBBBB;
-							background-color: #ffffff;
-							color: #BBBBBB;
-						}
-
-						&.disabled {
-							background-color: transparent;
-							border: 2rpx solid #BBBBBB;
-							color: #BBBBBB;
-						}
-					}
-				}
-			}
-			.coupon-message{
-				border-top: 1rpx solid #EEEEEE;
-				padding: 30rpx;
-				color: #999;
-				font-size: 24rpx;
-			}
-		}
-	}
-</style>

src/pages/staff/index.vue

@@ -1,975 +0,0 @@
-<template>
-	<view class="center">
-		<view class="head">
-			<view class="left">
-				<image :src="$globalData.publicUrl + infoData.cPortrait" mode=""></image>
-			</view>
-			<view class="middle">
-				<view class="name">
-					{{ infoData.cNickName || infoData.cName }}
-				</view>
-				<view class="address">
-					{{ infoData.address }} {{ infoData.name }}
-				</view>
-			</view>
-			<view class="right" @click="goAddress">
-				更换位置
-			</view>
-		</view>
-		<view class="jsdata">
-			<view class="num" v-if="money">
-				<view class="item">
-					<text>余额</text>
-					<text class="amount"><span>{{ money.dBalance}}</span>元</text>
-				</view>
-				<view class="item">
-					<text>可提现</text>
-					<text class="amount"><span>{{ money.getAmount || 0 }}</span>元</text>
-				</view>
-				<view class="item">
-					<view class="withdraw" @click="goWithdraw">申请提现</view>
-				</view>
-			</view>
-			<u-line margin="20rpx 0" />
-			<view class="num">
-				<view class="item" @click="toIncome">
-					<text>我的收益</text>
-					<text class="amount"><span>{{ myIncome.tAmount }}</span>元</text>
-				</view>
-				<view class="item" @click="toIncome">
-					<text>待结算</text>
-					<text class="amount"><span>{{ myIncome.wAmount }}</span>元</text>
-				</view>
-				<view class="item" @click="toIncome">
-					<text>已结算</text>
-					<text class="amount"><span>{{ myIncome.yAmount }}</span>元</text>
-				</view>
-				<view class="item" @click="toWithdraw">
-					<text>已提现</text>
-					<text class="amount"><span>{{ myIncome.gAmount }}</span>元</text>
-				</view>
-			</view>
-		</view>
-		<view class="jsdata">
-			<view class="num">
-				<view class="item">
-					<text>本月订单数</text>
-					<text class="amount"><span>{{ jsData.orderNum }}</span>单</text>
-				</view>
-				<view class="item">
-					<text>本月在线时长</text>
-					<text class="amount"><span>{{ onLine }}</span>时</text>
-				</view>
-				<view class="item">
-					<text>本月营业额</text>
-					<text class="amount"><span>{{ jsData.turnover }}</span>元</text>
-				</view>
-			</view>
-		</view>
-		<view class="warn">
-			<view class="top">
-				<view class="work is_work" v-if="isWork">
-					<image src="/static/identify/work.png" mode=""></image>
-					在线中
-				</view>
-				<view class="work" v-else>
-					<image src="/static/identify/rest.png" mode=""></image>
-					休息中
-				</view>
-
-				<view class="goWork" @click="onWork">
-					{{ isWork ? '下线' : '上线' }}
-				</view>
-			</view>
-			<view class="bottom" @click="onWarning">
-				<!-- <image src="/static/other/warn.png" mode=""></image> -->
-				报警/求助
-			</view>
-		</view>
-		<view class="other">
-			<view class="title">
-				其他功能
-			</view>
-			<view class="fun_box">
-				<u-grid :border="false" col="5">
-					<u-grid-item>
-						<view class="function" @click="goOrder">
-							<u-badge absolute :value="orderNum" :offset="[-4, -10]"
-								:customStyle="{ zIndex: 1 }"></u-badge>
-							<image src="/static/other/icon-order.png" mode=""></image>
-							<text>订单</text>
-						</view>
-					</u-grid-item>
-					<u-grid-item>
-						<view class="function" @click="goFree">
-							<image src="/static/other/icon-set.png" mode=""></image>
-							<text>设置免车费</text>
-						</view>
-					</u-grid-item>
-					<u-grid-item>
-						<view class="function" @click="goEdit">
-							<image src="/static/other/icon-edit.png" mode=""></image>
-							<text>编辑资料</text>
-						</view>
-					</u-grid-item>
-					<u-grid-item>
-						<view class="function" @click="qrCodeShow">
-							<image src="/static/other/icon-code.png" mode=""></image>
-							<text>我的分销码</text>
-						</view>
-					</u-grid-item>
-					<u-grid-item>
-						<view class="function" @click="qrCodeShow">
-							<image src="/static/other/icon-contract.png" mode=""></image>
-							<text>合同签订</text>
-						</view>
-					</u-grid-item>
-					<u-grid-item>
-						<view class="function" @click="goDiscover">
-							<image src="/static/discover/my-dynamic.png" mode=""></image>
-							<text>我的动态</text>
-						</view>
-					</u-grid-item>
-				</u-grid>
-			</view>
-		</view>
-		<view class="work"></view>
-		<!-- 分销码弹窗 -->
-		<view class="qr_code" @click="qrCodeShow" v-if="isQrcodeShow">
-			<view class="img_box">
-				<view class="logo">
-					<image src="/static/other/code_logo.png" mode=""></image>
-				</view>
-				<view class="title">扫码下单 一键预约</view>
-				<image :src="qrCode" mode=""></image>
-				<view class="foot">多名技师｜在线接单</view>
-			</view>
-		</view>
-		<!-- 添加银行卡提示弹窗 -->
-		<view class="add_blankcard" v-if="isAddBlank">
-			<view class="popup">
-				<view class="popup_title">
-					申请提现
-				</view>
-				<view class="popup_center">
-					您还没有绑定银行卡，<br />
-					请先去添加银行卡再进行提现
-				</view>
-				<view class="btn">
-					<view class="cancel" @click="isAddBlank = false">
-						取消
-					</view>
-					<view class="add" @click="addBlank">
-						添加银行卡
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="order">
-			<view class="tab-box">
-				<u-tabs keyName="label" lineColor="#03C8BE" :list="tabList" @change="onTabChange"></u-tabs>
-			</view>
-			<z-paging ref="paging" :fixed="false"
-				:paging-style="{'height': '30vh'}"
-				v-model="orderList"
-				@query="queryList">
-
-			</z-paging>
-		</view> -->
-
-
-		<!-- 未入驻提示 -->
-		<u-popup :show="showModal" mode="center" border-radius="16rpx" :mask-close-able="false">
-			<view class="modal-wrap">
-				<!-- 标题居中 -->
-				<view class="title">提示</view>
-				<!-- 正文 -->
-				<view class="content">
-					请提交入驻资料并由后台人员审核通过后,<br>即可开通操作权限
-				</view>
-				<!-- 底部双按钮（必显示） -->
-				<view class="btn-box">
-					<view class="btn left" @click="cancel">我在想想</view>
-					<view class="btn right" @click="goEnter">立即入驻</view>
-				</view>
-			</view>
-		</u-popup>
-		<!-- <u-modal 
-			:show="showModal" 
-			title="" 
-			content="请提交入驻资料并由后台人员审核通过后,即可开通操作权限" 
-			showCancelButton
-			confirmColor="#1ecbc3"
-			@confirm="onDelete"
-			@cancel="isShow = false"
-		></u-modal> -->
-	</view>
-</template>
-
-<script>
-import {
-	getInfo,
-	alertOrder,
-	getwxQrCode,
-	getWaitOrder,
-	getJsLocation,
-	getMerchantData,
-	netStaffWork,
-	getStaffWorkData,
-	myIncome
-} from '@/api/index';
-export default {
-	data() {
-		return {
-			showModal: false, // 控制弹窗显隐
-			isWork: false,
-			// 二维码
-			qrCode: '',
-			isQrcodeShow: false,
-			money: {},
-			jsData: {},
-			infoData: {},
-			cJsId: '',
-			onLine: '',
-			orderNum: 0,
-			isAddBlank: false,
-			active: 0,
-			tabList: [
-				{
-					label: '全部',
-					value: 1
-				},
-				{
-					label: '进行中',
-					value: 2
-				},
-				{
-					label: '已完成',
-					value: 3
-				},
-				{
-					label: '已取消',
-					value: 5
-				},
-				{
-					label: '售后',
-					value: 6
-				}
-			],
-			orderList: [],
-			myIncome: {
-				yAmount: '',
-				wAmount: '',
-				tAmount: '',
-				gAmount: ''
-			}
-		}
-	},
-	onLoad() {
-
-	},
-	onShow() {
-		// setTimeout(() => {
-		// 	console.log('666')
-		// 	this.showModal = true
-		// }, 500);
-		this.getData()
-		this.getWork()
-		this.getInfo()
-		this.getwxQrCode()
-		this.getMyIncome()
-	},
-	methods: {
-		// 我在想想：关闭弹窗
-		cancel() {
-			console.log('5555')
-			this.showModal = false
-		},
-		// 立即入驻：跳转入驻页
-		goEnter() {
-			this.showModal = false
-			uni.navigateTo({
-				url: '/pages/join/applyJoin' // 替换你的入驻页面路径
-			})
-		},
-		getMyIncome() {
-			myIncome().then(res => {
-				if (res.data.code == 200) {
-					this.myIncome = res.data.data
-				}
-			})
-		},
-		getData() {
-			let params = {
-				cOpenId: uni.getStorageSync('wx_copenid')
-			}
-			getMerchantData(params).then(res => {
-				if (res.data.code == 200 && res.data.data) {
-					this.cJsId = res.data.data.id
-					this.infoData = res.data.data
-					if (res.data.data.nStatus2 == '-1') { //未上岗
-						this.isWork = false
-					} else if (res.data.data.nStatus2 == '0') { //以上
-						this.isWork = true
-					}
-					// 获取待接单数量
-					getWaitOrder({ cJsId: this.cJsId }).then(res => {
-						this.orderNum = res.data.data
-					})
-				}
-			})
-		},
-		getInfo() {
-			getInfo().then(res => {
-				this.money = res.data.data
-			})
-		},
-		getWork() {
-			let params = {
-				openId: uni.getStorageSync('wx_copenid')
-			}
-			getStaffWorkData(params).then(res => {
-				if (res.data.code === 200) {
-					this.jsData = res.data.data
-					this.onLine = (this.jsData.onLine / 60).toFixed(2)
-				}
-			});
-		},
-		getwxQrCode() {
-			getwxQrCode({ openId: uni.getStorageSync('wx_copenid') }).then(res => {
-				let TICKET = res.data.ticket
-				this.qrCode = 'https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=' + TICKET
-			})
-		},
-		// 获取数据
-		queryList(pageNo, pageSize) {
-			let params = {
-				current: pageNo,
-				size: pageSize,
-				openId: uni.getStorageSync('wx_copenid'),
-			}
-			// getAddrList(params).then(res => {
-			// 	if (res.data.code === 200) {
-			// 		this.selected = res.data.data.find(item => item.type == 1)?.id;
-			// 		this.$refs.paging.complete(res.data.data);
-			// 	} else {
-			// 		this.$refs.paging.complete(false);
-			// 	}
-			// });
-		},
-		// 添加银行卡
-		addBlank() {
-			uni.navigateTo({
-				url: '/pages/my/add_blank'
-			})
-			this.isAddBlank = false
-		},
-		// 更换位置
-		goAddress() {
-			let str = uni.$u.queryParams({
-				id: this.cJsId,
-				name: this.infoData.cNickName,
-				phone: this.infoData.cPhone
-			});
-			uni.navigateTo({
-				url: `/pages/address/virtual${str}`
-			});
-		},
-		// 报警
-		onWarning() {
-			alertOrder({ jsId: this.cJsId }).then(res => {
-				if (res.data.code == 200) {
-					uni.showToast({
-						title: '已通知地区负责人',
-						icon: 'none'
-					})
-				} else {
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none'
-					})
-				}
-			})
-		},
-		goWithdraw() {
-			if (this.money.getAmount <= 0) {
-				uni.showToast({
-					title: '暂无可提现金额',
-					icon: 'none'
-				})
-			} else {
-				uni.navigateTo({
-					url: '/pages/my/withdraw'
-				})
-			}
-		},
-
-		// 跳转收入明细
-		toIncome() {
-			uni.navigateTo({
-				url: '/pages/staff/income'
-			})
-		},
-		// 跳转提现明细
-		toWithdraw() {
-			uni.navigateTo({
-				url: '/pages/staff/withdraw'
-			})
-		},
-
-		onWork() {
-			netStaffWork({
-				id: this.cJsId,
-				nStatus2: this.isWork ? '-1' : '0'
-			}).then(res => {
-				if (res.data.code == 200) {
-					uni.showToast({
-						title: '设置成功',
-						icon: 'none'
-					})
-					this.getData()
-				} else {
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none'
-					})
-				}
-			})
-		},
-		qrCodeShow() {
-			this.isQrcodeShow = !this.isQrcodeShow
-		},
-		goDiscover() {
-			uni.navigateTo({
-				url: '/pages/my/dynamic/index'
-			})
-		},
-		goEdit() {
-			uni.navigateTo({
-				url: '/pages/my/indent?title=编辑资料'
-			})
-		},
-		goOrder() {
-			uni.navigateTo({
-				url: '/pages/my/js_order'
-			})
-		},
-		goFree() {
-			uni.navigateTo({
-				url: '/pages/settings/fare'
-			})
-		},
-		onTabChange(e) {
-			console.log(e)
-			// this.active = e.index;
-		},
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-// 弹窗
-.modal-wrap {
-	width: 620rpx;
-	background: #fff;
-	border-radius: 16rpx;
-	overflow: hidden;
-}
-
-.title {
-	font-size: 42rpx;
-	text-align: center;
-	padding: 40rpx 30rpx 20rpx;
-	font-weight: 500;
-	color: #333;
-}
-
-.content {
-	font-size: 36rpx;
-	color: #333;
-	padding: 0 40rpx 40rpx;
-	line-height: 1.7;
-}
-
-.btn-box {
-	display: flex;
-	border-top: 1rpx solid #eee;
-}
-
-.btn {
-	flex: 1;
-	height: 90rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 36rpx;
-}
-
-.left {
-	color: #333;
-	border-right: 1rpx solid #eee;
-}
-
-.right {
-	color: #007aff;
-}
-
-
-
-
-
-
-.center {
-	width: 100vw;
-	height: 100vh;
-	padding: 30rpx 38rpx;
-	background: linear-gradient(152deg, #DCFFF8 0%, #F1FEFF 100%);
-}
-
-.head {
-	width: 100%;
-	display: flex;
-	align-items: center;
-	background: #FFFFFF;
-	box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.1);
-	border-radius: 24rpx;
-	padding: 24rpx;
-
-	.left {
-		border-radius: 100px;
-		overflow: hidden;
-		width: 80rpx;
-		height: 80rpx;
-		margin-right: 32rpx;
-		background-color: #ccc;
-		// margin-bottom: 20rpx;
-
-		image {
-			width: 80rpx;
-			height: 80rpx;
-		}
-	}
-
-	.middle {
-		width: 344rpx;
-		margin-right: 28rpx;
-
-		.name {
-			font-size: 28rpx;
-			color: #2F3437;
-			line-height: 33rpx;
-		}
-
-		.address {
-			font-size: 24rpx;
-			color: #666666;
-			line-height: 32rpx;
-			margin-top: 8rpx;
-		}
-	}
-
-	.right {
-		width: 152rpx;
-		height: 52rpx;
-		background: linear-gradient(135deg, #1AD8CF 0%, #21C8C0 100%);
-		border-radius: 98rpx;
-		font-size: 26rpx;
-		color: #FFFFFF;
-		line-height: 52rpx;
-		text-align: center;
-	}
-}
-
-.jsdata {
-	width: 100%;
-	padding: 24rpx;
-	margin-top: 24rpx;
-	background: #FFFFFF;
-	border-radius: 20rpx;
-	box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.1);
-
-	.num {
-		display: flex;
-		justify-content: space-between;
-
-		.item {
-			width: 33.3%;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			justify-content: center;
-
-			text {
-				color: #2F3437;
-				font-size: 26rpx;
-				display: inline-block;
-			}
-
-			.amount {
-				font-size: 24rpx;
-				color: #5E686E;
-				line-height: 30rpx;
-				margin-top: 10rpx;
-
-				span {
-					font-size: 26rpx;
-					color: #03C8BE;
-					margin-right: 4rpx;
-				}
-			}
-
-		}
-
-		.address_title {
-			width: 18%;
-		}
-
-		.address {
-			width: 60%;
-			font-size: 30rpx;
-		}
-
-		.update_address {
-			// width: 25%;
-			width: 70px;
-			height: 50rpx;
-			text-align: center;
-			background: linear-gradient(to right, #35c99d, #27aea7);
-			border-radius: 10rpx;
-			color: #ffffff;
-			padding: 10rpx;
-		}
-
-		.withdraw {
-			width: 80%;
-			height: 52rpx;
-			color: #fff;
-			border-radius: 98rpx;
-			text-align: center;
-			padding: 0px 10rpx;
-			line-height: 52rpx;
-			background: linear-gradient(135deg, #FF8B66 0%, #EE5B2D 100%);
-		}
-
-	}
-
-	.money {
-		// width: 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		.item {
-			// flex: 1;
-			height: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			text {
-				margin-top: 5px;
-				color: #999;
-				font-size: 26rpx;
-			}
-		}
-
-		.withdraw {
-			width: 70px;
-			height: 50rpx;
-			text-align: center;
-			background: linear-gradient(to right, #35c99d, #27aea7);
-			border-radius: 10rpx;
-			// margin-left: -50px;
-			margin-right: -30px;
-			padding: 10rpx;
-			color: #fff;
-		}
-	}
-}
-
-.warn {
-	width: 100%;
-	height: auto;
-	margin: 10px auto 0px;
-	border-radius: 20rpx;
-	padding: 26rpx 24rpx;
-	background-color: #fff;
-
-	.top {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		// margin: 0 auto;
-		padding-bottom: 22rpx;
-		border-bottom: 1px solid #eeeeee;
-		margin-bottom: 20rpx;
-
-		text {
-			color: #a6482c;
-		}
-
-		.goWork {
-			height: 50rpx;
-			color: #fff;
-			text-align: center;
-			line-height: 50rpx;
-			flex-shrink: 0;
-			padding: 0 32rpx;
-			border-radius: 98rpx;
-			background: linear-gradient(to right, #35c99d, #27aea7);
-		}
-
-		.work {
-			display: flex;
-			align-items: center;
-			font-size: 32rpx;
-			color: #999999;
-			line-height: 24rpx;
-
-			image {
-				width: 44rpx;
-				height: 44rpx;
-				margin-right: 12rpx;
-			}
-		}
-
-		.is_work {
-			color: #02CEC4;
-		}
-	}
-
-	.bottom {
-		width: 100%;
-		height: 72rpx;
-		background: #F24F62;
-		color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-radius: 10rpx;
-
-		image {
-			width: 50rpx;
-			height: 50rpx;
-			margin-right: 10rpx;
-		}
-	}
-
-}
-
-.other {
-	width: 100%;
-	height: auto;
-	margin: 10px auto 0px;
-	border-radius: 20rpx;
-	padding: 26rpx 24rpx;
-	background-color: #fff;
-
-	.title {
-		margin-bottom: 24rpx;
-		font-size: 28rpx;
-		color: #2F3437;
-		line-height: 33rpx;
-		font-weight: 600;
-	}
-
-	.fun_box {
-		width: 100%;
-
-		.function {
-			font-size: 24rpx;
-			color: #2F3437;
-			line-height: 28rpx;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			position: relative;
-
-			image {
-				width: 64rpx;
-				height: 64rpx;
-				margin-bottom: 8rpx;
-			}
-		}
-	}
-}
-
-.qr_code {
-	width: 100vw;
-	height: 100vh;
-	// background-color: rgba(0, 0, 0, 0.8);
-	background-image: url('/static/other/code_bg.png');
-	background-size: cover;
-	/* 完全覆盖，可能裁剪 */
-	background-position: center;
-	/* 图片居中（避免裁剪关键部分） */
-	z-index: 999999;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	.img_box {
-		width: 598rpx;
-		height: 724rpx;
-		background-color: #fff;
-		// height: 800rpx;
-		border-radius: 16rpx;
-		// overflow: hidden;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		margin-top: 160rpx;
-
-		.logo {
-			position: absolute;
-			top: 0;
-			left: 50%;
-			z-index: 99999;
-			transform: translate(-50%, -50%);
-
-			image {
-				width: 144rpx;
-				height: 144rpx;
-			}
-		}
-
-		image {
-			width: 400rpx;
-			height: 400rpx;
-		}
-	}
-
-	.title {
-		font-size: 36rpx;
-		margin-bottom: 32rpx;
-	}
-
-	.foot {
-		width: 316rpx;
-		height: 48rpx;
-		background: #F4F5F7;
-		border-radius: 4rpx;
-		margin-top: 32rpx;
-		font-size: 28rpx;
-		color: #788096;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-}
-
-.work {
-	width: 100%;
-}
-
-.add_blankcard {
-	width: 100vw;
-	height: 100vh;
-	z-index: 999999;
-	position: absolute;
-	top: 0;
-	left: 0;
-	background: rgba(0, 0, 0, 0.4);
-	padding: 0px 60rpx;
-
-	// display: flex;
-	// align-items: center;
-	.popup {
-		width: 630rpx;
-		height: 420rpx;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-		margin-top: 564rpx;
-		display: flex;
-		flex-direction: column;
-
-		.popup_title {
-			width: 100%;
-			height: 92rpx;
-			background: #F8EDE6;
-			border-radius: 24rpx 24rpx 0px 0px;
-			font-size: 32rpx;
-			color: #000000;
-			font-weight: 700;
-			text-align: center;
-			line-height: 92rpx;
-		}
-
-		.popup_center {
-			flex: 1;
-			background-color: #fff;
-			font-size: 28rpx;
-			color: #333333;
-			line-height: 39rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			text-align: center;
-		}
-
-		.btn {
-			height: 116rpx;
-			background: #FFFFFF;
-			border-radius: 0px 0px 24rpx 24rpx;
-			border-top: 2rpx solid #EEEEEE;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-
-			.cancel {
-				width: 182rpx;
-				height: 68rpx;
-				border-radius: 106rpx;
-				border: 2rpx solid #BBBBBB;
-				font-size: 32rpx;
-				color: #999999;
-				text-align: center;
-				line-height: 68rpx;
-			}
-
-			.add {
-				width: 268rpx;
-				height: 68rpx;
-				background: linear-gradient(135deg, #FF8B66 0%, #EE5B2D 100%);
-				border-radius: 44rpx;
-				font-size: 32rpx;
-				line-height: 68rpx;
-				text-align: center;
-				color: #FFFFFF;
-			}
-		}
-	}
-}
-
-.order {
-	margin-top: 24rpx;
-	background: #FFFFFF;
-	box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.1);
-	border-radius: 20rpx;
-
-	.tab-box {
-		padding: 0 32rpx;
-		border-bottom: 2rpx solid #EEEEEE;
-
-		.state {
-			// flex: 1;
-			padding: 0px;
-			text-align: center;
-			font-size: 28rpx;
-			padding-bottom: 20rpx;
-		}
-
-		.active {
-			font-size: 30rpx;
-			color: #03C8BE;
-			border-bottom: 1px solid #03C8BE;
-
-		}
-	}
-}
-</style>

src/setting/myNew/index.vue

@@ -1,113 +0,0 @@
-<script>
-import {logout, getInfo} from '@/api/index.js'
-export default {
-  data() {
-    return {
-      userInfo: {},
-    }
-  },
-  mounted() {
-    this.getData();
-  },
-  methods:{
-    // 用户数据
-    getData() {
-      this.userInfo = {};
-      getInfo().then(res => {
-        if (res.data.code == 200) {
-          this.userInfo = res.data.data;
-          uni.setStorageSync('wx_phone', res.data.data.cPhone);
-        }
-      })
-    },
-    goSetting(){
-      uni.navigateTo({
-        url: '/setting/myNew/security'
-      })
-    },
-    // 退出登录
-    onLogout() {
-      uni.showModal({
-        title: '确定退出登录吗',
-        success: (res) => {
-          if (res.confirm) {
-            logout().then(res => {
-              if (res.data.code == 200) {
-                uni.removeStorageSync('access-token')
-                uni.switchTab({
-                  url: '/pages/my/my'
-                })
-                uni.showToast({
-                  title: '已退出登录',
-                  icon: 'none'
-                })
-              }
-            })
-          }
-        }
-      })
-    },
-  }
-}
-</script>
-
-<template>
-  <view class="sett-box">
-    <view class="userInfo">
-      <u-avatar :src="userInfo.cIcon" size="80rpx"/>
-      <text>{{ userInfo.cNickName }}</text>
-    </view>
-    <u-cell :titleStyle="{fontWeight: 500}" title="账号安全" isLink class="security" @click="goSetting()"></u-cell>
-    <view class="logOut" @click="onLogout()">退出登录</view>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.sett-box{
-  width: 750rpx;
-  height: 100vh;
-  background: #F5F8F8;
-  padding:36rpx 40rpx;
-  position: relative;
-  .userInfo{
-    width: 678rpx;
-    height: 128rpx;
-    background: #FFFFFF;
-    border-radius: 24rpx;
-    padding: 24rpx;
-    line-height: 80rpx;
-    display: flex;
-    margin-bottom:24rpx;
-    text{
-      margin-left: 20rpx;
-      display: inline-block;
-    }
-  }
-  .security{
-    width: 678rpx;
-    height: 88rpx;
-    background: #FFFFFF;
-    border-radius: 24rpx 24rpx 24rpx 24rpx;
-    ::v-deep .u-cell__body{
-      padding: 25rpx 30rpx;
-    }
-    ::v-deep .u-line{
-      display: none;
-    }
-  }
-  .logOut{
-    width: 670rpx;
-    height: 84rpx;
-    background: #FFFFFF;
-    border-radius: 60rpx 60rpx 60rpx 60rpx;
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 500;
-    font-size: 28rpx;
-    color: #333333;
-    line-height: 84rpx;
-    text-align: center;
-    position: absolute;
-    bottom: 110rpx;
-  }
-}
-</style>

src/setting/myNew/security.vue

@@ -1,44 +0,0 @@
-<script>
-export default {
-  data() {
-    return {
-      phone:uni.getStorageSync('wx_phone')
-    }
-  },
-  methods:{
-    goSettPhone(){
-      uni.navigateTo({
-        url: '/setting/myNew/phone'
-      })
-    },
-  }
-}
-</script>
-
-<template>
-  <view class="sett-box">
-    <u-cell :titleStyle="{fontWeight: 500}" title="手机号码" :value="phone || '去绑定'" isLink class="security" @click="goSettPhone()"></u-cell>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.sett-box{
-  width: 750rpx;
-  height: 100vh;
-  background: #F5F8F8;
-  padding:36rpx 40rpx;
-  position: relative;
-  .security{
-    width: 678rpx;
-    height: 88rpx;
-    background: #FFFFFF;
-    border-radius: 24rpx 24rpx 24rpx 24rpx;
-    ::v-deep .u-cell__body{
-      padding: 25rpx 30rpx;
-    }
-    ::v-deep .u-line{
-      display: none;
-    }
-  }
-}
-</style>