diff --git a/components/Authorize.vue b/components/Authorize.vue index ea63b54..3b1ccb3 100644 --- a/components/Authorize.vue +++ b/components/Authorize.vue @@ -178,7 +178,7 @@ console.log(11); toLogin(true); uni.navigateTo({ - url: '/pages/users/login/index' + url: '/pages/users/login/login_copy' }) console.log(22); return @@ -209,7 +209,7 @@ } else { uni.setStorageSync('auth_token', res.data.result.key); return uni.navigateTo({ - url: '/pages/users/login/index' + url: '/pages/users/login/login_copy' }) } }).catch(res => { diff --git a/config/app.js b/config/app.js index f541cb0..9da6f0f 100644 --- a/config/app.js +++ b/config/app.js @@ -10,7 +10,7 @@ let httpApiThree // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { // httpApi = "https://crmeb-test.shop.lihaink.cn" - httpApi = "http://192.168.0.109:8325" + httpApi = "http://192.168.0.222" // #ifdef MP-WEIXIN httpApiTwo = "http://cms.com" httpApiThree = 'http://ceshi-oa.lihaink.cn' diff --git a/libs/login.js b/libs/login.js index c4c6d67..99ef69c 100644 --- a/libs/login.js +++ b/libs/login.js @@ -47,7 +47,7 @@ export function toLogin(push, pathLogin) { } // #endif if (!pathLogin) - pathLogin = '/page/users/login/index' + pathLogin = '/page/users/login/login_copy' Cache.set('login_back_url', path); // #ifdef H5 if (isWeixin()) { @@ -55,9 +55,9 @@ export function toLogin(push, pathLogin) { } else { if (path !== pathLogin) { push ? uni.navigateTo({ - url: '/pages/users/login/index' + url: '/pages/users/login/login_copy' }) : uni.reLaunch({ - url: '/pages/users/login/index' + url: '/pages/users/login/login_copy' }); } } @@ -65,7 +65,7 @@ export function toLogin(push, pathLogin) { // #ifdef APP-PLUS uni.navigateTo({ - url: '/pages/users/login/index', + url: '/pages/users/login/login_copy', }) // #endif } diff --git a/pages.json b/pages.json index bd6956c..e636ba2 100644 --- a/pages.json +++ b/pages.json @@ -499,7 +499,7 @@ } }, { - "path": "login/index", + "path": "login/login_copy", "style": { "navigationBarTitleText": "登录", "navigationBarBackgroundColor": "#EB5447", diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue index e26b7e8..0cf843c 100644 --- a/pages/short_video/nvueSwiper/index.nvue +++ b/pages/short_video/nvueSwiper/index.nvue @@ -323,7 +323,7 @@ aixinTop: 0, Rotate: 0, currentNav: 1, - limit: 3, + limit: 10, page: 1, oldCurrent: 1, H5ShareBox: false, diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index bf30c12..1c9f442 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -688,6 +688,7 @@ this.getCoupon(); break; case 7: + this.loadTitle='' this.getProductSpu() break; } @@ -787,6 +788,8 @@ that.loadTitle = loadend ? '已全部加载' : '加载更多'; that.$set(that, 'goods', goodsList); that.$set(that.where, 'page', that.where.page + 1); + console.log(that.loadTitle); + console.log(that.loadend); }).catch(err => { that.loading = false; that.goodsLoading = false; @@ -813,7 +816,7 @@ const query = uni.createSelectorQuery().in(this); query.select('#goods').boundingClientRect(data => { if (data.bottom < 1500 && data.top < 0) { - if (this.tabActive == 7) { + if (this.loadend == false) { this.getProductSpu() } else { this.getGoods(); @@ -1146,7 +1149,9 @@ return false; } this.goods = [] + this.where.page=1 this.tabActive = param; + console.log(this.goods); this.goodsLoading = this.loadend = this.loading = false }, resetParmas() { diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue index ce28e1a..33dffc2 100644 --- a/pages/users/login/login_copy.vue +++ b/pages/users/login/login_copy.vue @@ -1,167 +1,172 @@