Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/services/socket/protobuf/protoHeader.ts

@@ -41,7 +41,7 @@ export function getProtoHeadParam(funCodeName: string, type: HeadEnum = 0): IMes
             })
             break
         case HeadEnum.MarketID15101:
-            result = Object.assign(result, { MarketID: getMarketByTradeMode(TradeMode.ChannelTrading), })
+            result = Object.assign(result, { MarketID: 15101})
             break;
         case HeadEnum.MarketID69201:
             result = Object.assign(result, { MarketID: getMarketByTradeMode(TradeMode.Platinum), })

src/views/platinum/platinum_agreement/compoments/modify/index.vue

@@ -35,7 +35,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="协议类型">
-            <span class="white">{{formState.agreementtype}}</span>
+            <span class="white">{{getAgreementTypeName(formState.agreementtype)}}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -72,6 +72,7 @@ import {QHJAgreementConfigOperateReq} from "@/services/proto/manager/interface";
 import {getUserId} from "@/services/bus/account";
 import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
 import {agreementConfigOperate} from "@/services/proto/manager";
+import {getAgreementTypeName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: 'modify-custom',
@@ -120,6 +121,7 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            getAgreementTypeName,
         };
     },
 });

src/views/platinum/platinum_customer_info/compoments/common-detail/index.vue

@@ -44,7 +44,7 @@ export default defineComponent({
             const { proxystatementurl, cardfrontphotourl, cardbackphotourl } = props.selectedRow;
             switch (label) {
                 case '营业执照':
-                    previewImg(proxystatementurl);
+                    previewImg(cardfrontphotourl);
                     break;
                 case '身份证正面照':
                     previewImg(cardfrontphotourl);