xxxxx

oem/tss/locales/extras/en-US.json

@@ -202,6 +202,11 @@
             "orderBuyOrSell": "Default"
         }
     },
+    "user": {
+        "cancel": {
+            "tips_2": "1. The account has been settled"
+        }
+    },
     "pcroute": {
         "bottom": {
             "bottom_goods_position_transfer": "Reservation",

oem/tss/locales/extras/th-TH.json

@@ -202,6 +202,11 @@
             "orderBuyOrSell": "ค่าเริ่มต้น"
         }
     },
+    "user": {
+        "cancel": {
+            "tips_2": "1. บัญชีถูกถอนออกไปแล้ว"
+        }
+    },
     "pcroute": {
         "bottom": {
             "bottom_goods_position_transfer": "ยกเลิกการจอง",

oem/tss/locales/extras/zh-CN.json

@@ -202,6 +202,11 @@
             "orderBuyOrSell": "默认"
         }
     },
+    "user": {
+        "cancel": {
+            "tips_2": "1. 账户货款已结清"
+        }
+    },
     "pcroute": {
         "bottom": {
             "bottom_goods_position_transfer": "退订",

oem/tss/locales/extras/zh-TW.json

@@ -202,6 +202,11 @@
             "orderBuyOrSell": "默認"
         }
     },
+    "user": {
+        "cancel": {
+            "tips_2": "1. 賬戶貨款已結清"
+        }
+    },
     "pcroute": {
         "bottom": {
             "bottom_goods_position_transfer": "退訂",

public/locales/zh-CN.json

@@ -1403,7 +1403,7 @@
             "getsmscode": "获取验证码",
             "freeregister": "免费注册",
             "logipwd": "登录密码",
-            "confirmpwd": "確認密碼",
+            "confirmpwd": "确认密码",
             "registercode": "注册编码",
             "checked": "我已阅读并同意",
             "ruleszcxy": "《用户注册协议》",

src/packages/mobile/views/pricing/trade/v2/Index.vue

@@ -72,7 +72,7 @@
                             :auto-fixed="false" :decimal-length="decimalplace" :step="decimalvalue" />
                     </template>
                 </Field>
-                <Field name="Receive" :label="$t('performance.address')" type="textarea" autosize
+                <Field v-if="quote?.trademode != 10" name="Receive" :label="$t('performance.address')" type="textarea" autosize
                         v-model="formData.AddrInfo" :rules="formRules.AddrInfo" :placeholder="$t('performance.pleaseentertheaddress')" right-icon="add-o"
                         @click-right-icon="showContact = true" />
             </CellGroup>

src/packages/tss/views/bank/wallet/components/inoutapply/Index.vue

@@ -37,6 +37,9 @@
                                 </li>
                             </ul>
                         </div>
+                        <div class="g-order-list__btnbar" v-if="item.applystatus === 10">
+                            <Button size="small" @click="goToAmtInByPaidUrl(item)" round>去支付</Button>
+                        </div>
                     </div>
                 </div>
             </app-pull-refresh>
@@ -46,12 +49,14 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { Button, showToast } from 'vant'
 import { useRequest } from '@/hooks/request'
-import { queryAccountInOutApply } from '@/services/api/bank'
+import { queryAccountInOutApply, getAmtInByPaidUrl } from '@/services/api/bank'
 import { getInOutApplyStatusName, getInOutExecuteTypeName } from '@/constants/order'
+import { formatDecimal, handleNoneValue, formatDate } from '@/filters'
 import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
-import { formatDecimal, handleNoneValue, formatDate } from '@/filters'
+import plus from '@/utils/h5plus'
 
 const showModal = shallowRef(true)
 const error = shallowRef(false)
@@ -70,6 +75,34 @@ const closed = (isRefresh = false) => {
     showModal.value = false
 }
 
+const goToAmtInByPaidUrl = (item: Model.AccountOutInApplyRsp) => {
+    console.log(item)
+    getAmtInByPaidUrl({
+        data: {
+            exchticket: item.exchticket
+        }
+    }).then((res) => {
+        openWebview(res.data)
+    })
+}
+
+
+const openWebview = (url: string) => {
+    const ua = window.navigator.userAgent.toLowerCase()
+    if (ua.indexOf('micromessenger') !== -1) {
+        showToast({
+            type: 'fail',
+            message: '请使用浏览器打开此页面'
+        })
+    } else {
+        plus.openWebview({
+            url,
+            titleText: '实名认证',
+            onClose: () => run()
+        })
+    }
+}
+
 // 暴露组件属性给父组件调用
 defineExpose({
     closed,

src/packages/tss/views/product/list/components/waterfall-list/index.vue

@@ -3,13 +3,13 @@
         <template #default="{ item }">
             <div class="goods" @click="rowClick(item)">
                 <div class="goods-image">
-                    <img :src="getFileUrl(item.pictureurl)" v-if="item.pictureurl" />
+                    <img :src="getFileUrl(item.thumurls)" v-if="item.thumurls" />
                     <Image width="100%" height="160px" v-else />
                 </div>
                 <div class="goods-info">
                     <div class="goods-info__title">{{ item.goodscode }}</div>
                     <div class="goods-info__price">
-                        <span :class="['integer', item.askColor]">{{ item.ask }}</span>
+                        <span :class="['integer', item.askColor]">{{ handleNumberValue(item.ask) }}</span>
                     </div>
                 </div>
             </div>
@@ -20,7 +20,7 @@
 <script lang="ts" setup>
 import { PropType } from 'vue'
 import { Image } from 'vant'
-import { getFileUrl } from '@/filters'
+import { getFileUrl, handleNumberValue } from '@/filters'
 import { useNavigation } from '@mobile/router/navigation'
 import { BuyOrSell, BuildType } from '@/constants/order'
 import Waterfall from '@mobile/components/base/waterfall/index.vue'

src/services/api/bank/index.ts

@@ -162,6 +162,19 @@ export function queryAccountInOutApply(config: RequestConfig<Model.AccountInOutA
 }
 
 /**
+ * 获取银行支付地址
+ */
+export function getAmtInByPaidUrl(config: RequestConfig<Model.AmtInByPaidUrlReq> = {}) {
+    return http.commonRequest<Model.AmtInByPaidUrlRsp>({
+        url: '/Bank/GetAmtInByPaidUrl',
+        params: {
+            accountid: accountStore.currentAccountId,
+            ...config.data
+        },
+    })
+}
+
+/**
  * 资金流水查询（历史）
  */
 export function queryHisAmountLog(config: RequestConfig<Model.HisAmountLogReq> = {}) {

src/stores/modules/futures.ts

@@ -318,6 +318,7 @@ export const useFuturesStore = defineStore(() => {
             highestColor: '',
             lowestColor: '',
             pictureurl: '',
+            thumurls: '',
             traderules: []
         }
 
@@ -356,7 +357,8 @@ export const useFuturesStore = defineStore(() => {
                     goodstradetype: item.goodstradetype,
                     currencyid: item.currencyid,
                     pictureurl: item.pictureurl,
-                    traderules: item.traderules
+                    traderules: item.traderules,
+                    thumurls: item.thumurls
                 } = goods)
 
                 item.iscannotbuy = goods.iscannotbuy ?? 0

src/types/model/bank.d.ts

@@ -94,6 +94,17 @@ declare namespace Model {
         updatetime: string;//更新时间(签解约更新时间)
     }
 
+    /** 获取银行支付地址 请求 */
+    interface AmtInByPaidUrlReq {
+        accountid?: number;   // 资金账户
+        exchticket?: string;  // 银行服务流水号
+    }
+
+    /** 获取银行支付地址 回应 */
+    interface AmtInByPaidUrlRsp {
+        data: string;
+    }
+
     /** 查询充值出金 请求 */
     interface AccountInOutApplyReq {
         userid?: number;  // 用户ID

src/types/model/goods.d.ts

@@ -67,6 +67,7 @@ declare namespace Model {
         quoteshowtypeinterval: number; // 行情报价间隔时间(秒)(成交价时为0)
         relatedgoodsid: number; // 关联参考商品ID
         remark: string; // 备注
+        thumurls: string; // 缩略图片(1:1)(逗号分隔)
         trademode: number; // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
         tradeproperty: number; // 交易属性 - 1:收益权(可做空) 2:所有权(不可做空) 3:期权 4:现货 5:参考行情 6:通道交易 7:币交易 8:场外期权
         traderules: Proto.TradeRuleInfoStruct['TradeRules'] // 交易规则

src/types/model/market.d.ts

@@ -145,6 +145,7 @@ declare namespace Model {
         goodstradetype: number;//商品交易权限类型 - 1:可建可平 3:不可建可平
         currencyid: number;//报价货币ID
         traderules: Proto.TradeRuleInfoStruct['TradeRules'] // 交易规则
+        thumurls: string; // 缩略图片(1:1)(逗号分隔)
     }
 
     /** 查询新板块设置 响应 */