Merge branch 'xgg-saas-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-merchant

xgg-saas-merchant/app/base/controller/impl/saas/invoiceCtl.js

@@ -56,9 +56,9 @@ class InvoiceCtl extends CtlBase {
   }
 
   //发票列表
-  async invoicePage(params, pobj2, req) {
+  async merchantinvoicePage(params, pobj2, req) {
   try {
-      let rs = await this.invoiceSve.saasinvoicePage(params);
+      let rs = await this.invoiceSve.merchantinvoicePage(params);
       return rs;
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);

xgg-saas-merchant/app/base/service/impl/saas/invoiceSve.js

@@ -6,8 +6,8 @@ class InvoiceService extends ServiceBase {
         super();
     }
 
-    async saasinvoicePage(params){
-        var rs = await this.callms("invoice", "saasinvoicePage", params);
+    async merchantinvoicePage(params){
+        var rs = await this.callms("invoice", "merchantinvoicePage", params);
         if (rs && rs.data && rs.data.rows) {
             this.transOrderField(rs.data.rows);
         }

xgg-saas-merchant/app/front/entry/public/apidoc/invoice/invoice.md

@@ -8,7 +8,7 @@
 1. [审核失败](#deliverReject)
 1. [交付商交付](#delivered)
 1. [查询详细信息](#invoice)
-1. [发票列表](#invoicePage)
+1. [发票列表](#merchantinvoicePage)
 
 ## **<a name="processList"> 业务进度字典 </a>**
 [返回到目录](#menu)
@@ -517,11 +517,11 @@
 ```
 
 
-## **<a name="invoicePage"> 发票列表 </a>**　　　　　
+## **<a name="merchantinvoicePage"> 发票列表 </a>**　　　　　
 [返回到目录](#menu)　　　　　
 
 ##### URL
-[/web/saas/invoiceCtl/saasinvoicePage]
+[/web/saas/invoiceCtl/merchantinvoicePage]
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`
 #### 请求参数 `POST`