Browse Source

用户绑定企业

liuam 7 years ago
parent
commit
59e4281a15

+ 1 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -21,13 +21,12 @@ define(['app/app'], function(app) {
         var applyToEnterpriseTableParams = function () {
             $scope.applyToEnterpriseTableParams = new ngTableParams({
                 page : 1,
-                count : 1
+                count : 10
             }, {
                 total : 0,
                 getData : function ($defer, params) {
                     var param = BaseService.parseParams(params.url());
                     if ($scope.page.totalElements) {
-                        console.log($scope.page.totalElements);
                         if (param.page < 1 || param.page > $scope.page.totalElements) {
                             toaster.pop('error', '请输入正确的页数!');
                             return;

+ 6 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -434,7 +434,7 @@
       <ul class="fl">
         <li ng-class="{'active': tab=='base'}"><a ng-click="checkTab('base')">基本信息</a></li>
         <li ng-class="{'active': tab=='safe'}"><a ng-click="checkTab('safe')">安全设置</a></li>
-        <li ng-class="{'active': tab=='bind'}"><a ng-click="checkTab('bind')">申请绑定</a></li>
+        <li ng-class="{'active': tab=='bind'}"><a ng-click="checkTab('bind')" ng-if="userInfo.sys">申请绑定</a></li>
         <!--<li ng-class="{'active': tab=='logistic'}"><a href="#" ng-click="checkTab('logistic')">收货地址</a></li>-->
       </ul>
     </div>
@@ -462,7 +462,7 @@
                                                                   ng-model="enterpriseInfo.enName"/>
                 </div>
                 <div class="fr" ng-if="!updateState"><span
-                    ng-bind="enterpriseInfo.enName || '暂无信息'"></ span>
+                    ng-bind="enterpriseInfo.enName || '暂无信息'"></span>
                 </div>
               </li>
               <!--<li>
@@ -785,9 +785,12 @@
             </td>
           </tr>
           <tr class="num">
-            <td colspan="5">
+            <td colspan="5" ng-if="content[0].id">
               <span class="last-login pull-right">显示<span ng-bind="page.size * (page.number - 1) + 1"></span>-<span ng-bind="page.size * (page.number - 1) + page.numberOfElements"></span>条,共<span ng-bind="page.totalElements"></span>条</span>
             </td>
+            <td colspan="5" ng-if="!content[0].id">
+              <span class="last-login pull-right">暂无数据</span>
+            </td>
           </tr>
           </tbody>
         </table>

+ 6 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -112,7 +112,7 @@
                 <!--<li><a href="#"><img src="static/img/vendor/images/notice04.png"/><p>缺货预警</p></a></li>-->
             <!--</ul>-->
         <!--</div>-->
-        <div class="data_analyze bind-enter">
+        <div class="data_analyze bind-enter" ng-if="userInfo.sys">
             <div class="com_menu01">
                 <span>企业绑定申请</span>
                 <a class="pull-right" ng-click="findMore()">查看更多</a>
@@ -138,6 +138,11 @@
                         <a class="operate-btn" ng-click="auditApply(0, item.id, item.user.userUU)">|&nbsp;拒绝</a>
                     </td>
                 </tr>
+                <tr class="num">
+                    <td colspan="5" ng-if="!content[0].id">
+                        <span class="last-login pull-right">暂无数据</span>
+                    </td>
+                </tr>
                 </tbody>
             </table>
         </div>