qiushang 2 hete
szülő
commit
4ad7c7b764

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "b4X0GBHb95VN"
-!define PRODUCT_VERSION        		"2.1.0.0"
+!define PRODUCT_VERSION        		"2.1.1.0"
 !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.0.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.1.0.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.0.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYLinks/uninstallWeb/?v=2.1.1.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

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

+ 1 - 1
src/renderer/components/header.vue

@@ -104,7 +104,7 @@
 				</div>
 				<div class="micon-btn">
 					<el-button class="micon-btn1" style="margin:0 10px;" v-if="!isClick" @click="next()" :round="true">开始试用</el-button>
-					<el-button class="micon-btn1" style="margin:0 10px;" v-else @click="next()" :round="true">开始下载</el-button>
+					<el-button class="micon-btn1" style="margin:0 10px;" v-else @click="next()" :round="true">开始导出</el-button>
 					<el-button class="micon-btn2" type="primary" @click="openVip()" :round="true">开通会员</el-button>
 				</div>
 			</div>

+ 21 - 13
src/renderer/components/home.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-container style="height: 100vh;">
 			<el-header height="45px" style="background-color: #fafafa; padding: 0 10px;">
-				<soft-header ref="headerRef" @update-soft="updateSoft()" @login-url="loginUrl" @clear-cache="clearCache"></soft-header>
+				<soft-header ref="headerRef" @update-soft="updateSoft()" @export-file="exportRow" @login-url="loginUrl" @clear-cache="clearCache"></soft-header>
 			</el-header>
 							
 			<el-main ref="el-main" style="background-color: #fafafa;">
@@ -270,7 +270,9 @@
 				loginBrowser: null, // 登录用的浏览器实例
 				pauseFlag: true, //暂停中止标志
 				addLoading: false,
-				allLoading: false
+				allLoading: false,
+				
+				downloadRow: '',
 			};
 		},
 		computed: {
@@ -506,16 +508,13 @@
 					message: '提取任务已停止执行'
 				});
 			},
+			// 试用导出链接的回调方法
+			exportRow(flag){
+				let row = this.downloadRow;
+				this.exportPageLinks(row, flag);
+			},
 			//导出全部链接
-			exportLinks(){
-				let authority = this.$refs.headerRef.authority.isAuthority;
-				if(!authority){
-					this.$notify.warning({
-						title: '提示',
-						message: '导出全部链接功能需开通会员'
-					});
-					return false;
-				}
+			exportLinks(flag){
 				let allRows = {
 					title: '商品链接汇总',
 					urls: [],
@@ -548,15 +547,24 @@
 						allUrls = allUrls.concat(this[listNameArr[index]+'List'][i].urls);
 					}
 					allRows.urls = allUrls;
-					this.exportPageLinks(allRows);
 					setTimeout(() => {
 						this.allLoading = false;
 					}, 2000)
+					this.exportPageLinks(allRows);
 				}
 			},
 			// 导出单页链接
-			exportPageLinks(row){
+			exportPageLinks(row, flag){
 				let authority = this.$refs.headerRef.authority.isAuthority;
+				if (!authority && !flag) { // 非会员点击转换弹出提示框
+					this.$refs.headerRef.memberModel = true;
+					this.$refs.headerRef.isClick = true;
+					this.downloadRow = row;
+					return false;
+				} else {
+					this.$refs.headerRef.memberModel = false;
+				}
+				
 				row.loading = true;
 				let filename = row.title + '-' + this.$utils.formatFileTime() +'.xlsx';
 				let sheet1 = [['序号','商品ID','商品标题','商品链接','价格','销量','店铺名称','店铺地址','首图地址']];

+ 2 - 2
src/renderer/components/update.vue

@@ -11,7 +11,7 @@
 				<!-- <span v-if="linkList.length > 0" class="footer-menu" style="padding: 0;cursor:default;"><i class="iconfont iconx-lianjie"></i>应用推荐:</span>
 				<a v-for="(item, key) in linkList" :key="key" @click="openUrl(item.url)"><span class="footer-menu">{{item.title}}</span></a> -->
 			
-				<el-link :underline="false" type="danger" href="https://www.xingyousoft.com/news/detail/UHpHMrc6z0mz">使用教程</el-link>
+				<el-link :underline="false" type="danger" href="https://www.xingyousoft.com/news/detail/BZk8uvHj7ujW">使用教程</el-link>
 					
 			</div>
 			
@@ -81,7 +81,7 @@
 					<div>仅支持谷歌浏览器/和基于Chromium的Microsoft Edge浏览器,win10系统自带Edge浏览器,win10以下系统可以安装谷歌浏览器使用。谷歌浏览器下载地址:https://www.google.cn/chrome/</div>
 				</el-collapse-item>
 				<el-collapse-item title="3、为什么网址中的链接提取不到" name="3">
-					<div>请点击查看软件上方支持的网址类型,对照一下网址是否符合提取要求</div>
+					<div>请点击查看软件上方支持的网址格式,对照一下网址格式是否符合提取要求</div>
 				</el-collapse-item>
 				<el-collapse-item v-for="(item, index) in questionArr" :key="index" :title="item.q" :name="item.no">
 					<div>{{item.a}}</div>