Просмотр исходного кода

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

shenjj 7 лет назад
Родитель
Сommit
2c9672478d

+ 0 - 1
src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -554,7 +554,6 @@
 					</form>
 					<div class="row">
 						<div class="col-sm-12" style="text-align: center;">
-							<button class="btn" ng-click="cancel()" style="background: #acabab;color:#fff">取消</button>
 							<button class="btn" type="submit" ng-click="confirm()" style="background: #5078cb;color:#fff">确定</button>
 						</div>
 					</div>

+ 0 - 1
src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -951,7 +951,6 @@
                     <div class="row">
                         <button style="width:0;height:0;background: transparent;border:0;"></button>
                         <div class="col-sm-12" style="text-align: center;">
-                            <button class="btn" ng-click="cancelAdd()" style="background: #acabab;color:#fff">取消</button>
                             <button class="btn" type="submit" ng-click="ensureAddAccount()" style="background: #5078cb;color:#fff">确定</button>
                         </div>
                     </div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -425,7 +425,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in billData track by $index" on-finish-render>
+                    <tr ng-repeat="item in billData track by $index" on-finish-render >
                         <td  style="width: 60px;">
                             <lable class="check-act">
                                 <input type="checkbox" id={{$index+1}} ng-checked="item.checked" ng-click="checkInvoice(item)" />