对接地址

api/address.js

@@ -1,14 +0,0 @@
-import request from '@/utils/request'
-
-export const getAddressList = (params) => {
-  return request({
-    url: '/applet/address/addressList',
-    headers: {
-      isToken: true
-    },
-    method: "get",
-    params
-  }).then(res => {
-    return res.data
-  })
-}

api/address/address.js

@@ -0,0 +1,50 @@
+// 小程序-地址相关接口
+import request from '@/utils/request'
+
+// 地址-地址列表数据查询
+export const getAddressList = (params) => {
+  return request({
+    url: '/applet/address/addressList',
+    headers: {
+      isToken: true
+    },
+    method: "get",
+    params
+  })
+}
+
+// 地址-地址删除
+export const deleteAddress = (params) => {
+	return request({
+	  url: '/applet/address/deleteAddress',
+	  headers: {
+	    isToken: true
+	  },
+	  method: "post",
+	  params
+	})
+}
+
+// 地址-地址添加
+export const insertAddress = (data) => {
+	return request({
+	  url: '/applet/address/insertAddress',
+	  headers: {
+	    isToken: true
+	  },
+	  method: "post",
+	  data
+	})
+}
+
+// 地址-地址修改
+export const udpateAddress = () => {
+	return request({
+	  url: '/prod-api/applet/address/udpateAddress',
+	  headers: {
+	    isToken: true
+	  },
+	  method: "post",
+	  data
+	})
+}

api/amount/amount.js

@@ -0,0 +1,38 @@
+// 小程序-金额相关接口
+import request from '@/utils/request'
+
+// 小程序-金额流水信息列表数据查询
+export const amountLogList = (params) => {
+  return request({
+    url: '/applet/amount/amountLogList',
+    headers: {
+      isToken: true
+    },
+    method: "get",
+    params
+  })
+}
+
+// 小程序-充值
+export const cashIn = (params) => {
+  return request({
+    url: '/applet/amount/cashIn',
+    headers: {
+      isToken: true
+    },
+    method: "get",
+    params
+  })
+}
+
+// 小程序-提现
+export const cashOut = (params) => {
+  return request({
+    url: '​/applet​/amount​/cashOut',
+    headers: {
+      isToken: true
+    },
+    method: "get",
+    params
+  })
+}

api/certification/index.js

@@ -0,0 +1,49 @@
+// 伴宠师-伴宠师认证
+import request from '@/utils/request'
+
+// 伴宠师工作台-伴宠师基本信息删除
+export const deleteUser = (data) => {
+  return request({
+    url: '​/applet​/UserTeacher​/deleteUser',
+    headers: {
+      isToken: true
+    },
+    method: "post",
+    data
+  })
+}
+
+// 伴宠师工作台-伴宠师基本信息添加
+export const insertUser = (data) => {
+  return request({
+    url: '​/applet/UserTeacher/insertUser',
+    headers: {
+      isToken: true
+    },
+    method: "post",
+    data
+  })
+}
+
+// 伴宠师工作台-伴宠师基本信息修改
+export const udpateUser = (data) => {
+  return request({
+    url: '/prod-api​/applet​/UserTeacher​/udpateUser',
+    headers: {
+      isToken: true
+    },
+    method: "post",
+    data
+  })
+}
+
+// 伴宠师工作台-伴宠师列表数据查询
+export const userList = () => {
+  return request({
+    url: '/applet/UserTeacher/userList',
+    headers: {
+      isToken: true
+    },
+    method: "get"
+  })
+}

api/config/config.js

@@ -0,0 +1,42 @@
+// 小程序-配置信息
+import request from '@/utils/request'
+
+// 小程序-配置信息列表数据查询
+export function getConfigList() {
+  return request({
+    'url': '/applet/config/configList',
+    'method': 'get'
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 小程序-增值服务列表数据查询
+export function increaseServiceList() {
+  return request({
+    'url': '/applet/config/increaseServiceList',
+    'method': 'get'
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 小程序-平台&服务介绍列表数据查询
+export function serviceList() {
+  return request({
+    'url': '/applet/config/serviceList',
+    'method': 'get'
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 小程序-服务培训列表数据查询
+export function trainList() {
+  return request({
+    'url': '/applet/config/trainList',
+    'method': 'get'
+  }).then(res => {
+    return res.data
+  })
+}

api/date/index.js

@@ -0,0 +1,46 @@
+// 接单地址-不接单日期相关接口
+import request from '@/utils/request'
+
+// 接单地址-不接单日期删除
+export function deleteOutDate(data) {
+  return request({
+    'url': '/applet/outDate/deleteOutDate',
+    'method': 'post',
+	data
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 接单地址-不接单日期添加
+export function deleteOutDate(data) {
+  return request({
+    'url': '/applet/outDate/insertOutDate',
+    'method': 'post',
+	data
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 接单地址-不接单日期列表数据查询
+export function deleteOutDate(params) {
+  return request({
+    'url': '​/applet​/outDate​/outDateList',
+    'method': 'get',
+	params
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 接单地址-不接单日期修改s
+export function deleteOutDate(data) {
+  return request({
+    'url': '/prod-api/applet/outDate/udpateOutDate',
+    'method': 'post',
+	data
+  }).then(res => {
+    return res.data
+  })
+}

api/examination.js → api/examination/index.js

@@ -1,5 +1,7 @@
+// 伴宠师-伴宠师考核
 import request from '@/utils/request'
 
+// 伴宠师工作台-查询专业执照列表
 export const getLicenseList = () => {
   return request({
     url: '/applet/examination/licenseList',
@@ -9,6 +11,7 @@ export const getLicenseList = () => {
   })
 }
 
+// 伴宠师工作台-查询宠物类型列表
 export const getPetTypeList = () => {
   return request({
     url: '/applet/examination/petTypeList',
@@ -46,6 +49,7 @@ export const getTrainList = (params) => {
   })
 }
 
+// 伴宠师工作台-题目列表数据查询
 export const getQuestionList = (params) => {
   return request({
     url: '/applet/examination/questionList',
@@ -56,6 +60,7 @@ export const getQuestionList = (params) => {
   })
 }
 
+// 伴宠师工作台-根据题目id查询题目答案
 export const getQuestionOptions = (params) => {
   return request({
     url: '/applet/examination/insertUser',
@@ -66,6 +71,7 @@ export const getQuestionOptions = (params) => {
   })
 }
 
+// 伴宠师工作台-添加用户基本考核答案
 export const addBaseAnswer = (data) => {
   return request({
     url: '/applet/examination/addBaseAnswer',
@@ -77,6 +83,7 @@ export const addBaseAnswer = (data) => {
   })
 }
 
+// 伴宠师工作台-根据题目id查询基本考核答案
 export const answeBaseByQuestionId = (params) => {
   return request({
     url: '/applet/examination/answeBaseByQuestionId',
@@ -90,6 +97,7 @@ export const answeBaseByQuestionId = (params) => {
   })
 }
 
+// 伴宠师工作台-添加用户培训考核答案
 export const addTrainAnswer = (data) => {
   return request({
     url: '/applet/examination/addTrainAnswer',
@@ -101,6 +109,7 @@ export const addTrainAnswer = (data) => {
   })
 }
 
+// 伴宠师工作台-根据题目id查询培训考核答案
 export const answeTrainByQuestionId = (params) => {
   return request({
     url: '/applet/examination/answeTrainByQuestionId',

api/home.js

@@ -10,6 +10,7 @@ export const banner = (data) => {
 		data
 	})
 }
+
 export const joinHh = (data) => {
 	return request({
 		url: '/applet/workIn/joinHh',

api/internalProcess/index.js

@@ -0,0 +1,53 @@
+// 伴宠师-合伙人工作台内部流程
+import request from '@/utils/request'
+
+// 合伙人工作台 - 获取bannerList
+export const getLicenseList = () => {
+  return request({
+    url: '/applet/examination/licenseList',
+    method: "get"
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 合伙人工作台 - 绑定二维码
+export const hhrCode = (appUserId) => {
+  return request({
+    url: `/applet/workOut/hhrCode/${appUserId}`,
+    method: "get"
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 合伙人工作台 - 绑定用户基础信息
+export const hhrInfo = (appUserId) => {
+  return request({
+    url: `/applet/workOut/hhrInfo/${appUserId}`,
+    method: "get"
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 合伙人工作台 - 根据用户标识查询用户下单详细信息
+export const hhrMyUserGetById = (appUserId) => {
+  return request({
+    url: `/applet/workOut/hhrMyUserGetById/${appUserId}`,
+    method: "get"
+  }).then(res => {
+    return res.data
+  })
+}
+
+// 合伙人工作台 - 我的用户列表 0 未下单 1已下单
+export const hhrMyUserGetById = (data) => {
+  return request({
+    url: '/applet/workOut/hhrMyUserList',
+    method: "post",
+	data
+  }).then(res => {
+    return res.data
+  })
+}

api/serviceLog/index.js

@@ -0,0 +1,50 @@
+// 伴宠师工作台-服务记录
+import request from '@/utils/request'u
+
+// 伴宠师工作台-服务记录删除
+export const deleteServiceLog = (data) => {
+  return request({
+    url: '/applet/serviceLog/deleteServiceLog',
+    headers: {
+      isToken: true
+    },
+    method: "post",
+    data
+  })
+}
+
+// 伴宠师工作台-服务记录添加
+export const insertServiceLog = (data) => {
+  return request({
+    url: '/applet/serviceLog/insertServiceLog',
+    headers: {
+      isToken: true
+    },
+    method: "post",
+    data
+  })
+}
+
+// 伴宠师工作台-服务记录添加
+export const serviceLogList = (params) => {
+  return request({
+    url: '/applet/serviceLog/serviceLogList',
+    headers: {
+      isToken: true
+    },
+    method: "get",
+    params
+  })
+}
+
+// 伴宠师工作台-服务记录修改
+export const udpateServiceLog = (data) => {
+  return request({
+    url: '/applet/serviceLog/udpateServiceLog',
+    headers: {
+      isToken: true
+    },
+    method: "post",
+    data
+  })
+}

api/system/index.js

@@ -1,11 +0,0 @@
-import request from '@/utils/request'
-
-// 获取配置信息
-export function getConfigList() {
-  return request({
-    'url': '/applet/config/configList',
-    'method': 'get'
-  }).then(res => {
-    return res.data
-  })
-}

otherPages/authentication/components/questionCard.vue

@@ -13,7 +13,6 @@
           @click="onChange(option.id)"
         >
           {{ option.title }}
-          <!-- {{ `${String.fromCharCode(65 + oIdx)}、${option.label}` }} -->
         </view>
       </template>
       <template v-else>
@@ -38,7 +37,6 @@
           ]"
         >
           {{ option.title }}
-          <!-- {{ `${String.fromCharCode(65 + oIdx)}、${option.label}` }} -->
           <view class="icon icon-correct">
             <up-icon name="checkmark" color="#05C160" size="35rpx"></up-icon>
           </view>

otherPages/authentication/connectAddress/detail.vue

@@ -1,103 +1,103 @@
 <template>
-  <view class="page">
-	  <up-form 
-      ref="formRef"
-      :model="form" 
-      :rules="rules"
-      labelPosition="left" 
-      labelWidth="150rpx"
-    >
-      <view class="info">
-        <view class="info-header">地址信息</view>
-        <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-else class="placeholder">请定位选择小区或商城等</text>
-              <up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F" size="21rpx"></up-icon>
-            </view>
-          </up-form-item>
-			    <up-form-item label="接单地址" prop="address" labelPosition="top">
-            <view class="textarea">
-              <textarea
-                v-model="form.address"
-                placeholder="如街道、门牌号、小区、乡镇、村等"
-                :row="3"
-              ></textarea>
-            </view>
-          </up-form-item>
-        </view>
-      </view>
-      
-      <view class="info">
-        <view class="info-header">接单信息</view>
-        <view class="info-content">
-			    <up-form-item label="接单状态" prop="status">
-            <view class="flex-rowr">
-              <switch :checked="!!form.status" @change="onSwitch" color="#FFBF60" style="transform: scale(0.6);"/>
-              <text>{{ !!form.status ? '开启' : '关闭' }}</text>
-            </view>
-          </up-form-item>
-			    <up-form-item label="接单范围" prop="distance">
-            <up-input
-              v-model="form.distance"
-              placeholder="请输入内容"
-              inputAlign="right"
-              border="none"
-            >
-              <template #suffix>
-                <text>Km</text>
-              </template>
-            </up-input>
-          </up-form-item>
-			    <up-form-item label="不接单日期(选填)" prop="disabledDate" labelWidth="300rpx">
-            <!-- todo -->
-          </up-form-item>
-        </view>
-      </view>
-
-    </up-form>
-
-    <view>
-      <up-parse class="size-28" 
-        :content="configList.pet_km_text.paramValueArea" 
-        :containerStyle="{
+	<view class="page">
+		<up-form ref="formRef" :model="form" :rules="rules" labelPosition="left" labelWidth="150rpx">
+			<view class="info">
+				<view class="info-header">地址信息</view>
+				<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-else class="placeholder">请定位选择小区或商城等</text>
+							<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F"
+								size="21rpx"></up-icon>
+						</view>
+					</up-form-item>
+					<up-form-item label="接单地址" prop="address" labelPosition="top">
+						<view class="textarea">
+							<textarea v-model="form.address" placeholder="如街道、门牌号、小区、乡镇、村等" :row="3"></textarea>
+						</view>
+					</up-form-item>
+				</view>
+			</view>
+
+			<view class="info">
+				<view class="info-header">接单信息</view>
+				<view class="info-content">
+					<up-form-item label="接单状态" prop="status">
+						<view class="flex-rowr">
+							<switch :checked="!!form.status" @change="onSwitch" color="#FFBF60"
+								style="transform: scale(0.6);" />
+							<text>{{ !!form.status ? '开启' : '关闭' }}</text>
+						</view>
+					</up-form-item>
+					<up-form-item label="接单范围" prop="distance">
+						<up-input v-model="form.distance" placeholder="请输入内容" inputAlign="right" border="none">
+							<template #suffix>
+								<text>Km</text>
+							</template>
+						</up-input>
+					</up-form-item>
+					<up-form-item label="不接单日期(选填)" prop="disabledDate" labelWidth="300rpx">
+						<!-- todo -->
+					</up-form-item>
+				</view>
+			</view>
+
+		</up-form>
+
+		<view>
+			<up-parse class="size-28" :content="configList.pet_km_text.paramValueArea" containerStyle="{
           color: '#707070',
           fontSize: '22rpx',
           lineHeight: '35rpx',
-        }"
-      ></up-parse>
-    </view>
+        }"></up-parse>
+		</view>
 
 		<view class="footer-btn">
 			<view class="btn" @click="onSave">
-				保存
+				{{ eidtId ? '修改地址' : '新增地址'}}
 			</view>
 		</view>
-  </view>
+	</view>
 </template>
 
 <script setup>
-  import { ref } from 'vue'
-	import { store } from '@/store'
-
+	import {
+		ref,
+		getCurrentInstance
+	} from 'vue'
+	import {
+		store
+	} from '@/store'
+	import {
+		insertAddress,
+		udpateAddress
+	} from "@/api/address/address.js"
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+
+	const instance = getCurrentInstance();
 	const configList = store.state.system.configList
 
-  const formRef = ref()
-  const form = ref({
-    area: null,
-    latitude: null,
-    longitude: null,
-    address: null,
-    status: true,
-    distance: null,
-    disabledDate: [],
-  })
-  // todo: set rules
-  const rules = ref({})
-  
+	const formRef = ref()
+	const form = ref({
+		area: null,
+		latitude: null,
+		longitude: null,
+		address: null,
+		status: true,
+		distance: null,
+		disabledDate: [],
+	})
+	const rules = ref({})
+	const eidtId = ref(0);
+
+	onLoad((options) => {
+		eidtId.value = options?.id || 0
+	});
+
 	const setAddress = (res) => {
-		//经纬度信息
 		form.value.latitude = res.latitude
 		form.value.longitude = res.longitude
 
@@ -118,44 +118,54 @@
 		})
 	}
 
-  const onSwitch = (e) => {
-    form.value.status = e.detail.value
-  }
-
-  const onSave = () => {
-    // todo: fetch save data
+	const onSwitch = (e) => {
+		form.value.status = e.detail.value
+	}
 
-    uni.navigateBack()
-  }
+	const onSave = async () => {
+		if (eidtId.value) {
+			let result = await udpateAddress({
+				...form
+			})
+		} else {
+			// 新增地址
+			let result = await insertAddress({
+				...form
+			})
+			if (result.code == 200) {
+				uni.navigateBack()
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.page {
-  padding: 35rpx 37rpx 144rpx 37rpx;
-}
-
-.info {
-  color: #707070;
-  font-size: 30rpx;
-  line-height: 40rpx;
-
-  &-header {
-    color: #000000;
-  }
-
-  .placeholder {
-    color: #707070;
-  }
-
-  .textarea {
-    margin-top: 16rpx;
-    background-color: #F3F3F3;
-    padding: 26rpx 8rpx;
-    border-radius: 15rpx;
-  }
-
-  :deep(.u-form-item__body__left__content__label) {
-    color: #707070;
-  }
-}
+	.page {
+		padding: 35rpx 37rpx 144rpx 37rpx;
+	}
+
+	.info {
+		color: #707070;
+		font-size: 30rpx;
+		line-height: 40rpx;
+
+		&-header {
+			color: #000000;
+		}
+
+		.placeholder {
+			color: #707070;
+		}
+
+		.textarea {
+			margin-top: 16rpx;
+			background-color: #F3F3F3;
+			padding: 26rpx 8rpx;
+			border-radius: 15rpx;
+		}
+
+		:deep(.u-form-item__body__left__content__label) {
+			color: #707070;
+		}
+	}
 </style>

otherPages/authentication/connectAddress/index.vue

@@ -4,12 +4,9 @@
 			<image src="@/static/images/ydd/icon2.png" mode=""></image>
 			<text class="color-ffb size-22 ml16">普通喂养员可设置3个接单地址，优选喂养员可设置5个接单地址</text>
 		</view>
-		
+
 		<view v-if="list.length">
-			<view class="li bg-fff"
-				v-for="(item, index) in list"
-				:key="`address-${index}`"
-			>
+			<view class="li bg-fff" v-for="(item, index) in list" :key="`address-${index}`">
 				<view class="size-30">
 					{{ item.area }}
 				</view>
@@ -42,11 +39,11 @@
 						<switch checked="true" color="#FFBF60" style="transform: scale(0.6);" />
 					</view>
 					<view class="flex-rowr">
-						<view class="flex-rowl">
+						<view @click="toAdd(item.id)" 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>
-						<view class="flex-rowl" style="margin-left: 50rpx;">
+						<view @click="fetchDeleteAddress(item.id)" class="flex-rowl" style="margin-left: 50rpx;">
 							<image src="@/static/images/ydd/cancel.png" mode="widthFix" style="width: 20rpx;"></image>
 							<text class="size-22 color-777 ml10">删除</text>
 						</view>
@@ -57,9 +54,9 @@
 		<view v-else class="flex-rowc">
 			<image class="icon-empty" src="../static/connectAddress/icon-empty.png" mode="widthFix"></image>
 		</view>
-		
+
 		<view class="footer-btn">
-			<view class="btn" @click="toAdd">
+			<view class="btn" @click="toAdd()">
 				新增接单地址
 			</view>
 		</view>
@@ -67,22 +64,26 @@
 </template>
 
 <script setup>
-	import { ref } from 'vue'
-	import { onShow } from '@dcloudio/uni-app'
+	import {
+		ref
+	} from 'vue'
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
 	import dayjs from 'dayjs'
-	import { getAddressList } from '@/api/address'
-	
+	import {
+		getAddressList,
+		deleteAddress
+	} from "@/api/address/address.js"
+
 	const list = ref([])
 
 	const fetchAddressList = async () => {
 		try {
-			// todo: 对接接口字段
-			list.value = await getAddressList()
-
-			console.log('--list', list.value)
-
+			let response = await getAddressList();
+			list.value = response.data || []
 		} catch (err) {
-			
+
 		}
 	}
 
@@ -94,17 +95,32 @@
 		return dateArr.map(date => dayjs(date).format('MM-DD')).join('、')
 	}
 
-	const toAdd = () => {
-		uni.navigateTo({
-			url: "/otherPages/authentication/connectAddress/detail"
-		})
+	const toAdd = (editId) => {
+		if(editId) {
+			uni.navigateTo({
+				url: `/otherPages/authentication/connectAddress/detail?id=${editId}`
+			})
+		}else {
+			uni.navigateTo({
+				url: '/otherPages/authentication/connectAddress/detail'
+			})
+		}
 	}
 	
+	const fetchDeleteAddress = async (id) => {
+		let response = await deleteAddress({ id });
+		if(response.code == 200) {
+			uni.showToast({
+				title: '删除成功!',
+				icon: "none"
+			})
+			fetchAddressList()
+		}
+	}
+
 	onShow(() => {
 		fetchAddressList()
 	})
-
-
 </script>
 
 <style lang="scss" scoped>
@@ -138,9 +154,9 @@
 		}
 	}
 
-	.text-ellipsis{
-		overflow:hidden; //超出的文本隐藏
-		text-overflow:ellipsis; //溢出用省略号显示
-		white-space:nowrap; //溢出不换行
+	.text-ellipsis {
+		overflow: hidden; //超出的文本隐藏
+		text-overflow: ellipsis; //溢出用省略号显示
+		white-space: nowrap; //溢出不换行
 	}
 </style>

pages.json

@@ -8,20 +8,7 @@
 			"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
-	"pages": [
-		{
-			"path": "pages/login/index",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/login/wxUserInfo",
-			"style": {
-				"navigationBarTitleText": "用户信息"
-			}
-		},
-		{
+	"pages": [{
 			"path": "pages/workbenchManage/index",
 			"style": {
 				"navigationBarTitleText": "工作台"
@@ -50,77 +37,90 @@
 			"style": {
 				"navigationBarTitleText": "测试"
 			}
+		},
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/login/wxUserInfo",
+			"style": {
+				"navigationBarTitleText": "用户信息"
+			}
 		}
 	],
 	"subPackages": [{
 			"root": "otherPages/authentication",
 			"pages": [{
-				"path": "list/index",
-				"style": {
-					"navigationBarTitleText": "伴宠师认证"
-				}
-			}, {
-				"path": "examination/start",
-				"style": {
-					"navigationBarTitleText": "伴宠师认证"
-				}
-			}, {
-				"path": "examination/base",
-				"style": {
-					"navigationBarTitleText": "基础考核"
-				}
-			}, {
-				"path": "examination/baseCompleted",
-				"style": {
-					"navigationBarTitleText": "伴宠师认证"
-				}
-			},
-			{
-				"path": "examination/train",
-				"style": {
-					"navigationBarTitleText": "培训考核"
-				}
-			}, {
-				"path": "examination/trainCompleted/index",
-				"style": {
-					"navigationBarTitleText": "伴宠师认证"
-				}
-			}, {
-				"path": "examination/errorDetail",
-				"style": {
-					"navigationBarTitleText": "伴宠师认证"
-				}
-			}, {
-				"path": "examination/end",
-				"style": {
-					"navigationBarTitleText": "伴宠师认证"
-				}
-			}, {
-				"path": "serve/index",
-				"style": {
-					"navigationBarTitleText": "服务信息"
-				}
-			}, {
-				"path": "serve/record",
-				"style": {
-					"navigationBarTitleText": "服务记录"
-				}
-			}, {
-				"path": "serve/upload",
-				"style": {
-					"navigationBarTitleText": "服务记录上传"
-				}
-			}, {
-				"path": "connectAddress/index",
-				"style": {
-					"navigationBarTitleText": "接单地址"
-				}
-			}, {
-				"path": "connectAddress/detail",
-				"style": {
-					"navigationBarTitleText": "新增接单地址"
+					"path": "list/index",
+					"style": {
+						"navigationBarTitleText": "伴宠师认证"
+					}
+				}, {
+					"path": "examination/start",
+					"style": {
+						"navigationBarTitleText": "伴宠师认证"
+					}
+				}, {
+					"path": "examination/base",
+					"style": {
+						"navigationBarTitleText": "基础考核"
+					}
+				}, {
+					"path": "examination/baseCompleted",
+					"style": {
+						"navigationBarTitleText": "伴宠师认证"
+					}
+				},
+				{
+					"path": "examination/train",
+					"style": {
+						"navigationBarTitleText": "培训考核"
+					}
+				}, {
+					"path": "examination/trainCompleted/index",
+					"style": {
+						"navigationBarTitleText": "伴宠师认证"
+					}
+				}, {
+					"path": "examination/errorDetail",
+					"style": {
+						"navigationBarTitleText": "伴宠师认证"
+					}
+				}, {
+					"path": "examination/end",
+					"style": {
+						"navigationBarTitleText": "伴宠师认证"
+					}
+				}, {
+					"path": "serve/index",
+					"style": {
+						"navigationBarTitleText": "服务信息"
+					}
+				}, {
+					"path": "serve/record",
+					"style": {
+						"navigationBarTitleText": "服务记录"
+					}
+				}, {
+					"path": "serve/upload",
+					"style": {
+						"navigationBarTitleText": "服务记录上传"
+					}
+				}, {
+					"path": "connectAddress/index",
+					"style": {
+						"navigationBarTitleText": "接单地址"
+					}
+				}, {
+					"path": "connectAddress/detail",
+					"style": {
+						"navigationBarTitleText": "新增接单地址"
+					}
 				}
-			}]
+			]
 		},
 		{
 			"root": "otherPages/binding",

pages/workbenchManage/components/modal.vue

@@ -3,7 +3,7 @@
 		<view class="slot-content box">
 			<image class="w-100" :src="state.info.partnerBackground"></image>
 			<view class="size-32 fw700 title text-c w-100">
-				{{state.info.prompt}}
+				<view v-html="configList?.succeed_join?.paramValueArea"></view>
 			</view>
 			<view class="size-32 fw700 w-100 text-c" v-html="state.info.promptText">
 			</view>
@@ -25,11 +25,20 @@
 		onMounted,
 		reactive
 	} from "vue"
+	import {
+		useStore
+	} from "vuex"
+	import { computed } from "vue"
+	
 	const props = defineProps({
 		open: false
 	})
+	const store = useStore();
 	const emit = defineEmits(['close'])
 	const show = ref(false)
+	const configList = computed(() => {
+		return store.getters.configList
+	})
 
 	watch(() => props.open, (val) => {
 		show.value = val

pages/workbenchManage/index.scss

@@ -14,10 +14,21 @@
       background: #FFF4E5;
       border-radius: 8rpx 8rpx 8rpx 8rpx;
       color: #A94F20;
-      image{
-        width: 123rpx;
-        height: 154rpx;
-      }
+      .explain {
+		  display: flex;
+		  
+		  .explain-text {
+			  
+			  .join {
+				  margin-top: 20rpx;
+			  }
+		  }
+		  
+		  .explain-img {
+			  width: 130rpx;
+			  height: auto;
+		  }
+	  }
     }
     .add-but{
       width: 164rpx;

pages/workbenchManage/index.vue

@@ -11,11 +11,14 @@
 			<view class="container-list">
 				<view class="mb28 col3 font32">合伙人工作台</view>
 				<!--  申请加入     -->
-				<view class="container-list-but font28" v-if="userInfo.userHh!==1">
-					<view class="flex flex-between">
-						<view>
-							<view class="font24 add-but col-white" @click="handleJoin(1)">申请加入 ></view>
+				<view class="container-list-but font28" v-if="userInfo.userHh != 1">
+					<view class="explain">
+						<view class="explain-text">
+							<text>{{ configList?.partner_work_statement?.paramValueText }}</text>
+							<view class="font24 add-but col-white join" @click="handleJoin(1)">申请加入 ></view>
 						</view>
+						<image class="explain-img" :src="configList?.partner_work_statement?.paramValueImage"
+							mode="aspectFit"></image>
 					</view>
 				</view>
 				<!-- 申请加入后       -->
@@ -31,12 +34,15 @@
 			<view class="container-list">
 				<view class="mb28 col3 font32">伴宠师工作台</view>
 				<!--  申请之前       -->
-				<view class="container-list-but" style="background: #FFECE5" v-if="userInfo.userBcs!==1">
-					<view class="flex flex-between">
-						<view>
-							<view class="font24 add-but col-white" style="background: #FF8343" @click="handleJoin(2)">
-								申请加入 ></view>
+				<view class="container-list-but" style="background: #FFECE5" v-if="userInfo.userBcs != 1">
+					<view class="explain">
+						<view class="explain-text">
+							<text>{{ configList?.pet_teacher_statement?.paramValueText }}</text>
+							<view class="font24 add-but col-white join" @click="handleJoin(2)"
+								style="background: #FF7935">申请加入 ></view>
 						</view>
+						<image class="explain-img" :src="configList?.pet_teacher_statement?.paramValueImage"
+							mode="aspectFit"></image>
 					</view>
 				</view>
 				<!--  申请之后      -->
@@ -88,11 +94,16 @@
 	onMounted(() => {
 		getBanner()
 		getpz()
-		console.log("userInfo", userInfo)
+		uni.navigateTo({
+		    url: '/otherPages/authentication/connectAddress/index'
+		});
 	})
 	const userInfo = computed(() => {
 		return store.getters.userInfo
 	})
+	const configList = computed(() => {
+		return store.getters.configList
+	})
 	onShow(() => {
 
 	})
@@ -117,6 +128,7 @@
 		}
 		const baseInfo = JSON.parse(info)
 		if (type === 1) {
+			// 加入合伙人工作台
 			joinHh({
 				appUserId: baseInfo.userId
 			}).then(res => {
@@ -124,6 +136,7 @@
 				changeBaseInfo(baseInfo.userId)
 			}).catch(() => {})
 		} else {
+			// 加入伴宠师工作台
 			joiBcs({
 				appUserId: baseInfo.userId
 			}).then(res => {

store/modules/system.js

@@ -1,4 +1,4 @@
-import { getConfigList } from '@/api/system'
+import { getConfigList } from '@/api/config/config.js'
 
 const system = {
   state: {