debug

src/App.vue

@@ -11,7 +11,6 @@
     import Api from './lib/api'
     export default {
         created(){
-
             let _self = this;
             this.$store.commit('updateLoadingStatus', {isLoading: true});
             this.$http.jsonp(Api.memberInfo(), {_timeout: 5000}).then(function (res) {
@@ -44,6 +43,11 @@
             isLoading(){
                 return this.$store.state.isLoading;
             }
+        },
+        data(){
+            return {
+                transitionName:''
+            }
         }
     }
 </script>
@@ -65,4 +69,6 @@
     a {
         color: inherit;
     }
+
+
 </style>

src/components/blocks/block_list.vue

@@ -42,12 +42,12 @@
                 }
             }
         },
-        created: function () {
+        created(){
             this.getDatas();
             let shareMsg = {
                 title: '熊猫美妆商城',
                 desc: '熊猫美妆极速商城',
-                link: window.location.host + '/mobile/index.html?#',
+                link: "http://"+window.location.host+'/mobile/index.html?#',
                 img_url: 'http://a.lrlz.com/data/upload/shop/store/goods/6/6_05342032688036066_1280.jpg'
             };
             let WxShare = new WechatShare(shareMsg)
@@ -72,6 +72,9 @@
                         });
                         return;
                     }
+                    if(_self.proxy.specialList.length<=0) {
+                        _self.loadMoreTip = "暂无数据";
+                    }
                     window.removeEventListener('scroll', _self.loadMoreCallback);
                     let body = JSON.parse(res.bodyText);
                     _self.hasmore = body.datas['mobile_page'].hasmore;
@@ -120,7 +123,8 @@
                 scrollTop: 0,
                 documentHeight: 0,
                 windowHeight: 0,
-                isload: false
+                isload: false,
+                loadMoreTip:"加载中"
             }
         }
         ,
@@ -133,7 +137,7 @@
                 let loadMore = createElement(LoadMore, {
                     props: {
                         showLoading: false,
-                        tip: "暂无数据",
+                        tip: this.loadMoreTip,
                         backgroundColor: "#f9f9f9"
                     }
                 }, []);

src/components/blocks/bubble_btn.vue

@@ -0,0 +1,11 @@
+<template>
+
+</template>
+<script>
+ export default {
+
+ }
+</script>
+<style>
+
+</style>

src/components/blocks/goods_item.vue

@@ -26,7 +26,7 @@
                             <span class="f_left desc" style="margin-top: 20px;">仅剩{{grouptime}}天</span>
                             <div class="f_right">
                                 <span class="desc groupbuy_label">抢购特价</span>
-                                <span class="bonus_price">¥{{summery["goods_promotion_price"]}}</span>
+                                <span class="bonus_price">¥{{parseFloat(summery["goods_promotion_price"])}}</span>
                             </div>
                         </div>
                     </div>

src/components/blocks/goods_list.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="margin-top: 2.5%;">
+    <div style="padding-top: 2.5%;">
         <titles :special="special"></titles>
         <div class="goods_items">
             <goods-item v-for="goods in special.items" :key="goods" :item="goods" :proxy="proxy"></goods-item>

src/components/blocks/hot_search.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="margin-top: 2.5%;">
+    <div style="padding-top: 2.5%;">
         <titles :special="special"></titles>
         <flexbox class="flex-box" wrap="wrap" :gutter="0">
             <flexbox-item :span="1/4" v-for="item in special.items" :key="item">

src/components/blocks/search.vue

@@ -1,7 +1,6 @@
 <template>
-    <div class="search_box" @click="toSearch" >
-        <div class="search_logo"></div>
-        <div class="search">
+    <div v-bind:class="{search_box:true,'search_bg':isScroll}">
+        <div :class="{search:!isScroll,'search_scroll_bg':isScroll}" @click="toSearch">
             <p><i class="weui-icon-search index_search_icon"></i>搜索商品 品牌 功效 规格</p>
         </div>
     </div>
@@ -18,16 +17,6 @@
             toSearch(){
                 this.$router.push(Actions.toSearch());
             }
-        },
-        computed: {
-            windowScroll(){
-                if (this.isScroll) {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            }
         }
     }
 </script>
@@ -36,24 +25,41 @@
         position: fixed;
         top: 0;
         left: 0;
-        width: 100%;
+        width: 750px;
+        z-index: 999;
+        background: transparent;
+        padding: 12px 0;
+        -webkit-transition: all .8s ease;
+    }
+
+    .search_bg {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 750px;
         z-index: 999;
-        opacity: 1;
-        background: #fd4d51;
         padding: 12px 0;
+        background: rgba(235,78,79,0.9);
+        -webkit-transition: all .8s ease;
     }
 
     .search {
         border-radius: 5px;
-        background: #fff;
+        background: rgba(255,255,255,0.8);
         height: 60px;
-        width: 520px;
+        width: 720px;
         margin: 0 auto;
-        float: right;
-        margin-right: 20px;
     }
 
-    .search p {
+    .search_scroll_bg {
+        border-radius: 5px;
+        height: 60px;
+        width: 720px;
+        margin: 0 auto;
+        background: #fff;
+    }
+
+    .search_bg p,.search p {
         line-height: 60px;
         color: #666;
         padding-left: 20px;
@@ -63,11 +69,23 @@
         color: #666;
         margin-right: 10px;
     }
-    .search_logo {
-        float: left;
-        height: 60px;
-        width: 176px;
-        margin-left: 20px;
-        background: url("../../assets/search_log.jpg") no-repeat center;
-    }
+    /*.search_logo {*/
+        /*float: left;*/
+        /*height: 60px;*/
+        /*width: 176px;*/
+        /*margin-left: 20px;*/
+        /*background: url('../../assets/scroll_logo.png') no-repeat center;*/
+        /*background-size: 100%;*/
+        /*-webkit-transition: all .8s ease;*/
+    /*}*/
+    /*.scroll_logo {*/
+        /*float: left;*/
+        /*height: 60px;*/
+        /*width: 176px;*/
+        /*margin-left: 20px;*/
+        /*background: url('../../assets/search_logo.png') no-repeat center;*/
+        /*background-size: 100%;*/
+        /*-webkit-transition: all .8s ease;*/
+    /*}*/
+
 </style>

src/components/blocks/util/blockUtil.js

@@ -20,6 +20,7 @@ import HomeGrid from '../HomeGrid.vue'
 import Brand from '../brand.vue'
 import FCode from '../fcode.vue'
 import GoodsTop from '../goods_top.vue'
+import {LoadMore} from 'vux'
 class BlockUtil {
     static createBlockComp(createElement, special, proxy) {
         let comp;
@@ -63,7 +64,14 @@ class BlockUtil {
                     break;
             }
         } catch (e) {
-            comp = createElement('div', '<p>创建失败</p>');
+            // comp = createElement('div', '<p>创建失败</p>');
+            comp = createElement(LoadMore, {
+                props: {
+                    showLoading:false,
+                    tip: "暂无数据",
+                    backgroundColor: "#F7F7F7"
+                }
+            });
         }
         return comp;
     }
@@ -111,7 +119,14 @@ class BlockUtil {
                     comp = createElement(GoodsTop,params);
             }
         } catch (e) {
-            comp = createElement('div', '<p>创建失败</p>');
+            // comp = createElement('div', '<p>创建失败</p>');
+            comp = createElement(LoadMore, {
+                props: {
+                    showLoading:false,
+                    tip: "暂无数据",
+                    backgroundColor: "#F7F7F7"
+                }
+            });
         }
         return comp;
     }
@@ -137,6 +152,8 @@ class BlockUtil {
                 if (is_return) {
                     return this.getBlockUrl(path);
                 } else {
+                    path.query.url = base64.encode( path.query.url);
+                    console.log(path);
                     router.push(path);
                 }
                 break;

src/components/main/discovery/discovery.vue

@@ -64,7 +64,7 @@
 
     .discovery_content {
         padding-top: 88px;
-        padding-bottom: 101px;
+        padding-bottom: 94px;
         background: #f9f9f9;
     }
 </style>

src/components/main/home/homeTabs.vue

@@ -31,15 +31,35 @@
             let shareMsg = {
                 title: '熊猫美妆商城',
                 desc: '熊猫美妆极速商城',
-                link: window.location.host + '/mobile/index.html?#',
+                link: "http://" + window.location.host + '/mobile/index.html?#',
                 img_url: 'http://a.lrlz.com/data/upload/shop/store/goods/6/6_05342032688036066_1280.jpg'
             };
             let WxShare = new WechatShare(shareMsg);
         },
+        mounted(){
+            let _self = this;
+            let top = document.documentElement.scrollTop || document.body.scrollTop;
+            if (top > 0) {
+                this.isScrolls = true;
+            }
+            else {
+                this.isScrolls = false;
+            }
+            window.addEventListener('scroll', function () {
+                let top = document.documentElement.scrollTop || document.body.scrollTop;
+                if (top > 0) {
+                    _self.isScrolls = true;
+                }
+                else {
+                    _self.isScrolls = false;
+                }
+            });
+        },
         data(){
             return {
                 tabs: null,
                 current_id: 0,
+                isScrolls: false
             }
         },
         methods: {
@@ -64,12 +84,12 @@
 
             let showTable = this.tabs.length >= 2;
             let tabDisplay = showTable ? "block" : "none";
-            let containerPaddingTop = showTable ? "170px" : "84px";
+            let containerPaddingTop = showTable ? "170px" : "0";
 
             return (
                     <div>
                         <div v-document_title>熊猫美妆</div>
-                        <Search isScroll={this.isScroll}></Search>
+                        <Search isScroll={this.isScrolls}></Search>
                         <div style={{display: tabDisplay}}>
                             <div class="list_tab" style={{position: 'fixed'}}>
                                 <Tab style={{width: 150 * this.tabs.length + "px", background: "#fff"}}
@@ -110,8 +130,7 @@
     }
 
     .list_container {
-
-        padding-bottom: 101px;
+        padding-bottom: 94px;
         background: #f9f9f9;
     }
 

src/components/main/main.vue

@@ -10,7 +10,7 @@
                 <span slot="label">首页</span>
             </tabbar-item>
             <tabbar-item link="/main/discovery" :selected="routerPath('/main/discovery')">
-                <img slot="icon" src="../../assets/tabbar_shopguide_default@2x.png">
+                <img slot="icon" src="../../assets/tabbar_shopguide_default@2x.png" >
                 <img slot="icon-active" src="../../assets/tabbar_shopguide_hight@2x.png">
                 <span slot="label">发现</span>
             </tabbar-item>
@@ -31,7 +31,9 @@
     import {Tabbar, TabbarItem} from 'vux'
     export default {
         data () {
-            return {}
+            return {
+                transitionName:''
+            }
         },
         components: {
             Tabbar,
@@ -70,4 +72,14 @@
         position: fixed;
         background: #fff;
     }
+    .weui-tabbar__label {
+        color: #000;
+    }
+    .weui-tabbar__item {
+        padding: 8px 0 0;
+    }
+    .weui-tabbar__icon {
+        width: 50px;
+        height: 50px;
+    }
 </style>

src/components/main/mine/mine.vue

@@ -4,7 +4,7 @@
         <group>
             <cell :title="userMsg.userName" :link="loginPath" style="padding: 30px 40px;">
                 <img slot="icon" v-bind:src="userMsg.userImg"
-                     style="max-width: 122px; max-height: 118px; vertical-align: middle; margin-right: 32px;border-radius: 10px;"
+                     style="width: 122px; height: 118px; vertical-align: middle; margin-right: 32px;border-radius: 10px;"
                      alt="logo"/>
             </cell>
         </group>
@@ -83,7 +83,7 @@
             let shareMsg = {
                 title:'熊猫美妆商城',
                 desc: '熊猫美妆极速商城',
-                link: window.location.host+'/mobile/index.html?#',
+                link: "http://"+window.location.host+'/mobile/index.html?#',
                 img_url:'http://a.lrlz.com/data/upload/shop/store/goods/6/6_05342032688036066_1280.jpg'
             };
             let WxShare = new WechatShare(shareMsg);

src/components/main/shop-car/shopping_cart.vue

@@ -93,7 +93,7 @@
             let shareMsg = {
                 title:'熊猫美妆商城',
                 desc: '熊猫美妆极速商城',
-                link: window.location.host+'/mobile/index.html?#',
+                link: "http://"+window.location.host+'/mobile/index.html?#',
                 img_url:'http://a.lrlz.com/data/upload/shop/store/goods/6/6_05342032688036066_1280.jpg'
             };
             let WxShare = new WechatShare(shareMsg);
@@ -391,7 +391,7 @@
     .all_handle {
         position: fixed;
         width: 100%;
-        bottom: 100px;
+        bottom: 94px;
         left: 0;
         background: #fff;
         z-index: 100;

src/components/order/list/OrderList.vue

@@ -75,7 +75,7 @@
                 this.documentHeight = document.body.scrollHeight;
                 this.windowHeight = window.screen.height * 2;
                 if (!this.isload && (this.documentHeight-(this.scrollTop + this.windowHeight) <= 100)) {
-                    this.getDatas();
+                    this.getData();
                 }
             },
             getParamState(state){
@@ -413,5 +413,7 @@
         display: inline-block;
         float: right;
     }
-
+    .weui-dialog__bd {
+        font-size: 30px;
+    }
 </style>

src/components/order/list/OrderTabs.vue

@@ -65,4 +65,5 @@
         padding-top: 90px;
         background: #f9f9f9;
     }
+
 </style>

src/main.js

@@ -89,7 +89,7 @@ return response;
 })
 });
 
-
+//
 const scrollBehavior = (to, from, savedPosition) => {
     if (savedPosition) {
         setTimeout(() => {
@@ -109,9 +109,11 @@ const router = new VueRouter({
     scrollBehavior,
     mode: 'hash'
 });
-
+//
 router.beforeEach(function (to, from, next) {
-
+    if(to.path =='/confirm_order') {
+        window
+    }
     if (to.path.indexOf("schema") !== -1) {
         let schema = base64.decode(to.query.schema);
         let urlObj = CommonUtil.parseURL(schema);
@@ -121,7 +123,7 @@ router.beforeEach(function (to, from, next) {
                 let title = decodeURI(urlObj.params.title);
                 let url = base64.encode(decodeURIComponent(urlObj.params.url));
                 next(Actions.getWebViewPath(title, url));
-                break
+                break;
         }
     } else {
         next();

src/router/routes.js

@@ -84,6 +84,7 @@ export default [
         component: WebView,
         beforeEnter: (to, from, next) => {
             let url = base64.decode(to.query.url)
+            console.log(url);
             window.location.href = url
             next(false);
         }