qiushang 1 gün önce
ebeveyn
işleme
6054ffc542

BIN
nsis/skin/bg1.png


BIN
nsis/skin/bg2.png


BIN
nsis/skin/bgtop.png


+ 1 - 1
nsis/skin/uninstallpage.xml

@@ -3,7 +3,7 @@
    <VerticalLayout >
     <VerticalLayout width="570" height="314" bkimage="file='uninstall_bg1.png'">
 		<Control height="40" />
-		<WebBrowser height="264" width="550"  padding="10,0,0,0" name="oneclick_browser" homepage="https://xy.xingyousoft.com/soft/XYLinks/uninstallWeb/" autonavi="true"/>
+		<WebBrowser height="264" width="550"  padding="10,0,0,0" name="oneclick_browser" homepage="https://xy.xingyousoft.com/soft/XYToolBox/uninstallWeb/" autonavi="true"/>
 	</VerticalLayout>
 	
 	<VerticalLayout bkimage="file='bgbottom.png' corner='10,0,10,10'" >

+ 9 - 9
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
-!define PRODUCT_MID        		    "b4X0GBHb95VN"
-!define PRODUCT_VERSION        		"2.1.0.2"
-!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.2.7z"
+!define PRODUCT_MID        		    "Rma47gKxMumD"
+!define PRODUCT_VERSION        		"2.0.0.2"
+!define PRODUCT_NAME           		"星优网页工具箱"
+!define INSTALL_OUTPUT_NAME    		"XYToolBox_XY.exe" 
+!define EXE_NAME               		"XYToolBox.exe"
+!define PRODUCT_PATHNAME           	"XYToolBox"     #安装卸载项用到的KEY,注册表
+!define INSTALL_APPEND_PATH         "XYToolBox"     #安装路径追加的名称 
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYToolBox/lastest2.0.0.2.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.2"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYToolBox/uninstallWeb/?v=2.0.0.2"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

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

+ 10 - 2
src/renderer/components/header.vue

@@ -80,8 +80,15 @@
 				</div>
 				<div class="font-12" style="padding: 20px; margin-bottom: 10px;">
 					<div style="text-align: center; margin-bottom: 10px;">
-						<p style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP链接/图片仅导前5个,文字仅输出前100字,
-						试用创建快捷方式,网页转PDF/图片仅显示部分</p>
+						<!-- <p style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP链接/图片仅导前5个,文字仅输出前100字,
+						试用创建快捷方式,网页转PDF/图片仅显示部分</p> -->
+						<p v-if="menuIndex == '-1'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅试用基础功能</p>
+						<p v-if="menuIndex == '1'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅能导出前100个文字</p>
+						<p v-if="menuIndex == '2'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅能导出前5个链接</p>
+						<p v-if="menuIndex == '3'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅能导出前五张图片</p>
+						<p v-if="menuIndex == '4'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅支持试用,不能修改链接地址</p>
+						<p v-if="menuIndex == '5'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅能转换部分网页为PDF</p>
+						<p v-if="menuIndex == '6'" style="font-size: 16px;font-weight: 600;color: #f73131;">非VIP仅能转换部分网页为图片</p>
 						<p style="font-size: 14px; font-weight: 600; margin-top: 15px;">开通会员即享以下权益</p>
 					</div>
 					<el-row :gutter="20" class="micon-list">
@@ -345,6 +352,7 @@
 				isRead: false,
 				noticeValue: {},
 				noticeModel: false,
+				menuIndex: '-1',
 			}
 		},
         props: {

+ 20 - 2
src/renderer/components/home.vue

@@ -12,7 +12,7 @@
 						<el-row type="flex" align="middle" justify="space-between">
 							<div>
 								<span class="span-w">功能选择:</span>
-								<el-radio-group v-model="menuIndex" size="mini" style="margin-right: 10px;">
+								<el-radio-group v-model="menuIndex" size="mini" style="margin-right: 10px;" @input="indexChange">
 								    <el-radio-button label="1" size="mini">提取文字</el-radio-button>
 								    <el-radio-button label="2" size="mini">提取链接</el-radio-button>
 								    <el-radio-button label="3" size="mini">提取图片</el-radio-button>
@@ -144,7 +144,7 @@
 						</el-row>
 						
 						<div style="margin-top: 10px;">
-							<el-input id="aaa" type="textarea" :rows="3" placeholder="请输入需要提取的网址" v-model="formatUrl"></el-input>
+							<el-input id="aaa" type="textarea" :rows="3" placeholder="请输入需要提取的网址" v-model="formatUrl" :disabled="formatDisabled"></el-input>
 							
 							<div class="content-top" style="padding: 10px 0; text-align: center; display: inherit;">
 								<el-button size="small" type="danger" @click="addLinks()" :loading="addLoading">开始处理</el-button>
@@ -258,6 +258,8 @@
 				tipsDesc: "暂无下载权限,请开通VIP会员使用",
 				
 				formatUrl: '',
+				formatDisabled: false,
+				tempUrl: '',
 				tabLoading: false,
 				productName: pjson.softInfo.softName,
 				imgUrl: this.$api.imgUrl,
@@ -365,6 +367,19 @@
 			
 		},
 		methods: {
+			indexChange(e){
+				let authority = this.$refs.headerRef.authority.isAuthority;
+				if(!authority){
+					if(e == '4'){
+						this.formatUrl = 'https://www.xingyousoft.com';
+						this.formatDisabled = true;
+					}else{
+						this.formatUrl = '';
+						this.formatDisabled = false;
+					}
+				}
+				
+			},
 			// 实时获取页面滚动加载时间
 			initMs(){
 				let pageMs = this.$utils.getStorage('pageMs');
@@ -536,6 +551,7 @@
 				let authority = this.$refs.headerRef.authority.isAuthority;
 				if (!authority && !flag) { // 非会员点击转换弹出提示框
 					this.$refs.headerRef.memberModel = true;
+					this.$refs.headerRef.menuIndex = this.menuIndex;
 					this.$refs.headerRef.isClick = true;
 					this.downloadRow = row;
 					return false;
@@ -1037,6 +1053,7 @@
 				let authority = this.$refs.headerRef.authority.isAuthority;
 				if (!authority && !flag) { // 非会员点击转换弹出提示框
 					this.$refs.headerRef.memberModel = true;
+					this.$refs.headerRef.menuIndex = this.menuIndex;
 					this.$refs.headerRef.isClick = true;
 					return false;
 				} else {
@@ -1102,6 +1119,7 @@
 						let authority = this.$refs.headerRef.authority.isAuthority;
 						if (!authority && !flag) { // 非会员点击转换弹出提示框
 							this.$refs.headerRef.memberModel = true;
+							this.$refs.headerRef.menuIndex = this.menuIndex;
 							this.$refs.headerRef.isClick = true;
 							return false;
 						} else {