fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit ce6b2b293841f0ffb196e518c9308e8df3da7489 2 parents 6eaaa553 90643f37

Merge branch 'release/1.1' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.1

Inline Side-by-side
Showing 3 changed files with 26 additions and 6 deletions
... ... @@ -41,5 +41,22 @@ var uploader = function(option){
}
}
});
// $('.js-add-image').fileupload({
// url:'http://upload.static.yohobuy.com',
// dataType: 'html',
// forceIframeTransport: true,
// formData:{pid:0, project:'', is_public:'N', tags:'',exporttype:"html"},
// acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
// autoUpload: false,
// maxFileSize: 5000000,
// add: function (e, data) {
// for(k in data.files){
// console.log(data.files[k]);
// }
// }
// });
}
module.exports=uploader;
\ No newline at end of file
... ...
... ... @@ -72,7 +72,8 @@ exports.init = function() {
});
e.on("bind",function(){
$("input:checkbox[name=promotionInfo-type]").change(function(){
$discount = $("#promotionInfo-action-discount");
$("input:radio[name=promotionInfo-type]").change(function(){
var $checked=$(this);
if ($checked.prop("name") == "promotionInfo-type") {
if ($checked.val() == "3") {
... ... @@ -131,7 +132,9 @@ exports.init = function() {
option.success=function(res){
res=res.data;
if(res.code=="200"){
location.href="/coupon/index";
e.$tip('修改成功',function(){
location.href="/coupon/index";
},'growl-success');
}else{
e.$tip(res.message);
}
... ...
... ... @@ -55,12 +55,12 @@
<div class="form-group">
<label class="col-sm-2 control-label">营业期限</label>
<label class="col-sm-2 control-label">营业期限<span class="red">*</span></label>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="date:end:endOperateTime" id="beginOperateTime" placeholder="开始时间" value="{{beginOperateTime}}" readonly>
<input type="text" class="form-control" jsaction="date:end:endOperateTime" id="beginOperateTime" required placeholder="营业期限开始时间" value="{{beginOperateTime}}" readonly>
</div>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="date:start:beginOperateTime" id="endOperateTime" placeholder="结束时间" value="{{endOperateTime}}" readonly >
<input type="text" class="form-control" jsaction="date:start:beginOperateTime" id="endOperateTime" required placeholder="营业期限结束时间" value="{{endOperateTime}}" readonly >
</div>
<!-- readonly require-->
</div>
... ... @@ -156,7 +156,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">公司联系电话 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="text" id="contactPhone" placeholder="请填写公司联系电话" class="form-control" required value="{{contactPhone}}">
<input type="text" id="contactPhone" placeholder="请填写公司联系电话" class="form-control" required value="{{contactPhone}}" pattern="/^13[0-9]{9}$/">
</div>
</div>
... ...