Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/product/HopeMarket.vue

@@ -308,7 +308,9 @@ export default {
             this.$http
                 .post('/setting/byFlag', { flag: 1 })
                 .then(res => {
-                    this.settings = res;
+                    this.settings = res.filter(item => {
+                        return item.pic;
+                    });
                     setTimeout(() => {
                         this.$nextTick(() => {
                             this.normalHeight = this.$refs.top.$el.offsetHeight;