From c39323b1879dcb8e6667fcb4ab20a083697a95a1 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Mon, 24 Jan 2022 09:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 73 +++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/index.html b/index.html
index b6a1b53..3ff5c41 100644
--- a/index.html
+++ b/index.html
@@ -137,7 +137,6 @@
 			}
 			req.axiosGetplan('/plan/plan_theme/' + linkId).then(res => {
 				if (res.code == 200) {
-					if (res.data.id) {
 						//内置页顶图
 						document.title = res.data.title;
 						self.plan_id = res.data.plan_id
@@ -151,49 +150,45 @@
 							sessionStorage.setItem('product_detail', JSON.stringify(res.data['access_conf'].product_detail));
 						}
 						sessionStorage.setItem('linkId', linkId);
-							//是否携带token
-					if (keyCode) {
-						let data = {
-							key: keyCode
-						}
-						req.axiosPostTogppds('/key/loginFromLink', data).then(res => {
-							if (res.code == 200) {
-								sessionStorage.setItem('key', keyCode);
-								sessionStorage.setItem('token', res.data.token);
-								sessionStorage.setItem('haskey', keyCode);
-								this.promttip = '正在加载商品...';
-								this.openDialog();
-								window.location.replace("./homepage.html");
-							} else {
+						//是否携带token
+						if (keyCode) {
+							let data = {
+								key: keyCode
+							}
+							req.axiosPostTogppds('/key/loginFromLink', data).then(res => {
+								if (res.code == 200) {
+									sessionStorage.setItem('key', keyCode);
+									sessionStorage.setItem('token', res.data.token);
+									sessionStorage.setItem('haskey', keyCode);
+									this.promttip = '正在加载商品...';
+									this.openDialog();
+									window.location.replace("./homepage.html");
+								} else {
+									self.maskshow = true;
+									self.tiptext = res.message;
+									self.popboxshow = true;
+
+								}
+							}).catch(err => {
 								self.maskshow = true;
 								self.tiptext = res.message;
 								self.popboxshow = true;
-
+							});
+						} else {
+							let keyName;
+							if (this.pageType == 3) {
+								captchaimg();
+								keyName = 'exchange';
+							} else if (this.pageType == 1) {
+								keyName = 'access_conf';
 							}
-						}).catch(err => {
-							self.maskshow = true;
-							self.tiptext = res.message;
-							self.popboxshow = true;
-						});
-					} else {
-						let keyName;
-						if (this.pageType == 3) {
-							captchaimg();
-							keyName = 'exchange';
-						} else if (this.pageType == 1) {
-							keyName = 'access_conf';
+							self.bgcolor = res.data[keyName].land.bg_color;
+							self.ftcolor = res.data[keyName].land.font_color;
+							self.topImg = res.data[keyName].land.top_image;
+							self.middleImg = res.data[keyName].land.middle_image;
+							self.describe = res.data[keyName].land.describe;
+							self.loading = false;
 						}
-						self.bgcolor = res.data[keyName].land.bg_color;
-						self.ftcolor = res.data[keyName].land.font_color;
-						self.topImg = res.data[keyName].land.top_image;
-						self.middleImg = res.data[keyName].land.middle_image;
-						self.describe = res.data[keyName].land.describe;
-						self.loading = false;
-					}
-					}else{
-						window.location.href=res.data;
-					}
-				
 				}
 			}).catch(err => {});
 		},