Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

.env.development

@@ -1,8 +1,8 @@
 OUT_PUT_DIR=dist/jp-housekeeper-portal
 
 #VUE_APP_BACKEND_URL=http://127.0.0.1:7070/xpgj
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
-#VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
+VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
 #VUE_APP_BACKEND_URL=http://mirror.xiaoxinda.com/xpgjapi/
 
@@ -18,6 +18,14 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 #VUE_APP_PUNCHLOCATION_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server/prod/business/#/guest/current/list
 VUE_APP_PUNCHLOCATION_URL=http://xpgj.xiaoxinda.com/prod/business/#/guest/current/list
 
+#停车场二维码地址
+#非设备扫码 
+VUE_APP_PARKING_PAY_ULR=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
+#车道扫码 设备扫码
+VUE_APP_PARKING_CHANNEL_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
+#商户扫码
+VUE_APP_PARKING_MERCHAT_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/merchant/check/search
+
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7000
 VUE_APP_BIND_WECHAT_CODE=8000

.env.production

@@ -18,6 +18,14 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 #打卡点二维码地址
 VUE_APP_PUNCHLOCATION_URL=http://xpgj.xiaoxinda.com/prod/business/#/guest/current/list
 
+#停车场二维码地址
+#非设备扫码 
+VUE_APP_PARKING_PAY_ULR=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/car/search
+#车道扫码 设备扫码
+VUE_APP_PARKING_CHANNEL_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/car/search
+#商户扫码
+VUE_APP_PARKING_MERCHAT_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/merchant/check/search
+
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7000
 VUE_APP_BIND_WECHAT_CODE=8000

.env.test

@@ -18,6 +18,14 @@ VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention
 #打卡点二维码地址
 VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene
 
+#停车场二维码地址
+#非设备扫码 
+VUE_APP_PARKING_PAY_ULR=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
+#车道扫码 设备扫码
+VUE_APP_PARKING_CHANNEL_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
+#商户扫码
+VUE_APP_PARKING_MERCHAT_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/merchant/check/search
+
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7001
 VUE_APP_BIND_WECHAT_CODE=8001

src/views/base/parkingChannel-list.vue

@@ -59,8 +59,8 @@
               ></div>
               <el-link type="primary" :underline="false" slot="reference"
                 >车道二维码</el-link
-              > </el-popover
-            >
+              >
+            </el-popover>
           </template>
         </el-table-column>
       </el-table>
@@ -83,7 +83,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
-  props: ["parkId"],
+  props: ["parkId", "companyId"],
   data() {
     var self = this;
 
@@ -266,10 +266,12 @@ export default {
       //el.innerHTML = "";
       var self = this;
       self.$refs["qrcode_" + record.id].innerHTML = "";
-      //默认企业版
+      //车道扫码
       var qrtext =
-        process.env.VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL +
+        process.env.VUE_APP_PARKING_CHANNEL_URL +
         "?companyId=" +
+        self.companyId +
+        "&channelId=" +
         record.id;
 
       var el = self.$refs["qrcode_" + record.id];

src/views/base/parkingInfo-list.vue

@@ -117,19 +117,37 @@
       ></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{ row }">
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleOpenChannel(row)"
-            v-if="row.parkId != 0"
-            >查看车道</el-button
-          >
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
+          <el-row>
+            <el-col>
+              <el-link
+                type="primary"
+                @click="handleOpenChannel(row)"
+                v-if="row.parkId != 0"
+                >查看车道</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-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-link type="warning" @click="handleEdit(row)">编辑</el-link>-
+              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -150,6 +168,7 @@
     <parkingChannel-list
       v-if="showChannelModal"
       :parkId="parkId"
+      :companyId="companyId"
       @close="onDetailModalClose"
     ></parkingChannel-list>
   </div>
@@ -159,6 +178,7 @@ import Constant from "@/constant";
 import ParkingInfoDetail from "./parkingInfo-detail";
 import ParkingChannelList from "./parkingChannel-list";
 import parkingInfoApi from "@/api/base/parkingInfo";
+import QRCode from "qrcodejs2";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 import SelectTree from "@/components/SelectTree";
@@ -287,6 +307,7 @@ export default {
     },
     handleOpenChannel(record) {
       this.parkId = record.parkId;
+      this.companyId = record.companyId;
       this.showChannelModal = true;
     },
     handleDelete(record) {
@@ -350,6 +371,28 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    openQRCode(record) {
+      //el.innerHTML = "";
+      var self = this;
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+      //非设备扫码
+      var qrtext =
+        process.env.VUE_APP_PARKING_PAY_ULR + "?companyId=" + record.companyId;
+
+      var el = self.$refs["qrcode_" + record.id];
+
+      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 () {
     this.changePage(1);

src/views/base/parkingMerchant-list.vue

@@ -142,15 +142,33 @@
       ></el-table-column>
       <el-table-column label="操作" width="250">
         <template slot-scope="{ row }">
-          <el-button size="mini" type="primary" @click="bindWechat(row)"
-            >微信绑定</el-button
-          >
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
+          <el-row>
+            <el-col>
+              <el-link type="primary" @click="bindWechat(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-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-link type="warning" @click="handleEdit(row)">编辑</el-link>-
+              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -402,6 +420,28 @@ export default {
         }
       });
     },
+    openQRCode(record) {
+      //el.innerHTML = "";
+      var self = this;
+      self.$refs["qrcode_" + record.id].innerHTML = "";
+      //商户扫码
+      var qrtext =
+        process.env.VUE_APP_PARKING_MERCHAT_URL + "?merchantId=" + record.id;
+
+      var el = self.$refs["qrcode_" + record.id];
+
+      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 () {
     this.changePage(1);