修复bug

src/views/car/CarGoodsAdminView.vue

@@ -32,12 +32,13 @@
                                     <option value="1">未启用</option>
                                 </select>
                             </div>
+                        </div>
+                        <div class="col-sm-12">
                             <label for="partitionId" class="col-sm-1 control-label">地区:</label>
                             <div class="col-sm-3">
                                 <select name="partitionId" id="partitionId" class="form-control"></select>
                             </div>
                         </div>
-
                         <div class="col-sm-12">
                             <button id="car-goods-refresh" class="btn btn-default">
                                 <i class="glyphicon glyphicon-search"></i>查询
@@ -1182,12 +1183,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/chatbubble/ChatbubbleManageView.vue

@@ -627,12 +627,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/dressShop/DressShopAdminView.vue

@@ -217,7 +217,16 @@ export default {
                                 console.log(res)
                                 request.success({
                                     "rows": res.data.rows.map(i=>{
-                                        i.name = JSON.parse(i.name);
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(i.name);
+                                        } else {
+                                            i.name = {
+                                                zh: i.name,
+                                                ar: i.name,
+                                                en: i.name,
+                                            };
+                                        }
                                         return i;
                                     }),
                                     "total": res.total

src/views/firstpage/FirstPageBannerView.vue

@@ -1061,12 +1061,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/headwear/HeadwearAdminView.vue

@@ -37,21 +37,21 @@
                                 <option value="0">下架</option>
                             </select>
                         </div>
-
-                        <label for="partitionId" class="col-sm-1 control-label">地区:</label>
-                            <div class="col-sm-2">
-                                <select name="partitionId" id="partitionId" class="form-control"></select>
-                            </div>
-                        </div>
-
-                    <div class="col-sm-12">
-                        <button id="btnSearch" class="btn btn-default">
-                            <i class="glyphicon glyphicon-search"></i>查询
-                        </button>
-                        <button id="btnAdd" class="btn btn-default opt-apply">
-                            <i class="glyphicon glyphicon-adjust"></i>新增
-                        </button>
                     </div>
+                <div class="col-sm-12">
+                    <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                        <div class="col-sm-2">
+                            <select name="partitionId" id="partitionId" class="form-control"></select>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-12">
+                    <button id="btnSearch" class="btn btn-default">
+                        <i class="glyphicon glyphicon-search"></i>查询
+                    </button>
+                    <button id="btnAdd" class="btn btn-default opt-apply">
+                        <i class="glyphicon glyphicon-adjust"></i>新增
+                    </button>
                 </div>
             </div>
         </div>
@@ -1018,12 +1018,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/infocard/InfocardManageView.vue

@@ -583,12 +583,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/nameplate/NameplateInfoView.vue

@@ -705,12 +705,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/room/RoomSearchAdminView.vue

@@ -1047,12 +1047,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/room/RoomTabHomeView.vue

@@ -413,12 +413,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/room/RoomTabMapView.vue

@@ -453,12 +453,15 @@ export default {
                 buildSelectOption(
                     "#partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/room/RoomtagAdminView.vue

@@ -541,12 +541,15 @@ export default {
                 buildSelectOption(
                     "#modal_partitionId",
                     null,
-                    data.map((v) => {
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
                     return {
                         value: v.id,
                         text: v.desc,
                     };
-                    })
+                    }))
                 );
             });
         },

src/views/users/GiftManageView.vue

@@ -67,6 +67,10 @@
                                     <option value="16">超级幸运礼物</option>
                                 </select>
                             </div>
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
                         </div>
 
                         <div class="col-sm-12">
@@ -575,6 +579,8 @@ import TableHelper from '@/utils/bootstrap-table-helper';
 import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper';
 import { formatTime, showLoading, hideLoading, apiResult } from '@/utils/maintainer';
 import { uploadGift } from '@/api/common/upload';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 export default {
     name: "GiftManageView",
@@ -1687,7 +1693,25 @@ export default {
                     startDate: new Date()
                 });
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
 
 };