yangc 7 年 前
コミット
b03d71acc6

+ 2 - 2
src/main/resources/dev/account.properties

@@ -1,8 +1,8 @@
 ### account center config, 
-account.us.save.url=http://192.168.253.6:32323/api/userspace
+account.us.save.url=http://10.1.51.77:8081/api/userspace
 account.user.save.url=http://192.168.253.6:32323/api/user
 account.user.getPartners.url=http://192.168.253.6:32323/api/partners
-### ÍôÃ÷»ª±¾µØ:
+### \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD:
 ### sso config
 sso.app=mall
 # token secretkey

+ 76 - 12
src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -360,6 +360,70 @@
     background: #fef2f2;
     border: 1px solid #faaebe;
   }
+  .bind-enter-tab {
+    width: 999px;
+    margin: 15px auto 0;
+  }
+  .bind-enter-tab thead {
+    background: #8eb0f5;
+    color: #fff;
+    height: 38px;
+    line-height: 38px;
+  }
+  .bind-enter-tab th {
+    font-size: 14px;
+    font-weight: normal;
+  }
+  .bind-enter-tab tbody tr {
+    height: 50px;
+    line-height: 50px;
+    color: #666;
+    background: #fff;
+    text-align: center;
+    border: 1px solid #e8efff;
+    border-bottom: none;
+  }
+  .bind-enter-tab tbody tr:nth-child(even) {
+    background: #f1f5ff;
+  }
+  .bind-enter-tab tbody tr:hover {
+    background: #f1f5ff;
+  }
+  .bind-enter-tab tbody tr:last-child {
+    border-bottom: 1px solid #e8efff;
+  }
+  .bind-enter-tab tbody tr td {
+    font-size: 14px;
+    border-right: 1px solid #e8efff;
+  }
+  .bind-enter-tab tbody tr td:last-child {
+    border-right: none;
+  }
+  .bind-enter-tab .operate-btn {
+    color: #5078cb;
+  }
+  .bind-en .pull-right {
+    margin-right: 18px;
+    position: relative;
+    line-height: 39px;
+  }
+  .bind-en .pull-right .form-control {
+    width: 388px;
+    height: 32px;
+    display: inline-block;
+    border-radius: 0;
+    padding: 0 68px 0 10px;
+  }
+  .bind-en .pull-right button {
+    width: 58px;
+    height: 32px;
+    background: #5078cb;
+    color: #fff;
+    border-radius: 0;
+    position: absolute;
+    right: 0;
+    top: 4px;
+  }
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -694,29 +758,29 @@
       </ul>
     </div>
       <!--申请绑定-->
-      <div class="count01 clearfix" ng-if="tab=='bind'">
+    <div class="count01 clearfix bind-en" ng-if="tab=='bind'">
           <div class="rt_menu">
-              <span class="last-login pull-right"><input type="text" ng-model="searchParams.keyword" placeholder="用户名/UU账号/手机号"/><button ng-click="searchApply()">搜索</button> </span></span>
+              <span class="pull-right"><input type="text" ng-model="searchParams.keyword" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
           </div>
-        <table ng-table="applyToEnterpriseTableParams">
+        <table class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
           <thead>
           <tr>
-            <th width="165">用户名</th>
-            <th width="202">UU账号</th>
-            <th width="93">手机号</th>
-            <th width="78">邮箱</th>
-            <th width="70">操作</th>
+            <th>用户名</th>
+            <th>UU账号</th>
+            <th>手机号</th>
+            <th>邮箱</th>
+            <th>操作</th>
           </tr>
           </thead>
-          <tbody ng-repeat="item in content" ng-class="{'active': seek.$active}">
-          <tr class="default-row">
+          <tbody>
+          <tr class="default-row" ng-repeat="item in content">
             <td class="user-name" ng-bind="item.user.vipName"></td>
             <td style="text-align: left;" ng-bind="item.user.userUU"></td>
             <td ng-bind="item.user.mobile"></td>
             <td ng-bind="item.user.email"></td>
             <td>
-              <a ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
-              <a ng-click="auditApply(0, item.id, item.user.userUU)">拒绝</a>
+              <a class="operate-btn" ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
+              <a class="operate-btn" ng-click="auditApply(0, item.id, item.user.userUU)">|&nbsp;拒绝</a>
             </td>
           </tr>
           </tbody>

+ 60 - 15
src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -40,7 +40,52 @@
         margin: 0 !important;
         line-height: inherit !important;
     }
-
+    .bind-enter {
+        height: 250px;
+    }
+    .bind-enter .com_menu01{
+        border-bottom: 1px solid #5078cb;
+    }
+    .bind-enter .pull-right {
+        font-weight: normal;
+        color: #5078cb;
+        font-size: 14px;
+        margin-right: 14px;
+    }
+    .bind-enter-tab {
+        width: 709px;
+        margin: 0 auto;
+    }
+    .bind-enter-tab thead {
+        background: #8eb0f5;
+        color: #fff;
+        height: 28px;
+        line-height: 28px;
+    }
+    .bind-enter-tab th {
+        font-size: 14px;
+    }
+    .bind-enter-tab tbody tr {
+        height: 29px;
+        line-height: 29px;
+        color: #323232;
+        background: #edf2fd;
+        text-align: center;
+        border: 1px solid #e8e8e8;
+        border-bottom: none;
+    }
+    .bind-enter-tab tbody tr:nth-child(even) {
+        background: #f7f9fe;
+    }
+    .bind-enter-tab tbody tr:last-child {
+        border-bottom: 1px solid #e8e8e8;
+    }
+    .bind-enter-tab tbody tr td {
+        font-size: 14px;
+    }
+    .bind-enter-tab .operate-btn {
+        color: #5078cb;
+    }
 </style>
 <div class="user_right fr">
     <div class="right_l">
@@ -66,30 +111,30 @@
                 <!--<li><a href="#"><img src="static/img/vendor/images/notice04.png"/><p>缺货预警</p></a></li>-->
             <!--</ul>-->
         <!--</div>-->
-        <div class="data_analyze">
+        <div class="data_analyze bind-enter">
             <div class="com_menu01">
                 <span>企业绑定申请</span>
-                <span class="last-login pull-right"><a ng-click="findMore()">查看更多</a></span>
+                <a class="pull-right" ng-click="findMore()">查看更多</a>
             </div>
-            <table ng-table="applyToEnterpriseTableParams">
+            <table class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
                 <thead>
                 <tr>
-                    <th width="165">用户名</th>
-                    <th width="202">UU账号</th>
-                    <th width="93">手机号</th>
-                    <th width="78">邮箱</th>
-                    <th width="70">操作</th>
+                    <th>用户名</th>
+                    <th>UU账号</th>
+                    <th>手机号</th>
+                    <th>邮箱</th>
+                    <th>操作</th>
                 </tr>
                 </thead>
-                <tbody ng-repeat="item in content" ng-class="{'active': seek.$active}">
-                <tr class="default-row">
+                <tbody>
+                <tr ng-repeat="item in content" class="default-row">
                     <td class="user-name" ng-bind="item.user.vipName"></td>
-                    <td style="text-align: left;" ng-bind="item.user.userUU"></td>
+                    <td ng-bind="item.user.userUU"></td>
                     <td ng-bind="item.user.mobile"></td>
                     <td ng-bind="item.user.email"></td>
-                    <td>
-                        <a ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
-                        <a ng-click="auditApply(0, item.id, item.user.userUU)">拒绝</a>
+                    <td class="operate">
+                        <a class="operate-btn" ng-click="auditApply(1, item.id, item.user.userUU)">同意</a>
+                        <a class="operate-btn" ng-click="auditApply(0, item.id, item.user.userUU)">|&nbsp;拒绝</a>
                     </td>
                 </tr>
                 </tbody>