Browse Source

Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

傅行帆 6 years ago
parent
commit
b5be1b11ba

+ 2
- 1
CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml View File

233
           b.bill_name AS billName,
233
           b.bill_name AS billName,
234
           b.bill_explain AS billExplain,
234
           b.bill_explain AS billExplain,
235
           b.end_date AS endDate,
235
           b.end_date AS endDate,
236
-          b.create_date AS createDate
236
+          b.create_date AS createDate,
237
+          i.out_trade_no AS outTradeNo
237
       FROM
238
       FROM
238
           tp_bill_invoice i
239
           tp_bill_invoice i
239
           LEFT JOIN tp_bill b ON b.id = i.bill_id
240
           LEFT JOIN tp_bill b ON b.id = i.bill_id

+ 3
- 0
VUECODE/smart-property-manage/src/views/bill/statement/index.vue View File

161
         case '1':
161
         case '1':
162
           str = '线下缴费'
162
           str = '线下缴费'
163
           break
163
           break
164
+        case '2':
165
+          str = '支付宝缴费'
166
+          break
164
       }
167
       }
165
       return str
168
       return str
166
     },
169
     },