更新设置头头像

2025-06-27 18:05:19 +08:00
parent e634ed54ce
commit 973c99bc85
92 changed files with 53 additions and 470 deletions
@@ -4,23 +4,14 @@ ENV = 'development'

 # base api

-
 # 苗扬
 # VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' 

-
 VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'

-app入口
-<<<<<<< HEAD
-
+# app入口
 # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'

-=======
-# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
-# VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
-# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
->>>>>>> cea58939be69e08335a0aaf3f8fef73c5fdb914a

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>View</title>
-    <link rel="icon" href="data:,">
-    <link rel="stylesheet" href="app.css" />
-    <script>var __uniConfig = {"globalStyle":{},"darkmode":false}</script>
-    <script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script src="uni-app-view.umd.js"></script>
-    <script src="app-wxs.js"></script>
-    
-    
-  </body>
-</html>
@@ -1,11 +0,0 @@
-
-  ;(function(){
-  let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","titleView":false,"bounce":"none","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"AI智能培训","style":"custom","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"tra-app","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.66","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#666666","selectedColor":"#0066FF","borderStyle":"white","blurEffect":"none","fontSize":"16px","iconWidth":"24px","spacing":"10px","height":"70px","list":[{"text":"首页","pagePath":"pages/index/index"},{"text":"学习","pagePath":"pages/study/index"},{"text":"场景","pagePath":"pages/scene/index"},{"text":"我的","pagePath":"pages/me/index"}],"borderColor":"#ffffff","midButton":{"iconPath":"/static/images/icon/fawn.png","width":"86px","height":"86px","iconWidth":"90px"},"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"titleNView":false,"navigationBar":{"titleText":"首页","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/courseDetail/index","meta":{"titleNView":false,"navigationBar":{"titleText":"课程详情","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/courseDetail/submit","meta":{"titleNView":false,"navigationBar":{"titleText":"提交评价","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/study/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"titleNView":false,"navigationBar":{"titleText":"学习","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/intelligentAnswering/index","meta":{"titleNView":false,"navigationBar":{"titleText":"智能问答","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/scene/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"titleNView":false,"navigationBar":{"titleText":"场景","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/me/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"titleNView":false,"navigationBar":{"titleText":"我的","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/login/login","meta":{"titleNView":false,"navigationBar":{"titleText":"登录","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/other/web_view","meta":{"titleNView":false,"navigationBar":{"titleText":"","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/login/ysxy","meta":{"titleNView":false,"navigationBar":{"titleText":"","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/search/search","meta":{"titleNView":false,"navigationBar":{"titleText":"","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/course/index","meta":{"titleNView":false,"navigationBar":{"titleText":"课程中心","type":"default","style":"custom"},"isNVue":false}},{"path":"pages/course/study","meta":{"titleNView":false,"navigationBar":{"titleText":"课程学习","type":"default","style":"custom"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
-  __uniConfig.styles=[];//styles
-  __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
-  __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
-  service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:16})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:u,window:u,document:u,frames:u,self:u,location:u,navigator:u,localStorage:u,history:u,Caches:u,screen:u,alert:u,confirm:u,prompt:u,fetch:u,XMLHttpRequest:u,WebSocket:u,webkit:u,print:u}}}}); 
-  })();
-  
@@ -1 +0,0 @@
-(function(){})();
@@ -1,2 +0,0 @@
-var __wxsModules={};
-__wxsModules["1f01b1f2"]=(()=>{var v=(l,t)=>()=>(t||l((t={exports:{}}).exports,t),t.exports);var p=v((f,c)=>{function u(l,t){var r=l.detail,i=r.scrollWidth,o=r.scrollLeft,a=l.currentTarget.dataset,e=a.scrollWidth||a.scrollwidth||0,s=a.indicatorWidth||a.indicatorwidth||0,n=a.barWidth||a.barwidth||0,h=o/(i-e)*(s-n);d(t,h,a.unit)}function W(l,t){t.callMethod("scrollEvent","right");var r=l.currentTarget.dataset,i=r.indicatorWidth||r.indicatorwidth||0,o=r.barWidth||r.barwidth||0;d(t,i-o,r.unit)}function _(l,t){var r=l.currentTarget.dataset;t.callMethod("scrollEvent","left"),d(t,0,r.unit)}function d(l,t,r){l.selectComponent(".uv-scroll-list__indicator__line__bar")&&l.selectComponent(".uv-scroll-list__indicator__line__bar").setStyle({transform:r=="rpx"?"translateX("+t+"rpx)":"translateX("+t+"px)"})}c.exports={scroll:u,scrolltolower:W,scrolltoupper:_}});return p();})();
@@ -1,160 +0,0 @@
-{
-  "@platforms": [
-    "android",
-    "iPhone",
-    "iPad"
-  ],
-  "id": "__UNI__EDE0E52",
-  "name": "tra-app",
-  "version": {
-    "name": "1.0.0",
-    "code": "100"
-  },
-  "description": "",
-  "developer": {
-    "name": "",
-    "email": "",
-    "url": ""
-  },
-  "permissions": {
-    "UniNView": {
-      "description": "UniNView原生渲染"
-    }
-  },
-  "plus": {
-    "useragent": {
-      "value": "uni-app",
-      "concatenate": true
-    },
-    "splashscreen": {
-      "target": "id:1",
-      "autoclose": true,
-      "waiting": true,
-      "delay": 0
-    },
-    "popGesture": "close",
-    "launchwebview": {
-      "id": "1",
-      "kernel": "WKWebview"
-    },
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "distribute": {
-      "google": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      "apple": {},
-      "plugins": {
-        "audio": {
-          "mp3": {
-            "description": "Android平台录音支持MP3格式文件"
-          }
-        }
-      }
-    },
-    "statusbar": {
-      "immersed": "supportedDevice",
-      "style": "dark",
-      "background": "#F8F8F8"
-    },
-    "uniStatistics": {
-      "enable": false
-    },
-    "allowsInlineMediaPlayback": true,
-    "safearea": {
-      "background": "#FFFFFF",
-      "bottom": {
-        "offset": "auto"
-      }
-    },
-    "uni-app": {
-      "control": "uni-v3",
-      "vueVersion": "3",
-      "compilerVersion": "4.66",
-      "nvueCompiler": "uni-app",
-      "renderer": "auto",
-      "nvue": {
-        "flex-direction": "column"
-      },
-      "nvueLaunchMode": "normal",
-      "webView": {
-        "minUserAgentVersion": "49.0"
-      }
-    },
-    "tabBar": {
-      "position": "bottom",
-      "color": "#666666",
-      "selectedColor": "#0066FF",
-      "borderStyle": "rgba(255,255,255,0.4)",
-      "blurEffect": "none",
-      "fontSize": "16px",
-      "iconWidth": "24px",
-      "spacing": "10px",
-      "height": "70px",
-      "list": [
-        {
-          "text": "首页",
-          "pagePath": "pages/index/index"
-        },
-        {
-          "text": "学习",
-          "pagePath": "pages/study/index"
-        },
-        {
-          "text": "场景",
-          "pagePath": "pages/scene/index"
-        },
-        {
-          "text": "我的",
-          "pagePath": "pages/me/index"
-        }
-      ],
-      "borderColor": "#ffffff",
-      "midButton": {
-        "iconPath": "/static/images/icon/fawn.png",
-        "width": "86px",
-        "height": "86px",
-        "iconWidth": "90px"
-      },
-      "selectedIndex": 0,
-      "shown": true,
-      "child": [
-        "lauchwebview"
-      ],
-      "selected": 0
-    }
-  },
-  "app-harmony": {
-    "useragent": {
-      "value": "uni-app",
-      "concatenate": true
-    },
-    "uniStatistics": {
-      "enable": false
-    },
-    "safearea": {
-      "background": "#FFFFFF",
-      "bottom": {
-        "offset": "auto"
-      }
-    }
-  },
-  "launch_path": "__uniappview.html"
-}
@@ -1 +0,0 @@
-.bg{display:flex;flex-direction:column}.titletopbg{width:100%;background:#f8f8f8;height:1.5625rem}.titlebg{width:100%;height:3.125rem;background:#f8f8f8;display:flex;flex-direction:row;align-items:center;position:relative}.arrowleft{width:1.40625rem;height:1.40625rem;position:absolute;left:.625rem}.txt{width:100%;height:100%;color:#000;font-weight:600;font-size:1.1875rem;display:flex;flex-direction:row;align-items:center;justify-content:center}
@@ -1 +0,0 @@
-@charset "UTF-8";.main_div[data-v-16ab44fb]{background-color:#f9faff;display:flex;flex-direction:column;align-items:center;justify-content:space-around}.empty_div[data-v-16ab44fb]{display:flex;flex-direction:column;align-items:center}.empty_div .img[data-v-16ab44fb]{width:12.125rem;height:10.46875rem}.empty_div .text[data-v-16ab44fb]{margin-top:.625rem;height:1.25rem;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:.90625rem;color:#4375c9;line-height:1.25rem;text-align:center;font-style:normal}
@@ -1 +0,0 @@
-@charset "UTF-8";.nav-bar[data-v-e7a2d2df]{width:100%;height:var(--status-bar-height);position:fixed}.nav-bar-seat[data-v-e7a2d2df]{width:100%;height:var(--status-bar-height)}.nav-bar-div[data-v-e7a2d2df]{z-index:1900;width:100%;position:relative}uni-view[data-v-843a5998],uni-scroll-view[data-v-843a5998],uni-swiper-item[data-v-843a5998]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uvicon-iconfont;src:url(../../assets/uvicons.04d281cc.ttf) format("truetype")}.uv-icon[data-v-843a5998]{display:flex;align-items:center}.uv-icon--left[data-v-843a5998]{flex-direction:row-reverse;align-items:center}.uv-icon--right[data-v-843a5998]{flex-direction:row;align-items:center}.uv-icon--top[data-v-843a5998]{flex-direction:column-reverse;justify-content:center}.uv-icon--bottom[data-v-843a5998]{flex-direction:column;justify-content:center}.uv-icon__icon[data-v-843a5998]{font-family:uvicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.uv-icon__icon--primary[data-v-843a5998]{color:#06f}.uv-icon__icon--success[data-v-843a5998]{color:#5ac725}.uv-icon__icon--error[data-v-843a5998]{color:#f56c6c}.uv-icon__icon--warning[data-v-843a5998]{color:#f9ae3d}.uv-icon__icon--info[data-v-843a5998]{color:#909399}.uv-icon__img[data-v-843a5998]{height:auto;will-change:transform}.uv-icon__label[data-v-843a5998]{line-height:1}.uv-border[data-v-1b8a7a55]{border-width:.5px!important;border-color:#dadbde!important;border-style:solid}.uv-border-bottom[data-v-1b8a7a55]{border-bottom-width:.5px!important;border-color:#dadbde!important;border-bottom-style:solid}uni-view[data-v-1b8a7a55],uni-scroll-view[data-v-1b8a7a55],uni-swiper-item[data-v-1b8a7a55]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.uv-input[data-v-1b8a7a55]{display:flex;flex-direction:row;align-items:center;justify-content:space-between;flex:1}.uv-input--radius[data-v-1b8a7a55],.uv-input--square[data-v-1b8a7a55]{border-radius:4px}.uv-input--no-radius[data-v-1b8a7a55]{border-radius:0}.uv-input--circle[data-v-1b8a7a55]{border-radius:100px}.uv-input__content[data-v-1b8a7a55]{flex:1;display:flex;flex-direction:row;align-items:center;justify-content:space-between}.uv-input__content__field-wrapper[data-v-1b8a7a55]{position:relative;display:flex;flex-direction:row;margin:0;flex:1}.uv-input__content__field-wrapper__field[data-v-1b8a7a55]{line-height:26px;text-align:left;color:#303133;height:24px;font-size:15px;flex:1}.uv-input__content__clear[data-v-1b8a7a55]{width:20px;height:20px;border-radius:100px;background-color:#c6c7cb;display:flex;flex-direction:row;align-items:center;justify-content:center;transform:scale(.82);margin-left:15px}.uv-input__content__subfix-icon[data-v-1b8a7a55]{margin-left:4px}.uv-input__content__prefix-icon[data-v-1b8a7a55]{margin-right:4px}.search_content[data-v-fe6f59dd]{background-color:#fff;min-height:12.5rem;margin-top:-.1875rem;border-radius:.375rem .375rem 0 0;display:flex;flex-direction:column;align-items:center}.search_content .bg_img[data-v-fe6f59dd]{width:84%;margin:.625rem auto}.fixed_search_div[data-v-fe6f59dd]{padding:calc(.3125rem + var(--status-bar-height)) .46875rem .75rem .9375rem;background:linear-gradient(90deg,#f1f7ff,#d8edff,#c3e6ff);display:flex;align-items:center}.fixed_search_div .back_div[data-v-fe6f59dd]{margin-right:.3125rem}.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]{position:relative;width:1.25rem;height:1.25rem;cursor:pointer}.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]:before,.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]:after{content:"";position:absolute;transition:all .3s ease}.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]:after{top:25%;left:25%;width:40%;height:40%;border-top:.125rem solid #2B2C2E;border-left:.125rem solid #2B2C2E;transform:rotate(-45deg)}.main_div[data-v-fe6f59dd]{display:flex;flex-direction:column}
@@ -1 +0,0 @@
-@charset "UTF-8";.main_div[data-v-9ea8d8c1]{background-color:#f9faff;display:flex;flex-direction:column;align-items:center;justify-content:space-around}.empty_div[data-v-9ea8d8c1]{display:flex;flex-direction:column;align-items:center}.empty_div .img[data-v-9ea8d8c1]{width:12.125rem;height:10.46875rem}.empty_div .text[data-v-9ea8d8c1]{margin-top:.625rem;height:1.25rem;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:.90625rem;color:#4375c9;line-height:1.25rem;text-align:center;font-style:normal}
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">AI培训</string>
+    <string name="app_name">吉AI学</string>
 </resources>
@@ -13,7 +13,6 @@
 	import {
 		ref,
 		reactive,
-		defineProps,
 		defineEmits,
 		onMounted,
 		computed,
@@ -5,7 +5,7 @@
 			<view class="message_div" v-for="(item,index) in message_list">
 				<view class="head_div">
 					<image-preview v-if="item.userIconImgId" class="img-box img"
-						:imgId="item.userIconImgId"></image-preview>
+						:src="item.userIconImgId"></image-preview>
 					<image v-else src="/static/images/me/default_user_avatar.png" class="img"></image>
 				</view>
 				<view class="msg_content">
@@ -41,7 +41,7 @@
 						<view class="message_div" v-for="childrenItem in item.children">
 							<view class="head_div">
 								<image-preview v-if="childrenItem.userIconImgId" class="img-box img"
-									:imgId="childrenItem.userIconImgId"></image-preview>
+									:src="childrenItem.userIconImgId"></image-preview>
 								<image v-else src="/static/images/me/default_user_avatar.png" class="img"></image>
 							</view>
 							<view class="msg_content">
@@ -45,8 +45,7 @@
 					color="rgba(255,255,255,0.7)" :speed="40" direction="column"></uv-notice-bar>
 			</view>
 			<!-- 学习时长和飞天兔子，为了挡住部分兔子只能多一个盒子 -->
-			<view class="study_duration_and_profile_div"
-				@click="common.navigateTo('/pages/courseDetail/index?crsNum=meirenmaixiyinchenque')">
+			<view class="study_duration_and_profile_div">
 				<!-- 飞天兔子 -->
 				<view class="profile_div">
 					<image src="/static/images/index/fttz.png" class="profile"></image>
@@ -56,23 +55,24 @@
 					<view class="item">
 						<view class="top">本年学习时长</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['startStdtTmLen']" :endVal="statistics_data['stdtTmLen']"
-								:useEasing="true" :decimals="1" ref="stdtTmLenRef"></uv-count-to>h
+							<uv-count-to :startVal="statistics_data['startStdtTmLen']"
+								:endVal="statistics_data['stdtTmLen']" :useEasing="true" :decimals="1"
+								ref="stdtTmLenRef"></uv-count-to>h
 						</view>
 					</view>
 					<view class="item">
 						<view class="top">累计训练次数</view>
 						<view class="bottom">
 							<uv-count-to :startVal="statistics_data['startAccmExamCnt']"
-								:endVal="statistics_data['accmExamCnt']" :useEasing="true" ref="accmExamCntRef"></uv-count-to><span
-								class="number">次</span>
+								:endVal="statistics_data['accmExamCnt']" :useEasing="true"
+								ref="accmExamCntRef"></uv-count-to><span class="number">次</span>
 						</view>
 					</view>
 					<view class="item">
 						<view class="top">累计考试次数</view>
 						<view class="bottom"><uv-count-to :startVal="statistics_data['starAccmPracticeCnt']"
-								:endVal="statistics_data['accmPracticeCnt']" :useEasing="true" ref="accmPracticeCntRef"></uv-count-to><span
-								class="number">次</span>
+								:endVal="statistics_data['accmPracticeCnt']" :useEasing="true"
+								ref="accmPracticeCntRef"></uv-count-to><span class="number">次</span>
 						</view>
 					</view>
 				</view>
@@ -252,8 +252,8 @@
 	const stdtTmLenRef = ref(null);
 	const accmPracticeCntRef = ref(null);
 	const accmExamCntRef = ref(null);
-	const three_list_request_time = ref(0);  // 三个列表更新时间
-	
+	const three_list_request_time = ref(0); // 三个列表更新时间
+
 	// 计算透明度
 	const opacity = computed(() => {
 		if (scrollTop.value <= 130) return 0;
@@ -285,7 +285,7 @@
 	const hot_class_list = ref([...init_class_data])
 	const new_class_list = ref([...init_class_data])
 	const recommend_class_list = ref([...init_class_data])
-	
+
 	const statistics_data = reactive({
 		'stdtTmLen': 0, // 学习
 		'accmPracticeCnt': 0, // 训练
@@ -328,7 +328,7 @@
 						this.accmExamCnt = accmExamCnt
 						accmExamCntRef.value.start()
 					}
-					
+
 					console.log('统计数据已更新');
 				} else {
 					console.log('时间没到无需更新');
@@ -349,12 +349,12 @@
 	}
 	onShow(() => {
 		console.log('onShow');
-		if(!common.isLogin()){
+		if (!common.isLogin()) {
 			common.navigateTo('/pages/login/login')
-			return 
-		} 
+			return
+		}
 		statistics_data['get_statistics_data']() // 获取统计数据
-		if(!common.isLogin()) return;
+		if (!common.isLogin()) return;
 		queryCrsInfoByLastnew().then(res => {
 			new_class_list.value = res.body
 		})
@@ -366,7 +366,7 @@
 		})
 	})
 	onLoad(async () => {
-		
+
 	})
 </script>

@@ -49,14 +49,11 @@
 				</uv-checkbox-group>
 				<view class="ysxy_tip font_pf">
 					已阅读并同意
-					<!-- #ifdef APP -->
-					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy')">《服务条款》</span>
-					<!-- #endif -->
-					<!-- #ifndef APP -->
-					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy')">《服务条款》</span>
-					<!-- #endif -->
+				
+					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=1')">《服务条款》</span>
+				
 					与
-					<span class="ysxy_term">《隐私权政策》</span>
+					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=2')">《隐私权政策》</span>
 				</view>
 			</view>
 		</view>
@@ -6,24 +6,37 @@

 <script setup>
 	import {
-		ref,
-		onMounted
+		ref
 	} from 'vue'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
 	import common from '@/common/common'
 	import {
 		getYsxy
 	} from '@/api/login.js'
 	const ysxi_text = ref('')
-	onMounted(() => {
+	onLoad((e) => {
 		common.loading()
-		getYsxy().then(res => {
-			ysxi_text.value = res.body.agtContt
+		if (e.page == 1) {
+			ysxi_text.value = "服务条款"
 			common.hideLoading()
-		});
-
+		} else {
+			getYsxy().then(res => {
+				ysxi_text.value = res.body.agtContt
+				common.hideLoading()
+			});
+		}
 	})
 </script>

 <style lang="scss" scoped>
+	.main_div {
+		margin-top: 20%;
+		margin: 20% auto 0 auto;
+		display: flex;
+		justify-content: center;
+		font-weight: 600;

+	}
 </style>
@@ -179,6 +179,7 @@ const user_info = reactive({
 onShow(() => {
 	const user_info_cache = getUserInfo();
 	Object.assign(user_info, user_info_cache);
+	console.log('user_info', user_info);
 	statistics_data['get_statistics_data'](); // 获取统计数据
 });

@@ -16,7 +16,8 @@
 					</template>
 					<template #value>
 						<view style="width: 42rpx; height: 42rpx;border-radius: 100%; overflow: hidden">
-							<image-preview style="width: 100%" v-if="userInfo.imageAddr" :src="userInfo.imageAddr"></image-preview>
+							<image v-if="userInfo.imagePath" class="img_100" :src="userInfo.imagePath"></image>
+							<image-preview v-else class="img_100" :src="userInfo.imageAddr"></image-preview>
 						</view>
 					</template>
 				</uv-cell>
@@ -40,7 +41,6 @@
 </template>

 <script setup>
-<<<<<<< HEAD
 	import {
 		reactive,
 		ref,
@@ -69,6 +69,7 @@
 	const aaa = ref('');
 	const userInfo = ref({
 		gender: '',
+		imagePath: '',
 		imageAddr: ''
 	});
 	const avatarCropperStatus = ref(true)
@@ -85,11 +86,9 @@
 		avatarCropperStatus.value = false
 	}
 	const onConfirm = (file) => {
-		
 		avatarCropperStatus.value = false
 		nextTick(async() => {
 			common.loading('更新头像中')
-			
 			try{
 				const data = {
 					bizScen: 'S3010',
@@ -103,21 +102,20 @@
 				// 更新个人信息
 				const userData = await queryCurrentUser()
 				common.msg('修改成功')
-				console.log(userData);
 				userInfo.value.imageAddr = getUserInfo('imageAddr')
+				userInfo.value.imagePath = getUserInfo('imagePath')
 			} catch {
 				common.msg('修改失败')
 			}
 			common.hideLoading()
 		})
 	}
-
+	
 	const cellCLick = (value) => {
 		uni.chooseImage({
 			count: 1,
 			sizeType: ["compressed"],
 			success: (res) => {
-				
 				avatarCropperUrl.value = res.tempFilePaths[0];
 				avatarCropperStatus.value = true
 			},
@@ -128,7 +126,8 @@
 		common.loading("修改中")
 		updateDfSysUserExtandInfoGender({
 			gender: userInfo.value.gender
-		}).then(res => {
+		}).then(async() => {
+			await queryCurrentUser()
 			common.msg('修改成功')
 		}).finally(() => {
 			common.hideLoading()
@@ -137,33 +136,7 @@
 	
 	onLoad((params) => {
 		userInfo.value = getUserInfo()
-		console.log(userInfo.value);
 	});
-=======
-import { reactive, ref } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import common from '@/common/common';
-const index = ref(0);
-const form = ref({
-	gender: 'Y'
-});
-const sexOptions = [
-	{ value: 'Y', label: '男' },
-	{ value: 'M', label: '女' }
-];
-const cellCLick = (value) => {
-	sexOptions.length = 0;
-	console.log(sexOptions,'sisisis');
-};
-const sexChange = (e) => {
-	console.log(e);
-	console.log(sexOptions[e.detail.value].value, 'sexOptions[e.detail.value].value');
-	form.value.gender = sexOptions[e.detail.value].value;
-
-	console.log(form.value.gender, 'iiii');
-};
-onLoad((params) => {});
->>>>>>> cea58939be69e08335a0aaf3f8fef73c5fdb914a
 </script>

 <style lang="scss" scoped>
				`@@ -1 +0,0 @@`
				`.bg{display:flex;flex-direction:column}.titletopbg{width:100%;background:#f8f8f8;height:1.5625rem}.titlebg{width:100%;height:3.125rem;background:#f8f8f8;display:flex;flex-direction:row;align-items:center;position:relative}.arrowleft{width:1.40625rem;height:1.40625rem;position:absolute;left:.625rem}.txt{width:100%;height:100%;color:#000;font-weight:600;font-size:1.1875rem;display:flex;flex-direction:row;align-items:center;justify-content:center}`
				`@@ -1 +0,0 @@`
				@charset "UTF-8";.main_div[data-v-16ab44fb]{background-color:#f9faff;display:flex;flex-direction:column;align-items:center;justify-content:space-around}.empty_div[data-v-16ab44fb]{display:flex;flex-direction:column;align-items:center}.empty_div .img[data-v-16ab44fb]{width:12.125rem;height:10.46875rem}.empty_div .text[data-v-16ab44fb]{margin-top:.625rem;height:1.25rem;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:.90625rem;color:#4375c9;line-height:1.25rem;text-align:center;font-style:normal}
				`@@ -1 +0,0 @@`
				@charset "UTF-8";.nav-bar[data-v-e7a2d2df]{width:100%;height:var(--status-bar-height);position:fixed}.nav-bar-seat[data-v-e7a2d2df]{width:100%;height:var(--status-bar-height)}.nav-bar-div[data-v-e7a2d2df]{z-index:1900;width:100%;position:relative}uni-view[data-v-843a5998],uni-scroll-view[data-v-843a5998],uni-swiper-item[data-v-843a5998]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uvicon-iconfont;src:url(../../assets/uvicons.04d281cc.ttf) format("truetype")}.uv-icon[data-v-843a5998]{display:flex;align-items:center}.uv-icon--left[data-v-843a5998]{flex-direction:row-reverse;align-items:center}.uv-icon--right[data-v-843a5998]{flex-direction:row;align-items:center}.uv-icon--top[data-v-843a5998]{flex-direction:column-reverse;justify-content:center}.uv-icon--bottom[data-v-843a5998]{flex-direction:column;justify-content:center}.uv-icon__icon[data-v-843a5998]{font-family:uvicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.uv-icon__icon--primary[data-v-843a5998]{color:#06f}.uv-icon__icon--success[data-v-843a5998]{color:#5ac725}.uv-icon__icon--error[data-v-843a5998]{color:#f56c6c}.uv-icon__icon--warning[data-v-843a5998]{color:#f9ae3d}.uv-icon__icon--info[data-v-843a5998]{color:#909399}.uv-icon__img[data-v-843a5998]{height:auto;will-change:transform}.uv-icon__label[data-v-843a5998]{line-height:1}.uv-border[data-v-1b8a7a55]{border-width:.5px!important;border-color:#dadbde!important;border-style:solid}.uv-border-bottom[data-v-1b8a7a55]{border-bottom-width:.5px!important;border-color:#dadbde!important;border-bottom-style:solid}uni-view[data-v-1b8a7a55],uni-scroll-view[data-v-1b8a7a55],uni-swiper-item[data-v-1b8a7a55]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.uv-input[data-v-1b8a7a55]{display:flex;flex-direction:row;align-items:center;justify-content:space-between;flex:1}.uv-input--radius[data-v-1b8a7a55],.uv-input--square[data-v-1b8a7a55]{border-radius:4px}.uv-input--no-radius[data-v-1b8a7a55]{border-radius:0}.uv-input--circle[data-v-1b8a7a55]{border-radius:100px}.uv-input__content[data-v-1b8a7a55]{flex:1;display:flex;flex-direction:row;align-items:center;justify-content:space-between}.uv-input__content__field-wrapper[data-v-1b8a7a55]{position:relative;display:flex;flex-direction:row;margin:0;flex:1}.uv-input__content__field-wrapper__field[data-v-1b8a7a55]{line-height:26px;text-align:left;color:#303133;height:24px;font-size:15px;flex:1}.uv-input__content__clear[data-v-1b8a7a55]{width:20px;height:20px;border-radius:100px;background-color:#c6c7cb;display:flex;flex-direction:row;align-items:center;justify-content:center;transform:scale(.82);margin-left:15px}.uv-input__content__subfix-icon[data-v-1b8a7a55]{margin-left:4px}.uv-input__content__prefix-icon[data-v-1b8a7a55]{margin-right:4px}.search_content[data-v-fe6f59dd]{background-color:#fff;min-height:12.5rem;margin-top:-.1875rem;border-radius:.375rem .375rem 0 0;display:flex;flex-direction:column;align-items:center}.search_content .bg_img[data-v-fe6f59dd]{width:84%;margin:.625rem auto}.fixed_search_div[data-v-fe6f59dd]{padding:calc(.3125rem + var(--status-bar-height)) .46875rem .75rem .9375rem;background:linear-gradient(90deg,#f1f7ff,#d8edff,#c3e6ff);display:flex;align-items:center}.fixed_search_div .back_div[data-v-fe6f59dd]{margin-right:.3125rem}.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]{position:relative;width:1.25rem;height:1.25rem;cursor:pointer}.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]:before,.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]:after{content:"";position:absolute;transition:all .3s ease}.fixed_search_div .back_div .back-icon[data-v-fe6f59dd]:after{top:25%;left:25%;width:40%;height:40%;border-top:.125rem solid #2B2C2E;border-left:.125rem solid #2B2C2E;transform:rotate(-45deg)}.main_div[data-v-fe6f59dd]{display:flex;flex-direction:column}
				`@@ -1 +0,0 @@`
				@charset "UTF-8";.main_div[data-v-9ea8d8c1]{background-color:#f9faff;display:flex;flex-direction:column;align-items:center;justify-content:space-around}.empty_div[data-v-9ea8d8c1]{display:flex;flex-direction:column;align-items:center}.empty_div .img[data-v-9ea8d8c1]{width:12.125rem;height:10.46875rem}.empty_div .text[data-v-9ea8d8c1]{margin-top:.625rem;height:1.25rem;font-family:PingFangSC,PingFang SC;font-weight:400;font-size:.90625rem;color:#4375c9;line-height:1.25rem;text-align:center;font-style:normal}