diff --git a/config/index.js b/config/index.js index c998654..89a11db 100644 --- a/config/index.js +++ b/config/index.js @@ -1,7 +1,7 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api' -export const VUE_APP_API_URL = 'http://192.168.68.125:8088/api' +export const VUE_APP_API_URL = 'http://192.168.68.126:8088/api' // export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' diff --git a/pages.json b/pages.json index 4276512..580e7be 100644 --- a/pages.json +++ b/pages.json @@ -164,7 +164,7 @@ { "path": "pages/user/User/index", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "会员中心" } }, diff --git a/pages/home/index-copy.vue b/pages/home/index-copy.vue deleted file mode 100644 index 5f91eb7..0000000 --- a/pages/home/index-copy.vue +++ /dev/null @@ -1,428 +0,0 @@ - - - diff --git a/pages/home/index.vue b/pages/home/index.vue index 3135aca..baa80a1 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -218,7 +218,9 @@ return style } }, - onLoad: function() { + onLoad: function() { + + this.getLocation() let that = this this.getDate(); @@ -479,7 +481,10 @@ } .swiper-item { - height: 100%; + height: 100%; + image{ + border-radius: 20rpx; + } } .fixed-header { diff --git a/pages/knowledge/index.vue b/pages/knowledge/index.vue index c8550da..89a91db 100644 --- a/pages/knowledge/index.vue +++ b/pages/knowledge/index.vue @@ -72,7 +72,6 @@ components: { SecondMenu }, onShow() { console.log(this.tabSelect,'tabSelect') - }, onLoad(){ getArticleCategorys().then((res)=>{ @@ -122,7 +121,7 @@ } else{ this.$set(this, 'active', null) } - console.log(item) + // console.log(item) this.secondMenu = item.categoryList this.getArticle() }, @@ -158,8 +157,7 @@ min-height: 100%; padding-top: 110rpx; .tab-box{ - // position: fixed; - // top: 0; + box-shadow: 0px 6px 12px 0px rgba(227, 227, 227, 0.29); background: #fff; /deep/.second-menu-box { padding: 0 24rpx; diff --git a/pages/shop/GoodsClass/index.vue b/pages/shop/GoodsClass/index.vue index 544dd05..2bd93b3 100644 --- a/pages/shop/GoodsClass/index.vue +++ b/pages/shop/GoodsClass/index.vue @@ -22,17 +22,17 @@ --> - + 亲爱的,{{getTime()}} - {{userInfo.nickname}} + {{userInfo.nickname || '禅易家人'}} - {{userInfo.integral}}积分 + {{userInfo.integral || 0}}积分 - 您还有{{userInfo.integral}}积分未使用 + 您还有{{userInfo.integral || 0}}积分未使用 diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue index 7997d01..18f7d18 100644 --- a/pages/user/User/index.vue +++ b/pages/user/User/index.vue @@ -2,7 +2,7 @@ - + @@ -32,10 +32,14 @@ - 积分:{{userInfo.integral}} + + + 点击签到 + + - + - 服务老师主页 + --> + + + + + + 今日收益 + 200积分 + + + 累计收益 + 200积分 + + 去提现 + + + + + 推广人数 + 20人 + + + 今日收益 + 20人 + + 我的团队 + + + - + 我参与的 - + {{item.courseName}} @@ -66,7 +101,7 @@ - + @@ -552,9 +587,11 @@ export default {