Merge branch 'hi-ucs-dev' into release

back/src/views/modules/ability/assignedScene/area-add.vue

@@ -281,6 +281,9 @@ export default {
     // 详情
     getDetail (data) {
       this.dataForm = data
+        const _imgObj = data.fuseAttrList.find(v => v.attrType == '服务图片') || {}
+        this.imageUrl = _imgObj.attrValue
+
     },
     handleAvatarSuccess (res, file) {
       if (res.code !== 0) {

back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

@@ -81,7 +81,8 @@ js:
        <!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'">
         <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
       </el-radio-group> -->
-      <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
+      <a-textarea  v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1"  
+         maxLength="200"    :placeholder="'请填写' + name" />
       <div class="block" v-else-if="type == 'date'">
         <el-date-picker v-model="data.note1" type="date" :placeholder="'选择' + name" value-format="yyyy-MM-dd">
         </el-date-picker>

front/src/views/home/components/ApplicationTopDetails.vue

@@ -157,7 +157,11 @@ const addShoppingCart = () => {
 }
 //进入场景入口
 const openScene = (val) => {
-  window.open(val, '_blank')
+    if(val==''){
+      message.info("未配置场景入口")
+    }else{
+      window.open(val, '_blank')
+    }
 }
 // // 立即申请
 function toView() {

front/src/views/home/integrationServicesDetails.vue

@@ -392,7 +392,12 @@
 
   //进入场景入口
   const openScene = (val) => {
-    window.open(val, '_blank')
+    if(val==''){
+      message.info("未配置场景入口")
+    }else{
+      window.open(val, '_blank')
+    }
+    
   }
   const selectNav = (key) => {
     selectNow.value = key