Merge branch '2025北京诚祥App' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥App

components/dialog/shengjiDialogIos.vue

@@ -0,0 +1,71 @@
+<template>
+	<uni-popup ref="commonPopup" :animation="false" :is-mask-click="false"
+	 mask-background-color="rgba(0, 0, 0, 0.4)">
+	 <view class="phone-common-dialog">
+		<view class="common-body-box">
+			<view class="common-title">{{title}}</view>
+			<view class="common-content" :class="dialogContentClass">{{content}}</view>
+			<view class="common-btn-box">
+				<view class="not-confirm-btn" v-if="showQuxiao" @click="handleClose">{{notBtn}}</view>
+				<view class="confirm-btn" @click="confirmBtn">{{okBtn}}</view>
+			</view>
+		</view>
+	 </view>
+	</uni-popup>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	const props = defineProps({
+	  title: {
+	    type: String,
+	    default: ''
+	  },
+	  content: {
+	    type: String,
+		require: true,
+	    default: ''
+	  },
+	  dialogContentClass: {
+	    type: String,
+	  	require: true,
+	    default: 'content-center-class'
+	  },
+	  showQuxiao: {
+		  type: Boolean,
+		  default: true
+	  },
+	  notBtn: {
+	    type: String,
+	  	require: true,
+	    default: '取消'
+	  },
+	  okBtn: {
+	    type: String,
+	  	require: true,
+	    default: '确认'
+	  },
+	});
+	const commonPopup = ref(null); // 索引
+	const $emit = defineEmits(['confirm-btn'])
+	// 打开弹窗
+	function handleShow() {
+		commonPopup.value.open();
+	}
+	// 取消
+	function handleClose() {
+		commonPopup.value.close();
+	}
+	// 确认
+	function confirmBtn(){
+		$emit('confirm-btn');
+		commonPopup.value.close();
+	}
+	defineExpose({
+			handleShow,
+			handleClose
+		})
+</script>
+
+<style>
+</style>

config.js

@@ -7,10 +7,10 @@ const proUrl = 'https://www.chengxiangjiaoyu.com/api/v10'
 const devKey = 'MZRBZ-Q6PKQ-THS5E-BOGKN-ZH4MQ-6YFWC'
 const proKey = 'VLOBZ-Q7XWB-YR4UP-NO4PH-EM7FS-G3BLR'
 export default   {
-  mianshiUrl: `https://ceshi.chengxiangjiaoyu.com/dist/h5/room`, // 面试外链地址
-  haibaoUrl: `https://ceshi.chengxiangjiaoyu.com/dist/h5/share/haibao`, // 海报外链地址
-  jianliUrl: `https://ceshi.chengxiangjiaoyu.com/dist/h5/share/jianli`, // 建立外链地址
-  hetongType: 2, // 分享小程序 合同修改  0-正式版； 1-测试版； 2-体验版。 默认值为0。
+  mianshiUrl: `https://www.chengxiangjiaoyu.com/dist/h5/room`, // 面试外链地址
+  haibaoUrl: `https://www.chengxiangjiaoyu.com/dist/h5/share/haibao`, // 海报外链地址
+  jianliUrl: `https://www.chengxiangjiaoyu.com/dist/h5/share/jianli`, // 建立外链地址
+  hetongType: 0, // 分享小程序 合同修改  0-正式版； 1-测试版； 2-体验版。 默认值为0。
   baseUrl: isPro?proUrl:devUrl,
   mapKey:isPro?proKey:devKey,
   // 应用信息

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__CB9D85D",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : 7,
+    "versionCode" : 8,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -79,7 +79,13 @@
                     "NSLocationWhenInUseUsageDescription" : "我们需要在使用应用时访问您的位置，以便提供定位服务和相关功能",
                     "NSMicrophoneUsageDescription" : "",
                     "NSRemindersUsageDescription" : "",
-                    "NSUserTrackingUsageDescription" : ""
+                    "NSUserTrackingUsageDescription" : "",
+                    "NSPhotoLibraryUsageDescription" : "我们需要访问您的相册来上传服务需求相关的图片",
+                    "NSPhotoLibraryAddUsageDescription" : "我们需要保存图片到您的相册以便您长期保存服务记录",
+                    "NSCameraUsageDescription" : "该应用程序会在开启您的相机，用于拍照上传头像。",
+                    "NSBluetoothPeripheralUsageDescription" : "是否允许此App使用蓝牙？",
+                    "NSBluetoothAlwaysUsageDescription" : "是否允许此App使用蓝牙？",
+                    "NSCalendarsUsageDescription" : "是否允许此App使用日历？"
                 },
                 "idfa" : false
             },

pages/Login/components/adminloginBox.vue

@@ -5,7 +5,7 @@
 				<icon class="bjcx-logo-box"></icon>
 				<view class="bjcx-logo-title">家政学</view>
 			</view>
-			
+
 			<view class="login-input-box">
 				<icon class="user-icon"></icon>
 				<input class="login-input" type="text" v-model="userName" placeholder="请输入手机号" @input="userInputChange">
@@ -13,17 +13,15 @@
 			</view>
 			<view class="login-input-box">
 				<icon class="tel-icon"></icon>
-				<input class="login-input" placeholder="请输入密码" v-model="password" :password="showPassword" 
-				 @input="passwordInputChange"/>
-				<text class="login-eye" :class="[!showPassword ? 'uni-eye-active' : '']"
-					@click="changePassword"></text>
+				<input class="login-input" placeholder="请输入密码" v-model="password" :password="showPassword"
+					@input="passwordInputChange" />
+				<text class="login-eye" :class="[!showPassword ? 'uni-eye-active' : '']" @click="changePassword"></text>
 				<view class="close-btn" v-if="clearPwIcon" @click="clearPw"></view>
 			</view>
 			<!-- 协议勾选框和按钮 -->
 			<view class="agreement-checkbox-box">
 				<checkbox-group @change="handleAgreementChange">
-					<checkbox class="agreement-checkbox-input" color="#FFFFFF" value="agree"
-						:checked="isAgreed" />
+					<checkbox class="agreement-checkbox-input" color="#FFFFFF" value="agree" :checked="isAgreed" />
 				</checkbox-group>
 				<view class="agreement-text-box">
 					登录注册代表您已同意<view class="agreement-text" @click="agreeBtn('yhxy')">《家政学用户协议》</view>和<view
@@ -31,55 +29,65 @@
 				</view>
 			</view>
 			<button type="default" @click="handleLogin" class="phone-green-btn login-btn">登录</button>
-		<!-- 已加密的:{{lliPassword}} -->
+			<!-- 已加密的:{{lliPassword}} -->
 		</view>
-		<passwordLli ref="passLLiRef" :password="password" @lli-password="onLliPassword" />
-		<tip-dialog ref="tipDialogRef" :title="tipTitle" :content="tipContent"></tip-dialog>
-		
+		<passwordLli ref="passLLiRef" :password="password" @lli-password="onLliPassword" />
+		<shengjiDialogIos ref="tipDialogRef" :showQuxiao="false" :title="tipTitle" :content="tipContent" @confirm-btn="BanbenConfirmBtn"
+			okBtn="确认"></shengjiDialogIos>
 		<!-- 安卓强制升级 -->
-		<shengJiDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :showTip="true"
-			:notClose="true" :content="tipContentAndroid">
+		<shengJiDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+			:showTip="true" :notClose="true" :content="tipContentAndroid">
 		</shengJiDialog>
-		
 		<!-- 用户协议及隐私保护 -->
-		<common-dialog ref="commonDialogRef" :title="yhxyTitle" :content="yhxyContent"
-			@confirm-btn="yhxyBtn" okBtn="同意并登录" notBtn="不同意"></common-dialog>
+		<common-dialog ref="commonDialogRef" :title="yhxyTitle" :content="yhxyContent" @confirm-btn="yhxyBtn"
+			okBtn="同意并登录" notBtn="不同意"></common-dialog>
 	</view>
 </template>
 
 <script setup>
-	import {onShow} from '@dcloudio/uni-app';
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
 	import cacheManager from '@/utils/cacheManager.js'
 	import * as httpApi from "@/api/login.js"
 	import passwordLli from "@/components/password-lli/password-lli.vue";
-	import {ref} from "vue"
-	import {toast} from "@/utils/common";
-	import {useIsCanBack} from "@/store/isCanBack.js"
+	import {
+		ref
+	} from "vue"
+	import {
+		toast
+	} from "@/utils/common";
+	import {
+		useIsCanBack
+	} from "@/store/isCanBack.js"
 	import config from '../../../config.js'
 	import tipDialog from '@/components/dialog/tipDialog.vue';
 	import shengJiDialog from '@/components/dialog/shengJiDialog.vue';
-	import {useVersionUpdate} from "@/utils/versionUpdate.js";
-	import commonDialog from '@/components/dialog/commonDialog.vue';
-	
+	import {
+		useVersionUpdate
+	} from "@/utils/versionUpdate.js";
+	import commonDialog from '@/components/dialog/commonDialog.vue';
+	import shengjiDialogIos from '@/components/dialog/shengjiDialogIos.vue';
+
 	const userName = ref('') // 用户名
 	const password = ref('') // 密码
 	const lliPassword = ref('') // 加密后的密码
 	const passLLiRef = ref(null)
-	const showPassword= ref(true)
-	const clearTelIcon= ref(false)
-	const clearPwIcon= ref(false)
+	const showPassword = ref(true)
+	const clearTelIcon = ref(false)
+	const clearPwIcon = ref(false)
 	const isAgreed = ref(false)
-	
+
 	const store = useIsCanBack();
 	const version = config.appInfo.version;
 	const tipDialogRef = ref(null);
 	const tipTitle = '升级提醒';
 	const tipContent = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！';
 	const tipContentAndroid = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
-	
+
 	const tipDialogRef2 = ref(null)
 	const updateUrl = ref(null)
-	
+
 	const handleAgreementChange = (event) => {
 		if (event.detail.value[0] === 'agree') {
 			isAgreed.value = true;
@@ -87,155 +95,158 @@
 			isAgreed.value = false;
 		}
 	}
-	
+
 	const commonDialogRef = ref(null);
 	const yhxyContent = '我已阅读并同意《家政学用户协议》和《家政学隐私政策》';
 	const yhxyTitle = '用户协议及隐私保护';
-	
+
 	const {
 		initDownload
 	} = useVersionUpdate()
-	
+
 	const agreeBtn = (data) => {
 		if (data === 'yhxy') {
 			uni.navigateTo({
-			  url: `/pages/admin/my/yhxy?from=login`
+				url: `/pages/admin/my/yhxy?from=login`
 			})
 		} else {
 			uni.navigateTo({
-			  url: `/pages/admin/my/yszc?from=login`
+				url: `/pages/admin/my/yszc?from=login`
 			})
 		}
 	};
-	
+
 	function BanbenConfirmBtn() {
 		const systemInfo = uni.getSystemInfoSync();
-			if (systemInfo.platform == 'ios') {
-				const appStoreUrl = 'itms-apps://itunes.apple.com/app/6754060756'
-				plus.runtime.openURL(appStoreUrl)
-			} else {
-				initDownload(updateUrl.value)
-			}
-	}	
-	
+		if (systemInfo.platform == 'ios') {
+			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6754060756'
+			plus.runtime.openURL(appStoreUrl)
+
+		} else {
+			initDownload(updateUrl.value)
+		}
+	}
+
 	// 加密
 	function handleUpdateLLiPassword() {
 		passLLiRef.value.lliPassword();
 	}
+
 	function onLliPassword(password) {
-		console.log('onLliPassword',password)
+		console.log('onLliPassword', password)
 		lliPassword.value = password;
 	}
-	
+
 	// 手机号校验
-	function userInputChange(event){
+	function userInputChange(event) {
 		if (event.detail.value.length > 0) {
 			clearTelIcon.value = true;
 		} else {
 			clearTelIcon.value = false;
 		}
 	}
-	
+
 	// 密码校验
-	function passwordInputChange(event){
+	function passwordInputChange(event) {
 		if (event.detail.value.length > 0) {
 			clearPwIcon.value = true;
 		} else {
 			clearPwIcon.value = false;
 		}
 	}
-	
+
 	// 清除手机号
-	function clearTel(){
+	function clearTel() {
 		userName.value = '';
 		clearTelIcon.value = false;
 	}
-	
+
 	// 清除密码
-	function clearPw(){
+	function clearPw() {
 		password.value = '';
 		clearPwIcon.value = false;
 	}
 
 	// 密码显隐
 	function changePassword() {
-      showPassword.value = !showPassword.value;
-    }
-	
+		showPassword.value = !showPassword.value;
+	}
+
 	// 登录
 	function handleLogin() {
-		if(userName.value.length ===0){
+		if (userName.value.length === 0) {
 			toast('请输入手机号！')
 			return
 		}
-		
-		if(password.value.length ===0){
+
+		if (password.value.length === 0) {
 			toast('请输入密码！')
 			return
 		}
-		if(!isAgreed.value){
+		if (!isAgreed.value) {
 			commonDialogRef.value.handleShow();
 			return
 		}
-		
+
 		// 去除 userName 两端的空格
 		const trimmedUserName = userName.value;
 		const trimmedPassword = lliPassword.value;
-		
-	
+
+
 		httpApi.login({
 			// type 1app 2为H5
-			type:1,
+			type: 1,
 			userName: trimmedUserName,
 			password: lliPassword.value,
 		}).then(res => {
 			// 2为家政管理员
-			if(res.data.type ===2 ||res.data.type ===5){
-			
+			if (res.data.type === 2 || res.data.type === 5) {
+
 				cacheManager.set('auth', res.data)
 				store.setIsCanBack(false)
 				// 页面跳转
 				gotoPage();
-			}else{
+			} else {
 				toast('登录失败，您的身份有误，请联系管理员。')
 			}
 		}).catch(err => {
 			store.setIsCanBack(true)
 		})
 	}
-	
-	function yhxyBtn(){
+
+	function yhxyBtn() {
 		isAgreed.value = true;
 		handleLogin()
 	}
 	// 跳转
-	function gotoPage(){
-        uni.navigateTo({
-          url: `/pages/admin/ShouYe/shouye`
-        })
-		}
-		
-	function getLoginInit(){
+	function gotoPage() {
+		uni.navigateTo({
+			url: `/pages/admin/ShouYe/shouye`
+		})
+	}
+
+	function getLoginInit() {
 		httpApi.getVersion({}).then(res => {
-	
+
 			if (version != res.data.version) {
 				updateUrl.value = res.data.updateUrl
-				
+
 				const systemInfo = uni.getSystemInfoSync();
 				if (systemInfo.platform == 'ios') {
-				
+					tipDialogRef.value.handleShow();
 				} else {
 					tipDialogRef2.value.handleShow();
+				
 				}
 			}
 		})
 	}
-	
+
 	onShow(() => {
 		getLoginInit()
-	})	
+	})
 </script>
 
 <style>
 
-</style>
+</style>

pages/admin/ShouYe/shouye.vue

@@ -83,7 +83,7 @@
 				<icon class="index-icon kc-icon"></icon>
 				<text>课程管理</text>
 			</view>
-			
+
 		</view>
 		<view class="card-list-box">
 			<view class="card-list-title">合同管理</view>
@@ -99,7 +99,7 @@
 				<icon class="index-icon sfht-icon"></icon>
 				<text>三方合同</text>
 			</view>
-			
+
 		</view>
 		<view class="card-list-box">
 			<view class="card-list-title">其他服务</view>
@@ -114,8 +114,8 @@
 		</view>
 		<!-- 页面底端 -->
 		<customTabbarAdminVue :current-tab="0"></customTabbarAdminVue>
-		<tip-dialog ref="tipDialogRef" :title="tipTitle" :content="tipContent"></tip-dialog>
-
+		<shengjiDialogIos ref="tipDialogRef" :showQuxiao="false" :title="tipTitle" :content="tipContent"
+			@confirm-btn="BanbenConfirmBtn" okBtn="确认"></shengjiDialogIos>
 		<!-- 安卓强制升级 -->
 		<shengJiDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
 			:showTip="true" :notClose="true" :content="tipContentAndroid">
@@ -141,7 +141,7 @@
 		getGlIndexInfo,
 		getIndexKechengList
 	} from '@/api/shouye.js'
-	import tipDialog from '@/components/dialog/tipDialog.vue';
+	import shengjiDialogIos from '@/components/dialog/shengjiDialogIos.vue';
 	import config from '../../../config.js'
 	import * as httpApi from "@/api/login.js"
 	import shengJiDialog from '@/components/dialog/shengJiDialog.vue';
@@ -174,9 +174,9 @@
 		jzName: '',
 		kechengCount: 0, //剩余课程数量
 		kechengUsed: 0, //售出课程数量
-		status:null,// 合同状态：0待签字，1审核中，2生效,3失效
-		jzHtId:null,
-		sfCount:null,
+		status: null, // 合同状态：0待签字，1审核中，2生效,3失效
+		jzHtId: null,
+		sfCount: null,
 	});
 	const swiperInfo = ref([]);
 	const dotStyle = reactive({
@@ -190,13 +190,14 @@
 	});
 
 	const goToExternalPage = () => {
-		 // const externalUrl = 'https://www.baidu.com/'
-	  const externalUrl = 'https://kf2.mtavip.com/aliyunZhibo/index.html?roomId=900803&appId=dehjl65ff&uid=1145&userName=123456&token=000eJxjYGBQkNwl6RPe+n+pxsfW/3yNTNsT46azfzZTMppyaIvoS6VnpxkYGDhSUjOycsxM0zLjuSb7xF8/kZkQIwoUZ7M0MLAwMAayWAwNTUwZGBlGwZACAEbtGUY='; // 替换为你的 H5 地址
+		// const externalUrl = 'https://www.baidu.com/'
+		const externalUrl =
+			'https://kf2.mtavip.com/aliyunZhibo/index.html?roomId=900803&appId=dehjl65ff&uid=1145&userName=123456&token=000eJxjYGBQkNwl6RPe+n+pxsfW/3yNTNsT46azfzZTMppyaIvoS6VnpxkYGDhSUjOycsxM0zLjuSb7xF8/kZkQIwoUZ7M0MLAwMAayWAwNTUwZGBlGwZACAEbtGUY='; // 替换为你的 H5 地址
 
-	  // 使用 encodeURIComponent 防止 URL 中含特殊字符（如 ? & =）
-	  uni.navigateTo({
-		url: `/pages/admin/webview/index?url=${encodeURIComponent(externalUrl)}`
-	  });
+		// 使用 encodeURIComponent 防止 URL 中含特殊字符（如 ? & =）
+		uni.navigateTo({
+			url: `/pages/admin/webview/index?url=${encodeURIComponent(externalUrl)}`
+		});
 	};
 
 
@@ -211,7 +212,7 @@
 	}
 
 	onLoad((options) => {
-		
+
 	})
 
 	function initPage() {
@@ -242,8 +243,8 @@
 			indexInfoData.jzName = res.data.jzName;
 			indexInfoData.kechengCount = res.data.kechengCount;
 			indexInfoData.kechengUsed = res.data.kechengUsed;
-			indexInfoData.status =res.data.status;
-			indexInfoData.jzHtId =res.data.jzHtId;
+			indexInfoData.status = res.data.status;
+			indexInfoData.jzHtId = res.data.jzHtId;
 			indexInfoData.sfCount = res.data.sfCount;
 		})
 	}
@@ -267,12 +268,12 @@
 	// 获取用户头像
 	function goToPage(data) {
 		switch (data) {
-			case  'kscx':
+			case 'kscx':
 				uni.redirectTo({
 					url: '/pages/admin/Kaoshi/checkList'
 				})
-			break;
-			
+				break;
+
 			case 'jz':
 				uni.redirectTo({
 					url: '/pages/admin/Jiazheng/index'
@@ -324,37 +325,37 @@
 				})
 				break;
 			case 'zjkh':
-			uni.redirectTo({
-				url: '/pages/admin/kehu/kehuList'
-			})
-			break;
-			// 家政合同	
+				uni.redirectTo({
+					url: '/pages/admin/kehu/kehuList'
+				})
+				break;
+				// 家政合同	
 			case 'jzht':
-				if(indexInfoData.status === 0){
+				if (indexInfoData.status === 0) {
 					uni.navigateTo({
 						url: `/pages/admin/Hetong/Hetong?id=${indexInfoData.jzHtId}`
 					})
-				}else{
+				} else {
 					uni.redirectTo({
 						url: '/pages/admin/Hetong/HetongList'
 					})
 				}
 				break;
 			case 'sfht':
-			uni.navigateTo({
-				url: '/pages/admin/Hetong/sanfangHetong?from=shouye'
-			})
-			break;
+				uni.navigateTo({
+					url: '/pages/admin/Hetong/sanfangHetong?from=shouye'
+				})
+				break;
 			case 'ycms':
-			uni.navigateTo({
-				url: '/pages/admin/mianshi/index'
-			})
-			break;
+				uni.navigateTo({
+					url: '/pages/admin/mianshi/index'
+				})
+				break;
 			case 'zyhb':
-			uni.navigateTo({
-				url: '/pages/admin/haibao/index'
-			})
-			break;
+				uni.navigateTo({
+					url: '/pages/admin/haibao/index'
+				})
+				break;
 			case 'demo':
 				uni.redirectTo({
 					url: '/pages/demo/demo2'
@@ -381,7 +382,7 @@
 				// tipDialogRef2.value.handleShow();
 				const systemInfo = uni.getSystemInfoSync();
 				if (systemInfo.platform == 'ios') {
-
+					tipDialogRef.value.handleShow();
 				} else {
 					tipDialogRef2.value.handleShow();
 				}