Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into test
This commit is contained in:
commit
5372daf2a7
|
|
@ -1,14 +1,14 @@
|
|||
// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
|
||||
// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
|
||||
// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
|
||||
const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
|
||||
const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
|
||||
const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
|
||||
|
||||
// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
|
||||
// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
|
||||
// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
|
||||
|
||||
const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; //
|
||||
const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名
|
||||
const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名
|
||||
// const ROOTPATH1 = "http://192.168.1.5:8100/sqx_fast/"; //
|
||||
// const ROOTPATH = "http://192.168.1.5:8100/sqx_fast/"; //后台服务域名
|
||||
// const ROOTPATH2 = "http://192.168.1.5:8100"; //后台服务域名
|
||||
|
||||
module.exports = {
|
||||
APIHOST: ROOTPATH,
|
||||
|
|
|
|||
|
|
@ -541,6 +541,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
if (document.documentElement.scrollHeight <= document.documentElement.clientHeight) {
|
||||
bodyTag = document.getElementsByTagName('body')[0];
|
||||
bodyTag.style.height = document.documentElement.clientWidth / screen.width * screen.height + 'px';
|
||||
}
|
||||
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@
|
|||
<input type="text" v-if="registerCode == '否'" :value="invitation" placeholder="请填写邀请码(选填)"
|
||||
data-key="invitation" maxlength="20" @input="inputChange" @confirm="toLogin" />
|
||||
</view> -->
|
||||
<button class="confirm-btn" @click="toLogin">注册</button>
|
||||
<button class="confirm-btn" @click="toRegister">注册</button>
|
||||
<button class="confirm-btn" @click="toLogin">登录</button>
|
||||
</view>
|
||||
<view class="footer">
|
||||
<text @tap="isShowAgree" class="cuIcon"
|
||||
|
|
@ -163,6 +164,12 @@
|
|||
});
|
||||
},
|
||||
toLogin() {
|
||||
console.log("123");
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
});
|
||||
},
|
||||
toRegister() {
|
||||
const {
|
||||
mobile,
|
||||
password,
|
||||
|
|
@ -434,7 +441,7 @@
|
|||
text-align: center;
|
||||
line-height: 100rpx;
|
||||
border-radius: 16rpx;
|
||||
margin-top: 80rpx;
|
||||
margin-top: 40rpx;
|
||||
background: #EC6F48;
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@
|
|||
<input type="text" v-if="registerCode == '否'" :value="invitation" placeholder="请填写邀请码(选填)"
|
||||
data-key="invitation" maxlength="20" @input="inputChange" @confirm="toLogin" />
|
||||
</view> -->
|
||||
<button class="confirm-btn" @click="toLogin">注册</button>
|
||||
<button class="confirm-btn" @click="toRegister">注册</button>
|
||||
<button class="confirm-btn" @click="toLogin">登录</button>
|
||||
</view>
|
||||
<view class="footer">
|
||||
<text @tap="isShowAgree" class="cuIcon"
|
||||
|
|
@ -171,6 +172,12 @@
|
|||
});
|
||||
},
|
||||
toLogin() {
|
||||
console.log("123");
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
});
|
||||
},
|
||||
toRegister() {
|
||||
const {
|
||||
mobile,
|
||||
password,
|
||||
|
|
@ -365,7 +372,7 @@
|
|||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 278rpx;
|
||||
bottom: 178rpx;
|
||||
.cuIcon::before{
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
|
|
@ -440,7 +447,7 @@
|
|||
text-align: center;
|
||||
line-height: 100rpx;
|
||||
border-radius: 16rpx;
|
||||
margin-top: 80rpx;
|
||||
margin-top: 40rpx;
|
||||
background: #EC6F48;
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
|
|
|
|||
Loading…
Reference in New Issue