qiushang 11 ヶ月 前
コミット
164b6abc0b
3 ファイル変更10 行追加8 行削除
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 6 4
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.0.2.8"
+!define PRODUCT_VERSION        		"2.0.2.9"
 !define PRODUCT_NAME           		"星优图片下载器"
 !define INSTALL_OUTPUT_NAME    		"XYCapture_XY.exe" 
 !define EXE_NAME               		"XYCapture.exe"
 !define PRODUCT_PATHNAME           	"XYCapture"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYCapture"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.8.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.9.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.8"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.9"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCapture",
-	"version": "2.0.2.8",
+	"version": "2.0.2.9",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "capture",

+ 6 - 4
src/renderer/components/home.vue

@@ -123,7 +123,7 @@
 											<div>
 												<div>
 													<el-tag type="info" size="mini" v-if="tbStatus == 1">未检测</el-tag>
-													<el-tag type="success" size="mini" v-if="tbStatus == 2">账号已登录</el-tag>
+													<el-tag type="success" size="mini" v-if="tbStatus == 2">{{menuIndex == '3' ? '天猫' : '淘宝'}}账号已登录</el-tag>
 													<el-link type="danger" style="text-decoration: underline;" v-if="tbStatus == 3" :underline="false" @click="loginUrl('https://login.taobao.com')">未登录,点击登录<span>{{menuIndex == '3' ? '天猫' : '淘宝'}}</span>账号</el-link>
 													<el-button size="mini" type="warning" :loading="checkLoading" style="margin-left: 10px;" :disabled='tbStatus == 2' @click="checkLogin">检测登录状态</el-button>
 												</div>
@@ -417,7 +417,6 @@
 					type: 'warning'
 				}).then(() => {
 						this[type+'List'].splice(rowIndex, 1);
-						this[type+'List'].splice(rowIndex, 1);
 						if(this[type+'List'].length == 0) {
 							this.clearList();
 						}
@@ -504,7 +503,7 @@
 									}else{
 										let info = {
 											url: item[1],
-											title: item[0].trim(),
+											title: item[0].toString().trim(),
 											status: '1',
 											num: 0,
 											newPath: ''
@@ -1458,8 +1457,11 @@
 							outObj.mainImg.push(arr1[i].src);
 						}
 					}
-					//sku图片
+					//sku图片  
 					let arr2 = document.querySelectorAll('.prop-img');
+					if(arr2.length == 0){
+						arr2 = document.querySelectorAll('.sku-item-image');
+					}
 					for(let i=0; i< arr2.length; i++){
 						let src = window.getComputedStyle(arr2[i]).backgroundImage.replace(/url\(["']?(.+?)["']?\)/i, '$1');
 						if(!authority && i < execNum){