Merge branch 'master' of http://gitlab.frkj.cc/php/ZhiHuiJiaoWu_UniApp

api/apiRoute.js

@@ -31,6 +31,13 @@ export default {
             return res;
         })
     },
+    //教师/销售端详情
+    editPersonnelInfo(data = {}) {
+        let url = '/personnel/edit'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
 
 
 

pages/market/my/info.vue

@@ -8,7 +8,7 @@
           <image
               @click="changeAvatar()"
               class="pic"
-              :src="$util.img(formData.header)"
+              :src="$util.img(formData.head_img)"
           ></image>
 
           <view class="btn" @click="changeAvatar()">修改头像</view>
@@ -39,7 +39,7 @@
             部门 <text class="required"></text>
           </view>
           <view class="input">
-            <input disabled placeholder="暂无" />
+            <input disabled :placeholder="formData.department_name_str" />
           </view>
         </view>
 
@@ -59,14 +59,14 @@
             性别 <text class="required">*</text>
           </view>
           <view class="input">
-            <input placeholder="请选择性别" v-model="formData.gender" @click="picker_show_sex=true"/>
+            <input placeholder="请选择性别" v-model="formData.gender_str" @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"
+                @cancel="picker_show_sex=false"
             ></fui-picker>
           </view>
         </view>
@@ -122,6 +122,7 @@
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js';
 import marketApi from '@/api/market.js';
 import {
   Api_url
@@ -136,11 +137,12 @@ export default {
   data() {
     return {
       formData:{
-        header:'',//头像地址
+        head_img:'',//头像地址
         name:'',//姓名
         username:'',//账号
         address:'',//住址
-        gender:'',//性别|男,女
+        gender:'',//性别|1男,2女
+        gender_str:'',
         birthday:'',//生日
         email:'',//邮箱
         phone:'',//手机
@@ -150,7 +152,7 @@ export default {
       userInfo: {},
 
       //上传图片APi路径
-      uploadUrl: `${Api_url}/file/image`,
+      uploadUrl: `${Api_url}/uploadImage`,
 
       //性别选择器 相关
       picker_show_sex: false,
@@ -197,7 +199,7 @@ export default {
 
     //获取用户详情
     async getUserInfo(){
-      let res = await marketApi.member({})
+      let res = await apiRoute.getPersonnelInfo({})
       if (res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -206,21 +208,28 @@ export default {
         return
       }
 
+      let gender_str = ''
+      if(res.data.gender == 1){
+        gender_str = '男'
+      }else if(res.data.gender == 2){
+        gender_str = '女'
+      }
+
       //用户表单
       this.formData = {
-        header: res.data.headimg,//头像地址
+        head_img: res.data.head_img,//头像地址
         name: res.data.name,//姓名
-        username: res.data.username,//账号
+        username: res.data.phone,//账号
         address: res.data.address,//住址
-        gender: res.data.gender,//性别|男,女
+        gender: res.data.gender,//性别|1男,2女
+        gender_str:gender_str,
         birthday: res.data.birthday,//生日
-        email: res.data.email,//邮箱
+        email: res.data.email || '',//邮箱
         phone: res.data.phone,//手机
         wx: res.data.wx || '',//微信号
         member_level_name: res.data.member_level_name || '',//等级名称
+        department_name_str:res.data.department_name_str || '暂无',//部门名称
       }
-      console.log(123,this.formData);
-
     },
 
     // 修改头像按钮
@@ -250,7 +259,7 @@ export default {
           console.log('上传成功2', res)
           if (res.code == 1) {
             this.upload_type = 2
-            this.formData.header = res.data.path
+            this.formData.head_img = res.data.url
             // this.editHeadimg = res.data.path
             // this.uploadHeadimg = res.data.url
           } else {
@@ -262,24 +271,12 @@ export default {
         },
       });
     },
-    //修改头像Api
-    async editPic(pic) {
-      let res = await salesmanApi.editPic({pic: pic})
-      if (res.code >= 0) {
-        this.$util.showToast({
-          title: '修改成功'
-        })
-      } else {
-        this.$util.showToast({
-          title: res.message
-        })
-      }
-    },
 
     //性别选择相关
     changePickerSex(e) {
       console.log('监听选择', e)
-      this.formData.gender = e.text
+      this.formData.gender = e.value
+      this.formData.gender_str = e.text
       this.picker_show_sex = false
     },
 
@@ -334,7 +331,7 @@ export default {
     async submit() {
       let data = {...this.formData}
 
-      if(!data.header){
+      if(!data.head_img){
         uni.showToast({
           title: '请上传头像',
           icon: 'none'
@@ -383,7 +380,7 @@ export default {
       }
 
 
-      let res = await marketApi.memberEdit(data)
+      let res = await apiRoute.editPersonnelInfo(data)
       if(res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -395,8 +392,10 @@ export default {
         title: res.msg,
         icon: 'success'
       })
-
-      this.getUserInfo()
+      //延迟1s执行
+      setTimeout(() => {
+        this.getUserInfo()
+      }, 1000)
     },
 
 

pages/student/login/login.vue

@@ -16,6 +16,7 @@
         <fui-input borderTop placeholder="登录账号" v-model="user" @input="input"
                    backgroundColor="#f2f2f2"></fui-input>
       </view>
+
       <view style="width: 95%;margin: auto;">
         <fui-input borderTop :padding="['20rpx','32rpx']" v-model="password1" placeholder="登录密码"
                    :password="password" @input="input" backgroundColor="#f2f2f2">
@@ -23,6 +24,28 @@
                     @click="change"></fui-icon>
         </fui-input>
       </view>
+
+      <view style="width: 95%;height: 30rpx;"></view>
+      <view style="width: 95%;margin:30rpx auto;">
+        <fui-input
+            @click="picker_show_loginType=true"
+            v-model="loginType_str"
+            placeholder="请选择登录类型"
+            backgroundColor="#f2f2f2"
+        >
+          <fui-icon name="arrowdown" color="#B2B2B2" :size="50"
+                    @click="change"></fui-icon>
+        </fui-input>
+        <fui-picker
+            layer="1"
+            :linkage="true"
+            :options="loginType_Arr"
+            :show="picker_show_loginType"
+            @change="changePicker_loginType"
+            @cancel="picker_show_loginType=false"
+        ></fui-picker>
+      </view>
+
       <view style="width: 95%;margin:60rpx auto;">
         <fui-button background="#00be8c" radius="5rpx" @click="login">登录</fui-button>
       </view>
@@ -42,13 +65,32 @@ export default {
   data() {
     return {
       password: true,
-      user: '15374889135', //账户
-      password1: '15374889135', //密码
+      user: '', //账户
+      password1: '', //密码
+
       loginType:'',//登陆类型|1=教练,2=销售,3=学员
+      loginType_str:'',//登陆类型中文名字
+      loginType_Arr:[
+        {
+          value: '1',
+          text: '教师登陆'
+        },
+        {
+          value: '2',
+          text: '销售登陆'
+        },
+        {
+          value: '3',
+          text: '学员登陆'
+        }
+      ],
+      picker_show_loginType:false,//是否显示下拉窗组件
     }
   },
   onLoad(options) {
-    this.loginType = options.loginType ?? '1'//登陆类型|1=教练,2=销售,3=学员
+    this.loginType = options.loginType ?? '2'//登陆类型|1=教练,2=销售,3=学员
+    const selectedItem = this.loginType_Arr.find(item => item.value === String(this.loginType));
+    this.loginType_str = selectedItem ? selectedItem.text : '未知类型';
     // uni.hideHomeButton()
     // console.log(uni.getStorageSync('um_id'))
   },
@@ -66,6 +108,30 @@ export default {
     },
     //登陆
     async login() {
+
+      if (!this.user) {
+        uni.showToast({
+          title: '请输入用户名',
+          icon: 'none'
+        })
+        return
+      }
+      if (!this.password1) {
+        uni.showToast({
+          title: '请输入密码',
+          icon: 'none'
+        })
+        return
+      }
+
+      if (!this.loginType) {
+        uni.showToast({
+          title: '请选择登陆类型',
+          icon: 'none'
+        })
+        return
+      }
+
       let item = {};
       item['username'] = this.user
       item['password'] = this.password1
@@ -81,6 +147,7 @@ export default {
 		  }
 		  res = await apiRoute.personnelLogin(params)		  
       }else if(this.loginType == 2){
+
         //销售
         let params = {
           'phone': this.user,
@@ -153,6 +220,30 @@ export default {
         }
       });
     },
+
+    //登录类型选择相关
+    changePicker_loginType(e){
+      console.log('监听选择', e)
+      this.loginType = e.value
+      this.loginType_str = e.text
+      this.picker_show_loginType = false
+
+      //@todo 上线时请删除这个判断
+      if(this.loginType == 1){
+        //教师端
+        this.user= '15374889135' //账户
+        this.password1= '15374889135' //密码
+      }else if(this.loginType == 2){
+        //销售端
+        this.user= '15148228108' //账户
+        this.password1= '123123' //密码
+      }else{
+        //学生端
+        this.user= '' //账户
+        this.password1= '' //密码
+      }
+
+    },
   }
 }
 </script>