Merge remote-tracking branch 'origin/dev-frontend' into dev-frontend

electron/config/app.config.json

@@ -1,4 +1,4 @@
 {
   "digiCamControl": "C:\\Program Files (x86)\\digiCamControl",
-  "pyapp": "127.0.0.1"
+  "pyapp": "10.56.42.176"
 }

frontend/src/views/Photography/detail.vue

@@ -21,11 +21,6 @@
           主图LOGO：
         </div>
         <upload :value="form.logoImage" @input="onInput"></upload>
-        <router-link class="mar-left-20 " :to="{
-          name: 'PhotographySeniorDetail'
-        }">
-          <button class="generate-button button--primary1 mar-left-20" @click="generate">去高级详情</button>
-        </router-link>
       </div>
 
       <el-divider />
@@ -93,7 +88,7 @@
       <button class="generate-button button--primary1" @click="generate">开始生成</button>
     </div>
     <el-dialog v-model="dialogVisible">
-      <img w-full :src="dialogImageUrl" alt="Preview Image" />
+      <img style="width: 100%;" :src="dialogImageUrl" alt="Preview Image" />
     </el-dialog>
   </div>
 </template>
@@ -152,7 +147,7 @@ const viewTemplate = (template) => {
   console.log('查看模板详情', template);
   // 展示大图
   dialogVisible.value = true
-  dialogImageUrl.value = 'https://ossimg.valimart.net/uploads/vali_ai/20240312/171022217892595.png'
+  dialogImageUrl.value = 'https://ossimg.valimart.net/uploads/vali_ai/20250218/173984697449910.png'
 
 };
 const onCurrentChange = (page) => {
@@ -164,6 +159,8 @@ const onSizeChange = (data) => {
 const generate = () => {
   // 这里添加实际生成主图和详情的逻辑
   console.log('queryParams', form)
+  
+
 };
 const onInput = (value) => {
   form.logoImage = value
@@ -203,6 +200,8 @@ function openPhotographySeniorDetail() {
   }
   clientStore.ipc.send(icpList.utils.openMain, params);
 }
+
+
 </script>
 
 <style lang="scss" scoped>

frontend/src/views/Photography/seniorDetail.vue

@@ -184,7 +184,7 @@ const selectFolder = () => {
     background: #EAECED;
     padding: 20px;
     overflow-x: hidden;
-    height: 100vh;
+    height: calc(100vh  - 30px);
 
     .card-header {
       display: flex;