Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/market/spot_trade/components/buy-sell-market/components/delisting/index.vue

@@ -201,7 +201,6 @@ export default defineComponent({
                     DeliveryMonth: '', // string 交收月
                     HasWr: isSale() ? 0 : 1, // uint32 是否有仓单-0:没有仓单 1:有仓单
                 };
-
                 // 摘买方向
                 if (isBuy()) {
                     param.BuyOrSell = 1;

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -20,20 +20,32 @@
         <div class="name">{{selectedRow.warehousename}}</div>
       </div>
       <div class="green">
-        <div class="numBlock">
+        <div class="numBlock"
+             v-if="isFloatPrice()">
           <div class="first">卖基差</div>
           <div class="last">{{selectedRow.sellpricemove}}</div>
         </div>
+        <div class="numBlock"
+             v-else>
+          <div class="first">卖价</div>
+          <div class="last">{{selectedRow.sellprice}}</div>
+        </div>
         <div class="numBlock">
           <div class="first">卖量</div>
           <div class="last">{{selectedRow.sellqty}}</div>
         </div>
       </div>
       <div class="red ml35">
-        <div class="numBlock">
+        <div class="numBlock"
+             v-if="isFloatPrice()">
           <div class="first">买基差</div>
           <div class="last">{{selectedRow.buypricemove}}</div>
         </div>
+        <div class="numBlock"
+             v-else>
+          <div class="first">买价</div>
+          <div class="last">{{selectedRow.buyprice}}</div>
+        </div>
         <div class="numBlock">
           <div class="first">买量</div>
           <div class="last">{{selectedRow.buyqty}}</div>
@@ -45,7 +57,7 @@
         <div class="last red">{{getGoodsPrice()}}</div>
         <LineChartOutlined />
       </div>
-      <BtnList :btnList="firstBtn"
+      <BtnList :btnList="temp(firstBtn)"
                :record="selectedRow"
                @click="openComponent" />
     </div>
@@ -154,6 +166,11 @@ export default defineComponent({
         );
         // 单据挂牌成功 通知买大厅刷新数据
         Bus.$on('spotTrade', loadSellData);
+
+        function temp(list: any[]) {
+            return list.filter((e) => e.code !== 'spot_trade_warehouse_detail');
+        }
+
         return {
             buyRef,
             sellRef,
@@ -168,6 +185,7 @@ export default defineComponent({
             closeComponent,
             openComponent,
             enumName: props.enumName,
+            temp,
         };
     },
 });