Merge branch 'bug0531' into test

src/components/icss/AddMedicinePrompt.vue

@@ -260,7 +260,7 @@ export default {
                   return {
                     title: it.title,
                     position: (it.contentType||'').split(","),
-                    content: it.content.replace(
+                    content: it.content && it.content.replace(
                       /{imageUrlPrefix}/g,
                       config.imgHost
                     ),