Merge remote-tracking branch 'origin/liusw-account-v1.0.10.19' into liusw-account-v1.0.10.19

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

@@ -1308,11 +1308,11 @@ define(['app/app'], function(app) {
 
 		$scope.deleteImg =function () {
 			$scope.user.idImgUrl = '';
+			$scope.checkSuccess2=false;
 		};
 
 		// 查看范例
 		$scope.showImg = function(imgUrl) {
-			debugger;
 			var src = imgUrl, box = $('#image-box'), modal = $('.modal-content');
 			box.show();
 			box.find('img').attr('src', src);

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

@@ -127,9 +127,9 @@
                             <span class="prompt">提示：选择文件大小不超过3MB，支持JPG，PNG，GIF，BMP格式.</span>
                             <div class="logoImg" style="float: left; padding-left: 10px;position: relative">
                                 <input type="file" ng-if="imageUrl==''" image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadSuccess($data,$file)" non-preview="true"/>
-                                <div ng-if="imageUrl!=''">
-                                    <img ng-src="{{imageUrl}}" alt="">
-                                </div>
+                                    <div ng-if="imageUrl!=''">
+                                        <img ng-src="{{imageUrl}}" alt="">
+                                    </div>
                                 <div class="hover-show" ng-if="imageUrl!=''">
                                     <span class="delete" title="删除" ng-click="deleteImg()"><i class="fa fa-trash" ng-click="deleteImg()"></i></span>
                                     <span class="view" ng-click="showImg(imageUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>

src/main/webapp/resources/view/vendor/modal/updateRealAuth.html

@@ -85,11 +85,10 @@
         bottom: 15px;
         background: rgba(0,0,0,.5);
         z-index: 10;
-        display: block;
+        display: none;
     }
     .realAuth .logoImg:hover .hover-show{
-        top: 0;
-        z-index: 10;
+       display: block;
     }
     .realAuth .hover-show .delete{
         position: absolute;
@@ -125,6 +124,20 @@
         margin-right: 5px;
         font-size: 16px;
     }
+    .realAuth .pre-img {
+        width: 117px;
+        height: 117px;
+        margin: 19px auto 0;
+    }
+    .realAuth .pre-img img {
+        width: 117px;
+        height: 117px;
+    }
+    .logoImg {
+        width: 117px;
+        height: 117px;
+        margin: 0 auto;
+    }
 </style>
 <div class="modal-header">
     <img src="static/img/user/images/realAuth.png" alt="">
@@ -164,9 +177,12 @@
         <div class="upload-area">
             <div class="area-header">请上传一张本人手持身份证照片：</div>
             <input type="hidden" name="idImgUrl" ng-model="user.idImgUrl"/>
-            <div>
-                <div  image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadID($data)"></div>
+            <div class="logoImg">
+                <div ng-if="!user.idImgUrl||user.idImgUrl==''" image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadID($data)"></div>
                 <!--<span class="help-block font-size-12 text-inverse">建议图片大小在3M以内，支持图片格式jpg、png、gif</span>-->
+                <div ng-if="user.idImgUrl&&user.idImgUrl!=''" class="pre-img">
+                    <img ng-src="{{user.idImgUrl}}" alt="">
+                </div>
                 <div class="hover-show" ng-if="user.idImgUrl&&user.idImgUrl!=''">
                     <span class="delete" title="删除" ng-click="deleteImg()"><i class="fa fa-trash" ng-click="deleteImg()"></i></span>
                     <span class="view" ng-click="showImg(user.idImgUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>

src/main/webapp/resources/view/vendor/modal/updateUserEmail.html

@@ -47,10 +47,14 @@
         border-right: 1px solid rgb( 204, 204, 204 );
         border-bottom: 1px solid rgb( 204, 204, 204 );
         border-top: 1px solid rgb( 204, 204, 204 );
-        background: rgb( 227, 227, 227 );
+        background: #5078cb;
+        color: #fff;
+        cursor: pointer;
     }
     .userEmail .modal-body .row.validate-code .col-md-8 .code-btn[disabled] {
         cursor: not-allowed;
+        background: rgb( 227, 227, 227 );
+        color: #666;
     }
     .modal-footer >button {
         width: 90px;

src/main/webapp/resources/view/vendor/modal/updateUserTel.html

@@ -47,10 +47,14 @@
         border-right: 1px solid rgb( 204, 204, 204 );
         border-bottom: 1px solid rgb( 204, 204, 204 );
         border-top: 1px solid rgb( 204, 204, 204 );
-        background: rgb( 227, 227, 227 );
+        background: #5078cb;
+        color: #fff;
+        cursor: pointer;
     }
     .userTel .modal-body .row.validate-code .col-md-8 .code-btn[disabled] {
         cursor: not-allowed;
+        background: rgb( 227, 227, 227 );
+        color: #666;
     }
     .modal-footer >button {
         width: 90px;