refactor(images): 更新图片资源引用方式

- 将静态图片资源引用方式改为动态引用
- 使用 $util.img() 方法统一处理图片路径
- 更新部分组件和页面的图片资源路径

api/apiRoute.js

@@ -98,6 +98,14 @@ export default {
     //公共端-获取配置项
     common_getConfig(data = {}) {
         let url = '/common/getConfig'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
+    //公共端-获取配置项
+    common_getMiniWxOpenId(data = {}) {
+        let url = '/common/getMiniWxOpenId'
         return http.post(url, data).then(res => {
             return res;
         })
@@ -168,6 +176,13 @@ export default {
             return res;
         })
     },
+	//获取班级详情
+	jlClassInfo(data = {}) {
+	    let url = '/class/jlClassInfo'
+	    return http.get(url, data).then(res => {
+	        return res;
+	    })
+	},
 	//获取课程列表
 	courseList(data = {}) {
         let url = '/course/courseList'
@@ -388,7 +403,20 @@ export default {
 
 
     //↓↓↓↓↓↓↓↓↓↓↓↓-----学生接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓
-
+    //学生登陆接口
+    xy_login(data = {}) {
+        let url = '/customerResourcesAuth/login'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
+    //学生详情
+    xy_memberInfo(data = {}) {
+        let url = '/customerResourcesAuth/info'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
 
 
 

components/AQ/AQUplodeImage.vue

@@ -1,3 +1,4 @@
+<!--单图自定义按钮上传-->
 <template>
   <view @click="chooseImage">
     <slot></slot>

manifest.json

@@ -62,7 +62,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx675f2696abf932c5",
+        "appid" : "wxdaf2fffe7e397c01",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

pages/coach/class/info.vue

@@ -8,31 +8,31 @@
 
     <view class="main_section">
       <view class="section_1">
-<!--        <view class="left">-->
-<!--          <image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>-->
-<!--          <view class="name">包皮子</view>-->
-<!--        </view>-->
+       <view class="left">
+         <image class="pic" :src="classInfo.head_coach_head_img"></image>
+         <view class="name">{{classInfo.head_coach_name}}</view>
+       </view>
         <view class="right">
           <view class="item">
-            班级：{{classInfo.name}}
+            班级：{{classInfo.class_name}}
           </view>
 
           <view class="item">
-            地点：{{classInfo.address}}
+            校区：{{classInfo.campus_name}}
           </view>
 
-<!--          <view class="item">-->
-<!--            课程：篮球少儿课-->
+<!--          <view class="item">
+<!--            课程：篮球少儿课
 <!--          </view>-->
 
           <view class="item">
-            人数：{{classInfo.max_students}}人
+            人数：{{classInfo.classPersonnelRel.length}}人
           </view>
-
+<!-- 
           <view class="item">
 
             时间：{{classInfo.start_date}}  - {{classInfo.end_date}}
-          </view>
+          </view> -->
         </view>
       </view>
 
@@ -76,29 +76,29 @@
         <view class="ul">
           <view
               class="li"
-              v-for="(v,k) in classMemberList"
+              v-for="(v,k) in classInfo.classPersonnelRel"
               :key="k"
               @click="openViewStudentInfo(v)"
           >
             <view class="left">
               <view class="box_1">
-                <image class="pic" :src="$util.img(v.header)"></image>
+                <image class="pic" :src="$util.img(v.student.customerResources.member.headimg)"></image>
                 <view class="tag_box" v-if="v.expire">
                   即将到期
                 </view>
               </view>
               <view class="box_2">
-                <view class="name">{{ v.name }}</view>
-                <view class="date">课程截止时间：{{ $util.formatToDateTime(v.expire_time, 'Y-m-d') }}</view>
+                <view class="name">{{ v.student.name }}</view>
+                <view class="date">课程截止时间：{{ $util.formatToDateTime(v.end_date, 'Y-m-d') }}</view>
               </view>
             </view>
             <view class="right">
               <view class="item">
-                <view>{{ v.have_study_time }}</view>
+                <view>{{ v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours }}</view>
                 <view>已上课时</view>
               </view>
               <view class="item">
-                <view>{{ v.end_study_time }}</view>
+                <view>{{ (v.studentCoursesInfo.total_hours + v.studentCoursesInfo.gift_hours) - (v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours) }}</view>
                 <view>剩余课时</view>
               </view>
             </view>
@@ -180,7 +180,7 @@
 <script>
 import memberApi from '@/api/member.js';
 import AQTabber from "@/components/AQ/AQTabber.vue"
-
+import apiRoute from '@/api/apiRoute.js';
 
 export default {
   components: {
@@ -227,13 +227,13 @@ export default {
       // member/course_list//课程列表
       // member/class_info//班级详情+成员详情
       this.getClassInfo()//获取班级详情
-      await this.getCourseList()//获取课程列表
+      //await this.getCourseList()//获取课程列表
 
     },
 
     //教练端-获取班级详情
     async getClassInfo(){
-      let res = await memberApi.jlClassInfo({class_id:this.class_id})//班级详情
+      let res = await apiRoute.jlClassInfo({class_id:this.class_id})//班级详情
       if(res.code != 1){
         uni.showToast({
           title: res.msg,

pages/coach/class/list.vue

@@ -17,7 +17,7 @@
             scroll-y="true"
             :lower-threshold="lowerThreshold"
             @scrolltolower="loadMoreData"
-            style="height: 80vh;"
+            style="height: 65vh;"
         >
           <view
               class="li"
@@ -26,21 +26,21 @@
               @click="openViewClassInfo(v)"
           >
             <view class="left">
-              <!--              <image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>-->
+                <image class="pic" :src="v.head_coach_head_img"></image>
             </view>
             <view class="right">
               <view class="box_1">
                 <view class="name">
-                  {{v.name}}
+                  {{v.class_name}}
                 </view>
                 <view class="btn_box">
                   <view v-if="v.end_count">{{v.end_count}}人即将到期</view>
                 </view>
               </view>
               <view class="box_2">
-                <view class="user_list" v-for="(v2,k2) in v.students_list" :key="k2">
+                <view class="user_list" v-for="(v2,k2) in v.classPersonnelRel" :key="k2">
                   <image
-                      :src="$util.img(v2.header)"></image>
+                      :src="$util.img(v2.student.customerResources.member.headimg)"></image>
                 </view>
                 <view class="num">{{v.students_count}}</view>
               </view>
@@ -83,7 +83,7 @@ export default {
   },
   onLoad(options) {},
   onShow(){
-    //this.init()//初始化
+    this.init()//初始化
   },
   methods: {
     //初始化
@@ -148,14 +148,14 @@ export default {
     },
 
     async search(e){
-      //await this.resetFilteredData()
+      await this.resetFilteredData()
       this.filteredData.name = e
-      //await this.getList()
+      await this.getList()
     },
 
     //打开班级详情页
     openViewClassInfo(item){
-      let class_id = item.class_id
+      let class_id = item.id
       uni.navigateTo({
         url: `/pages/coach/class/info?class_id=${class_id}`
       })
@@ -191,7 +191,7 @@ export default {
 }
 
 .main_section{
-  min-height: 100vh;
+  // min-height: 100vh;
   background: #292929 100%;
   padding: 0 24rpx;
   padding-top: 40rpx;
@@ -236,6 +236,7 @@ export default {
         padding: 50rpx 36rpx 46rpx;
         border-radius: 16rpx;
         display: flex;
+		align-items: center;
         gap: 32rpx;
         .left{
           .pic{

pages/student/index/index.vue

@@ -6,7 +6,7 @@
 		<view class="head">
 			<view class="head-img">
 				<!-- <fui-avatar width="136" :src="$util.img(member_info.headimg)"></fui-avatar> -->
-				<image class="pic" :src="$util.img(member_info.headimg)"></image>
+        <image class="pic" :src="member_info.memberHasOne ? member_info.memberHasOne.headimg : $util.img('/uniapp_src/static/images/common/yong_hu.png')"></image>
 				<view class="head-text">{{member_info.name}}</view>
 			</view>
 		</view>
@@ -123,6 +123,8 @@
 
 <script>
   import {Api_url} from "@/common/config";
+	import apiRoute from '@/api/apiRoute.js';
+
 	import memberApi from '@/api/member.js';
 	import AQTabber from "@/components/AQ/AQTabber.vue"
 	export default {
@@ -131,12 +133,15 @@
 		},
 		data() {
 			return {
+        inited: false, // 添加标记位控制 init 只执行一次
+
         //上传接口地址
         uploadApiUrl: ``,
         uploadImageApiUrl: `${Api_url}/file/image`,
         uploadVideoApiUrl: `${Api_url}/file/video`,
 
-				member_info: [],
+				member_info: {},//学生信息
+
         assignmentsList: [],//作业列表
         jobAssignmentsInfo: [],//待完成的作业
 
@@ -168,23 +173,27 @@
 			}
 		},
 		onLoad() {
-
+      this.openViewHome()//检测首页是否正确跳转-不正确则进行重定向
 		},
     onShow(){
-      this.openViewHome()//检测首页是否正确跳转-不正确则进行重定向
+      // 防止 onShow 触发后重复 init
+      if (!this.inited) {
+        this.init()
+        this.inited = true
+      }
     },
 		methods: {
-		  //初始化
+		  //学生页面初始化
       async init(){
-        this.member_init()
+        await this.member_init()
         this.getMemberIndex()
         this.getList()
         this.getJobAssignmentsInfo()
       },
 
 
-      //检测首页是否正确跳转-不正确则进行重定向
-      async openViewHome(){
+
+      async openViewHome_COPY(){
         //获取当前页面路径
         let pages = getCurrentPages();
         //当前页面路径
@@ -194,21 +203,24 @@
 
         this.openPath = this.path_arr[userType]
 
+        console.log(
+            '跳转',
+            this.thisPath,
+            userType,
+            this.path_arr[userType]
+        )
         if(this.thisPath != this.openPath){
+          console.log('打印1')
           //跳转tabBar首页-页面
           uni.setStorageSync('tabBerIndex', 0)
           uni.navigateTo({
             url: this.openPath
           })
+          return
         }else{
-          //页面正确的情况下
+          //页面正确的情况下->执行学生页面初始化
           this.init()
         }
-
-
-        console.log(123123123123,this.thisPath,userType,this.path_arr[userType])
-
-
       },
 
       async getMemberIndex(){
@@ -269,15 +281,20 @@
       },
 
 			//获取学员信息
-			member_init() {
-				memberApi.member().then(res => {
-					if(res.code == 1){
-						this.member_info = res.data
-					}else{
-						this.member_info = []
-					}					
-				})
+			async member_init() {
+        let res = await apiRoute.xy_memberInfo({})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        this.member_info = res.data
+        console.log('xxxx',this.member_info)
 			},
+
+      //跳转页面-作业详情
 			details() {
 				uni.navigateTo({
 					url: '/pages/student/index/work_details'

pages/student/login/login.vue

@@ -25,7 +25,6 @@
         </fui-input>
       </view>
 
-      <view style="width: 95%;height: 30rpx;"></view>
       <view style="width: 95%;margin:30rpx auto;">
         <fui-input
             @click="picker_show_loginType=true"
@@ -64,6 +63,8 @@ import apiRoute from '@/api/apiRoute.js';
 export default {
   data() {
     return {
+      inited: false, // 添加标记位控制 init 只执行一次
+
       password: true,
       user: '', //账户
       password1: '', //密码
@@ -86,6 +87,13 @@ export default {
         }
       ],
       picker_show_loginType:false,//是否显示下拉窗组件
+
+
+      path_arr:{
+        '1':'/pages/coach/home/index',//教练
+        '2':'/pages/market/index/index',//销售
+        '3':'/pages/student/index/index',//学员
+      },
     }
   },
   onLoad(options) {
@@ -94,14 +102,21 @@ export default {
     this.loginType_str = selectedItem ? selectedItem.text : '未知类型';
     // uni.hideHomeButton()
     // console.log(uni.getStorageSync('um_id'))
-    this.init()
+    // 防止 onShow 触发后重复 init
+    if (!this.inited) {
+      this.openViewHome()
+      this.inited = true
+    }
   },
   methods: {
     async init(){
-      await this.getWxConfig()
+      //条件编译 微信小程序
+      //#ifdef MP-WEIXIN
+      await this.getMiNiWxOpenId()
+      //#endif
     },
     input(e) {
-      console.log(e)
+      //console.log(e)
     },
     change() {
       this.password = !this.password
@@ -149,6 +164,7 @@ export default {
 		    'phone': this.user,
 		    'password': this.password1,
 		    'login_type': 1,
+        'mini_wx_openid':this.mini_wx_openid,//微信小程序openid
 		  }
 		  res = await apiRoute.personnelLogin(params)		  
       }else if(this.loginType == 2){
@@ -158,11 +174,20 @@ export default {
           'phone': this.user,
           'password': this.password1,
           'login_type': 2,
+          'mini_wx_openid':this.mini_wx_openid,//微信小程序openid
         }
         res = await apiRoute.personnelLogin(params)
         console.log(123123,res)
 
       }else if (this.loginType == 3){
+        //学生
+        let params = {
+          'phone': this.user,
+          'password': this.password1,
+          'login_type': 2,
+          'mini_wx_openid':this.mini_wx_openid,//微信小程序openid
+        }
+        res = await apiRoute.xy_login(params)
       }
 
       if(!res.code){
@@ -202,57 +227,35 @@ export default {
       })
     },
 
-    async getWxConfig(){
-      let params = {
-        config_key: 'WECHAT'
-      }
-      let res = await apiRoute.common_getConfig(params)
-      if ( res.code != 1){
-         uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-         return
-      }
-      let appid = res.data.app_id || ''
-      let secret = res.data.app_secret || ''
-      if(!appid || !secret){
-         uni.showToast({
-          title: '请配置微信小程序信息',
-          icon: 'none'
-        })
-      }
-      await this.loginWx(appid, secret)
-    },
-
-    async loginWx(appid,secret) {
+    //获取微信小程序openid
+    // 获取微信登录 code 并请求 openid
+    async getMiNiWxOpenId() {
       uni.login({
         provider: 'weixin',
         success: (res) => {
-          console.log(res.code); // 打印 code
-
-          // 拿到 code 后请求后端接口换取 openid
-          uni.request({
-            url: 'https://api.weixin.qq.com/sns/jscode2session',
-            data: {
-              appid: '你的AppID',     // 替换为你的 AppID
-              secret: '你的AppSecret', // 替换为你的 AppSecret
-              js_code: res.code,
-              grant_type: 'authorization_code'
-            },
-            success: (wxRes) => {
-              console.log('获取到的 openid:', wxRes.data.openid); // 只打印 openid
-            },
-            fail: () => {
-              console.error('请求失败');
-            }
-          });
+          const code = res.code;
+          this.fetchOpenId(code); // 调用单独方法
         },
         fail: () => {
-          console.error('uni.login 失败');
+          uni.showToast({ title: '微信登录失败', icon: 'none' });
         }
       });
     },
+    // 获取微信登录 code 并请求 openid
+    async fetchOpenId(code){
+      let params = {
+        code: code,
+      }
+      let res = await apiRoute.common_getMiniWxOpenId(params)
+      if (res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+      this.mini_wx_openid = res.data.openid
+    },
 
     //登录类型选择相关
     changePicker_loginType(e){
@@ -272,10 +275,43 @@ export default {
         this.password1= '123123' //密码
       }else{
         //学生端
-        this.user= '' //账户
-        this.password1= '' //密码
+        this.user= '15335526445' //账户
+        this.password1= '123123' //密码
+      }
+
+    },
+
+    //检测首页是否正确跳转-不正确则进行重定向
+    async openViewHome() {
+      const userType = String(uni.getStorageSync('userType') || '');
+      const token = uni.getStorageSync('token') || ''
+
+      if(!userType || !token){
+        return
       }
 
+      const pages = getCurrentPages();
+      const currentPage = pages[pages.length - 1];
+      const thisPath = '/' + currentPage.route;
+
+
+      const openPath = this.path_arr[userType];
+
+      console.log('当前路径:', thisPath);
+      console.log('用户类型:', userType);
+      console.log('应跳转路径:', openPath);
+
+      if (thisPath !== openPath) {
+        // 如果不是正确的首页路径，则跳转到对应角色首页
+        uni.setStorageSync('tabBerIndex', 0)
+
+        // 使用 redirectTo 替代 navigateTo，避免页面栈堆积
+        uni.redirectTo({
+          url: openPath
+        });
+        return
+      }
+      // 如果是正确的路径，交给 onShow 控制初始化
     },
   }
 }

pages/student/my/my.vue

@@ -9,7 +9,7 @@
 			<view class="user_section">
 				<view class="box">
 					<view class="left" @click="personal_data">
-						<image class="pic" :src="$util.img(member_info.headimg)"></image>
+						<image class="pic" :src="member_info.memberHasOne ? member_info.memberHasOne.headimg : $util.img('/uniapp_src/static/images/common/yong_hu.png')"></image>
 						<view class="name">{{member_info.name}}</view>
 					</view>
 					<view class="right" @click="setup">
@@ -57,7 +57,7 @@
 <!--				</view>-->
 
 				<view class="item" @click="openViewContractList()">
-					<view>我的合同</view>
+					<view>我的订单</view>
 					<view></view>
 				</view>
 			</view>
@@ -89,6 +89,7 @@
 
 <script>
 	import AQTabber from "@/components/AQ/AQTabber.vue"
+	import apiRoute from '@/api/apiRoute.js';
 	import member from '@/api/member.js';
 	export default {
 		components: {
@@ -104,14 +105,16 @@
 		},
 		methods: {
 			//获取学员信息
-			member_init() {
-				member.member().then(res => {
-					if(res.code == 1){
-						this.member_info = res.data
-					}else{
-						this.member_info = []
-					}					
-				})
+      async member_init() {
+        let res = await apiRoute.xy_memberInfo({})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        this.member_info = res.data
 			},
 			//打开设置
 			setup(item) {

pages/student/my/personal_data.vue

@@ -5,11 +5,16 @@
 		<view class="main_section">
 			<view class="section">
 				<view class="item">
-					<image @click="changeAvatar()" class="pic" :src="$util.img(formData.headimg)"
-						v-if="upload_type == 1">
-						<image @click="changeAvatar()" class="pic" :src="uploadHeadimg" v-else>
-						</image>
-						<view class="btn" @click="changeAvatar()">修改头像</view>
+          <image @click="previewImage(editHeadimg)" class="pic" :src="editHeadimg"></image>
+          <view class="btn">
+            <AQUplodeImage
+                :uploadUrl=uploadUrl
+                :extraData="{ input_name: 'headimg', formData:{} }"
+                @uplodeImageRes="uplodeImageRes"
+            >
+              修改头像
+            </AQUplodeImage>
+          </view>
 				</view>
 			</view>
 
@@ -28,18 +33,18 @@
 						账号 <text class="required"></text>
 					</view>
 					<view class="input">
-						<input disabled placeholder="暂无" v-model="formData.username" />
+						<input disabled placeholder="暂无" v-model="formData.memberHasOne.mobile" />
 					</view>
 				</view>
 
-				<view class="item">
-					<view class="title">
-						住址 <text class="required"></text>
-					</view>
-					<view class="input">
-						<input placeholder="暂无" v-model="formData.address" />
-					</view>
-				</view>
+<!--				<view class="item">-->
+<!--					<view class="title">-->
+<!--						住址 <text class="required"></text>-->
+<!--					</view>-->
+<!--					<view class="input">-->
+<!--						<input placeholder="暂无" v-model="formData.address" />-->
+<!--					</view>-->
+<!--				</view>-->
 
 				<view class="item">
 					<view class="title">
@@ -57,33 +62,30 @@
 						性别 <text class="required">*</text>
 					</view>
 					<view class="input">
-						<input placeholder="请选择性别" v-model="sex_name" @click="picker_show_sex=true" />
+						<input placeholder="请选择性别" v-model="formData.gender_name" @click="picker_show_sex=true" />
 						<fui-picker layer="1" :linkage="true" :options="options_sex_arr" :show="picker_show_sex"
-							@change="changePickerSex" @cancel="picker_sex_show=false"></fui-picker>
+							@change="changePickerSex" @cancel="cancelPickerSex"></fui-picker>
 					</view>
 				</view>
 
 				<view class="item">
 					<view class="title">
-						生日 <text class="required">*</text>
+						年龄 <text class="required">*</text>
 					</view>
 					<view class="input">
-						<input placeholder="请选择生日" @click="picker_show_birthday=true" v-model="formData.birthday" />
-						<fui-date-picker :minDate="minDate" :maxDate="maxDate" :show="picker_show_birthday" type="3"
-							@change="changePickerBirthday" @cancel="picker_show_birthday=false"></fui-date-picker>
-					</view>
+            <input type="number" v-model.number="formData.age" :min="3" :max="18" placeholder="请输入年龄" @input="handleAgeInput" />          </view>
 				</view>
 			</view>
 
 			<view class="section">
-				<view class="item">
-					<view class="title">
-						邮箱 <text class="required">*</text>
-					</view>
-					<view class="input">
-						<input v-model="formData.email" placeholder="请输入邮箱" />
-					</view>
-				</view>
+<!--				<view class="item">-->
+<!--					<view class="title">-->
+<!--						邮箱 <text class="required">*</text>-->
+<!--					</view>-->
+<!--					<view class="input">-->
+<!--						<input v-model="formData.email" placeholder="请输入邮箱" />-->
+<!--					</view>-->
+<!--				</view>-->
 
 				<view class="item">
 					<view class="title">
@@ -102,45 +104,37 @@
 </template>
 
 <script>
+	import apiRoute from '@/api/apiRoute.js';
 	import member from '@/api/member.js';
 	import {
 		Api_url
 	} from "@/common/config.js";
 	import AQTabber from "@/components/AQ/AQTabber"
+  import AQUplodeImage from '@/components/AQ/AQUplodeImage';//单图上传组件
 
 
 	export default {
 		components: {
 			AQTabber,
+      AQUplodeImage,
 		},
 		data() {
 			return {
-				member_info: [],
-				formData: {
-					images_arr: [],
-					name: '', //姓名
-					email: '', //邮箱
-					tel: '', //手机
-					wx: '', //微信
-					sex: '', //性别
-					birthday: '', //生日
-				},
+				member_info: {},
+
 
 				//上传图片APi路径
-				uploadUrl: `${Api_url}/file/image`,
+				uploadUrl: `${Api_url}/memberUploadImage`,
 
 				//性别选择器 相关
 				picker_show_sex: false,
 				sex_name: '请选择',
-				options_sex_arr: [{
-						value: 1,
-						text: '男'
-					},
-					{
-						value: 2,
-						text: '女'
-					},
-				],
+        options_sex_arr: [
+          // {
+          //   value: 1,
+          //   text: '男'
+          // },
+        ],
 
 				//生日选择器相关
 				minDate: '',
@@ -149,79 +143,81 @@
 				upload_type: 1,
 				uploadHeadimg: '',
 				editHeadimg: '',
+
+        //表单
+        formData: {
+          headimg:'',//头像
+          name:'',//姓名
+          course_arr:[],//课程
+          gender:'',//性别: male-男性, female-女性, other-其他
+          gender_name:'',//性别: male-男性, female-女性, other-其他
+          age:'',//年龄
+          phone_number:'',//手机号
+        },
 			}
 		},
 		onLoad() {},
 		onShow() {
 			this.init()
-			this.member_init()
 		},
 		methods: {
 
 			async init() {
+			  await this.memberInfo()
+			  await this.getSexDict()
 				this.getBirthday()
 			},
 
 			//获取学员信息
-			async member_init() {
-				const member_in = await member.member();
-				if (member_in.code == 1) {
-					this.member_info = member_in.data
-					this.formData = {
-						...this.member_info
-					}
-					this.sex_name = member_in.data.gender
-				} else {
-					this.member_info = []
-				}
+			async memberInfo() {
+				let res = await apiRoute.xy_memberInfo({})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        this.formData = res.data
+
+        this.formData.headimg = res.data.memberHasOne ? res.data.memberHasOne.headimg  : $util.img('/uniapp_src/static/images/common/yong_hu.png')
+        this.editHeadimg = this.formData.headimg
+
+        console.log('xq',this.formData)
 			},
 
-			// 修改头像按钮
-			changeAvatar() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed'],
-					sourceType: ['album', 'camera'],
-					success: (res) => {
-						const tempFilePath = res.tempFilePaths[0]
-						// 这里可以调用上传接口
-						this.uploadFilePromise(tempFilePath)
-					}
-				})
-			},
-			uploadFilePromise(url) {
-				let token = uni.getStorageSync('token') || ''
-				let a = uni.uploadFile({
-					url: this.uploadUrl, //仅为示例，非真实的接口地址
-					filePath: url,
-					name: 'file',
-					header: {
-						'token': `${token}`, //请求头设置token
-					},
-					success: (e) => {
-						let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
-						console.log('上传成功2', res)
-						if (res.code == 1) {
-							this.upload_type = 2
-							this.formData.headimg = res.data.path
-							this.editHeadimg = res.data.path
-							this.uploadHeadimg = res.data.url
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							})
-						}
-					},
-				});
-			},
+      //获取性别字典
+      async getSexDict() {
+        let res = await apiRoute.common_Dictionary({key:'zy_sex'})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+
+        let dictionary =  res.data.dictionary
+        let arr = []
+        dictionary.forEach((v,k)=>{
+          arr.push({
+            text: v.name,
+            value: v.value,
+          })
+        })
+        this.options_sex_arr = arr
+      },
+
 			//性别选择相关
 			changePickerSex(e) {
 				console.log('监听选择', e)
-				this.sex_name = e.text
-				this.formData.sex = e.value
-				this.picker_show_sex = false
+				this.formData.gender_name = e.text
+				this.formData.gender = e.value
+				this.cancelPickerSex()
 			},
+      cancelPickerSex(){
+			  this.picker_show_sex = false
+      },
 
 			//生日选择相关
 			//获取当前年月日+获取30年前的日期
@@ -270,12 +266,52 @@
 				this.picker_show_birthday = false
 			},
 
+      //监听-年龄修改
+      handleAgeInput(e) {
+        let age = e.detail.value;
+        if (age < 3) {
+          uni.showToast({
+            title: '年龄不能小于3岁',
+            icon: 'none'
+          });
+          this.formData.age = 3;
+        } else if (age > 18) {
+          uni.showToast({
+            title: '年龄不能大于18岁',
+            icon: 'none'
+          });
+          this.formData.age = 18;
+        } else {
+          this.formData.age = age;
+        }
+      },
+
+
+      //文件上传回调
+      uplodeImageRes(resData,extraData){
+        console.log('上传成功回调',resData,extraData)
+        //判断是不是上传相册图片
+        if (extraData.input_name == 'headimg') {
+          console.log('收到的图片地址:', resData.url);
+          this.editHeadimg = resData.url;
+          alert(this.formData.headimg)
+        }
+      },
+
+      //图片预览
+      previewImage(url){
+        uni.previewImage({
+          current: url, // 当前图片地址
+          urls: [url]   // 所有图片列表（可以是多个）
+        });
+      },
+
 			//提交信息
 			submit() {
 				console.log(this.editHeadimg, '111')
-				if(this.editHeadimg == ''){
-					this.editHeadimg = this.formData.headimg
-				}
+				// if(this.editHeadimg == ''){
+				// 	this.editHeadimg = this.formData.headimg
+				// }
 				member.member_edit({
 					header: this.editHeadimg,
 					name: this.formData.name,
@@ -297,7 +333,9 @@
 						})
 					}
 				})
-			}
+			},
+
+
 
 		}
 	}