li.shaoyi 4 роки тому
батько
коміт
3bc3b3b1b3

+ 1 - 1
src/assets/styles/mixin.less

@@ -3331,7 +3331,7 @@ input:-internal-autofill-selected {
 
 // 左侧菜单
 .ant-menu-dark .ant-menu-inline.ant-menu-sub {
-    background: @m-black28;
+    background: #14181b;
     box-shadow: none;
 }
 

+ 2 - 1
src/views/account/login.vue

@@ -220,9 +220,9 @@ export default defineComponent({
 .ant-col {
     width: 690px;
     height: 450px;
-    background: @m-white0;
     border-radius: 5px;
     box-shadow: 0px 5px 10px 0px rgba(18, 22, 24, 0.18);
+    overflow: hidden;
     .flex();
 }
 
@@ -267,6 +267,7 @@ export default defineComponent({
     padding-left: 53px;
     padding-right: 53px;
     min-width: 405px;
+    background: @m-white0;
     ::v-deep(.ant-form) {
         margin-top: 20px;
         .ant-form-item-control-wrapper {

+ 4 - 0
src/views/information/custom/index.vue

@@ -21,6 +21,10 @@
       <template #userinfotype="{ text }">
         <a>{{ getUserInfoTypeName(text) }}</a>
       </template>
+      <!-- 客户简称 -->
+      <template #nickname="{ record }">
+        {{ record.userinfotype === 1 ? record.customername : record.nickname }}
+      </template>
       <template #attachment1="{ text, record }">
         <a>{{ text }}</a><a>{{ record.attachment2 }}</a>
       </template>

+ 3 - 3
src/views/information/spot-contract/components/add/index.vue

@@ -99,7 +99,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="商品" name="WrStandardID">
-              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
+              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="wrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
                 <a-select-option v-for="item in wrstandardList" :key="item.wrstandardid" :value="item.wrstandardid">
                   {{ item.wrstandardname }}
                 </a-select-option>
@@ -292,7 +292,7 @@ export default defineComponent({
     const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
 
     //  处理现货商品
-    const { deliveryGoodsList, barandList, wrstandardList, goodsList, numberUnit, WrStandardChange, deliveryGoodsChange } = handleDeliveryGoods(formState);
+    const { deliveryGoodsList, barandList, wrstandardList, goodsList, numberUnit, wrStandardChange, deliveryGoodsChange } = handleDeliveryGoods(formState);
     // 价格信息
     const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
     // 日期
@@ -378,7 +378,7 @@ export default defineComponent({
       wrstandardList,
       goodsList,
       deliveryGoodsChange,
-      WrStandardChange,
+      wrStandardChange,
       priceType,
       payCurrency,
       payCurrencyUnit,

+ 4 - 4
src/views/information/spot-contract/components/modify/index.vue

@@ -95,7 +95,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="商品" name="WrStandardID">
-              <a-select class="inlineFormSelect" style="width: 200px" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
+              <a-select class="inlineFormSelect" style="width: 200px" @change="wrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
                 <a-select-option v-for="item in wrstandardList" :key="item.wrstandardid" :value="item.wrstandardid">
                   {{ item.wrstandardname }}
                 </a-select-option>
@@ -288,7 +288,7 @@ export default defineComponent({
     const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
 
     //  处理现货商品
-    const { deliveryGoodsList, barandList, wrstandardList, goodsList, numberUnit, WrStandardChange, deliveryGoodsChange } = handleDeliveryGoods(formState);
+    const { deliveryGoodsList, barandList, wrstandardList, goodsList, numberUnit, wrStandardChange, deliveryGoodsChange } = handleDeliveryGoods(formState);
     // 价格信息
     const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
     // 日期
@@ -329,7 +329,7 @@ export default defineComponent({
         formState.ConvertFactor = convertfactor;
       });
       if (wrstandardid) {
-        WrStandardChange(wrstandardid);
+        wrStandardChange(wrstandardid);
       }
     }
     formState.Qty = qty.toString();
@@ -411,7 +411,7 @@ export default defineComponent({
       wrstandardList,
       goodsList,
       deliveryGoodsChange,
-      WrStandardChange,
+      wrStandardChange,
       priceType,
       payCurrency,
       payCurrencyUnit,

+ 2 - 2
src/views/information/spot-contract/components/setup.ts

@@ -279,7 +279,7 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
     const numberUnit = ref<string>('')
 
     // 选择现货商品
-    async function WrStandardChange(value: number) {
+    async function wrStandardChange(value: number) {
         await request;
         const wrstandard = wrstandardList.value.find((e) => e.wrstandardid === value);
         if (wrstandard) {
@@ -302,7 +302,7 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
         wrstandardList,
         goodsList,
         numberUnit,
-        WrStandardChange,
+        wrStandardChange,
         deliveryGoodsChange
     }
 }

+ 38 - 12
src/views/market/futures/compoments/futures-trade/index.less

@@ -45,31 +45,57 @@
             justify-content: center;
             flex-direction : column;
             align-items    : center;
-            width          : 96px;
-            height         : 72px;
-            color          : #fff;
-            border         : 0;
-            border-radius  : 4px;
-
-            &[disabled] {
-                color: #fff !important;
-            }
+            width          : 80px;
+            height         : 64px;
+            border-radius  : 5px;
+            padding        : 0 5px;
 
             &:not(:last-child) {
                 margin-right: 10px;
             }
+
+            span {
+                flex           : 1;
+                display        : flex;
+                justify-content: center;
+                align-items    : center;
+                width          : 100%;
+                font-weight    : bold;
+
+                &:first-child {
+                    font-size: 16px;
+                }
+
+                &:last-child {
+                    font-size: 20px;
+                }
+            }
         }
 
         .buy {
-            background-color: red !important;
+            color           : #FF4848 !important;
+            border          : 1px solid #FF4848 !important;
+            background-color: #2F1B1C !important;
+
+            span:first-child {
+                border-bottom: 1px dashed #5E1616;
+            }
         }
 
         .sell {
-            background-color: green !important;
+            color           : #1DDFAF !important;
+            border          : 1px solid #1DDFAF !important;
+            background-color: #20322A !important;
+
+            span:first-child {
+                border-bottom: 1px dashed #095936;
+            }
         }
 
         .close {
-            background-color: blue !important;
+            color           : #FFA235 !important;
+            border          : 1px solid #FFA235 !important;
+            background-color: #3D3325 !important;
         }
     }