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

.env.development

@@ -1,7 +1,7 @@
 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://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://xpgjapi.xiaoxinda.com
 

src/views/business/billPush-checkIn-detail.vue

@@ -370,6 +370,9 @@ export default {
             this.orderId = orderId;
             this.showModal3 = true;
         },
+        onDetailModalClose3() {
+            this.showModal3 = false;
+        }
     },
     components: {
         "billPush-qrcode-pay":billPushQrcodePay

src/views/business/billPush-checkIn-list.vue

@@ -123,7 +123,7 @@
         :data="tableData" 
         :height="tableHeight"
         v-loading="loading" stripe>
-            <el-table-column type="index" label="序号" width="50"></el-table-column>
+            <el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
             <el-table-column prop="name" label="账单名称" width="180"></el-table-column>
             <el-table-column prop="companyName" label="缴费单位" width="180"></el-table-column>
             <el-table-column prop="personName" label="推送用户" width="150">
@@ -311,6 +311,9 @@ export default {
         },1000);
     },
     methods: {
+        indexMethod(index) {
+            return (this.pageIndex - 1) * this.pageSize + (index + 1);
+        },
         changePage(pageIndex) {
             var self = this;
 

src/views/business/billPush-qrcode-pay.vue

@@ -11,12 +11,18 @@
     >
 
     <el-row :gutter="20">
-        <el-col :span="12">
-             <el-image class="qucode"  src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/%E5%BE%AE%E4%BF%A1%E6%94%AF%E4%BB%98.png"></el-image>
+        <el-col :span="12" style="text-align:center;">
+            <el-image class="qrcode"  
+            src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/%E5%BE%AE%E4%BF%A1%E6%94%AF%E4%BB%98.png"
+            fit="contain"
+            ></el-image>
             <div class="grid-content bg-purple" id="wxQuCode" ref="wxQuCode"></div>
         </el-col>
-        <el-col :span="12">
-            <el-image  class="qucode" src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/%E6%94%AF%E4%BB%98%E5%AE%9D%E6%94%AF%E4%BB%98.png"></el-image>
+        <el-col :span="12" style="text-align:center;">
+            <el-image  class="qrcode" 
+            src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/%E6%94%AF%E4%BB%98%E5%AE%9D%E6%94%AF%E4%BB%98.png"
+            fit="contain"
+            ></el-image>
             <div class="grid-content bg-purple" id="alipayQuCode" ref="alipayQuCode"></div>
         </el-col>
     </el-row>
@@ -51,8 +57,8 @@ export default {
 
                 new QRCode(this.$refs.wxQuCode, {
                     text: qucode,
-                    width: 300,
-                    height: 300,
+                    width: 200,
+                    height: 200,
                     colorDark: "#333333", //二维码颜色
                     colorLight: "#ffffff", //二维码背景色
                     correctLevel: QRCode.CorrectLevel.L//容错率，L/M/H
@@ -70,8 +76,8 @@ export default {
                 var qucode = jsonData.data;
                 new QRCode(this.$refs.alipayQuCode, {
                     text: qucode,
-                    width: 300,
-                    height: 300,
+                    width: 200,
+                    height: 200,
                     colorDark: "#333333", //二维码颜色
                     colorLight: "#ffffff", //二维码背景色
                     correctLevel: QRCode.CorrectLevel.L//容错率，L/M/H
@@ -94,12 +100,16 @@ export default {
   .grid-content {
     border-radius: 4px;
     min-height: 36px;
+    width: 200px;
+    height:200px;
+    margin:5px auto;
   }
   .row-bg {
     padding: 10px 0;
   }
-  .qucode{
-      width: 70%;
-      height: 70%;
+
+  .qrcode{
+      width: 160px;
+      height: 120px;
   }
 </style>