Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

.env.gstj

@@ -1,4 +1,5 @@
 VUE_APP_ENV = 'gstj'
 VUE_APP_TITLE = 甘肃碳交
 VUE_APP_ROOT = src/packages/gstj/
+VUE_APP_OEM = oem/gstj/
 VUE_APP_HOST = localhost

.env.sbyj

@@ -1,4 +1,5 @@
 VUE_APP_ENV = 'sbyj'
 VUE_APP_TITLE = 水贝亿爵
 VUE_APP_ROOT = src/packages/sbyj/
+VUE_APP_OEM = oem/sbyj/
 VUE_APP_HOST = localhost

oem/gstj/androidPrivacy.json

@@ -1,27 +1,27 @@
 {
-    "version" : "1",
-    "prompt" : "template",
-    "title" : "隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"html/yszc.htm\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-    "buttonAccept" : "同意并接受",
-    "buttonRefuse" : "拒绝",
-    "hrefLoader" : "system|default",
-    "second" : {
-        "title" : "确认提示",
-        "message" : "　　进入应用前，你需先同意<a href=\"html/yszc.htm\">《隐私政策》</a>，否则将退出应用。",
-        "buttonAccept" : "同意并继续",
-        "buttonRefuse" : "退出应用"
+    "version": "1",
+    "prompt": "template",
+    "title": "隐私政策",
+    "message": "　　请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"http://8.130.36.162:8070/demo_register/html/yszc.htm\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept": "同意并接受",
+    "buttonRefuse": "拒绝",
+    "hrefLoader": "system|default",
+    "second": {
+        "title": "确认提示",
+        "message": "　　进入应用前，你需先同意<a href=\"http://8.130.36.162:8070/demo_register/html/yszc.htm\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept": "同意并继续",
+        "buttonRefuse": "退出应用"
     },
-    "disagreeMode" : {
-        "support" : false,
-        "loadNativePlugins" : false,
-        "visitorEntry" : true,
-        "showAlways" : true
+    "disagreeMode": {
+        "support": false,
+        "loadNativePlugins": false,
+        "visitorEntry": true,
+        "showAlways": true
     },
-    "styles" : {
-        "borderRadius" : "5px",
-        "buttonAccept" : {
-            "color" : "#ee0a24"
+    "styles": {
+        "borderRadius": "5px",
+        "buttonAccept": {
+            "color": "#ee0a24"
         }
     }
-}
+}

src/hooks/echarts/candlestick/index.ts

@@ -107,6 +107,12 @@ export function useCandlestickChart(goodscode: string) {
             case ChartCycleType.Day: {
                 return milliseconds * 24 * 60;
             }
+            case ChartCycleType.Week: {
+                return milliseconds * 24 * 60 * 7;
+            }
+            case ChartCycleType.Month: {
+                return milliseconds * 24 * 60 * 30;
+            }
             default: {
                 return milliseconds;
             }

src/packages/gstj/components/modules/quote/price/index.vue

@@ -3,7 +3,7 @@
         <div class="app-quote-price__main" v-if="quote">
             <div class="block-left">
                 <div class="top-content">
-                    <span :class="quote.lastColor">{{ handleNumberValue(quote.last) }}</span>
+                    <span :class="quote.lastColor">{{ handleNumberValue(quote.last.toFixed(quote.decimalplace)) }}</span>
                 </div>
                 <div class="bottom-content">
                     <span :class="quote.lastColor">{{ quote.rise.toFixed(quote.decimalplace) }}</span>
@@ -14,27 +14,33 @@
                 <ul>
                     <li>
                         <span>开盘</span>
-                        <span>{{ handleNumberValue(quote.opened) }}</span>
+                        <span :class="quote.openedColor">
+                            {{ handleNumberValue(quote.opened.toFixed(quote.decimalplace)) }}
+                        </span>
                     </li>
                     <li>
                         <span>最高</span>
-                        <span :class="quote.highestColor">{{ handleNumberValue(quote.highest) }}</span>
+                        <span :class="quote.highestColor">
+                            {{ handleNumberValue(quote.highest.toFixed(quote.decimalplace)) }}
+                        </span>
                     </li>
                     <li>
                         <span>涨停</span>
-                        <span class="g-price-up">{{ handleNumberValue(quote.limitup) }}</span>
+                        <span class="g-price-up">{{ handleNumberValue(quote.limitup.toFixed(quote.decimalplace)) }}</span>
                     </li>
                     <li>
                         <span>昨结</span>
-                        <span>{{ handleNumberValue(quote.presettle) }}</span>
+                        <span>{{ handleNumberValue(quote.presettle.toFixed(quote.decimalplace)) }}</span>
                     </li>
                     <li>
                         <span>最低</span>
-                        <span :class="quote.lowestColor">{{ handleNumberValue(quote.lowest) }}</span>
+                        <span :class="quote.lowestColor">{{ handleNumberValue(quote.lowest.toFixed(quote.decimalplace))
+                        }}</span>
                     </li>
                     <li>
                         <span>跌停</span>
-                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown) }}</span>
+                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown.toFixed(quote.decimalplace))
+                        }}</span>
                     </li>
                 </ul>
             </div>
@@ -54,15 +60,16 @@
                 </li>
                 <li>
                     <span>买价</span>
-                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid) }}</span>
+                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>卖价</span>
-                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask) }}</span>
+                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>均价</span>
-                    <span>{{ handleNumberValue(quote.averageprice) }}</span>
+                    <span :class="quote.averagepriceColor">{{
+                        handleNumberValue(quote.averageprice.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>振幅</span>

src/packages/mobile/assets/themes/global/global.less

@@ -446,6 +446,65 @@
     }
 }
 
+.g-qty-group {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    &__stepper {
+        display: flex;
+        align-items: center;
+        gap: .1rem;
+        width: 100%;
+
+        .van-stepper {
+            flex: 1;
+            display: flex;
+
+            &__input {
+                flex: 1;
+            }
+        }
+    }
+
+    .van-radio-group {
+        display: flex;
+        flex-wrap: wrap;
+        width: 100%;
+        margin-top: .2rem;
+    }
+
+    .van-radio {
+        width: calc(~'100% / 3');
+        padding: .04rem;
+        margin-right: 0;
+
+        .van-radio__icon {
+            display: none;
+        }
+
+        &__label {
+            display: block;
+            width: 100%;
+            font-size: .24rem;
+            text-align: center;
+            color: #666;
+            border: 1px solid #e5e5e5;
+            border-radius: .08rem;
+            padding: .04rem;
+            margin-left: 0;
+        }
+
+        &[aria-checked="true"] {
+            .van-radio__label {
+                color: var(--van-radio-checked-icon-color);
+                border-color: var(--van-radio-checked-icon-color);
+            }
+        }
+    }
+}
+
 .van {
     &-dialog {
         &__message {

src/packages/mobile/router/index.ts

@@ -344,6 +344,17 @@ const routes: Array<RouteRecordRaw> = [
     ],
   },
   {
+    path: '/forward',
+    component: Page,
+    children: [
+      {
+        path: '',
+        name: 'forward-list',
+        component: () => import('../views/goods/list/Index.vue'),
+      },
+    ],
+  },
+  {
     path: '/mine',
     component: Page,
     children: [

src/packages/mobile/views/goods/detail/components/listing/Index.less

@@ -1,40 +0,0 @@
-.goods-listing {
-    &__stepper {
-        flex: 1;
-
-        .van-radio-group {
-            display: flex;
-            flex-wrap: wrap;
-            margin-top: .2rem;
-        }
-
-        .van-radio {
-            width: calc(~'100% / 3');
-            padding: .04rem;
-            margin-right: 0;
-
-            .van-radio__icon {
-                display: none;
-            }
-
-            &__label {
-                display: block;
-                width: 100%;
-                font-size: .24rem;
-                text-align: center;
-                color: #666;
-                border: 1px solid #e5e5e5;
-                border-radius: .08rem;
-                padding: .04rem;
-                margin-left: 0;
-            }
-
-            &[aria-checked="true"] {
-                .van-radio__label {
-                    color: var(--van-radio-checked-icon-color);
-                    border-color: var(--van-radio-checked-icon-color);
-                }
-            }
-        }
-    }
-}

src/packages/mobile/views/goods/detail/components/listing/Index.vue

@@ -16,9 +16,11 @@
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="数量">
                         <template #input>
-                            <div class="goods-listing__stepper">
-                                <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0" :step="qtyStep"
-                                    integer />
+                            <div class="g-qty-group">
+                                <div class="g-qty-group__stepper">
+                                    <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0"
+                                        :step="qtyStep" integer />
+                                </div>
                                 <RadioGroup v-model="qtyStep" direction="horizontal" @change="onRadioChange">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">{{ value }}
                                     </Radio>
@@ -186,8 +188,4 @@ onMounted(() => {
 defineExpose({
     closed,
 })
-</script>
-
-<style lang="less">
-@import './Index.less';
-</style>
+</script>

src/packages/mobile/views/home/main/Index.vue

@@ -13,20 +13,23 @@
           <li @click="routerTo('presale-list')">
             <Iconfont label-direction="bottom" icon="icon-yushoujingpai">预售竞拍</Iconfont>
           </li>
-          <li @click="switchTab(1)">
-            <Iconfont label-direction="bottom" icon="icon-zhongqian">预售中签</Iconfont>
+          <li @click="routerTo('forward-list')">
+            <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">中远期挂牌</Iconfont>
           </li>
-          <li @click="switchTab(2)">
+          <!-- <li @click="switchTab(1)">
+            <Iconfont label-direction="bottom" icon="icon-zhongqian">预售中签</Iconfont>
+          </li> -->
+          <!-- <li @click="switchTab(2)">
             <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">定金转让</Iconfont>
-          </li>
+          </li> -->
           <li @click="routerTo('swap-list')">
             <Iconfont label-direction="bottom" icon="icon-diaoqimaoyi">掉期贸易</Iconfont>
           </li>
         </ul>
         <ul>
-          <li @click="switchTab(3)">
+          <!-- <li @click="switchTab(3)">
             <Iconfont label-direction="bottom" icon="icon-a-zu771">订单挂牌</Iconfont>
-          </li>
+          </li> -->
           <li @click="routerTo('pricing-list')">
             <Iconfont label-direction="bottom" icon="icon-guapaidianjia">挂牌点价</Iconfont>
           </li>

src/packages/mobile/views/home/main/index.less

@@ -20,7 +20,7 @@
                 display: flex;
                 flex-direction: column;
                 align-items: center;
-                width: calc(~'100% / 4');
+                width: calc(~'100% / 3');
                 text-align: center;
 
                 .app-iconfont {

src/packages/mobile/views/market/list/Index.vue

@@ -42,7 +42,7 @@
 
 <script lang="ts" setup>
 import { onMounted, onUnmounted, computed } from 'vue'
-import { parsePercent, handleNumberValue } from '@/filters'
+import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
 import { useNavigation } from '../../../router/navigation'
 import { useFuturesStore } from '@/stores'
 import quoteSocket from '@/services/websocket/quote'
@@ -61,15 +61,15 @@ const dataList = computed(() => {
         openedColor: e.openedColor,
         lowestColor: e.lowestColor,
         highestColor: e.highestColor,
-        ask: handleNumberValue(e.ask),
-        bid: handleNumberValue(e.bid),
-        last: handleNumberValue(e.last),
-        rise: handleNumberValue(e.rise.toFixed(e.decimalplace)),
+        ask: handleNumberValue(formatDecimal(e.ask, e.decimalplace)),
+        bid: handleNumberValue(formatDecimal(e.bid, e.decimalplace)),
+        last: handleNumberValue(formatDecimal(e.last, e.decimalplace)),
+        rise: handleNumberValue(formatDecimal(e.rise, e.decimalplace)),
         change: parsePercent(e.change),
-        opened: handleNumberValue(e.opened),
-        presettle: handleNumberValue(e.presettle),
-        lowest: handleNumberValue(e.lowest),
-        highest: handleNumberValue(e.highest),
+        opened: handleNumberValue(formatDecimal(e.opened, e.decimalplace)),
+        presettle: handleNumberValue(formatDecimal(e.presettle, e.decimalplace)),
+        lowest: handleNumberValue(formatDecimal(e.lowest, e.decimalplace)),
+        highest: handleNumberValue(formatDecimal(e.highest, e.decimalplace)),
         amplitude: parsePercent(e.amplitude),
     }))
 })

src/packages/mobile/views/transfer/listing/Index.vue

@@ -17,9 +17,11 @@
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="数量">
                         <template #input>
-                            <div class="goods-listing__stepper">
-                                <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0" :step="qtyStep"
-                                    integer />
+                            <div class="g-qty-group">
+                                <div class="g-qty-group__stepper">
+                                    <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0"
+                                        :step="qtyStep" integer />
+                                </div>
                                 <RadioGroup v-model="qtyStep" direction="horizontal" @change="onRadioChange">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">{{ value }}
                                     </Radio>

src/packages/qxst/components/modules/quote/price/index.vue

@@ -3,7 +3,7 @@
         <div class="app-quote-price__main" v-if="quote">
             <div class="block-left">
                 <div class="top-content">
-                    <span :class="quote.lastColor">{{ handleNumberValue(quote.last) }}</span>
+                    <span :class="quote.lastColor">{{ handleNumberValue(quote.last.toFixed(quote.decimalplace)) }}</span>
                 </div>
                 <div class="bottom-content">
                     <span :class="quote.lastColor">{{ quote.rise.toFixed(quote.decimalplace) }}</span>
@@ -14,27 +14,33 @@
                 <ul>
                     <li>
                         <span>开盘</span>
-                        <span :class="quote.openedColor">{{ handleNumberValue(quote.opened) }}</span>
+                        <span :class="quote.openedColor">
+                            {{ handleNumberValue(quote.opened.toFixed(quote.decimalplace)) }}
+                        </span>
                     </li>
                     <li>
                         <span>最高</span>
-                        <span :class="quote.highestColor">{{ handleNumberValue(quote.highest) }}</span>
+                        <span :class="quote.highestColor">
+                            {{ handleNumberValue(quote.highest.toFixed(quote.decimalplace)) }}
+                        </span>
                     </li>
                     <li>
                         <span>涨停</span>
-                        <span class="g-price-up">{{ handleNumberValue(quote.limitup) }}</span>
+                        <span class="g-price-up">{{ handleNumberValue(quote.limitup.toFixed(quote.decimalplace)) }}</span>
                     </li>
                     <li>
                         <span>昨结</span>
-                        <span>{{ handleNumberValue(quote.presettle) }}</span>
+                        <span>{{ handleNumberValue(quote.presettle.toFixed(quote.decimalplace)) }}</span>
                     </li>
                     <li>
                         <span>最低</span>
-                        <span :class="quote.lowestColor">{{ handleNumberValue(quote.lowest) }}</span>
+                        <span :class="quote.lowestColor">{{ handleNumberValue(quote.lowest.toFixed(quote.decimalplace))
+                        }}</span>
                     </li>
                     <li>
                         <span>跌停</span>
-                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown) }}</span>
+                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown.toFixed(quote.decimalplace))
+                        }}</span>
                     </li>
                 </ul>
             </div>
@@ -54,15 +60,16 @@
                 </li>
                 <li>
                     <span>买价</span>
-                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid) }}</span>
+                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>卖价</span>
-                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask) }}</span>
+                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>均价</span>
-                    <span :class="quote.averagepriceColor">{{ handleNumberValue(quote.averageprice) }}</span>
+                    <span :class="quote.averagepriceColor">{{
+                        handleNumberValue(quote.averageprice.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>振幅</span>

src/packages/sbyj/components/modules/quote/price/index.vue

@@ -3,7 +3,7 @@
         <div class="app-quote-price__main" v-if="quote">
             <div class="block-left">
                 <div class="top-content">
-                    <span :class="quote.lastColor">{{ handleNumberValue(quote.last) }}</span>
+                    <span :class="quote.lastColor">{{ handleNumberValue(quote.last.toFixed(quote.decimalplace)) }}</span>
                 </div>
                 <div class="bottom-content">
                     <span :class="quote.lastColor">{{ quote.rise.toFixed(quote.decimalplace) }}</span>
@@ -14,27 +14,33 @@
                 <ul>
                     <li>
                         <span>开盘</span>
-                        <span>{{ handleNumberValue(quote.opened) }}</span>
+                        <span :class="quote.openedColor">
+                            {{ handleNumberValue(quote.opened.toFixed(quote.decimalplace)) }}
+                        </span>
                     </li>
                     <li>
                         <span>最高</span>
-                        <span :class="quote.highestColor">{{ handleNumberValue(quote.highest) }}</span>
+                        <span :class="quote.highestColor">
+                            {{ handleNumberValue(quote.highest.toFixed(quote.decimalplace)) }}
+                        </span>
                     </li>
                     <li>
                         <span>涨停</span>
-                        <span class="g-price-up">{{ handleNumberValue(quote.limitup) }}</span>
+                        <span class="g-price-up">{{ handleNumberValue(quote.limitup.toFixed(quote.decimalplace)) }}</span>
                     </li>
                     <li>
                         <span>昨结</span>
-                        <span>{{ handleNumberValue(quote.presettle) }}</span>
+                        <span>{{ handleNumberValue(quote.presettle.toFixed(quote.decimalplace)) }}</span>
                     </li>
                     <li>
                         <span>最低</span>
-                        <span :class="quote.lowestColor">{{ handleNumberValue(quote.lowest) }}</span>
+                        <span :class="quote.lowestColor">{{ handleNumberValue(quote.lowest.toFixed(quote.decimalplace))
+                        }}</span>
                     </li>
                     <li>
                         <span>跌停</span>
-                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown) }}</span>
+                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown.toFixed(quote.decimalplace))
+                        }}</span>
                     </li>
                 </ul>
             </div>
@@ -54,15 +60,16 @@
                 </li>
                 <li>
                     <span>买价</span>
-                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid) }}</span>
+                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>卖价</span>
-                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask) }}</span>
+                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>均价</span>
-                    <span>{{ handleNumberValue(quote.averageprice) }}</span>
+                    <span :class="quote.averagepriceColor">{{
+                        handleNumberValue(quote.averageprice.toFixed(quote.decimalplace)) }}</span>
                 </li>
                 <li>
                     <span>振幅</span>

src/packages/sbyj/views/delivery/components/processing/components/pay/index.vue

@@ -28,13 +28,7 @@
                 </Field>
                 <Field name="PayAmount" :rules="formRules.PayAmount">
                     <template #input>
-                        <div class="goods-listing__stepper">
-                            <div>
-                                <span>
-                                    <Stepper v-model="formData.PayAmount" theme="round" button-size="22" :min="0" />
-                                </span>
-                            </div>
-                        </div>
+                        <Stepper v-model="formData.PayAmount" theme="round" button-size="22" :min="0" />
                     </template>
                 </Field>
                 <Field label="上传凭证" v-if="formData.DeliveryPayMode === 2" :rules="formRules.headurl">