msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix~

Browse Source
master
yuan 6 years ago
parent 7c8c0c56c9
commit 1ff35dc8d1
4 changed files with 77 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
Unescape View File

@ -248,7 +248,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
sysClient.put("suburb",apply.getString("suburb"));
sysClient.put("state",apply.getString("state"));
sysClient.put("postcode",apply.getString("postcode"));
sysClient.put("industry",apply.getString("industry"));
sysClient.put("royalpayindustry",apply.getString("industry"));
sysClient.put("contact_person",apply.getString("contact_person"));
sysClient.put("contact_email",apply.getString("contact_email"));
sysClient.put("contact_phone",apply.getString("contact_phone"));

40
src/main/ui/merchant_application.html
Unescape View File

@ -284,7 +284,7 @@
class="form-control" style="width: 80%;display: inline"
placeholder="Your Phone">
<button type="button" class="btn btn-success" style="width:20%;display:inline;height: 34px;float: right;border-radius: 0px"
title="发送验证码" ng-click="sendVerificationCode(partner.contact_phone)"
title="发送验证码" ng-click="sendVerificationCode()"
ng-bind="description" ng-disabled="canClick"></button>
</div>
@ -293,14 +293,14 @@
<div class="form-group has-feedback"
ng-class="{'has-error':accountForm.code.$invalid && accountForm.code.$dirty}">
<input class="form-control" ng-model="partner.code" placeholder="Code"
<input class="form-control" ng-model="partner.phoneCodeKey" placeholder="Code"
required maxlength="50" name="code">
</div>
<div class="row">
<div class="col-xs-12 margin-bottom">
<button type="button" class="btn btn-success btn-block btn-flat"
ng-click="saveApplyInfo(accountForm,1)">Next
ng-click="saveStep1(accountForm,1)">Next
</button>
<div>
<p ng-if="resError" style="padding: 6px 12px;font-size: 14px;"
@ -355,15 +355,33 @@
<input class="form-control" ng-model="partner.postcode" placeholder="Postcode" required
maxlength="50" name="postcode">
</div>
<div class="form-group has-feedback"
ng-class="{'has-error':companyForm.industry.$invalid && companyForm.industry.$dirty}">
<select class="form-control" name="industry"
ng-model="partner.industry"
id="industry-input" required
ng-options="industry.value as industry.label for industry in industries">
<option value="">Industry</option>
</select>
<div class="row">
<div class="col-xs-12 margin-bottom">
<div class="form-group has-feedback" ng-class="{'has-error':companyForm.royalpayindustry.$invalid && companyForm.royalpayindustry.$dirty}">
<div class="dropdown">
<input id="dLabel" data-toggle="dropdown" data-target="#" class="form-control"
ng-model="industryLable" placeholder="Industry" required
maxlength="50" name="royalpayindustry">
<ul class="dropdown-menu multi-level" role="menu" aria-labelledby="dropdownMenu">
<li class="dropdown-submenu" ng-repeat="industry in royalpayindustry">
<a tabindex="-1" ng-model="industry.mccCode">{{industry.label}}</a>
<ul class="dropdown-menu">
<li><a tabindex="-1" href="javascript:;" ng-repeat="child in industry.children" ng-click="chooseIndustry(child)">{{child.label}}</a></li>
</ul>
</li>
</ul>
</div>
</div>
</div>
</div>
<!-- <div class="form-group has-feedback"
ng-class="{'has-error':companyForm.royalpayindustry.$invalid && companyForm.royalpayindustry.$dirty}">
<input class="form-control" id="royalpayindustry" required
name="royalpayindustry" readonly
ng-model="partner.royalpayindustry"
multi-level-select-popup="royalpayindustry"
on-select="onRoyalPayIndustrySelect($selected)">
</div>-->
<div class="row">
<div class="col-xs-12 margin-bottom">

41
src/main/ui/static/css/merchant_application.css
Unescape View File

@ -419,6 +419,47 @@ body .dis_before:nth-child(5):before {
color: white;
background: #1ea4ec;
}
.dropdown-submenu {
position: relative;
}
.dropdown-submenu > .dropdown-menu {
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px;
border-radius: 0 6px 6px 6px;
}
.dropdown-submenu:hover > .dropdown-menu {
display: block;
}
.dropdown-submenu > a:after {
display: block;
content: " ";
float: right;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
border-width: 5px 0 5px 5px;
border-left-color: #ccc;
margin-top: 5px;
margin-right: -10px;
}
.dropdown-submenu:hover > a:after {
border-left-color: #fff;
}
.dropdown-submenu.pull-left {
float: none;
}
.dropdown-submenu.pull-left > .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
}
/*.progress_inner__step:before{
background: #1ea4ec;
}

7
src/main/ui/static/merchantapplication/merchant_application.js
Unescape View File

@ -70,7 +70,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
}
};
$scope.disabledArray = new Array(true, false, false, false, false);
$scope.chooseArray = new Array(true, false, false, false, false);
$scope.chooseArray = new Array(false, true, false, false, false);
$scope.changeChoose = function (index) {
$scope.chooseArray = new Array(false, false, false, false, false);
$scope.chooseArray[index] = true;
@ -114,6 +114,10 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
$scope.resError = resp.data.message;
});
};
$scope.chooseIndustry = function (industry) {
$scope.partner.industry = industry.mccCode;
$scope.industryLable = industry.label;
};
$scope.searchBankInfo = function (bsb_no) {
if (bsb_no != null && bsb_no != "") {
$http.get('/register/info/bank/' + bsb_no).then(function (resp) {
@ -197,6 +201,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
$scope.goToLogin();
}
$scope.changeChoose(index);
$scope.resError = '';
}, function (resp) {
$scope.resError = resp.data.message;
});

Write Preview
Loading…
Cancel
Save