huangbin 4 vuotta sitten
vanhempi
commit
f6b56fc9ef

+ 1 - 1
src/services/go/wrtrade/interface.ts

@@ -475,7 +475,7 @@ export interface WrFAProductDetail {
     financingdays: number;//天数(天)
     interestminlen: number;//最小起息天数
     interestrate: number;//利率
-    interestratemode: number;//利率方式 - 1:年利率 2:日利率
+    interestratemode: number;//利率方式 - 1:年利率 2:日利率, 3: 固定值
     interestsettlemode: number;//结息方式 - 1:按日结息 3:按月结息
     interestsettlevalue: number;//结息方式值
     isautoloan: number;//是否自动放款 number;

+ 49 - 51
src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/components/choose-finance/index.vue

@@ -1,56 +1,54 @@
 <template>
-    <!-- 仓单贸易&仓单预售 融资-->
+  <!-- 仓单贸易&仓单预售 融资-->
 
-    <Drawer
-        :title="'选择融资方案'"
-        :placement="'right'"
-        :visible="visible"
-        width="486px"
-        height="580px"
-        @cancel="update"
-        class="topHigh financing"
-    >
-        <div class="financingCont">
-            <a-row class="f-t">
-                <a-col :span="7">融出方/名称</a-col>
-                <a-col :span="10">天数/保证金/利息</a-col>
-                <a-col :span="7">结息/起息天数</a-col>
-            </a-row>
-            <div
-                class="contBar"
-                v-for="(item, index) in list"
-                :key="index + 11"
-                @click="choose(item)"
-            >
-                <a-row class="firstRow">
-                    <a-col :span="7">{{item.productname}}</a-col>
-                    <a-col :span="17" v-if="item.isautoloan">放款快</a-col>
-                </a-row>
-                <a-row class="secondRow">
-                    <a-col :span="7">{{item.username}}</a-col>
-                    <a-col :span="10">
-                        <a-row class="middle">
-                            <a-col :span="7">{{item.financingdays}}天</a-col>
-                            <a-col :span="10">{{item.marginratio * 100}}%</a-col>
-                            <a-col :span="7">
-                                <!-- <div class="two">{{item.interestrate * 100}}%</div>
+  <Drawer :title="'选择融资方案'"
+          :placement="'right'"
+          :visible="visible"
+          width="486px"
+          height="580px"
+          @cancel="update"
+          class="topHigh financing">
+    <div class="financingCont">
+      <a-row class="f-t">
+        <a-col :span="7">融出方/名称</a-col>
+        <a-col :span="10">天数/保证金/利息</a-col>
+        <a-col :span="7">结息/起息天数</a-col>
+      </a-row>
+      <div class="contBar"
+           v-for="(item, index) in list"
+           :key="index + 11"
+           @click="choose(item)">
+        <a-row class="firstRow">
+          <a-col :span="7">{{item.productname}}</a-col>
+          <a-col :span="17"
+                 v-if="item.isautoloan">放款快</a-col>
+        </a-row>
+        <a-row class="secondRow">
+          <a-col :span="7">{{item.username}}</a-col>
+          <a-col :span="10">
+            <a-row class="middle">
+              <a-col :span="7">{{item.financingdays}}天</a-col>
+              <a-col :span="10">{{item.marginratio * 100}}%</a-col>
+              <a-col :span="7">
+                <!-- <div class="two">{{item.interestrate * 100}}%</div>
                                 <div class="two">{{item.interestrate * 100}}%</div>-->
-                                {{item.interestrate * 100}}%
-                            </a-col>
-                        </a-row>
-                    </a-col>
-                    <a-col :span="7">
-                        <div class="settle">
-                            <div>{{item.interestsettlemode === 1 ? '日' : '月'}}结</div>
-                            <div>{{item.interestminlen}}天起息</div>
-                        </div>
-                    </a-col>
-                </a-row>
-            </div>
-            <div class="noDataContBar" v-if="!list.length">
-                <div class="noData"></div>
+                {{item.interestratemode === 3 ? item.interestrate : item.interestrate * 10000}}%
+              </a-col>
+            </a-row>
+          </a-col>
+          <a-col :span="7">
+            <div class="settle">
+              <div>{{item.interestsettlemode === 1 ? '日' : '月'}}结</div>
+              <div>{{item.interestminlen}}天起息</div>
             </div>
-            <!-- <div class="contBar">
+          </a-col>
+        </a-row>
+      </div>
+      <div class="noDataContBar"
+           v-if="!list.length">
+        <div class="noData"></div>
+      </div>
+      <!-- <div class="contBar">
         <a-row class="firstRow">
           <a-col :span="7">铜供应链金融</a-col>
           <a-col :span="17">放款快</a-col>
@@ -94,8 +92,8 @@
           </a-col>
         </a-row>
             </div>-->
-        </div>
-    </Drawer>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">

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

@@ -188,7 +188,7 @@ export default defineComponent({
             show.value = !show.value;
         }
         function choose(item: WrFAProductDetail) {
-            formState.case = `${item.productname}-${item.username}-${item.financingdays}天-${item.marginratio * 100}%-${item.interestrate * 100}%-${item.interestsettlemode === 1 ? '按日结息' : '按月结息'}-${item.interestminlen}天起息`;
+            formState.case = `${item.productname}-${item.username}-${item.financingdays}天-${item.marginratio * 100}%-${item.interestratemode === 3 ? item.interestrate : item.interestrate * 10000}%-${item.interestsettlemode === 1 ? '按日结息' : '按月结息'}-${item.interestminlen}天起息`;
         }
         function submit() {
             // validateAction<ListingForm>(formRef, formState).then((res) => {