auto commit

.env.development

@@ -0,0 +1,9 @@
+# 开发环境配置
+NODE_ENV = development
+
+# 开发环境
+VUE_APP_BASE_API = '/company-api'
+
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -0,0 +1,5 @@
+# 生产环境配置
+NODE_ENV = production
+
+# 生产环境
+VUE_APP_BASE_API = 'http://172.16.90.64:7200/company/'

src/App.vue

@@ -16,26 +16,50 @@
       </span>
     </el-dialog>
     <!--Waves Container-->
-	<div class="page-bottom">
-	<svg class="waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	viewBox="0 24 150 28" preserveAspectRatio="none" shape-rendering="auto">
-	<defs>
-	<path id="gentle-wave" d="M-160 44c30 0 58-18 88-18s 58 18 88 18 58-18 88-18 58 18 88 18 v44h-352z" />
-	</defs>
-	<g class="parallax">
-	<use xlink:href="#gentle-wave" x="48" y="0" fill="rgba(255,255,255,0.7" />
-	<use xlink:href="#gentle-wave" x="48" y="3" fill="rgba(255,255,255,0.5)" />
-	<use xlink:href="#gentle-wave" x="48" y="5" fill="rgba(255,255,255,0.3)" />
-	<use xlink:href="#gentle-wave" x="48" y="7" fill="#fff" />
-	</g>
-	</svg>
-  <div class="content-wrap">
-    <div class="content">
-      提示：退役军人用"veteMemberId",企业使用用户名登录。
+    <div class="page-bottom">
+      <svg
+        class="waves"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        viewBox="0 24 150 28"
+        preserveAspectRatio="none"
+        shape-rendering="auto"
+      >
+        <defs>
+          <path
+            id="gentle-wave"
+            d="M-160 44c30 0 58-18 88-18s 58 18 88 18 58-18 88-18 58 18 88 18 v44h-352z"
+          />
+        </defs>
+        <g class="parallax">
+          <use
+            xlink:href="#gentle-wave"
+            x="48"
+            y="0"
+            fill="rgba(255,255,255,0.7"
+          />
+          <use
+            xlink:href="#gentle-wave"
+            x="48"
+            y="3"
+            fill="rgba(255,255,255,0.5)"
+          />
+          <use
+            xlink:href="#gentle-wave"
+            x="48"
+            y="5"
+            fill="rgba(255,255,255,0.3)"
+          />
+          <use xlink:href="#gentle-wave" x="48" y="7" fill="#fff" />
+        </g>
+      </svg>
+      <div class="content-wrap">
+        <div class="content">
+          提示：退役军人用"veteMemberId",企业使用企业ID登录。
+        </div>
+      </div>
     </div>
-  </div>
-	</div>
-	<!--Waves end-->
+    <!--Waves end-->
   </div>
 </template>
 

src/api/index.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import qs from 'qs';
 
 const API_DOMAIN = 'https://service-c2zjvuxa-1252463788.gz.apigw.tencentcs.com';
+let MY_API_DOMAIN = process.env.VUE_APP_BASE_API;
 
 export async function getSmsVerifyCode(phoneNum) {
   let data = {
@@ -13,7 +14,7 @@ export async function getSmsVerifyCode(phoneNum) {
 }
 
 export async function loginSystemByVerifyCode(loginInfo) {
-  const {phoneNum, sessionId, verifyCode} = loginInfo;
+  const { phoneNum, sessionId, verifyCode } = loginInfo;
   let data = {
     method: 'login',
     phone: phoneNum,
@@ -70,3 +71,24 @@ function buildOptions(data, apiPath) {
     url: `${API_DOMAIN}${apiPath}`,
   }
 }
+// 查询退役军人信息
+export function memberinfo(data) {
+  let params = {
+    method: 'get',
+    headers: { 'content-type': 'application/json' },
+    params: data,
+    url: `${MY_API_DOMAIN}memberinfo/findById`,
+  }
+  return axios(params);
+}
+// 查询公司信息
+export function companyInfo(data) {
+  let params = {
+    method: 'get',
+    headers: { 'content-type': 'application/json' },
+    params: data,
+    url: `${MY_API_DOMAIN}/tcompany/getCompanyInfoById`,
+  }
+  return axios(params);
+}
+

src/components/home-page/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home-page-container">
     <div class="home-page-header">
-      <img class="portrait" src="../../../static/images/avatar15.png" alt="" />
+      <img class="portrait" :src="loginUserInfo.loginsPortrait" alt="" />
       {{ loginUserInfo && (loginUserInfo.name || loginUserInfo.userId) }}
       欢迎您！
     </div>
@@ -46,7 +46,7 @@ export default {
   },
   created() {
     // console.log("this.veteMemberId", this.veteMemberId);
-    // console.log("loginUserInfo", this.loginUserInfo);
+    console.log("loginUserInfo", this.loginUserInfo);
     if (this.veteMemberId && this.isLogin) {
       this.goto("/video-call");
     }

src/components/login/index.vue

@@ -3,7 +3,7 @@
     <el-input
       placeholder="用户ID"
       v-model="UserID"
-      maxlength="11"
+      maxlength="20"
       class="phone-num"
     ></el-input>
     <el-button class="user-login-btn" @click="handleLogin">登陆</el-button>
@@ -12,12 +12,14 @@
 
 <script>
 import { genTestUserSig } from "../../../public/debug/GenerateTestUserSig";
+import { companyInfo } from "../../api";
 
 export default {
   name: "Login",
   data() {
     return {
-      UserID: "",
+      UserID: "613912321546268672",
+      loginInfo: {},
       verifyCode: "",
       disableFetchCodeBtn: false,
     };
@@ -30,25 +32,39 @@ export default {
     }
   },
   methods: {
-    handleLogin: async function () {
-      console.log("userid");
+    async handleLogin() {
       if (!this.UserID) {
         this.$message.error("请输入用户ID");
         return;
       }
 
-      const userSig = genTestUserSig(this.UserID).userSig;
-      const userId = this.UserID;
-      this.$store.commit("userLoginSuccess");
-      this.$store.commit("setLoginUserInfo", {
-        userId,
-        userSig,
-      });
+      companyInfo({ companyId: this.UserID }).then((res) => {
+        if (res.data.code == "200") {
+          this.loginInfo = res.data?.data;
+        } else {
+          this.loginInfo = {};
+        }
+        console.log("this.loginInfo", this.loginInfo);
+
+        const userSig = genTestUserSig(this.UserID).userSig;
+        const userId = this.UserID;
+        const name = this.loginInfo.userName;
+        const loginsPortrait =
+          this.loginInfo.logoFileList[0]?.filesUrl ||
+          "../../../static/images/avatar15.png";
+        this.$store.commit("userLoginSuccess");
+        this.$store.commit("setLoginUserInfo", {
+          userId,
+          name,
+          loginsPortrait,
+          userSig,
+        });
 
-      // 登录 trtcCalling
-      this.$trtcCalling.login({
-        userID: this.UserID,
-        userSig,
+        // 登录 trtcCalling
+        this.$trtcCalling.login({
+          userID: this.UserID,
+          userSig,
+        });
       });
     },
   },

src/components/search-user/index.vue

@@ -28,7 +28,7 @@
         @click="handleCallBtnClick(searchInput)"
         :disabled="call"
         class="user-item-join-btn"
-        >呼叫</el-button
+        >呼叫 <span>{{ veteMemberName }}</span></el-button
       >
     </div>
   </div>
@@ -37,6 +37,7 @@
 <script>
 import { mapState } from "vuex";
 import { getSearchHistory } from "../../utils";
+import { memberinfo } from "../../api";
 
 export default {
   name: "SearchUser",
@@ -56,6 +57,7 @@ export default {
       searchHistoryUser: getSearchHistory(),
       call: false,
       cancel: false,
+      veteMemberName: "",
     };
   },
   computed: {
@@ -75,6 +77,17 @@ export default {
     },
   },
   watch: {
+    searchInput: {
+      handler(value) {
+        if (this.timer) {
+          clearTimeout(this.timer);
+        }
+        this.timer = setTimeout(() => {
+          this.getmemberinfo();
+        }, 1500);
+      },
+      deep: true,
+    },
     callStatus: function (newStatus, oldStatus) {
       if (newStatus !== oldStatus && newStatus === "connected") {
         this.searchInput = "";
@@ -96,6 +109,18 @@ export default {
     this.searchInput = this.veteMemberId;
   },
   methods: {
+    getmemberinfo() {
+      memberinfo({ veteMemberId: this.searchInput }).then((res) => {
+        if (res.data.code == "200") {
+          this.veteMemberName = res.data?.data?.data?.veteName;
+        } else {
+          this.veteMemberName = "";
+        }
+        // console.log("res.code", res.data.code);
+        // console.log("this.veteMemberName", this.veteMemberName);
+        // console.log("getmemberinfo", res.data.data.data.veteName);
+      });
+    },
     handleCallBtnClick: function (param) {
       if (param === this.loginUserInfo.userId) {
         this.$message("请输入正确用户ID");

src/components/video-call/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="video-call-section">
     <div class="video-call-section-header">
-      <img class="portrait" src="../../../static/images/avatar15.png" alt="" />
+      <img class="portrait" :src="loginUserInfo.loginsPortrait" alt="" />
       {{ loginUserInfo && (loginUserInfo.name || loginUserInfo.userId) }}
       欢迎您！
     </div>

src/store/index.js

@@ -29,9 +29,9 @@ function createStore() {
         state.loginUserInfo = null;
       },
       setLoginUserInfo(state, payload) {
-        const { userId, userSig } = payload;
+        const { userId, userSig, name, loginsPortrait } = payload;
         state.loginUserInfo = {
-          userId, userSig
+          userId, userSig, name, loginsPortrait
         }
       },
       updateIsInviter(state, isInviter) {

static/css/style.css

@@ -13,8 +13,10 @@ body {
   margin: 0;
   padding: 0;
   /* background: rgb(4, 22, 43); */
-  height: 100%;
-    background: linear-gradient(60deg, rgba(84,58,183,1) 0%, rgba(0,172,193,1) 100%);
+  min-height: 100%;
+  background: linear-gradient(60deg, rgba(84,58,183,1) 0%, rgba(0,172,193,1) 100%);
+  box-sizing: border-box;
+  padding-bottom: 207px;
 }
 .el-button.red {
     background-color: rgb(192, 36, 40);

vue.config.js

@@ -1,4 +1,17 @@
 // vue.config.js
 module.exports = {
-  publicPath: './'
+  publicPath: './',
+  devServer: {
+    proxy: {
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `http://wx.hw.hongweisoft.com/veterans/company/`,
+        target: `http://172.16.90.64:7200/company/`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+        }
+      }
+    },
+    disableHostCheck: true
+  },
 }