Commit 4557923c by songbingqi

修复部分bug

parent 94101c65
...@@ -253,9 +253,20 @@ export default { ...@@ -253,9 +253,20 @@ export default {
scroll(e) { scroll(e) {
if (!this.scrolled) return; if (!this.scrolled) return;
const { categoryPostion } = this; const { categoryPostion } = this;
const [el] = categoryPostion.filter(item => (item.top) - (e.target.scrollTop) >= 20); let otherHeight = 0
console.log(el,'-------------------',e.target.scrollTop) if(this.buied){
if (el) this.categoryId = el.id otherHeight = 320
}else{
otherHeight = 270
}
if(this.shopCarFlag){
otherHeight += 100
}else{
otherHeight+=0
}
const el = categoryPostion.filter(item => {return item.top <= e.target.scrollTop+otherHeight});
console.log(el[el.length-1],'-------------------',e.target.scrollTop+otherHeight,otherHeight)
if (el[el.length-1]) this.categoryId = el[el.length-1].id
}, },
categoryClickMain(id) { categoryClickMain(id) {
this.scrolled = false this.scrolled = false
......
...@@ -326,16 +326,7 @@ export default { ...@@ -326,16 +326,7 @@ export default {
} }
}, },
async getallNum(e) { async getallNum(e) {
const settleMentFunc = async ()=>{ const gosettleFun = async ()=> {
let Authorization = uni.getStorageSync('Authorization');
if (!Authorization) {
this.loginByPhoneNumber(e);
return
}
if(!this.shopState||!this.isInRange){
return
}
const { goods } = this; const { goods } = this;
const { data } = await Order.checkSku({skuId:goods.skuId}) const { data } = await Order.checkSku({skuId:goods.skuId})
const {state,goods:newgoods} = data.data const {state,goods:newgoods} = data.data
...@@ -355,6 +346,9 @@ export default { ...@@ -355,6 +346,9 @@ export default {
uni.navigateTo({ url: `/orderSubPackage/pages/settlement/index?buyType=1&goodsList=1` }) uni.navigateTo({ url: `/orderSubPackage/pages/settlement/index?buyType=1&goodsList=1` })
} }
} }
let Authorization = uni.getStorageSync('Authorization');
if (!Authorization) {
this.loginByPhoneNumber(e);
uni.authorize({ uni.authorize({
scope: 'scope.userLocation', scope: 'scope.userLocation',
success: () => { //1.1 允许授权 success: () => { //1.1 允许授权
...@@ -374,7 +368,7 @@ export default { ...@@ -374,7 +368,7 @@ export default {
success: (res) => { success: (res) => {
console.log(res) console.log(res)
if(res.authSetting['scope.userLocation'] == true){//判断res.authsetting的值是true还是false if(res.authSetting['scope.userLocation'] == true){//判断res.authsetting的值是true还是false
settleMentFunc() gosettleFun()
}else{ }else{
// console.log("什么也不做"); // console.log("什么也不做");
} }
...@@ -389,6 +383,13 @@ export default { ...@@ -389,6 +383,13 @@ export default {
} }
}) })
return return
}
if(!this.shopState||!this.isInRange){
return
}
// return
}, },
async getMenuList() { async getMenuList() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment