浏览代码

Merge branch 'release-3.9.0' into John/release-3.8.0/KIP-11923(停车发票支持在线查看PDF)

john 1 年之前
父节点
当前提交
f0d25ffd27
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      package.json
  2. 1 1
      src/pages/parkingFeeV2/parkingFeeMsg.vue
  3. 1 1
      src/pages/parkingFeeV2/vehicleAddOrEdit.vue

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "temporay-parking",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "private": true,
   "scripts": {
     "serve": "cross-env NODE_ENV=dev vue-cli-service serve",

+ 1 - 1
src/pages/parkingFeeV2/parkingFeeMsg.vue

@@ -180,7 +180,7 @@ export default {
     fetchData(id) {
       return new Promise(async (resolve, reject) => {
         try {
-          const res = await this.asyncRequest(`${'window.QR_CODE_BASE_URL'}/c/${id}`);
+          const res = await this.asyncRequest(`${window.QR_CODE_BASE_URL}/c/${id}`);
           console.log('baseURLQrCode:::', res)
           // console.log('baseURLQrCodebaseURLQrCode::', res.data);
           if (res?.code == 200) {

+ 1 - 1
src/pages/parkingFeeV2/vehicleAddOrEdit.vue

@@ -33,7 +33,7 @@
           {{ numArr[6] }}
         </div>
         <div class="li dashed green-active" @click="clickShowKeyboard(7)" :class="[active === 7 ? 'active' : '']" >
-          <span v-if="numArr[7] && carType === 1">{{ numArr[7] }}</span>
+          <span v-if="carType === 1">{{ numArr[7] }}</span>
           <img v-else :src="require('@/pages/parkingFee/static/images/unlicensed/leaf.svg')">
         </div>
       </div>