删除冗余代码---商户菜单

src/pages.json

@@ -16,31 +16,7 @@
 				}
 			}
 		},
-		{
-			"path": "pages/identify/identify",
-			"style": {
-				"navigationBarTitleText": "商户",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/identify/city",
-			"style": {
-				"navigationBarTitleText": "选择所在市",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-    {
+    	{
 			"path": "pages/discover/discover",
 			"style": {
 				"navigationBarTitleText": "发现",
@@ -208,47 +184,6 @@
 				}
 			}
 		},
-		//商户详情
-		{
-			"path": "pages/identify/details",
-			"style": {
-				"navigationBarTitleText": "商户",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"enablePullDownRefresh":false,
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		//商户认证信息
-		{
-			"path": "pages/identify/approve_data",
-			"style": {
-				"navigationBarTitleText": "认证信息",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"enablePullDownRefresh":false,
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
-		//支付订单
-		{
-			"path": "pages/identify/pay_order",
-			"style": {
-				"navigationBarTitleText": "支付订单",
-				"navigationBarBackgroundColor": "#2cb8d4",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none",
-					"titleNView": false
-				}
-			}
-		},
 		//订单详情
 		{
 			"path": "pages/order/order_detail",
@@ -891,15 +826,10 @@
 				"iconPath": "static/identify/index.png",
 				"selectedIconPath": "static/identify/index-cur.png"
 			},
-			{
-				"text": "商户",
-				"pagePath": "pages/identify/identify",
-				"iconPath": "static/identify/people.png",
-				"selectedIconPath": "static/identify/people-cur.png"
-			},
       {
 				"text": "发现",
-				"pagePath": "pages/discover/discover",
+				"pagePath": "pages/my/dynamic/index",
+				//"pagePath": "pages/discover/discover",
 				"iconPath": "static/discover/discover.png",
 				"selectedIconPath": "static/discover/discover-cur.png"
 			},

src/pages/identify/approve_data.vue

@@ -1,201 +0,0 @@
-<template>
-	<view class="approve_box">
-		<view class="data">
-			<view class="left">
-				<image src="/static/other/approve.png" mode=""></image>
-			</view>
-			<view class="right">
-				<view class="top">
-					签约商家
-				</view>
-				<view class="bottom">
-					sda 
-				</view>
-			</view>
-		</view>
-		<view class="data">
-			<view class="left">
-				<image src="/static/other/approve.png" mode=""></image>
-			</view>
-			<view class="right">
-				<view class="top">
-					实名认证已通过
-				</view>
-				<view class="bottom">
-					所有商户签约入驻平台时，身份信息均已通过核验
-				</view>
-			</view>
-		</view>
-		<view class="data">
-			<view class="left">
-				<image src="/static/other/approve.png" mode=""></image>
-			</view>
-			<view class="right">
-				<view class="top">
-					健康证认证
-				</view>
-				<view class="bottom">
-					该商户健康体检合格，并在平台已认证通过
-				</view>
-			</view>
-		</view>
-		<view class="data">
-			<view class="left">
-				<image src="/static/other/approve.png" mode=""></image>
-			</view>
-			<view class="right">
-				<view class="top">
-					该店铺已在平台完成市场主体登记认证
-				</view>
-				<view class="bottom">
-					根据相关法律法规要求，经营者相关资质信息公示如下 
-				</view>
-			</view>
-		</view>
-		<view class="credential">
-			<view class="title">
-				所属商家资质
-			</view>
-			<view class="img">
-				<image :src="$globalData.publicUrl + businessLicense" mode=""></image>
-				<image src="/static/other/mask.png" mode="" class="mask"></image>
-			</view>
-		</view>
-		<view class="credential">
-			<view class="title">
-				从业资格证书
-			</view>
-			<view class="img">
-				<image :src="$globalData.publicUrl + certification" mode=""></image>
-					<image src="/static/other/mask.png" mode="" class="mask"></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		engineerDetails,
-		addOrder,
-		addCollect,
-		cancleCollect
-	} from '../../api/index.js'
-	export default{
-		data(){
-			return{
-				businessLicense:'',//营业执照
-				certification:''//资格证
-			}
-		},
-		methods:{
-			getDetails(id) {
-				const cId = {
-					id: id,
-					cOpenId: uni.getStorageSync('wx_copenid')
-				}
-				engineerDetails(cId).then(res => {
-					this.businessLicense = res.data.data.businessLicense
-					this.certification = res.data.data.certification
-			// 		if (res.data.data) {
-						
-			// 			res.data.data.cImgList.forEach(item => {
-			// 				this.swiper.push(this.public + item)
-			// 			})
-			// 			var prolist = res.data.data.projects
-			// 			prolist.forEach(element => {
-			// 				element.number = 0
-			// 			});
-			// 			this.details = res.data.data
-			// 			this.projects = prolist
-			// 			if (res.data.data.comments) {
-			// 				this.comList = res.data.data.comments.slice(0,3)
-			// 			} else {
-			// 				this.comList = []
-			// 			}
-			
-			// 		}
-				})
-			},
-		},
-		onLoad(options){
-			this.getDetails(options.id)
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.approve_box{
-		width: 100vw;
-		height: 100%;
-		// overflow-y: auto;
-		// background: radial-gradient(circle, #b1fffc, #fcfdff);
-		background: linear-gradient(to bottom right, #fcfdff, #b1fffc);
-		padding: 20rpx;
-		box-sizing: border-box;
-		overflow-y: auto;
-		.data{
-			width: 100%;
-			height: 150rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			display: flex;
-			align-items: center;
-			padding: 20rpx;
-			box-sizing: border-box;
-			margin-bottom: 20rpx;
-			.left{
-				margin-right: 20rpx;
-				image{
-					width: 50rpx;
-					height: 50rpx;
-				}
-			}
-			.right{
-				height: 80%;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				.top{
-					font-size: 34rpx;
-					font-weight: 700;
-				}
-				.bottom{
-					font-size: 26rpx;
-					color: #666;
-				}
-			}
-		}
-		.credential{
-			width: 100%;
-			height: auto;
-			padding: 20rpx;
-			box-sizing: border-box;
-			background-color: #fff;
-			border-radius: 16rpx;
-			margin-bottom: 20rpx;
-			.title{
-				font-weight: 700;
-			}
-			.img{
-				width: 100%;
-				height: 200px;
-				position: relative;
-				margin-top: 10rpx;
-				border-radius: 20rpx;
-				overflow: hidden;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-				.mask{
-					position: absolute;
-					top: 0;
-					left: 0;
-				}
-			}
-		}
-	}
-</style>

src/pages/identify/city.vue

@@ -1,31 +0,0 @@
-<template>
-	<t-index-address @select="select"></t-index-address>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				type: ''
-			}
-		},
-		onLoad(options) {
-			this.type = options.type
-		},
-		methods: {
-			// 选中事件
-			select(data) {
-				if (this.type == 'indent') {
-                    uni.setStorageSync('jsCity', data.name);
-				} else {
-                    uni.setStorageSync('selectCity', data.name);
-				}
-				uni.navigateBack();
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-</style>

src/pages/identify/details.vue

@@ -1,652 +0,0 @@
-<template>
-	<view class="page-container">
-		<view class="detail-content">
-			<view class="swiper-box">
-				<text class="tips">图片仅供参考</text>
-				<MySwiper :list="swipeList" :autoplay="false" />
-			</view>
-			<view class="qin">
-				<view class="info">
-					<text class="line"></text> 
-					<text class="name">{{details.cNickName}}</text>
-					<text>/ {{details.cNickName}}</text>
-				</view>
-				<view class="collect" v-if="details.isCollection" @click="cancleCollect(details.id)">
-					<image src="/static/identify/collect2.png" mode="" /> 取消收藏
-				</view>
-				<!-- <view class="collect" v-else @click="addCollect(details.id)">
-					<image src="/static/identify/collect1.png" mode="" />
-					加入收藏
-				</view> -->
-				<view class="jieshao">{{details.cJianjie}}</view>
-			</view>
-			<view class="service">
-				服务履约保障
-			</view>
-			<view class="three">
-				<view>
-					<image src="/static/identify/approve.png" mode="" />实名认证
-				</view>
-				<view>
-					<image src="/static/identify/approve.png" mode="" />爽约包赔
-				</view>
-				<view @click="goApprove(details.id)">
-					<image src="/static/identify/approve.png" mode="" />商户认证
-				</view>
-			</view>
-		</view>
-		<view class="server-content">
-			<view class="tab">
-				<text class="tips" :class=" checkedIndex === 0 ? 'active' : '' " @click="switchTab(0)">服务内容</text>
-				<text class="tips" :class=" checkedIndex === 2 ? 'active' : '' " @click="switchTab(2)">技师动态</text>
-				<text class="tips" :class=" checkedIndex === 1 ? 'active' : '' " @click="switchTab(1)">顾客评价</text>
-			</view>
-			<view class="tab_content">
-				<view class="tab-pane" :class="checkedIndex === 0 ? 'active' : ''">
-					<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="info-box">
-								<view class="name"> {{item.cTitle}} </view>
-								<!-- <view class="time">{{item.nMinute}}分钟</view> -->
-								<view class="price">
-									<text class="unit">￥</text>
-									<text>{{item.dPrice}}</text>
-								</view>
-							</view>
-							<view class="desc-box">
-								<view>{{item.cLdList}}</view>
-								<view style="flex-shrink: 0">超{{item.nSaleNumber}}人选择</view>
-							</view>
-							<view class="time">
-								<view class="money">{{item.nMinute}}分钟</view>
-								<view class="counter">
-									<u-number-box 
-										integer
-										min="0"
-										button-size="28"
-										v-model="item.number" 
-										@change="onQuantityChange($event, item)"
-									>
-										<view slot="minus" class="abtn">
-											<u-icon bold name="minus" size="12" color="#202726"></u-icon>
-										</view>
-										<text slot="input" class="input">{{ item.number }}</text>
-										<view slot="plus" class="abtn">
-											<u-icon bold name="plus" size="12" color="#202726"></u-icon>
-										</view>
-									</u-number-box>
-
-									<!-- <view class="minus" @click="decrease(index)">
-										<image src="/static/identify/minus.png" mode="" />
-									</view>
-									<text>{{item.number}}</text>
-									<view class="minus" @click="increase(index)">
-										<image src="/static/identify/add.png" mode="" />
-									</view> -->
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="tab-pane " :class="checkedIndex === 1 ? 'active' : ''">
-					<view v-if="comList < 1" style="text-align: center;padding:50rpx 0;font-size: 28rpx;color: #ccc;">暂无评价
-					</view>
-					<view v-else>
-						<view class="commentList" v-for="(item,index) in comList" :key="index">
-							<view class="cTitile">
-								<view class="tt">{{item.cNickName}}
-
-								</view>
-								<view class="time">{{item.dTime.substring(0,10)}} {{item.dTime.substring(11,19)}}</view>
-							</view>
-							<view class="img">
-								<image src="/static/identify/collect2.png" mode=""></image>
-								<image src="/static/identify/collect2.png" mode=""></image>
-								<image src="/static/identify/collect2.png" mode=""></image>
-								<image src="/static/identify/collect2.png" mode=""></image>
-								<image src="/static/identify/collect2.png" mode=""></image>
-							</view>
-							<view class="cText">{{item.cText}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="tab-pane" :class="checkedIndex === 2 ? 'active' : ''">
-          <!-- 技师动态列表 -->
-					<MyDynamicList :data-list="dynamicList" type="merchant" />
-					<!-- 空状态 -->
-          <view v-if="dynamicList < 1" style="text-align: center;padding:50rpx 0;font-size: 28rpx;color: #ccc;">暂无动态
-					</view>
-        </view>
-			</view>
-		</view>
-		<view class="reserved">
-			<view @click="nowYuyue(details.id,details.nStatus)">立即预约</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import {
-	engineerDetails,
-	addOrder,
-	addCollect,
-	cancleCollect
-} from '@/api/index.js';
-import { jsDynamicList } from '@/api/dynamic.js'
-import MySwiper from '@/components/swiper/index.vue';
-import MyDynamicList from '@/pages/my/dynamic/components/my_list.vue';
-export default {
-    components: { MySwiper, MyDynamicList },
-	data() {
-		return {
-			details: '',
-			indicatorDots: true,
-			autoplay: true,
-			projects: [],
-			collectShow: true,
-			checkedIndex: 0,
-			comList: [],
-			public: this.$globalData.publicUrl, //图片前缀
-			swiper: [],
-			swipeList: [],
-      dynamicList: [] // 技师动态列表
-		}
-	},
-	onLoad(options) {
-		this.getDetails(options.id)
-    // 技师动态列表
-		this.getJsDynamicList(options.id)
-	},
-	methods: {
-		switchTab(index) {
-			if (this.checkedIndex === index) {
-				return false;
-			} else {
-				this.checkedIndex = index
-			}
-		},
-		getJsDynamicList(id) {
-			let params = {
-				technicianId: id,
-			}
-			jsDynamicList(params).then(res => {
-				if (res.data.code === 200 && res.data.data) {
-					let data = res.data.data
-					data.forEach(item => {
-						item.publishTime = item.publishTime
-							.replace('T', ' ')
-							.substring(0, 16)
-					})
-					this.dynamicList = data
-				}
-			})
-		},
-		//查看认证信息
-		goApprove(id) {
-			uni.navigateTo({
-				url: './approve_data?id=' + id
-			})
-		},
-		//立即预约
-		nowYuyue(id, nStatus) {
-			if (nStatus === 1) {
-				uni.showToast({
-					title: '该商户不可预约！',
-					icon: 'none'
-				})
-				return
-			} else {
-				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: './pay_order?orderNo=' + res.data.data.orderNo,
-							})
-						} else {
-							uni.showModal({
-								title: '提示',
-								content: '你还没有添加地址哦！是否去添加？',
-								confirmText: '确定', 
-								cancelText: '取消', 
-								success: (res) => {
-									if (res.confirm) {
-										setTimeout(() => {
-											uni.navigateTo({
-												url: '/pages/address/address-edit?type=1'
-											})
-										}, 100)
-										// 用户点击确定按钮后的操作
-									} else if (res.cancel) {
-										console.log('用户点击取消');
-									}
-								}
-							})
-						}
-					})
-				}
-			}
-		},
-		getDetails(cid) {
-			this.swiper = []
-			const cId = {
-				id: cid,
-				cOpenId: uni.getStorageSync('wx_copenid')
-			}
-			engineerDetails(cId).then(res => {
-				if (res.data.data) {
-					if(res.data.data.cVideo){
-						this.swiper.push(res.data.data.cVideo)
-					}
-					res.data.data.cImgList.forEach(item => {
-						this.swiper.push(this.public + item)
-					})
-					console.log(this.swiper)
-
-					if(this.swiper){
-						this.swipeList = this.swiper.map(item => {
-							const isVideo = item.endsWith('.mp4');
-							return {
-								src: item,
-								type: isVideo ? 'video' : 'image',
-								// 视频封面（需替换）
-								poster: isVideo ?this.public +res.data.data.cImgList[0]: item.image, 
-							};
-						});
-					}
-					
-					this.details = res.data.data
-					this.projects = res.data.data.projects.map(item => ({ ...item, number: 0 }))
-					if (res.data.data.comments) {
-						this.comList = res.data.data.comments.slice(0, 3)
-					} else {
-						this.comList = []
-					}
-				}
-			})
-		},
-		// 添加收藏
-		addCollect(id) {
-			var data = {
-				cJsId: id,
-				cWxOpenId: uni.getStorageSync('wx_copenid')
-			}
-			addCollect(data).then(res => {
-				if (res.data.code == 200) {
-					wx.showToast({
-						title: '收藏成功！',
-						icon: 'none'
-					})
-					this.getDetails(id);
-				} else {
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none'
-					})
-				}
-			})
-		},
-		// 取消收藏
-		cancleCollect(id) {
-			var data = {
-				cJsId: id,
-				cWxOpenId: wx.getStorageSync('wx_copenid')
-			}
-			cancleCollect(data).then(res => {
-				if (res.data.code == 200) {
-					wx.showToast({
-						title: '取消成功！',
-						icon: 'none'
-					})
-					this.getDetails(id);
-				} else {
-					wx.showToast({
-						title: res.data.msg,
-						icon: 'none'
-					})
-				}
-			})
-		},
-		increase(idx) {
-			this.projects[idx].number++;
-		},
-		decrease(idx) {
-			if (this.projects[idx].number > 0) this.projects[idx].number--;
-			else return;
-		},
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.page-container {
-	padding: 24rpx;
-	background-color: #F7FFFF;
-}
-
-.detail-content {
-	padding: 24rpx;
-	overflow-y: scroll;
-	background-color: #fff;
-
-	swiper {
-		height: 600rpx;
-	}
-
-	.swiper-box {
-		width: 100%;
-		height: 600rpx;
-		position: relative;
-
-		.tips {
-			font-size: 18rpx;
-			color: #808080;
-			position: absolute;
-			top: 10px;
-			left: 10px;
-		}
-	}
-
-	.qin {
-		margin-top: 24rpx;
-
-		.info {
-			font-size: 28rpx;
-			color: #2F3437;
-			margin-bottom: 15rpx;
-			display: flex;
-			align-items: baseline;
-
-			.line {
-				width: 6rpx;
-				height: 28rpx;
-				background: #20CBC2;
-				display: inline-block;
-			}
-
-			.name {
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #000;
-				margin-left: 8rpx;
-				padding: 0 12rpx;
-			}
-		}
-
-		.collect {
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-				vertical-align: sub;
-			}
-		}
-
-		.jieshao {
-			width: 100%;
-			background: #F8F8F8;
-			border-radius: 16rpx;
-			padding: 20rpx 12rpx;
-			font-size: 28rpx;
-			color: #2F3437;
-			line-height: 33rpx;
-			box-sizing: border-box;
-		}
-	}
-
-	.service {
-		font-size: 28rpx;
-		color: #2F3437;
-		line-height: 33rpx;
-		margin: 24rpx 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: #F8F8F8;
-		box-sizing: border-box;
-		border-radius: 16rpx;
-
-		view {
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-				margin-right: 8rpx;
-			}
-		}
-	}
-}
-
-.server-content {
-	padding-bottom: 190rpx;
-
-	.tab {
-		font-size: 30rpx;
-		color: #333;
-		padding: 24rpx;
-
-		.tips {
-			height: 42rpx;
-			margin-right: 30rpx;
-		}
-
-		.active {
-			width: 100%;
-			font-weight: bold;
-			border-bottom: 6rpx solid #2BDAD1;
-		}
-	}
-
-	.tab-pane {
-		display: none;
-	}
-
-	.tab-pane.active {
-		display: block;
-	}
-
-	.commentList {
-		padding: 24rpx;
-		border-bottom: 1px solid #f3f2f2;
-		background: #FFFFFF;
-		box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.1);
-		border-radius: 24rpx;
-		margin-bottom: 24rpx;
-
-		.cTitile {
-			display: flex;
-			justify-content: space-between;
-			font-size: 24rpx;
-			align-items: center;
-
-			.tt {
-				font-size: 30rpx;
-				color: #6a6a6a;
-				font-weight: bolder;
-
-				text {
-					color: #ff5656;
-				}
-			}
-
-			.time {
-				font-size: 30rpx;
-				color: #666666;
-			}
-		}
-
-		.img {
-			margin-top: 16rpx;
-
-			image {
-				width: 24rpx;
-				height: 24rpx;
-				margin-right: 6rpx;
-			}
-		}
-
-		.cText {
-			font-size: 28rpx;
-			margin-top: 16rpx;
-		}
-	}
-
-	.lists {
-		background-color: #fff;
-		margin-bottom: 20rpx;
-		display: flex;
-		justify-content: space-between;
-		padding: 24rpx 32rpx;
-		border-radius: 24rpx;
-
-		.imgs {
-			width: 160rpx;
-			height: 160rpx;
-			border-radius: 16rpx;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.right {
-			flex: 1;
-			padding-left: 30rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-
-			.info-box {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.price {
-					font-size: 48rpx;
-					color: #F53E54;
-					display: flex;
-					align-items: baseline;
-
-					.unit {
-						font-size: 24rpx
-					}
-				}
-			}
-
-			.desc-box {
-				font-size: 24rpx;
-				color: #888888;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-			}
-
-			.time {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.money {
-					font-size: 26rpx;
-					color: #666666;
-					font-weight: bold;
-				}
-
-				.counter {
-					display: flex;
-					align-items: center;
-
-					.abtn {
-						width: 38rpx;
-						height: 38rpx;
-						border: 1rpx dashed #202726;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-					}
-					.input {
-						width: 58rpx;
-						height: 40rpx;
-						line-height: 40rpx;
-						text-align: center;
-						margin: 0 10rpx;
-						background: #F8F9FD;
-						border-radius: 4rpx;
-					}
-				}
-			}
-		}
-	}
-
-}
-
-.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;
-	}
-}
-</style>

src/pages/identify/identify.vue

@@ -1,1122 +0,0 @@
-<template>
-	<view class="identify">
-		<!-- <view class="title bigtitle" style="padding-top:{{navTop}}px;">
-	    <view class="titles">商户</view>
-	  </view> -->
-		<view class="top">
-			<view class="select">
-				<view class="option" :class="selectIndex == index?'active':''" v-for="(item,index) in selectList" :key="index"
-					@click="selectJs(item.value,index)">
-					{{item.name}}
-					<!-- <view class="bgc" v-if="selectIndex == index"></view> -->
-				</view>
-			</view>
-			<view class="call">
-				<!-- <image src="/static/other/call.png" mode=""></image> -->
-				<view class="phone">
-					<image src="/static/identify/shop.png" mode=""></image>	
-					<text>本地商家客服电话：19935577015</text>
-					<view class="call_btn" @click="call(19935577015)">
-						<image src="/static/identify/call.png" mode=""></image>
-						拨打
-					</view>
-				</view>
-			</view>
-			<view class="search_box" style="background: #F7FFFF;">
-				<!-- <view class="address" v-if="city == ''" @click="show = true">
-					选择市<image src="/static/identify/down.png" mode=""></image>
-				</view>
-				<view class="address" v-else @click="show = true">
-					<text>{{city}}</text>
-					<image src="/static/identify/down.png" mode=""></image>
-				</view> -->
-				<view class="weui-cells weui-cells_after-title">
-					<!-- <u-picker :show="show" :columns="[cityList]" keyName="label" 
-						@cancel="show = false" @confirm="onSelect"
-					></u-picker> -->
-					<view class="address" @click="show = true" v-if="city == ''">
-						<!-- 选择市<image src="/static/identify/down.png" mode=""></image> -->
-					</view>
-					<view class="address" @click="show = true" v-else>
-						{{city}}
-						<!-- <image src="/static/identify/down.png" mode=""></image> -->
-					</view>
-				</view>
-				<view class="search">
-					<u-search placeholder="请输入商家名称" bgColor="#fff" v-model="jsName" 
-						@search="searList" @custom="searList" 
-					/>
-				</view>
-			</view>
-			<!-- 			<view class="level">
-				<view class="lv" :class="lvIndex == index?'selectLv':''" v-for="(item,index) in searchList" :key="index"
-					@click="selectLv(item,index)">
-					<image :src=item.src mode="" v-if="lvIndex == index"></image>
-					{{item.name}}
-				</view>
-			</view> -->
-		</view>
-		<!-- <mescroll-body class="list" v-infinite-scroll="getlocaltion" :infinite-scroll-disabled="isInfiniteScrollDisabled"> -->
-		<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getList" @init="mescrollInit">
-			<view class="item" v-for="(item,index) in list" :key="index" @click.stop="godetails(item.id)">
-				<view class="hot">
-					<image src="/static/identify/hot.png" mode="" />
-				</view>
-				<view class="itemL">
-					<view class="img">
-						<u-image :src="$globalData.publicUrl + item.cPortrait" width="160rpx" height="160rpx" radius="2rpx" mode="aspectFill"></u-image>
-					</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.cNickName}}</view>
-						<view class="intro_box">
-							<view class="intro">
-								简介
-							</view>
-							<view class="intro_content">
-								
-							{{item.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.nStar}}分
-						</view>
-						<!-- 收藏数量 -->
-						<view class=" center right">
-							<image src="/static/identify/my1.png" mode="" />
-							<text>{{item.nZan}}</text> 人
-						</view>
-						<!-- 服务数量 -->
-						<view class="right">
-							<!-- <image src="/static/identify/serve.png" mode="" /> -->
-							已服务: <text>{{item.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.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>
-		</mescroll-uni>
-
-
-		<view class="dialog" v-if="dialogShow">
-			<view class="back" @click="closeDialog">
-
-			</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 class="price">
-									<span>￥</span>{{item.dPrice}}
-								</view>
-							</view>
-							<view class="num">
-								<view class="desc">{{item.cLdList}}</view>
-								<span>超{{item.nSaleNumber}}选择</span>
-							</view>
-							<view class="time">
-								<view class="money">{{item.nMinute}}分钟</view>
-								<view class="counter">
-									<!-- <view @click="decrease(item,index)">-</view> -->
-									<view class="minus" @click="decrease(item,index)">
-										<image src="/static/identify/minus.png" mode="" />
-									</view>
-									<text>{{item.number}}</text>
-									<view class="minus" @click="increase(index)">
-										<image src="/static/identify/add.png" mode="" />
-									</view>
-									<!-- <view @click="increase(index)">＋</view> -->
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="now" @click="nowYuyue"><text>立即预约</text></view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	import {
-		engineer,
-		engineerDetails,
-		addOrder,
-		getInfo,
-		getCityList
-	} from '@/api/index'
-	import {
-		getAddrList,
-	} from '@/api/address';
-	export default {
-		mixins: [MescrollMixin], // 使用mixin
-		// components: {
-		// 	MescrollMixin
-		// },
-		data() {
-			return {
-				show: false,
-				cityList: [],
-				downOption: {
-					use: false
-				},
-				lvIndex: 0,
-				jsGrade: '',
-				searchList: [{
-						name: '全部',
-						value: '',
-						src: '/static/identify/spa.png'
-					},
-					{
-						name: '金牌',
-						value: '1',
-						src: '/static/identify/gold.png'
-					},
-					{
-						name: '银牌',
-						value: '0',
-						src: '/static/identify/silver.png'
-					},
-				],
-				selectIndex: 0,
-				selectList: [{
-						name: '全部',
-						value: '1'
-					},
-					{
-						name: '可服务',
-						value: '2'
-					},
-					{
-						name: '新商家',
-						value: '3'
-					},
-					// {
-					// 	name: '免出行费',
-					// 	value: '4'
-					// },
-				],
-				list: [],
-				projects: [],
-				dialogShow: false,
-				count: 0,
-				details: '',
-				sum: 0,
-				distance: 0,
-				isAddress: false,
-				latitude: '',
-				longitude: '',
-				projectId: '',
-				nStatus: '',
-				nB2: '',
-				free: '',
-				jsName: '',
-				city: '',
-				current: 1,
-				total: 1,
-			}
-		},
-		methods: {
-			getCity() {
-				getCityList().then(res => {
-					if (res.data.code === 200) {
-						this.cityList = res.data.data.map(({
-							deptId,
-							deptName
-						}) => ({
-							value: deptId,
-							label: deptName
-						}))
-					}
-				});
-			},
-			onSelect(e) {
-				this.city = e.value[0].label
-				this.list = []
-				this.mescroll.resetUpScroll()
-				this.show = false
-			},
-			searList() {
-				this.list = []
-				this.mescroll.resetUpScroll()
-			},
-			selectLv(item, index) {
-				// this.list = []
-				// this.current = 0
-				this.lvIndex = index
-				this.jsGrade = item.value
-				this.mescroll.resetUpScroll();
-			},
-			selectJs(value, index) {
-				this.selectIndex = index
-				this.list = []
-				if (value == 1) {
-					this.nStatus = ''
-					this.free = ''
-					this.nB2 = ''
-					this.mescroll.resetUpScroll();
-				} else if (value == 2) {
-					this.nStatus = 0
-					this.nB2 = ''
-					this.free = ''
-					this.mescroll.resetUpScroll();
-				} else if (value == 3) {
-					this.nStatus = ''
-					this.nB2 = 1
-					this.free = ''
-					this.mescroll.resetUpScroll();
-				} else if (value == 4) {
-					this.nStatus = ''
-					this.nB2 = ''
-					this.free = 1
-					this.mescroll.resetUpScroll();
-				}
-
-			},
-			getList(page) {
-				// 	let lastCity = this.city.charAt(this.city.length - 1)
-				// 	let subcity = ''
-				// 	lastCity =='市' ? subcity = this.city.slice(0,-1) : subcity =  this.city
-				let data = {
-					cNickName: this.jsName,
-					current: page.num,
-					size: page.size,
-					nTong: 1,
-					nStatus2: 0,
-					projectId: uni.getStorageSync('projectId'),
-					longitude: uni.getStorageSync('longitude'),
-					latitude: uni.getStorageSync('latitude'),
-					nStatus: this.nStatus,
-					nB2: this.nB2,
-					free: this.free,
-					jsGrade: this.jsGrade,
-					city: this.city
-				}
-
-				engineer(data).then(res => {
-					// let page_num = res.data.data.total / 10
-					// page_num <= 1 ? this.total = 1 : this.total = page_num
-					// this.mescroll.endBySize(curPageLen, res.data.data.total); 
-					this.mescroll.endSuccess(res.data.data.records.length,res.data.data.total);
-					this.list = this.list.concat(res.data.data.records)
-					// if(res.data.data.records.length == 0){
-					// 	this.mescroll.endErr()
-					// }
-
-					// if (this.list == []) {
-					// 	this.list = res.data.data.records
-
-					// } else {
-					// 	// this.list.push(...res.data.data.records)
-					// }
-				})
-				.catch(() => {
-					this.mescroll.endErr()
-				})
-			},
-			//选择商户
-			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,
-						console.log(this.projects)
-						this.dialogShow = true
-				})
-			},
-			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
-					})
-				}
-
-			},
-			//弹窗关闭
-			closeDialog() {
-				this.dialogShow = false
-			},
-			// 选择项目加一
-			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() {
-				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: './pay_order?orderNo=' + res.data.data.orderNo
-								// url:''
-							})
-							this.dialogShow = true
-						} else {
-							uni.showModal({
-								title: res.data.msg,
-							})
-						}
-					})
-				}
-
-			},
-			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 => {})
-			},
-			goCity() {
-				this.list = []
-				uni.navigateTo({
-					url: '/pages/identify/city'
-				})
-			},
-			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
-					},
-				});
-			},
-			//打电话
-			call(phone){
-				uni.makePhoneCall({
-					phoneNumber: phone 
-				});
-			}
-		},
-		onShow() {
-			// this.getlocaltion()
-			this.city = uni.getStorageSync('selectCity')
-			this.getCity()
-			this.getAddress()
-			this.mescroll && this.mescroll.resetUpScroll()
-			// this.projectId = uni.getStorageSync('projectId');
-			this.dialogShow = false
-			uni.removeStorageSync('couponData');
-		},
-		mounted() {
-			this.mescroll.optDown.use = false
-		},
-		onHide() {
-			// this.dialogShow = false 
-			// this.current = 0
-			this.list = []
-			this.projectId = ''
-			uni.removeStorage({
-				key: 'projectId'
-			});
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.identify {
-		width: 100vw;
-		height: 100%;
-		// overflow-y: auto;
-		// background: radial-gradient(circle, #b1fffc, #fcfdff);
-		background: #F7FFFF;
-		display: flex;
-		flex-direction: column;
-		position: fixed;
-
-		.top {
-			position: sticky;
-			top: 0;
-			width: 100%;
-			background: linear-gradient( 180deg, #C1FFF8 0%, #B8FFF3 34%, #F5FFFF 100%);
-			z-index: 999;
-			padding-bottom: 20rpx;
-			.call{
-				position: relative;
-				height: 100rpx;
-				background: #E2FFFD;
-				.phone{
-					width: 100%;
-					height: 100%;
-					display: flex;
-					align-items: center;
-					justify-content: space-around;
-					font-size: 34rpx;
-					color: #FFFFFF;
-					// position: absolute;
-					// top: 50%;
-					// transform: translateY(-50%);
-					// left: 24rpx;
-					z-index: 99;
-					font-size: 28rpx;
-					color: #08C0B7;
-					image{
-						width: 48rpx;
-						height: 48rpx;
-					}
-					text{
-						font-size: 32rpx
-					}
-					.call_btn{
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 152rpx;
-						height: 56rpx;
-						background: #08C0B7;
-						border-radius: 106rpx;
-						font-size: 28rpx;
-						color: #ffffff;
-						box-sizing: border-box;
-						image{
-							width: 36rpx;
-							height: 36rpx;
-							margin-right: 10rpx;
-						}
-					}
-				}
-			}
-		}
-
-		.select {
-			width: 100%;
-			display: flex;
-			padding: 24rpx 32rpx;
-
-			.option {
-				font-size: 30rpx;
-				margin-right: 20px;
-				position: relative;
-				z-index: 9;
-				
-				.bgc {
-					width: 100%;
-					height: 30%;
-					margin-right: 20px;
-					background-color: #89dcdc;
-					position: absolute;
-					bottom: 0;
-					z-index: 0;
-					opacity: 0.8;
-				}
-			}
-
-			.active {
-				color: #03C8BE;
-				font-weight: 500;
-				border-bottom: 1px solid #03C8BE;
-			}
-
-		}
-
-		.search_box {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-
-			.address {
-				image {
-					width: 20rpx;
-					height: 20rpx;
-					margin-left: 10rpx;
-				}
-			}
-
-			.search {
-				width: 70%;
-			}
-		}
-
-		.level {
-			display: flex;
-			margin-top: 20rpx;
-			// margin-bottom: 20rpx;
-			padding-left: 20rpx;
-			box-sizing: border-box;
-
-			.lv {
-				// width: 100rpx;
-				height: 50rpx;
-				background-color: #fff;
-				border-radius: 10rpx;
-				padding: 0 10px;
-				margin-right: 20rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				padding-top: 0;
-				padding-bottom: 0;
-
-				image {
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 10rpx;
-				}
-			}
-
-			.selectLv {
-				background-color: #89dcdc;
-				color: #ffffff;
-			}
-		}
-
-		.bigtitle {
-			font-size: 28rpx;
-			text-align: center;
-			line-height: 60rpx;
-			background-color: #2cb8d4;
-			color: #fff;
-		}
-
-		.list {
-			flex: 1;
-			overflow-y: auto;
-			// height: 100%;
-			padding: 0rpx 20rpx;
-			// box-sizing: border-box;
-
-			.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;
-					align-items: center;
-					justify-content: center;
-
-					.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: 1000;
-			transition: transform 0.3s ease-out;
-			display: flex;
-			flex-direction: column;
-
-			.back {
-				flex: 1;
-			}
-
-			.closebox {
-				height: calc(50vh - 60rpx);
-				width: 100%;
-			}
-
-
-
-			.dialog_content {
-				background: #F3F3F3;
-				position: absolute;
-				bottom: 0;
-				width: 100%;
-				height: 50vh;
-				border-top-left-radius: 20rpx;
-				border-top-right-radius: 20rpx;
-				padding: 30rpx;
-				background-color: #f3f3f3;
-        padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
-
-				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: 24rpx 32rpx;
-						border-radius: 24rpx;
-						// overflow-y: auto;
-
-						.imgs {
-							width: 160rpx;
-							height: 160rpx;
-							border-radius: 16rpx;
-							overflow: hidden;
-
-							image {
-								width: 100%;
-								height: 100%;
-							}
-						}
-
-						.right {
-							flex: 1;
-							padding-left: 30rpx;
-							display: flex;
-							flex-direction: column;
-							justify-content: space-between;
-							.list_title {
-								display: flex;
-								justify-content: space-between;
-								align-items: start;
-
-								.title {
-									width: 280rpx;
-									font-size: 34rpx;
-									// font-weight: bold;
-									overflow: hidden;
-									white-space: nowrap;
-									text-overflow: ellipsis;
-								}
-
-								
-								.price{
-									font-size: 48rpx;
-									color: #F53E54;
-									display: flex;
-									align-items: center;
-									padding: 0;
-									span{
-										font-size: 24rpx
-									}
-								}
-							}
-							.num{
-								display: flex;
-								align-items: center;
-								justify-content: space-between;
-								font-size: 24rpx;
-								color: #888888;
-                .desc{
-                  width: 350rpx;
-                }
-							}
-
-							.time {
-								// padding-top: 50rpx;
-								display: flex;
-								align-items: center;
-								justify-content: space-between;
-
-								.money {
-									font-size: 26rpx;
-									color: #666666;
-									font-weight: bold;
-								}
-
-								.counter {
-									display: flex;
-									align-items: center;
-									.minus{
-										image{
-											width: 36rpx;
-											height: 36rpx;
-										}
-									}
-									text {
-										line-height: 24rpx;
-										font-size: 28rpx;
-										margin: 0px 24rpx;
-									}
-								}
-							}
-						}
-					}
-				}
-
-				.now {
-					height: 76rpx;
-					left: 0;
-					width: 100%;
-					text-align: center;
-					height: 100rpx;
-					padding-top: 10rpx;
-					
-
-					text {
-						display: inline-block;
-						height: 80rpx;
-						line-height: 80rpx;
-						width: 90%;
-						color: #fff;
-						background: linear-gradient( 90deg, #1AD7CE 0%, #21C9C1 100%);
-						border-radius: 106rpx ;
-					}
-				}
-
-
-			}
-		}
-	}
-	::v-deep .u-input{
-		background-color: #fff;
-	}
-	::v-deep .u-content{
-		background-color: #fff;
-	}
-	
-</style>

src/pages/identify/pay_order.vue

@@ -1,947 +0,0 @@
-<template>
-	<view class="orderDetails">
-		<view class="content" v-if="details">
-			<view class="address">
-				<view class="add">{{details.address}} {{details.name}} {{details.atlasAdd}} </view>
-				<view class="name">
-					<view class="name_left">
-						{{details.cName}} <text>{{details.cPhone}}</text>
-					</view>
-					<view class="toggle" @click="changeAddress(details.cId)">
-						更换地址
-					</view>
-				</view>
-			</view>
-			<view class="list_content">
-				<view class="list_title">
-					<view class="title_left">
-						<text></text>体验项目
-					</view>
-					<view class="js">商户：{{ details.js ? details.js.cNickName : '' }}</view>
-				</view>
-				<view class="lists" v-for="(item,index) in details.cGoods" :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="counter">份数：{{item.number}} </view>
-							<view class="money">￥{{item.dPrice}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="total">
-					<text style="font-size: 28rpx;">总计</text>
-					<view class="total_price" v-if="orderType ==2">
-						￥<text class="price">{{priceDifference}}</text>
-					</view>
-					<view class="total_price" v-else>
-						￥<text class="price">{{dTotalMoney}}</text>
-					</view>
-				</view>
-				<view class="time_coupon">
-					<view class="select_coupon" @click="onSelectTime">
-						<text>预约时间 <text class="red">*</text> </text>
-						<view class="right" v-if="reachTime !== ''">{{reachTime}}
-							<image src="/static/identify/more.png" mode="" />
-						</view>
-						<view class="right" v-else>请选择上门时间
-							<image src="/static/identify/more.png" mode="" />
-						</view>
-					</view>
-					<view class="select_coupon" @click="selectCoupon">
-						<text>优惠券</text>
-						<view class="right" v-if="preferential>0">-{{preferential}}元
-							<image src="/static/identify/more.png" mode="" />
-						</view>
-						<view class="right" v-else>{{couponNum}}张可用
-							<image src="/static/identify/more.png" mode="" />
-						</view>
-					</view>
-				</view>
-
-			</view>
-			<view class="face" v-if="!details.parentNo">
-				<view class="face_one">
-					<view class="title_left"> <text></text>出行方式</view>
-					<view class="btn">滴滴/出租</view>
-				</view>
-				<view class="face_one">
-					<view>车费</view>
-					<view class="price"> 预估：{{details.fare || 0}}元</view>
-				</view>
-				<view class="face_three">
-					<text>车费共计￥{{details.fare || 0}}，全程 {{details.distance}} 公里，</text>
-					<text>起步价{{baseDistance || 3}}公里{{baseFare || 9.3}}元，</text>
-					<text>超出{{baseDistance || 3}}公里后，</text>
-					<text>每公里{{additionalFarePer || 2.4}}元。</text>
-				</view>
-			</view>
-			<view class="pay_type">
-				<view class="pay_title"> <text></text>支付方式</view>
-				<view class="pay_box">
-					<u-radio-group
-						placement="column"
-						v-model="selectedPayment"
-					>
-						<view class="paytype">
-							<image src="/static/identify/weixin.png" mode="" />
-							<text>微信支付</text>
-							<u-radio name="1" />
-						</view>
-						<view class="paytype">
-							<image src="/static/identify/qianbao.png" mode="" />
-							<text>账户余额（{{dBalance}}）</text>
-							<u-radio name="2" />
-						</view>
-						<view class="paytype" v-if="orderType == 2">
-							<image src="/static/identify/rmb.png" mode="" />
-							<text>现金支付</text>
-							<u-radio name="3" />
-						</view>
-					</u-radio-group>
-				</view>
-			</view>
-		</view>
-
-		<view class="footer-bar">
-			<view class="prices">合计：
-				<text v-if="orderType == 2">{{priceDifference}}</text>
-				<text v-else>{{totalPrice}}</text>
-			</view>
-			<view class="btn" @click="goPay" v-if="remainingTime>0">
-				<view class="">
-					立即支付
-				</view>
-				<view class="remaining_time">
-					剩余 <u-count-down :time="remainingTime" @finish="onRefresh"></u-count-down>
-				</view>
-			</view>
-			<view class="btn" v-else>
-        <view>{{ remainingTime }}</view>
-				<view class="">
-					已过期
-				</view>
-			</view>
-		</view>
-
-		<ServiceTimePicker
-            ref="stp"
-            startHour="00:00"
-            endHour="24:00"
-            :duration="120"
-            :bookedTimes="bookedTimes"
-            @confirm="onTimeConfirm"
-        ></ServiceTimePicker>
-	</view>
-</template>
-
-<script>
-import wx from 'weixin-js-sdk';
-import { h5Url } from '@/common/config.js';
-import ServiceTimePicker from '@/components/picker/service-time.vue';
-import {
-	getInfo,
-	payoff,
-	pay,
-	getSignature,
-	getCoupon,
-	getFareSetting,
-	verification
-} from '@/api/index.js';
-import {
-	orderDeatails,
-	getStaffServiceTime
-} from '@/api/order.js';
-export default {
-	components: {
-		ServiceTimePicker
-	},
-	data() {
-		return {
-			form: {
-				dMoney: 0,
-				cOpenId: uni.getStorageSync('wx_copenid'),
-			},
-			query: {},
-			details: {},
-			// 变量
-			orderType: '',
-			dBalance: 0, //账户余额
-			dTotalMoney: 0,
-			totalPrice: '', //总金额
-			preferential: '', //优惠金额
-      reachTime: '', //上门时间
-			priceDifference: '', //升级差价
-			// 交通费
-			baseFare: '', //起步价
-			baseDistance: '', //起步距离
-			additionalFarePer: '', //超出费用
-			// 优惠劵
-			couponId: '',
-			couponNum: 0,
-			couponReceiveId: '', //优惠券id
-			// 服务时间
-			bookedTimes: [
-				// { start: '2026-01-03 19:00', end: '2026-01-03 20:00' }
-			],
-			// 支付计时
-			remainingTime: '',
-			// 支付方式
-			selectedPayment: null,
-			couponSelected: {}
-		}
-	},
-	onLoad(query) {
-		this.query = query;
-		wx.checkJsApi({
-			jsApiList: ['chooseImage'],
-			success: (res) => {
-				// 以键值对的形式返回，可用的api值true，不可用为false
-				// 如：{"checkResult":{"chooseImage":true},"errMsg":"checkJsApi:ok"}
-			}
-		});
-		if(getApp().globalData.couponSelected) {
-			this.couponSelected = getApp().globalData.couponSelected
-		}
-	},
-	onShow() {
-		this.getInfo()
-		this.getOrder()
-		this.getCoupon()
-
-		let couponData = uni.getStorageSync('couponData');
-		if (couponData) {
-			this.couponId = couponData.id
-			this.verification()
-		}
-	},
-	methods: {
-		getInfo() {
-			getInfo().then(res => {
-				this.dBalance = res.data.data.dBalance.toFixed(2)
-			})
-		},
-		getCoupon() {
-			let params = {
-				openid: uni.getStorageSync('wx_copenid')
-			}
-			getCoupon(params).then(res => {
-				if (res.data.data?.length > 0) {
-					this.couponNum = res.data.data.length
-				} else {
-					this.couponNum = 0
-				}
-			})
-		},
-		getOrder() {
-			let params = {
-				orderNo: this.query.orderNo,
-				couponReceiveId: this.couponId
-			}
-			orderDeatails(params).then(res => {
-				console.log('orderDeatails', res)
-				if (res.data.code === 200) {
-					this.details = {
-						...res.data.data.records[0],
-						distance: res.data.data.records[0].distance.toFixed(2)
-					}
-					// 这四个值相关 orderType 2: 现金
-					this.orderType = this.details.orderType;
-					this.totalPrice = this.details.totalPrice;
-					this.dTotalMoney = this.details.dTotalMoney;
-					this.priceDifference = this.details.priceDifference;
-					// 支付倒计时
-          this.$set(this, 'remainingTime', res.data.data.records[0].remainingTime * 1000);
-					// 获取部门车费
-					this.fareSetting(res.data.data.records[0].deptId);
-					// 获取服务时间
-					this.getServiceTime();
-				}
-			})
-		},
-		// 获取服务时间
-		getServiceTime() {
-			getStaffServiceTime({
-				technicianId: this.details.cJsId
-			}).then(res => {
-
-			});
-		},
-		// 获取部门车费
-		fareSetting(id) {
-			let params = {
-				deptId: id,
-				enable: 1
-			}
-			getFareSetting(params).then(res => {
-        if(res.data.data.records && res.data.data.records.length > 0){
-				  this.baseFare = res.data.data.records[0].baseFare || ''
-				  this.baseDistance = res.data.data.records[0].baseDistance
-				  this.additionalFarePer = res.data.data.records[0].additionalFarePer
-        }
-			})
-		},
-		// 服务时间
-		onSelectTime() {
-      this.$refs.stp.show = true;
-		},
-		onTimeConfirm(e) {
-      this.reachTime = e[0];
-		},
-		onRefresh() {
-			this.remainingTime = 0
-		},
-		selectCoupon() {
-			if (this.remainingTime > 0) {
-				uni.navigateTo({
-					url: '/pages/my/coupon?title=select'
-				})
-			} else {
-				uni.showToast({
-					title: '已过期，请重新下单',
-					icon: 'none'
-				})
-			}
-		},
-		changeAddress(id) {
-			let str = uni.$u.queryParams({
-				name: '支付订单',
-				orderNo: id
-			});
-			uni.navigateTo({
-				url: `/pages/address/index${str}`
-			})
-		},
-		//选择支付方式
-		onRadioChange(e) {
-			this.selectedPayment = e.target.value
-		},
-		// 支付
-		goPay() {
-			this.form.dMoney = this.totalPrice
-			if (this.remainingTime == 0) {
-				uni.showToast({
-					title: '订单已过期',
-					icon: 'none'
-				})
-				return;
-			}
-			if (this.selectedPayment == null) {
-				uni.showToast({
-					title: '请选择支付方式',
-					icon: 'none'
-				})
-			} else if (this.selectedPayment == 1) {
-				//微信支付
-				this.weixinPay()
-			} else if (this.selectedPayment == 2) {
-				//余额支付
-				this.nowYuyue()
-			} else if (this.selectedPayment == 3){
-				this.rmbPay()
-			}
-		},
-		//微信支付
-		weixinPay() {
-			let params = {
-				cId: this.details.cId,
-				payType: this.selectedPayment,
-				couponReceiveId: this.couponReceiveId,
-				preferential: this.preferential, //优惠金额
-				totalPrice: this.totalPrice, //总金额
-			}
-      let url = `${h5Url}/`
-			payoff(params).then(res => {
-				let payConfig = JSON.parse(res.data.data)
-				getSignature(url).then(res => {
-					this.wxconfig = res.data
-					wx.config({
-						beta: true,
-						debug: false,
-						appId: this.wxconfig.appId, // 公众号ID
-						// appId: uni.getAppBaseInfo().host.appId, // 公众号ID
-						timestamp: this.wxconfig.timestamp, // 时间戳，自1970年以来的秒数
-						nonceStr: this.wxconfig.nonceStr, // 随机串
-						signature: this.wxconfig.sign, // 微信签名方式
-						jsApiList: ['getBrandWCPayRequest']
-					});
-					var vm = this
-					wx.invoke(
-						'getBrandWCPayRequest',
-						// 下面参数内容都是后台返回的
-						{
-							'appId': payConfig.appid, // 公众号名称，由商户传入
-							'timeStamp': payConfig.timeStamp, // 时间戳
-							'nonceStr': payConfig.nonceStr, // 随机串
-							'package': payConfig.package, // 预支付id
-							'signType': payConfig.signType, // 微信签名方式
-							'paySign': payConfig.paySign, // 微信签名
-						},
-						function(res) {
-							// 使用以上方式判断前端返回,微信团队郑重提示：res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
-
-							// JSON.stringify(res);
-							if (res.err_msg == "get_brand_wcpay_request:ok") {
-                uni.showToast({
-                  title: '支付成功！',
-                  icon: 'success',
-                  duration: 2000
-                })
-                setTimeout(() => {
-                  uni.switchTab({
-                    url: '../order/order',
-                  })
-                }, 500)
-                //使用vm弹窗导致界面报错 不跳转 - xueyh
-								// vm.$message.success(
-								// 	"支付成功") // 使用alert来弹窗 支付成功  是没有反应的。所以这里改为框架页面的弹窗就好了。注意必须要上这个微信浏览器内置事件外 转this指向才能弹窗
-								// // vm.isDisabledSubmitBtn = false;
-								// uni.switchTab({
-								// 	url: '../order/order',
-								// })
-							} else if (res.err_msg == "get_brand_wcpay_request:cancel") {
-								uni.showToast({
-									title: '已取消支付',
-									icon: 'none'
-								})
-								// alert('支付取消');
-								// vm.isDisabledSubmitBtn = false;
-
-							} else {
-								alert('付款失败');
-								// vm.isDisabledSubmitBtn = false;
-							}
-						}
-					)
-				})
-			})
-		},
-		//拉取微信支付的方法
-		pullWchatPay(data) {
-			var that = this;
-			let onBridgeReady = () => {
-				if (WeixinJSBridge && appId) {
-					WeixinJSBridge.invoke(
-						'getBrandWCPayRequest', {
-							appId: data.appId,
-							nonceStr: data.nonceStr,
-							package: data.package,
-							paySign: data.paySign,
-							signType: data.signType,
-							timeStamp: data.timeStamp
-						},
-						function(res) {
-							console.log('调起支付时的警告');
-							if (res.err_msg === 'get_brand_wcpay_request:ok') {
-								_this.payType = 0;
-								console.log('支付成功回调')
-							} else {
-								console.log('支付失败')
-							}
-						}
-					)
-				}
-			}
-			// 检测支付环境中的 WeixinJSBridge
-			if (typeof WeixinJSBridge == "undefined") {
-				if (document.addEventListener) {
-					//android机型，调取支付支付环境偶尔有延迟，这里增加延时器处理
-					var timev = setTimeout(() => {
-						clearTimeout(timev)
-						document.addEventListener('WeixinJSBridgeReady', onBridgeReady(),
-							false);
-					}, 1000)
-				} else if (document.attachEvent) {
-					document.attachEvent('WeixinJSBridgeReady', onBridgeReady());
-					document.attachEvent('onWeixinJSBridgeReady', onBridgeReady());
-				}
-			} else {
-				onBridgeReady();
-			}
-		},
-		//账号余额支付
-		nowYuyue() {
-			if (parseInt(this.dBalance) < parseInt(this.totalPrice)) {
-				uni.showModal({
-					title: '账户余额不足',
-					content: '请充值',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '../my/pay?name=充值'
-							})
-						} else if (res.cancel) {}
-					}
-				});
-			} else {
-				var data = {
-					cId: this.details.cId,
-					payType: this.selectedPayment,
-					couponReceiveId: this.couponReceiveId,
-					preferential: this.preferential, //优惠金额
-					totalPrice: this.totalPrice, //总金额
-				}
-				payoff(data).then(res => {
-					if (res.data.code == 200) {
-						uni.showToast({
-							title: '支付成功！',
-						})
-						setTimeout(() => {
-							uni.switchTab({
-								url: '../order/order',
-							})
-						}, 2000)
-					} else {
-						uni.showToast({
-							icon: 'error',
-							title: res.data.msg,
-						})
-					}
-
-				})
-			}
-		},
-		//现金支付
-		rmbPay(){
-			let params = {
-				cId: this.details.cId,
-				payType: this.selectedPayment,
-				couponReceiveId: this.couponReceiveId,
-				preferential: this.preferential, //优惠金额
-				totalPrice: this.totalPrice, //总金额
-			}
-			payoff(params).then(res => {
-				if (res.data.code == 200) {
-					uni.showToast({
-						title: '支付成功！',
-					})
-					setTimeout(() => {
-						uni.switchTab({
-							url: '../order/order',
-						})
-					}, 2000)
-				} else {
-					uni.showToast({
-						icon: 'error',
-						title: res.data.msg,
-					})
-				}
-
-			})
-		},
-		verification() {
-			let params = {
-				cId: this.details.cId,
-				couponReceiveId: this.couponId
-			}
-			verification(params).then(res => {
-				if (res.data.msg == '不满足优惠券门槛金额') {
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none'
-					})
-				}
-				this.couponReceiveId = res.data.data.couponReceiveId
-				this.preferential = res.data.data.preferential
-				this.totalPrice = res.data.data.totalPrice
-			})
-		},
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.orderDetails {
-	min-height: 100vh;
-	padding: 30rpx 40rpx 130rpx;
-	background-color: #e8f2f4;
-	background: linear-gradient(152deg, #DCFFF8 0%, #F1FEFF 100%);
-
-	.content {
-		overflow-y: auto;
-
-		.address {
-			background-color: #fff;
-			border-radius: 20rpx;
-			padding: 24rpx;
-			color: #000;
-			position: relative;
-			margin-bottom: 24rpx;
-
-			.add {
-				font-weight: 600;
-				font-size: 30rpx;
-				color: #2F3437;
-				line-height: 35rpx;
-				margin-bottom: 12rpx;
-			}
-
-			.name {
-				width: 100%;
-				color: #666;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.name_left {
-					font-size: 26rpx;
-					color: #333333;
-
-					text {
-						font-size: 26rpx;
-						color: #999999;
-						margin-left: 20rpx;
-					}
-				}
-
-				.toggle {
-					width: 152rpx;
-					height: 52rpx;
-					background: linear-gradient(135deg, #1AD8CF 0%, #21C8C0 100%);
-					border-radius: 98rpx;
-					font-size: 26rpx;
-					color: #FFFFFF;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-				}
-			}
-
-			.back {
-				position: absolute;
-				top: 50%;
-				right: 30rpx;
-				margin-top: -16rpx;
-
-				image {
-					width: 16rpx;
-					transform: rotate(180deg);
-				}
-			}
-		}
-	}
-
-	.list_content {
-		width: 100%;
-		background: #FFFFFF;
-		box-shadow: 0px 4px 12px 0px rgba(88, 209, 187, 0.2);
-		border-radius: 20rpx;
-		margin-bottom: 24rpx;
-		padding: 24rpx;
-
-		.list_title {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			margin-bottom: 24rpx;
-
-			.title_left {
-				font-weight: 600;
-				font-size: 28rpx;
-				color: #2F3437;
-				display: flex;
-				align-items: center;
-
-				text {
-					display: inline-block;
-					width: 6rpx;
-					height: 28rpx;
-					background: #20CBC2;
-					margin-right: 12rpx;
-				}
-			}
-
-			.js {
-				width: 188rpx;
-				height: 52rpx;
-				background: #DEFFFD;
-				border-radius: 4rpx;
-				padding: 8rpx 16rpx;
-				font-size: 26rpx;
-				color: #00B8B0;
-				box-sizing: border-box;
-			}
-		}
-
-		.total {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-
-			.total_price {
-				font-size: 28rpx;
-				color: #F53E54;
-
-				.price {
-					font-weight: 600;
-					font-size: 36rpx;
-					color: #F53E54;
-				}
-			}
-		}
-
-		.time_coupon {
-			border-top: 1px solid #eeeeee;
-			// padding-top: 24rpx;
-			margin-top: 24rpx;
-
-			.select_coupon {
-				display: flex;
-				justify-content: space-between;
-				margin-top: 26rpx;
-
-				text {
-					font-size: 28rpx;
-					color: #333333;
-
-					.red {
-						font-weight: 600;
-						font-size: 28rpx;
-						color: #F53E54;
-						margin-left: 10rpx;
-					}
-				}
-
-				.right {
-					font-size: 26rpx;
-					display: flex;
-					align-items: center;
-
-					image {
-						width: 28rpx;
-						height: 28rpx;
-						margin-left: 8rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.lists {
-		width: 100%;
-		// height: 160rpx;
-		display: flex;
-		justify-content: space-between;
-		border-radius: 24rpx;
-		margin-bottom: 28rpx;
-
-		.imgs {
-			width: 160rpx;
-			height: 160rpx;
-			border-radius: 20rpx;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.right {
-			flex: 1;
-			padding-left: 30rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-
-			.list_title {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.title {
-					font-size: 34rpx;
-					font-weight: bold;
-				}
-
-				.time {
-					font-size: 24rpx;
-				}
-			}
-
-			.js {
-				color: #8f9394;
-			}
-
-			.price {
-				// padding-top: 50rpx;
-				display: flex;
-				justify-content: space-between;
-
-				.counter {
-					color: #c8caca;
-				}
-
-				.money {
-					font-size: 24rpx;
-					color: #333333;
-				}
-
-				.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;
-					}
-				}
-			}
-		}
-	}
-
-	.face {
-		width: 100%;
-		background-color: #fff;
-		// margin: 0 30rpx;
-		border-radius: 20rpx;
-		padding: 24rpx;
-		box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.05);
-		box-sizing: border-box;
-
-		.face_one {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 28rpx;
-			margin-bottom: 12rpx;
-
-			.title_left {
-				font-weight: 600;
-				font-size: 28rpx;
-				color: #2F3437;
-				display: flex;
-				align-items: center;
-
-				text {
-					display: inline-block;
-					width: 6rpx;
-					height: 28rpx;
-					background: #20CBC2;
-					margin-right: 12rpx;
-				}
-			}
-
-			.btn {
-				font-size: 28rpx;
-				color: #00B8B0;
-			}
-
-			.price {
-				color: #999999;
-			}
-		}
-
-		.face_three {
-			font-size: 26rpx;
-			color: #999999;
-		}
-	}
-
-	.pay_type {
-		background: #FFFFFF;
-		box-shadow: 0px 4rpx 12rpx 0px rgba(88, 209, 187, 0.1);
-		border-radius: 20rpx;
-		margin-top: 24rpx;
-		padding: 24rpx;
-		box-sizing: border-box;
-
-		.pay_title {
-			width: 100%;
-			margin-bottom: 24rpx;
-			font-weight: 600;
-			font-size: 32rpx;
-			color: #2F3437;
-			font-weight: 600;
-			font-size: 28rpx;
-			color: #2F3437;
-			display: flex;
-			align-items: center;
-
-			text {
-				display: inline-block;
-				width: 6rpx;
-				height: 28rpx;
-				background: #20CBC2;
-				margin-right: 12rpx;
-			}
-		}
-
-		.paytype {
-			width: 100%;
-			margin-bottom: 16rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-				margin-right: 10rpx;
-			}
-
-			text {
-				flex: 1;
-				font-size: 30rpx;
-				color: #333333;
-			}
-		}
-	}
-
-	.footer-bar {
-		.prices {
-			font-size: 28rpx;
-			color: #b0b5b7;
-
-			text {
-				color: #d3362b;
-			}
-		}
-
-		.btn {
-			color: #fff;
-			width: 300rpx;
-			padding: 10rpx 0;
-			background: linear-gradient(to right, #53aebc, #12d4f4);
-			border-radius: 10rpx;
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-
-			.remaining_time {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-				height: 35rpx;
-				margin-top: 5rpx;
-				font-size: 24rpx;
-
-				::v-deep.u-countdown-time {
-					font-size: 24rpx !important;
-				}
-			}
-		}
-	}
-}
-
-::v-deep .u-count-down {
-  margin-left: 10rpx !important;
-}
-</style>
-

src/pages/my/dynamic/index.vue

@@ -121,9 +121,13 @@ export default {
       this.$refs.paging.reload()
     },
     goLogin() {
+      
       uni.navigateTo({
-        url: '/pages/login/wxLogin',
+        url: '/setting/myNew/phone',
       })
+      // uni.navigateTo({
+      //   url: '/pages/login/wxLogin',
+      // })
     },
     goPublish() {
       uni.navigateTo({

src/pages/order/order.vue

@@ -320,8 +320,11 @@ export default {
 		},
 		goLogin() {
 			uni.navigateTo({
-				url: '/pages/login/wxLogin'
+				url: '/setting/myNew/phone',
 			})
+			// uni.navigateTo({
+			// 	url: '/pages/login/wxLogin'
+			// })
 		},
 	},
 }

src/utils/index.js

@@ -108,7 +108,7 @@ const otherUtil = {
 		let str = uni.$u.queryParams({ isBack: 1 });
 		// 跳转路由
 		
-		let path = `/pages/myNew/phone${str}`;
+		let path = `/setting/myNew/phone${str}`;
 		//let path = `/pages/login/wxLogin${str}`;
 		// 未登录时，根据 type 执行对应操作
 		if (!isLogin) {