diff --git a/index/index.js b/index/index.js index 801be3e..6a5c726 100644 --- a/index/index.js +++ b/index/index.js @@ -143,7 +143,7 @@ Page({ getsubMallList() { Http.get({ - url: '/mall/subMall?isAll=0', + url: '/mall/subMall?isAll=1', }).then(res => { tt.setStorageSync('shopList', JSON.stringify(res.data)); this.setData({ @@ -665,10 +665,16 @@ Page({ // 切换至最近的广场 const locationFlag = tt.getStorageSync('locationFlag'); if ((item.distance == nearestDistance)) { - that.bindPickerChange('', index, item.tenantId) - tt.setStorageSync('locationFlag', false); + if (locationFlag) { + that.bindPickerChange('', index, item.tenantId) + tt.setStorageSync('locationFlag', false); + } else { + that.bindPickerChange('', ttt.getStorageSync('mallIndex'), tt.getStorageSync('mallTenantId')) + } + return true } else { + return false } }) @@ -677,6 +683,7 @@ Page({ }) } }, + // 拒绝提供定位权限 fail: error => { console.log(error); const shopList = JSON.parse(tt.getStorageSync('shopList')); @@ -692,7 +699,13 @@ Page({ } }) console.log(obj, 'obj'); - that.bindPickerChange('', obj.index, obj.tenantId) + const locationFlag = tt.getStorageSync('locationFlag'); + if (locationFlag) { + that.bindPickerChange('', obj.index, obj.tenantId) + tt.setStorageSync('locationFlag', false); + } else { + that.bindPickerChange('', ttt.getStorageSync('mallIndex'), tt.getStorageSync('mallTenantId')) + } }, complete: finish => { diff --git a/index/index.ttml b/index/index.ttml index 7c0c1d6..059db74 100644 --- a/index/index.ttml +++ b/index/index.ttml @@ -19,14 +19,14 @@ - + {{ shopList[index].name }} - 距您{{ - shopList[index].distance_str}} + diff --git a/pages/couponorder/detail/index.ttml b/pages/couponorder/detail/index.ttml index dc665b5..1874555 100644 --- a/pages/couponorder/detail/index.ttml +++ b/pages/couponorder/detail/index.ttml @@ -63,12 +63,12 @@ {{data.orderId}} - + + {{detailObj.remark}} - + --> \ No newline at end of file diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 42b2e59..746dca0 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -141,7 +141,7 @@ Page({ onLoad: function (options) { this.mallSync() Http.get({ - url: '/mall/subMall?isAll=0', + url: '/mall/subMall?isAll=1', }).then(res => { this.setData({ shopList: res.data, diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 3868374..9d56643 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -106,7 +106,7 @@ Page({ onLoad(e) { Http.get({ - url: '/mall/subMall?isAll=0', + url: '/mall/subMall?isAll=1', }).then(res => { this.setData({ shopList: res.data,