From d974327f8cbe51148799abfaf7b30a3e21b3f92c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 11 Mar 2020 22:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=B3=A8?=
=?UTF-8?q?=E5=86=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/advertVedio.html | 43 +++++++++++++++++++
public/components/login/login.html | 2 +-
public/components/login/login.js | 3 ++
public/components/register/register.html | 2 +-
public/components/register/register.js | 3 ++
.../writeAdvertMachine/writeAdvertMachine.js | 2 +-
public/vcCore/vcFramework.js | 2 +
7 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 public/advertVedio.html
diff --git a/public/advertVedio.html b/public/advertVedio.html
new file mode 100644
index 000000000..e1807014c
--- /dev/null
+++ b/public/advertVedio.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+ 广告屏
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/components/login/login.html b/public/components/login/login.html
index 19c0fb531..673ac3c01 100644
--- a/public/components/login/login.html
+++ b/public/components/login/login.html
@@ -16,7 +16,7 @@
忘记密码?
Do not have an account?
- 请注册
+ 请注册
diff --git a/public/components/login/login.js b/public/components/login/login.js
index 7b1f478eb..b599e0b75 100644
--- a/public/components/login/login.js
+++ b/public/components/login/login.js
@@ -98,6 +98,9 @@
vc.component.loginInfo.errorInfo = errInfo;
});
+ },
+ _doRegister:function(){
+ vc.jumpToPage('/user.html#/register')
}
},
_destroyedMethod: function () {
diff --git a/public/components/register/register.html b/public/components/register/register.html
index f82b7e109..c061e3873 100644
--- a/public/components/register/register.html
+++ b/public/components/register/register.html
@@ -19,7 +19,7 @@
已有账户?
- 登录
+ 登录
\ No newline at end of file
diff --git a/public/components/register/register.js b/public/components/register/register.js
index d5c5547bb..8f8d193fe 100644
--- a/public/components/register/register.js
+++ b/public/components/register/register.js
@@ -157,6 +157,9 @@
vc.messageTips("*密码长度必须在6位至12位");
}
+ },
+ _doLogin:function(){
+ vc.jumpToPage('/user.html#/login');
}
}
});
diff --git a/public/components/writeAdvertMachine/writeAdvertMachine.js b/public/components/writeAdvertMachine/writeAdvertMachine.js
index cf80ef5fd..f7f2abaa5 100644
--- a/public/components/writeAdvertMachine/writeAdvertMachine.js
+++ b/public/components/writeAdvertMachine/writeAdvertMachine.js
@@ -25,7 +25,7 @@
return;
}
- vc.jumpToPage("/admin.html#/advertVedioView?machineCode="
+ vc.jumpToPage("/advertVedio.html#/advertVedioView?machineCode="
+ vc.component.writeAdvertMachineInfo.machineCode
+ "&communityId=" + vc.getCurrentCommunity().communityId);
},
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js
index 5213f2dde..62789e2ee 100644
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -1324,3 +1324,5 @@
}
})(window.vcFramework);
+
+