diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue index c281727d..8e766627 100644 --- a/src/components/image-preview/image-preview.vue +++ b/src/components/image-preview/image-preview.vue @@ -64,6 +64,10 @@ watch: { imgId: { handler(newval, oldval) { + if(newval.indexOf('/') === 0) { + this.imgUrlShow = this.base_url + newval + return + } if(newval.indexOf('http') === 0){ this.imgUrlShow = newval return @@ -128,7 +132,9 @@ }, mounted() { if (this.imgId) { - if(this.imgId.indexOf('http') === 0){ + if(this.imgId.indexOf('/') === 0) { + this.imgUrlShow = this.base_url + this.imgId + }else if(this.imgId.indexOf('http') === 0){ this.imgUrlShow = this.imgId }else{ this.getPreviewUrlBlob(this.imgId); diff --git a/src/pages.json b/src/pages.json index 4cd6d89d..5ffa6f61 100644 --- a/src/pages.json +++ b/src/pages.json @@ -162,7 +162,7 @@ }, { "text": "学习", - "pagePath": "pages/study/index" + "pagePath": "pages/course/index" }, { "text": "场景", @@ -198,15 +198,5 @@ "bounce": "none" } }, - "uniIdRouter": {}, - "condition" : { //模式配置,仅开发期间生效 - "current": 0, //当前激活的模式(list 的索引项) - "list": [ - { - "name": "", //模式名称 - "path": "", //启动页面,必选 - "query": "" //启动参数,在页面的onLoad函数里面得到 - } - ] - } + "uniIdRouter": {} } \ No newline at end of file diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index 5e5a3430..43b5ec4e 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -147,8 +147,13 @@ > - 完成 - 撤回 + 完成 + 撤回 + diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index e6c25f2f..9bc227b7 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -38,7 +38,7 @@