Merge branch 'master' of http://82.156.35.112:3000/chensiyi/zonghe_web

src/views/onlineBusinessHall/productManagement/releaseProduct/index.vue

@@ -1347,13 +1347,13 @@ function customSelectorSelection(
 }
 const totalPrices = ref(0)
 const handleTotalPrices = (form) => {
-  let equityPrice = 0
-  form.equityServicesId.forEach((item) => {
-    const price = equityList.value.find((ele) => ele.value == item)
-    if (price) {
-      equityPrice += parseInt(price.discountPrice)
-    }
-  })
+  // let equityPrice = 0
+  // form.equityServicesId.forEach((item) => {
+  //   const price = equityList.value.find((ele) => ele.value == item)
+  //   if (price) {
+  //     equityPrice += parseInt(price.discountPrice)
+  //   }
+  // })
   let processingPrice = 0
   if (form.expenseType == 1) {
     dataForm.processingFeeList.forEach((item) => {
@@ -1362,11 +1362,10 @@ const handleTotalPrices = (form) => {
     processingPrice = processingPrice < 0 ? 0 : processingPrice
   }
 
-  form.totalPrices = (equityPrice + processingPrice) / 100
+  form.totalPrices =  processingPrice / 100
   console.log(
     '总金额',
     form,
-    equityPrice,
     processingPrice,
     form.totalPrices,
     dataForm.processingFeeList
@@ -1786,6 +1785,19 @@ let field = ref<any>({
         listData: CARD_TYPE,
       },
     },
+    {
+      prop: 'customerType',
+      label: '支持车辆所属性质', //用户类型
+      listData: USER_TYPE,
+      form: {
+        width: '45%',
+        formLabelWidth: formLabelWidth,
+        type: 'select',
+        required: true,
+        multiple: false,
+        listData: USER_TYPE,
+      },
+    },
     {
       prop: 'vanType',
       label: '车辆类型',
@@ -1813,32 +1825,8 @@ let field = ref<any>({
         collapseTags: true,
       },
     },
-    {
-      prop: 'customerType',
-      label: '支持车辆所属性质', //用户类型
-      listData: USER_TYPE,
-      form: {
-        width: '45%',
-        formLabelWidth: formLabelWidth,
-        type: 'select',
-        required: true,
-        multiple: false,
-        listData: USER_TYPE,
-      },
-    },
-    {
-      prop: 'equityServicesId',
-      label: '权益服务',
-      listData: equityList,
-      form: {
-        width: '45%',
-        formLabelWidth: formLabelWidth,
-        required: true,
-        multiple: true,
-        listData: equityList,
-        type: 'select',
-      },
-    },
+
+
     {
       prop: 'dateOfListing',
       label: '起始日期',
@@ -1878,6 +1866,19 @@ let field = ref<any>({
         required: true,
       },
     },
+    {
+      prop: 'equityServicesId',
+      label: '权益服务',
+      listData: equityList,
+      form: {
+        width: '45%',
+        formLabelWidth: formLabelWidth,
+        required: true,
+        multiple: true,
+        listData: equityList,
+        type: 'select',
+      },
+    },
     {
       prop: 'trialOperationCirculation',
       label: '试运营发行量设置',