Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

This commit is contained in:
尹吉欢
2018-03-30 13:11:26 +08:00
6 changed files with 113 additions and 39 deletions
+1 -1
View File
@@ -3,6 +3,6 @@
//var BASE_PATH = "http://192.168.10.47:8086";
var BASE_PATH = "http://192.168.10.161:8086";
//var BASE_PATH = "http://192.168.10.53:8084";
var BASE_PATH = "http://192.168.10.170:8084";
var BASE_PATH = "http://192.168.10.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
+76 -12
View File
@@ -1,16 +1,80 @@
export default {
methods: {
checkPhoneNum (phone) {
alert("1111111111111")
}
}
}
var sendPhoneCode = new Vue({
el:'#sendPhoneCode',
methods:{
sendCode:function(){
alert("222222222")
checkPhoneNum("1352222222")
}
}
})
})
function sendCode(){
var mobile = $("#input_phoneNumber").val();
if(checkPhoneNum(mobile)){
timer.start();
axios.post("/rest/user/sendMobileCode", {mobile: mobile})
.then(function (response) {
var data = response.data
if(data.code==200){
$.toast("短信验证码发送成功,请注意查收!")
}else{
$.toast("验证码发送失败")
timer.cancel()
}
})
}
}
function checkPhoneNum(phone){
var reg=11&& /^((13|14|15|17|18)[0-9]{1}\d{8})$/;
if(phone==''){
$.toast("请输入手机号码");
return false;
}else if(!reg.test(phone)){
$.toast("手机格式不正确");
return false;
}else{
return true;
}
}
//验证码倒计时
timer = {
countdown:60,
start:function(){
countdown = 60
$(".sendCode").hide()
$(".waiting").empty().append(countdown + " s").show()
timer.down()
},
down:function(){
countdown --
$(".waiting").empty().append(countdown + " s")
if(countdown <= 0){
$(".sendCode").show()
$(".waiting").hide()
}else{
setTimeout(timer.down, 1000)
}
},
cancel:function(){
countdown = 0
}
}
/* 错误提示-快捷登录 */
$("#login_btn").on("click", function () {
var phoneNum = $("#input_phoneNumber").val();
var code = $("#input_codeSms").val();
var protocal = $(".check").find(".checkImg").css("display");
if(phoneNum == ""){
$.toast("请输入手机号码");
return false;
}
if(code == ""){
$.toast("请输入验证码");
return false;
}
if(protocal != "block"){
$.toast("请同意服务协议");
return false;
}
axios.post("/rest/user/sendMobileCode", {mobile: mobile})
.then(function (response) {
})
});
@@ -16,6 +16,9 @@
<style>
.priceRecovery + .list-block ul:after{height:0;}
.theme {
background-color: #F18D00;
}
</style>
</head>
@@ -82,8 +85,8 @@
<p><label>估的准吗?</label></p>
<p><small>您的反馈很重要,是我们努力的动力</small></p>
<div class="row">
<div class="col-50"><a class="button" v-on:click="feedback(1)">高了</a></div>
<div class="col-50"><a class="button" v-on:click="feedback(0)">低了</a></div>
<div class="col-50"><a class="button" v-on:click="feedback(1,$event)">高了</a></div>
<div class="col-50"><a class="button" v-on:click="feedback(0,$event)">低了</a></div>
</div>
</div>
<div class="list-block media-list">
@@ -174,11 +177,15 @@ $.config = {router: false}
},
methods:{
feedback:function(i){
axios.post("/rest/evaluate/feedBack",{params:{
hid:hid,
reason:i
}}).then(function(response){
feedback:function(i,event){
if($(event.target).hasClass("theme")){
return;
}
return;
axios.post("/rest/evaluate/feedBack",{
hid:hid,
reason:i
}).then(function(response){
}).catch(function(error){console.log(error)})
}
+12
View File
@@ -28,6 +28,7 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="mui-icon mui-icon mui-icon-arrowleft"></span>
</button>
<!--<a href="javascript:void(0)" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left">返回刷新</a>-->
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
<span class="icon icon-path"></span>
</button>
@@ -106,6 +107,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
<script src="../../config.js"></script>
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
@@ -537,6 +539,16 @@ function addComment(){
});
}
mui.init({
beforeback: function() {
     //获得父页面的webview
var list = plus.webview.getWebviewById('yfindex.html');
     //触发父页面的自定义事件(refresh),从而进行刷新
mui.fire(list, 'refresh');
//返回true,继续页面关闭逻辑
return true;
}
});
</script>
</body>
</html>
@@ -37,7 +37,7 @@
<input type="number" id="input_phoneNumber" class="textAlignLeft" placeholder="请输入手机号码">
<label>
<span id="sendPhoneCode" class="sendCode theme" @click="sendCode()">获取验证码</span>
<span class="waiting theme dn">48&nbsp;s</span>
<span id="getTime" class="waiting theme dn">60&nbsp;s</span>
</label>
</div>
</div>
@@ -92,15 +92,14 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script src="../../config.js"></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/login/codeSms.js" ></script>
<script>
/* 获取验证码等待状态 */
$(".sendCode").click(function(){
$(".waiting").show();
$(".sendCode").hide();
});
/* 勾选-已阅读 */
$(".check").on("click", function () {
@@ -112,19 +111,7 @@ $(".check").on("click", function () {
}
});
/* 错误提示-快捷登录 */
$("#login_btn").on("click", function () {
var a = $("#input_phoneNumber").val();
var b = $("#input_codeSms").val();
if(a == ""){
$.toast("请输入手机号码");
return false;
}
else if(b == ""){
$.toast("请输入验证码");
return false;
}
});
</script>
+4
View File
@@ -2537,6 +2537,10 @@ function openNewsView(newId) {
$("#visitCount_"+newId).text(count+'人');
}
window.addEventListener('refresh', function(e){//执行刷新
alert("aa");
});
</script>
<script>
/* 获取附近小区名称字数,截取附近小区名称前5字,并添加... */