fuck

.env.development

@@ -4,8 +4,8 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = '/dev-api'
 # 开发环境
-# VUE_APP_DOMAIN_PREFIX = 'http://192.168.0.91:9104'
-VUE_APP_DOMAIN_PREFIX = '/businessapi'
+VUE_APP_DOMAIN_PREFIX = 'http://192.168.0.91:9104'
+# VUE_APP_DOMAIN_PREFIX = '/businessapi'
 
 # 演示环境
 # VUE_APP_DOMAIN_PREFIX = 'http://192.168.0.91:9104'

canvas-container/components/canvasEditPage.vue

@@ -66,6 +66,7 @@
       }),
       // 画布添加或者移动了组件
       pageChange (e) {
+        console.log(e, '添加了东西');
         if (e.added) {
           this.activeComponent = e.added.newIndex
           e.added.element.index = e.added.newIndex

canvas-container/components/leftBar/panel.vue

@@ -79,17 +79,22 @@
         'typeId'
       ]),
       panelShowList(){
+        // terminal: 4, // 画布设备 1 小程序，2 H5，3 App 4 电脑
+        // typeId: 3, // 画布类型 1 平台画布，2 自定义页面，3 商家店铺装修
         let _this = this
         var _panelList = JSON.parse(JSON.stringify(this.panelList))
         var mewPaneList =  _panelList.filter(parent=>{
           let children = parent.classList.filter(child=>{
+            // 是否只用于app onlyApp  terminal == 4
+            // 是否只用于平台端 onlyAdmin typeId == 3
+            // 是否只用于商家端 onlyMerchant typeId == 1
             console.log(child.title,!(child.onlyApp && _this.terminal==4),!(child.onlyAdmin && _this.typeId==3),!(child.onlyMerchant && _this.typeId==1))
             return !(child.onlyApp && _this.terminal==4) && !(child.onlyAdmin && _this.typeId==3) && !(child.onlyMerchant && _this.typeId==1)
           })
           parent.classList = children
           return parent
         })
-        console.log(this.panelList)
+        console.log(this.panelList, 123)
         return mewPaneList
       }
     }

src/utils/request.js

@@ -17,7 +17,7 @@ const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
 const service = axios.create({
   baseURL,
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 150000 // request timeout
 })
 
 export const uploadUrl = `${baseURL}/file/upload`

src/views/commodity/commodityList/commodityGroup.vue

@@ -151,7 +151,7 @@ function GroupData(data) {
   this.ids = [] // 商品id数组
   this.shopGroupId = null // 商品分组id
 }
-import { commodityListAdd, commodityListUpdate, getGroupList, commodityListGetById } from '@/api/commodity'
+import { commodityListAdd, commodityListUpdate, getGroupList, commodityListGetById, commodityListDelete } from '@/api/commodity'
 export default {
   // eslint-disable-next-line vue/component-definition-name-casing, vue/match-component-file-name
   name: 'commodityGroup',
@@ -282,16 +282,34 @@ export default {
       console.log(this.dataGroup)
     },
     remove(node, data) {
+      // console.log(data.shopGroupId)
       // console.log(node, data)
-      const parent = node.parent
-      const children = parent.data.childs || parent.data
-      const index = children.findIndex((d) => d.idx === data.idx)
-      if (index !== -1) {
-        children.splice(index, 1)
-        this.deleteArr.push(data.id || '')
-      } else {
-        this.$message.warning('数据错误，请重试')
-      }
+      this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          commodityListDelete({ shopGroupId: data.shopGroupId }).then((res) => {
+            if (res.code === '') {
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getAll(this.formInline)
+            }
+            const parent = node.parent
+            const children = parent.data.childs || parent.data
+            const index = children.findIndex((d) => d.idx === data.idx)
+            if (index !== -1) {
+              children.splice(index, 1)
+              this.deleteArr.push(data.id || '')
+            } else {
+              this.$message.warning('数据错误，请重试')
+            }
+          })
+        })
+        .catch(() => { })
     },
     manualAdd(node, data) {
       // console.log(node)

src/views/commodity/commoditySystem/addComponent.vue

@@ -355,6 +355,7 @@ export default {
         // console.log(oldVal)
         // 修复因为添加规格导致的价格归零的问题
         oldVal.forEach((item, index) => {
+          // newVal[index] = Object.assign(item, newVal[index])
           for (const key in newVal[index]) {
             if (item[key]) {
               newVal[index][key] = item[key]