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

electron/config/config.default.js

@@ -64,8 +64,8 @@ module.exports = (appInfo) => {
    * 远程模式-web地址
    */
   config.remoteUrl = {
-    enable: false,
-    url: 'http://localhost:3000'
+    enable: true,
+    url: 'http://localhost:3000/#/home'
   };
 
   /**

frontend/src/views/Photography/detail.vue

@@ -341,6 +341,10 @@ const onSizeChange = (data) => {
 
 // 开始生成操作
 const generate = async function () {
+  if ( form.dataType == '1'  && !form.excel_path) {
+    ElMessage.error('请上传商品基础资料')
+    return
+  }
   const tokenInfoStore = tokenInfo();
   const token = tokenInfoStore.getToken; // 使用 getToken() 获取 token
   let temp_list = []
@@ -362,14 +366,14 @@ const generate = async function () {
   // 开启进度弹窗
   progress.value = 0
   openLoadingDialog(20)
-  requesting.value =  true
+  requesting.value =  false
   console.log("params", "color:#3f7cff", params);
+  partErrList.value = []
   clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
   clientStore.ipc.send(icpList.generate.generatePhotoDetail, params);
   clientStore.ipc.on(icpList.generate.generatePhotoDetail, (event, result) => {
     console.log('result', result)
-    requesting.value =  false
-    partErrList.value = []
+    requesting.value =  true
     clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
     clearInterval(INTERVAL.value)
     if (result.code === 0) {