修复活动奖励展示问题

src/views/activity/ActivityAwardAdminView.vue

@@ -105,9 +105,9 @@
                             </div>
                         </div>
 
-                        <!-- 头饰 -->
+                        <!-- 铭牌 -->
                         <div class="form-group nameplateChoose awardList">
-                            <label for="nameplateChoose" class="col-sm-3 control-label">选择头饰：</label>
+                            <label for="nameplateChoose" class="col-sm-3 control-label">选择铭牌：</label>
 
                             <div class="col-sm-8">
                                 <select name="nameplateChoose" id="nameplateChoose" class="combobox">
@@ -165,6 +165,7 @@ export default {
     methods: {
         initData() {
             $(function () {
+                combineDataFromBack();
                 var $form = $('#activityAwardForm');
                 var $awardList = $('.awardList');
                 $('#table').bootstrapTable('destroy');
@@ -282,7 +283,6 @@ export default {
                         console.log("load fail");
                     }
                 });
-                combineDataFromBack();
                 $('#btnSearch').on('click', function () {
                     TableHelper.doRefresh('#table');
                 });
@@ -497,7 +497,7 @@ export default {
                         }
                         $('#carChoose').combobox();
                     })
-                    $.get('/admin/nameplate//total/list', {}, function (res) {
+                    $.get('/admin/nameplate/total/list', {}, function (res) {
                         if (res.code == 200) {
                             for (var i = 0; i < res.data.length; i++) {
                                 //                        car.push(res.data[i]);