diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index 8a6850b66df514ab1a1615ef09c6913151ad148c..f3ee1f5467f16f98c182c5500f01188a156c8fea 100755
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -428,8 +428,7 @@ App({
},
/**
- * 价格保留两位小数
- * price 价格保留两位小数
+ * 事件操作
*/
operation_event(e) {
var value = e.target.dataset.value || null;
diff --git a/public/appmini/old/wechat/app.js b/public/appmini/old/wechat/app.js
index a3dc4a35afb601ac985bde81a8eee3aee79882df..e57f341a44bcd5ef3a4c3fd265bd00125cb56979 100755
--- a/public/appmini/old/wechat/app.js
+++ b/public/appmini/old/wechat/app.js
@@ -480,6 +480,53 @@ App({
return s_x;
},
+ /**
+ * 事件操作
+ */
+ operation_event(e) {
+ var value = e.currentTarget.dataset.value || null;
+ var type = parseInt(e.currentTarget.dataset.type);
+ if (value != null) {
+ switch (type) {
+ // web
+ case 0:
+ wx.navigateTo({ url: '/pages/web-view/web-view?url=' + value });
+ break;
+
+ // 内部页面
+ case 1:
+ wx.navigateTo({ url: value });
+ break;
+
+ // 跳转到外部小程序
+ case 2:
+ wx.navigateToMiniProgram({ appId: value });
+ break;
+
+ // 跳转到地图查看位置
+ case 3:
+ var values = value.split('|');
+ if (values.length != 4) {
+ wx.showToast({ content: '事件值格式有误' });
+ return false;
+ }
+
+ wx.openLocation({
+ name: values[0],
+ address: values[1],
+ longitude: values[2],
+ latitude: values[3],
+ });
+ break;
+
+ // 拨打电话
+ case 4:
+ wx.makePhoneCall({ number: value });
+ break;
+ }
+ }
+ },
+
/**
* 默认弱提示方法
* msg [string] 提示信息
diff --git a/public/appmini/old/wechat/app.wxss b/public/appmini/old/wechat/app.wxss
index 37843798b06334856a6c508e2d669ecbcff2a380..2c4e8c478f9f22cbbe4bbd50595a16903eb57d93 100755
--- a/public/appmini/old/wechat/app.wxss
+++ b/public/appmini/old/wechat/app.wxss
@@ -1,5 +1,11 @@
/* 框架样式覆盖 */
-.a-textarea-control textarea { font-size: 12px; }
+.a-textarea-control textarea {
+ font-size: 12px;
+}
+button:after, button:before {
+ border: 0;
+ border-radius: 0;
+}
/* 公共样式 */
page {
diff --git a/public/appmini/old/wechat/components/home-banner/home-banner.js b/public/appmini/old/wechat/components/home-banner/home-banner.js
deleted file mode 100755
index 48ad692baa8d98cc7a1664a574fd9769ba81b22e..0000000000000000000000000000000000000000
--- a/public/appmini/old/wechat/components/home-banner/home-banner.js
+++ /dev/null
@@ -1,76 +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
- wx.request({
- url: app.get_request_url("index", "banner"),
- method: "POST",
- data: {},
- dataType: "json",
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- 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,
- });
-
- wx.showToast({
- type: "fail",
- content: res.data.msg
- });
- }
- },
- fail: () => {
- this.setData({
- data_list_loding_status: 2,
- data_bottom_line_status: true,
- });
-
- wx.showToast({
- type: "fail",
- content: "服务器请求出错"
- });
- }
- });
- },
-
- // 操作事件
- banner_event(e) {
- app.operation_event(e);
- },
- },
-});
diff --git a/public/appmini/old/wechat/components/home-nav/home-nav.js b/public/appmini/old/wechat/components/home-nav/home-nav.js
deleted file mode 100755
index 61d434e346aee0c54afd8756db2904df1ad6613e..0000000000000000000000000000000000000000
--- a/public/appmini/old/wechat/components/home-nav/home-nav.js
+++ /dev/null
@@ -1,68 +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
- wx.request({
- url: app.get_request_url("index", "navigation"),
- method: "POST",
- data: {},
- dataType: "json",
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- 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,
- });
-
- wx.showToast({
- type: "fail",
- content: res.data.msg
- });
- }
- },
- fail: () => {
- this.setData({
- data_list_loding_status: 2,
- data_bottom_line_status: true,
- });
-
- wx.showToast({
- type: "fail",
- content: "服务器请求出错"
- });
- }
- });
- },
-
- // 操作事件
- nav_event(e) {
- app.operation_event(e);
- },
- }
-});
diff --git a/public/appmini/old/wechat/components/icon-nav/icon-nav.js b/public/appmini/old/wechat/components/icon-nav/icon-nav.js
new file mode 100755
index 0000000000000000000000000000000000000000..0a3fb3e59d3d71042ce16f260409574eba60a880
--- /dev/null
+++ b/public/appmini/old/wechat/components/icon-nav/icon-nav.js
@@ -0,0 +1,12 @@
+const app = getApp();
+Component({
+ data: {},
+ properties: {
+ propData: Array
+ },
+ methods: {
+ nav_event(e) {
+ app.operation_event(e);
+ },
+ },
+});
diff --git a/public/appmini/old/wechat/components/home-banner/home-banner.json b/public/appmini/old/wechat/components/icon-nav/icon-nav.json
similarity index 100%
rename from public/appmini/old/wechat/components/home-banner/home-banner.json
rename to public/appmini/old/wechat/components/icon-nav/icon-nav.json
diff --git a/public/appmini/old/wechat/components/home-nav/home-nav.wxml b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxml
similarity index 58%
rename from public/appmini/old/wechat/components/home-nav/home-nav.wxml
rename to public/appmini/old/wechat/components/icon-nav/icon-nav.wxml
index a9e9667f8cc78baa583c1241e81d0cae3140bd8c..7290f708d5ac3b91c73678daa4d1fa4902b3ac69 100755
--- a/public/appmini/old/wechat/components/home-nav/home-nav.wxml
+++ b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxml
@@ -1,15 +1,10 @@
-
+
-
+
{{item.name}}
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/public/appmini/old/wechat/components/home-nav/home-nav.wxss b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxss
similarity index 100%
rename from public/appmini/old/wechat/components/home-nav/home-nav.wxss
rename to public/appmini/old/wechat/components/icon-nav/icon-nav.wxss
diff --git a/public/appmini/old/wechat/components/popup/popup.js b/public/appmini/old/wechat/components/popup/popup.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d35fdad2ae6fecf4050aef052392b2568cfc660
--- /dev/null
+++ b/public/appmini/old/wechat/components/popup/popup.js
@@ -0,0 +1,28 @@
+// components/popup.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ propClassname: String,
+ propShow: Boolean,
+ propPosition: String,
+ propMask: Boolean,
+ propAnimation: Boolean,
+ propDisablescroll: Boolean
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/public/appmini/old/wechat/components/popup/popup.json b/public/appmini/old/wechat/components/popup/popup.json
new file mode 100644
index 0000000000000000000000000000000000000000..e8cfaaf80c404eb97d3cf8b6277ec15f37e6905e
--- /dev/null
+++ b/public/appmini/old/wechat/components/popup/popup.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/public/appmini/old/wechat/components/popup/popup.wxml b/public/appmini/old/wechat/components/popup/popup.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..caae536aed0f0abf045a3467461875cb31660c7a
--- /dev/null
+++ b/public/appmini/old/wechat/components/popup/popup.wxml
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/public/appmini/old/wechat/components/popup/popup.wxss b/public/appmini/old/wechat/components/popup/popup.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..e0cd78583ee0d81b68e72ad859fbcb402bc5e2da
--- /dev/null
+++ b/public/appmini/old/wechat/components/popup/popup.wxss
@@ -0,0 +1,57 @@
+.am-popup-content {
+ position: fixed;
+}
+
+.am-popup-mask {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background-color: rgba(0, 0, 0, 0.75);
+ opacity: 0;
+ pointer-events: none;
+}
+
+.am-popup-left {
+ transform: translateX(-100%);
+ left: 0;
+ top: 0;
+ bottom: 0;
+}
+
+.am-popup-right {
+ transform: translateX(100%);
+ right: 0;
+ top: 0;
+ bottom: 0;
+}
+
+.am-popup-top {
+ top: 0;
+ width: 100vw;
+ transform: translateY(-100%);
+}
+
+.am-popup-bottom {
+ bottom: 0;
+ width: 100vw;
+ transform: translateY(100%);
+}
+
+.am-popup-show .am-popup-content {
+ transform: none;
+}
+
+.am-popup-show .am-popup-mask {
+ opacity: 1;
+ pointer-events: auto;
+}
+
+.am-popup.animation .am-popup-content {
+ transition: all 0.15s linear;
+}
+
+.am-popup.animation .am-popup-mask {
+ transition: all 0.15s linear;
+}
\ No newline at end of file
diff --git a/public/appmini/old/wechat/components/slider/slider.js b/public/appmini/old/wechat/components/slider/slider.js
new file mode 100755
index 0000000000000000000000000000000000000000..503d474c5db7d610cf09f861a5db2c31003ac1a4
--- /dev/null
+++ b/public/appmini/old/wechat/components/slider/slider.js
@@ -0,0 +1,18 @@
+const app = getApp();
+Component({
+ data: {
+ indicator_dots: false,
+ indicator_color: 'rgba(0, 0, 0, .3)',
+ indicator_active_color: '#e31c55',
+ autoplay: true,
+ circular: true,
+ },
+ properties: {
+ propData: Array
+ },
+ methods: {
+ banner_event(e) {
+ app.operation_event(e);
+ },
+ },
+});
\ No newline at end of file
diff --git a/public/appmini/old/wechat/components/home-nav/home-nav.json b/public/appmini/old/wechat/components/slider/slider.json
similarity index 100%
rename from public/appmini/old/wechat/components/home-nav/home-nav.json
rename to public/appmini/old/wechat/components/slider/slider.json
diff --git a/public/appmini/old/wechat/components/home-banner/home-banner.wxml b/public/appmini/old/wechat/components/slider/slider.wxml
similarity index 53%
rename from public/appmini/old/wechat/components/home-banner/home-banner.wxml
rename to public/appmini/old/wechat/components/slider/slider.wxml
index f01a2f7462db6f6f987b2fa3d01436ce047b3944..1c84cbd0c1ee9fb713e72959ef4e97b3662c22e2 100755
--- a/public/appmini/old/wechat/components/home-banner/home-banner.wxml
+++ b/public/appmini/old/wechat/components/slider/slider.wxml
@@ -1,19 +1,14 @@
-
+ wx:if="{{propData.length > 0}}">
+
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/appmini/old/wechat/components/home-banner/home-banner.wxss b/public/appmini/old/wechat/components/slider/slider.wxss
similarity index 100%
rename from public/appmini/old/wechat/components/home-banner/home-banner.wxss
rename to public/appmini/old/wechat/components/slider/slider.wxss
diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.json b/public/appmini/old/wechat/pages/goods-detail/goods-detail.json
index 2a4ca3ef804a8fc56d39af5195290d5a8d7da336..7d179bfd5fd5f445a1ef926625a70f5712237393 100755
--- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.json
+++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.json
@@ -1,6 +1,6 @@
{
"enablePullDownRefresh": true,
"usingComponents": {
- "popup": "mini-antui/es/popup/index"
+ "component-popup": "/components/popup/popup"
}
}
\ No newline at end of file
diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
index fb78e26ee6c06142f5e4b5c00654d1306ca2f32b..b1783a37b416a7a6806105d535bac745f9584669 100755
--- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
@@ -8,7 +8,7 @@
circular="{{circular}}"
class="goods-photo bg-white"
wx:if="{{goods_photo.length > 0}}">
-
+
@@ -48,7 +48,7 @@
详情
-
+
{{items}}
@@ -77,10 +77,11 @@
-
+
+
-
+
-
+
diff --git a/public/appmini/old/wechat/pages/index/index.js b/public/appmini/old/wechat/pages/index/index.js
index e4cbdfe53d561b1261181e5b8e9379592d40d80e..b2e0034cb836cce044978d22a15a532b4d8a96f3 100755
--- a/public/appmini/old/wechat/pages/index/index.js
+++ b/public/appmini/old/wechat/pages/index/index.js
@@ -1,15 +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,
@@ -42,13 +38,9 @@ Page({
if (res.data.code == 0) {
var data = res.data.data;
self.setData({
- banner_list: data.banner_list,
- indicator_dots: (data.banner_list.length > 1),
- autoplay: (data.banner_list.length > 1),
-
+ banner_list: data.banner_list || [],
+ navigation: data.navigation || [],
data_list: data.data_list,
- indicator_dots: (data.data_list.length > 1),
- autoplay: (data.data_list.length > 1),
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,
@@ -102,6 +94,16 @@ Page({
this.init();
},
+ // 轮播事件
+ banner_event(e) {
+ app.operation_event(e);
+ },
+
+ // 导航事件
+ navigation_event(e) {
+ app.operation_event(e);
+ },
+
// 自定义分享
onShareAppMessage() {
return {
diff --git a/public/appmini/old/wechat/pages/index/index.json b/public/appmini/old/wechat/pages/index/index.json
index 126466a3f32bfec1bb68fe8e84b100ff6c6e6d17..b3298e1be52467e9f0c4653c7512cbaa836e2660 100755
--- a/public/appmini/old/wechat/pages/index/index.json
+++ b/public/appmini/old/wechat/pages/index/index.json
@@ -1,7 +1,7 @@
{
"enablePullDownRefresh": 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-banner": "/components/slider/slider"
}
}
\ No newline at end of file
diff --git a/public/appmini/old/wechat/pages/index/index.wxml b/public/appmini/old/wechat/pages/index/index.wxml
index 3548fba14be548706a5730c1b5f0c69f1c5d1dfc..dbd93f2e66c0080f3a171da55b088c5353b07401 100755
--- a/public/appmini/old/wechat/pages/index/index.wxml
+++ b/public/appmini/old/wechat/pages/index/index.wxml
@@ -12,25 +12,14 @@
-
-
-
-
-
-
-
+
+
+
-
+
{{floor.name}}
@@ -43,7 +32,7 @@
-
+
diff --git a/public/appmini/old/wechat/pages/index/index.wxss b/public/appmini/old/wechat/pages/index/index.wxss
index 9d231f81f3543aa0015638091e72728c77ac5e17..b3127290b6b7979c6b54423678fdb556c697c52c 100755
--- a/public/appmini/old/wechat/pages/index/index.wxss
+++ b/public/appmini/old/wechat/pages/index/index.wxss
@@ -26,13 +26,6 @@
line-height: 70rpx;
}
- /**
- * 轮播
- */
-.banner {
- height: 320rpx!important;
-}
-
/**
* 楼层数据
*/