From 61850973cf77e1d9286f7f4fd782be3efa320f78 Mon Sep 17 00:00:00 2001
From: cedric <cedriclin@foxmail.com>
Date: Fri, 13 Oct 2017 15:35:42 +0800
Subject: [PATCH] =?UTF-8?q?*=20=E9=A6=96=E9=A1=B5loding=E5=9B=BE=E7=9A=84?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=96=E5=86=B3=E4=BA=8E=E8=AF=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=89=80=E6=9C=89=E8=AF=B7=E6=B1=82=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=20*=20=E5=8E=BB=E9=99=A4=E9=A6=96=E9=A1=B5=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84wxss=E8=AE=BE=E7=BD=AE=20*=20=E9=A6=96=E9=A1=B5banner?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BD=BF=E7=94=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/brand/index.js      |  6 ++++++
 pages/classify/index.wxml |  6 +++++-
 pages/index/index.js      | 26 +++++++++++---------------
 pages/index/index.wxml    | 15 +++++++++++----
 pages/index/index.wxss    |  1 -
 pages/list/index.wxml     |  1 -
 project.config.json       | 27 +++++++++++++++++++++++++++
 7 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 project.config.json

diff --git a/pages/brand/index.js b/pages/brand/index.js
index d2834c4..d9c26ad 100644
--- a/pages/brand/index.js
+++ b/pages/brand/index.js
@@ -20,6 +20,12 @@ Page({
                 });
             }
         })
+    },
+
+    onReady: function(options) {
+      console.log('************************');
+      console.log(options);
+      console.log('************************');
     }
 
 })
\ No newline at end of file
diff --git a/pages/classify/index.wxml b/pages/classify/index.wxml
index 1905c87..c50184f 100644
--- a/pages/classify/index.wxml
+++ b/pages/classify/index.wxml
@@ -1,7 +1,11 @@
 <view class="container">
   <view class="nav_left">
     <block wx:for="{{navLeftItems}}">
-      <view class="nav_left_items {{curNav == item.id ? 'active' : ''}}" bindtap="switchRightTab" data-index="{{index}}" data-id="{{item.id}}">{{item.tree.desc}}</view>
+      <view class="nav_left_items {{curNav == item.id ? 'active' : ''}}" 
+            bindtap="switchRightTab" 
+            data-index="{{index}}"
+            data-id="{{item.id}}">{{item.tree.desc}}
+      </view>
     </block>
   </view>
   <view class="nav_right">
diff --git a/pages/index/index.js b/pages/index/index.js
index 105f888..49ae1a0 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -7,7 +7,10 @@ Page({
         autoplay: true,
         interval: 3000,
         duration: 1000,
-        loadingHidden: false  // loading
+        circular: true,
+        hasGotSliderDatas: false,
+        hasGotVenuesDatas: false,
+        hasChoiceGotDatas: false
     },
 
     //事件处理函数
@@ -34,9 +37,10 @@ Page({
             header: {
                 'Accept': 'application/json'
             },
-            success: function(res) {
+            success: function (res) {
                 that.setData({
-                    images: res.data
+                  images: res.data,
+                  hasGotSliderDatas: true
                 })
             }
         })
@@ -51,13 +55,9 @@ Page({
             },
             success: function(res) {
                 that.setData({
-                    venuesItems: res.data.data
+                    venuesItems: res.data.data,
+                    hasGotVenuesDatas: true
                 })
-                setTimeout(function () {
-                    that.setData({
-                        loadingHidden: true
-                    })
-                }, 1500)
             }
         })
 
@@ -71,13 +71,9 @@ Page({
             },
             success: function(res) {
                 that.setData({
-                    choiceItems: res.data.data.dataList
+                    choiceItems: res.data.data.dataList,
+                    hasChoiceGotDatas: true
                 })
-                setTimeout(function () {
-                    that.setData({
-                        loadingHidden: true
-                    })
-                }, 1500)
             }
         })
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e3299e9..37a8974 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,11 +1,18 @@
 <!--index.wxml-->
 <view class="container">
     <view>
-        <swiper class="swiper_box" indicator-dots="{{indicatorDots}}" vertical="{{vertical}}"
-                autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperchange">
+        <swiper class="swiper_box" 
+                indicator-dots="{{indicatorDots}}"
+                vertical="{{vertical}}"
+                autoplay="{{autoplay}}" 
+                interval="{{interval}}" 
+                duration="{{duration}}" 
+                bindchange="swiperchange" 
+                circular="{{circular}}">
             <block wx:for="{{images}}">
                 <swiper-item>
-                    <image src="{{item.picurl}}" class="slide-image"/>
+                    <image wx:if="{{item.picurl}}" src="{{item.picurl}}"  class="slide-image"></image>
+                    <image wx:else src= "http://placeholder.qiniudn.com/100x50" class="slide-image"></image>  
                 </swiper-item>
             </block>
         </swiper>
@@ -46,7 +53,7 @@
         </view>
     </view>
 
-    <loading hidden="{{loadingHidden}}">
+    <loading hidden="{{hasGotSliderDatas && hasGotVenuesDatas && hasChoiceGotDatas}}">
         加载中...
     </loading>
 
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 6aee45f..c5f8a93 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -33,7 +33,6 @@ view.text:before {
 
 .line_flag {
     width: 3px;
-    height: 100%;
     height: 15px;
     display: inline-block;
     background-color: #f9f027;
diff --git a/pages/list/index.wxml b/pages/list/index.wxml
index effab38..b2b0aa5 100644
--- a/pages/list/index.wxml
+++ b/pages/list/index.wxml
@@ -2,7 +2,6 @@
     <block wx:for="{{list}}">
         <navigator url="../details/index?id={{item.id}}">
         <view class="brand_item">
-            
                 <image src="{{item.goodspics}}" class="pic"></image>
                 <view class="right_cont">
                     <text class="country">{{item.country}}直采 {{item.bigname}}发货</text>
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..96a96a7
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,27 @@
+{
+	"description": "项目配置文件。",
+	"setting": {
+		"urlCheck": false,
+		"es6": true,
+		"postcss": true,
+		"minified": true
+	},
+	"compileType": "weapp",
+	"libVersion": "1.5.4",
+	"appid": "wx0f7b2572e5e3363b",
+	"projectname": "mall",
+	"condition": {
+		"weapp": {
+			"current": -1,
+			"list": []
+		},
+		"search": {
+			"current": -1,
+			"list": []
+		},
+		"conversation": {
+			"current": -1,
+			"list": []
+		}
+	}
+}
\ No newline at end of file