浏览代码

车辆二维码

xiao547607 4 年之前
父节点
当前提交
0031c317b5
共有 8 个文件被更改,包括 69 次插入9 次删除
  1. 6 3
      .env.development
  2. 3 0
      .env.production
  3. 5 2
      .env.test
  4. 二进制
      public/favicon.ico
  5. 二进制
      src/assets/logo.png
  6. 1 1
      src/views/Login.vue
  7. 53 2
      src/views/bus/vehicleInfo-list.vue
  8. 1 1
      src/views/layout/index.vue

+ 6 - 3
.env.development

@@ -1,7 +1,7 @@
-OUT_PUT_DIR=dist/bus-portal
+OUT_PUT_DIR=dist/smart-bus-portal
 
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-bus-server
-#VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-bus-server
+VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/smart-bus-server
 #VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
 
 #手机企业版
@@ -15,6 +15,9 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 #打卡点二维码地址
 VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene
 
+#车辆购票二维码
+VUE_APP_BUY_TICKET_URL=http://xpgj.xiaoxinda.com/jp-car/#/pages/buytickets/index
+
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7001
 VUE_APP_BIND_WECHAT_CODE=8001

+ 3 - 0
.env.production

@@ -17,6 +17,9 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 #打卡点二维码地址
 VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene
 
+#车辆购票二维码
+VUE_APP_BUY_TICKET_URL=http://xpgj.xiaoxinda.com/jp-car/#/pages/buytickets/index
+
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7000
 VUE_APP_BIND_WECHAT_CODE=8000

+ 5 - 2
.env.test

@@ -1,6 +1,6 @@
-OUT_PUT_DIR=dist/bus-portal
+OUT_PUT_DIR=dist/smart-bus-portal
 
-VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
+VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/smart-bus-server
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/healthPublicity
@@ -17,6 +17,9 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 #打卡点二维码地址
 VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene
 
+#车辆购票二维码
+VUE_APP_BUY_TICKET_URL=http://xpgj.xiaoxinda.com/jp-car/#/pages/buytickets/index
+
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7001
 VUE_APP_BIND_WECHAT_CODE=8001

二进制
public/favicon.ico


二进制
src/assets/logo.png


+ 1 - 1
src/views/Login.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="login-form">
       <h3>
-        <img src="../assets/logo.png" width="400" height="80"/>
+        <img src="../assets/logo.png" width="360" height="116.1"/>
       </h3>
       <el-card class="box-card">
         <el-tabs v-model="activeName" @tab-click="handleTabClick">

+ 53 - 2
src/views/bus/vehicleInfo-list.vue

@@ -158,8 +158,35 @@
       ></el-table-column>
       <el-table-column label="操作" fixed="right" width="220">
         <template slot-scope="{ row }">
-            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="handleEdit(row)"
+                  >编辑</el-link
+                >-
+                
+            <el-popover
+                placement="left"
+                width="300"
+                trigger="click"
+                @show="openQRCode(row)"
+                @hide="closeQRCode(row)"
+              >
+                <div
+                  :ref="'qrcode_' + row.id"
+                  style="width: 300px; height: 300px"
+                ></div>
+                <el-link type="primary" :underline="false" slot="reference"
+                  >购票二维码</el-link
+                >
+              </el-popover>
+              -
+            <el-link
+                  type="danger"
+                  :underline="false"
+                  @click="handleDelete(row)"
+                  >删除</el-link
+                >
         </template>
       </el-table-column>
     </el-table>
@@ -236,6 +263,8 @@ import vehicleInfoApi from "@/api/bus/vehicleInfo";
 import SelectTree from "@/components/SelectTree";
 import companyInfoApi from "@/api/bus/companyInfo";
 
+import QRCode from "qrcodejs2";
+
 import { getToken } from "@/utils/auth"; // get token from cookie
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -485,6 +514,28 @@ export default {
         } 个文件`
       );
     },
+    openQRCode(record) {
+      //el.innerHTML = "";
+      var self = this;
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+      //商户扫码
+      var qrtext =
+        process.env.VUE_APP_BUY_TICKET_URL + "?id=" + record.id;
+      var el = self.$refs["qrcode_" + record.id];
+      alert(qrtext);
+
+      var qr = new QRCode(el, {
+        text: qrtext,
+        width: 300,
+        height: 300,
+        colorDark: "#333333", //二维码颜色
+        colorLight: "#ffffff", //二维码背景色
+        correctLevel: QRCode.CorrectLevel.L, //容错率,L/M/H
+      });
+    },
+    closeQRCode(record) {
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+    },
 
   },
   mounted: function () {},

+ 1 - 1
src/views/layout/index.vue

@@ -18,7 +18,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      <div style="position:absolute;bottom:0px;left:275px;right:400px;">
+      <div style="position:absolute;bottom:0px;left:205px;right:400px;">
         <tags-view />
       </div>
     </el-header>