Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue

@@ -87,16 +87,25 @@
   const deploymentLocation = ref('') //部署位置
   //加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
+    if (props.dataList.isInShoppingCart) {
-    sgcInsert({
+      message.error('已经加入申购车了')
-      delFlag: '0',
+    } else {
-      resourceId: props.dataList.id,
+      console.log('加入申购车==================>', props.dataList)
-      // userId: userId.value,
+      sgcInsert({
-    }).then((res) => {
+        delFlag: '0',
-      console.log(res)
+        resourceId: props.dataList.id,
-      message.success('添加申购车成功！')
+        // userId: userId.value,
-      mybus.emit('getSgcNum')
+      }).then((res) => {
-    })
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   //立即申请
   function toView() {

front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue

@@ -90,16 +90,25 @@
   const applicationArea = ref('')
   // // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
+    if (props.dataList.isInShoppingCart) {
-    sgcInsert({
+      message.error('已经加入申购车了')
-      delFlag: '0',
+    } else {
-      resourceId: props.dataList.id,
+      console.log('加入申购车==================>', props.dataList)
-      // userId: userId.value,
+      sgcInsert({
-    }).then((res) => {
+        delFlag: '0',
-      console.log(res)
+        resourceId: props.dataList.id,
-      message.success('添加申购车成功！')
+        // userId: userId.value,
-      mybus.emit('getSgcNum')
+      }).then((res) => {
-    })
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // // 立即申请
   function toView() {

front/src/views/detailsAll/components/Business/BusinessTopDetails.vue

@@ -87,16 +87,25 @@
   const componentType = ref('') //组件类型
   // // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
+    if (props.dataList.isInShoppingCart) {
-    sgcInsert({
+      message.error('已经加入申购车了')
-      delFlag: '0',
+    } else {
-      resourceId: props.dataList.id,
+      console.log('加入申购车==================>', props.dataList)
-      // userId: userId.value,
+      sgcInsert({
-    }).then((res) => {
+        delFlag: '0',
-      console.log(res)
+        resourceId: props.dataList.id,
-      message.success('添加申购车成功！')
+        // userId: userId.value,
-      mybus.emit('getSgcNum')
+      }).then((res) => {
-    })
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // // 立即申请
   function toView() {

front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue

@@ -82,16 +82,25 @@
   const deploymentLocation = ref('') //部署位置
   // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
+    if (props.dataList.isInShoppingCart) {
-    sgcInsert({
+      message.error('已经加入申购车了')
-      delFlag: '0',
+    } else {
-      resourceId: props.dataList.id,
+      console.log('加入申购车==================>', props.dataList)
-      // userId: userId.value,
+      sgcInsert({
-    }).then((res) => {
+        delFlag: '0',
-      console.log(res)
+        resourceId: props.dataList.id,
-      message.success('添加申购车成功！')
+        // userId: userId.value,
-      mybus.emit('getSgcNum')
+      }).then((res) => {
-    })
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // 立即申请
   function toView() {

front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue

@@ -82,16 +82,25 @@
   const deploymentLocation = ref('') //部署位置
   // 加入申购车
   const addShoppingCart = () => {
-    console.log('加入申购车==================>', props.dataList)
+    if (props.dataList.isInShoppingCart) {
-    sgcInsert({
+      message.error('已经加入申购车了')
-      delFlag: '0',
+    } else {
-      resourceId: props.dataList.id,
+      console.log('加入申购车==================>', props.dataList)
-      // userId: userId.value,
+      sgcInsert({
-    }).then((res) => {
+        delFlag: '0',
-      console.log(res)
+        resourceId: props.dataList.id,
-      message.success('添加申购车成功！')
+        // userId: userId.value,
-      mybus.emit('getSgcNum')
+      }).then((res) => {
-    })
+        console.log(res)
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
+      })
+    }
   }
   // 立即申请
   function toView() {

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

@@ -465,7 +465,7 @@
     border-radius: 0.05rem;
     position: absolute;
     top: 0.45rem;
-    right: 3.1rem;
+    right: 2.9rem;
     overflow-y: scroll;
     .bottom {
       cursor: pointer;