diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php index 757eccd77438be11758de52984adb60af8c74175..ee3adb8deb03cb9b499ed6d2b877413150b47f67 100755 --- a/application/admin/controller/Plugins.php +++ b/application/admin/controller/Plugins.php @@ -131,13 +131,7 @@ class Plugins extends Common return $this->fetch('public/tips_error'); } } - $ret = $obj->$pluginsaction($params); - if(is_string($ret)) - { - $this->assign('msg', $ret); - return $this->fetch('public/tips_error'); - } - return $ret; + return $obj->$pluginsaction($params); } /** diff --git a/application/index/controller/Plugins.php b/application/index/controller/Plugins.php index 8acd9152b284dbe91145e2f0cfe26221244c3f6b..3bbc8ce8bc9a2bff36e6082e043d37650b4213f0 100755 --- a/application/index/controller/Plugins.php +++ b/application/index/controller/Plugins.php @@ -125,13 +125,7 @@ class Plugins extends Common return $this->fetch('public/tips_error'); } } - $ret = $obj->$pluginsaction($params); - if(is_string($ret)) - { - $this->assign('msg', $ret); - return $this->fetch('public/tips_error'); - } - return $ret; + return $obj->$pluginsaction($params); } /** diff --git a/application/tags.php b/application/tags.php index 7fb4b4ce8cf21ddb6f5dd9c94f67aad0e78b5245..55f27f8f4e9410f823671b49b98f3c381fc91fb5 100755 --- a/application/tags.php +++ b/application/tags.php @@ -32,5 +32,33 @@ return array ( 'log_write' => array ( ), + 'plugins_css' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_js' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_service_navigation_header_handle' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_service_goods_handle_end' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_service_goods_spec_base' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_view_goods_detail_base_top' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_view_home_floor_top' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), ); ?> \ No newline at end of file diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index c0a6d50ce53b7321fc254b79f41321ab4f7e48e1..4188557f195de583c81b49eb53955254b60d35f6 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -61,7 +61,7 @@ App({ // 请求地址 // request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - request_url: 'https://test.shopxo.net/', + //request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.js b/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.js deleted file mode 100644 index c1a51b1eb23aa210771375915720eeec5cd459b9..0000000000000000000000000000000000000000 --- a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.js +++ /dev/null @@ -1,95 +0,0 @@ -// components/limitedtimediscount.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - hours: 0, - minutes: 0, - seconds: 30, - timer_title: '距离结束', - is_show_time: true, - data_list: [ - { - goods_id: 1, - goods_title: '2019新款夏装漂亮的睡衣，性感女士专享', - images_url: 'https://demo.shopxo.net/static/upload/images/goods/2019/01/14/1547454702543219.jpg', - min_price: 345.23, - min_original_price: 9863.98, - }, - { - goods_id: 2, - goods_title: 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', - images_url: 'https://demo.shopxo.net/static/upload/images/goods/2019/01/14/1547454145355962.jpg', - min_price: 256.00, - min_original_price: 356.00, - }, - { - goods_id: 3, - goods_title: 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', - images_url: 'https://demo.shopxo.net/static/upload/images/goods/2019/01/14/1547452474332334.jpg', - min_price: 1999.99, - min_original_price: 2300.00, - } - ], - }, - - ready: function () { - this.countdown(); - }, - - /** - * 组件的方法列表 - */ - methods: { - // 倒计时 - countdown() { - if (this.data.hours > 0 || this.data.minutes > 0 || this.data.seconds > 0) { - var hours = this.data.hours; - var minutes = this.data.minutes; - var seconds = this.data.seconds; - - // 秒 - var self = this; - var timer = setInterval(function () { - if (seconds <= 0) { - if (minutes > 0) { - minutes--; - seconds = 59; - } else if (hours > 0) { - hours--; - minutes = 59; - seconds = 59; - } - } else { - seconds--; - } - - self.setData({ - hours: (hours < 10) ? 0 + hours : hours, - minutes: (minutes < 10) ? 0 + minutes : minutes, - seconds: (seconds < 10) ? 0 + seconds : seconds, - }); - - if (hours <= 0 && minutes <= 0 && seconds <= 0) { - // 停止时间 - clearInterval(timer); - - // 活动已结束 - self.setData({ - timer_title: '活动已结束', - is_show_time: false, - }); - } - }, 1000); - } - } - } -}) diff --git a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.json b/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.json deleted file mode 100644 index e8cfaaf80c404eb97d3cf8b6277ec15f37e6905e..0000000000000000000000000000000000000000 --- a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.wxml b/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.wxml deleted file mode 100644 index 0cd5ab45e0a073d2938b97b187c94d389e47dd71..0000000000000000000000000000000000000000 --- a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.wxml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 限时秒杀 - - - {{seconds}} - : - {{minutes}} - : - {{hours}} - - {{timer_title}} - - - - - - - - - {{item.goods_title}} - ￥{{item.min_price}} - ￥{{item.min_original_price}} - - - - - - - \ No newline at end of file diff --git a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.wxss b/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.wxss deleted file mode 100644 index b2dec62a16ce39df53828fbcb1673c0eb86237a2..0000000000000000000000000000000000000000 --- a/public/appmini/old/weixin/components/limitedtimediscount/limitedtimediscount.wxss +++ /dev/null @@ -1,112 +0,0 @@ -.limitedtimediscount { - background: #fff; - padding: 5rpx 10rpx 20rpx 10rpx; - margin-bottom: 20rpx; -} - -/* - 定时器 -*/ -.spacing-nav-title { - overflow: hidden; - padding: 10rpx 0; -} -.spacing-nav-title .nav-icon { - width: 45rpx; - height: 45rpx; - vertical-align: top; - margin-right: 10rpx; -} -.text-wrapper { - color: #d2364c; - font-size: 36rpx; - font-weight: bold; -} -.countdown { - line-height: 50rpx; - float: right; -} -.countdown view { - margin-right: 0; - float: right; -} -.countdown .timer-title { - color: #666; - margin-right: 10rpx; -} -.countdown .timer-hours { - padding: 0 12rpx; - -moz-border-radius: 8rpx; - border-radius: 8rpx; - background-color: #3A4145; - color: #fff; - min-width: 35rpx; - text-align: center; -} -.countdown .ds { - color: #4B5459; - padding: 0 8rpx; - font-weight: 700; -} - -/* - 商品 -*/ -.data-list { - width: 100%; - white-space: nowrap; - box-sizing: border-box; - margin-top: 5rpx; -} -.data-list .item { - width: 460rpx; - height: 605rpx; - border: 1px solid #f5f5f5; - background: white; - display: inline-block; - position: relative; -} -.data-list .item:not(:last-child) { - margin-right: 10px; -} -.data-list .item image { - width: 460rpx; - height: 460rpx; -} -.data-list .item .goods-base { - padding: 0 10rpx; -} -.data-list .goods-base .goods-title, -.data-list .goods-base .goods-price, -.data-list .goods-base .ogoods-riginal-price { - -o-text-overflow: ellipsis; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - max-width: 100%; -} -.data-list .goods-base .goods-title { - font-size: 32rpx; -} -.data-list .goods-base .goods-price { - color: #f40; - font-weight: bold; - font-size: 36rpx; -} -.data-list .goods-base .goods-original-price { - color: #999; - text-decoration: line-through; - font-size: 24rpx; -} -.data-list .goods-base button { - background: #d2364c; - border: 0; - color: #fff; - padding: 0 30rpx; - line-height: 50rpx; - font-size: 30rpx; - border-radius: 6rpx; - position: absolute; - right: 15rpx; - bottom: 15rpx; -} \ No newline at end of file diff --git a/public/appmini/old/weixin/components/limitedtimediscount/images/nav-icon.png b/public/appmini/old/weixin/images/limitedtimediscount-nav-icon.png similarity index 100% rename from public/appmini/old/weixin/components/limitedtimediscount/images/nav-icon.png rename to public/appmini/old/weixin/images/limitedtimediscount-nav-icon.png diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index cc67d43df7e9cbfbe7cfe0337cd54d5c0f319cb0..06077dc95da1565e8c05b8259d0f658889d49bb7 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -40,7 +40,7 @@ Page({ }, onLoad(params) { - params['goods_id']=2; + //params['goods_id']=2; this.setData({params: params}); this.init(); }, diff --git a/public/appmini/old/weixin/pages/index/index.js b/public/appmini/old/weixin/pages/index/index.js index 865e491a3ada53c5ce82adad7d6ac02e40822daf..bfd7326e3c81867f8b759411ca9ebe96e4fb0d17 100755 --- a/public/appmini/old/weixin/pages/index/index.js +++ b/public/appmini/old/weixin/pages/index/index.js @@ -1,6 +1,7 @@ const app = getApp(); Page({ data: { + load_status: 0, data_list_loding_status: 1, data_bottom_line_status: false, data_list: [], @@ -11,7 +12,11 @@ Page({ common_app_is_enable_answer: 1, common_app_is_header_nav_fixed: 0, common_app_is_online_service: 0, - load_status: 0, + + // 限时秒杀插件 + plugins_limitedtimediscount_data: [], + plugins_limitedtimediscount_timer_title: '距离结束', + plugins_limitedtimediscount_is_show_time: true, }, onShow() { @@ -40,6 +45,7 @@ Page({ if (res.data.code == 0) { var data = res.data.data; self.setData({ + data_bottom_line_status: true, banner_list: data.banner_list || [], navigation: data.navigation || [], data_list: data.data_list, @@ -49,8 +55,11 @@ Page({ common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed, data_list_loding_status: data.data_list.length == 0 ? 0 : 3, common_app_is_online_service: data.common_app_is_online_service || 0, - data_bottom_line_status: true, + plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || [], }); + + // 限时秒杀倒计时 + this.plugins_limitedtimediscount_countdown(); } else { self.setData({ data_list_loding_status: 0, @@ -92,6 +101,54 @@ Page({ this.init(); }, + // 显示秒杀插件-倒计时 + plugins_limitedtimediscount_countdown() { + var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; + var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; + var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; + var self = this; + if (hours > 0 || minutes > 0 || seconds > 0) { + // 秒 + var timer = setInterval(function () { + if (seconds <= 0) { + if (minutes > 0) { + minutes--; + seconds = 59; + } else if (hours > 0) { + hours--; + minutes = 59; + seconds = 59; + } + } else { + seconds--; + } + + self.setData({ + 'plugins_limitedtimediscount_data.time.hours': (hours < 10) ? 0 + hours : hours, + 'plugins_limitedtimediscount_data.time.minutes': (minutes < 10) ? 0 + minutes : minutes, + 'plugins_limitedtimediscount_data.time.seconds': (seconds < 10) ? 0 + seconds : seconds, + }); + + if (hours <= 0 && minutes <= 0 && seconds <= 0) { + // 停止时间 + clearInterval(timer); + + // 活动已结束 + self.setData({ + plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_is_show_time: false, + }); + } + }, 1000); + } else { + // 活动已结束 + self.setData({ + plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_is_show_time: false, + }); + } + }, + // 自定义分享 onShareAppMessage() { return { diff --git a/public/appmini/old/weixin/pages/index/index.json b/public/appmini/old/weixin/pages/index/index.json index 92244203728db711c8cc31092a698ce9244ce6d8..b3298e1be52467e9f0c4653c7512cbaa836e2660 100755 --- a/public/appmini/old/weixin/pages/index/index.json +++ b/public/appmini/old/weixin/pages/index/index.json @@ -2,7 +2,6 @@ "enablePullDownRefresh": true, "usingComponents": { "component-icon-nav": "/components/icon-nav/icon-nav", - "component-banner": "/components/slider/slider", - "component-limitedtimediscount": "/components/limitedtimediscount/limitedtimediscount" + "component-banner": "/components/slider/slider" } } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/index/index.wxml b/public/appmini/old/weixin/pages/index/index.wxml index b49d5cfacb3e427a884cb508ec01da09804c2a6a..cabfd6791937dbe38edd20d3a0815690a0b77fea 100755 --- a/public/appmini/old/weixin/pages/index/index.wxml +++ b/public/appmini/old/weixin/pages/index/index.wxml @@ -19,7 +19,37 @@ - + + + + 限时秒杀 + + + {{plugins_limitedtimediscount_data.time.seconds}} + : + {{plugins_limitedtimediscount_data.time.minutes}} + : + {{plugins_limitedtimediscount_data.time.hours}} + + {{plugins_limitedtimediscount_timer_title}} + + + + + + + + + {{item.title}} + ￥{{item.price}} + ￥{{item.original_price}} + + + + + + + diff --git a/public/appmini/old/weixin/pages/index/index.wxss b/public/appmini/old/weixin/pages/index/index.wxss index 66b44bd35c1c9e034e1dbcf3c4482ba141d827fb..6fc3f62e936c4ba7ce034b0499310c0d608dbdcf 100755 --- a/public/appmini/old/weixin/pages/index/index.wxss +++ b/public/appmini/old/weixin/pages/index/index.wxss @@ -99,4 +99,111 @@ } .floor-list .goods-list .goods-base .sales-price { font-size: 30rpx; +} + +.limitedtimediscount { + background: #fff; + padding: 5rpx 10rpx 20rpx 10rpx; + margin-bottom: 20rpx; +} + +/* + * 限时秒杀 + */ + .limitedtimediscount { + background: #fff; + padding: 5rpx 10rpx 20rpx 10rpx; + margin-bottom: 20rpx; +} +.limitedtimediscount .nav-title { + overflow: hidden; + padding: 10rpx 0; +} +.limitedtimediscount .nav-title .nav-icon { + width: 45rpx; + height: 45rpx; + vertical-align: top; + margin-right: 10rpx; +} +.limitedtimediscount .text-wrapper { + color: #d2364c; + font-size: 36rpx; + font-weight: bold; +} +.limitedtimediscount .countdown { + line-height: 50rpx; + float: right; +} +.limitedtimediscount .countdown view { + margin-right: 0; + float: right; +} +.limitedtimediscount .countdown .timer-title { + color: #666; + margin-right: 10rpx; +} +.limitedtimediscount .countdown .timer-hours { + padding: 0 12rpx; + -moz-border-radius: 8rpx; + border-radius: 8rpx; + background-color: #3A4145; + color: #fff; + min-width: 35rpx; + text-align: center; +} +.limitedtimediscount .countdown .ds { + color: #4B5459; + padding: 0 8rpx; + font-weight: 700; +} + +.limitedtimediscount .goods-list { + width: 100%; + white-space: nowrap; + box-sizing: border-box; + margin-top: 5rpx; +} +.limitedtimediscount .goods-list .item { + width: 460rpx; + height: 605rpx; + border: 1px solid #f5f5f5; + background: white; + display: inline-block; + position: relative; +} +.limitedtimediscount .goods-list .item:not(:last-child) { + margin-right: 10px; +} +.limitedtimediscount .goods-list .item image { + width: 460rpx; + height: 460rpx; +} +.limitedtimediscount .goods-list .item .goods-base { + padding: 0 10rpx; + margin-top: 10rpx; +} +.limitedtimediscount .goods-list .goods-base .goods-title { + font-size: 32rpx; +} +.limitedtimediscount .goods-list .goods-base .goods-price { + color: #f40; + font-weight: bold; + font-size: 32rpx; +} +.limitedtimediscount .goods-list .goods-base .goods-original-price { + color: #999; + text-decoration: line-through; + font-size: 24rpx; +} +.limitedtimediscount .goods-list .goods-base button { + background: #d2364c; + border: 0; + color: #fff; + padding: 0 30rpx; + line-height: 50rpx; + font-size: 30rpx; + border-radius: 6rpx; + position: absolute; + right: 15rpx; + bottom: 15rpx; } \ No newline at end of file