update

src/main/ui/static/payment/partner/partner-manage.js

@@ -3508,6 +3508,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.directors={};
         $scope.executives={};
         $scope.industry = '';
+        $scope.business_content = '';
         var merchantInfo = {};
 
         var merchantId = '';
@@ -3782,6 +3783,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             // });
             merchantInfo['executives'] = $scope.executives;
             merchantInfo['directors'] = $scope.directors;
+            merchantInfo['business_content'] = $scope.business_content;
             merchantInfo['industry'] = $scope.industry;
             merchantInfo['merchantId'] = merchantId;
             $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registYeepaySubMerchantId', merchantInfo).then(function (resp) {

src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html

@@ -6,21 +6,21 @@
                     <div class="panel-heading">Apply Yeepay Sub Merchant Id</div>
                     <div class="panel-body">
                         <div class="form-horizontal">
-                            <!--<div class="form-group"-->
-                                 <!--ng-class="{'has-error':subForm.business_content.$invalid && subForm.business_content.$dirty}">-->
-                                <!--<label class="control-label col-sm-3" for="business_content">* Business Content</label>-->
-                                <!--<div class="col-sm-8">-->
-                                    <!--<select class="form-control" name="business_content"-->
-                                            <!--ng-model="subMerchantInfo.business_content"-->
-                                            <!--id="business_content" required-->
-                                            <!--ng-options="business_content.value as business_content.label for business_content in yeepay_business_contents">-->
-                                        <!--<option value="">Please Choose</option>-->
-                                    <!--</select>-->
-                                    <!--<div ng-messages="subForm.business_content.$error" ng-if="subForm.business_content.$dirty">-->
-                                        <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.business_content.$invalid && subForm.business_content.$dirty}">
+                                <label class="control-label col-sm-3" for="business_content">* Business Content</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="business_content"
+                                            ng-model="business_content"
+                                            id="business_content" required
+                                            ng-options="business_content.value as business_content.label for business_content in yeepay_business_contents">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="subForm.business_content.$error" ng-if="subForm.business_content.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
+                                </div>
+                            </div>
 
 
                             <div class="form-group"

src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html

@@ -182,10 +182,10 @@
                                 Apply Time
                                 <span style="float: right" ng-bind="id_apply.create_time"></span>
                             </li>
-                            <!--<li class="list-group-item list-group-item-success">-->
-                                <!--Business Content-->
-                                <!--<span style="float:right;">{{id_apply.business_content | yeepayBusinessContent}}</span>-->
-                            <!--</li>-->
+                            <li class="list-group-item list-group-item-success">
+                                Business Content
+                                <span style="float:right;">{{id_apply.business_content | yeepayBusinessContent}}</span>
+                            </li>
                             <li class="list-group-item list-group-item-success">
                                 Business Category
                                 <span style="float: right">{{id_apply.industry | yeepayIndustry}}</span>