Bläddra i källkod

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

tanxue 2 veckor sedan
förälder
incheckning
aab0ef90d4
4 ändrade filer med 143 tillägg och 42 borttagningar
  1. 2 2
      config.js
  2. 19 3
      manifest.json
  3. 8 0
      pages/admin/Jiazheng/gerenZiliao.vue
  4. 114 37
      pages/admin/my/index.vue

+ 2 - 2
config.js

@@ -2,7 +2,7 @@
 // 切换环境后 注意 :map 要去对应manifest.json文件修改
 // 打正式包前一定要和后台确认版本号,修改appInfo.version,第一次1.0.1----2025-04-24
 let isPro = process.env.NODE_ENV === 'production'
-const devUrl = 'https://www.chengxiangjiaoyu.com/api/v10'
+const devUrl = 'https://kf1.mtavip.com/api'
 const proUrl = 'https://www.chengxiangjiaoyu.com/api/v10'
 const devKey = 'MZRBZ-Q6PKQ-THS5E-BOGKN-ZH4MQ-6YFWC'
 const proKey = 'VLOBZ-Q7XWB-YR4UP-NO4PH-EM7FS-G3BLR'
@@ -15,7 +15,7 @@ export default   {
     name: "",
 	
     // 应用版本
-    version: "1.0",
+    version: "1.0.5",
     // 应用logo
     logo: "/static/logo.png",
     // 官方网站

+ 19 - 3
manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__CB9D85D",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : 1,
+    "versionCode" : 7,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -36,7 +36,8 @@
         /* 模块配置 */
         "modules" : {
             "Camera" : {},
-            "Maps" : {}
+            "Maps" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -71,7 +72,16 @@
             },
             /* ios打包配置 */
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSLocationAlwaysUsageDescription" : "我们需要在使用应用时访问您的位置",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "我们需要访问您的位置来提供基于位置的服务",
+                    "NSLocationWhenInUseUsageDescription" : "我们需要在使用应用时访问您的位置,以便提供定位服务和相关功能",
+                    "NSMicrophoneUsageDescription" : "",
+                    "NSRemindersUsageDescription" : "",
+                    "NSUserTrackingUsageDescription" : ""
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -85,6 +95,12 @@
                     "tencent" : {
                         "key" : "VLOBZ-Q7XWB-YR4UP-NO4PH-EM7FS-G3BLR"
                     }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxd6a8954fa7b0f8a0",
+                        "UniversalLinks" : "https://cdnks.mtavip.com/mdist/#/login/"
+                    }
                 }
             },
             "splashscreen" : {

+ 8 - 0
pages/admin/Jiazheng/gerenZiliao.vue

@@ -676,6 +676,14 @@
 				if (!this.checkAllFields()) {
 					return false
 				}
+				if(this.formData.gender == 0){
+					uni.showToast({
+						title: "请选择性别",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
 				if (!this.formData.agree) {
 					uni.showToast({
 						title: "请勾选本人同意!",

+ 114 - 37
pages/admin/my/index.vue

@@ -12,11 +12,11 @@
 				<text>{{myInfoData.realName}}</text>
 				<view class="head-content-row-box" v-if="myInfoData.userName">
 					<icon class="tel-icon"></icon>
-					<text class="content-text" >{{myInfoData.userName}}</text>
+					<text class="content-text">{{myInfoData.userName}}</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="my-list-box">
 			<view class="list-row" @click="goToPage('grcj')">
 				<icon class="list-icon user-icon"></icon>
@@ -37,7 +37,8 @@
 		</view>
 		<!-- 底部区域 -->
 		<customTabbarClient :currentTab="3"></customTabbarClient>
-		<common-dialog ref="commonDialogRef" :title="exitTitle" :content="exitContent" @confirm-btn="exitBtn"></common-dialog>
+		<common-dialog ref="commonDialogRef" :title="exitTitle" :content="exitContent"
+			@confirm-btn="exitBtn"></common-dialog>
 		<shexiangDialogVue ref="shexiangRef" title="摄像头说明"></shexiangDialogVue>
 		<password-dialog ref="passwordDialogRef" @confirm-btn="passwordBtn"></password-dialog>
 		<image-dialog ref="imageDialogRef"></image-dialog>
@@ -47,25 +48,39 @@
 </template>
 
 <script setup>
-	import {toast} from "@/utils/common";
-	import {onLoad,onShow} from '@dcloudio/uni-app';
+	import {
+		toast
+	} from "@/utils/common";
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app';
 	import cacheManager from '@/utils/cacheManager.js';
-	import {getGlMineUser,getGlMineLogout,getGlPasswordUpdate} from '@/api/my.js'
-	import {reactive,ref} from "vue";
+	import {
+		getGlMineUser,
+		getGlMineLogout,
+		getGlPasswordUpdate
+	} from '@/api/my.js'
+	import {
+		reactive,
+		ref
+	} from "vue";
 	import customTabbarClient from "@/components/custom-tabbar/custom-tabbar-admin.vue"
 	import commonDialog from '@/components/dialog/commonDialog.vue';
 	import passwordDialog from './passwordDialog.vue';
 	import imageDialog from './imageDialog.vue';
 	import shexiangDialogVue from "@/components/dialog/shexiangDialog.vue";
 	import zhuapaiConfrimVue from "@/components/zhuapaiConfirm/index.vue";
-	import {useIsCanBack} from "@/store/isCanBack.js"
+	import {
+		useIsCanBack
+	} from "@/store/isCanBack.js"
 	let myInfoData = reactive({
 		jzName: '',
 		userImg: '',
 		realName: '',
 		idcard: '',
 		userName: '',
-		from:''
+		from: ''
 	});
 	const commonDialogRef = ref(null);
 	const passwordDialogRef = ref(null);
@@ -74,48 +89,108 @@
 	const zpRef = ref(null);
 	const exitContent = '你确定要执行这个操作吗?';
 	const exitTitle = '退出登录';
-	
+
 	const store = useIsCanBack();
-	
+
 	function getMyInit() {
 		getUserInfo();
 	}
 	// 获取用户头像
-	function goToPage(data){
+	function goToPage(data) {
 		switch (data) {
 			case 'grcj':
-			    uni.navigateTo({
-			    	url:'/pages/admin/my/myInfo?from=my'
-			    })
-			    break;
+				uni.navigateTo({
+					url: '/pages/admin/my/myInfo?from=my'
+				})
+				break;
 		}
 	}
-	function getUserInfo(){
+
+	function getUserInfo() {
 		getGlMineUser({}).then(res => {
-			myInfoData.userImg= res.data.icon;
+			myInfoData.userImg = res.data.icon;
 			myInfoData.realName = res.data.realName;
 			myInfoData.idcard = res.data.idcard;
 			myInfoData.userName = res.data.userName;
 			myInfoData.jzName = res.data.jzName;
 		})
 	}
-	function exitLogin(){
+
+	function exitLogin() {
 		commonDialogRef.value.handleShow();
-		
+
 	}
-	function xgmmBtn(){
+
+	function xgmmBtn() {
 		passwordDialogRef.value.handleShow();
 	}
-	
-	function ewmBtn(){
-		imageDialogRef.value.handleShow();
+
+	function ewmBtn() {
+		//imageDialogRef.value.handleShow();
+
+		if (!plus.runtime.isApplicationExist({
+				pname: 'com.tencent.mm'
+			})) {
+			uni.showToast({
+				title: '请先安装微信',
+				icon: 'none'
+			});
+			return;
+		}
+		uni.share({
+			provider: "weixin",
+			scene: "WXSceneSession",
+			type: 1,
+			summary: "我正在使用HBuilderX开发uni-app,赶紧跟我一起来体验!",
+			success: function(res) {
+				console.log("success:" + JSON.stringify(res));
+			},
+			fail: function(err) {
+				console.log("fail:" + JSON.stringify(err));
+			}
+		});
+		// uni.share({
+		// 	provider: "weixin",
+		// 	scene: "WXSceneSession", // 分享给好友
+		// 	type: 5, // 5表示小程序卡片
+		// 	summary: "专业的家政服务平台,为您提供优质服务",
+		// 	href: "https://www.baidu.com",
+		// 	title: "家政学小程序",
+		// 	imageUrl: "/static/share-thumb.jpg",
+		// 	miniProgram: {
+		// 		id: "wx3a4f7c01eb080d14", 
+		// 		path: "/pages/index/index",
+		// 		type: 0,
+		// 		webUrl: "https://www.baidu.com"
+		// 	},
+		// 	success: (res) => {
+		// 		console.log("分享成功:", res);
+		// 		uni.showToast({
+		// 			title: '分享成功',
+		// 			icon: 'success'
+		// 		});
+		// 	},
+		// 	fail: (err) => {
+		// 		console.log("分享失败:", err);
+		// 		let errorMsg = '分享失败';
+		// 		if (err.errMsg && err.errMsg.includes('未安装')) {
+		// 			errorMsg = '未安装微信';
+		// 		}
+		// 		uni.showToast({
+		// 			title: errorMsg,
+		// 			icon: 'none'
+		// 		});
+		// 	}
+		// });
+
+
 	}
-	
-	function passwordBtn(data){
-		console.log(data,'data');
+
+	function passwordBtn(data) {
+		console.log(data, 'data');
 		const opt = {
 			passwordOld: data.oldPassWord,
-			passwordNew: data.newPassWord, 
+			passwordNew: data.newPassWord,
 		}
 		getGlPasswordUpdate(opt).then(res => {
 			if (res.data) {
@@ -126,7 +201,8 @@
 			}
 		})
 	}
-	function exitBtn(){
+
+	function exitBtn() {
 		getGlMineLogout().then(res => {
 			toast('退出登录成功')
 			cacheManager.clearAll();
@@ -139,33 +215,34 @@
 			store.setIsCanBack(false)
 		})
 	}
-	
+
 	function showMessageDl() {
 		console.log(shexiangRef.value)
 		shexiangRef.value.handleShow()
 	}
-	
+
 	function showZhuaPaiConfirm() {
 		zpRef.value.showDialog()
 	}
-	
+
 	function zpConfirmSuccess() {
 		zpRef.value.showDialog()
 	}
+
 	function zpConfirmError() {
 		uni.showToast({
 			title: '摄像头唤起异常',
 			icon: 'none'
 		})
 	}
-	
+
 	onLoad(() => {
-    
+
 	})
 
-  onShow(() => {
-	getMyInit()
-  })
+	onShow(() => {
+		getMyInit()
+	})
 </script>
 
 <style>