From cb60a8736d3e98349e93d7d75b365c388e54338d Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 09:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=80=9A=E8=BF=87=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=94=B3=E8=AF=B7=E8=B7=B3=E8=BD=AC=20=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=BF=9B=E5=85=A5=E6=94=BF=E5=8A=A1=E4=BA=91=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue  |    1 +
 front/src/views/home/infrastructurePage.vue   |   16 +-
 .../views/newHome/components/WorkDynamics.vue | 1022 ++++++++---------
 3 files changed, 519 insertions(+), 520 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index dee8e5b0..1947a3ba 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1784,6 +1784,7 @@
         Cardsname.value = name
         newQuery.select = Cardsname.value
         newQuery.type = ''
+        newQuery.zwy = ''
         router
           .replace({
             query: newQuery,
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index c9e1c4f6..5031c4f4 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -1024,6 +1024,7 @@
   }
   // 消息列表页面
   let formPage = router.currentRoute.value.query.formPage || ''
+  let zwy = router.currentRoute.value.query.zwy || ''
   // 设施类型--无人机和单兵设备
   let facilitiesType = router.currentRoute.value.query.facilitiesType || ''
   onMounted(() => {
@@ -1054,7 +1055,12 @@
           roomResult.value = true
           onSearch()
         } else {
-          tabClick(0, '城市云脑会客厅')
+          // 如果是通过自愿申请跳转 默认打开政务云资源
+          if (zwy) {
+            tabClick(0, '政务云资源')
+          } else {
+            tabClick(0, '城市云脑会客厅')
+          }
         }
       }
     }
@@ -1264,10 +1270,10 @@
   }
   // 时间选择器限制----可用时间查询
   //获取不可选择的日期
-   const disabledDate = (current) => {
-      const time = moment().endOf('day').subtract(1, 'days')
-      return current && current < time
-    }
+  const disabledDate = (current) => {
+    const time = moment().endOf('day').subtract(1, 'days')
+    return current && current < time
+  }
   //获取不可选择的小时
   const disabledStartHours = () => {
     if (roomEndTime.value) {
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index 6de21b31..b3151918 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -13,14 +13,7 @@
         <p></p>
         <p>能力上架</p>
         <!-- <a-button type="primary" >Open Modal</a-button> -->
-        <a-modal
-          v-model:visible="visible"
-          
-          class="shangjia-class"
-         
-        >
-      
-
+        <a-modal v-model:visible="visible" class="shangjia-class">
           <div class="ant-modal-title" id="vcDialogTitle1">
             <!-- <div class="showBg"></div> -->
             能力上架申请
@@ -42,7 +35,7 @@
               </div>
             </div>
           </div>
-         
+
           <div
             class="ability-to-type"
             v-if="abilityToTypeFunctionData == '组件服务'"
@@ -54,571 +47,570 @@
                 :key="item"
                 @click="componentTypeValueFunction(item)"
                 :class="
-                  componentTypeValue == item
-                    ? 'ability-to-type-down'
-                    : ''
+                  componentTypeValue == item ? 'ability-to-type-down' : ''
                 "
               >
                 {{ item }}
               </div>
-            </div> 
-           </div>
-           <template v-slot:footer>
-        <a-button  class="shenqing" @click="handleOk">申请</a-button>
-        <a-button class="quxiao"  @click="handlecancel">取消</a-button>
-    </template>
-
+            </div>
+          </div>
+          <template v-slot:footer>
+            <a-button class="shenqing" @click="handleOk">申请</a-button>
+            <a-button class="quxiao" @click="handlecancel">取消</a-button>
+          </template>
         </a-modal>
       </div>
-    
     </div>
   </div>
 </template>
 <script setup>
-import { gongZuoZhuangTai } from '@/api/home.js'
-import { message } from 'ant-design-vue'
-import { ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-const store = useStore()
-const router = useRouter()
-const imgSrc = ref(require('@/assets/newHome/zw.png'))
-let dataList = ref([])
-// let tupain = ref([
-//   require('../../../assets/newHome/one.png'),
-//   require('../../../assets/newHome/two.png'),
-//   require('../../../assets/newHome/three.png'),
-//   require('../../../assets/newHome/four.png'),
-// ])
-//能力上架弹窗
-function handlecancel() {
-  abilityToTypeFunctionData.value = '组件服务'
-  componentTypeValue.value = ''
-}
-let abilityToTypeFunctionData = ref('组件服务')
-function abilityToTypeFunction(item) {
-  abilityToTypeFunctionData.value = item
-}
-
-let abilityToType = ref(['组件服务', '应用资源'])
-let abilitySquare = ref(['智能算法', '图层服务', '应用资源'])
-let componentType = ref([
-  '智能算法',
-  '图层服务',
-  '开发组件',
-  // '办公组件',
-  '业务组件',
-  // '其他',
-])
-const visible = ref(false)
-const showModal = () => {
-  visible.value = true
-}
-// 能力广场
-const visibleAbilitySquare = ref(false)
-const showAbilitySquare = () => {
-  visibleAbilitySquare.value = true
-}
-let componentTypeValueOld = ref('')
-function componentTypeValueFunction(item) {
-  componentTypeValue.value = item
-  if (componentTypeValueOld.value != item) {
-    componentTypeValue.value = item
-    componentTypeValueOld.value = item
-  } else {
+  import { gongZuoZhuangTai } from '@/api/home.js'
+  import { message } from 'ant-design-vue'
+  import { ref, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  const store = useStore()
+  const router = useRouter()
+  const imgSrc = ref(require('@/assets/newHome/zw.png'))
+  let dataList = ref([])
+  // let tupain = ref([
+  //   require('../../../assets/newHome/one.png'),
+  //   require('../../../assets/newHome/two.png'),
+  //   require('../../../assets/newHome/three.png'),
+  //   require('../../../assets/newHome/four.png'),
+  // ])
+  //能力上架弹窗
+  function handlecancel() {
+    abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
   }
-}
-let componentTypeValue = ref('')
-const handleOk = (e) => {
-  let snum = ref({})
-  if (abilityToTypeFunctionData.value == '组件服务') {
-    if (!componentTypeValue.value || componentTypeValue.value == '') {
-      message.error('请选择组件类型！')
-      return
-    } else if (
-      componentTypeValue.value === '智能算法' ||
-      componentTypeValue.value === '开发组件' ||
-      componentTypeValue.value === '业务组件' ||
-      componentTypeValue.value === '图层服务'
-    ) {
-      snum.value = {
-        abilityToType: abilityToTypeFunctionData.value,
-        componentTypeValue: componentTypeValue.value,
+  let abilityToTypeFunctionData = ref('组件服务')
+  function abilityToTypeFunction(item) {
+    abilityToTypeFunctionData.value = item
+  }
+
+  let abilityToType = ref(['组件服务', '应用资源'])
+  let abilitySquare = ref(['智能算法', '图层服务', '应用资源'])
+  let componentType = ref([
+    '智能算法',
+    '图层服务',
+    '开发组件',
+    // '办公组件',
+    '业务组件',
+    // '其他',
+  ])
+  const visible = ref(false)
+  const showModal = () => {
+    visible.value = true
+  }
+  // 能力广场
+  const visibleAbilitySquare = ref(false)
+  const showAbilitySquare = () => {
+    visibleAbilitySquare.value = true
+  }
+  let componentTypeValueOld = ref('')
+  function componentTypeValueFunction(item) {
+    componentTypeValue.value = item
+    if (componentTypeValueOld.value != item) {
+      componentTypeValue.value = item
+      componentTypeValueOld.value = item
+    } else {
+      componentTypeValue.value = ''
+    }
+  }
+  let componentTypeValue = ref('')
+  const handleOk = (e) => {
+    let snum = ref({})
+    if (abilityToTypeFunctionData.value == '组件服务') {
+      if (!componentTypeValue.value || componentTypeValue.value == '') {
+        message.error('请选择组件类型！')
+        return
+      } else if (
+        componentTypeValue.value === '智能算法' ||
+        componentTypeValue.value === '开发组件' ||
+        componentTypeValue.value === '业务组件' ||
+        componentTypeValue.value === '图层服务'
+      ) {
+        snum.value = {
+          abilityToType: abilityToTypeFunctionData.value,
+          componentTypeValue: componentTypeValue.value,
+        }
+      } else {
+        message.error('功能开发中！')
+        return
       }
     } else {
-      message.error('功能开发中！')
-      return
+      snum.value = {
+        abilityToType: abilityToTypeFunctionData.value,
+      }
     }
-  } else {
-    snum.value = {
-      abilityToType: abilityToTypeFunctionData.value,
-    }
-  }
-  const applypage = router.resolve({
-    path: '/nenglishangjia', // 跳转的页面路由
-    query: snum.value,
-  })
-  window.open(applypage.href, '_blank')
-  visible.value = false
-  abilityToTypeFunctionData.value = '组件服务'
-  componentTypeValue.value = ''
-  console.log(e)
-}
-const getList = () => {
-  const params = {
-    limit: 4,
-    page: 1,
-  }
-  gongZuoZhuangTai(params).then((res) => {
-    dataList.value = res.data.data.list
-    dataList.value.map((item, index) => {
-      // dataList.value[index].imageUrl = require(dataList.value[index].imageUrl)
-      console.log('item', dataList.value[index].imageUrl)
+    const applypage = router.resolve({
+      path: '/nenglishangjia', // 跳转的页面路由
+      query: snum.value,
     })
-  })
-}
-const newpage = router.resolve({
-  path: '/addApplication', // 跳转的页面路由
-})
-const toView = () => {
-  window.open(newpage.href, '_blank')
-}
-// const toApply = () => {
-//   window.open(applypage.href, '_blank')
-// }
-getList()
-// dataList.value.map((item, index) => {
-//   dataList.value[index].tupian = tupain.value[index]
-//   console.log('item', item, dataList.value)
-// })
-function jumpPage() {
-  // 点击内存入store
-  // store.commit('WorkDynList', {
-  //   selectCardsnum: '组件服务',
-  // })
-  console.log('选中===================>', store.getters['home/selectCardsnum'])
-  // router.push({ path: '/DetailsPageconetent' })
-  router.push({
-    path: '/WorkDynList',
-  })
-}
-const selectOne = (id) => {
-  console.log('点击===============》', id)
-  router.push({
-    path: '/WorkDynDetails',
-    query: {
-      id: id,
-    },
-  })
-}
-watch(abilityToTypeFunctionData, () => {
-  componentTypeValue.value = ''
-})
-// 能力广场
-const handleOkAbilitySquare = (e) => {
-  let snumSquare = ref({})
-  snumSquare.value = {
-    abilityToType: abilitySquareFunctionData.value,
+    window.open(applypage.href, '_blank')
+    visible.value = false
+    abilityToTypeFunctionData.value = '组件服务'
+    componentTypeValue.value = ''
+    console.log(e)
   }
-  const applypage = router.resolve({
-    path: '/capacitySquare', // 跳转的页面路由
-    query: snumSquare.value,
+  const getList = () => {
+    const params = {
+      limit: 4,
+      page: 1,
+    }
+    gongZuoZhuangTai(params).then((res) => {
+      dataList.value = res.data.data.list
+      dataList.value.map((item, index) => {
+        // dataList.value[index].imageUrl = require(dataList.value[index].imageUrl)
+        console.log('item', dataList.value[index].imageUrl)
+      })
+    })
+  }
+  const newpage = router.resolve({
+    path: '/addApplication', // 跳转的页面路由
   })
-  window.open(applypage.href, '_blank')
-  console.log(e, abilitySquareFunctionData.value, 'hahhaha')
-  visibleAbilitySquare.value = false
-  abilitySquareFunctionData.value = '智能算法'
-}
-let abilitySquareFunctionData = ref('智能算法')
-function abilitySquareFunction(item) {
-  abilitySquareFunctionData.value = item
-}
-function handlecancelAbilitySquare() {
-  abilitySquareFunctionData.value = '智能算法'
-}
-const applyResource = () => {
-  console.log('点击===============》')
-  router.push({
-    path: '/DetailsPageconetent',
-    query: {
-      select: '基础设施',
-    },
+  const toView = () => {
+    window.open(newpage.href, '_blank')
+  }
+  // const toApply = () => {
+  //   window.open(applypage.href, '_blank')
+  // }
+  getList()
+  // dataList.value.map((item, index) => {
+  //   dataList.value[index].tupian = tupain.value[index]
+  //   console.log('item', item, dataList.value)
+  // })
+  function jumpPage() {
+    // 点击内存入store
+    // store.commit('WorkDynList', {
+    //   selectCardsnum: '组件服务',
+    // })
+    console.log(
+      '选中===================>',
+      store.getters['home/selectCardsnum']
+    )
+    // router.push({ path: '/DetailsPageconetent' })
+    router.push({
+      path: '/WorkDynList',
+    })
+  }
+  const selectOne = (id) => {
+    console.log('点击===============》', id)
+    router.push({
+      path: '/WorkDynDetails',
+      query: {
+        id: id,
+      },
+    })
+  }
+  watch(abilityToTypeFunctionData, () => {
+    componentTypeValue.value = ''
   })
-}
+  // 能力广场
+  const handleOkAbilitySquare = (e) => {
+    let snumSquare = ref({})
+    snumSquare.value = {
+      abilityToType: abilitySquareFunctionData.value,
+    }
+    const applypage = router.resolve({
+      path: '/capacitySquare', // 跳转的页面路由
+      query: snumSquare.value,
+    })
+    window.open(applypage.href, '_blank')
+    console.log(e, abilitySquareFunctionData.value, 'hahhaha')
+    visibleAbilitySquare.value = false
+    abilitySquareFunctionData.value = '智能算法'
+  }
+  let abilitySquareFunctionData = ref('智能算法')
+  function abilitySquareFunction(item) {
+    abilitySquareFunctionData.value = item
+  }
+  function handlecancelAbilitySquare() {
+    abilitySquareFunctionData.value = '智能算法'
+  }
+  const applyResource = () => {
+    console.log('点击===============》')
+    router.push({
+      path: '/DetailsPageconetent',
+      query: {
+        select: '基础设施',
+        zwy: true,
+      },
+    })
+  }
 </script>
 <style lang="less">
-.shangjia-class {
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  margin-left: -2.6rem;
-  margin-top: -1.44rem;
-  font-size: 0.14rem;
-  font-weight: 500;
-  .ant-modal-footer {
-    border: 0;
-    text-align: center;
-    margin-top: 24px;
-    padding-bottom: 24px;
-   
-    .shenqing{
-      background: #0058e1;
-      color:#ffffff;
-      width: 90px;
-      height: 32px;
-      border-radius: 2px;
-      border: 1px #0058e1 solid;
-    }
-    .quxiao{
-      width: 90px;
-      height: 32px;
-      background: #ffffff;
-      color:#0058e1;
-      border-radius: 2px;
-      border: 1px #0058e1 solid;
-
-    }
-}
-  .ant-modal-body {
-    padding: 0px !important;
-  }
-  .ant-radio-inner {
-    height: 0.16rem;
-    width: 0.16rem;
-  }
-  .ant-radio-inner::after {
-    background-color: unset;
-    background: url('~@/assets/personalCenter/xuanzhong.png') no-repeat;
-    background-size: cover;
-    background-position: center;
-  }
-  .ant-modal-content {
-    border-radius: 2px;
-    border: 1px #e6e9ed solid;
-    width: 690px;
-    box-shadow: 0px 4px 20px rgb(0, 0, 0, 0.5);
-    .ability-to-type,
-    .component-type {
-      display: flex;
+  .shangjia-class {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    margin-left: -2.6rem;
+    margin-top: -1.44rem;
+    font-size: 0.14rem;
+    font-weight: 500;
+    .ant-modal-footer {
+      border: 0;
+      text-align: center;
       margin-top: 24px;
-      margin-left: 24px;
-      .title {
-        white-space: nowrap;
-        display: flex;
-        align-items: center;
-        height: 0.26rem;
-        font-size: 16px;
+      padding-bottom: 24px;
+
+      .shenqing {
+        background: #0058e1;
+        color: #ffffff;
+        width: 90px;
+        height: 32px;
+        border-radius: 2px;
+        border: 1px #0058e1 solid;
       }
-      .component-type-content {
-        width: 100%;
-        height: unset;
-        border: unset;
-        background: unset;
-        .ant-radio-group {
+      .quxiao {
+        width: 90px;
+        height: 32px;
+        background: #ffffff;
+        color: #0058e1;
+        border-radius: 2px;
+        border: 1px #0058e1 solid;
+      }
+    }
+    .ant-modal-body {
+      padding: 0px !important;
+    }
+    .ant-radio-inner {
+      height: 0.16rem;
+      width: 0.16rem;
+    }
+    .ant-radio-inner::after {
+      background-color: unset;
+      background: url('~@/assets/personalCenter/xuanzhong.png') no-repeat;
+      background-size: cover;
+      background-position: center;
+    }
+    .ant-modal-content {
+      border-radius: 2px;
+      border: 1px #e6e9ed solid;
+      width: 690px;
+      box-shadow: 0px 4px 20px rgb(0, 0, 0, 0.5);
+      .ability-to-type,
+      .component-type {
+        display: flex;
+        margin-top: 24px;
+        margin-left: 24px;
+        .title {
+          white-space: nowrap;
+          display: flex;
+          align-items: center;
+          height: 0.26rem;
+          font-size: 16px;
+        }
+        .component-type-content {
+          width: 100%;
+          height: unset;
+          border: unset;
+          background: unset;
+          .ant-radio-group {
+            display: grid;
+            grid-template-columns: auto auto auto auto;
+            grid-gap: 0.15rem;
+          }
+        }
+      }
+
+      .ability-to-type {
+        .ability-to-type-content {
           display: grid;
           grid-template-columns: auto auto auto auto;
-          grid-gap: 0.15rem;
+          height: unset;
+          border: unset;
+          background: unset;
+          margin-left: 20px;
+          div {
+            &:hover {
+              background: #0058e1;
+              cursor: pointer;
+              color: #ffffff;
+            }
+            margin-right: 16px;
+            cursor: pointer;
+            font-size: 16px;
+            width: 90px;
+            height: 32px;
+            border-radius: 2px;
+            color: #0058e1;
+            background: #ffffff;
+            border: 1px #0058e1 solid;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-weight: 500;
+          }
+
+          .ability-to-type-down {
+            background: #0058e1;
+            color: #fff;
+          }
         }
       }
     }
 
-    .ability-to-type {
-      .ability-to-type-content {
-        display: grid;
-        grid-template-columns: auto auto auto auto;
-        height: unset;
-        border: unset;
-        background: unset;
-        margin-left: 20px;
-        div {
-          &:hover {
-    background: #0058e1;
-    cursor: pointer;
-    color:#ffffff;
-  }
-          margin-right: 16px;
-          cursor: pointer;
-          font-size: 16px;
-          width: 90px;
-          height: 32px;
-          border-radius: 2px;
-          color: #0058e1;
-          background: #ffffff;
-          border: 1px #0058e1 solid;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          font-weight: 500;
-        }
+    .ant-modal-title {
+      display: flex;
+      align-items: center;
+      display: flex;
+      align-items: center;
+      margin: 0px 24px;
+      padding-top: 24px;
+      padding-bottom: 22px;
+      color: #212121;
+      font-weight: bold;
+      font-size: 20px;
+      border-bottom: 2px solid #ebeced;
+    }
 
-        .ability-to-type-down {
-          background: #0058e1;
-          color: #fff;
-        }
+    .ant-modal-footer {
+      border: 0;
+      text-align: center;
+      padding-bottom: 0.2rem;
+      margin-top: 50px;
+      button {
+        margin-right: 12px;
+        border-radius: 2px;
       }
     }
-  }
 
-  .ant-modal-title {
-    display: flex;
-    align-items: center;
-    display: flex;
-    align-items: center;
-    margin: 0px 24px;
-    padding-top: 24px;
-    padding-bottom: 22px;
-    color: #212121;
-    font-weight: bold;
-    font-size: 20px;
-    border-bottom: 2px solid #ebeced;
-  }
-
-  .ant-modal-footer {
-    border: 0;
-    text-align: center;
-    padding-bottom: 0.2rem;
-    margin-top:50px;
-    button {
-      margin-right: 12px;
-      border-radius: 2px;
+    .showBg {
+      height: 0.24rem;
+      width: 0.24rem;
+      background: url('~@/assets/home/shenqing.png') no-repeat;
+      background-size: cover;
+      background-position: center;
+      margin-right: 0.1rem;
     }
   }
-
-  .showBg {
-    height: 0.24rem;
-    width: 0.24rem;
-    background: url('~@/assets/home/shenqing.png') no-repeat;
-    background-size: cover;
-    background-position: center;
-    margin-right: 0.1rem;
-  }
-}
 </style>
 <style lang="less" scoped>
-.work-dynamics {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  // padding-bottom: 0.8rem;
-  // padding-top: 0.78rem;
-  .title {
-    font-size: 0.3rem;
-    font-family: 'convergence-typeface';
+  .work-dynamics {
     display: flex;
     flex-direction: column;
     align-items: center;
-    margin-bottom: 0.32rem;
-    // width: 0.34rem;
-    border-radius: 0.01rem;
-    margin-top: 0.18rem;
-  }
-}
-
-.content {
-  width: 13rem;
-  height: 4.8rem;
-  display: flex;
-  // padding-left: 0.2rem;
-  .content-empty {
-    height: 2.2rem;
-    padding-top: 0.49rem;
-  }
-  border: #eaedf2 0.01rem solid;
-}
-
-.content > div:hover {
-  border-radius: 0.02rem;
-  border: 0.01rem solid #0058e1;
-  box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
-}
-
-.content-miaoshui {
-  display: flex;
-  flex-direction: column;
-  padding-top: 0.2rem;
-  align-items: center;
-  padding-bottom: 0.1rem;
-  .content-miaoshui-title {
-    padding-left: 0.05rem;
-    padding-right: 0.05rem;
-    font-size: 0.18rem;
-    font-weight: bold;
-    height: 0.3rem;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-    margin-bottom: 0.12rem;
-    word-break: break-all;
+    // padding-bottom: 0.8rem;
+    // padding-top: 0.78rem;
+    .title {
+      font-size: 0.3rem;
+      font-family: 'convergence-typeface';
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-bottom: 0.32rem;
+      // width: 0.34rem;
+      border-radius: 0.01rem;
+      margin-top: 0.18rem;
+    }
   }
 
-  .content-miaoshui-content {
-    height: 1.2rem;
-    width: 2.98rem;
-    margin: 0.12rem 0.1rem 0.1rem 0.1rem;
-    font-family: text-typeface;
-    font-size: 0.14rem;
-    line-height: 0.2rem;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 6;
-    -webkit-box-orient: vertical;
-    margin-bottom: 0.12rem;
-    word-break: break-all;
-    cursor: pointer;
+  .content {
+    width: 13rem;
+    height: 4.8rem;
+    display: flex;
+    // padding-left: 0.2rem;
+    .content-empty {
+      height: 2.2rem;
+      padding-top: 0.49rem;
+    }
+    border: #eaedf2 0.01rem solid;
   }
-}
 
-.shijain {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: bottom;
-  margin-right: 0.16rem;
-  margin-left: 0.16rem;
-  div:first-child {
-    margin-left: 0.16rem;
+  .content > div:hover {
+    border-radius: 0.02rem;
+    border: 0.01rem solid #0058e1;
+    box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
   }
-}
 
-.shijain-content-bootom {
-  margin-right: 0.16rem;
-  width: 0.8rem;
-  height: 0.24rem;
-  text-align: center;
-  border: 0.01rem solid #0058e1;
-  cursor: pointer;
-  color: #0058e1;
-}
+  .content-miaoshui {
+    display: flex;
+    flex-direction: column;
+    padding-top: 0.2rem;
+    align-items: center;
+    padding-bottom: 0.1rem;
+    .content-miaoshui-title {
+      padding-left: 0.05rem;
+      padding-right: 0.05rem;
+      font-size: 0.18rem;
+      font-weight: bold;
+      height: 0.3rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      margin-bottom: 0.12rem;
+      word-break: break-all;
+    }
 
-.shijain-content-bootom:hover {
-  background: rgba(0, 88, 225, 0.3);
-}
+    .content-miaoshui-content {
+      height: 1.2rem;
+      width: 2.98rem;
+      margin: 0.12rem 0.1rem 0.1rem 0.1rem;
+      font-family: text-typeface;
+      font-size: 0.14rem;
+      line-height: 0.2rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 6;
+      -webkit-box-orient: vertical;
+      margin-bottom: 0.12rem;
+      word-break: break-all;
+      cursor: pointer;
+    }
+  }
 
-.content > div > div {
-  height: 2.4rem;
-  width: 100%;
-}
-
-.one {
-  height: 2.4rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  background-size: 100%;
-  padding-top: 0.15rem;
   .shijain {
-    margin-top: 0.2rem;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: bottom;
+    margin-right: 0.16rem;
+    margin-left: 0.16rem;
+    div:first-child {
+      margin-left: 0.16rem;
+    }
   }
 
-  :deep(.ant-imag) {
+  .shijain-content-bootom {
+    margin-right: 0.16rem;
+    width: 0.8rem;
+    height: 0.24rem;
     text-align: center;
+    border: 0.01rem solid #0058e1;
+    cursor: pointer;
+    color: #0058e1;
   }
-  :deep(.ant-image-img) {
-    height: 2.1rem;
-    text-align: center;
+
+  .shijain-content-bootom:hover {
+    background: rgba(0, 88, 225, 0.3);
+  }
+
+  .content > div > div {
+    height: 2.4rem;
+    width: 100%;
+  }
+
+  .one {
+    height: 2.4rem;
+    display: flex;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
-    width: 100%;
-    max-width: 2.98rem;
+    background-size: 100%;
+    padding-top: 0.15rem;
+    .shijain {
+      margin-top: 0.2rem;
+    }
+
+    :deep(.ant-imag) {
+      text-align: center;
+    }
+    :deep(.ant-image-img) {
+      height: 2.1rem;
+      text-align: center;
+      justify-content: center;
+      align-items: center;
+      width: 100%;
+      max-width: 2.98rem;
+    }
   }
-}
 
-.bottom {
-  height: 0.24rem;
-  font-size: 0.16rem;
-  width: 1rem;
-  margin-top: 0.4rem;
-  cursor: pointer;
-  text-align: center;
-  color: #000000;
+  .bottom {
+    height: 0.24rem;
+    font-size: 0.16rem;
+    width: 1rem;
+    margin-top: 0.4rem;
+    cursor: pointer;
+    text-align: center;
+    color: #000000;
 
-  .gengduo {
-    display: inline-block;
-    margin-left: 0.04rem;
-    width: 0.1rem;
-    height: 0.1rem;
-    background: url('~@/assets/newHome/gd2.png') no-repeat;
+    .gengduo {
+      display: inline-block;
+      margin-left: 0.04rem;
+      width: 0.1rem;
+      height: 0.1rem;
+      background: url('~@/assets/newHome/gd2.png') no-repeat;
+      background-position: center;
+    }
+  }
+
+  .bottom:hover {
+    border-radius: 0.02rem;
+    background-color: rgba(1, 102, 255, 0.1);
+  }
+
+  .content > div {
+    height: 4.8rem;
+    width: 3.1rem;
+    margin-right: 0.1rem;
+    background: #f3f5f9;
+  }
+
+  .fixedmount {
+    height: 3rem;
+    display: flex;
+    position: fixed;
+    bottom: 1.56rem;
+    right: 0rem;
+    z-index: 10;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .fixedmount div {
+    width: 0.96rem;
+    height: 0.96rem;
+    // border-radius: 0.04rem;
+    // border: 0.01rem #94aac9 solid;
+    display: flex;
+    flex-direction: column;
+    // justify-content: center;
+    align-items: center;
+    padding-top: 0.16rem;
+    margin-bottom: 2px;
+    position: relative;
+    cursor: pointer;
+    // background: #e3edfc;
+    background: url('~@/assets/home/bg-right.png');
+  }
+
+  .fixedmount div p:nth-child(2) {
+    position: absolute;
+    bottom: 0rem;
+    height: 0.2rem;
+    font-size: 0.2rem;
+    line-height: 0.2rem;
+    color: #fff;
+    // margin-top: .08rem;
+  }
+
+  .fixedmount div:nth-child(1) p:nth-child(1) {
+    height: 0.32rem;
+    width: 0.32rem;
+    //background: url('~@/assets/home/shenqing.png') no-repeat;
+    background: url('~@/assets/home/sq.png') no-repeat;
+    background-size: contain;
     background-position: center;
   }
-}
 
-.bottom:hover {
-  border-radius: 0.02rem;
-  background-color: rgba(1, 102, 255, 0.1);
-}
-
-.content > div {
-  height: 4.8rem;
-  width: 3.1rem;
-  margin-right: 0.1rem;
-  background: #f3f5f9;
-}
-
-.fixedmount {
-  height: 3rem;
-  display: flex;
-  position: fixed;
-  bottom: 1.56rem;
-  right: 0rem;
-  z-index: 10;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.fixedmount div {
-  width: 0.96rem;
-  height: 0.96rem;
-  // border-radius: 0.04rem;
-  // border: 0.01rem #94aac9 solid;
-  display: flex;
-  flex-direction: column;
-  // justify-content: center;
-  align-items: center;
-  padding-top: 0.16rem;
-  margin-bottom: 2px;
-  position: relative;
-  cursor: pointer;
-  // background: #e3edfc;
-  background: url('~@/assets/home/bg-right.png');
-}
-
-.fixedmount div p:nth-child(2) {
-  position: absolute;
-  bottom: 0rem;
-  height: 0.2rem;
-  font-size: 0.2rem;
-  line-height: 0.2rem;
-  color: #fff;
-  // margin-top: .08rem;
-}
-
-.fixedmount div:nth-child(1) p:nth-child(1) {
-  height: 0.32rem;
-  width: 0.32rem;
-  //background: url('~@/assets/home/shenqing.png') no-repeat;
-  background: url('~@/assets/home/sq.png') no-repeat;
-  background-size: contain;
-  background-position: center;
-}
-
-.fixedmount div:nth-child(2) p:nth-child(1) {
-  height: 0.32rem;
-  width: 0.32rem;
-  background: url('~@/assets/home/xq.png') no-repeat;
-  background-size: contain;
-  background-position: center;
-}
-.fixedmount div:nth-child(3) p:nth-child(1) {
-  height: 0.32rem;
-  width: 0.32rem;
-  background: url('~@/assets/home/sj.png') no-repeat;
-  background-size: 140% 126%;
-  background-position: center;
-}
+  .fixedmount div:nth-child(2) p:nth-child(1) {
+    height: 0.32rem;
+    width: 0.32rem;
+    background: url('~@/assets/home/xq.png') no-repeat;
+    background-size: contain;
+    background-position: center;
+  }
+  .fixedmount div:nth-child(3) p:nth-child(1) {
+    height: 0.32rem;
+    width: 0.32rem;
+    background: url('~@/assets/home/sj.png') no-repeat;
+    background-size: 140% 126%;
+    background-position: center;
+  }
 </style>