1、修改超级后台，通过与不通过显示查看详情按钮

2、修改超级后台，终审按钮下改成已初审多久
3、修改上下架历史，单价显示问题

src/main/webapp/resources/js/admin/controllers/StoreApplicationCtrl.js

@@ -23,6 +23,10 @@ define([ 'app/app' ], function(app) {
 				name: 'PREPARE',
 				message: '待审核'
 			},
+            CHECK: {
+                name: 'CHECK',
+                message: '待审核'
+            },
 			PASS: {
 				name: 'PASS',
 				message: '已通过'
@@ -116,8 +120,11 @@ define([ 'app/app' ], function(app) {
 						var date = new Date();
 						console.log('TIMESTAMP', date.getTime());
 						angular.forEach(data.content, function (application) {
-							if (application.status === $scope.authType.PREPARE.name) {
+							if (application.status === $scope.authType.PREPARE.name || application.status === $scope.authType.CHECK.name) {
 								var time = date - application.createTime;
+								if (application.status === $scope.authType.CHECK.name) {
+                                    time = date - application.authTime;
+								}
 								// 计算相差天数
 								var days = Math.floor(time / (24 * 3600 * 1000));
 								// 计算相差小时数

src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -277,6 +277,7 @@
 				<td>
 					<p ng-if="application.status == authType.PASS.name">已通过</p>
 					<p class="wait" ng-if="application.status == authType.PREPARE.name">待审核</p>
+					<p class="wait" ng-if="application.status == authType.CHECK.name">已通过初审</p>
 					<p class="no-pass" ng-if="application.status == authType.UNPASS.name">未通过</p>
 				</td>
 				<td>
@@ -286,8 +287,9 @@
 					</div>
 					<div ng-if="application.status === 'CHECK'">
 						<a class="apply-bg btn" href="javascript:void(0)" ng-click="auditQualification(application)">终审</a><br/>
+						<span style="color: #9d9d9d">已初审 {{application.time.day}}天{{application.time.hour}}时</span>
 					</div>
-					<div ng-if="application.status !== 'PREPARE'">
+					<div ng-if="application.status === 'PASS' || application.status === 'UNPASS'">
 						<a class="detail-bg btn" href="javascript:void(0)" ng-click="auditQualification(application)">查看详情</a>
 					</div>
 				</td>

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

@@ -751,8 +751,8 @@
                         </td>
                         <td>
                             <div ng-repeat="price in commodity.prices">
-                                <span ng-if="$$upAndDown.currency == 'RMB'" style="margin-left: 20px;" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
-                                <span ng-if="$$upAndDown.currency == 'USD'" style="margin-left: 20px;" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
+                                <span ng-if="$$upAndDown.currency == 'RMB'" class="wid100" style="margin-left: 0px;" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
+                                <span ng-if="$$upAndDown.currency == 'USD'"  class="wid100"  style="margin-left: 0px;" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
                             </div>
                         </td>
                         <td>
@@ -766,8 +766,10 @@
                             </div>
                         </td>
                         <td>
-                            <div>
-                                <span class="wid100" ng-bind="commodity.operater.userName"></span>
+                            <div title="{{commodity.operater.userName}}">
+                                <span class="wid100" style="width: 64px;overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;" ng-bind="commodity.operater.userName"></span>
                             </div>
                         </td>
                     </tr>