Skip to content

Commit

Permalink
V1.12版本
Browse files Browse the repository at this point in the history
  • Loading branch information
szvone committed Jan 30, 2020
1 parent b691e31 commit e0eafd7
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ V免签为完全开源项目,开源项目意味着作者没有任何收入来
+ 微信店员收款推送通知

## 更新记录
+ v1.12(2020.01.30)
+ 增加一些提示信息

+ v1.11(2019.10.28)
+ 修复上传二维码一直卡在处理中
+ 如二维码无法正常识别,请给/public/qr-code/test.php设置777权限
Expand Down
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@
'show_error_msg' => false,
// 异常处理handle类 留空使用 \think\exception\Handle
'exception_handle' => '',
'ver' => '1.11',
'ver' => '1.12',
];
5 changes: 3 additions & 2 deletions public/admin/setting.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
$('#wximg').attr('src', "enQrcode?url="+data.data);
layer.msg('处理成功');
} else{
return layer.msg('处理失败');
return layer.alert('处理失败,可以尝试将二维码用草料识别出内容,然后重新将内容生成二维码图片上传!');
}

});
Expand Down Expand Up @@ -205,7 +205,8 @@
$('#zfbimg').attr('src', "enQrcode?url="+data.data);
layer.msg('处理成功');
} else{
return layer.msg('处理失败');
return layer.alert('处理失败,可以尝试将二维码用草料识别出内容,然后重新将内容生成二维码图片上传!');
}

});
Expand Down
17 changes: 11 additions & 6 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,17 @@ <h2 class="major">登录</h2>

<script>
function login() {
$.post("login","user="+$("#user").val()+"&pass="+$("#pass").val(),function (data) {
layer.msg(data.msg);
if (data.code==1){
window.location.href = "aaa.html";
}
});
try {
$.post("login","user="+$("#user").val()+"&pass="+$("#pass").val(),function (data) {
layer.msg(data.msg);
if (data.code==1){
window.location.href = "aaa.html";
}
});
}catch (e) {
layer.alert("程序出错,请检查:<br>1、伪静态是否设置成功<br>2、是否设置好数据库账号密码并导入数据库脚本")
}

}
</script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion ver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11|2019-10-28
1.12|2020-01-30

0 comments on commit e0eafd7

Please sign in to comment.