Merge branch 'master-charge' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front into master-charge

.env.development

@@ -44,3 +44,6 @@ VITE_APP_SHARE_QR_CODE_URL = 'http://dm.share.yujin.shuziyunyao.com'
 VITE_H5_URL = 'https://t.yujin.shuziyunyao.com/'
 # pagetpl地址
 VITE_APP_PAGETPL_URL = 'https://dm.yujin.shuziyunyao.com/trainpage'
+
+# 会议门户地址
+VITE_APP_MEETING_URL = 'https://dm.yujin.shuziyunyao.com/trainpage'

.env.production

@@ -45,4 +45,6 @@ VITE_APP_APPID = '1890328853823459329'
 
 VITE_APP_SHARE_QR_CODE_URL = 'https://www.shuziyunyao.com/dm'
 
-VITE_H5_URL = 'https://t.zycpzs.cn/'
+VITE_H5_URL = 'https://t.zycpzs.cn/'
+# 会议门户地址
+VITE_APP_MEETING_URL = 'https://www.shuziyunyao.com/trainpage'

src/views/training/meeting/index.vue

@@ -134,7 +134,7 @@
     <TemporaryRegistration v-if="showTemporary" v-model:show="showTemporary" :info="temporaryRegistration" :dict="{ lm_training_join_type }"></TemporaryRegistration>
     <el-dialog v-model="dialogVisible" title="会议门户" width="500">
         <div class="mb-20">会议名称：{{ training?.trainingName }}</div>
-        <div>访问地址：{{ `https://dm.yujin.shuziyunyao.com/trainpage/?id=${training?.pageId}` }}</div>
+        <div>访问地址：{{ `${VITE_APP_MEETING_URL}/?id=${training?.pageId}` }}</div>
         <template #footer>
             <div style="display: flex;justify-content: space-around;">
                 <el-button type="primary" @click="router.push({ path: 'ptpl-edit', query: { meetid: training?.id } })">编辑</el-button>
@@ -150,9 +150,7 @@ import { colNoData } from '@/utils/noData';
 import { searchTabs } from '@/views/models';
 import { SignInCode, TemporaryRegistration } from '../models';
 import { copyTextToClipboard } from '@/directive/common/copyText';
-
-
-
+const VITE_APP_MEETING_URL = ref(import.meta.env.VITE_APP_MEETING_URL);
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { lm_training_join_type, yes_no, dm_training_cert, lm_training_status,lm_training_join_status } = toRefs<any>(proxy?.useDict('lm_training_join_type', 'yes_no', 'dm_training_cert', 'lm_training_status',"lm_training_join_status"));

src/views/training/models/meeting-detail-attend.vue

@@ -168,7 +168,9 @@
                 <template #default="{ row }">
                     <div v-if="row.payType === '1'" class="f-w-5">微信支付</div>
                     <div v-if="row.payType === '2'" class="f-w-5">对公转账</div>
-                    <div v-if="row?.payType !=='1'&& row?.payType !=='2'">-</div>
+                      <div v-if="row.payType === '3'" class="f-w-5">对公转账收款</div>
+                        <div v-if="row.payType === '4'" class="f-w-5">现场收款</div>
+                    <div v-if="row?.payType !=='1'&& row?.payType !=='2' && row?.payType !=='3' && row?.payType !=='4'" >-</div>
                 </template>
             </vxe-column>
             <vxe-column title="开票信息" field="remark" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
@@ -293,8 +295,8 @@
                 </el-radio-group>
             </el-form-item> -->
             <div class="d-flex">
-                <div class="orange-button" :class="{'orange-active': collectiontype === '4'}" @click="collectiontype = '4'">对公转账收款</div>
-                <div class="green-button" :class="{'green-active': collectiontype === '3'}" @click="collectiontype = '3'">现场收款</div>
+                <div class="orange-button" :class="{'orange-active': collectiontype === '3'}" @click="collectiontype = '3'">对公转账收款</div>
+                <div class="green-button" :class="{'green-active': collectiontype === '4'}" @click="collectiontype = '4'">现场收款</div>
             </div>
             <div class="f-s-24">确认收款后将直接改为已支付状态，并进入报名审核流程，操作无法撤回请慎重操作。</div>
         </div>
@@ -539,9 +541,9 @@ const openTransfer = (row)=>{
     editPricedata.value = row
 }
 const confirmTransfer = async()=>{
-    await confirmSigPublicPay(editPricedata.value?.id,collectiontype)
+    await confirmSigPublicPay(editPricedata.value?.id,collectiontype.value)
     showTransfer.value = false
-     getList();
+    getList();
 }
 const changeEditPrice = async ()=>{
     await editPrice({