Merge remote-tracking branch 'origin/release-201817-wangcz' into release-201817-wangcz

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

@@ -785,7 +785,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
         $scope.chooseInvoice = ChooseInvoice
         $scope.chooseInvoice.billInfo = angular.fromJson($scope.chooseInvoice.billInfo);
         $scope.isUserCenter = source
-        console.log($scope.chooseInvoice, '$scope.ChooseInvoice')
         $scope.closeInvoice = function () {
             $modalInstance.close();
         };

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

@@ -56,7 +56,6 @@ define([ 'app/app' ], function(app) {
                         $defer.resolve(page.content);
                         //划分数据
                         $scope.billData = page.content;
-                        console.log($scope.billData, 'data')
                     }, function (response) {
                         toaster.pop('error', '获取开票记录失败 ', response.data);
                     });

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

@@ -1308,7 +1308,6 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
   		$scope.chooseInvoice = ChooseInvoice
       	$scope.chooseInvoice.billInfo = angular.fromJson($scope.chooseInvoice.billInfo);
 	  	$scope.isUserCenter = source
-	  	console.log($scope.chooseInvoice, '$scope.ChooseInvoice')
 		$scope.closeInvoice = function () {
 			$modalInstance.close();
 		};

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

@@ -65,7 +65,6 @@ define([ 'app/app' ], function(app) {
                         $defer.resolve(page.content);
                         //划分数据
                         $scope.billData = page.content;
-                        console.log($scope.billData, '111')
                         //初始化选中状态和地址信息
                         $scope.isAllCheck = false;
                         angular.forEach($scope.billData, function (item) {

src/main/webapp/resources/view/common/modal/delete_modal.html

@@ -81,7 +81,7 @@
         <a ng-click="cancleDelete()"><i class="fa fa-close fa-lg"></i></a>
     </div>
     <div class="content">
-        <p><i class="fa fa-exclamation-circle"></i>是否删除此信息</p>
+        <p><i class="fa fa-exclamation-circle"></i>是否删除此产品</p>
         <div class="red"
              ng-if="message">*<i ng-if="message" ng-bind="message"></i>
         </div>

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

@@ -639,18 +639,18 @@
                         </div>
                         <div class="text-inverse error col-md-3" ng-show="form.account.$touched&&(form.account.$invalid)" ng-bind="form.account.$error.required?'请填写开户银行账号':'请填写30位以内的数字'"></div>
                     </div>
-                    <div class="form-group"  ng-if="billType == 1205">
-                        <label class="col-md-2 control-label"><b class="text-inverse">*</b>上传开户许可证：{{form.permissionUpload}}</label>
-                        <div class="form-input-line file-line">
-                            <input type="text" name="permission" required class="form-control" ng-model="bill.attachUrl" readonly style="background: #fff">
-                        </div>
-                        <div class="col-md-1">
-                            <label class="select-file-box">
-                                <span>选择文件</span>
-                                <input class="input-file-default" type="file" ng-file-select ng-model="bill.billInfo" ng-change="onUploadPermission()" ng-multiple="false" accept="image/gif,image/jpeg,image/jpg,image/png,image/svg,application/pdf,*.pdf">
-                            </label></div>
-                        <div class="text-inverse error col-md-3" ng-show="isDoUpload&&(form.permission.$error.required)">请勿超过3M</div>
-                    </div>
+                    <!--<div class="form-group"  ng-if="billType == 1205">-->
+                        <!--<label class="col-md-2 control-label"><b class="text-inverse">*</b>上传开户许可证：{{form.permissionUpload}}</label>-->
+                        <!--<div class="form-input-line file-line">-->
+                            <!--<input type="text" name="permission" required class="form-control" ng-model="bill.attachUrl" readonly style="background: #fff">-->
+                        <!--</div>-->
+                        <!--<div class="col-md-1">-->
+                            <!--<label class="select-file-box">-->
+                                <!--<span>选择文件</span>-->
+                                <!--<input class="input-file-default" type="file" ng-file-select ng-model="bill.billInfo" ng-change="onUploadPermission()" ng-multiple="false" accept="image/gif,image/jpeg,image/jpg,image/png,image/svg,application/pdf,*.pdf">-->
+                            <!--</label></div>-->
+                        <!--<div class="text-inverse error col-md-3" ng-show="isDoUpload&&(form.permission.$error.required)">请勿超过3M</div>-->
+                    <!--</div>-->
                     <div class="form-group">
                         <label class="col-md-2 control-label"><b class="text-inverse">*</b>收票人：</label>
                         <div class="form-input-line">

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

@@ -123,7 +123,7 @@
     <span>发票抬头：</span><span ng-bind="chooseInvoice.invoicetitle || '-'">深圳市优软商城有限公司</span>
   </div>
   <div class="item-list" ng-hide="chooseInvoice.invoicetype==1206">
-    <span>单位地址：</span><span ng-bind="chooseInvoice.billInfo.detailAddress || '-'">深圳市家具卡卡卡卡卡卡阿里看斗罗大陆领深圳市家具卡卡卡卡卡卡阿里看斗罗大陆领</span>
+    <span>单位地址：</span><span ng-bind="chooseInvoice.billInfo.companyAddress || '-'">深圳市家具卡卡卡卡卡卡阿里看斗罗大陆领深圳市家具卡卡卡卡卡卡阿里看斗罗大陆领</span>
   </div>
   <div class="item-list" ng-hide="chooseInvoice.invoicetype==1206">
     <span>单位电话：</span><span ng-bind="chooseInvoice.billInfo.companyPhone || '-'">125698596566556"</span>