huangbin 4 years ago
parent
commit
16b7e088f2

BIN
src/assets/images/tian_jing_mai_dun.png


+ 2 - 2
src/layout/components/header.vue

@@ -13,8 +13,8 @@
   </div>
   </div>
   <!-- 天津麦顿 -->
   <!-- 天津麦顿 -->
   <div v-else-if="isOemByEnum(OemType.tian_jing_mai_dun)">
   <div v-else-if="isOemByEnum(OemType.tian_jing_mai_dun)">
-    <img src="../../assets/images/headLogo.jpg" />
-    <span>云融</span>
+    <img src="../../assets/images/tian_jing_mai_dun.png" />
+    <span>天津麦顿</span>
   </div>
   </div>
 
 
   <!-- 千海金 -->
   <!-- 千海金 -->

+ 10 - 1
src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer/index.vue

@@ -14,6 +14,14 @@
       <template #totalturnover="{ text }">
       <template #totalturnover="{ text }">
         <span>{{ changeUnit(text) }}</span>
         <span>{{ changeUnit(text) }}</span>
       </template>
       </template>
+      <!-- 买量 -->
+      <template #bidvolume="{ text }">
+        <span>{{ handleNoneValue(text) }}</span>
+      </template>
+      <!-- 卖量 -->
+      <template #askvolume="{ text }">
+        <span>{{ handleNoneValue(text) }}</span>
+      </template>
       <!-- 涨跌 -->
       <!-- 涨跌 -->
       <template #change="{ record }">
       <template #change="{ record }">
         <span>{{ quoteChange(record, record.decimalplace) }}</span>
         <span>{{ quoteChange(record, record.decimalplace) }}</span>
@@ -68,7 +76,7 @@ import { contextMenu, defineAsyncComponent, defineComponent } from '@/common/exp
 
 
 import { handleDeliveryRelation } from '../setup';
 import { handleDeliveryRelation } from '../setup';
 
 
-import { handleSubcriteOnDemandQuote, handleQuotePriceColor, quoteChange, quoteAmplitude, quoteAmplituOfVibration } from '@/common/setup/table/tableQuote';
+import { handleSubcriteOnDemandQuote, handleQuotePriceColor, quoteChange, quoteAmplitude, quoteAmplituOfVibration, handleNoneValue } from '@/common/setup/table/tableQuote';
 import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 import { columnsList } from '../setup';
 import { columnsList } from '../setup';
 
 
@@ -118,6 +126,7 @@ export default defineComponent({
             findDeilverGoodsByGoodsCode,
             findDeilverGoodsByGoodsCode,
             goodsList,
             goodsList,
             loading,
             loading,
+            handleNoneValue,
         };
         };
     },
     },
 });
 });

+ 7 - 3
src/views/order/funding_information/components/funding_information_funding_summary/components/funding_information_funding_summary_withdraw/index.vue

@@ -22,7 +22,7 @@
             <a-col :span="24">
             <a-col :span="24">
               <a-form-item label="可提现金额"
               <a-form-item label="可提现金额"
                            name="price">
                            name="price">
-                <span class="white ml8"> {{selectedRow.currentbalance}} <span class="blue"
+                <span class="white ml8"> {{canUseMoney}} <span class="blue"
                         @click="chooseAll">全部</span></span>
                         @click="chooseAll">全部</span></span>
               </a-form-item>
               </a-form-item>
 
 
@@ -99,6 +99,10 @@ export default defineComponent({
             type: Object as PropType<Taaccount>,
             type: Object as PropType<Taaccount>,
             default: {},
             default: {},
         },
         },
+        canUseMoney: {
+            type: Number,
+            default: 0,
+        },
     },
     },
     setup(props, context) {
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const { visible, cancel } = _closeModal(context);
@@ -107,14 +111,14 @@ export default defineComponent({
         // 签约银行
         // 签约银行
         const { hasSignBank, getSignBank, getItemSignBankValue } = useSignBank();
         const { hasSignBank, getSignBank, getItemSignBankValue } = useSignBank();
         function chooseAll() {
         function chooseAll() {
-            formState.price = props.selectedRow.currentbalance;
+            formState.price = props.canUseMoney;
         }
         }
         function submit() {
         function submit() {
             if (!hasSignBank()) {
             if (!hasSignBank()) {
                 message.error('请先签约银行!');
                 message.error('请先签约银行!');
                 return;
                 return;
             }
             }
-            const max = props.selectedRow.currentbalance;
+            const max = props.canUseMoney;
             if (max) {
             if (max) {
                 if (formState.price > max) {
                 if (formState.price > max) {
                     message.error(`提现金额不能超过${max}`);
                     message.error(`提现金额不能超过${max}`);

+ 1 - 0
src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -45,6 +45,7 @@
     <component :is="componentId"
     <component :is="componentId"
                v-if="componentId"
                v-if="componentId"
                :selectedRow="selectedRow"
                :selectedRow="selectedRow"
+               :canUseMoney="canUseMoney(selectedRow)"
                @cancel="closeComponent"></component>
                @cancel="closeComponent"></component>
   </section>
   </section>
 </template>
 </template>