diff --git a/src/project/fengdu/AppMine/myStoreList.vue b/src/project/fengdu/AppMine/myStoreList.vue index 9022528..24f1ace 100644 --- a/src/project/fengdu/AppMine/myStoreList.vue +++ b/src/project/fengdu/AppMine/myStoreList.vue @@ -43,7 +43,7 @@ export default { }).then(res => { if (res?.data) { this.list = this.current == 1 ? res.data.records : [this.list, res.data.records].flat() - this.pages = res.data.total + this.pages = res.data.pages } }).finally(() => uni.hideLoading()) }, diff --git a/src/project/fengdu/AppStore/AppStore.vue b/src/project/fengdu/AppStore/AppStore.vue index 4020984..a9c9b67 100644 --- a/src/project/fengdu/AppStore/AppStore.vue +++ b/src/project/fengdu/AppStore/AppStore.vue @@ -1,12 +1,20 @@ @@ -19,22 +27,14 @@ export default { name: 'AppStore', appName: '门店', components: {Situation, Evaluate}, + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', customNavigation: true, data() { return { tabList: [{name: '门店情况'}, {name: '我要评价'}], tabIndex: 0, - barStyle: { - 'width': '20px', - 'height': '3px', - 'border-radius': '2px', - 'bottom': '-3px', - 'background': '#2D7DFF' - }, - backgroundNavbar: { - background: '#fff', - }, - tabHeight: 0 + statusBarHeight: uni.getSystemInfoSync().statusBarHeight, } }, computed: { @@ -44,30 +44,23 @@ export default { if(e.tabIndex) { this.tabIndex = e.tabIndex } - let info = uni.createSelectorQuery().select(".tab"); - info.boundingClientRect((data)=> { //data - 各种参数 - this.tabHeight = data.height - console.log(this.tabHeight) - }).exec() - }, - onShow() { - - - }, methods: { change(e) { this.tabIndex = e }, toEvaluateForm(e) { - console.log(e) uni.navigateTo({url: `./EvaluateForm?shopId=${e.shopId}`}) }, toStoreDetail(e) { - console.log(e) uni.navigateTo({url: `./StoreDetail?shopId=${e.shopId}`}) }, }, + onReachBottom() { + if(this.tabIndex == 1) { + this.$refs.Evaluate.getNextList() + } + } } @@ -79,6 +72,27 @@ page{ .AppStore { background-color: #F4F5FA; height: 100vh; + .header { + position: fixed; + left: 0; + top: 0; + z-index: 111; + width: 100%; + opacity: 1; + transition: all 0.2s ease; + .status-bar { + background: #fff; + } + + .nav-bar { + position: relative; + color: #000; + font-size: 32px; + font-weight: 600; + background: #fff; + text-align: center; + } + } .tab { position: fixed; left: 0; diff --git a/src/project/fengdu/AppStore/EvaluateForm.vue b/src/project/fengdu/AppStore/EvaluateForm.vue index 3b2ef7c..abcea0d 100644 --- a/src/project/fengdu/AppStore/EvaluateForm.vue +++ b/src/project/fengdu/AppStore/EvaluateForm.vue @@ -86,6 +86,8 @@ export default { name: 'EvaluateForm', appName: '我要评价', customNavigation: true, + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', data() { return { form: { diff --git a/src/project/fengdu/AppStore/StoreDetail.vue b/src/project/fengdu/AppStore/StoreDetail.vue index 579bcef..14aac0f 100644 --- a/src/project/fengdu/AppStore/StoreDetail.vue +++ b/src/project/fengdu/AppStore/StoreDetail.vue @@ -70,6 +70,8 @@ export default { name: 'StoreDetail', appName: '门店情况', + navigationBarBackgroundColor: '#ffffff', + navigationBarTextStyle: 'black', customNavigation: true, data() { return { @@ -130,7 +132,7 @@ export default { item.wxzStar = wxz <= 0 ? 0 : wxz }) this.assessList = this.current == 1 ? res.data.records : [this.list, res.data.records].flat() - this.pages = res.data.total + this.pages = res.data.pages } }).finally(() => uni.hideLoading()) }, diff --git a/src/project/fengdu/AppStore/components/Evaluate.vue b/src/project/fengdu/AppStore/components/Evaluate.vue index bffdf90..92f6e46 100644 --- a/src/project/fengdu/AppStore/components/Evaluate.vue +++ b/src/project/fengdu/AppStore/components/Evaluate.vue @@ -1,6 +1,6 @@