Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

oem/gstj/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "甘肃碳交",
   "version": "1.0.15",
   "versionCode": "100015",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://8.130.69.63:8280/cfg?key=gstj",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -34,6 +34,20 @@
                                 </template>
                             </Field>
                         </template>
+                        <!-- <template v-else-if="(item.fieldcode === 'bank_branch_name')">
+                            <Field v-if="(item.usabletype === 1) ||
+                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
+                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" name="OpenBankName"
+                                :label="item.fieldname"
+                                v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankName"/>
+                        </template>
+                        <template v-else-if="(item.fieldcode === '100')">
+                            <Field v-if="(item.usabletype === 1) ||
+                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
+                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" name="OpenBankNo"
+                                :label="item.fieldname"
+                                v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankNo"/>
+                        </template> -->
                         <template v-else>
                             <Field v-if="(item.usabletype === 1) ||
                                 (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
@@ -132,10 +146,24 @@ const formRules: { [key in keyof Proto.t2bBankSignReq]?: FieldRule[] } = {
         required: true,
         message: '请输入银行卡账户名',
     }],
+    MobilePhone: [{
+        required: true,
+        message: '请输入手机号码',
+        validator: (val) => {
+            if (validateRules.phone.validate(val)) {
+                return true
+            }
+            return validateRules.phone.message
+        }
+    }],
     OpenBankName: [{
         required: true,
-        message: '请输入银行卡支行名称',
+        message: '请输入开户行支行名称',
     }],
+    OpenBankNo: [{
+        required: true,
+        message: '请输入开户行支行号',
+    }]
 }
 
 const formSubmit = () => {

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -36,6 +36,22 @@
                         </el-input>
                     </el-form-item>
                     </template>
+                    <template v-else-if="(item.fieldcode === 'bank_branch_name')">
+                        <el-form-item :label="item.fieldname" prop="OpenBankName"
+                                v-if="(item.usabletype === 1) || 
+                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
+                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                            <el-input maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="(item.fieldcode === '100')">
+                        <el-form-item :label="item.fieldname" prop="OpenBankNo"
+                                v-if="(item.usabletype === 1) || 
+                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
+                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                            <el-input maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
+                        </el-form-item>
+                    </template>
                 <template v-else>
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode"
                             v-if="(item.usabletype === 1) || 
@@ -82,9 +98,28 @@ const formRules: FormRules = {
             }
         }
     }],
+    MobilePhone: [{
+        required: true,
+        message: '请输入手机号码',
+        validator: (rule, value, callback) => {
+            if (validateRules.phone.validate(value)) {
+                callback()
+            } else {
+                callback(new Error(validateRules.phone.message))
+            }
+        }
+    }],
     AccountName: [{
         required: true,
         message: '请输入行卡账户名',
+    }],
+    OpenBankName: [{
+        required: true,
+        message: '请输入开户行支行名称',
+    }],
+    OpenBankNo: [{
+        required: true,
+        message: '请输入开户行支行号',
     }]
 }
 

src/packages/pc/views/market/trade/swap/detail/order/index.vue

@@ -102,6 +102,14 @@ const { dataList: buyList, run: getBuyList } = useRequest(queryTjmdTradeOrderDet
     },
 })
 
+const { dataList: sellList, run: getSellList } = useRequest(queryTjmdTradeOrderDetail, {
+    params: {
+        pagesize: 20,
+        goodsid: props.goodsId,
+        buyorsell: BuyOrSell.Sell
+    },
+})
+
 const onDelisting = (row: Model.TjmdTradeOrderDetailRsp) => {
     switch (status(row)) {
         case 4: /// 已签署
@@ -117,14 +125,6 @@ const onDelisting = (row: Model.TjmdTradeOrderDetailRsp) => {
     }
 }
 
-const { dataList: sellList, run: getSellList } = useRequest(queryTjmdTradeOrderDetail, {
-    params: {
-        pagesize: 20,
-        goodsid: props.goodsId,
-        buyorsell: BuyOrSell.Sell
-    },
-})
-
 /// 每隔 30 秒去刷新请求数据信息
 setTimeout(() => {
     // 获取买大厅数据

src/packages/pc/views/market/trade/swap/detail/order/protocol/index.vue

@@ -1,7 +1,7 @@
 <!-- 掉期市场 - 买卖大厅 - 合同签署 -->
 <template>
-    <app-drawer title="实名认证" v-model:show="show" :refresh="refresh">
-        <div class="g-text-message">请前往手机App进行合同签署证</div>
+    <app-drawer title="合同签署" v-model:show="show" :refresh="refresh">
+        <div class="g-text-message">请前往手机App进行合同签署操作！</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">确认</el-button>
         </template>

src/packages/tjmd/views/account/protocol/Index.vue

@@ -104,8 +104,7 @@ const signer = (item: Model.TencentUsereSignRecordsRsq) => {
     if (item.recordstatus === 2) {
         item.signurl ? openWebview(item.signurl) : showFailToast('合同地址错误')
     } else if (item.recordstatus === 3) {
-        const fileUrl = getFileUrl(item.contractfileaddr)
-        item.contractfileaddr ? plus.openURL(fileUrl) : showFailToast('合同地址错误')
+        showFailToast('合同已签署，请前往腾讯电子签小程序查看！')
     } else {
         fullloading((hideLoading) => {
             const userinfotype = useUserStore().userInfo.userinfotype

src/packages/tjmd/views/mine/Index.vue

@@ -80,7 +80,7 @@
                 </Cell>
                 <Cell is-link :to="{ name: 'account-protocol', query: { memberUserId: getMemberUserId()} }" v-if="userStore.userType != 2 && authStatus === AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="g-icon-sign">合同签署</Iconfont>
+                        <Iconfont icon="g-icon-order--line">合同签署</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">

src/services/api/swap/index.ts

@@ -1,6 +1,7 @@
 import { useLoginStore, useUserStore } from '@/stores'
 import http from '@/services/http'
 import { RequestConfig } from '@/services/http/types'
+import { getMemberUserId } from '@/services/methods/user'
 
 const loginStore = useLoginStore()
 const userStore = useUserStore()
@@ -54,6 +55,7 @@ export function queryTjmdTradeOrderDetail(config: RequestConfig<Model.TjmdTradeO
         params: {
             userid: loginStore.userId,
             usertype: userStore.userType,
+            memberuserid: getMemberUserId(),
             ...config.data
         },
     })

src/types/model/swap.d.ts

@@ -257,7 +257,8 @@ declare namespace Model {
         goodsid: number
         /// 买卖方向 0-买 1-卖
         buyorsell?: number
-        
+        /// 所属会员ID，传入后会将此机构的单放在最前面，主要给麦顿使用
+        memberuserid?: number
     }
 
     /** 查询掉期买卖大厅 响应 */