Merge remote-tracking branch 'origin/dev' into dev

pages/bindEnterPrise/_uuid.vue

@@ -42,7 +42,7 @@
           <template v-if="hasRegister && !searchInfo">
             <a name="register" href="/register/enterpriseRegistration">立即注册</a>
           </template>
-          <template v-if="hasRegister && searchInfo && !searchInfo.admin">
+          <template v-if="hasRegister && searchInfo && searchInfo.admin">
             <a href="javascript:void(0)" @click="bingEnterPrise()">申请绑定</a>
             <p id="applyText">管理员审核通过后成功绑定</p>
           </template>

pages/cloudcenter/enterprise/index.vue

@@ -105,8 +105,8 @@
     middleware: 'authenticated',
     fetch ({store}) {
       return Promise.all([
-        store.dispatch('loadApplyList', {page: 1, size: 20}),
-        store.dispatch('loadMemberList', {page: 1, size: 20})
+        store.dispatch('loadApplyList', {page: 0, size: 20}),
+        store.dispatch('loadMemberList', {page: 0, size: 20})
       ])
     },
     components: {
@@ -115,8 +115,8 @@
     data () {
       return {
         centerDialogVisible: true,
-        toggle: false,
-        page: 1,
+        toggle: true,
+        page: 0,
         count: 20
       }
     },
@@ -128,25 +128,27 @@
         return this.$store.state.option.userInfo.data.content
       },
       apple () {
+        console.log(this.$store.state.cloudCenter.apple.data.content)
         return this.$store.state.cloudCenter.apple.data.content
       },
       member () {
+        console.log(this.$store.state.cloudCenter.member.data.content)
         return this.$store.state.cloudCenter.member.data.content
       }
     },
     methods: {
       bingEnterpriseClick: function () {
-        window.location.href = '/bindEnterPrise'
+        window.location.href = '/bindEnterPrise/' + this.user.user.userUU
       },
       noBingClick: function () {
         window.location.href = '/cloudcenter'
         this.centerDialogVisible = false
       },
       handleApplyChange: function (page) {
-        this.$store.dispatch('loadApplyList', {page: page, size: 20})
+        this.$store.dispatch('loadApplyList', {page: page - 1, size: this.count})
       },
       handleMemberChange: function (page) {
-        this.$store.dispatch('loadMemberList', {page: page, size: 20})
+        this.$store.dispatch('loadMemberList', {page: page - 1, size: this.count})
       },
       handleClick: function (type, item) {
         let param = new FormData()