diff --git a/App.vue b/App.vue
index 0b7ced7..5fb7601 100644
--- a/App.vue
+++ b/App.vue
@@ -71,6 +71,28 @@
border-right: 1px solid #bdbdbd;
transform: rotate(45deg);
}
+ uni-modal {
+ .uni-modal {
+ width: 288px !important;
+ max-width: 288px !important;
+ border-radius: 26upx;
+ .uni-modal__bd{
+ font-size: 36upx;
+ font-weight: 600;
+ color: #333333;
+ padding: 33px 25px 33px 25px;
+ }
+ .uni-modal__ft{
+ font-size: 32upx;
+ .uni-modal__btn_default{
+ color: #333333;
+ }
+ .uni-modal__btn_primary{
+ color: #387DF7;
+ }
+ }
+ }
+ }
/**统一样式*/
.fixed-field{
diff --git a/pages.json b/pages.json
index 5fee363..20d108d 100644
--- a/pages.json
+++ b/pages.json
@@ -66,7 +66,8 @@
}
},
{"path" : "pages/plus/addQuestion","style" : {"navigationBarTitleText": "提问题"}},
- {"path" : "pages/plus/editQuestion","style" : {"navigationBarTitleText": "编辑问题"}},
+ {"path" : "pages/plus/editQuestion","style" : {"navigationBarTitleText": "编辑问题"}},
+ {"path" : "pages/plus/editAnser","style" : {"navigationBarTitleText": "编辑回答"}},
{"path" : "pages/plus/feedback","style" : {"navigationBarTitleText": "提意见"}},
{"path" : "pages/login/next","style" : {"navigationBarTitleText": "修改密码"}},
{"path" : "pages/login/headPortrait","style" : {"navigationBarTitleText": "修改头像"}},
diff --git a/pages/my/myMedal.vue b/pages/my/myMedal.vue
index e562cd9..6b4b776 100644
--- a/pages/my/myMedal.vue
+++ b/pages/my/myMedal.vue
@@ -238,6 +238,7 @@
color: #0A89FC;
margin-left: 74upx;
margin-top: 26upx;
+ margin-bottom: 30upx;
}
// margin-top: 510upx;
.medal-list-index{
diff --git a/pages/my/myQa.vue b/pages/my/myQa.vue
index df4ecff..fd2abc9 100644
--- a/pages/my/myQa.vue
+++ b/pages/my/myQa.vue
@@ -117,6 +117,7 @@
+
@@ -132,6 +133,7 @@
},
data() {
return {
+ modalShow:false,
inputShow:false,
loadStatus:'more',
active:1,
@@ -232,8 +234,9 @@
delItem(item) {
const $this=this
uni.showModal({
- title: '提示',
+ // title: '提示',
content: '您确定要删除此回答吗？',
+ confirmText:"删除",
success: function (res) {
if (res.confirm) {
apiQa
@@ -254,9 +257,13 @@
});
},
editItem(item){
- this.reply = item;
- this.inputValue = item.answercontent;
- this.inputShow=true
+ // this.reply = item;
+ // this.inputValue = item.answercontent;
+ // this.inputShow=true
+
+ uni.navigateTo({
+ url:'/pages/plus/editAnser?value='+JSON.stringify(item)
+ })
},
toanDetail(item) {
uni.navigateTo({
@@ -265,7 +272,6 @@
});
},
toDetail(item) {
- console.log(item,'item')
uni.navigateTo({
url: '/pages/resource/qaDetail?id=' + item.id
});
@@ -278,8 +284,9 @@
del(item,index){
const $this=this
uni.showModal({
- title: '提示',
+ // title: '提示',
content: '确认删除这条提问吗？',
+ confirmText:"删除",
success: function (res) {
if (res.confirm) {
apiQa.del(item.id).then(res=>{
@@ -441,9 +448,7 @@
}
-
diff --git a/pages/plus/feedback.vue b/pages/plus/feedback.vue
index 63e310e..2a7d26f 100644
--- a/pages/plus/feedback.vue
+++ b/pages/plus/feedback.vue
@@ -9,7 +9,7 @@
取消
- 提交
+ 发布
@@ -154,7 +154,7 @@
}
.active{
color: #333;
- font-weight: 500;
+ font-weight: bold;
font-size: 36upx;
}
.sub-box{
@@ -238,12 +238,10 @@
color: #0D0D0D;
}
.title-right{
- // position: absolute;
- // right: 18rpx;
- color: #588AFC;
+ color: #387DF7;
font-size: 32upx;
font-family: Source Han Sans CN;
- font-weight: bold;
+ font-weight: 400;
line-height: 36rpx;
}
}
diff --git a/pages/resource/qaDetail.vue b/pages/resource/qaDetail.vue
index 9f4b14f..59d0abf 100644
--- a/pages/resource/qaDetail.vue
+++ b/pages/resource/qaDetail.vue
@@ -15,7 +15,7 @@
{{ detailData.title }}
-
+
@@ -938,7 +938,7 @@ export default {
padding: 15upx 30upx;
.adetail-title {
background-color: #fff;
- padding-bottom: 40upx;
+ // padding-bottom: 40upx;
font-weight: 500;
font-size: 36upx;
letter-spacing: 0.5px;
@@ -954,6 +954,7 @@ export default {
color: #7e7e7e;
}
.adetail-body {
+ padding-top: 20upx;
line-height: 55upx;
white-space: normal;
word-break: break-all;
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 4cb76e9..2ccc696 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -15,7 +15,7 @@
-
+
学习任务
@@ -77,7 +77,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -415,7 +415,6 @@
},
methods: {
removecour(item){
- console.log(item);
item.delcour = !item.delcour
},
rowbtn(row) {
@@ -520,8 +519,8 @@
})
},
autonomyStatus(num) {
- console.log(num)
this.Applistatus = num;
+ // console.log(this.Applistatus)
this.getLearning();
},
taskStatus(num) {
@@ -576,6 +575,7 @@
loadBoeData(flag) {
if (flag) {
this.taskPageIndex = 1; //回到首页
+ this.couresList = [];
}
let params = {
page: this.taskPageIndex,
@@ -587,12 +587,12 @@
params.cmtask_name = this.keyWord;
}
apiBoeCourse.cmtaskList(params).then(res => {
- this.taskCount = res.result.count;
+ this.taskCount = res.result.count;
res.result.list.forEach(item => {
let time = this.formatDate(item.created_at * 1000);
item.created_at = time.split(' ')[0];
});
- this.couresList = res.result.list;
+ this.couresList.push(...res.result.list);
if (this.taskCount > this.taskPageIndex * this.taskPageSize) {
this.taskHasMore = true;
} else {
@@ -648,12 +648,12 @@
},
clicktab(idx) {
this.tabIndex = idx;
- if (this.tabIndex == 1) {
+ if (this.tabIndex == 1 && this.studyList.length == 0) {
this.getLearning()
// this.searchData();
} else if (this.tabIndex == 2) {
this.history()
- } else if (this.tabIndex == 0) {
+ } else if (this.tabIndex == 0 && this.couresList.length == 0) {
this.loadBoeData()
}
},
@@ -701,6 +701,7 @@
})
},
async getLearning() {
+ console.log(this.Applistatus)
uni.showLoading({
title: '加载中...'
});