Merge remote-tracking branch 'origin/dev-mysql' into fearure-inuiry-message-hyy-20180502

src/main/webapp/resources/css/vendor/sell.css

@@ -3477,7 +3477,7 @@ body {
     color: #fff !important;
 }
 .com_tab:nth-of-type(1) ul li::after{
-    background: url('/static/img/vendor/images/downicon.png');
+    background: url('../../img/vendor/images/downicon.png');
     width: 11px;
     height: 6px;
     position: absolute;

src/main/webapp/resources/js/vendor/app.js

@@ -9,10 +9,10 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	};
 
 	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ui.form', 'ui.jquery', 'toaster', 'ngDraggable', 'tool.directives', 'ngSanitize', 'common.query.kind', 'common.services', 'brandServices', 'componentServices', 'goodsServices',  'rateServices','cartServices', 'orderServices', 'addressServices', 'invoiceServices', 'common.query.propertyAdvice', 'propertyServices', 'returnServices' , 'changeServices',  'logisticsServices', 'common.query.kindAdvice', 'ngTable', 'ngDynamicInput', 'common.directives', 'angularFileUpload', 'urlencryptionServices', 'purchaseServices', 'vendorServices', 'goodsServices', 'bankTransfer', 'common.query.enterprise', 'billServices', 'receiptServices', 'collection', 'expressServices', 'bankInfo','Charge', 'statisticsServices', 'currencyService', 'responseLogisticsService', 'PriceServices', 'addressServices', 'searchService', 'urlencryptionServices', 'ReleaseProductByBatchService', 'makerDemand', 'afterSaleService', 'messageBoardServices', 'logisticsServices', 'table.directives', 'storeInfoServices', 'recommendation', 'common.query.user', 'logisticsPortService', 'cmsService', 'materialServices', 'StoreCmsServices', 'productImportModule', 'stockInOutModule', 'StoreCmsModule', 'WebChatModule', 'StandardPutOnAdminModule', 'StoreViolationsServices', 'internalMessageServices', 'installmentServices','common.query.product', 'ui.tour', 'seekPurchaseServices', 'UASBatchPutOnPropertyModule'])
-  .directive('onFinishRender', function ($timeout) {
+  app.directive('onFinishRender', function ($timeout) {
     return {
       restrict: 'A',
-      link: function (scope, element, attr) {
+      link: function (scope) {
         if (scope.$last === true) {
           $timeout(function () {
             scope.$emit('ngRepeatFinished');

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1,6 +1,18 @@
 define([ 'app/app', 'jquery-uploadify' ], function(app) {
 	'use strict';
 	app.register.controller('vendor_materialCtrl', ['$scope', '$rootScope', 'Material', 'toaster', 'ComponentActive', 'Enterprise', '$q', 'NumberService', '$location', '$stateParams', 'Search', '$modal', 'ComponentActiveAPI', 'BrandSubmit', 'BrandActiveAPI', 'DistributionRule', 'prodRepositoryService', 'AuthenticationService', 'StoreInfo', 'ProductServiceQuery', 'StoreCms', 'ByteCountService', 'Goods', 'UASBatchPutOnPropertyServices', '$filter', function ($scope, $rootScope, Material, toaster, ComponentActive, Enterprise, $q, NumberService, $location, $stateParams, Search, $modal, ComponentActiveAPI, BrandSubmit, BrandActiveAPI, DistributionRule, prodRepositoryService, AuthenticationService, StoreInfo, ProductServiceQuery, StoreCms, ByteCountService, Goods, UASBatchPutOnPropertyServices, $filter) {
+    app.directive('onFinishRender', function ($timeout) {
+      return {
+        restrict: 'A',
+        link: function (scope) {
+          if (scope.$last === true) {
+            $timeout(function () {
+              scope.$emit('ngRepeatFinished');
+            });
+          }
+        }
+      }
+    })
 		$rootScope.active = 'vendor_material';
 		document.title = '卖家产品库-优软商城';
 		$scope.tab = 'material';

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -549,6 +549,10 @@
 	.oder01 ul li{
 		margin-left: 0px;
 		position: relative;
+		min-width: 110px
+	}
+	.oder01 ul li a {
+		min-width: 110px
 	}
 	.oder01 ul li.active a{
 		border-bottom: #fff;

src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -472,6 +472,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')" ng-if="isAdmin">申请绑定</a></li>
         <!--<li ng-class="{'active': tab=='logistic'}"><a href="#" ng-click="checkTab('logistic')">收货地址</a></li>-->
       </ul>
     </div>
@@ -795,6 +796,45 @@
         </li>-->
       </ul>
     </div>
+    <!--申请绑定-->
+    <div class="clearfix bind-en" ng-if="tab=='bind'">
+      <div class="rt_menu">
+        <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 class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
+        <thead>
+        <tr>
+          <th>用户名</th>
+          <th>UU账号</th>
+          <th>手机号</th>
+          <th>邮箱</th>
+          <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr class="default-row" ng-repeat="item in content">
+          <td class="user-name" ng-bind="item.user.vipName || '-'"></td>
+          <td ng-bind="item.user.userUU || '-'"></td>
+          <td ng-bind="item.user.mobile || '-'"></td>
+          <td ng-bind="item.user.email || '-'"></td>
+          <td>
+            <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>
+        <tr class="num" ng-if="content && content.length > 0">
+          <td colspan="5">
+            <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>
+        </tr>
+        <tr ng-if="!content || !content.length">
+          <td colspan="5" class="grey white">
+            <img src="static/img/all/empty-cart.png">暂无申请信息
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
     <!--权限管理-->
     <div class="count01 clearfix" ng-if="tab=='auth'">
       <div class="power_title">员工账号及权限管理</div>

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1127,6 +1127,9 @@
 		position: relative;
 		min-width: 110px
 	}
+	.com_tab ul li a {
+		min-width: 110px
+	}
 
 	.com_tab ul li::after{
 		background: url('static/img/vendor/images/downicon.png');