diff --git a/app.js b/app.js
index fc1f971..df34f9e 100644
--- a/app.js
+++ b/app.js
@@ -115,6 +115,14 @@ App({
} else {
app.globalData.userInfo = user;
app.globalData.user_id = user.user_id;
+
+ //调用接口判断是不是会员
+ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => {
+ if (res.data.code == 0) {
+ getApp().globalData.guide_id = res.data.data.id;
+ }
+ })
+
}
wx.setStorageSync("userinfo", user);
} else {
@@ -474,6 +482,7 @@ App({
"/pages/goods/categoryList/categoryList?type=1",
"/pages/cart/cart/cart", "/pages/user/index/index",
"/pages/distribution/distribution"];
+
if (arr_tabbar.indexOf(url) != -1) {
if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 55f8ed5..d245ad4 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -604,7 +604,7 @@ Page({
}
//进行排序，只有是默认排序的时候，才按首字母排序
- if(parseInt(s.data.is_used_share)!=0) continue;
+ // if(parseInt(s.data.is_used_share)!=0) continue;
if (arr.length>0){
var find = 0;
@@ -625,14 +625,14 @@ Page({
arr.push(item);
}
}
- if(parseInt(s.data.is_used_share)==0){
- arr.sort(compare("zm"));
- }else{
- var ob={array:dda};
- arr.push(ob);
- }
+ // if(parseInt(s.data.is_used_share)==0){
+ // arr.sort(compare("zm"));
+ // }else{
+ // var ob={array:dda};
+ // arr.push(ob);
+ // }
-
+ arr.sort(compare("zm"));
s.setData({ groups: arr });
//console.log(s.data.groups)
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 4db77d3..f343d68 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -82,6 +82,9 @@
+
+
+
{{item.zm}}
@@ -226,7 +229,7 @@
-
+
+
+
+
+ {{classify_name}}
+
+
+ {{brand_list.zm}}
+
+
+
+
+ {{user.name}}2
+
+
+
+
+
+
+
+
+ {{item.zm}}
+
+
+
+
+
+
@@ -462,7 +494,7 @@
-
+
+
+
+
+
+
+ {{classify_name}}
+
+
+ {{brand_list.zm}}
+
+
+
+
+ {{user.name}}
+
+
+
+
+
+
+
+
+
+ {{item.zm}}
+
+
+
+
+
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index 2ece175..5115230 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -329,6 +329,15 @@ width: 60%;
flex-wrap:wrap;
overflow-y:scroll;
}
+
+ .classify_content-frame2{
+ box-sizing: border-box;
+ width: 100%;
+ padding: 0 12rpx;
+ flex-wrap:wrap;
+ }
+
+
.country_img-frame{
width: 48%;
height: 140rpx;
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 53f61ef..ba08ae0 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -462,8 +462,8 @@ Page({
go_url:function (e) {
var url = e.currentTarget.dataset.url;
- var rq_data = JSON.stringify(this.data.rq_data);
- url += `&o=${rq_data}`;
+ //var rq_data = JSON.stringify(this.data.rq_data);
+ //url += `&o=${rq_data}`;
// console.log('url!!!=======<<<<', url);
getApp().goto(url);
}
diff --git a/pages/index/index/full_screen.js b/pages/index/index/full_screen.js
index 8b7d8aa..bdbb51d 100644
--- a/pages/index/index/full_screen.js
+++ b/pages/index/index/full_screen.js
@@ -13,14 +13,18 @@
getApp().promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + stoid,{
data: { enabled: 1 }
}).then(res=>{
+
//判断是不是有全屏广告
+ // res.data.data.pageData[0].show_type=1
if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
getApp().globalData.full_screen=res.data.data.pageData[0];
th.setData({
is_full_screen_show:1,
full_ad:res.data.data.pageData[0],
+ sec_show: res.data.data.pageData[0].show_second || 3
})
- //--定时关闭--
+ //--定时关闭--
+ console.log(th.data.sec_show)
th.data.full_screen=setInterval(function(){
if(!th.data.sec_show) {
clearInterval(th.data.full_screen);
@@ -30,6 +34,10 @@
th.data.sec_show--;
th.setData({sec_show:th.data.sec_show});
},1000)
+
+ if(res.data.data.pageData[0].show_type==1){
+ clearInterval(th.data.full_screen);
+ }
}else{
getApp().globalData.full_screen=true;
}
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 1cb2746..d30a627 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,11 +1,17 @@
-
-
-
-
- 跳过 {{sec_show}}
+
+
+ 跳过 {{sec_show}}
+
+
+
+
+
+
+
+
@@ -27,10 +33,6 @@
-
-
@@ -40,7 +42,6 @@
-
@@ -59,33 +60,8 @@
-
-
-
-
+
@@ -153,9 +129,6 @@
-
-
-
@@ -185,17 +158,13 @@
￥{{aitem.price}}
-
-
+
@@ -364,10 +333,6 @@
-
@@ -392,13 +357,6 @@
-
-
-
@@ -434,17 +392,7 @@
-
-
-
-
-
+
@@ -536,11 +484,7 @@
-
-
-
-
-
+
提供技术支持
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index dedb960..1172f86 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -1215,3 +1215,22 @@ page {
background-color: #ccc;
}
+
+/* 居中广告 */
+.full_img_main{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+}
+
+.full_img_close{
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 100%;
+ border: 2rpx solid #000;
+ background-color: #fff;
+ display: flex;
+ align-items: center;
+ justify-items: center;
+}
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index 1a0d100..5c124bd 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -122,6 +122,14 @@ Page({
//把会员的信息存在内存
wx.setStorageSync("userinfo",e.data.data);
+ //调用接口判断是不是会员
+ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => {
+ if (res.data.code == 0) {
+ getApp().globalData.guide_id = res.data.data.id;
+ }
+ })
+
+
setTimeout(function () {
getApp().globalData.login_back=1;
wx.navigateBack({ delta: 1}) //返回上一页
@@ -258,7 +266,15 @@ Page({
getApp().globalData.login_back=1;
wx.setStorageSync("userinfo",e.data.data);
wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic);
- wx.navigateBack({ delta: 1})
+
+ //调用接口判断是不是会员
+ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
+ if (res.data.code == 0) {
+ getApp().globalData.guide_id = res.data.data.id;
+ }
+ })
+
+ wx.navigateBack({ delta: 1})
},
failStatus: function (t) {
@@ -321,6 +337,14 @@ Page({
//把会员的信息存在内存
wx.setStorageSync("userinfo",e.data.data);
+ //调用接口判断是不是会员
+ app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
+ if (res.data.code == 0) {
+ getApp().globalData.guide_id = res.data.data.id;
+ }
+ })
+
+
setTimeout(function () {
getApp().globalData.login_back=1;
wx.navigateBack({ delta: 1}) //返回上一页