对接流水接口

api/address/address.js

@@ -38,9 +38,9 @@ export const insertAddress = (data) => {
 }
 
 // 地址-地址修改
-export const udpateAddress = () => {
+export const udpateAddress = (data) => {
 	return request({
-	  url: '/prod-api/applet/address/udpateAddress',
+	  url: '/applet/address/udpateAddress',
 	  headers: {
 	    isToken: true
 	  },

api/date/index.js

@@ -7,40 +7,31 @@ export function deleteOutDate(data) {
     'url': '/applet/outDate/deleteOutDate',
     'method': 'post',
 	data
-  }).then(res => {
-    return res.data
   })
 }
 
 // 接单地址-不接单日期添加
-export function deleteOutDate(data) {
+export function insertOutDate(data) {
   return request({
     'url': '/applet/outDate/insertOutDate',
     'method': 'post',
 	data
-  }).then(res => {
-    return res.data
   })
 }
 
 // 接单地址-不接单日期列表数据查询
-export function deleteOutDate(params) {
+export function outDateList() {
   return request({
-    'url': '​/applet​/outDate​/outDateList',
-    'method': 'get',
-	params
-  }).then(res => {
-    return res.data
+    'url': '​/applet/outDate/outDateList',
+    'method': 'get'
   })
 }
 
-// 接单地址-不接单日期修改s
-export function deleteOutDate(data) {
+// 接单地址-不接单日期修改
+export function udpateOutDate(data) {
   return request({
-    'url': '/prod-api/applet/outDate/udpateOutDate',
+    'url': '/applet/outDate/udpateOutDate',
     'method': 'post',
 	data
-  }).then(res => {
-    return res.data
   })
 }

manifest.json

@@ -1,63 +1,68 @@
 {
-	"name": "uni-vuu3",
-	"appid": "",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"appid": "wx01f0f43759922fda",
-		"setting": {
-			"urlCheck": false,
-			"postcss": true,
-			"minified": true
-		},
-		"usingComponents": true,
-		"mergeVirtualHostAttributes": true
-	},
-	"vueVersion": "3"
-}
+    "name" : "uni-vuu3",
+    "appid" : "__UNI__BCA90DD",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "wx01f0f43759922fda",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : true,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "mergeVirtualHostAttributes" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取用户地址"
+            }
+        }
+    },
+    "vueVersion" : "3"
+}

otherPages/authentication/connectAddress/detail.vue

@@ -6,7 +6,7 @@
 				<view class="info-content">
 					<up-form-item label="接单地址" prop="area">
 						<view plain class="flex-rowr" @click="selectAddr">
-							<text v-if="form.area"></text>
+							<text v-if="form.area">{{ form.area }}</text>
 							<text v-else class="placeholder">请定位选择小区或商城等</text>
 							<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F"
 								size="21rpx"></up-icon>
@@ -37,8 +37,7 @@
 							</template>
 						</up-input>
 					</up-form-item>
-					<up-form-item label="不接单日期(选填)" prop="disabledDate" labelWidth="300rpx">
-						<!-- todo -->
+					<up-form-item @click="toNoOrderDate" label="不接单日期(选填)" prop="disabledDate" labelWidth="300rpx">
 					</up-form-item>
 				</view>
 			</view>
@@ -55,7 +54,7 @@
 
 		<view class="footer-btn">
 			<view class="btn" @click="onSave">
-				{{ eidtId ? '修改地址' : '新增地址'}}
+				{{ eidtItem ? '修改地址' : '新增地址'}}
 			</view>
 		</view>
 	</view>
@@ -91,10 +90,18 @@
 		disabledDate: [],
 	})
 	const rules = ref({})
-	const eidtId = ref(0);
+	const eidtItem = ref(null);
 
 	onLoad((options) => {
-		eidtId.value = options?.id || 0
+		eidtItem.value = options?.item ? JSON.parse(options.item) : null;
+		form.value = {
+			id: eidtItem?.value?.id || null,
+			area: eidtItem?.value?.area || null,
+			address: eidtItem?.value?.address || null,
+			status: eidtItem?.value?.status || null,
+			latitude: eidtItem?.value?.latitude || null,
+			longitude: eidtItem?.value?.longitude || null
+		}
 	});
 
 	const setAddress = (res) => {
@@ -123,18 +130,29 @@
 	}
 
 	const onSave = async () => {
-		if (eidtId.value) {
+		let code = null;
+		if (eidtItem?.value?.id) {
 			let result = await udpateAddress({
-				...form
+				...form.value
 			})
+			code = result.code
 		} else {
 			// 新增地址
 			let result = await insertAddress({
-				...form
+				...form.value
 			})
-			if (result.code == 200) {
-				uni.navigateBack()
-			}
+			code = result.code
+		}
+		if (code == 200) {
+			uni.navigateBack()
+		}
+	}
+
+	const toNoOrderDate = () => {
+		if (eidtItem?.value?.id) {
+			uni.navigateTo({
+				url: `/otherPages/myOrdersManage/date/detail?addressId=${eidtItem.value.id}`
+			});
 		}
 	}
 </script>

otherPages/authentication/connectAddress/index.vue

@@ -36,10 +36,10 @@
 						<view class="color-ffb size-22">
 							接单中
 						</view>
-						<switch checked="true" color="#FFBF60" style="transform: scale(0.6);" />
+						<switch :checked="item.status" color="#FFBF60" style="transform: scale(0.6);" />
 					</view>
 					<view class="flex-rowr">
-						<view @click="toAdd(item.id)" class="flex-rowl">
+						<view @click="toAdd(item)" class="flex-rowl">
 							<image src="@/static/images/ydd/edit.png" mode="widthFix" style="width: 20rpx;"></image>
 							<text class="size-22 color-777 ml10">编辑</text>
 						</view>
@@ -95,10 +95,10 @@
 		return dateArr.map(date => dayjs(date).format('MM-DD')).join('、')
 	}
 
-	const toAdd = (editId) => {
-		if(editId) {
+	const toAdd = (item) => {
+		if(item) {
 			uni.navigateTo({
-				url: `/otherPages/authentication/connectAddress/detail?id=${editId}`
+				url: `/otherPages/authentication/connectAddress/detail?item=${JSON.stringify(item)}`
 			})
 		}else {
 			uni.navigateTo({

otherPages/myOrdersManage/date/detail.vue

@@ -8,43 +8,180 @@
 				</view>
 				您不会再接收到选择日期内的订单
 			</view>
-			<view class="buttom level" :style="{borderRadius:'31rpx'}">
+			<view @click="show = true" class="buttom level" :style="{borderRadius:'31rpx'}">
 				添加不接单日期
 			</view>
 		</view>
-		<view class="line1">
-		</view>
-		<view class="level center">
+
+		<view v-if="selectDateList.length" class="level center">
 			<view class="">
 				<view class="text1" :style="{ textAlign: 'right' }">
-					8天
+					{{ selectDateList.length }}天
 				</view>
 				共不接单时间
 			</view>
 			<view class="level center_item">
-				<view class="">
-					<!-- <up-icon name="edit-pen" color="#2979ff" size="22"></up-icon> -->
+				<!-- 		<view class="">
+					<up-icon name="edit-pen" color="#2979ff" size="22"></up-icon>
 					修改
-				</view>
-				<view class="">
+				</view> -->
+				<view @click="cleanDates" class="">
 					<!-- <up-icon name="trash" color="#2979ff" size="22"></up-icon> -->
 					清空
 				</view>
 			</view>
 		</view>
-		<view class="item box-size" :style="{borderRadius:'16rpx'}">
-			2月不接单
+
+		<view v-if="selectDateList.length" v-for="(dates,month) in groupedDates" :key="month" class="item box-size"
+			:style="{borderRadius:'16rpx'}">
+			{{ month }}不接单
 			<view class="text2">
-				共6天:2月19日、2月22日、2月24日、2月27日、2月28日、2月29日
+				共{{ dates.length }}天:<text v-for="(item,index) in dates"
+					:key="index">{{ item + (index != dates.length - 1 ? "," : "") }}</text>
 			</view>
 		</view>
-		<view class="buttom_ level" :style="{borderRadius:'41rpx'}">
+		<view @click="submit" class="buttom_ level" :style="{borderRadius:'41rpx'}">
 			保存
 		</view>
 	</view>
+
+	<up-action-sheet :actions="list" @select="selectClick" :show="show" :round="10"></up-action-sheet>
+	<up-calendar :show="calendarShow" color="#FFBF60" :round="10" :showTitle="false" :mode="mode" @confirm="confirm"
+		@close="closeCandler" :minDate="minDate" :maxDate="maxDate"></up-calendar>
 </template>
 
-<script>
+<script setup>
+	import {
+		ref
+	} from "vue"
+
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app'
+	import {
+		insertOutDate,
+		outDateList
+	} from "@/api/date/index.js"
+
+	onLoad((options) => {
+		addressId.value = options.addressId
+	});
+	
+	onShow(() => {
+		let response = outDateList();
+		console.log("返回数据",response)
+	})
+
+	const addressId = ref(0)
+	const list = ref([{
+			index: 0,
+			name: '添加不接单日期区间'
+		},
+		{
+			index: 1,
+			name: '添加不接单日期'
+		},
+		{
+			index: 2,
+			name: '取消'
+		}
+	]);
+
+	const show = ref(false);
+	const calendarShow = ref(false);
+	const mode = ref('range');
+	const selectDateList = ref([]);
+	const groupedDates = ref({}); //按月分组
+	const d = new Date();
+	const currentYear = d.getFullYear();
+	const minDate = `${currentYear}-01-01`;
+	const maxDate = `${currentYear}-12-31`;
+
+	// 方法  
+	const selectClick = (selectItem) => {
+		if (selectItem.index == 0) {
+			mode.value = 'range';
+			calendarShow.value = true;
+		} else if (selectItem.index == 1) {
+			mode.value = 'single';
+			calendarShow.value = true;
+		}
+		show.value = false;
+	};
+
+	const confirm = (e) => {
+		const list = [...selectDateList.value, ...e];
+		selectDateList.value = [...new Set(list)];
+		gruopDate(selectDateList.value);
+		calendarShow.value = false;
+	};
+
+	const closeCandler = () => {
+		calendarShow.value = false;
+	}
+
+
+	// 日期按月分组
+	const gruopDate = (dateList) => {
+		groupedDates.value = {}
+		dateList.forEach(date => {
+			const [year, month, day] = date.split('-');
+			const formattedDate = `${parseInt(month)}月${parseInt(day)}日`;
+			const monthKey = `${parseInt(month)}月`;
+
+			if (!groupedDates.value[monthKey]) {
+				groupedDates.value[monthKey] = [];
+			}
+			groupedDates.value[monthKey].push(formattedDate);
+		});
+
+		// 对键进行排序
+		const sortedKeys = Object.keys(groupedDates.value).sort((a, b) => {
+			const monthA = parseInt(a.replace('月', ''));
+			const monthB = parseInt(b.replace('月', ''));
+			return monthA - monthB;
+		});
+
+		// 根据排序后的键构建新对象
+		const sortedGroupedDates = {};
+		sortedKeys.forEach(key => {
+			sortedGroupedDates[key] = groupedDates.value[key];
+		});
+
+		// 更新 groupedDates 的值
+		groupedDates.value = sortedGroupedDates;
+	}
+
+	const cleanDates = () => {
+		selectDateList.value = [];
+		gruopDate(selectDateList.value);
+	}
+
+	const submit = async () => {
+		if (!selectDateList.value.length) {
+			return uni.showToast({
+				title: '请选择日期',
+				icon: "none"
+			})
+		} else if (!addressId.value) {
+			return uni.showToast({
+				title: '地址标识不能为空',
+				icon: "none"
+			})
+		}
+		let response = await insertOutDate({
+			addressId: addressId.value,
+			date: selectDateList.value.toString()
+		})
+		if (response.code == 200) {
+			uni.showToast({
+				title: response.msg,
+				icon: "none"
+			})
+			uni.navigateBack(-1);
+		}
+	}
 </script>
 
 <style scoped lang="scss">

otherPages/myOrdersManage/date/index.vue

@@ -8,7 +8,7 @@
 				</view>
 				您不会再接收到选择日期内的订单
 			</view>
-			<view class="buttom level" :style="{borderRadius:'31rpx'}">
+			<view @click="toDetail" class="buttom level" :style="{borderRadius:'31rpx'}">
 				添加不接单日期
 			</view>
 		</view>
@@ -18,7 +18,12 @@
 	</view>
 </template>
 
-<script>
+<script setup>
+	const toDetail = () => {
+		uni.navigateTo({
+			url: '/otherPages/myOrdersManage/date/detail'
+		});
+	}
 </script>
 
 <style scoped lang="scss">

otherPages/myOrdersManage/transaction/index.vue

@@ -9,13 +9,14 @@
 				支出明细
 			</view>
 		</view>
-		<view class="Recharge flex">
+		
+		<view v-for="(item,index) in list" :key="index" class="Recharge flex">
 			<view class="flex">
 				<image src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
 					mode=""></image>
 				<view class="text1">
 					<view class="text2">
-						伴宠师上门服务
+						{{ item.title }}
 					</view>
 					<view>
 						2020-12-29 12:54:54
@@ -23,13 +24,35 @@
 				</view>
 			</view>
 			<view class="text3">
-				¥200
+				{{ item.type == '收入' ? '+' : '-' }}{{ item.amount }}
 			</view>
 		</view>
 	</view>
 </template>
 
-<script>
+<script setup>
+	import { ref } from "vue"
+	import { amountLogList  } from "@/api/amount/index.js"
+	
+	import {
+		onShow
+	} from "@dcloudio/uni-app"
+	
+	onShow(() => {
+		getRunningWater()
+	})
+	
+	const list = ref([]);
+	
+	// 获取流水
+	const getRunningWater = async () => {
+		let response = await amountLogList({
+			type : 1
+		});
+		if(response.code == 200) {
+			list.value = response.data
+		}
+	}
 </script>
 
 <style scoped lang="scss">

pages/login/index.scss

@@ -4,14 +4,21 @@
   
   &-logo {
 	  display: flex;
-	  align-items: center;
+	  flex-direction: column;
 	  justify-content: center;
+	  align-items: center;
     height: 504rpx;
     background: linear-gradient(360deg, #FFFFFF 0%, #FFBF60 99%);
-    image{
+    .logo{
       width: 180rpx;
 	  height: 180rpx;
     }
+	
+	.d {
+		width: 200rpx;
+		height: 80rpx;
+		margin-top: 20rpx;
+	}
   }
   &-submit{
     padding: 0 76rpx;

pages/login/index.vue

@@ -2,12 +2,13 @@
 	<view class="login">
 		<view class="login-logo">
 			<image class="logo" :src="configList?.applet_info?.paramValueImage" mode="aspectFill"></image>
+			<image class="d" :src="configList?.logo_icon?.paramValueImage" mode="aspectFill"></image>
 		</view>
 		<view class="login-submit">
-			<up-button type="primary" text="授权手机号登录" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber"
-				shape="circle" color="#FFBF60"></up-button>
 			<up-button class="mt24" type="primary" text="微信授权登陆" @tap="loginWx" shape="circle"
 				color="#FFBF60"></up-button>
+			<up-button @click="cancelLogin" class="mt24" type="primary" text="取消登录" shape="circle"
+				color="#FFBF60"></up-button>
 		</view>
 		<view class="flex-rowc">
 			<view class="select">
@@ -15,15 +16,16 @@
 			</view>
 			<view class="size-26">
 				<text>我已阅读并同意猫爸狗妈</text>
-				<text class="main-color">《注册协议》</text>
+				<text @click="privacyPolicy('login_xy')" class="main-color">《注册协议》</text>
 				<text>与</text>
-				<text class="main-color">《隐私政策》</text>
+				<text @click="privacyPolicy('login_ys')" class="main-color">《隐私政策》</text>
 			</view>
 		</view>
 	</view>
-	<view class="footer size-30 flex-rowc w100">
-		暂不登陆
-	</view>
+
+	<up-popup :show="show" @close="close" :round="10">
+		<view style="padding: 10rpx 20rpx;min-height: 50vh;" v-html="content"></view>
+	</up-popup>
 
 </template>
 
@@ -55,12 +57,9 @@
 	const configList = computed(() => {
 		return store.getters.configList
 	})
-	
-	onMounted(() => {
-		console.log("configList",configList)
-		
-	})
-	
+	const show = ref(false)
+	const content = ref('')
+
 	// 微信授权登陆
 	const loginWx = () => {
 		store.dispatch("login")
@@ -129,6 +128,21 @@
 	// 	setStorage('userInfo', data)
 	// 	uni.navigateBack()
 	// }
+
+	const cancelLogin = () => {
+		uni.switchTab({
+			url: "/pages/workbenchManage/index"
+		})
+	}
+
+	const close = () => {
+		show.value = false
+	}
+	
+	const privacyPolicy = (key) => {
+		content.value = configList.value[key]?.paramValueArea || "";
+		show.value = true;
+	}
 </script>
 
 <style scoped lang="scss">

pages/myOrdersManage/index.vue

@@ -6,7 +6,7 @@
 				<view class="buts" :class="{'buts-active':activeIndex===2}" @click="activeIndex=2">日订单</view>
 			</view>
 		</view>
-		
+
 		<up-sticky bgColor="#fff" v-if="activeIndex == 1">
 			<view class="container-tabs">
 				<up-tabs :list="tabList1" lineWidth="68rpx" :activeStyle="{
@@ -17,31 +17,25 @@
 					color: '#FFFFFF',
 					transform: 'scale(1)'
 				}" :itemStyle="{height:'88rpx',padding:'0 52rpx'}" lineColor="#FFFFFF"></up-tabs>
-					</view>
+			</view>
 		</up-sticky>
-		
+
 		<up-sticky bgColor="#fff" v-else>
 			<view class="container-tabs">
-				<up-tabs :list="tabList2" 
-				lineWidth="68rpx" 
-				:activeStyle="{
+				<up-tabs :list="tabList2" lineWidth="68rpx" :activeStyle="{
 					color: '#FFFFFF',
 					fontWeight: 'bold',
 					transform: 'scale(1.05)'
-				}" 
-				:inactiveStyle="{
+				}" :inactiveStyle="{
 					color: '#FFFFFF',
 					transform: 'scale(1)'
-				}" 
-				
-				:itemStyle="{height:'88rpx',padding:'0 52rpx', width : '400rpx'}" 
-				lineColor="#FFFFFF"></up-tabs>
+				}" :itemStyle="{height:'88rpx',padding:'0 52rpx', width : '400rpx'}" lineColor="#FFFFFF"></up-tabs>
 			</view>
 		</up-sticky>
 
 		<view class="container">
-			<systemOrder :list="list" v-if="activeIndex == 1"/>
-			<orderListByData :list="list" v-else/>
+			<systemOrder :list="list" v-if="activeIndex == 1" />
+			<orderListByData :list="list" v-else />
 		</view>
 	</view>
 </template>
@@ -53,19 +47,33 @@
 	} from "vue";
 	import systemOrder from "./components/systemOrder.vue";
 	import orderListByData from "./components/orderListByData.vue";
+	import {
+		onShow
+	} from "@dcloudio/uni-app"
+	import {
+		getIsLogin
+	} from "@/utils/auth.js"
 	// import personOrder from "./components/personOrder.vue";
 	// import lossOrder from "./components/lossOrder.vue";
-	
-	
+
+
 	import {
 		getAppOrderList,
 	} from "@/api/order/order.js"
 
+	onShow(() => {
+		if (!getIsLogin()) {
+			uni.navigateTo({
+				url: "/pages/login/index"
+			})
+		}
+	})
+
 	const current = ref(0)
 	const activeIndex = ref(1)
-	
+
 	const list = ref([])
-	
+
 	const tabList1 = reactive([{
 			name: '待服务',
 			badge: {
@@ -85,9 +93,8 @@
 			}
 		},
 	])
-	
-	const tabList2 = reactive([
-		{
+
+	const tabList2 = reactive([{
 			name: '待上门',
 			badge: {
 				// value: 5,
@@ -100,18 +107,17 @@
 			}
 		},
 	])
-	
-	function getList(){
+
+	function getList() {
 		getAppOrderList()
-		.then(res => {
-			if(res.code == 200){
-				list.value = res.rows
-			}
-		})
+			.then(res => {
+				if (res.code == 200) {
+					list.value = res.rows
+				}
+			})
 	}
-	
+
 	getList()
-	
 </script>
 
 <style scoped lang="scss">

pages/orderTakingManage/index.vue

@@ -1,59 +1,69 @@
 <template>
-  <view>
-    <up-sticky bgColor="#fff">
-      <view class="container-tabs">
-        <up-tabs :list="list" lineWidth="68rpx"
-                 :activeStyle="{
+	<view>
+		<up-sticky bgColor="#fff">
+			<view class="container-tabs">
+				<up-tabs :list="list" lineWidth="68rpx" :activeStyle="{
             color: '#FFFFFF',
             fontWeight: 'bold',
             transform: 'scale(1.05)'
-        }"
-                 :inactiveStyle="{
+        }" :inactiveStyle="{
             color: '#FFFFFF',
             transform: 'scale(1)'
-        }"
-                 :itemStyle="{height:'88rpx',padding:'0 52rpx'}"
-                 lineColor="#FFFFFF"></up-tabs>
-      </view>
-    </up-sticky>
+        }" :itemStyle="{height:'88rpx',padding:'0 52rpx'}" lineColor="#FFFFFF"></up-tabs>
+			</view>
+		</up-sticky>
 
-    <view class="container">
-      <systemOrder v-if="current===0"/>
-      <personOrder v-if="current===1"/>
-      <lossOrder v-if="current===2"/>
-    </view>
-  </view>
+		<view class="container">
+			<systemOrder v-if="current===0" />
+			<personOrder v-if="current===1" />
+			<lossOrder v-if="current===2" />
+		</view>
+	</view>
 </template>
 
 <script setup>
-import {reactive,ref} from "vue";
-import systemOrder from "./components/systemOrder.vue";
-import personOrder from "./components/personOrder.vue";
-import lossOrder from "./components/lossOrder.vue";
-const current = ref(0)
-const list = reactive([
-  {
-    name: '系统派单',
-    badge: {
-      value: 5,
-    }
-  },
-  {
-    name: '个人订单',
-    badge: {
-      value: 5,
-    }
-  },
-  {
-    name: '流失订单',
-    badge: {
-      value: 5,
-    }
-  },
-])
+	import {
+		reactive,
+		ref
+	} from "vue";
+	import systemOrder from "./components/systemOrder.vue";
+	import personOrder from "./components/personOrder.vue";
+	import lossOrder from "./components/lossOrder.vue";
+	import {
+		onShow
+	} from "@dcloudio/uni-app"
+	import { getIsLogin } from "@/utils/auth.js"
+	
+	const current = ref(0)
+	const list = reactive([{
+			name: '系统派单',
+			badge: {
+				value: 5,
+			}
+		},
+		{
+			name: '个人订单',
+			badge: {
+				value: 5,
+			}
+		},
+		{
+			name: '流失订单',
+			badge: {
+				value: 5,
+			}
+		},
+	])
+	
+	onShow(() => {
+		if(!getIsLogin()) {
+			uni.navigateTo({
+				url: "/pages/login/index"
+			})
+		}
+	})
 </script>
 
 <style scoped lang="scss">
-@import "index.scss";
-
-</style>
+	@import "index.scss";
+</style>

pages/userManage/index.vue

@@ -25,7 +25,7 @@
 							<view class="flex flex-between but">
 								<view>提现</view>
 								<view>|</view>
-								<view>明细</view>
+								<view @click="toRunningWater">明细</view>
 							</view>
 						</view>
 						<view style="text-align: center">
@@ -110,6 +110,17 @@
 	import {
 		useStore
 	} from "vuex"
+	import {
+		onShow
+	} from "@dcloudio/uni-app"
+
+	onShow(() => {
+		if (!getIsLogin()) {
+			uni.navigateTo({
+				url: "/pages/login/index"
+			})
+		}
+	})
 
 	const store = useStore();
 	const isLogin = ref(false)
@@ -129,6 +140,12 @@
 			url: "/otherPages/orderTakingManage/evaluate/index"
 		})
 	}
+	
+	const toRunningWater = () => {
+		uni.navigateTo({
+			url: "/otherPages/myOrdersManage/transaction/index"
+		})
+	}
 </script>
 <style scoped lang="scss">
 	@import "index";

pages/workbenchManage/index.vue

@@ -23,7 +23,7 @@
 				</view>
 				<!-- 申请加入后       -->
 				<view class="flex flex-between font24 flex-wrap" v-if="userInfo.userHh==1">
-					<view class="icon-list" @click="handleGoto(1,item)" v-for="item in iconState.list1" :key="item.id">
+					<view class="icon-list" @click="handleGoto(item)" v-for="item in iconState.list1" :key="item.id">
 						<up-image class="mb20" :show-loading="true" :src="item.image" width="68rpx"
 							height="68rpx"></up-image>
 						<view>{{item.name}}</view>
@@ -47,7 +47,7 @@
 				</view>
 				<!--  申请之后      -->
 				<view class="flex-rowl flex-wrap" v-if="userInfo.userBcs===1">
-					<view class="icon-list" v-for="item in iconState.list2" :key="item.id" @click="handleClick(item)">
+					<view class="icon-list" v-for="item in iconState.list2" :key="item.id" @click="handleGoto(item)">
 						<up-image class="mb20" :show-loading="true" :src="item.image" width="68rpx"
 							height="68rpx"></up-image>
 						<view>{{ item.name }}</view>
@@ -94,9 +94,9 @@
 	onMounted(() => {
 		getBanner()
 		getpz()
-		uni.navigateTo({
-		    url: '/otherPages/authentication/connectAddress/index'
-		});
+		// uni.navigateTo({
+		//     url: '/otherPages/authentication/connectAddress/index'
+		// });
 	})
 	const userInfo = computed(() => {
 		return store.getters.userInfo
@@ -104,9 +104,7 @@
 	const configList = computed(() => {
 		return store.getters.configList
 	})
-	onShow(() => {
-
-	})
+	
 	// 获取轮播图
 	const getBanner = async () => {
 		const res = await banner()
@@ -178,21 +176,11 @@
 
 	const show = ref(true)
 	const hhShow = ref(true)
-	const handleGoto = (val, item) => {
-		switch (item.id) {
-			case 1:
-				tab.navigateTo('/otherPages/binding/list/index')
-				break;
-			case 2:
-				tab.navigateTo('/otherPages/workbenchManage/myUser/index')
-				break;
-			case 3:
-				tab.navigateTo('/otherPages/workbenchManage/myLevel/index')
-				break;
-			case 4:
-				// tab.navigateTo('/otherPages/binding/wallet/index')
-				tab.navigateTo('/otherPages/workbenchManage/myWallet/index')
-				break;
+	const handleGoto = (item) => {
+		if(item.url) {
+			uni.navigateTo({
+				url: item.url
+			})
 		}
 	}
 	// 加入合伙人
@@ -207,33 +195,6 @@
 		}
 	}
 
-	const handleClick = (item) => {
-		switch (item.code) {
-			case "1":
-				uni.navigateTo({
-					url: "/otherPages/authentication/serve/index"
-				})
-				break;
-			case "2":
-				uni.navigateTo({
-					url: "/otherPages/authentication/serve/record"
-				})
-				break;
-			case "3":
-				uni.navigateTo({
-					url: "/otherPages/authentication/connectAddress/index"
-				})
-				break;
-			case "4":
-				break;
-			case "5":
-				uni.navigateTo({
-					url: "/otherPages/orderTakingManage/evaluate/index"
-				})
-				break;
-		}
-	}
-
 	const handleOpen = () => {
 		show.value = false
 	}

store/modules/user.js

@@ -33,7 +33,7 @@ const user = {
 		},
 
 		// 设置用户信息
-		setUserInfo(state,userInfo) {
+		setUserInfo(state, userInfo) {
 			state.userInfo = userInfo;
 		}
 	},
@@ -51,10 +51,15 @@ const user = {
 							uni.setStorageSync("baseInfo", JSON.stringify(res.data.userInfo))
 							context.commit('setAccessToken', res.data.token);
 							context.commit('setUserInfo', res.data.userInfo);
-							setIsLogin("isLogin",true);
-							uni.navigateTo({
-								url: "/pages/login/wxUserInfo"
-							})
+							setIsLogin("isLogin", true);
+
+							if (!res.data.userInfo.userName || !res.data.userInfo.userImage || !res.data.userInfo.userTelephone) {
+								uni.navigateTo({
+									url: "/pages/login/wxUserInfo"
+								})
+							}else {
+								uni.navigateBack(-1)
+							}
 						}
 					})
 				}