修改订单详情的加价先洗

src/views/recycleOrder/detail/order-book-list.vue

@@ -97,13 +97,17 @@
                         >
                     </div>
                     <div class="common-text flex">
-                        <el-text>预估金额：</el-text>
-                        <el-text>¥ {{ row.recyclePrice * row.num }}</el-text>
+                        <el-text>回收单价：</el-text>
+                        <el-text>¥ {{ row.recyclePrice }}</el-text>
                         <el-text
-                            v-if="row.upsellExpectMoney"
-                            style="color: #f56c6c; font-weight: 500;margin-left: 2px;"
+                            v-if="row.isupSell"
+                            style="
+                                color: #f56c6c;
+                                font-weight: 500;
+                                margin-left: 2px;
+                            "
                         >
-                            +{{ row.upsellExpectMoney }}</el-text
+                            +{{ row.upsellPrice }}</el-text
                         >
                     </div>
                     <div class="common-text flex">
@@ -251,11 +255,13 @@
                     ...audit,
                     _index: i,
                     _groupIndex: currentIndex,
-                    _isFirstRow: i === 0
+                    _isFirstRow: i === 0,
+                    isupSell: item.upsellNum > i
                 });
             }
             currentIndex++;
         });
+        console.log(result, 'result');
         return result;
     };
 
@@ -474,7 +480,9 @@
             align: 'center',
             minWidth: 100,
             formatter: (row) => {
-                return row.sts == 1 ? `¥ ${row.recyclePrice}` : '0';
+                return row.sts == 1
+                    ? `¥ ${(row.recyclePrice + (row.isupSell ? row.upsellPrice : 0)).toFixed(2)}`
+                    : '0';
             }
         }
     ]);

src/views/riskControl/restrictLog/index.vue

@@ -22,7 +22,7 @@
           <el-button
             type="primary"
             link
-            v-permission="'user:userRequestLimit:disarm'"
+            v-permission="'riskControl:restrictLog:disarm'"
             @click="handleDisarm(row)"
           >
             [解禁]