-
+ {{if !empty($v['icon'])}}
+
+ {{/if}}
{{$v.name}}
>
diff --git a/public/appmini/old/alipay/components/home-banner/home-banner.js b/public/appmini/old/alipay/components/home-banner/home-banner.js
deleted file mode 100755
index d585db9f8..000000000
--- a/public/appmini/old/alipay/components/home-banner/home-banner.js
+++ /dev/null
@@ -1,75 +0,0 @@
-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();
- },
- 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.js b/public/appmini/old/alipay/components/home-nav/home-nav.js
deleted file mode 100755
index 7f4e195c5..000000000
--- a/public/appmini/old/alipay/components/home-nav/home-nav.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const app = getApp();
-Component({
- mixins: [],
- props: {},
- data: {
- data_list_loding_status: 1,
- data_bottom_line_status: false,
- data_list: [],
- },
- didMount() {
- this.init();
- },
- 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: "服务器请求出错"
- });
- }
- });
- },
-
- // 操作事件
- nav_event(e) {
- app.operation_event(e);
- },
- }
-});
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 59%
rename from public/appmini/old/alipay/components/home-nav/home-nav.axml
rename to public/appmini/old/alipay/components/icon-nav/icon-nav.axml
index bf44cc04b..a301859a0 100755
--- a/public/appmini/old/alipay/components/home-nav/home-nav.axml
+++ b/public/appmini/old/alipay/components/icon-nav/icon-nav.axml
@@ -1,6 +1,6 @@
-
+
-
+
@@ -8,8 +8,3 @@
-
-
-
-
-
diff --git a/public/appmini/old/alipay/components/icon-nav/icon-nav.js b/public/appmini/old/alipay/components/icon-nav/icon-nav.js
new file mode 100755
index 000000000..98d11eee9
--- /dev/null
+++ b/public/appmini/old/alipay/components/icon-nav/icon-nav.js
@@ -0,0 +1,17 @@
+const app = getApp();
+Component({
+ mixins: [],
+ data: {},
+ props: {
+ data: []
+ },
+ didMount() {},
+ didUpdate(){},
+ didUnmount(){},
+ methods: {
+ // 操作事件
+ nav_event(e) {
+ app.operation_event(e);
+ },
+ }
+});
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 53%
rename from public/appmini/old/alipay/components/home-banner/home-banner.axml
rename to public/appmini/old/alipay/components/slider/slider.axml
index efbf6edf9..83d40556c 100755
--- a/public/appmini/old/alipay/components/home-banner/home-banner.axml
+++ b/public/appmini/old/alipay/components/slider/slider.axml
@@ -1,19 +1,14 @@
-
+ a:if="{{data.length > 0}}">
+
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/appmini/old/alipay/components/slider/slider.js b/public/appmini/old/alipay/components/slider/slider.js
new file mode 100755
index 000000000..4179527d8
--- /dev/null
+++ b/public/appmini/old/alipay/components/slider/slider.js
@@ -0,0 +1,21 @@
+const app = getApp();
+Component({
+ mixins: [],
+ data: {
+ indicator_color: 'rgba(0, 0, 0, .3)',
+ indicator_active_color: '#e31c55',
+ circular: true,
+ },
+ props: {
+ data: []
+ },
+ didMount() {},
+ didUpdate() {},
+ didUnmount() {},
+ methods: {
+ // 操作事件
+ banner_event(e) {
+ app.operation_event(e);
+ },
+ }
+});
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 435c6fc0e..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.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,
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