qiushang преди 2 седмици
родител
ревизия
986174820e
променени са 3 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 4 4
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "b4X0GBHb95VN"
-!define PRODUCT_VERSION        		"2.1.1.0"
+!define PRODUCT_VERSION        		"2.1.1.1"
 !define PRODUCT_NAME           		"星优链接复制器"
 !define INSTALL_OUTPUT_NAME    		"XYLinks_XY.exe" 
 !define EXE_NAME               		"XYLinks.exe"
 !define PRODUCT_PATHNAME           	"XYLinks"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYLinks"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.1.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.1.1.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/XYLinks/uninstallWeb/?v=2.1.1.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYLinks/uninstallWeb/?v=2.1.1.1"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYLinks",
-	"version": "2.1.1.0",
+	"version": "2.1.1.1",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "links",

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

@@ -787,10 +787,10 @@
 						let waitUntil = 'networkidle2';
 						waitUntil = this.initDevelop().waitUntil;
 						
-						let searchReg = /^https?:\/\/(s|search).taobao.com\/search/;
-						let tbShopReg = /^https?:\/\/(?!www|item|search)(shop\d+|[\w-]+)\.taobao\.com(\/[^\s]*)?$/; //店铺首页
-						let tbShopReg2 = /^https?:\/\/(?!www|item|search)(shop\d+|[\w-]+)\.(taobao|tmall)\.com(\/(search|category)[^\s]*)?$/; // 店铺搜索和店铺分类
-						let tmallShopReg = /^https?:\/\/(?!www|list|detail|search)([\w-]+)\.tmall\.(com|hk)(\/[^\s]*)?$/
+						let searchReg = /^https?:\/\/(s\.|search\.)taobao.com\/search/;
+						let tbShopReg = /^https?:\/\/(?!www\.|item\.|search\.|s\.)(shop\d+\.|[\w-]+\.)taobao\.com(\/[^\s]*)?$/; //店铺首页
+						let tbShopReg2 = /^https?:\/\/(?!www\.|item\.|search\.|s\.)(shop\d+\.|[\w-]+\.)(taobao|tmall)\.com(\/(search|category)[^\s]*)?$/; // 店铺搜索和店铺分类
+						let tmallShopReg = /^https?:\/\/(?!www\.|list\.|detail\.|search\.)([\w-]+\.)tmall\.(com|hk)(\/[^\s]*)?$/
 						let shopGoodsCurrentPage = 1;
 						let shopGoodstotalPage = 1;
 						let tbShopGoods = {