民生付

zhangmeng
Showing 5 changed files with 132 additions and 61 deletions
src/viewsPc/match/components/signInfo-table.vue
src/viewsPc/match/components/zu-table.vue
src/viewsPc/match/detail_en.vue
src/viewsPc/match/pay.vue
src/viewsPc/match/signPreview.vue
--- a/src/viewsPc/match/components/signInfo-table.vue
View file @207ead0
+++ b/src/viewsPc/match/components/signInfo-table.vue
View file @207ead0
@@ -85,7 +85,7 @@
      min-width="100" prop="insuranceFee"
    >
      <template #default="scope">
-        <span class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ scope.row.insuranceFee }}</span>
+        <span class="text-primary">{{ payType != 3 ? '¥' : '€' }}{{ payType != 3?scope.row.insuranceFee:scope.row.insuranceFeeEn }}</span>
      </template>
    </el-table-column>
    <!--                补充信息-->
@@ -122,7 +122,7 @@
      </div>
      <div v-if="showSummary" style="display: inline-block">
-        {{ language == 0 ? '金额小计' : 'Amount' }}: <span>{{ language == 0 ? '¥' : '€' }}{{ total }}</span>
+        {{ language == 0 ? '金额小计' : 'Amount' }}: <span>{{ payType != 3 ? '¥' : '€' }}{{ total }}</span>
      </div>
    </div>
@@ -162,6 +162,11 @@ const props = defineProps({
    type: Number,
    required: false,
    default: 0
+  },
+  payType: {
+    type: String,
+    required: false,
+    default: ''
  }
 })
 import { useStorage } from '@vueuse/core/index'
@@ -194,8 +199,6 @@ function getMatch() {
  })
 }
-function totalMethod() {
-}
 </script>
 <style lang="scss" scoped>
--- a/src/viewsPc/match/components/zu-table.vue
View file @207ead0
+++ b/src/viewsPc/match/components/zu-table.vue
View file @207ead0
 <template>
-  <div class="mt20"></div>
+  <div class="mt20" />
  <el-table :data="list" border style="width: 100%">
-    <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/>
+    <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center" />
-    <el-table-column :label="language==0?'组别代码':'EVENT code'" width="120px" align="center" prop="project.code"/>
+    <el-table-column :label="language==0?'组别代码':'EVENT code'" width="120px" align="center" prop="project.code" />
    <el-table-column :label="language==0?'组别':'EVENT'" min-width="150px" header-align="center" prop="project.name">
      <template #default="scope">
        <el-tooltip effect="dark" :content="scope.row.project.name">
-          <div class="esp">{{scope.row.project.name}}</div>
+          <div class="esp">{{ scope.row.project.name }}</div>
        </el-tooltip>
      </template>
    </el-table-column>
-    <el-table-column :label="language==0?'舞种':'DISCIPLINE'" align="center" width="120px" prop="project.danceType"/>
+    <el-table-column :label="language==0?'舞种':'DISCIPLINE'" align="center" width="120px" prop="project.danceType" />
    <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" header-align="center" min-width="160px">
      <template #default="scope">
        <el-tooltip effect="dark" :content="scope.row.project.remarks">
-          <div class="esp" v-html="scope.row.project.remarks"></div>
+          <div class="esp" v-html="scope.row.project.remarks" />
        </el-tooltip>
      </template>
    </el-table-column>
@@ -22,10 +22,10 @@
      <template #default="scope">
        <el-tooltip effect="dark">
          <template #content>
-            <span v-for="s in scope.row.athletes">{{ s.name }},</span>
+            <span v-for="s in scope.row.athletes" :key="s">{{ s.name }},</span>
          </template>
          <div class="esp">
-          <span v-for="s in scope.row.athletes">{{ s.name }},</span>
+            <span v-for="s in scope.row.athletes" :key="s">{{ s.name }},</span>
          </div>
        </el-tooltip>
      </template>
@@ -33,14 +33,22 @@
    <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop="">
      <template #default="scope">
        <div class="text-primary">
-          {{ language==0?'¥':'€' }}{{ scope.row.project.chargeType == '0'?scope.row.project.serviceFee : scope.row.project.serviceFee * scope.row.athletes.length }}
+          <!--          // chargeType 0 按项目收费  1按人数收费-->
+          {{ payType!=3?'¥':'€' }}
+          <span v-if="scope.row.project.chargeType == '0'">
+            {{ payType!=3? scope.row.project.serviceFee:scope.row.project.serviceFeeEn }}
+          </span>
+          <span v-else>
+            {{ payType!=3? scope.row.project.serviceFee * scope.row.athletes.length:scope.row.project.serviceFeeEn * scope.row.athletes.length }}
+          </span>
+          <!--          {{ scope.row.project.chargeType == '0'?scope.row.project.serviceFee : scope.row.project.serviceFee * scope.row.athletes.length }}-->
        </div>
      </template>
    </el-table-column>
    <el-table-column v-if="hasAction" :label="language==0?'操作':'Actions'" fixed="right" width="150" align="center">
      <template #default="scope">
        <el-button type="primary" link @click="remove(scope.row.signId)">
-          {{language == 0 ? '删除' : 'Delete' }}
+          {{ language == 0 ? '删除' : 'Delete' }}
        </el-button>
      </template>
@@ -50,13 +58,13 @@
    <div>
      {{ language==0?'总报项数':'Count' }}:  <span class="mr20">{{ list.length }}</span>
-      {{ language==0?'金额小计':'Amount' }}:  <span>{{ language==0?'¥':'€' }}{{ total }}</span>
+      {{ language==0?'金额小计':'Amount' }}:  <span>{{ payType!=3?'¥':'€' }}{{ total }}</span>
    </div>
  </div>
 </template>
 <script setup>
-import {useStorage} from "@vueuse/core/index";
+import { useStorage } from '@vueuse/core/index'
 const emit = defineEmits(['delete'])
 const props = defineProps({
@@ -64,23 +72,28 @@ const props = defineProps({
    type: Array,
    required: true
  },
-  hasAction:{
+  hasAction: {
    type: Boolean,
    required: false,
    default: true
  },
-  showSummary:{
+  showSummary: {
    type: Boolean,
    required: false,
    default: false
  },
-  total:{
+  total: {
    type: Number,
    required: false,
    default: 0
+  },
+  payType: {
+    type: String,
+    required: false,
+    default: ''
  }
 })
-const language= useStorage('language',0)
+const language = useStorage('language', 0)
 const remove = (id) => {
  emit('delete', id)
 }
--- a/src/viewsPc/match/detail_en.vue
View file @207ead0
+++ b/src/viewsPc/match/detail_en.vue
View file @207ead0
@@ -592,7 +592,6 @@ function getMatch(id) {
  loading.value = true
  match.getMatchById({ id: id }).then(res => {
    matchData.value = res.data
-    console.log(666666, matchData.value)
    loading.value = false
    const today = dayjs().format('YYYY-MM-DD HH:mm:ss')
    time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
--- a/src/viewsPc/match/pay.vue
View file @207ead0
+++ b/src/viewsPc/match/pay.vue
View file @207ead0
@@ -61,7 +61,8 @@
              :list="signInfoList"
              :match-id="matchId"
              :show-summary="buy==1"
-              :total="insuranceFeeTotal"
+              :total="payType!=3? insuranceFeeTotal:insuranceFeeTotalEn"
+              :pay-type="payType"
              class="mt20"
            />
          </div>
@@ -79,7 +80,8 @@
              :has-action="false"
              :list="zuTableList"
              :show-summary="true"
-              :total="serviceFeeTotal"
+              :total=" payType!=3?serviceFeeTotal:serviceFeeTotalEn"
+              :pay-type="payType"
              class="mt20"
            />
          </div>
@@ -109,13 +111,21 @@
              <div v-if="Number(form.totalFee)>0" class="flex">
                <div v-if="signInfoList?.length>0" class="item"><label>{{
                  language == 0 ? '参赛服务费' : 'REGISTRATION FEE'
-                }}：</label><span>{{ language == 0 ? '¥' : '€' }}{{ serviceFeeTotal }}</span></div>
+                }}：</label><span>
+                  <!--                  {{ language == 0 ? '¥' : '€' }}{{ serviceFeeTotal }}-->
+                  {{ payType != 3 ? '¥' : '€' }}{{ payType!=3? serviceFeeTotal:serviceFeeTotalEn }}
+                </span></div>
                <div v-if="zuTableList?.length>0 &&buy!='0'" class="item"><label>{{
                  language == 0 ? '保险费' : 'INSURANCE'
-                }}：</label><span>{{ language == 0 ? '¥' : '€' }}{{ insuranceFeeTotal }}</span></div>
+                }}：</label><span>
+                  <!--                  {{ language == 0 ? '¥' : '€' }}{{ // insuranceFeeTotal }}-->
+                  {{ payType != 3 ? '¥' : '€' }}{{ payType!=3? insuranceFeeTotal:insuranceFeeTotalEn }}
+                </span></div>
                <div class="item">
                  <label>{{ language == 0 ? '费用总计' : 'Total Cost' }}：</label>
-                  <span class="size26">{{ language == 0 ? '¥' : '€' }}{{ form.totalFee }}</span>
+                  <span class="size26">
+                    {{ payType!=3? '¥' : '€' }}{{ payType!=3? form.totalFee:form.totalFeeEn }}
+                  </span>
                </div>
              </div>
            </el-col>
@@ -158,21 +168,28 @@
            </div>
          </el-col>
          <el-col v-if="Number(form.totalFee)>0" :lg="12">
-            <div v-if="form.payStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}：<span
+            <div v-if="form.payStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}：
-              class="price"
+              <!--              <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>-->
-            >{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+              <span class="price">{{ payType != 3 ? '¥' : '€' }}{{ payType != 3?Number(totalFee).toFixed(2):Number(totalFeeEn).toFixed(2) }}</span>
+            </div>
            <div v-else-if="form.payStatus=='1'" class="priceb">{{
                                                                  language == 0 ? '线下支付待核销' : 'Amount Due'
-            }}：<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+                                                                }}：
-            <div v-else-if="form.payStatus=='3'" class="priceb">{{ language == 0 ? '已支付金额' : 'Amount Due' }}：<span
+              <!--              <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>-->
-              class="price"
+              <span class="price">{{ payType != 3 ? '¥' : '€' }}{{ payType != 3?Number(totalFee).toFixed(2):Number(totalFeeEn).toFixed(2) }}</span>
-            >{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+            </div>
-            <div v-else-if="form.payStatus=='5'" class="priceb">{{ language == 0 ? '已退款' : 'Refunded' }}：<span
+            <div v-else-if="form.payStatus=='3'" class="priceb">{{ language == 0 ? '已支付金额' : 'Amount Due' }}：
-              class="price"
+              <!--              <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>-->
-            >{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+              <span class="price">{{ payType != 3 ? '¥' : '€' }}{{ payType != 3?Number(totalFee).toFixed(2):Number(totalFeeEn).toFixed(2) }}</span>
-            <div v-else class="priceb">{{ language == 0 ? '费用总计' : 'Amount Due' }}：<span
+            </div>
-              class="price"
+            <div v-else-if="form.payStatus=='5'" class="priceb">{{ language == 0 ? '已退款' : 'Refunded' }}：
-            >{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+              <!--              <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>-->
+              <span class="price">{{ payType != 3 ? '¥' : '€' }}{{ payType != 3?Number(totalFee).toFixed(2):Number(totalFeeEn).toFixed(2) }}</span>
+            </div>
+            <div v-else class="priceb">{{ language == 0 ? '费用总计' : 'Amount Due' }}：
+              <!--              <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>-->
+              <span class="price">{{ payType != 3 ? '¥' : '€' }}{{ payType != 3?Number(totalFee).toFixed(2):Number(totalFeeEn).toFixed(2) }}</span>
+            </div>
          </el-col>
        </el-row>
      </el-card>
@@ -248,7 +265,7 @@
                <span>{{ language==0?'民生付':'Minsheng Pay' }}</span>
              </div>
            </el-radio>
-            <el-radio v-if="form.payTypeArr.indexOf('3')>-1" border label="3">
+            <el-radio v-if="form.payTypeArr.indexOf('3')>-1&&language==1" border label="3">
              <!--              paypal-->
              <svg
                class="icon" height="40" p-id="22654" t="1709002828937"
@@ -324,7 +341,8 @@
                <tr>
                  <th>{{ language == 0 ? '付款金额' : 'Payment Amount' }}</th>
                  <td>
-                    {{ language == 0 ? '¥' : '€' }}{{ totalFee }}
+                    <!--                    {{ language == 0 ? '¥' : '€' }}{{ totalFee }}-->
+                    {{ payType!=3?'¥':'€' }}{{ payType!=3?totalFee:totalFeeEn }}
                    <div class="text-gray">{{
                      language == 0 ? '请按照指定金额进行打款' : 'Please make the payment according to the specified amount'
                    }}
@@ -410,7 +428,10 @@
            <SuccessFilled />
          </el-icon>
          <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
-          <h3 class="wePrice">{{ language == 0 ? '¥' : '€' }}{{ form.totalFee || 0 }}</h3>
+          <h3 class="wePrice">
+            <!--            {{ language == 0 ? '¥' : '€' }}{{ form.totalFee || 0 }}-->
+            {{ payType != 3 ? '¥' : '€' }}{{ payType!=3?totalFee:totalFeeEn }}
+          </h3>
          <el-button v-if="language != 0" class="btn-lineG w200px" round type="primary" @click="downInvoice">
            {{ language == 0 ? '下载收据' : 'Download receipt' }}
@@ -425,7 +446,11 @@
            <SuccessFilled />
          </el-icon>
          <p class="text-success">{{ language == 0 ? '支付成功' : 'successfully!' }}</p>
-          <h3 class="wePrice">{{ language == 0 ? '¥' : '€' }}{{ form.totalFee }}</h3>
+          <h3 class="wePrice">
+            <!--            {{ language == 0 ? '¥' : '€' }}{{ form.totalFee }}-->
+            {{ payType != 3 ? '¥' : '€' }}{{ payType!=3?totalFee:totalFeeEn }}
+          </h3>
          <span
            v-if="language==0"
            class="text-danger size12"
@@ -514,6 +539,7 @@ const language = useStorage('language', 0)
 const signInfoList = ref([])
 const zuTableList = ref([])
 const totalFee = ref('')
+const totalFeeEn = ref('')
 const wePayCodeUrl = ref('')
 const form = ref({})
 const voucherObj = ref([])
@@ -525,7 +551,9 @@ const errorBox = ref(false)
 const hideconfirmbtn = ref(false)
 const isphone = ref(false)
 const insuranceFeeTotal = ref(0)
+const insuranceFeeTotalEn = ref(0)
 const serviceFeeTotal = ref(0)
+const serviceFeeTotalEn = ref(0)
 const zuQuery = ref({
  cptId: matchId.value,
  groupId: groupId.value,
@@ -572,6 +600,7 @@ function getData() {
    buy: buy.value
  }).then(res => {
    totalFee.value = res.data.totalFee
+    totalFeeEn.value = res.data.totalFeeEn
    form.value = res.data
    form.value.payTypeArr = res.data.payType.split(',')
    matchId.value = form.value.cptId
@@ -579,6 +608,9 @@ function getData() {
    zuQuery.value.groupId = groupId.value
    zuQuery.value.cptId = matchId.value
    showLoading.value = false
+    if (res.data.orderPayType) {
+      payType.value = res.data.orderPayType
+    }
    if (isLogin.value) {
      getSignList()
      if (user.utype == '1') {
@@ -612,11 +644,14 @@ function getSignList() {
  match.getMySignInfoList(zuQuery.value).then(res => {
    console.log(res)
    insuranceFeeTotal.value = 0
+    insuranceFeeTotalEn.value = 0
    serviceFeeTotal.value = 0
+    serviceFeeTotalEn.value = 0
    signInfoList.value = res.data?.singleData || []
    zuTableList.value = res.data?.zuData || []
    for (var s of signInfoList.value) {
      insuranceFeeTotal.value = insuranceFeeTotal.value + Number(s.insuranceFee)
+      insuranceFeeTotalEn.value = insuranceFeeTotalEn.value + Number(s.insuranceFeeEn)
    }
    // for (var z of zuTableList.value) {
    //   serviceFeeTotal.value = serviceFeeTotal.value + Number(z.project.serviceFee)
@@ -627,23 +662,29 @@ function getSignList() {
      }
      const serviceFee = Number(z.project.serviceFee) || 0
+      const serviceFeeEn = Number(z.project.serviceFeeEn) || 0
      const chargeType = String(z.project.chargeType).trim()
      let currentItemFee = 0
-      if (chargeType === '0') {
+      let currentItemFeeEn = 0
+      if (chargeType === '0') { // 0 按项目收费  1按人数收费
        currentItemFee = serviceFee
+        currentItemFeeEn = serviceFeeEn
      } else if (chargeType === '1') {
        const athletesLength = z.athletes?.length || 0
        currentItemFee = serviceFee * athletesLength
+        currentItemFeeEn = serviceFeeEn * athletesLength
      } else {
        currentItemFee = 0
+        currentItemFeeEn = 0
      }
      serviceFeeTotal.value += currentItemFee
+      serviceFeeTotalEn.value += currentItemFeeEn
    }
    serviceFeeTotal.value = serviceFeeTotal.value.toFixed(2)
-    console.log(6666, signInfoList.value)
+    serviceFeeTotalEn.value = serviceFeeTotalEn.value.toFixed(2)
  }).catch(err => {
    console.log(err)
    if (isLogin.value) {
--- a/src/viewsPc/match/signPreview.vue
View file @207ead0
+++ b/src/viewsPc/match/signPreview.vue
View file @207ead0
@@ -55,7 +55,9 @@
              :list="signInfoList"
              :match-id="matchId"
              :show-summary="route.query.buy=='1'"
-              :total="signTotal" class="mt20"
+              :total="language==0? signTotal:signTotalEn"
+              class="mt20"
+              :pay-type="language==1?3:4"
            />
          </div>
          <div class="mt20">
@@ -71,7 +73,8 @@
              :has-action="false"
              :list="zuTableList"
              :show-summary="true"
-              :total="zuTotal"
+              :total="language==0? zuTotal:zuTotalEn"
+              :pay-type="language==1?3:4"
              class="mt20"
            />
          </div>
@@ -171,7 +174,9 @@ const signInfoList = ref([])
 const signEndTime = ref('')
 const zuTableList = ref([])
 const zuTotal = ref(0)
+const zuTotalEn = ref(0)
 const signTotal = ref(0)
+const signTotalEn = ref(0)
 const groupId = ref(route.query.groupId || 0)
 const matchId = ref(route.query.matchId)
 const isNational = ref(route.query.isNational || false)
@@ -215,41 +220,51 @@ function getMyMemberTable() {
 function getSignList() {
  match.getMySignInfoList(zuQuery.value).then(res => {
    zuTotal.value = 0
+    zuTotalEn.value = 0
    signTotal.value = 0
+    signTotalEn.value = 0
    signInfoList.value = res.data.singleData
    console.log(signInfoList.value)
    zuTableList.value = res.data.zuData
    for (var s of signInfoList.value) {
      signTotal.value = (Number(signTotal.value) + Number(s.insuranceFee)).toFixed(2)
+      signTotalEn.value = (Number(signTotalEn.value) + Number(s.insuranceFeeEn)).toFixed(2)
    }
-//  for (var z of zuTableList.value) {
+    //  for (var z of zuTableList.value) {
-//       zuTotal.value = (Number(zuTotal.value) + Number(z.project.serviceFee)).toFixed(2)
+    //       zuTotal.value = (Number(zuTotal.value) + Number(z.project.serviceFee)).toFixed(2)
-//     }
+    //     }
    for (const z of zuTableList.value) {
      if (!z.project) {
-        continue;
+        continue
      }
-      const serviceFee = Number(z.project.serviceFee) || 0;
+      const serviceFee = Number(z.project.serviceFee) || 0
+      const serviceFeeEn = Number(z.project.serviceFeeEn) || 0
-      const chargeType = String(z.project.chargeType).trim();
+      const chargeType = String(z.project.chargeType).trim()
-      let currentItemFee = 0;
+      let currentItemFee = 0
+      let currentItemFeeEn = 0
      if (chargeType === '0') {
-        currentItemFee = serviceFee;
+        currentItemFee = serviceFee
+        currentItemFeeEn = serviceFeeEn
      } else if (chargeType === '1') {
-        const athletesLength = z.athletes?.length || 0;
+        const athletesLength = z.athletes?.length || 0
-        currentItemFee = serviceFee * athletesLength;
+        currentItemFee = serviceFee * athletesLength
+        currentItemFeeEn = serviceFeeEn * athletesLength
      } else {
-        currentItemFee = 0;
+        currentItemFee = 0
+        currentItemFeeEn = 0
      }
-      zuTotal.value += currentItemFee;
+      zuTotal.value += currentItemFee
+      zuTotalEn.value += currentItemFeeEn
    }
-    zuTotal.value = zuTotal.value.toFixed(2);
+    zuTotal.value = zuTotal.value.toFixed(2)
+    zuTotalEn.value = zuTotalEn.value.toFixed(2)
  })
 }