Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/user/App.vue

@@ -1,6 +1,6 @@
 <template>
-  <div id="app">
-    <router-view></router-view>
+  <div id="app" v-if="showPage">
+    <router-view ></router-view>
   </div>
 </template>
 
@@ -10,6 +10,11 @@ import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
 export default {
   name: 'app',
+  data () {
+    return {
+      showPage: false
+    }
+  },
   components: {},
   computed: {
     ...mapState({
@@ -23,7 +28,9 @@ export default {
     } else {
       this.code = null
     }
-    this.getUserInfo({ org: this.org, code: this.code })
+    this.getUserInfo({ org: this.org, code: this.code }).then(() => {
+      this.showPage = true
+    })
   },
   methods: {
     ...actions(['getUserInfo'])

src/pages/user/mainPage/userCenter/index.vue

@@ -79,13 +79,15 @@ export default {
   components: {
 
   },
-  created () {
-    if (this.userInfo != 406) {
-      this.user = this.userInfo.customer
-      this.AccountInfo = JSON.parse(this.user.AccountInfo)
-      this.headimgurl = this.AccountInfo.headimgurl
-      this.isLoading = false
-    }
+  mounted () {
+    this.$nextTick(() => {
+      if (this.userInfo != 406) {
+        this.user = this.userInfo.customer
+        this.AccountInfo = JSON.parse(this.user.AccountInfo)
+        this.headimgurl = this.AccountInfo.headimgurl
+        this.isLoading = false
+      }
+    })
   },
   methods: {
     ...actions(['getUserInfo']),

src/pages/user/orderList/index.vue

@@ -87,6 +87,7 @@ export default {
       Math.ceil(this.orders.pagenum / this.orders.pagesize) > this.page ? this.hasMore = true : this.hasMore = false
       // this.list.length <= 8 ? this.hasMore = true : this.hasMore = false
       if (this.hasMore) {
+        this.page = this.page+1
         setTimeout(() => {
           _that.getCustomerGoodsOrder({
             page: _that.page,

vue.config.js

@@ -26,7 +26,7 @@ module.exports = {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
-        target: 'http://192.168.0.11:8080', //ys
+        target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {