Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

project/oms/apps/develop/AppDeployCustom/add.vue

@@ -113,6 +113,9 @@
                     <el-form-item label="接口是否单服务">
                       <el-checkbox v-model="form.isSingleService"/>
                     </el-form-item>
+                    <el-form-item label="引导页">
+                      <el-input v-model="form.guide" placeholder="带'/'会被认为是输入的页面路径" clearable/>
+                    </el-form-item>
                     <ai-title title="底部导航栏">
                       <el-button type="text" slot="rightBtn" icon="iconfont iconAdd" @click="tabBar.list.push({})">添加</el-button>
                     </ai-title>
@@ -324,11 +327,12 @@ export default {
               sysInfo,
               appQRCode,
               customLogin,
-              base
+              base,
+              guide
             }
           } = this
           if (type == 'mp') {
-            this.form.extra = {tabBar, appId, embeddedAppIdList, isSingleService}
+            this.form.extra = {tabBar, appId, embeddedAppIdList, isSingleService, guide}
           } else if (type == 'web') {
             const {desc} = sysInfo
             sysInfo.desc = JSON.parse(desc || null)

project/qujing/app/AppCurriculumManage/components/Comment.vue

@@ -84,7 +84,7 @@
       },
 
       show (id, isShow) {
-        this.$confirm(isShow === '1' ? '确定隐藏该留言？' : '确定隐藏该留言').then(() => {
+        this.$confirm(isShow === '1' ? '确定隐藏该评论？' : '确定隐藏该评论').then(() => {
           this.instance.post(`/app/appcoursecomment/configCommentById?id=${id}&status=${isShow === '1' ? '0' : '1'}`).then(res => {
             if (res.code == 0) {
               this.$message.success('操作成功')