Browse Source

短视频

DESKTOP-6ESHLVF\admin 4 years ago
parent
commit
e106bf7d4b

+ 3 - 3
.env.test

@@ -1,7 +1,7 @@
 VUE_APP_Name='测试环境'
 VUE_APP_Host='https://mem.360lj.com/ym2'
-VUE_APP_DoctorUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=1&backurl=https://mem.360lj.com/ui/SignUp'
-VUE_APP_PartnerUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=2&backurl=https://mem.360lj.com/ui/SignUp'
-VUE_APP_PatientUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=0&backurl=hhttps://mem.360lj.com/ui/PatientUser'
+VUE_APP_DoctorUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=1&backurl=https://mem.360lj.com/ui2/SignUp'
+VUE_APP_PartnerUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=2&backurl=https://mem.360lj.com/ui2/SignUp'
+VUE_APP_PatientUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=0&backurl=hhttps://mem.360lj.com/ui2/PatientUser'
 VUE_APP_Url='https://mem.360lj.com/ym2'
 VUE_APP_DoctorAPIUrl = '/ym2'

+ 2 - 1
src/api/ShortVideo/ShortVideo.js

@@ -153,7 +153,8 @@ export const uploadFileByDoctor = (data) => {
 
 // 获取用户基本信息
 export const getUserInfo = (data) => {
-  return api.post(host + '/api/Account/GetUserInfo', data)
+  // return api.post(host + '/api/Account/GetUserInfo', data)
+  return api.post(java_host + '/ymall/user/GetUserInfo', data)
 }
 
 

+ 3 - 2
src/api/api.js

@@ -259,7 +259,7 @@ export default {
          Region (string, optional): 所属地区
      */
   UpdateAccount(obj) {
-    return api.post(host + "/api/Account/UpdateAccount", obj);
+    return api.post(host2 + "/ymall/user/UpdateAccount", obj);
   },
 
   // 生成图片验证码
@@ -283,7 +283,8 @@ export default {
 
   // 获取用户资料
   GetPatientInfo() {
-    return api.post(host + "/api/Account/GetUserInfo");
+    // return api.post(host + "/api/Account/GetUserInfo");
+    return api.post(host2 + '/ymall/user/GetUserInfo')
   },
 
   // 用户  获取家庭成员列表

+ 12 - 12
src/views/patient/PatientUser/PatientUser.vue

@@ -5,18 +5,18 @@
       <div>
         <div>
           <img
-            v-if="!UserData && UserData.HeadImg"
+            v-if="!UserData && UserData.headimg"
             src="../../../assets/images/default.png"
             alt
           />
           <img
-            v-if="UserData && UserData.HeadImg"
-            :src="UserData.HeadImg"
+            v-if="UserData && UserData.headimg"
+            :src="UserData.headimg"
             alt
           />
         </div>
         <p>
-          {{ UserData.NickName }}
+          {{ UserData.nickname }}
           <!-- <span>用户</span> -->
         </p>
       </div>
@@ -101,10 +101,10 @@ export default {
     // 当用户第一次进入时  GetPatientInfo 返回信息里经纬度为 null  调用改方法修改用户经纬度 确认用户位置且无法更改
     UpdateAccount() {
       var obj = {
-        Longitude: this.Location.lng,
-        Latitude: this.Location.lat,
-        RegionCode: this.Location.adcode,
-        Region: this.Location.province + this.Location.city
+        longitude: this.Location.lng,
+        latitude: this.Location.lat,
+        regionCode: this.Location.adcode,
+        region: this.Location.province + this.Location.city
       };
       this.$http.UpdateAccount(obj).then(res => {
         console.log(res);
@@ -113,10 +113,10 @@ export default {
 
     GetPatientInfo() {
       this.$http.GetPatientInfo().then(res => {
-        if (res.data.IsSuccess) {
-          this.UserData = res.data.ResultObject;
+        if (res.data.success) {
+          this.UserData = res.data.result;
           // 病人本地信息
-          if (!this.UserData.Longitude && !this.UserData.Latitude) {
+          if (!this.UserData.longitude && !this.UserData.latitude) {
             this.map.getLocation({
               success: e => {
                 console.log(e);
@@ -130,7 +130,7 @@ export default {
           }
           sessionStorage.setItem("patientInfo", JSON.stringify(this.UserData));
         } else {
-          this.$toast(res.data.ResultMsg);
+          this.$toast(res.data.message);
         }
       });
     }

+ 5 - 5
src/views/shortVideo/OneVideoPlayer.vue

@@ -145,12 +145,12 @@
       _getUserInfo() {
         getUserInfo()
           .then(({ data }) => {
-            if (data.IsSuccess) {
-              const { userRoles } = data.ResultObject
-              let findResult = userRoles.find(item => item.UserRoleType === 1)
-              this.userType = findResult.UserRoleType
+            if (data.success) {
+              const { userRoles } = data.result
+              let findResult = userRoles.find(item => item.userRoleType === 1)
+              this.userType = findResult.userRoleType
             } else {
-              this.$toast.fail(data.ResultMsg)
+              this.$toast.fail(data.message)
             }
           })
           .catch(error => {