From 5ecf4ebd307ea1dc8696eb4ee66cc1fe3607f805 Mon Sep 17 00:00:00 2001
From: yanghao <781521347@qq.com>
Date: Wed, 9 Feb 2022 14:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/index.js | 2 +-
pages.json | 2 +-
pages/home/index-copy.vue | 428 --------------------------------
pages/home/index.vue | 9 +-
pages/knowledge/index.vue | 6 +-
pages/shop/GoodsClass/index.vue | 8 +-
pages/user/User/index.vue | 199 ++++++++++++---
static/jifen-icon.png | Bin 0 -> 665 bytes
static/nav.png | Bin 15782 -> 0 bytes
static/pause.png | Bin 3760 -> 0 bytes
static/play.png | Bin 4420 -> 0 bytes
static/plus.png | Bin 1252 -> 0 bytes
static/record.png | Bin 5801 -> 0 bytes
static/stop.png | Bin 2539 -> 0 bytes
static/uni.ttf | Bin 26164 -> 0 bytes
static/user-index-bg.png | Bin 20843 -> 0 bytes
utils/request.js | 2 +-
17 files changed, 183 insertions(+), 473 deletions(-)
delete mode 100644 pages/home/index-copy.vue
create mode 100644 static/jifen-icon.png
delete mode 100644 static/nav.png
delete mode 100644 static/pause.png
delete mode 100644 static/play.png
delete mode 100644 static/plus.png
delete mode 100644 static/record.png
delete mode 100644 static/stop.png
delete mode 100644 static/uni.ttf
delete mode 100644 static/user-index-bg.png
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 @@
-
+
-
服务老师主页
+ -->
+
+
+
+
+
+ 今日收益
+ 200积分
+
+
+ 累计收益
+ 200积分
+
+ 去提现
+
+
+
+
+ 推广人数
+ 20人
+
+
+ 今日收益
+ 20人
+
+ 我的团队
+
+
+
-
+
我参与的
-
+
{{item.courseName}}
@@ -66,7 +101,7 @@
-
+
@@ -552,9 +587,11 @@ export default {