Merge branch 'master' of http://gitlab.pubdata.cn/liangyibo/CameraMachine

frontend/.env.development

@@ -1,2 +1,2 @@
 NODE_ENV=development
-API_HOST = http://dev2.pubdata.cn
+API_HOST = http://dev2.valimart.net

frontend/.env.production

@@ -1,3 +1,3 @@
 NODE_ENV=production
-API_HOST = http://dev2.pubdata.cn
+API_HOST = http://dev2.valimart.net
 

frontend/src/views/Photography/detail.vue

@@ -468,7 +468,7 @@ const openLoadingDialog = (timer: number) => {
   const step = 100 / timer
   INTERVAL.value = setInterval(() => {
     if (progress.value < 100) {
-      progress.value = Math.round(progress.value + step)
+      progress.value = Math.min(Math.round(progress.value + step),100)
     }
   }, 1000)
 }

frontend/vite.config.ts

@@ -61,7 +61,7 @@ export default ({mode, command})=> {
         // 当请求以'/api'开头时，将其代理到目标服务器
         '/api': {
           // 目标服务器的地址
-          target: 'http://dev2.pubdata.cn',
+          target: 'https://dev2.valimart.net',
           // 允许更改目标服务器的来源
           changeOrigin: true
         },