Browse Source

修复Bug

master
liutong 1 year ago
parent
commit
8b8ce9146a
  1. 50
      admin/src/addon/hygl/views/config/config.vue
  2. 2
      niucloud/addon/hygl/app/service/admin/config/ConfigService.php

50
admin/src/addon/hygl/views/config/config.vue

@ -18,10 +18,10 @@
--> -->
<el-form-item :label="t('weChatPayAppId')" prop="we_chat_pay_app_id"> <!-- <el-form-item :label="t('weChatPayAppId')" prop="we_chat_pay_app_id">-->
<el-input v-model="formData.we_chat_pay_app_id" clearable :placeholder="t('weChatPayAppIdPlaceholder')" <!-- <el-input v-model="formData.we_chat_pay_app_id" clearable :placeholder="t('weChatPayAppIdPlaceholder')"-->
class="input-width"/> <!-- class="input-width"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="t('weChatPayMiniappId')" prop="we_chat_pay_miniapp_id"> <el-form-item :label="t('weChatPayMiniappId')" prop="we_chat_pay_miniapp_id">
<el-input v-model="formData.we_chat_pay_miniapp_id" clearable <el-input v-model="formData.we_chat_pay_miniapp_id" clearable
@ -88,27 +88,27 @@
class="input-width"/> class="input-width"/>
</el-form-item> </el-form-item>
--> -->
<el-form-item :label="t('H5站点地址')" prop="h5_site_url"> <!-- <el-form-item :label="t('H5站点地址')" prop="h5_site_url">-->
<el-input disabled="true" v-model="formData.h5_site_url" clearable <!-- <el-input disabled="true" v-model="formData.h5_site_url" clearable-->
:placeholder="t('H5站点地址')" <!-- :placeholder="t('H5站点地址')"-->
class="input-width"/> <!-- class="input-width"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="t('H5站点二维码')" prop="h5_qrcode_url"> <!-- <el-form-item :label="t('H5站点二维码')" prop="h5_qrcode_url">-->
<el-input disabled="true" v-model="formData.h5_qrcode_url" clearable :placeholder="t('H5站点二维码')" <!-- <el-input disabled="true" v-model="formData.h5_qrcode_url" clearable :placeholder="t('H5站点二维码')"-->
class="input-width"/> <!-- class="input-width"/>-->
<el-button style="margin-left: 15px;" type="primary" @click="resetQrCode()">{{ t('重新生成二维码') }}</el-button> <!-- <el-button style="margin-left: 15px;" type="primary" @click="resetQrCode()">{{ t('重新生成二维码') }}</el-button>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-if="formData.ol_h5_qrcode_url" :label="t('原始H5站点二维码')" prop="h5_qrcode_url"> <!-- <el-form-item v-if="formData.ol_h5_qrcode_url" :label="t('原始H5站点二维码')" prop="h5_qrcode_url">-->
<div> <!-- <div>-->
<p style="color: red;">重新生成二维码后->点击"保存"将替换此二维码</p> <!-- <p style="color: red;">重新生成二维码后->点击"保存"将替换此二维码</p>-->
<img :src="formData.ol_h5_qrcode_url" alt="" style="width:205px;height:205px;"> <!-- <img :src="formData.ol_h5_qrcode_url" alt="" style="width:205px;height:205px;">-->
<a :href="formData.ol_h5_qrcode_url" target="downloadFile" download="h5_qrcode.png"> <!-- <a :href="formData.ol_h5_qrcode_url" target="downloadFile" download="h5_qrcode.png">-->
<el-button type="primary">打开二维码</el-button> <!-- <el-button type="primary">打开二维码</el-button>-->
</a> <!-- </a>-->
</div> <!-- </div>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="t('微信小程序跳转路径')" prop="miniapp_site_url"> <el-form-item :label="t('微信小程序跳转路径')" prop="miniapp_site_url">

2
niucloud/addon/hygl/app/service/admin/config/ConfigService.php

@ -84,7 +84,7 @@ class ConfigService extends BaseAdminService
} }
if($info['miniapp_site_url'] && !$info['miniapp_qrcode_url'] && $info['we_chat_pay_miniapp_id'] && $info['we_chat_pay_miniapp_secret']){ if(isset($info['miniapp_site_url']) && !isset($info['miniapp_qrcode_url']) && isset($info['we_chat_pay_miniapp_id']) && isset($info['we_chat_pay_miniapp_secret'])){
$mini_qRCode = $this->createMiniappQrcodeUrl($info['we_chat_pay_miniapp_id'], $info['we_chat_pay_miniapp_secret'], $info['miniapp_site_url']);//生成微信小程序二维码 $mini_qRCode = $this->createMiniappQrcodeUrl($info['we_chat_pay_miniapp_id'], $info['we_chat_pay_miniapp_secret'], $info['miniapp_site_url']);//生成微信小程序二维码
if($mini_qRCode['url']){ if($mini_qRCode['url']){

Loading…
Cancel
Save