Merge remote-tracking branch 'origin/develop' into develop

src/App.vue

@@ -2,25 +2,25 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 18:56:24
+ * @LastEditTime: 2022-12-13 22:10:22
  * @FilePath: /fe-stu/src/App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
   <div id="container">
-<!--    <div id="nav">-->
-<!--      <router-link-->
-<!--        v-for="item in routes"-->
-<!--        :key="item.path"-->
-<!--        :to="item.path"-->
-<!--        :class="{-->
-<!--          link: true,-->
-<!--          active: name === item.name,-->
-<!--        }"-->
-<!--      >-->
-<!--        {{ item.name }}-->
-<!--      </router-link>-->
-<!--    </div>-->
+    <!-- <div id="nav">
+      <router-link
+        v-for="item in routes"
+        :key="item.path"
+        :to="item.path"
+        :class="{
+          link: true,
+          active: name === item.name,
+        }"
+      >
+        {{ item.name }}
+      </router-link>
+    </div> -->
     <main>
       <router-view />
     </main>
@@ -34,7 +34,7 @@ export default defineComponent({
     const router = useRouter();
     const route = useRoute();
     console.log("router", router.getRoutes(), route);
-    console.log(import.meta.env.DEV)
+    console.log(import.meta.env.DEV);
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/views/ballot/BallotPage.vue

@@ -122,8 +122,7 @@
           <div class="right">
             <div class="righttitle">
               <img
-                width="20px"
-                height="20px"
+                style="width: 20px; height: 20px"
                 src="../../assets/image/yuan.png"
               />
               <div class="text">投票时间</div>
@@ -154,8 +153,7 @@
             </div>
             <div class="righttitle">
               <img
-                width="20px"
-                height="20px"
+                style="width: 20px; height: 20px"
                 src="../../assets/image/yuan.png"
               />
 

vite.config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 17:28:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-12 16:49:27
+ * @LastEditTime: 2022-12-13 20:49:00
  * @FilePath: /fe-stu/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -13,7 +13,8 @@ import {viteMockServe} from 'vite-plugin-mock'
 import topLevelAwait from "vite-plugin-top-level-await";
 
 const path = require('path')
-const url = 'http://localhost:30001'
+// const url = 'http://localhost:30001'
+const url = 'http://111.231.196.214:12013/manageApi'
 export default defineConfig(({ command }) =>
 ({
     base: '/fe-student',