Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt

lttnew
Showing 4 changed files with 19 additions and 18 deletions
common/api.js
myCenter/goPay.vue
myCenter/payOrder.vue
pages/index/home.vue
--- a/common/api.js
View file @8ac0bb4
+++ b/common/api.js
View file @8ac0bb4
@@ -1552,7 +1552,7 @@ export function certifiedNew(data) {
  let url = '/system/certifiedNew/commit'
  const params = []
  if (data.renewYear) params.push(`renewYear=${data.renewYear}`)
-  if (data.type) params.push(`type=${data.type}`)
+  params.push(`type=${data.type}`)
  if (data.contactPerson) params.push(`contactPerson=${data.contactPerson}`)
  if (data.contactTel) params.push(`contactTel=${data.contactTel}`)
  if (params.length > 0) {
--- a/myCenter/goPay.vue
View file @8ac0bb4
+++ b/myCenter/goPay.vue
View file @8ac0bb4
@@ -47,7 +47,7 @@
      <view class="payRow ">
        <radio-group @change="onPayTypeChange">
          <label class="radioItem">
-            <radio :checked="payType == '1'" class="custom-radio" value="0"/>
+            <radio :checked="payType == '0'" class="custom-radio" value="0"/>
            <view class="payInfo">
              <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon" mode="widthFix"></image>
              <text>民生付</text>
@@ -116,7 +116,7 @@ const preferentialPolicy = ref(false)
 const preferentialData = ref({
  name: '优惠'
 })
-const payType = ref('1')
+const payType = ref('0')
 const isPaying = ref(false)
 const payName = ref('')
 const assoName = ref('')
@@ -194,7 +194,7 @@ const handelPay = async () => {
  // 构建请求参数
  const params = {
    renewYear: form.value.renewYear,
-    type: payType.value
+    type: payType.value,
  }
  // 对公转账需要传联系人信息
--- a/myCenter/payOrder.vue
View file @8ac0bb4
+++ b/myCenter/payOrder.vue
View file @8ac0bb4
@@ -30,13 +30,13 @@
      <view class="section-title">选择支付方式</view>
      <view class="payment-methods">
        <radio-group @change="handlePayTypeChange">
-          <label class="payment-item" :class="{ selected: payType === '1' }">
+          <label :class="{ selected: payType === '1' }" class="payment-item">
-            <radio :checked="payType === '1'" value="0" />
+            <radio :checked="payType =='0'" value="0"/>
            <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon ml10" mode="widthFix"></image>
            <text class="pay-name ml10">民生付</text>
          </label>
-          <label class="payment-item" :class="{ selected: payType === '3' }">
+          <label :class="{ selected: payType === '3' }" class="payment-item">
-            <radio :checked="payType === '3'" value="1" />
+            <radio :checked="payType === '3'" value="1"/>
            <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon ml10" mode="widthFix"></image>
            <text class="pay-name ml10">对公转账</text>
          </label>
@@ -48,11 +48,11 @@
    <view v-if="payType === '3'" class="transfer-form">
      <view class="form-item">
        <text class="form-label">联系人</text>
-        <input class="form-input" v-model="form.contactPerson" placeholder="请输入联系人" />
+        <input v-model="form.contactPerson" class="form-input" placeholder="请输入联系人"/>
      </view>
      <view class="form-item">
        <text class="form-label">联系电话</text>
-        <input class="form-input" v-model="form.contactTel" type="number" placeholder="请输入联系电话" />
+        <input v-model="form.contactTel" class="form-input" placeholder="请输入联系电话" type="number"/>
      </view>
    </view>
@@ -77,7 +77,7 @@ import {minShengPay} from "@/common/pay";
 // 核心数据
 const formData = ref({}) // 订单统计数据
 const rangeId = ref('') // 核心业务ID
-const payType = ref('1') // 支付方式（默认0=民生付）
+const payType = ref('0') // 支付方式（默认0=民生付）
 const payLoading = ref(false) // 支付按钮加载状态
 const form = ref({
  contactPerson: '',
@@ -112,7 +112,7 @@ async function getCount() {
 // 支付方式切换
 function handlePayTypeChange(e) {
-  payType.value = e.detail.value == '0' ? '1' : '3'
+  payType.value = e.detail.value == '0' ? '0' : '3'
  console.log('支付方式：', payType.value)
  if (payType.value === '3') {
    form.value.contactPerson = ''
@@ -133,14 +133,14 @@ async function handlePay() {
  // 对公转账校验
  if (payType.value === '3') {
    if (!form.value.contactPerson) {
-      return uni.showToast({ title: '请输入联系人', icon: 'none' })
+      return uni.showToast({title: '请输入联系人', icon: 'none'})
    }
    if (!form.value.contactTel) {
-      return uni.showToast({ title: '请输入联系电话', icon: 'none' })
+      return uni.showToast({title: '请输入联系电话', icon: 'none'})
    }
    // 手机号格式校验
    if (!/^1[3-9]\d{9}$/.test(form.value.contactTel)) {
-      return uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
+      return uni.showToast({title: '请输入正确的手机号', icon: 'none'})
    }
  }
@@ -177,7 +177,7 @@ async function handlePay() {
    if (resData.payResult && resData.payResult.encryptedData) {
      const reason = await minShengPay(resData.orderId, resData.payResult.encryptedData)
      if (reason == 'OK') {
-        uni.showToast({ title: '支付成功', icon: 'success' })
+        uni.showToast({title: '支付成功', icon: 'success'})
        setTimeout(() => {
          uni.hideLoading()
          uni.redirectTo({
--- a/pages/index/home.vue
View file @8ac0bb4
+++ b/pages/index/home.vue
View file @8ac0bb4
@@ -637,7 +637,7 @@ const associateIdForAuthPay = ref(0)
 // 是否是道馆用户
 const isDaoGuan = computed(() => {
-  console.log('isDaoGuan', app.globalData.deptType,userType.value)
+  console.log('isDaoGuan', app.globalData.deptType, userType.value)
  return userType.value == '4' || app.globalData.deptType == '6' || app.globalData.deptType == '3'
 })
@@ -691,7 +691,7 @@ onLoad(option => {
      menus: ['shareAppMessage', 'shareTimeline']
    });
  }
-  console.log('app.globalData22',app.globalData.changePassFlag,app.globalData.memberInfo?.activeStatus,app.globalData.authenticationStatus)
+  console.log('app.globalData22', app.globalData.changePassFlag, app.globalData.memberInfo?.activeStatus, app.globalData.authenticationStatus)
 });
@@ -1489,6 +1489,7 @@ function checkDialogs() {
  .dialog-icon {
    color: #AD181F;
  }
  .dialog-message {
    font-size: 28rpx;
    color: #606266;