bug修改

src/views/home/index.vue

@@ -8,7 +8,7 @@
     <div class="card">
       <div class="card-item" v-for="item in cardList" :key="item.name" @click="(e) => clickHandle(item)">
         <img :src="item.img" alt="" />
-        <p>{{ item.name }}</p>
+        <span>{{ item.name }}</span>
       </div>
     </div>
   </div>
@@ -55,6 +55,12 @@ const cardList = computed(() => {
     })
   })
 
+  newList.forEach((item) => {
+    // 判断item.name是否包含‘后台管理系统’，包含则在‘后’前加换行
+    if (item.name.includes('后台管理系统')) {
+      item.name = item.name.replace('后台管理系统', '\n后台管理系统')
+    }
+  })
   return newList
 })
 
@@ -122,10 +128,32 @@ function clickHandle(item: IObject) {
     align-items: center;
     justify-content: center;
     cursor: pointer;
+    min-width: 130px;
+    border-radius: 5px;
+    transition: all 0.5s ease;
 
     &>img {
       width: 100px;
       height: 100px;
+      transition: all 0.5s ease;
+    }
+
+    & > span {
+      height: 50px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      white-space: pre-line;
+      text-align: center;
+      padding: 0 10px;
+      box-sizing: border-box;
+    }
+
+    &:hover {
+      box-shadow: 0 0 50px rgba(0, 0, 0, 0.05);
+      & > img {
+        transform: scale(1.02)
+      }
     }
   }
 }

src/views/inventoryControl/newInventory/allocationManagement/index.vue

@@ -23,12 +23,13 @@
       <el-button type="primary" @click="addHandle">设备调拨</el-button>
     </div>
     <div class="table-list">
-      <el-table size="small" :data="tableData" @selection-change="selectionChangeHandle" :border="true" row-key="id" v-loading="tableLoding" show-overflow-tooltip>
-        <el-table-column label="序号" width="50" type="index" :index="indexMethod"/>
-        <el-table-column prop="applyNo" label="申请编号" width="200"></el-table-column>
-        <el-table-column prop="sendStoreCode" label="发货仓库" width="170"></el-table-column>
-        <el-table-column prop="receiveStoreCode" label="收货仓库" width="170"></el-table-column>
-        <el-table-column prop="brand" label="厂商" min-width="80">
+      <el-table size="small" :data="tableData" @selection-change="selectionChangeHandle" :border="true" row-key="id"
+                v-loading="tableLoding" show-overflow-tooltip>
+        <el-table-column align="center" header-align="center" label="序号" width="50" type="index" :index="indexMethod"/>
+        <el-table-column align="center" header-align="center" prop="applyNo" label="申请编号" width="200"></el-table-column>
+        <el-table-column align="center" header-align="center" prop="sendStoreCode" label="发货仓库" width="170"></el-table-column>
+        <el-table-column align="center" header-align="center" prop="receiveStoreCode" label="收货仓库" width="170"></el-table-column>
+        <el-table-column align="center" header-align="center" prop="brand" label="厂商" min-width="80">
           <template v-slot="scope">
             <span v-if="scope.row.inventoryType == 'CARD'">
               {{ getDictLabel(cardManufacturerList, scope.row.brand) }}
@@ -38,26 +39,26 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="inventoryType" label="设备类型" min-width="80">
+        <el-table-column align="center" header-align="center" prop="inventoryType" label="设备类型" min-width="80">
           <template v-slot="scope">
             <span>{{ getDictLabel(inventoryType, scope.row.inventoryType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="version" label="设备版本" min-width="80">
+        <el-table-column align="center" header-align="center" prop="version" label="设备版本" min-width="80">
           <template v-slot="scope">
             <span>{{ getDictLabel(modelList, scope.row.version) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="applyCount" label="备货数量" width="80"></el-table-column>
-        <el-table-column prop="applyStatus" label="状态" width="80">
+        <el-table-column align="center" header-align="center" prop="applyCount" label="备货数量" width="80"></el-table-column>
+        <el-table-column align="center" header-align="center" prop="applyStatus" label="状态" width="80">
           <template v-slot="scope">
             <el-tag :type="scope.row.applyStatus === 'CANCEL' ? 'danger' : scope.row.applyStatus === 'NEW'?'success':''">
               {{ getDictLabel(resultList, scope.row.applyStatus) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="applyTime" label="申请时间" width="170"></el-table-column>
-        <el-table-column label="操作" width="250" fixed="right">
+        <el-table-column align="center" header-align="center" prop="applyTime" label="申请时间" width="170"></el-table-column>
+        <el-table-column align="center" header-align="center" label="操作" :width="opWidth" fixed="right">
           <template v-slot="scope">
             <el-button size="small" type="success" class="op-btn" @click="editHandle(scope.row)" v-if=" (scope.row.applyStatus === 'NEW')">修改</el-button>
             <el-button size="small" type="danger" class="op-btn" @click="deleteHandleShow(scope.row)" v-if="(scope.row.applyStatus === 'NEW')">取消</el-button>
@@ -136,6 +137,7 @@ const cancelOrderForm = ref({
   cancelReason: ''
 })
 const addUpdateRef = ref()
+const opWidth = ref('250')
 const cancelOrderFormRef = ref()
 const state = reactive({
   tableData: [] as IObject[],
@@ -255,6 +257,12 @@ function getList() {
           tableData.value = data
           tableLoding.value = false
           paging.value.total = bizContent.totalCount
+          let isNew = data.some((item) => item.applyStatus === 'NEW')
+          if (isNew) {
+            opWidth.value='250'
+          }else {
+            opWidth.value='80'
+          }
         } else {
           tableLoding.value = false
           ElMessage.error(res.message)

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

@@ -696,6 +696,9 @@ const getEditFeeListData = (id, form) => {
           item.fee = item.fee / 100
         })
       }
+      if(data.passFee && data.passFee.chargeMethod){
+        customSelectorSelection(data.passFee.chargeMethod, 'passFee.chargeMethod')
+      }
       addMenu(feeListData.value)
       addMenu(releaseList.value)
       addMenu(data.afterSaleFees)
@@ -829,7 +832,7 @@ function getmerchantListTx() {
       merchantListTx.value = bizContent?.map((item) => {
         return {
           label: item.info,
-          value: item.id,
+          value: item.parentId,
           merchantId: item.mchId,
         }
       })

src/views/system/gateway/singInfo/singInfo.vue

@@ -108,7 +108,7 @@ const field = ref({
   field: [
     {
       prop: "appId",
-      label: "appId",
+      label: "AppId",
       isShow: {
         v2: true,
         v3: true,
@@ -196,7 +196,7 @@ const field = ref({
     },
     {
       prop: "subAppId",
-      label: "subAppId",
+      label: "子商户AppId",
       hide: true,
       isShow: {
         v2: true,
@@ -214,7 +214,6 @@ const field = ref({
     {
       prop: "subMchId",
       label: "子商户号",
-      hide: true,
       isShow: {
         v2: true,
         v3: true,
@@ -452,6 +451,7 @@ const submitAdd = (data: any) => {
 
 const request = (data: any, type: any) => {
   data.optType = type //操作类型 1新增 2修改
+  data.parentId=props.parentId
   BaseService.postN(itemStartValue.value == 1 ? '/userw/wxCar/add' : '/userw/wxCar/update', data).then((res: any) => {
     if (res && res.code === 0) {
       getSingInfoList()