From 14ccac5b16a219b068c98082399408391879c216 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sun, 6 Jan 2019 15:40:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BC=98=E5=8C=96img?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/view/default/public/goods_category.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/index/view/default/public/goods_category.html b/application/index/view/default/public/goods_category.html index d403c39d3..c95a48639 100755 --- a/application/index/view/default/public/goods_category.html +++ b/application/index/view/default/public/goods_category.html @@ -14,7 +14,9 @@

  • - + {{if !empty($v['icon'])}} + + {{/if}} {{$v.name}}

    > 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 2/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=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 @@ - - - - - \ No newline at end of file + \ 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 @@ - + - + @@ -8,8 +8,3 @@ - - - - - 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 @@ - + - + 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, From df4eec9e64129e7396178dc6935e09eabbfe6870 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sun, 6 Jan 2019 17:20:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{home-nav/home-nav.acss => icon-nav/icon-nav.acss} | 0 .../{home-nav/home-nav.axml => icon-nav/icon-nav.axml} | 0 .../components/{home-nav/home-nav.js => icon-nav/icon-nav.js} | 0 .../{home-banner/home-banner.json => icon-nav/icon-nav.json} | 0 .../{home-banner/home-banner.acss => slider/slider.acss} | 0 .../{home-banner/home-banner.axml => slider/slider.axml} | 0 .../{home-banner/home-banner.js => slider/slider.js} | 0 .../components/{home-nav/home-nav.json => slider/slider.json} | 0 public/appmini/old/alipay/pages/index/index.axml | 4 ++-- public/appmini/old/alipay/pages/index/index.json | 4 ++-- 10 files changed, 4 insertions(+), 4 deletions(-) rename public/appmini/old/alipay/components/{home-nav/home-nav.acss => icon-nav/icon-nav.acss} (100%) rename public/appmini/old/alipay/components/{home-nav/home-nav.axml => icon-nav/icon-nav.axml} (100%) rename public/appmini/old/alipay/components/{home-nav/home-nav.js => icon-nav/icon-nav.js} (100%) rename public/appmini/old/alipay/components/{home-banner/home-banner.json => icon-nav/icon-nav.json} (100%) rename public/appmini/old/alipay/components/{home-banner/home-banner.acss => slider/slider.acss} (100%) rename public/appmini/old/alipay/components/{home-banner/home-banner.axml => slider/slider.axml} (100%) rename public/appmini/old/alipay/components/{home-banner/home-banner.js => slider/slider.js} (100%) rename public/appmini/old/alipay/components/{home-nav/home-nav.json => slider/slider.json} (100%) diff --git a/public/appmini/old/alipay/components/home-nav/home-nav.acss b/public/appmini/old/alipay/components/icon-nav/icon-nav.acss similarity index 100% rename from public/appmini/old/alipay/components/home-nav/home-nav.acss rename to public/appmini/old/alipay/components/icon-nav/icon-nav.acss diff --git a/public/appmini/old/alipay/components/home-nav/home-nav.axml b/public/appmini/old/alipay/components/icon-nav/icon-nav.axml similarity index 100% rename from public/appmini/old/alipay/components/home-nav/home-nav.axml rename to public/appmini/old/alipay/components/icon-nav/icon-nav.axml diff --git a/public/appmini/old/alipay/components/home-nav/home-nav.js b/public/appmini/old/alipay/components/icon-nav/icon-nav.js similarity index 100% rename from public/appmini/old/alipay/components/home-nav/home-nav.js rename to public/appmini/old/alipay/components/icon-nav/icon-nav.js diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.json b/public/appmini/old/alipay/components/icon-nav/icon-nav.json similarity index 100% rename from public/appmini/old/alipay/components/home-banner/home-banner.json rename to public/appmini/old/alipay/components/icon-nav/icon-nav.json diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.acss b/public/appmini/old/alipay/components/slider/slider.acss similarity index 100% rename from public/appmini/old/alipay/components/home-banner/home-banner.acss rename to public/appmini/old/alipay/components/slider/slider.acss diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.axml b/public/appmini/old/alipay/components/slider/slider.axml similarity index 100% rename from public/appmini/old/alipay/components/home-banner/home-banner.axml rename to public/appmini/old/alipay/components/slider/slider.axml diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.js b/public/appmini/old/alipay/components/slider/slider.js similarity index 100% rename from public/appmini/old/alipay/components/home-banner/home-banner.js rename to public/appmini/old/alipay/components/slider/slider.js diff --git a/public/appmini/old/alipay/components/home-nav/home-nav.json b/public/appmini/old/alipay/components/slider/slider.json similarity index 100% rename from public/appmini/old/alipay/components/home-nav/home-nav.json rename to public/appmini/old/alipay/components/slider/slider.json diff --git a/public/appmini/old/alipay/pages/index/index.axml b/public/appmini/old/alipay/pages/index/index.axml index e6f1b4d36..de3df72e6 100755 --- a/public/appmini/old/alipay/pages/index/index.axml +++ b/public/appmini/old/alipay/pages/index/index.axml @@ -14,10 +14,10 @@ - + - + diff --git a/public/appmini/old/alipay/pages/index/index.json b/public/appmini/old/alipay/pages/index/index.json index 87b931570..ee8b2fd0c 100755 --- a/public/appmini/old/alipay/pages/index/index.json +++ b/public/appmini/old/alipay/pages/index/index.json @@ -1,7 +1,7 @@ { "pullRefresh": true, "usingComponents": { - "component-home-nav": "/components/home-nav/home-nav", - "component-home-banner": "/components/home-banner/home-banner" + "component-icon-nav": "/components/icon-nav/icon-nav", + "component-slider": "/components/slider/slider" } } \ No newline at end of file From bc7015c95316b910d71dad9b4077cb2a914d552c Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sun, 6 Jan 2019 17:20:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/appmini/old/alipay/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index e2d807775..f7958445e 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: "https://test.shopxo.net/", + //request_url: "https://test.shopxo.net/", //request_url: 'http://tp5-dev.com/', // 基础信息