Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp

2020-08-03 01:52:49 +08:00
parent 941e04195f 50d77fbcda
commit c498644b37
13 changed files with 57 additions and 26 deletions
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@ -313,6 +313,7 @@ export default {
        });
        return;
      }
+      console.log(this.userInfo)
      if (url === "/pages/orderAdmin/OrderCancellation/index" && !this.userInfo.checkStatus) {
        uni.showToast({
          title: "您没有核销权限,请后台店员设置！！",
--- a/pages/user/UserBill/index.vue
+++ b/pages/user/UserBill/index.vue
@ -70,7 +70,7 @@ export default {
    that.getIndex();
  },
  onReachBottom() {
-    !that.loading && that.getIndex();
+    !this.loading && this.getIndex();
  },
  methods: {
    code: function() {