From a1849de54b47bc0c3d3af4b547c22f7990be569b Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sun, 6 Jan 2019 17:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/appmini/old/alipay/app.js              |  2 +-
 .../components/home-banner/home-banner.axml   | 15 ++---
 .../components/home-banner/home-banner.js     | 62 ++-----------------
 .../alipay/components/home-nav/home-nav.axml  |  9 +--
 .../alipay/components/home-nav/home-nav.js    | 60 ++----------------
 .../appmini/old/alipay/pages/index/index.axml |  4 +-
 .../appmini/old/alipay/pages/index/index.js   | 13 ++--
 7 files changed, 24 insertions(+), 141 deletions(-)

diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index 8a6850b66..e2d807775 100755
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -50,7 +50,7 @@ App({
 
     // 请求地址
     request_url: "{{request_url}}",
-    //request_url: "http://test.shopxo.net/",
+    request_url: "https://test.shopxo.net/",
     //request_url: 'http://tp5-dev.com/',
 
     // 基础信息
diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.axml b/public/appmini/old/alipay/components/home-banner/home-banner.axml
index efbf6edf9..83d40556c 100755
--- a/public/appmini/old/alipay/components/home-banner/home-banner.axml
+++ b/public/appmini/old/alipay/components/home-banner/home-banner.axml
@@ -1,19 +1,14 @@
 <swiper
-  indicator-dots="{{indicator_dots}}"
+  indicator-dots="{{data.length > 1}}"
   indicator-color="{{indicator_color}}"
   indicator-active-color="{{indicator_active_color}}"
-  autoplay="{{autoplay}}"
+  autoplay="{{data.length > 1}}"
   circular="{{circular}}"
   class="banner bg-white spacing-mb"
-  a:if="{{data_list.length > 0}}">
-  <block a:for="{{data_list}}">
+  a:if="{{data.length > 0}}">
+  <block a:for="{{data}}">
     <swiper-item>
       <image class="wh-auto" src="{{item.images_url}}" mode="widthFix" data-value="{{item.event_value}}" data-type="{{item.event_type}}" onTap="banner_event" />
     </swiper-item>
   </block>
-</swiper>
-
-<view a:if="{{data_list_loding_status == 2}}">
-  <import src="/pages/common/nodata.axml" />
-  <template is="nodata" data="{{status: data_list_loding_status}}"></template>
-</view>
\ No newline at end of file
+</swiper>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.js b/public/appmini/old/alipay/components/home-banner/home-banner.js
index d585db9f8..4179527d8 100755
--- a/public/appmini/old/alipay/components/home-banner/home-banner.js
+++ b/public/appmini/old/alipay/components/home-banner/home-banner.js
@@ -2,74 +2,20 @@ const app = getApp();
 Component({
   mixins: [],
   data: {
-    indicator_dots: false,
     indicator_color: 'rgba(0, 0, 0, .3)',
     indicator_active_color: '#e31c55',
-    autoplay: true,
     circular: true,
-    data_list_loding_status: 1,
-    data_bottom_line_status: false,
-    data_list: [],
   },
-  props: {},
-  didMount() {
-    this.init();
+  props: {
+    data: []
   },
+  didMount() {},
   didUpdate() {},
   didUnmount() {},
   methods: {
-    // 获取数
-    init() {
-      // 加载loding
-      this.setData({
-        data_list_loding_status: 1,
-      });
-
-      // 加载loding
-      my.httpRequest({
-        url: app.get_request_url("index", "banner"),
-        method: "POST",
-        data: {},
-        dataType: "json",
-        success: res => {
-          if (res.data.code == 0) {
-            var data = res.data.data;
-            this.setData({
-              data_list: data,
-              indicator_dots: (data.length > 1),
-              autoplay: (data.length > 1),
-              data_list_loding_status: data.length == 0 ? 0 : 3,
-              data_bottom_line_status: true,
-            });
-          } else {
-            this.setData({
-              data_list_loding_status: 0,
-              data_bottom_line_status: true,
-            });
-
-            my.showToast({
-              type: "fail",
-              content: res.data.msg
-            });
-          }
-        },
-        fail: () => {
-          this.setData({
-            data_list_loding_status: 2,
-            data_bottom_line_status: true,
-          });
-
-          my.showToast({
-            type: "fail",
-            content: "服务器请求出错"
-          });
-        }
-      });
-    },
-
     // 操作事件
     banner_event(e) {
       app.operation_event(e);
     },
-  },
+  }
 });
diff --git a/public/appmini/old/alipay/components/home-nav/home-nav.axml b/public/appmini/old/alipay/components/home-nav/home-nav.axml
index bf44cc04b..a301859a0 100755
--- a/public/appmini/old/alipay/components/home-nav/home-nav.axml
+++ b/public/appmini/old/alipay/components/home-nav/home-nav.axml
@@ -1,6 +1,6 @@
-<view a:if="{{data_list.length > 0}}">
+<view a:if="{{data.length > 0}}">
   <view class="data-list bg-white spacing-mb">
-    <view class="items" a:for="{{data_list}}">
+    <view class="items" a:for="{{data}}">
       <view class="items-content tc" style="background-color:{{item.bg_color}}" data-value="{{item.event_value}}" data-type="{{item.event_type}}" onTap="nav_event">
         <image class="wh-auto" src="{{item.images_url}}" mode="aspectFit" />
       </view>
@@ -8,8 +8,3 @@
     </view>
   </view>
 </view>
-
-<view a:if="{{data_list_loding_status == 2}}">
-  <import src="/pages/common/nodata.axml" />
-  <template is="nodata" data="{{status: data_list_loding_status}}"></template>
-</view>
diff --git a/public/appmini/old/alipay/components/home-nav/home-nav.js b/public/appmini/old/alipay/components/home-nav/home-nav.js
index 7f4e195c5..98d11eee9 100755
--- a/public/appmini/old/alipay/components/home-nav/home-nav.js
+++ b/public/appmini/old/alipay/components/home-nav/home-nav.js
@@ -1,64 +1,14 @@
 const app = getApp();
 Component({
   mixins: [],
-  props: {},
-  data: {
-    data_list_loding_status: 1,
-    data_bottom_line_status: false,
-    data_list: [],
-  },
-  didMount() {
-    this.init();
+  data: {},
+  props: {
+    data: []
   },
+  didMount() {},
   didUpdate(){},
   didUnmount(){},
-  methods:{
-    init() {
-      // 加载loding
-      this.setData({
-        data_list_loding_status: 1,
-      });
-
-      // 加载loding
-      my.httpRequest({
-        url: app.get_request_url("index", "navigation"),
-        method: "POST",
-        data: {},
-        dataType: "json",
-        success: res => {
-          if (res.data.code == 0) {
-            var data = res.data.data;
-            this.setData({
-              data_list: data,
-              data_list_loding_status: data.length == 0 ? 0 : 3,
-              data_bottom_line_status: true,
-            });
-          } else {
-            this.setData({
-              data_list_loding_status: 0,
-              data_bottom_line_status: true,
-            });
-
-            my.showToast({
-              type: "fail",
-              content: res.data.msg
-            });
-          }
-        },
-        fail: () => {
-          this.setData({
-            data_list_loding_status: 2,
-            data_bottom_line_status: true,
-          });
-
-          my.showToast({
-            type: "fail",
-            content: "服务器请求出错"
-          });
-        }
-      });
-    },
-
+  methods: {
     // 操作事件
     nav_event(e) {
       app.operation_event(e);
diff --git a/public/appmini/old/alipay/pages/index/index.axml b/public/appmini/old/alipay/pages/index/index.axml
index 435c6fc0e..e6f1b4d36 100755
--- a/public/appmini/old/alipay/pages/index/index.axml
+++ b/public/appmini/old/alipay/pages/index/index.axml
@@ -14,10 +14,10 @@
 <!-- 组件 -->
 <view a:if="{{load_status == 1}}">
   <!-- 轮播 -->
-  <component-home-banner />
+  <component-home-banner data="{{banner_list}}" />
 
   <!-- 导航 -->
-  <component-home-nav />
+  <component-home-nav data="{{navigation}}" />
 </view>
 
 
diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js
index 5d09e4486..a6b50c433 100755
--- a/public/appmini/old/alipay/pages/index/index.js
+++ b/public/appmini/old/alipay/pages/index/index.js
@@ -1,14 +1,11 @@
 const app = getApp();
 Page({
   data: {
-    indicator_dots: false,
-    indicator_color: 'rgba(0, 0, 0, .3)',
-    indicator_active_color: '#e31c55',
-    autoplay: true,
-    circular: true,
     data_list_loding_status: 1,
     data_bottom_line_status: false,
     data_list: [],
+    banner_list: [],
+    navigation: [],
     common_shop_notice: null,
     common_app_is_enable_search: 1,
     common_app_is_enable_answer: 1,
@@ -41,9 +38,9 @@ Page({
         if (res.data.code == 0) {
           var data = res.data.data;
           self.setData({
-            data_list: data.data_list,
-            indicator_dots: (data.data_list.length > 1),
-            autoplay: (data.data_list.length > 1),
+            banner_list: data.banner_list || [],
+            navigation: data.navigation || [],
+            data_list: data.data_list || [],
             common_shop_notice: data.common_shop_notice || null,
             common_app_is_enable_search: data.common_app_is_enable_search,
             common_app_is_enable_answer: data.common_app_is_enable_answer,
-- 
GitLab