diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 4b9a020..95d7fa9 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -28,7 +28,7 @@ Page({
color_type: 0, //线条控制
color_type_one: 0,
color_type_two: 1,
-
+ is_no_plus:1,
gid: "",
stoid: o.stoid,
url: o.url,
@@ -359,6 +359,22 @@ Page({
th.data.c_guide_id = c_guide_id;
}
+ //调用接口判断商家plus有没有过期
+ i.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+ if (res.data.code == 0) {
+ var arr = res.data.data.pageData;
+ if (arr.length > 0) {
+ var item = arr[0];
+ if (item.is_sy == 0) {
+ var now = Date.parse(new Date()); now = now / 1000;
+ if (item.end_time < now) {
+ th.setData({ is_no_plus: 0 })
+ }
+ }
+ }
+ }
+ })
+
getApp().getConfig(function (e) {
ee.setData({sto_sele_name_1: e.store_name})
})
@@ -3799,6 +3815,20 @@ Page({
return param < 10 ? '0' + param : param;
},
+ // 显示拼单规则
+ showRules: function() {
+ this.setData({
+ showRules: true,
+ });
+ },
+
+ // 关闭拼单规则
+ closeRules: function() {
+ this.setData({
+ showRules: false,
+ });
+ },
+
//----倒计时函数-----
countDown(time, prom_st) {
if (!this.data.is_timer) return false;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index e6ac7d3..fa7be93 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -6,6 +6,8 @@
+
+ 规则
{{item.name}}
@@ -324,7 +326,7 @@
-
+
@@ -336,7 +338,7 @@
-
+
@@ -1502,6 +1504,7 @@
+
@@ -1690,6 +1693,28 @@
+
+ 规则详情
+
+
+
+ 活动时间
+ {{filters.format_time(prom_act.start_time,1)}} 至 {{filters.format_time(prom_act.end_time,1)}}
+
+
+
+ 活动内容
+
+
+
+
+
+ 我知道了
+
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 6211423..ffab0d8 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -9,10 +9,62 @@
image {
vertical-align: top;
}
+.rules {
+ position: fixed;
+ background-color: rgba(0,0,0,.2);
+ color: white;
+ top: 22rpx;
+ right: 0;
+ z-index: 100;
+ font-size: 26rpx;
+ padding: 0 20rpx;
+ z-index: 99999;
+ border-radius: 20rpx 0 0 20rpx;
+}
+
+.rule-pop-container {
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ background-color: white;
+ z-index: 99999;
+ border-radius: 16rpx 16rpx 0 0;
+ padding: 0 40rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+ color: #444;
+}
+
+.pop-title {
+ padding: 20rpx 0;
+ text-align: center;
+ font-size: 32rpx;
+ position: relative;
+}
+.icon-guan {
+ position: absolute;
+ right: 0;
+ font-size: 26rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ color: #ccc;
+}
+.btn {
+ color: white;
+ padding: 20rpx 0;
+ text-align: center;
+ border-radius: 40rpx;
+ background: -webkit-linear-gradient(left,#ff5000,#ff2000) no-repeat;
+}
.goods-detail {
overflow: hidden
}
+.popup-content {
+ max-height: 600rpx;
+ overflow-y: auto;
+}
.type-navbar {
display: flex;
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index 5b25d2a..d9ab927 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -18,17 +18,14 @@ Page({
requestUrl: "",
//hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ]
hotWords: null,
-
+ is_no_plus:1,
tabname: "sort", //排序的字段
adname: "asc", //升降的字段
rq_data:null,
-
-
- searchRecord: [],
- keyword: '',
- is_his:0,
-
- hiddenClear: true,
+ searchRecord: [],
+ keyword: '',
+ is_his:0,
+ hiddenClear: true,
},
onLoad: function(t) {
@@ -45,6 +42,22 @@ Page({
})
}
+ //调用接口判断商家plus有没有过期
+ rq.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => {
+ if (res.data.code == 0) {
+ var arr = res.data.data.pageData;
+ if (arr.length > 0) {
+ var item = arr[0];
+ if (item.is_sy == 0) {
+ var now = Date.parse(new Date()); now = now / 1000;
+ if (item.end_time < now) {
+ th.setData({ is_no_plus: 0 })
+ }
+ }
+ }
+ }
+ })
+
var th=this;
a.getConfig2(function(rs) {
var arr=new Array(),arr2=new Array();
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index a034b28..fdb179d 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -98,7 +98,7 @@
-
+