ie9bug

src/main/webapp/resources/css/common.css

@@ -1137,4 +1137,8 @@ select {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+}
+input.form-control {
+	padding-top: 0 !important;
+	padding-bottom: 0 !important;
 }

src/main/webapp/resources/js/sso/controllers/ssoAddressCtrl.js

@@ -59,6 +59,7 @@ define(['app/app'], function (app) {
 
                 $scope.ensureDelete = function (addressId) {
                     ShippingAddress.del({ addid : addressId }, {}, function () {
+                        toaster.pop('success', '删除收货地址成功');
                         $scope.showDeleteFrame = false;
                         $scope.loadAddresses();
                     }, function () {

src/main/webapp/resources/js/usercenter/controllers/forstore/bom_detail_ctrl.js

@@ -410,7 +410,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                   var minute = date.getMinutes();
                   var sec = date.getSeconds();
                   minute = minute < 10 ? ('0' + minute) : minute;
-                  return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':'
+                  return y + '/' + m + '/' + d + ' ' + h + ':' + minute + ':'
                       + sec;
                 };
                 // 选择查找日期

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js

@@ -466,7 +466,7 @@ define(['app/app'], function (app) {
             var minute = date.getMinutes();
             var sec = date.getSeconds();
             minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
+            return y + '/' + m + '/' + d+' '+h+':'+minute+':'+sec;
         };
 
 		/**

src/main/webapp/resources/js/usercenter/controllers/forstore/first_rate_ctrl.js

@@ -60,7 +60,7 @@ define(['app/app'], function(app) {
                 if (data.success){
                     window.location.href='user#/order';
                 }
-
+                toaster.pop('success', '评价完成');
             },function (error) {
                 toaster.pop('error', '评价失败');
             });

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -405,6 +405,8 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
               inquiry.date = new Date();
               inquiry.recorder = $scope.userInfo.userName;
               // 截止时间处理  添加23:59:59秒
+              // console.log(formatDateTime($scope.applyObj.deadline))
+              // console.log(new Date(Date.parse(formatDateTime($scope.applyObj.deadline).replace(/-/g, '/'))))
               $scope.applyObj.deadline = new Date(formatDateTime($scope.applyObj.deadline));
               inquiry.endDate = $scope.applyObj.deadline;
               inquiry.sourceapp = "MALL";
@@ -704,7 +706,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             var minute = 59;
             var sec = 59;
             //minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + sec;
+            return y + '/' + m + '/' + d + ' ' + h + ':' + minute + ':' + sec;
           };
           // 选择查找日期
           $scope.onDateCondition = function () {

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

@@ -20,7 +20,7 @@ define(['app/app'], function (app) {
           }, {
             total: 0,
             getData: function ($defer, params) {
-              const param = BaseService.parseParams(params.url());
+              var param = BaseService.parseParams(params.url());
               param.keyword = $scope.keyWord;
               if ($scope.isSearch) {
                 param.page = 1;

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

@@ -111,7 +111,7 @@ define(['app/app'], function(app) {
             var minute = date.getMinutes();
             var sec = date.getSeconds();
             minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
+            return y + '/' + m + '/' + d+' '+h+':'+minute+':'+sec;
         };
         // 选择查找日期
         $scope.onDateCondition = function () {

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

@@ -214,7 +214,7 @@ define(['app/app'], function(app) {
 			var minute = date.getMinutes();
 			var sec = date.getSeconds();
 			minute = minute < 10 ? ('0' + minute) : minute;
-			return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
+			return y + '/' + m + '/' + d+' '+h+':'+minute+':'+sec;
 		};
 		$scope.totalPrice = 0;
 		$scope.totalNum = function () {

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

@@ -112,7 +112,7 @@ define(['app/app'], function(app) {
             var minute = date.getMinutes();
             var sec = date.getSeconds();
             minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
+            return y + '/' + m + '/' + d+' '+h+':'+minute+':'+sec;
         };
         // 选择查找日期
         $scope.onDateCondition = function () {

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

@@ -330,7 +330,7 @@ define(['app/app'], function (app) {
             var minute = date.getMinutes();
             var sec = date.getSeconds();
             minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + sec;
+            return y + '/' + m + '/' + d + ' ' + h + ':' + minute + ':' + sec;
           };
           // 选择查找日期
           $scope.onDateCondition = function () {

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

@@ -1925,7 +1925,8 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
     }
 
     var countLength = function (string) {
-      return string.replace(/[^\x00-\xff]/g,'**').length;
+      return string && string !== null && !angular.isUndefined(string) ? string.replace(/[^\x00-\xff]/g,'**').length : 0;
+      // return 0;
     };
 
     var cutOutString = function (str, length) {

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

@@ -983,7 +983,7 @@ define(['app/app'], function (app) {
             var minute = date.getMinutes();
             var sec = date.getSeconds();
             minute = minute < 10 ? ('0' + minute) : minute;
-            return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
+            return y + '/' + m + '/' + d+' '+h+':'+minute+':'+sec;
         };
         // 选择查找日期
         $scope.onDateCondition = function () {

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

@@ -32,6 +32,7 @@
 		width : 1026px;
 		height: 230px;
 		border-bottom: 1px dashed #dadada;
+		clear: both;
 	}
 	.store-item > div{
 		float:left;
@@ -374,7 +375,7 @@
 		<!-- 店铺关注具体信息 -->
 		<div class="store-container" ng-if="store.length != 0">
 			<ul>
-				<li ng-repeat="item in store" class="store-item">
+				<li ng-repeat="item in store" class="store-item clearfix">
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
 						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}" target="_blank">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>

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

@@ -2204,7 +2204,7 @@
                                                                                            ng-click="toggleIsBreadUp(goods, false)"></button></span>
                                                         </div>
                                                     </div>
-                                                    <div class="content margin10">
+                                                    <div class="content margin10" style="width: 154px;">
                                                         <!--<p class="title">库存</p>-->
                                                         <div class="input-list">
                                                             <span class="tit" style="width: 84px">库存：</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量"
@@ -2223,7 +2223,7 @@
                                                     </div>
                                                     <div class="content">
                                                         <p class="title height24">梯度/pcs</p>
-                                                        <div class="input-list" ng-repeat="price in goods.editPrices">
+                                                        <div class="input-list" style="width: 154px;overflow: hidden" ng-repeat="price in goods.editPrices">
                                                             <p>
                                                                 <span style="overflow: hidden;"><input ng-disabled="$index == 0" type="number" class="wid42 form-control fl" ng-class="{'error' : price.startInValid}"
                                                                                    placeholder="数量" ng-model="price.start" ng-blur="editQty(goods, $index, false, price.start)" oninput="if(value.length>9)value=value.slice(0,9)"/></span><em
@@ -2236,14 +2236,14 @@
                                                     </div>
                                                     <div class="content" ng-if="!store.enType || store.enType === 'HK'">
                                                         <p class="title height24">单价($)</p>
-                                                        <div
+                                                        <div style="width: 92px;overflow: hidden;"
                                                                 class="input-list" ng-repeat="price in goods.editPrices">
                                                                 <input type="number" name="usd" class="wid92 form-control"  placeholder="单价($)" ng-blur="changePrices(goods.editPrices, price.uSDPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.uSDPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
                                                         </div>
                                                     </div>
                                                     <div class="content" ng-if="!store.enType || store.enType === 'MAINLAND'">
                                                         <p class="title height24">单价(￥)</p>
-                                                        <div
+                                                        <div style="width: 92px;overflow: hidden;"
                                                                 class="input-list" ng-repeat="price in goods.editPrices">
                                                                 <input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(￥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
                                                         </div>