调整发行产品展示

src/views/onlineBusinessHall/onlineOperation/repositpry/index.vue

@@ -95,7 +95,6 @@
 </template>
 <!-- 知识库 -->
 <script setup lang="ts">
-
 import { ref, toRaw, onMounted, computed } from 'vue'
 // @ts-ignore crudFrom模板
 import CrudTemplate from '@/crud/index.vue'
@@ -110,7 +109,6 @@ import FeedBackDialog from './components/FeedBackDialog.vue'
 const route = useRoute()
 const crudRef = ref()
 
-
 //问题类型
 let serviceTypeOptinos = [
   {
@@ -151,7 +149,7 @@ function handleEdit(idx: any, row: any) {
 // 删除按钮
 function handleDelete(idx: any, row: any) {
   const data = {
-    id:row.id
+    id: row.id,
   }
   BaseService.post('/managew/knowledgebase/deleteById', data).then(
     (res: any) => {
@@ -245,8 +243,7 @@ function getList() {
       crudRef.value.tableLoding = false
       //分页总数
       field.value.paging.total = bizContent.totalCount
-      console.log(bizContent, 'getList');
-      
+      console.log(bizContent, 'getList')
     } else {
       crudRef.value.tableLoding = false
       ElMessage.error(res.message)
@@ -261,7 +258,7 @@ function getBusinessType() {
       if (res && res.code === 0) {
         //数据转换
         let bizContent = res.data
-        businessTypeList.value = bizContent.map(item => {
+        businessTypeList.value = bizContent.map((item) => {
           return {
             label: item,
             value: item,
@@ -298,6 +295,7 @@ function getFeedBackNo(data) {
     (res: any) => {
       if (res && res.code === 0) {
         ElMessage.success('操作成功')
+        feedBackShow.value = false
         getList()
         cancel()
       } else {
@@ -315,6 +313,8 @@ function getFeedBack(data) {
     (res: any) => {
       if (res && res.code === 0) {
         ElMessage.success('操作成功')
+        feedBackShow.value = false
+
         getList()
         cancel()
       } else {

src/views/onlineBusinessHall/productManagement/promoteAnd/components/afterSaleFees.vue

@@ -163,11 +163,21 @@
                   collapse-tags-tooltip
                   filterable
                 >
-                  <el-option
+                <el-option
                     v-for="eles in merchantList"
                     :label="eles.label"
                     :value="eles.value"
-                  />
+                  >
+                  <div style="display: flex;justify-content: space-between;align-items: center;"> 
+                    <span >
+                    {{ eles.label }}
+                  </span>
+                  <span style="color: #999;">
+                    {{ eles.merchantId }}
+                  </span>
+                  </div>
+
+                </el-option>
                 </el-select>
               </el-form-item>
             </div>

src/views/onlineBusinessHall/productManagement/promoteAnd/components/feeList.vue

@@ -248,7 +248,17 @@
                     v-for="eles in merchantList"
                     :label="eles.label"
                     :value="eles.value"
-                  />
+                  >
+                  <div style="display: flex;justify-content: space-between;align-items: center;"> 
+                    <span >
+                    {{ eles.label }}
+                  </span>
+                  <span style="color: #999;">
+                    {{ eles.merchantId }}
+                  </span>
+                  </div>
+
+                </el-option>
                 </el-select>
               </el-form-item>
             </div>

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

@@ -227,7 +227,7 @@ function handleEdit(idx: any, row: any) {
 }
 
 function handleAfterFee(data) {
-  data.afterSaleFees.forEach((item) => {
+  data.afterSaleFees?.forEach((item) => {
     item.fee = item.fee / 100
   })
   afterSaleFeesList.value = data.afterSaleFees
@@ -632,6 +632,7 @@ function getmerchantList() {
         return {
           label: item.appName,
           value: item.id,
+          merchantId:item.merchantId,
         }
       })
       console.log(bizContent, 'getmerchantList')