Merge pull request '重新修改了页脚相关内容' (#4) from lq/Glass-ERP-Vue:test into test

Reviewed-on: http://www.gitea.hrbnu.club/Big-Data-Lab/Glass-ERP-Vue/pulls/4

src/components/page/GlobalFooter.vue

@@ -1,19 +1,5 @@
 <template>
-  <div class="footer">
+  <div class="footer"></div>
-    <div class="links">
-      <a href="http://www.jeecg.com" target="_blank">JEECG 首页</a>
-      <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">
-        <a-icon type="github" />
-      </a>
-      <a href="https://ant.design/">Ant Design</a>
-      <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
-    </div>
-    <div class="copyright">
-      Copyright
-      <a-icon type="copyright" />
-      2023 <span> 哈尔滨师范大学人工智能大数据实验室 出品</span>
-    </div>
-  </div>
 </template>
 
 <script>

src/views/user/third/ThirdLogin.vue

@@ -2,13 +2,18 @@
   <div>
     <div class="user-login-other">
       <span>其他登录方式</span>
-      <a @click="onThirdLogin('github')" title="github"><a-icon class="item-icon" type="github"></a-icon></a>
+      <a href="https://www.baidu.com" title="github"><a-icon class="item-icon" type="github"></a-icon></a>
-      <a @click="onThirdLogin('wechat_enterprise')" title="企业微信"> <icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
+      <a href="https://www.baidu.com" title="企业微信"> <icon-font class="item-icon" type="icon-qiyeweixin3"/></a>
-      <a @click="onThirdLogin('dingtalk')" title="钉钉"><a-icon class="item-icon" type="dingding"></a-icon></a>
+      <a href="https://www.baidu.com" title="钉钉"><a-icon class="item-icon" type="dingding"></a-icon></a>
-      <a @click="onThirdLogin('wechat_open')" title="微信"><a-icon class="item-icon" type="wechat"></a-icon></a>
+      <a href="https://www.bing.com" title="微信"><a-icon class="item-icon" type="wechat"></a-icon></a>
     </div>
     <!-- 第三方登录绑定账号密码输入弹框 -->
-    <a-modal title="请输入密码" :visible="thirdPasswordShow" @ok="thirdLoginCheckPassword" @cancel="thirdLoginNoPassword">
+    <a-modal
+      title="请输入密码"
+      :visible="thirdPasswordShow"
+      @ok="thirdLoginCheckPassword"
+      @cancel="thirdLoginNoPassword"
+    >
       <a-input-password placeholder="请输入密码" v-model="thirdLoginPassword" />
     </a-modal>
 
@@ -16,7 +21,7 @@
     <a-modal :footer="null" :closable="false" :visible="thirdConfirmShow" :class="'ant-modal-confirm'">
       <div class="ant-modal-confirm-body-wrapper">
         <div class="ant-modal-confirm-body">
-          <a-icon type="question-circle" style="color:#faad14"/>
+          <a-icon type="question-circle" style="color:#faad14" />
           <span class="ant-modal-confirm-title">提示</span>
           <div class="ant-modal-confirm-content">
             已有同名账号存在,请确认是否绑定该账号？
@@ -41,34 +46,27 @@
           <span>绑定手机号</span>
         </a-form-model-item>
         <a-form-model-item>
-          <a-input
+          <a-input size="large" type="text" placeholder="手机号" v-model="thirdPhone">
-              size="large"
+            <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }" />
-              type="text"
-              placeholder="手机号"
-              v-model="thirdPhone">
-            <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
           </a-input>
         </a-form-model-item>
 
         <a-row :gutter="16">
           <a-col class="gutter-row" :span="16">
             <a-form-model-item>
-              <a-input
+              <a-input size="large" type="text" placeholder="请输入验证码" v-model="thirdCaptcha">
-                  size="large"
+                <a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }" />
-                  type="text"
-                  placeholder="请输入验证码"
-                  v-model="thirdCaptcha">
-                <a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
               </a-input>
             </a-form-model-item>
           </a-col>
           <a-col class="gutter-row" :span="8">
             <a-button
-                class="getCaptcha"
+              class="getCaptcha"
-                tabindex="-1"
+              tabindex="-1"
-                :disabled="thirdState.smsSendBtn"
+              :disabled="thirdState.smsSendBtn"
-                @click.stop.prevent="getThirdCaptcha"
+              @click.stop.prevent="getThirdCaptcha"
-                v-text="!thirdState.smsSendBtn && '获取验证码' || (thirdState.time+' s')"></a-button>
+              v-text="(!thirdState.smsSendBtn && '获取验证码') || thirdState.time + ' s'"
+            ></a-button>
           </a-col>
         </a-row>
       </div>
@@ -78,17 +76,17 @@
 
 <script>
 import { JeecgThirdLoginMixin } from '@views/user/third/JeecgThirdLoginMixin'
-import { Icon } from 'ant-design-vue';
+import { Icon } from 'ant-design-vue'
 
 const IconFont = Icon.createFromIconfontCN({
- // scriptUrl: '//at.alicdn.com/t/font_2316098_umqusozousr.js',
+  // scriptUrl: '//at.alicdn.com/t/font_2316098_umqusozousr.js',
-  scriptUrl: '/cdn/font-icon/font_2316098_umqusozousr.js',
+  scriptUrl: '/cdn/font-icon/font_2316098_umqusozousr.js'
-});
+})
 export default {
   name: 'thirdLogin',
   mixins: [JeecgThirdLoginMixin],
   components: {
-    IconFont,
+    IconFont
   }
 }
 </script>
@@ -99,20 +97,20 @@ export default {
   margin-top: 24px;
   line-height: 22px;
 
-.item-icon {
+  .item-icon {
-  font-size: 24px;
+    font-size: 24px;
-  color: rgba(0, 0, 0, .2);
+    color: rgba(0, 0, 0, 0.2);
-  margin-left: 16px;
+    margin-left: 16px;
-  vertical-align: middle;
+    vertical-align: middle;
-  cursor: pointer;
+    cursor: pointer;
-  transition: color .3s;
+    transition: color 0.3s;
 
-&  :hover {
+    & :hover {
-  color: #1890ff;
+      color: #1890ff;
+    }
+  }
+  .register {
+    float: right;
+  }
 }
-}
+</style>
-.register {
-  float: right;
-}
-}
-</style>