04/19

src/main.js

@@ -11,8 +11,8 @@ import './main.css'
 import './swiper.css'
 
 
-import Vconsole from 'vconsole';
-new Vconsole();
+// import Vconsole from 'vconsole';
+// new Vconsole();
 
 
 // 初始化vue-amap
@@ -136,30 +136,44 @@ Vue.prototype.$http = {
 
 
 
-Vue.prototype.preview = function (index, list) {
+Vue.prototype.preview = function(index, list) {
     var imgList = []
 
     var sequence = Promise.resolve();
 
-    list.forEach(function (item) {
-        sequence = sequence.then(function () {
-            return getImg(item.img, window.innerWidth - 30, window.innerHeight - 30);
-        }).then(function (data) {
-            var jsonp = {
-                img: item.img,
-                width: data.width,
-                height: data.height,
-            };
-            if (item.title) {
-                jsonp.title = item.title
-
-                if (item.money) {
-                    jsonp.money = item.money
+    list.forEach(function(item) {
+        if (item.img) {
+            sequence = sequence.then(function() {
+                return getImg(item.img, window.innerWidth - 30, window.innerHeight - 30);
+            }).then(function(data) {
+                var jsonp = {
+                    img: item.img,
+                    width: data.width,
+                    height: data.height,
+                };
+                if (item.title) {
+                    jsonp.title = item.title
+
+                    if (item.money) {
+                        jsonp.money = item.money
+                    }
                 }
-            }
-            imgList.push(jsonp);
-            return Promise.resolve();
-        });
+                imgList.push(jsonp);
+                return Promise.resolve();
+            });
+        } else {
+            sequence = sequence.then(function() {
+                return getImg(item, window.innerWidth - 30, window.innerHeight - 30);
+            }).then(function(data) {
+                var jsonp = {
+                    img: item,
+                    width: data.width,
+                    height: data.height,
+                };
+                imgList.push(jsonp);
+                return Promise.resolve();
+            });
+        }
     })
     sequence.then(() => {
         this.$preview({ nowIndex: index, List: imgList })

src/pages/Daily.vue

@@ -10,7 +10,7 @@
       <div class="swiper-container" id="swiper3">
         <div class="swiper-wrapper">
           <div class="swiper-slide" v-for="(item,index) in imgList" :key="index">
-            <img :src="item" alt  @click="preview(index,imgList)">
+            <img :src="item" alt  >
           </div>
         </div>
       </div>

src/pages/Home.vue

@@ -197,8 +197,11 @@ export default {
     },
     methods: {
         goDaily() {
-            this.$route.push({
-                name: 'daily'
+            this.$router.push({
+                name: 'daily',
+                params:{
+                    isNext:1
+                }
             })
         },
         takeMenu(jsonp) {
@@ -260,7 +263,8 @@ export default {
                     backgroundImage: 'url(' + require('../assets/icon_daohang.png') + ')',
                     backgroundPosition: '6px 8px',
                     backgroundSize: '13px 13px',
-                    backgroundRepeat: 'no-repeat'
+                    backgroundRepeat: 'no-repeat',
+                    border:'none'
                 }
             });
 

src/pages/Location.vue

@@ -94,7 +94,8 @@ export default {
           backgroundImage: 'url(' + require('../assets/icon_daohang.png') + ')',
           backgroundPosition: '6px 8px',
           backgroundSize: '13px 13px',
-          backgroundRepeat: 'no-repeat'
+          backgroundRepeat: 'no-repeat',
+                    border:'none'
         }
       });
 

src/pages/Meeting.vue

@@ -13,7 +13,7 @@
       <div class="swiper-container" id="swiper3">
         <div class="swiper-wrapper">
           <div class="swiper-slide" v-for="(item,index) in allmenuInfo[nowMenu].img">
-            <img :src="item" alt   @click="preview(index,allmenuInfo[nowMenu].img)">
+            <img :src="item" alt  >
           </div>
         </div>
       </div>

src/pages/WaterTreatment.vue

@@ -10,7 +10,7 @@
       <div class="swiper-container" id="swiper3">
         <div class="swiper-wrapper">
           <div class="swiper-slide" v-for="(item,index) in imgList">
-            <img :src="item" alt @click="preview(index,imgList)">
+            <img :src="item" alt >
           </div>
         </div>
       </div>