version6

prod-env/docker-compose.yml

@@ -374,6 +374,7 @@ services:
       # 挂载 Docker 卷用于持久化
       - web-property-data:/MicroCommunityWeb
       - web-property-conf:/etc/nginx
+      - web-property-logs:/var/log/
     environment:
       TZ: Asia/Bangkok
     networks:
@@ -571,6 +572,12 @@ volumes:
       type: none
       device: ${VOLUMES_USE}/web-property-conf
       o: bind
+  web-property-logs:
+    driver: local
+    driver_opts:
+      type: none
+      device: ${VOLUMES_USE}/web-property-logs
+      o: bind
 
   web-property-staff-data:
     driver: local

prod-env/init.sh

@@ -72,6 +72,7 @@ mkdir -p \
   ${VOLUMES_USE}/backend-property-data \
   ${VOLUMES_USE}/backend-iot-logs \
   ${VOLUMES_USE}/web-property-staff-conf \
+  ${VOLUMES_USE}/web-property-logs \
   ${VOLUMES_USE}/backend-iot-data
 
 

resources/Web/MicroCommunityWeb/html/components/fee/batchPayConfirm/batchPayConfirm.html

@@ -87,7 +87,7 @@
                                 class="col-sm-8"
                                 :src="ABAQRCode "
                                 alt="ABA QR Code"
-                                style="max-width: 200px; max-height: 200px;"
+                                style="max-width: 200px; "
                         >
                     </div>
 

resources/Web/MicroCommunityWeb/html/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html

@@ -120,7 +120,7 @@
                         class="col-sm-8"
                         :src="payFeeOrderConfirmInfo.ABAQRCode "
                         alt="ABA QR Code"
-                        style="max-width: 210px;"
+                        style="max-width: 200px;"
                 >
                 </div>
 

resources/Web/MicroCommunityWeb/html/pages/property/feeReceipt/feeReceipt.html

@@ -144,21 +144,24 @@
                             <td class="text-center">{{feeReceipt.createTime}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_printFeeReceipt(feeReceipt)">
+                                    <div class="dropdown">
-                                        <span><vc:i18n name="补打收据" namespace="feeReceipt"></vc:i18n></span>
+                                        <button class="btn-white btn btn-xs dropdown-toggle" type="button"
-                                    </button>
+                                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                                title="补打收据 / 补打小票">
+                                            <span><vc:i18n name="打印" namespace="feeReceipt"></vc:i18n></span>
+                                        </button>
+                                        <div class="dropdown-menu" style="min-width: 120px;">
+                                            <a class="dropdown-item" href="javascript:void(0);"
+                                               v-on:click="_printFeeReceipt(feeReceipt)">
+                                                <vc:i18n name="补打收据" namespace="feeReceipt"></vc:i18n>
+                                            </a>
+                                            <a class="dropdown-item" href="javascript:void(0);"
+                                               v-on:click="_printFeeSmallReceipt(feeReceipt)">
+                                                <vc:i18n name="补打小票" namespace="feeReceipt"></vc:i18n>
+                                            </a>
+                                        </div>
+                                    </div>
                                 </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_printFeeSmallReceipt(feeReceipt)">
-                                        <span><vc:i18n name="补打小票" namespace="feeReceipt"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <!-- <div v-if="feeReceipt.objType == '6666'" class="btn-group">
-                                     <button class="btn-white btn btn-xs"
-                                          v-on:click="_printFeeReceipt(feeReceipt)">
-                                         <span><vc:i18n name="补打收据" namespace="feeReceipt"></vc:i18n></span>(车)
-                                     </button>
-                                 </div> -->
                             </td>
                         </tr>
                         </tbody>

resources/Web/MicroCommunityWeb/html/pages/property/feeReceipt/feeReceipt.js

@@ -169,10 +169,10 @@
                 vc.component._listFeeReceipts(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _printFeeReceipt: function (_receipt) {
-                window.open($that.feeReceiptManageInfo.printUrl + "?receiptId=" + _receipt.receiptId);
+                window.open('http://localhost:8085/jmreport/view/1157941533747441664?receiptId=' + _receipt.receiptId);
             },
             _printFeeSmallReceipt: function (_receipt) {
-                window.open('/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=' + _receipt.receiptId);
+                window.open('http://localhost:8085/jmreport/view/1158273349834502144?receiptId=' + _receipt.receiptId);
             },
             _printFeeReceipts: function (_conditions) {
                 // console.log(_conditions)

resources/Web/MicroCommunityWeb/nginx.conf

@@ -1,3 +1,11 @@
+log_format custom_format '$remote_addr - $remote_user [$time_local] '
+                         '"$request" $status $body_bytes_sent '
+                         '"$http_referer" "$http_user_agent" '
+                         '$request_time $upstream_response_time '
+                         '$host $uri $args';
+
+access_log /var/log/nginx/access.log custom_format;
+
 server {
     listen 8111;
     server_name _;   # 匹配所有主机名

resources/Web/WechatOwnerService/html/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>业主家园</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.e5157221.js></script><script src=/static/js/index.b1c318ec.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.e5157221.js></script><script src=/static/js/index.f4c917e0.js></script></body></html>