chenjj пре 4 месеци
родитељ
комит
b605ae6cae
5 измењених фајлова са 47 додато и 47 уклоњено
  1. 7 7
      components/CustomTabBar/index.vue
  2. 4 4
      pages/index.vue
  3. 7 7
      pages/mine.vue
  4. 27 27
      pages_home/pages/register/index.vue
  5. 2 2
      utils/adress.js

+ 7 - 7
components/CustomTabBar/index.vue

@@ -92,13 +92,13 @@ export default {
                     "text": "分类",
                      key:'class'
                 },
-                {
-                    "pagePath": "/pages/release",
-                    "iconPath": "/static/images/tabbar/class.png",
-                    "selectedIconPath": "/static/images/tabbar/class_.png",
-                    "text": "发布",
-                    key:'release'
-                },
+                // {
+                //     "pagePath": "/pages/release",
+                //     "iconPath": "/static/images/tabbar/class.png",
+                //     "selectedIconPath": "/static/images/tabbar/class_.png",
+                //     "text": "发布",
+                //     key:'release'
+                // },
                 // {
                 //     "pagePath": "/pages/chat",
                 //     "iconPath": "/static/images/tabbar/class.png",

+ 4 - 4
pages/index.vue

@@ -84,7 +84,7 @@ import {
 } from '@/utils/dict.js';
 import { chooseLocationInit,locateTheCurrentAddress } from '@/utils/adress'
 import CustomTabBar from '@/components/CustomTabBar/index.vue'
-
+import {regionAddresstree} from '@/api/home.js'
 
 
 
@@ -278,9 +278,9 @@ onShow(() => {
 
 })
 
-onMounted(() => {
-	
-	locateTheCurrentAddress().then(res => {
+onMounted(async() => {
+	const res_dara = await regionAddresstree();
+	locateTheCurrentAddress(res_dara.data).then(res => {
 		console.log('locateTheCurrentAddress',res);
 		data.address = res;
 		settingAddress();

+ 7 - 7
pages/mine.vue

@@ -159,16 +159,16 @@ const userType = uni.getStorageSync('userType') //读取本地存储
 
 const adminList = ref(
 	[
-		// {
-		// 	name: '差评申述',
-		// 	iconName: 'chat',
-		// 	page: '/pages_mine/pages/bad/index'
-		// },
 		{
-			name: '资质申请',
+			name: '差评申述',
 			iconName: 'chat',
-			page: '/pages_home/pages/qualifications/index'
+			page: '/pages_mine/pages/bad/index'
 		},
+		// {
+		// 	name: '资质申请',
+		// 	iconName: 'chat',
+		// 	page: '/pages_home/pages/qualifications/index'
+		// },
 		{
 			name: '帮助与客服',
 			iconName: 'kefu-ermai',

+ 27 - 27
pages_home/pages/register/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="register-main">
 		<view class="register-user-info">
-			<FontTitle title="请完成注册信息填报" />
+			<FontTitle title="基本信息" />
 			<CustForm :column="com_column" ref="cust_form_ref" :isCode="isAdd" />
 		</view>
-		<!-- <view class="register-card">
+		<view class="register-card">
 
 			<view class="info-list">
 				<view class="font-title">服务类别( {{ serviceOptions.length }} )</view>
@@ -65,7 +65,7 @@
 
 
 			</view>
-		</view> -->
+		</view>
 
 		<view class="register-card" v-if="details.appStatus === '3'">
 			<view class="font-title">驳回原因</view>
@@ -235,34 +235,34 @@ function onSubmit() {
 				}
 			}
 
-			// if (!(serviceKeys.threeKeyname || serviceKeys.itemKeyname || serviceKeys.classKeyname)) {
-			// 	uni.showToast({
-			// 		title: '请选择服务',
-			// 		icon: 'none'
-			// 	})
-			// 	return
-			// }
-			// if (!serviceKeys.time) {
-			// 	uni.showToast({
-			// 		title: '请选择服务时长',
-			// 		icon: 'none'
-			// 	})
-			// 	return
-			// }
-			// if (!serviceKeys.price) {
-			// 	uni.showToast({
-			// 		title: '请输入服务价格',
-			// 		icon: 'none'
-			// 	})
-			// 	return
-			// }
+			if (!(serviceKeys.threeKeyname || serviceKeys.itemKeyname || serviceKeys.classKeyname)) {
+				uni.showToast({
+					title: '请选择服务',
+					icon: 'none'
+				})
+				return
+			}
+			if (!serviceKeys.time) {
+				uni.showToast({
+					title: '请选择服务时长',
+					icon: 'none'
+				})
+				return
+			}
+			if (!serviceKeys.price) {
+				uni.showToast({
+					title: '请输入服务价格',
+					icon: 'none'
+				})
+				return
+			}
 
 			const parmas = {
 				serviceCategory: data.value.key,
 				...file_url,
-				// businessManagementId: serviceKeys.threeKey || serviceKeys.itemKey || serviceKeys.classKey,
-				// businessPrice: serviceKeys.price,
-				// businessDuration: serviceKeys.time
+				businessManagementId: serviceKeys.threeKey || serviceKeys.itemKey || serviceKeys.classKey,
+				businessPrice: serviceKeys.price,
+				businessDuration: serviceKeys.time
 			};
 			for (const key in res) {
 				parmas[key] = key == 'sex' ? sex_status[res[key]] : res[key];

+ 2 - 2
utils/adress.js

@@ -85,7 +85,7 @@ const citySelectorNavigateTo = (city) => {
 
 }
 
-function locateTheCurrentAddress(){
+function locateTheCurrentAddress(ad_array){
   return new Promise((resolve, reject) => { 
       wx.getFuzzyLocation({
         type: 'gcj02',
@@ -98,7 +98,7 @@ function locateTheCurrentAddress(){
               console.log(res.result);
               const {address_component,formatted_addresses} =  res.result;
               const {province,city,district} = address_component;
-              const handlecityData = getCityCode([province,city,district].join(' '))
+              const handlecityData = getCityCode([province,city,district].join(' '),ad_array)
               resolve({
                 name:formatted_addresses.standard_address,
                 cityCode:handlecityData,