Browse Source

个人中心背景修改、学员合同签署优化

学习?学个屁 1 month ago
parent
commit
c7bfb629e9

+ 3 - 4
node_modules/.vue-global-types/vue_3.5_0.d.ts

@@ -5,10 +5,9 @@ export {};
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('vue').unref;
 	const __VLS_placeholder: any;
+	const __VLS_intrinsics: import('vue/jsx-runtime').JSX.IntrinsicElements;
 
-	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
-	type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements;
-	type __VLS_Element = import('vue/jsx-runtime').JSX.Element;
+	type __VLS_Elements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
 	type __VLS_GlobalComponents = import('vue').GlobalComponents;
 	type __VLS_GlobalDirectives = import('vue').GlobalDirectives;
 	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
@@ -31,7 +30,7 @@ export {};
 		? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
 		: T extends (props: infer P, ...args: any) => any ? P
 		: {};
-	type __VLS_FunctionalComponent<T> = (props: (T extends { $props: infer Props } ? Props : {}) & Record<string, unknown>, ctx?: any) => __VLS_Element & {
+	type __VLS_FunctionalComponent<T> = (props: (T extends { $props: infer Props } ? Props : {}) & Record<string, unknown>, ctx?: any) => import('vue/jsx-runtime').JSX.Element & {
 		__ctx?: {
 			attrs?: any;
 			slots?: T extends { $slots: infer Slots } ? Slots : Record<string, any>;

+ 1 - 1
src/pages/index/courseDetail/index.vue

@@ -104,7 +104,7 @@
 				<view class="appraise-info" v-for="item in appraiseList.records" :key="item.id">
 					<view class="a-user-info">
 						<view class="info">
-							<image v-if="item.isAnonymous == 0" src="@/static/default-header.png" mode=""></image>
+							<image v-if="item.isAnonymous == 0" src="@/static/header.png" mode=""></image>
 							<image v-else :src="item.avatar" mode=""></image>
 							<view class="name">{{ item.username }}</view>
 						</view>

+ 1 - 1
src/pages/index/detail/components/appraise.vue

@@ -13,7 +13,7 @@
 		<view class="appraise-info" v-for="item in listData.records" :key="item.id">
 			<view class="a-user-info">
 				<view class="info">
-					<image v-if="item.isAnonymous == 0" src="@/static/default-header.png" mode=""></image>
+					<image v-if="item.isAnonymous == 0" src="@/static/header.png" mode=""></image>
 					<image v-else :src="item.avatar" mode=""></image>
 					<view class="name">{{ item.username }}</view>
 				</view>

+ 1 - 1
src/pages/index/detail/components/instructor.vue

@@ -9,7 +9,7 @@
 				<view class="swiper-inner" v-for="(item, idx) in instrctorList" :key="idx"
 					@click="RouterUtils.to_page(`/pages/index/instructorDetail/index?id=${item.id}`)">
 					<view class="header-img">
-						<image v-if="item.isAnonymous == 0" src="@/static/default-header.png" mode=""></image>
+						<image v-if="item.isAnonymous == 0" src="@/static/header.png" mode=""></image>
 						<image v-else :src="item.avatar" mode=""></image>
 						<image src="/src/static/badge.png" mode=""></image>
 					</view>

+ 2 - 1
src/pages/index/detail/index.vue

@@ -91,7 +91,7 @@
 
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue';
-import { RouterUtils, _previewImage } from '@/utils/util';
+import { RouterUtils, _previewImage,TipsUtils } from '@/utils/util';
 import { http } from '@/utils/http'
 import zzxNavbar from '@/components/zzx-navbar/zzx-navbar.vue';
 import zsEmpty from '@/components/zs-empty/index.vue'
@@ -149,6 +149,7 @@ const get_placeInfo = () => {
 }
 
 const openphone = () => {
+	if(!detailInfo.value.phone) return TipsUtils.tips_toast('暂无联系电话')
 	uni.makePhoneCall({
 		phoneNumber: detailInfo.value.phone
 	});

+ 1 - 0
src/pages/index/eventsDetail/index.vue

@@ -357,6 +357,7 @@ const open_map = () => {
 
 // 拨打电话
 const open_phone = () => {
+	if(!eventsInfoObj.value.phone) return TipsUtils.tips_toast('暂无联系电话')
 	uni.makePhoneCall({
 		phoneNumber: eventsInfoObj.value.phone
 	});

+ 3 - 2
src/pages/index/gymDetail/index.vue

@@ -209,7 +209,7 @@
 					<view class="swiper-inner" v-for="item in detailInfo.instructorVOList" :key="item.id"
 						@click="RouterUtils.to_page(`/pages/index/instructorDetail/index?id=${item.id}`)">
 						<view class="header-img">
-							<image v-if="item.isAnonymous == 0" src="@/static/default-header.png" mode=""></image>
+							<image v-if="item.isAnonymous == 0" src="@/static/header.png" mode=""></image>
 							<image v-else :src="item.avatar" mode=""></image>
 							<image src="/src/static/badge.png" mode=""></image>
 						</view>
@@ -235,7 +235,7 @@
 			<view class="appraise-info" v-for="item in appraiseList.records" :key="item.id">
 				<view class="a-user-info">
 					<view class="info">
-						<image v-if="item.isAnonymous == 0" src="@/static/default-header.png" mode=""></image>
+						<image v-if="item.isAnonymous == 0" src="@/static/header.png" mode=""></image>
 						<image v-else :src="item.avatar" mode=""></image>
 						<view class="name">{{ item.username }}</view>
 					</view>
@@ -431,6 +431,7 @@ const open_map = () => {
 
 // 拨打电话
 const open_phone = () => {
+	if(!detailInfo.value.phone) return TipsUtils.tips_toast('暂无联系电话')
 	uni.makePhoneCall({
 		phoneNumber: detailInfo.value.phone
 	});

+ 1 - 1
src/pages/index/instructorDetail/index.vue

@@ -94,7 +94,7 @@
 			<view class="appraise-info" v-for="item in appraiseList.records" :key="item.id">
 				<view class="a-user-info">
 					<view class="info">
-						<image v-if="item.isAnonymous == 0" src="@/static/default-header.png" mode=""></image>
+						<image v-if="item.isAnonymous == 0" src="@/static/header.png" mode=""></image>
 						<image v-else :src="item.avatar" mode=""></image>
 						<view class="name">{{ item.username }}</view>
 					</view>

+ 2 - 2
src/pages/index/signWebview/index.vue

@@ -7,8 +7,8 @@ import { onLoad } from '@dcloudio/uni-app';
 import { ref } from 'vue';
 const url =ref()
 onLoad((options) => {
-  console.log(options)
-  url.value= options.url || '';
+  console.log(decodeURIComponent(options.url))
+  url.value= decodeURIComponent(options.url) || '';
 })
 </script>
 

+ 3 - 2
src/pages/index/toBeUsed/index.vue

@@ -601,6 +601,7 @@ const open_map = () => {
 
 // 拨打电话
 const open_phone = () => {
+	if(!orderDetailInfo.value.phone) return TipsUtils.tips_toast('暂无联系电话')
 	uni.makePhoneCall({
 		phoneNumber: orderDetailInfo.value.phone
 	});
@@ -889,14 +890,14 @@ const get_createSign = (familyId: string) => {
 // 未授权跳转链接
 const getAuthUrl = (familyId: string) => {
 	http.get('/esign/getAuthUrl', { data: { familyId: familyId }, loading: true }).then((res) => {
-		RouterUtils.to_page(`/pages/index/signWebview/index?url=${res.result}`)
+		RouterUtils.to_page(`/pages/index/signWebview/index?url=${encodeURIComponent(res.result)}`)
 	})
 }
 
 // 获取签署链接
 const getSignUrl = (signFlowId: string) => {
 	http.get('/esign/getSignUrl', { data: { signFlowId: signFlowId }, loading: true }).then((res) => {
-		RouterUtils.to_page(`/pages/index/signWebview/index?url=${res.result}`)
+		RouterUtils.to_page(`/pages/index/signWebview/index?url=${encodeURIComponent(res.result)}`)
 	})
 }
 </script>

+ 2 - 2
src/pages/mine/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<zzx-navbar :scrollable="true" :back="false" title="我的"></zzx-navbar>
 	<view class="m-header">
-		<image class="header-bgImg" src="@/static/mine_bg.png" mode="widthFix"></image>
+		<image class="header-bgImg" src="@/static/mine-bg1.jpg" mode="widthFix"></image>
 	</view>
 	<view class="m-content-box">
 		<view class="m-content">
@@ -9,7 +9,7 @@
 				<view class="user-info">
 					<image class="user-header" v-if="token && userinfo.userAvatar !== null" :src="userinfo.userAvatar"
 						mode=""></image>
-					<image class="user-header" v-else src="@/static/default-header.png" mode=""></image>
+					<image class="user-header" v-else src="@/static/header.png" mode=""></image>
 					<view class="user-nickname textHidden">{{ token ? userinfo.userName : '暂未登录' }}</view>
 				</view>
 				<view class="user-setting" @click="RouterUtils.to_page('/pages/mine/accountSetting/index')">

+ 1 - 1
src/pages/mine/mineComments/index.vue

@@ -13,7 +13,7 @@
 			<view class="m-user-info">
 				<view class="user-info">
 					<view class="user-header">
-						<image v-if="item.isAnonymous==0" src="@/static/default-header.png" mode=""></image>
+						<image v-if="item.isAnonymous==0" src="@/static/header.png" mode=""></image>
 						<image v-else :src="item.avatar" mode=""></image>
 					</view>
 					<view class="user-name textHidden">{{ item.username }}</view>

BIN
src/static/header.png


BIN
src/static/mine-bg1.jpg


BIN
src/static/mine-bg2.jpg


+ 2 - 2
src/utils/http/index.ts

@@ -178,10 +178,10 @@ export class HttpClient {
 
 // 创建实例
 export const http = new HttpClient({
-  baseURL: 'http://192.168.0.217:8080/jeecg-boot/app',
+  // baseURL: 'http://192.168.0.217:8080/jeecg-boot/app',
   // baseURL: 'http://192.168.1.166:8080/jeecg-boot/app',
   // baseURL: 'http://192.168.0.11:8080/jeecg-boot/app',
-  // baseURL: 'https://api.qlapp.cn/jeecgboot/app', //生产
+  baseURL: 'https://api.qlapp.cn/jeecgboot/app', //生产
   headers: {
     'Content-Type': 'application/json'
   }