diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 2437feb..aa7e8a6 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2226,4 +2226,5 @@ right:17rpx; top:55rpx;
line-height:15rpx;
}
-.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
\ No newline at end of file
+.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
+
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index ad1e46f..c9beabd 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -44,6 +44,14 @@ Page({
})
e.init(this, "", "requestData");
var url = this.data.baseUrl;
+
+ //扫一扫过来，显示搜索的内容
+ var s_key = t.s_key;
+ if (s_key){
+ this.search(s_key); his.openSearchModal();
+ return;
+ }
+
if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 4ab4fd1..7ab754f 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -55,6 +55,7 @@ Page({
//看下商家是否开通会员权益
is_boot:0,
gd_category:null,
+ is_no_more:0,
},
onLoad: function () {
@@ -67,7 +68,7 @@ Page({
data: { storeId: os.stoid}
}).then(res => {
if(res.data.data){
- is_init=res.data.data.isBool;
+ var is_init=res.data.data.isBool;
th.setData({is_boot:is_init});
}
})
@@ -88,7 +89,7 @@ Page({
}
//--正再拼团中的处理--
- var url = "/api/weshop/order/pageTuan?pt_status=1&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
+ var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
await getApp().request.promiseGet(url, {}).then(res => {
if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
th.data.pt_timer_arr = res.data.data.pageData;
@@ -99,6 +100,7 @@ Page({
var p_item = th.data.pt_timer_arr[i];
await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {1: 1}).then(res => {
th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
+ th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
})
}
th.Interval_pt();
@@ -106,10 +108,12 @@ Page({
//---处理正在6个分类----
await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
- data: {store_id: os.stoid, pageSize: 6,is_show:1}
+ data: {store_id: os.stoid, pageSize: 5,is_show:1}
}).then(res => {
- var gd_category=res.data.data.pageData;
- th.seData({gd_category:gd_category});
+ if(res.data.data) {
+ var gd_category = res.data.data.pageData;
+ th.setData({gd_category: gd_category});
+ }
})
},
@@ -166,6 +170,7 @@ Page({
}
console.log(arr);
if (arr.length>0) e.setData({ banner: arr, });
+
wx.stopPullDownRefresh();
})
@@ -216,7 +221,7 @@ Page({
store_id: os.stoid,
is_end: 0,
is_show: 1,
- pageSize: 9
+ pageSize: 6
}
}).then(res => {
var e = res;
@@ -233,9 +238,9 @@ Page({
});
var arr = new Array();
- //--三个三个一组---
- for(var i=0;i< pd_data.length;i+=3){
- arr.push(pd_data.slice(i,i+3));
+ //--2个2个一组---
+ for(var i=0;i< pd_data.length;i+=2){
+ arr.push(pd_data.slice(i,i+2));
}
th.setData({
pindGoods: arr
@@ -308,7 +313,13 @@ Page({
},
//---加载更多是靠这个函数----
onReachBottom: function () {
+ //if (!n.canloadMore()) this.setData({ is_no_more:1});
+ var n1 = n.data.goodsLoadFinishFlag
+ if (n1) {
+ this.setData({ is_no_more: 1 }); return false;
+ }
n.canloadMore() && this.requestRecommend();
+
},
//--更多商品--
@@ -522,11 +533,67 @@ Page({
var th=this;
this.data.pt_timer=setInterval(function () {
var item=ut.get_rand_item(th.data.pt_timer_arr);
+
+ console.log("Interval_pt");
+ console.log(item);
+
th.setData({pt_timer_active:1,pt_timer_item:item});
setTimeout(function () {
th.setData({pt_timer_active:0});
- },1000)
- },3000);
- }
+ },1500)
+ },4000);
+ },
+
+
+ //---扫一扫的函数---
+ getScancode: function () {
+ var _this = this;
+ // 允许从相机和相册扫码
+ wx.scanCode({
+ success: (res) => {
+ var result = res.result;
+ wx.navigateTo({
+ url: "/pages/goods/search/search?s_key=" + result,
+ });
+ }
+ })
+ },
+
+ //跳转到分类
+ go_cate:function(){
+ getApp().goto("/pages/goods/categoryList/categoryList");
+ },
+
+ go_url:function(e){
+ var url=e.currentTarget.dataset.url;
+ getApp().goto(url);
+ },
+
+ bind_bnerr_icon:function (e) {
+ var def= "/miniapp/images/default_g_img.gif";
+ var _err = e.currentTarget.dataset.err;
+ var ob={};
+ ob[_err]=def;
+ this.setData(ob);
+ },
+
+ //跳转到分类的商品列表
+ go_cate2: function (t) {
+ var cid = t.currentTarget.dataset.cid;
+ var pid = t.currentTarget.dataset.pid;
+ var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
+ wx.navigateTo({ url: lurl });
+ },
+
+ //跳转到权益
+ go_quanyi:function(t){
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ wx.navigateTo({ url: '/pages/getphone/getphone', })
+ return false;
+ }
+ getApp().goto("/pages/user/userqy/userqy");
+ }
+
});
\ No newline at end of file
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 328438c..8a5421f 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -5,7 +5,7 @@
-
+
分类
@@ -18,7 +18,7 @@
- 扫一扫
+ 扫一扫
@@ -97,51 +97,24 @@
-
+
-
-
-
- 护肤
-
-
-
-
-
-
- 彩妆
-
-
-
-
-
-
- 面膜
-
-
-
-
-
-
-
- 个人护理
-
-
-
-
-
-
-
- 男士专区
+
+
+
+ {{item.name}}
+
-
-
+
+
-
-
-
+
+
+
@@ -197,13 +170,15 @@
-
+
-
-
- 张大仙
- 刚拼团成功
-
+
+
+
+ {{pt_timer_item.nickname}}
+ 刚拼团成功
+
+
查看全部
@@ -404,12 +379,10 @@
-
-
-
-
-
+
+
+
{{item.goods_name}}
@@ -428,21 +401,18 @@
-
+
-
-
-
+
没有更多内容了
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 1182297..f87a0d9 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -404,14 +404,15 @@ margin-left:20rpx;
}
.user-frame{
width:220rpx;
- border-left: 5rpx solid #eee;
+ /* border-left: 5rpx solid #eee; */
height: 35rpx;
line-height: 35rpx;
margin-left: 10rpx;
}
.user-name{
- width: 66rpx
+ width: 66rpx;
+ border-left: 5rpx solid #eee;
}
@@ -693,5 +694,10 @@ left: 43%;
}
.mar-top{
margin-top: 20rpx;
+}
+.pt_active{ animation: sport 0.5s;}
+@keyframes sport {
+ 0% {transform: translateY(80rpx);opacity: 0;}
+ 100% {transform: translateY(0rpx);opacity: 1}
}
\ No newline at end of file
diff --git a/utils/LoadMore.js b/utils/LoadMore.js
index 75d47ff..2094bc8 100644
--- a/utils/LoadMore.js
+++ b/utils/LoadMore.js
@@ -65,6 +65,7 @@ var e = function() {
console.log('loadmore');
console.log(t.data.data.pageData);
console.log(c );
+
//如果已经的第二页的时候，就是把数据加入数组
if (c !=undefined && c.data[l]) {
@@ -73,35 +74,35 @@ var e = function() {
f = "" != d ? c.data[l][d] : c.data[l], [].push.apply(f, i), g = c.data[l];
} else g = t.data.data.pageData;
-
+
//格式化
var glist="";
- for (var i = 0; i < g.length; i++) {
+ for (var ij = 0; ij < g.length; ij++) {
//if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) {
- if (g[i].prom_type == 1) {
- glist += g[i].goods_id+",";
+ if (g[ij].prom_type == 1) {
+ glist += g[ij].goods_id+",";
}
- if (g[i].original_img!=undefined){
- if (g[i].original_img.indexOf(oo.imghost)==-1)
- g[i].original_img = oo.imghost + g[i].original_img;
+ if (g[ij].original_img!=undefined){
+ if (g[ij].original_img.indexOf(oo.imghost)==-1)
+ g[ij].original_img = oo.imghost + g[ij].original_img;
}
- if (g[i].add_time != undefined){
- var tx = g[i].add_time + "";
+ if (g[ij].add_time != undefined){
+ var tx = g[ij].add_time + "";
if (tx.indexOf('-') == -1) {
- g[i].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss');
+ g[ij].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss');
}
}
if (rurl.indexOf('comment/page')!=-1){
console.log('comment/page');
- console.log(g[i].img);
- var tx1 = g[i].img;
+ console.log(g[ij].img);
+ var tx1 = g[ij].img;
if (tx1 != "" && tx1 != null && ut.isString(tx1)){
var arr = ut.unserialize(tx1);
- g[i].img=arr;
+ g[ij].img=arr;
} else if (!ut.isArray(tx1)){
- g[i].img="";
+ g[ij].img="";
}
}
}
diff --git a/utils/util.js b/utils/util.js
index 85350e1..169e371 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -252,7 +252,9 @@ function check_mobile(phoneMobile){
function get_rand_item(arr){
if(!arr) return null;
if(arr.length<=0) return null;
- var ind=Math.floor(Math.random()*arr.length*10);
+ if(arr.length==1) return arr[0];
+ var ind=Math.floor(Math.random()*arr.length);
+ if(ind==arr.length) ind=arr.length-1;
return arr[ind];
}