From 810282754545ae25e0251a8c4c3dcc4950377e23 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 10 Aug 2022 14:41:11 +0800
Subject: [PATCH] 发票

---
 common/common.js                        |  75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 common/uni.css                          |   9 ++++++++-
 pages/addTitle/addTitle.vue             | 429 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------
 pages/billing/billing.vue               | 656 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/companyMsg/companyMsg.vue         | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------
 pages/editTitle/editTitle.vue           | 423 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------
 pages/elecRecord/elecRecord.vue         |  84 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 pages/index/index.vue                   |  16 ++++++++--------
 pages/invoiceClaim/invoiceClaim.vue     |  55 +++++++++++++++++++++++++++----------------------------
 pages/invoiceForm/invoiceForm.vue       | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
 pages/invoicePreview/invoicePreview.vue |  29 +++++++++++++++++++++--------
 pages/invoiceRecord/invoiceRecord.vue   | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 pages/invoiceTitle/invoiceTitle.vue     | 354 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------
 13 files changed, 1704 insertions(+), 937 deletions(-)

diff --git a/common/common.js b/common/common.js
index 42faa9e..c0350ea 100644
--- a/common/common.js
+++ b/common/common.js
@@ -1,6 +1,8 @@
 import md5 from './md5.min.js';
 // 江阴正式环境
-var serverUrl = "https://bus.jycrtc.com";
+var serverUrl = "http://test.jycrtc.com:8096";
+// 测试 http://test.jycrtc.com:8096     正式 https://bus.jycrtc.com
+var serverPayUrl = ''
 // 测试环境
 // var serverUrl = "http://test.jycrtc.com:8096";
 //江阴微信小程序appid
@@ -51,7 +53,26 @@ const createCouponOrder = serverUrl + "/business/h5/coupon/createCouponOrder";
 //   商户卡券-使用余额购买
 const accountPay = serverUrl + "/business/h5/pay/busAccount/accountPay";
 
+// 获取发票抬头列表
+const queryCustInvoiceInfoList = serverUrl + "/business/h5/pay/invoice/queryCustInvoiceInfoList";
+// 新增一条客户发票抬头信息
+const insertCustInvoiceInfo = serverUrl + "/business/h5/pay/invoice/insertCustInvoiceInfo";
+// 通过主键更新一条客户发票抬头信息
+const updateCustInvoiceInfo = serverUrl + "/business/h5/pay/invoice/updateCustInvoiceInfo";
+// 删除一条客户发票抬头信息
+const deleteCustInvoiceInfoByID = serverUrl + "/business/h5/pay/invoice/deleteCustInvoiceInfoByID";
 
+// 获取开票订单列表
+const queryRntPayOrderForInvoice = serverUrl + "/business/h5/pay/invoice/queryRntPayOrderForInvoice";
+
+//  记录客户开发票历史信息及开票历史详情信息
+const openTicketForCustInvoiceHisInfo = serverUrl + "/business/h5/pay/invoice/openTicketForCustInvoiceHisInfo";
+
+//  查询客户所有发票历史
+const queryCustInvoiceHistoryList = serverUrl + "/business/h5/pay/invoice/queryCustInvoiceHistoryList";
+
+//  重发邮件
+const resendInvoiceMail = serverUrl + "/business/h5/pay/invoice/resendInvoiceMail";
 
 
 
@@ -223,8 +244,43 @@ var cardTypeFormat =  function(num){
     return '折扣券'
   }
 }
+
+var formatDate = function(dataStr) {
+  var time = new Date(dataStr);
+
+  function timeAdd0(str) {
+
+    if (str < 10) {
+
+      str = '0' + str;
+
+    }
+
+    return str
+
+  }
+
+  var y = time.getFullYear();
+
+  var m = time.getMonth() + 1;
+
+  var d = time.getDate();
+
+  var h = time.getHours();
+
+  var mm = time.getMinutes();
+
+  var s = time.getSeconds();
+
+  return y + '-' + timeAdd0(m) + '-' + timeAdd0(d) + ' '
+
+    + timeAdd0(h) + ':' + timeAdd0(mm) + ':' + timeAdd0(s);
+
+
+};
 export default {
 	// deviceInfo,
+  formatDate,
 	hs_wxPay_appId,
 	public_orgId,
 	appName,
@@ -254,6 +310,23 @@ export default {
   accountPay,
 
 
+  // 获取发票抬头列表
+  queryCustInvoiceInfoList,
+  //  新增一条客户发票抬头信息
+  insertCustInvoiceInfo,
+  //  通过主键更新一条客户发票抬头信息
+  updateCustInvoiceInfo,
+  // 删除一条客户发票抬头信息
+  deleteCustInvoiceInfoByID,
+  // 获取开票订单列表
+  queryRntPayOrderForInvoice,
+  //  记录客户开发票历史信息及开票历史详情信息
+  openTicketForCustInvoiceHisInfo,
+  //  查询客户所有发票历史
+  queryCustInvoiceHistoryList,
+  //  重发邮件
+  resendInvoiceMail,
+
 	//陈彪接口
 	rechargeList,
 	walletKindType,
diff --git a/common/uni.css b/common/uni.css
index 63893ff..472a18c 100644
--- a/common/uni.css
+++ b/common/uni.css
@@ -1857,4 +1857,11 @@ checkbox-group label {
 
 .marginRightArrow{
 	margin-right: 10px;
-}
\ No newline at end of file
+}
+
+.novipcard_Mid{
+	text-align: center;
+}
+
+
+
diff --git a/pages/addTitle/addTitle.vue b/pages/addTitle/addTitle.vue
index 877e86a..14fe58c 100644
--- a/pages/addTitle/addTitle.vue
+++ b/pages/addTitle/addTitle.vue
@@ -1,157 +1,292 @@
 <template>
-	<view>
-		<uni-section title="抬头类型" type="line">
-			<view class="uni-list">
-				<radio-group @change="radioChange">
-					<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
-						<view>
-							<radio :value="item.value" :checked="index === current" />
-						</view>
-						<view style="flex: 1;">{{item.name}}</view>
-					</label>
-				</radio-group>
-			</view>
-		</uni-section>
-		<uni-section title="发票详情" type="line">
-			<view class="paddinglr30">
-				<!-- 基础用法，不包含校验规则 -->
-				<uni-forms ref="baseForm" :rules="rules" :modelValue="baseFormData">
-					<uni-forms-item label="发票抬头" name="invoicetitle" required>
-						<uni-easyinput v-model="baseFormData.invoicetitle" placeholder="请输入发票抬头" />
-					</uni-forms-item>
-					<uni-forms-item label="纳税人识别号" name="userId" required>
-						<uni-easyinput v-model="baseFormData.userId" placeholder="请输入纳税人识别号" />
-					</uni-forms-item>
-					<uni-forms-item label="注册地址">
-						<uni-easyinput v-model="baseFormData.address" placeholder="请输入注册地址" />
-					</uni-forms-item>
-					<uni-forms-item label="注册电话">
-						<uni-easyinput v-model="baseFormData.telphone" placeholder="请输入注册电话" />
-					</uni-forms-item>
-					<uni-forms-item label="开户行">
-						<uni-easyinput v-model="baseFormData.bank" placeholder="请输入开户行" />
-					</uni-forms-item>
-					<uni-forms-item label="开户账号">
-						<uni-easyinput v-model="baseFormData.bankAccount" placeholder="请输入开户账号" />
-					</uni-forms-item>
-					<uni-forms-item label="电子邮箱" name="email" required>
-						<uni-easyinput v-model="baseFormData.email" placeholder="请输入电子邮箱" />
-					</uni-forms-item>
-					<uni-forms-item label="备注">
-						<uni-easyinput type="textarea" v-model="baseFormData.remark" placeholder="备注" />
-					</uni-forms-item>
-					<uni-section title="纸质票邮寄方式" type="line">
-						<uni-forms-item label="邮寄地址" name="emsAdress" required="">
-							<uni-easyinput v-model="baseFormData.emsAdress" placeholder="请输入邮寄地址" />
-						</uni-forms-item>
-						<uni-forms-item label="联系人">
-							<uni-easyinput v-model="baseFormData.emsUsername" placeholder="请输入联系人" />
-						</uni-forms-item>
-						<uni-forms-item label="联系方式">
-							<uni-easyinput v-model="baseFormData.emsTel" placeholder="请输入联系方式" />
-						</uni-forms-item>
-					</uni-section>
-				</uni-forms>
+    <view>
+        <uni-section title="抬头类型" type="line">
+            <view class="uni-list">
+                <radio-group @change="radioChange">
+                    <label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
+                        <view>
+                            <radio :value="item.value" :checked="index === current"/>
+                        </view>
+                        <view style="flex: 1;">{{item.name}}</view>
+                    </label>
+                </radio-group>
+            </view>
+        </uni-section>
 
-			</view>
-		</uni-section>
-		<view class="paddinglr30 margin-top-30 uni-common-mb">
-			<button type="primary" @click="submit('baseForm')">确认</button>
-		</view>
-	</view>
+
+        <!--个人-->
+        <uni-section title="个人发票详情" type="line" v-if="current==0">
+            <view class="paddinglr30 margin-top-30">
+                <!-- 基础用法，不包含校验规则 -->
+                <uni-forms ref="baseFormPerson" :rules="rulesPerson" :modelValue="baseFormDataPerson">
+                    <uni-forms-item label="发票抬头" name="invoicetitle" required>
+                        <uni-easyinput v-model="baseFormDataPerson.invoicetitle" placeholder="请输入发票抬头"/>
+                    </uni-forms-item>
+
+                    <uni-forms-item label="电子邮箱" name="email" required>
+                        <uni-easyinput v-model="baseFormDataPerson.email" placeholder="请输入电子邮箱"/>
+                    </uni-forms-item>
+
+                    <uni-forms-item label="备注信息">
+                        <uni-easyinput type="textarea" v-model="baseFormDataPerson.remark" placeholder="备注"/>
+                    </uni-forms-item>
+                </uni-forms>
+
+            </view>
+        </uni-section>
+
+        <!--企业-->
+        <uni-section title="发票详情" type="line" v-if="current==1">
+            <view class="paddinglr30 margin-top-30">
+                <!-- 基础用法，不包含校验规则 -->
+                <uni-forms ref="baseForm" :rules="rules" :modelValue="baseFormData">
+                    <uni-forms-item label="发票抬头" name="invoicetitle" required>
+                        <uni-easyinput v-model="baseFormData.invoicetitle" placeholder="请输入发票抬头"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="纳税人识别号" name="userId" required>
+                        <uni-easyinput v-model="baseFormData.userId" placeholder="请输入纳税人识别号"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="注册地址">
+                        <uni-easyinput v-model="baseFormData.address" placeholder="请输入注册地址"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="注册电话">
+                        <uni-easyinput v-model="baseFormData.telphone" placeholder="请输入注册电话"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="开户行">
+                        <uni-easyinput v-model="baseFormData.bank" placeholder="请输入开户行"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="开户账号">
+                        <uni-easyinput v-model="baseFormData.bankAccount" placeholder="请输入开户账号"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="电子邮箱" name="email" required>
+                        <uni-easyinput v-model="baseFormData.email" placeholder="请输入电子邮箱"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="备注">
+                        <uni-easyinput type="textarea" v-model="baseFormData.remark" placeholder="备注"/>
+                    </uni-forms-item>
+                    <!--<uni-section title="纸质票邮寄方式" type="line">-->
+                        <!--<uni-forms-item label="邮寄地址" name="emsAdress" required="">-->
+                            <!--<uni-easyinput v-model="baseFormData.emsAdress" placeholder="请输入邮寄地址"/>-->
+                        <!--</uni-forms-item>-->
+                        <!--<uni-forms-item label="联系人">-->
+                            <!--<uni-easyinput v-model="baseFormData.emsUsername" placeholder="请输入联系人"/>-->
+                        <!--</uni-forms-item>-->
+                        <!--<uni-forms-item label="联系方式">-->
+                            <!--<uni-easyinput v-model="baseFormData.emsTel" placeholder="请输入联系方式"/>-->
+                        <!--</uni-forms-item>-->
+                    <!--</uni-section>-->
+                </uni-forms>
+
+            </view>
+        </uni-section>
+        <view class="paddinglr30 margin-top-30 uni-common-mb">
+            <button type="primary" @click="submit()">确认</button>
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				items: [{
-						value: '1',
-						name: '个人'
-					},
-					{
-						value: '2',
-						name: '企业'
-					},
-					{
-						value: '3',
-						name: '非企业性单位'
-					},
-				],
-				current: 0,
-				baseFormData: {
-					invoicetitle: '',
-					userId: '',
-					address: '',
-					telphone: '',
-					bank: '',
-					bankAccount: '',
-					email: '',
-					remark: '',
-					emsAdress: '',
-					emsUsername: '',
-					emsTel: '',
-				},
-				// 校验规则
-				rules: {
-					invoicetitle: {
-						rules: [{
-							required: true,
-							errorMessage: '发票抬头不能为空'
-						}]
-					},
-					userId: {
-						rules: [{
-							required: true,
-							errorMessage: '纳税人识别号不能为空'
-						}, {
-							format: 'number',
-							errorMessage: '纳税人识别号只能输入数字'
-						}]
-					},
-					email: {
-						rules: [{
-							required: true,
-							errorMessage: '电子邮箱不能为空'
-						}, ]
-					},
-					emsAdress: {
-						rules: [{
-							required: true,
-							errorMessage: '邮寄地址不能为空'
-						}, ]
-					},
-				},
-			};
-		},
-		onLoad() {},
+export default {
+  data() {
+    return {
+      items: [{
+        value: '1',
+        name: '个人'
+      },
+        {
+          value: '2',
+          name: '企业'
+        },
+        // {
+        //   value: '3',
+        //   name: '非企业性单位'
+        // },
+      ],
+      current: 0,
+      baseFormDataPerson: {
+        invoicetitle: '',
+        email: '',
+        remark: '',
+      },
+      baseFormData: {
+        invoicetitle: '',
+        userId: '',
+        address: '',
+        telphone: '',
+        bank: '',
+        bankAccount: '',
+        email: '',
+        remark: '',
+        // emsAdress: '',
+        // emsUsername: '',
+        // emsTel: '',
+      },
+      // 校验规则
+      rulesPerson: {
+        invoicetitle: {
+          rules: [{
+            required: true,
+            errorMessage: '发票抬头不能为空'
+          }]
+        },
+
+        email: {
+          rules: [{
+            required: true,
+            errorMessage: '电子邮箱不能为空'
+          },]
+        },
+
+      },
+      // 校验规则
+      rules: {
+        invoicetitle: {
+          rules: [{
+            required: true,
+            errorMessage: '发票抬头不能为空'
+          }]
+        },
+        userId: {
+          rules: [{
+            required: true,
+            errorMessage: '纳税人识别号不能为空'
+          }, {
+            format: 'number',
+            errorMessage: '纳税人识别号只能输入数字'
+          }]
+        },
+        email: {
+          rules: [{
+            required: true,
+            errorMessage: '电子邮箱不能为空'
+          },]
+        },
+        emsAdress: {
+          rules: [{
+            required: true,
+            errorMessage: '邮寄地址不能为空'
+          },]
+        },
+      },
+    };
+  },
+  onLoad() {
+  },
+  onReady() {
+    // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+    // this.$refs.baseForm.setRules(this.rules)
+    // this.$refs.baseFormPerson.setRules(this.rulesPerson)
+  },
+  methods: {
+    radioChange: function (evt) {
+      for (let i = 0; i < this.items.length; i++) {
+        if (this.items[i].value === evt.detail.value) {
+          this.current = i;
+          break;
+        }
+      }
+      console.log(this.current)
+    },
+    submit() {
+      console.log()
+      if(this.current==0){
+        this.$refs['baseFormPerson'].validate().then(res => {
+          console.log('success', res);
 
-		onReady() {
-			// 设置自定义表单校验规则，必须在节点渲染完毕后执行
-			this.$refs.baseForm.setRules(this.rules)
-		},
+          let insertCustInvoiceInfo = this.$common.insertCustInvoiceInfo;
+          let jsondata = {
+            name: this.baseFormDataPerson.invoicetitle,
+            email: this.baseFormDataPerson.email,
+            remark: this.baseFormDataPerson.remark,
+            isDefault: '1',// 是否默认客户抬头信息，1表示是默认抬头信息，0不是默认抬头信息（默认0）
+            invoiceType: '0', // 发票类型（个人、公司），0 表示个人，1表示公司
+          };
+          uni.request({
+            url: insertCustInvoiceInfo,
+            data: JSON.stringify(this.$common.requestSign(jsondata)),
+            dataType: "json",
+            method: "POST",
+            success: (res) => {
+              console.log(res)
+              if (res.data.code == 0) {
+                uni.showToast({
+                  icon:'none',
+                  title: `新增个人发票抬头成功`
+                })
+                uni.navigateBack({
+                  delta:1,//返回层数，2则上上页
+                })
+              }else{
+                uni.showToast({
+                  icon:'none',
+                  title: res.data.message
+                })
+              }
+              if(res.code=='1001'){
+                uni.showToast({
+                  icon:'none',
+                  title: res.message
+                })
+              }
+            }
+          })
+        }).catch(err => {
+          console.log('err', err);
+        })
+      }
+      if(this.current==1){
+        this.$refs['baseForm'].validate().then(res => {
+          console.log('success', res);
+          let insertCustInvoiceInfo = this.$common.insertCustInvoiceInfo;
+          let jsondata = {
+            name: this.baseFormData.invoicetitle,
+            email: this.baseFormData.email,
+            remark: this.baseFormData.remark,
+            isDefault: '1',// 是否默认客户抬头信息，1表示是默认抬头信息，0不是默认抬头信息（默认0）
+            invoiceType: '1', // 发票类型（个人、公司），0 表示个人，1表示公司
+            bankName: this.baseFormData.bank,
+            taxid: this.baseFormData.userId,
+            cardNo: this.baseFormData.bankAccount,
+            address: this.baseFormData.address,
+            phone: this.baseFormData.telphone,
+          };
+          uni.request({
+            url: insertCustInvoiceInfo,
+            data: JSON.stringify(this.$common.requestSign(jsondata)),
+            dataType: "json",
+            method: "POST",
+            success: (res) => {
+              console.log(res)
+              if (res.data.code == 0) {
+                uni.showToast({
+                  icon:'none',
+                  title: `新增企业发票抬头成功`
+                })
+                uni.navigateBack({
+                  delta:1,//返回层数，2则上上页
+                })
+              }else{
+                uni.showToast({
+                  icon:'none',
+                  title: res.data.message
+                })
+              }
+              if(res.code=='1001'){
+                uni.showToast({
+                  icon:'none',
+                  title: res.message
+                })
+              }
+            }
+          })
+        }).catch(err => {
+          console.log('err', err);
+        })
+      }
 
-		methods: {
-			radioChange: function(evt) {
-				for (let i = 0; i < this.items.length; i++) {
-					if (this.items[i].value === evt.detail.value) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			submit(ref) {
-				this.$refs[ref].validate().then(res => {
-					console.log('success', res);
-					uni.showToast({
-						title: `校验通过`
-					})
-				}).catch(err => {
-					console.log('err', err);
-				})
-			}
-		},
-	}
+    }
+  },
+}
 </script>
 
 <style lang="scss">
diff --git a/pages/billing/billing.vue b/pages/billing/billing.vue
index d9d447a..dd96ee2 100644
--- a/pages/billing/billing.vue
+++ b/pages/billing/billing.vue
@@ -1,251 +1,419 @@
 <template>
-	<view>
-		<view class="billing-content">
-			<view class="uni-title uni-common-mt uni-common-pl">开票类型</view>
-			<view class="uni-list">
-				<radio-group @change="typeChange">
-					<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
-						<view>
-							<radio :value="item.value" :checked="index === current" />
-						</view>
-						<view>{{item.name}}</view>
-					</label>
-				</radio-group>
-			</view>
-
-			<view class="paddinglr30 bg-white uni-text border-bottom-1 pos-rel" @click="detailClick">
-				<view class="jy-fix-height34">
-					<text class="color-black">抬头类型：</text>
-					<text class="color-black">公司</text>
-				</view>
-				<view class="jy-fix-height34">
-					<text class="color-black">发票抬头：</text>
-					<text class="color-black">111</text>
-				</view>
-				<view class="jy-fix-height34">
-					<text class="color-black">纳税人识别号：</text>
-					<text class="color-black">1111</text>
-				</view>
-				<view class="jy-fix-height34" v-if="current === 0">
-					<text class="color-black">电子邮箱：</text>
-					<text class="color-black">111</text>
-				</view>
-				<view class="jy-fix-height34" v-if="current === 1">
-					<text class="color-black">邮寄地址：</text>
-					<text class="color-black">北京市海淀区玲珑路中关村产业园15A三层</text>
-				</view>
-				<view class="jy-fix-height34" v-if="current === 1">
-					<text class="color-black">联系方式：</text>
-					<text class="color-black">王旭 13810587647</text>
-				</view>
-				<view class="jy-fix-height34">
-					<text class="color-black">备注：</text>
-					<text class="color-black">111</text>
-				</view>
-
-				<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
-				</view>
-			</view>
-
-			<!-- 每项选择 -->
-			<view class="billing-list">
-				<checkbox-group name="check" @change="changeCheck" class="check">
-					<!-- 注意v-for不要设在checkbox-group上 -->
-					<label class="uni-list paddingl10 pos-rel" v-for="(item, index) in content" :key="item.id">
-						<view class="jy-fix-height34">
-							<checkbox :value="item.value" :checked="item.checked" /><text
-								class="margin-left-5">余额充值</text>
-						</view>
-						<view class="jy-fix-height34 paddinglr30 margin-left-5">{{item.name}}</view>
-						<view class="jy-fix-height34 paddinglr30 margin-left-5">{{item.time}}</view>
-						<view class="pos-abs billing-money">
-							{{item.money}}
-						</view>
-					</label>
-				</checkbox-group>
-			</view>
-			<view class="billing-total">
-				您已选中0笔交易，共0元
-			</view>
-			<!-- 全选 -->
-			<checkbox-group name="allCheck" @change="changeAll">
-				<label class="billing-all paddinglr30">
-					<checkbox :value="allCheck.value" :checked="allCheck.checked" /><text>{{allCheck.name}}</text>
-					<button type="primary" class="billing-submit" @click="billingSubmit">提交发票</button>
-				</label>
-			</checkbox-group>
-
-		</view>
-	</view>
+    <view>
+        <view class="billing-content">
+            <!--<view class="uni-title uni-common-mt uni-common-pl">开票类型</view>-->
+            <!--<view class="uni-list">-->
+            <!--<radio-group @change="typeChange">-->
+            <!--<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">-->
+            <!--<view>-->
+            <!--<radio :value="item.value" :checked="index === current" />-->
+            <!--</view>-->
+            <!--<view>{{item.name}}</view>-->
+            <!--</label>-->
+            <!--</radio-group>-->
+            <!--</view>-->
+
+            <view class="paddinglr30 bg-white uni-text border-bottom-1 pos-rel" @click="detailClick">
+                <view class="jy-fix-height34 commonText">
+                    <text class="color-black">抬头类型：</text>
+                    <text class="color-black">{{invoiceType==0?'个人':'企业'}}</text>
+                </view>
+                <view class="jy-fix-height34 commonText">
+                    <text class="color-black">发票抬头：</text>
+                    <text class="color-black">{{name}}</text>
+                </view>
+                <!--<view class="jy-fix-height34 commonText">-->
+                    <!--<text class="color-black">纳税人识别号：</text>-->
+                    <!--<text class="color-black">1111</text>-->
+                <!--</view>-->
+                <view class="jy-fix-height34 commonText" v-if="current === 1">
+                    <text class="color-black">电子邮箱：</text>
+                    <text class="color-black">{{email}}</text>
+                </view>
+                <!--<view class="jy-fix-height34 commonText" v-if="current === 1">-->
+                    <!--<text class="color-black">邮寄地址：</text>-->
+                    <!--<text class="color-black ">北京市海淀区玲珑路中关村产业园15A三层北京市海淀区玲珑路中关村产业园15A三层</text>-->
+                <!--</view>-->
+                <!--<view class="jy-fix-height34 commonText" v-if="current === 1">-->
+                    <!--<text class="color-black">联系方式：</text>-->
+                    <!--<text class="color-black">王旭 13810587647</text>-->
+                <!--</view>-->
+                <view class="jy-fix-height34 commonText">
+                    <text class="color-black">备注：</text>
+                    <text class="color-black">{{remark}}</text>
+                </view>
+
+                <view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
+                </view>
+            </view>
+
+            <!-- 每项选择 -->
+            <view class="billing-list" v-if="content.length>0">
+                <checkbox-group name="check" @change="changeCheck" class="check">
+                    <!-- 注意v-for不要设在checkbox-group上 -->
+                    <label class="uni-list paddingl10 pos-rel " v-for="(item, index) in content" :key="item.id">
+                        <view class="pos-abs billing-check">
+                            <checkbox :value="item.rltOrderId" :checked="item.checked"/>
+                        </view>
+                        <view class="">
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-if="type=='1'">停车缴费</view>
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-else-if="type=='2'">会员卡缴费</view>
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-else>账户充值</view>
+
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-if="type=='1'">{{item.carNumber}}</view>
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-else-if="type=='2'">{{item.carNumber}}</view>
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-else>充值金额</view>
+
+
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-if="item.terminalSource=='4'">充值渠道:云平台</view>
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-else-if="item.terminalSource=='11'">充值渠道:微信小程序</view>
+                            <view class="jy-fix-height34 paddinglr30 margin-left-5" v-else>充值渠道:商户端微信小程序</view>
+
+
+                            <view class="pos-abs billing-money">
+                                {{(item.orderActFee/100).toFixed(2)}} 元
+                            </view>
+                        </view>
+
+                    </label>
+                </checkbox-group>
+            </view>
+
+            <view v-else class="novipcard_Mid"  style="padding-top: 20px;">
+                <image class="novipcard" src="../../static/vipcard/novipcard.png" mode="aspectFit"></image>
+                <view class="novipcard_txt">
+                    暂无记录
+                </view>
+
+            </view>
+
+            <view class="billing-total">
+                您已选中{{payNum}}笔交易，共{{(moneyTotal/100).toFixed(2)}}元
+            </view>
+            <!-- 全选 -->
+            <checkbox-group name="allCheck" @change="changeAll">
+                <label class="billing-all paddinglr30">
+                    <checkbox :value="allCheck.value" :checked="allCheck.checked"/>
+                    <text>{{allCheck.name}}</text>
+                    <button type="primary" class="billing-submit" @click="billingSubmit">提交发票</button>
+                </label>
+            </checkbox-group>
+
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				items: [{
-						value: '1',
-						name: '增值税电子普通发票',
-						checked: 'true'
-					},
-					{
-						value: '2',
-						name: '增值税纸质专用发票',
-
-					}
-				],
-				current: 0,
-				allCheck: {
-					name: '全选',
-					value: 'all',
-					checked: false
-				},
-				content: [{
-						name: '微信支付',
-						value: '1',
-						id: 1,
-						money: '5000',
-						time: '2022-01-12',
-						whether: true
-					},
-					{
-						name: '微信支付',
-						value: '2',
-						money: '5000',
-						time: '2022-01-12',
-						id: 2,
-						whether: true
-					},
-					{
-						name: '微信支付',
-						value: '2',
-						money: '5000',
-						time: '2022-01-12',
-						id: 2,
-						whether: true
-					},
-					{
-						name: '微信支付',
-						value: '2',
-						money: '5000',
-						time: '2022-01-12',
-						id: 2,
-						whether: true
-					},
-					{
-						name: '线下公对公',
-						value: '3',
-						money: '5000',
-						time: '2022-01-12',
-						id: 3,
-						whether: true
-					}
-				]
-
-			}
-		},
-		methods: {
-			typeChange: function(evt) {
-				for (let i = 0; i < this.items.length; i++) {
-					if (this.items[i].value === evt.detail.value) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			detailClick() {
-				uni.navigateTo({
-					url: '../invoiceTitle/invoiceTitle'
-
-				});
-			},
-			// 全选
-			changeAll: function(e) {
-				if (e.detail.value.length == 0) {
-					this.content.map(item => this.$set(item, 'checked', false));
-					this.$set(this.allCheck, 'checked', false);
-				} else {
-					this.content.map(item => this.$set(item, 'checked', true));
-					this.$set(this.allCheck, 'checked', true);
-				}
-			},
-			// 多选
-			changeCheck: function(e) {
-				var items = this.content;
-				var len = this.content.length;
-				var values = e.detail.value;
-				// console.log(values)
-				for (var i = 0; i < len; i++) {
-					var item = items[i];
-					if (values.includes(item.value)) {
-						this.$set(item, 'checked', true);
-					} else {
-						this.$set(item, 'checked', false);
-					}
-				}
-				// 判断选中状态
-				var arr = [];
-				this.content.forEach(item => item.whether == true ? arr.push(item) : '');
-				var isAll = arr.every(item => item.checked == true);
-				isAll ? this.$set(this.allCheck, 'checked', true) : this.$set(this.allCheck, 'checked', false)
-			},
-			billingSubmit() {
-
-			},
-
-		}
-	}
+export default {
+  data() {
+    return {
+
+
+      custName: '', // 购买方填写名称（开发票个人或公司名称）公司必填
+      invoiceType: '', // 发票类型（个人、公司），0 表示个人，1表示公司,2表示非企业性质单位
+      custTaxid: '', // 纳税人识别号（税号） 公司必填
+      custEmail: '', // 客户电子邮箱
+
+      payNum: 0,
+      moneyTotal: 0,
+      items: [{
+        value: '1',
+        name: '增值税电子普通发票',
+        checked: 'true'
+      },
+        {
+          value: '2',
+          name: '增值税纸质专用发票',
+        }
+      ],
+      current: 0,
+      allCheck: {
+        name: '全选',
+        value: 'all',
+        checked: false
+      },
+      content: [
+      //   {
+      //   name: '微信支付',
+      //   value: '1',
+      //   id: 1,
+      //   money: '5000',
+      //   time: '2022-01-12',
+      //   whether: true
+      // },
+      //   {
+      //     name: '微信支付',
+      //     value: '2',
+      //     money: '5000',
+      //     time: '2022-01-12',
+      //     id: 2,
+      //     whether: true
+      //   },
+      //   {
+      //     name: '微信支付',
+      //     value: '3',
+      //     money: '5000',
+      //     time: '2022-01-12',
+      //     id: 3,
+      //     whether: true
+      //   },
+      //   {
+      //     name: '微信支付',
+      //     value: '4',
+      //     money: '5000',
+      //     time: '2022-01-12',
+      //     id: 4,
+      //     whether: true
+      //   },
+      //   {
+      //     name: '线下公对公',
+      //     value: '5',
+      //     money: '5000',
+      //     time: '2022-01-12',
+      //     id: 5,
+      //     whether: true
+      //   }
+      ],
+      invoiceType:0,  // 发票类型
+      email:'', // 发票邮箱
+      name:'', // 发票抬头
+      remark:'', // 备注
+      type:'1', //
+      useTitleIfo:{}
+    }
+  },
+  onLoad(params){
+    console.log(params)
+    // invoiceType='+i.invoiceType+'&email='+i.email+'&name'+i.name+'&remark'+i.remark
+    this.invoiceType = params.invoiceType
+    this.custEmail = params.email
+    this.custName = params.name
+    this.remark = params.remark
+    this.useTitleIfo = JSON.parse(uni.getStorageSync('useTitleIfo'))
+    this.custTaxid = this.useTitleIfo.taxid
+    this.name = params.name
+
+    this.type = uni.getStorageSync('type') // 发票类型。1-停车记录，2-会员卡，3-余额充值
+    console.log(this.type)
+    console.log(this.custTaxid)
+    console.log(this.useTitleIfo)
+
+  },
+  onShow() {
+    this.queryRntPayOrderForInvoice()
+  },
+  methods: {
+    queryRntPayOrderForInvoice() {
+      var queryRntPayOrderForInvoice = this.$common.queryRntPayOrderForInvoice;
+      var jsondata = {
+        invoiceType: this.type,
+      };
+      uni.request({
+        url: queryRntPayOrderForInvoice,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+          console.log(res)
+          if (res.data.code == 0) {
+            this.content = res.data.data
+            console.log(this.content)
+          }
+        }
+      })
+    },
+    typeChange: function (evt) {
+      for (let i = 0; i < this.items.length; i++) {
+        if (this.items[i].value === evt.detail.value) {
+          this.current = i;
+          break;
+        }
+      }
+    },
+    detailClick() {
+      uni.navigateTo({
+        url: '../invoiceTitle/invoiceTitle'
+      });
+    },
+    // 全选
+    changeAll: function (e) {
+      console.log(e.detail.value)
+      let me = this
+      if (e.detail.value.length == 0) {
+        this.content.map(item => this.$set(item, 'checked', false));
+        this.$set(this.allCheck, 'checked', false);
+        this.payNum = 0
+        this.moneyTotal = 0
+      } else {
+        this.content.forEach(function (item, index) {
+          console.log(item);
+          me.$set(item, 'checked', true)
+          me.payNum++
+          me.moneyTotal += item.orderActFee
+        });
+        this.$set(this.allCheck, 'checked', true);
+      }
+    },
+    // 多选
+    changeCheck: function (e) {
+      let me = this
+      var items = this.content;
+      var len = this.content.length;
+      var values = e.detail.value;
+      console.log(values)
+      for (var i = 0; i < len; i++) {
+        var item = items[i];
+        if (values.includes(item.rltOrderId)) {
+          this.$set(item, 'checked', true);
+        } else {
+          this.$set(item, 'checked', false);
+        }
+      }
+      console.log(items)
+      // 判断选中状态
+      var arr = [];
+      this.payNum = 0
+      this.moneyTotal = 0
+      // this.content.forEach(item => item.checked == true ? arr.push(item) : '');
+      this.content.forEach(function (item, index) {
+        console.log(item);
+        if (item.checked == true) {
+          me.payNum++
+          me.moneyTotal += item.orderActFee
+        }
+      });
+      var isAll = this.content.every(item => item.checked == true);
+      isAll ? this.$set(this.allCheck, 'checked', true) : this.$set(this.allCheck, 'checked', false)
+    },
+    billingSubmit() {
+      let orderList = []
+      this.content.forEach(function (item, index) {
+        if (item.checked == true) {
+          orderList.push(item)
+        }
+      });
+      if(orderList.length==0){
+        uni.showToast({
+          icon:'none',
+          title: `请至少选择一条再提交`
+        })
+        return
+      }
+
+      var openTicketForCustInvoiceHisInfo = this.$common.openTicketForCustInvoiceHisInfo;
+      var jsondata = {
+        orderList: JSON.stringify(orderList),
+        invoiceTotalFee: this.moneyTotal,
+        custName: this.useTitleIfo.name, // 购买方填写名称（开发票个人或公司名称）公司必填
+        invoiceType: this.invoiceType, // 发票类型（个人、公司），0 表示个人，1表示公司,2表示非企业性质单位
+        custTaxid: this.custTaxid, // 纳税人识别号（税号） 公司必填
+        custEmail: this.custEmail, // 客户电子邮箱
+        invoiceKind: '0', // 发票种类：0 普通发票，1增值发票
+        orgId: this.$common.public_orgId,
+        saleTaxid:'91320281MA1X8C486Y',
+        address:this.useTitleIfo.address,
+
+        invoiceState:this.useTitleIfo.dataState,
+        custBankName:this.useTitleIfo.bankName,
+        custCardNo:this.useTitleIfo.cardNo,
+        custAddress:this.useTitleIfo.address,
+        custPhone:this.useTitleIfo.phone,
+        remark:this.useTitleIfo.remark
+        // this.useTitleIfo
+
+      };
+      uni.request({
+        url: openTicketForCustInvoiceHisInfo,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+          console.log(res)
+          if (res.data.code == 0) {
+            this.queryRntPayOrderForInvoice()
+            uni.showToast({
+              icon:'none',
+              title: `提交成功`
+            })
+          }
+        }
+      })
+
+    },
+    moneyCount() {
+    },
+  }
+}
 </script>
 
-<style lang="scss">
-	.icon-arrowright {
-		color: #bbb;
-		// font-size: 20px;
-		right: 2upx;
-		top: 73px;
-	}
-
-	.billing-list {
-		width: 100%;
-		margin-bottom: 82px;
-	}
-
-	.billing-money {
-		top: 34px;
-		right: 20px;
-		height: 34px;
-		list-height: 34px;
-		// z-index: 1;
-	}
-
-	.billing-total {
-		position: fixed;
-		bottom: 46px;
-		left: 0;
-		width: 100%;
-		height: 34px;
-		line-height: 34px;
-		// color: #51c24e;
-		background-color: #f2fded;
-	}
-
-	.billing-all {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		height: 46px;
-		line-height: 46px;
-		// font-size: 24px;
-		background-color: #f6f6f6;
-	}
-
-	.billing-submit {
-		position: fixed;
-		bottom: 0;
-		right: 0;
-		width: 100px;
-		height: 46px;
-		line-height: 46px;
-	}
+<style lang="scss" scoped>
+    .icon-arrowright {
+        color: #bbb;
+        // font-size: 20px;
+        right: 2px;
+        top: 33px;
+    }
+
+    .billing-list {
+        width: 100%;
+        margin-bottom: 82px;
+    }
+
+    .billing-check {
+        top: 38px;
+        left: 4px;
+        height: 34px;
+        list-height: 34px;
+        // z-index: 1;
+    }
+
+    .billing-money {
+        top: 38px;
+        right: 20px;
+        height: 34px;
+        list-height: 34px;
+        // z-index: 1;
+    }
+
+    .billing-total {
+        padding-left: 30px;
+        position: fixed;
+        bottom: 46px;
+        left: 0;
+        width: 100%;
+        height: 34px;
+        line-height: 34px;
+        // color: #51c24e;
+        background-color: #f2fded;
+        z-index: 11;
+    }
+
+    .billing-all {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 46px;
+        line-height: 46px;
+        // font-size: 24px;
+        background-color: #f6f6f6;
+        z-index: 11;
+    }
+
+    .billing-submit {
+        position: fixed;
+        bottom: 0;
+        right: 0;
+        width: 100px;
+        height: 46px;
+        line-height: 46px;
+    }
+
+    .commonText {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        width: 100%;
+    }
+
 </style>
diff --git a/pages/companyMsg/companyMsg.vue b/pages/companyMsg/companyMsg.vue
index 9319ef9..2e52c77 100644
--- a/pages/companyMsg/companyMsg.vue
+++ b/pages/companyMsg/companyMsg.vue
@@ -1,119 +1,99 @@
 <template>
-	<view>
-		<view class="paddinglr30 bg-white uni-text margin-bottom-5">
-			<view class="jy-fix-height34">
-				<text class="color-black">抬头类型：</text>
-				<text class="color-black">公司</text>
-			</view>
-		</view>
-		<uni-section title="发票详情" type="line">
-			<view class="uni-list">
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						<text class="is-required">*</text>发票抬头:
-					</view>
-					<view class="uni-list-cell-db">
-						中兴智能交通股份有限公司
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						<text class="is-required">*</text>纳税人识别号:
-					</view>
-					<view class="uni-list-cell-db">
-						123333
-					</view>
-				</view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left jy-fix-height34">
-						注册地址:
-					</view>
-					<view class="uni-list-cell-db uni-ellipsis-2">
-						北京市海淀区玲珑路中关村产业园北京市海淀区玲珑路中关村产业园
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						注册电话:
-					</view>
-					<view class="uni-list-cell-db">
-						123
-					</view>
-				</view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left jy-fix-height34">
-						开户行:
-					</view>
-					<view class="uni-list-cell-db uni-ellipsis-2">
-						北京市海淀区玲珑路中关村产业园北京市海淀区玲珑路中关村产业园
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						开户账号:
-					</view>
-					<view class="uni-list-cell-db">
-						1123村产业园
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						<text class="is-required">*</text>电子邮箱:
-					</view>
-					<view class="uni-list-cell-db">
-						1123@qq.com
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						备注:
-					</view>
-					<view class="uni-list-cell-db">
-						备注
-					</view>
-				</view>
-			</view>
-		</uni-section>
+    <view>
+        <view class=" bg-white uni-text margin-bottom-5" style="padding-left: 15px">
+            <view class="jy-fix-height34">
+                <text class="color-black">抬头类型：</text>
+                <text class="color-black">{{titleIfo.invoiceType==0?'个人':'企业'}}</text>
+            </view>
+        </view>
+        <uni-section title="发票详情" type="line">
+            <view class="uni-list">
+                <view class="uni-list-cell jy-fix-height34">
+                    <view class="uni-list-cell-left">
+                        <text class="is-required">*</text>
+                        发票抬头:
+                    </view>
+                    <view class="uni-list-cell-db">
+                        {{titleIfo.name}}
+                    </view>
+                </view>
+                <view class="uni-list-cell jy-fix-height34" v-if="titleIfo.invoiceType==1">
+                    <view class="uni-list-cell-left">
+                        <text class="is-required">*</text>
+                        纳税人识别号:
+                    </view>
+                    <view class="uni-list-cell-db">
+                        {{titleIfo.taxid}}
+                    </view>
+                </view>
+                <view class="uni-list-cell"  v-if="titleIfo.invoiceType==1">
+                    <view class="uni-list-cell-left jy-fix-height34" >
+                        注册地址:
+                    </view>
+                    <view class="uni-list-cell-db uni-ellipsis-2">
+                        {{titleIfo.address}}
+                    </view>
+                </view>
+                <view class="uni-list-cell jy-fix-height34"  v-if="titleIfo.invoiceType==1">
+                    <view class="uni-list-cell-left">
+                        注册电话:
+                    </view>
+                    <view class="uni-list-cell-db">
+                        {{titleIfo.phone}}
+                    </view>
+                </view>
+                <view class="uni-list-cell"  v-if="titleIfo.invoiceType==1">
+                    <view class="uni-list-cell-left jy-fix-height34">
+                        开户行:
+                    </view>
+                    <view class="uni-list-cell-db uni-ellipsis-2">
+                        {{titleIfo.bankName}}
+                    </view>
+                </view>
+                <view class="uni-list-cell jy-fix-height34"  v-if="titleIfo.invoiceType==1">
+                    <view class="uni-list-cell-left">
+                        开户账号:
+                    </view>
+                    <view class="uni-list-cell-db">
+                        {{titleIfo.taxid}}
+                    </view>
+                </view>
+                <view class="uni-list-cell jy-fix-height34"  >
+                    <view class="uni-list-cell-left">
+                        <text class="is-required">*</text>
+                        电子邮箱:
+                    </view>
+                    <view class="uni-list-cell-db">
+                        {{titleIfo.email}}
+                    </view>
+                </view>
+                <view class="uni-list-cell jy-fix-height34" >
+                    <view class="uni-list-cell-left">
+                        备注:
+                    </view>
+                    <view class="uni-list-cell-db">
+                        {{titleIfo.remark}}
+                    </view>
+                </view>
+            </view>
+        </uni-section>
 
-		<uni-section title="纸质票邮寄方式" type="line">
-			<view class="uni-list">
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left jy-fix-height34">
-						邮寄地址:
-					</view>
-					<view class="uni-list-cell-db uni-ellipsis-2">
-						北京市海淀区玲珑路中关村产业园北京市海淀区玲珑路中关村产业园
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						联系人:
-					</view>
-					<view class="uni-list-cell-db">
-						中兴智能交通股份有限公司
-					</view>
-				</view>
-				<view class="uni-list-cell jy-fix-height34">
-					<view class="uni-list-cell-left">
-						联系方式:
-					</view>
-					<view class="uni-list-cell-db">
-						13113131212
-					</view>
-				</view>
-			</view>
-		</uni-section>
-	</view>
+
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			};
-		}
-	}
+export default {
+  data() {
+    return {
+      titleIfo:{}
+    };
+  },
+  onLoad(){
+    this.titleIfo = JSON.parse(uni.getStorageSync('companyMsg'))
+    console.log(this.titleIfo)
+  }
+}
 </script>
 
 <style lang="scss">
diff --git a/pages/editTitle/editTitle.vue b/pages/editTitle/editTitle.vue
index 14c177b..beb1a9f 100644
--- a/pages/editTitle/editTitle.vue
+++ b/pages/editTitle/editTitle.vue
@@ -1,128 +1,309 @@
 <template>
-	<view>
-		<uni-section title="抬头类型" type="line">
-			<view class="uni-list">
-				<radio-group @change="radioChange">
-					<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
-						<view>
-							<radio :value="item.value" :checked="index === current" />
-						</view>
-						<view style="flex: 1;">{{item.name}}</view>
-					</label>
-				</radio-group>
-			</view>
-		</uni-section>
-		<uni-section title="发票详情" type="line">
-			<view class="paddinglr30">
-				<!-- 包含校验规则 -->
-				<uni-forms ref="baseForm" :rules="rules" :modelValue="baseFormData">
-					<uni-forms-item label="发票抬头" name="invoicetitle" required>
-						<uni-easyinput v-model="baseFormData.invoicetitle" placeholder="请输入发票抬头" />
-					</uni-forms-item>			
-					<uni-forms-item label="电子邮箱" name="email" required>
-						<uni-easyinput v-model="baseFormData.email" placeholder="请输入电子邮箱" />
-					</uni-forms-item>
-					<uni-forms-item label="备注">
-						<uni-easyinput type="textarea" v-model="baseFormData.remark" placeholder="备注" />
-					</uni-forms-item>
-					<uni-section title="纸质票邮寄方式" type="line">
-						<uni-forms-item label="邮寄地址" name="emsAdress" required="">
-							<uni-easyinput v-model="baseFormData.emsAdress" placeholder="请输入邮寄地址" />
-						</uni-forms-item>
-						<uni-forms-item label="联系人">
-							<uni-easyinput v-model="baseFormData.emsUsername" placeholder="请输入联系人" />
-						</uni-forms-item>
-						<uni-forms-item label="联系方式">
-							<uni-easyinput v-model="baseFormData.emsTel" placeholder="请输入联系方式" />
-						</uni-forms-item>
-					</uni-section>
-				</uni-forms>
-
-			</view>
-		</uni-section>
-		<view class="paddinglr30 margin-top-30 uni-common-mb">
-			<button type="primary" @click="submit('baseForm')">确认</button>
-		</view>
-	</view>
+    <view>
+        <uni-section title="抬头类型" type="line">
+            <view class="uni-list">
+                <radio-group @change="radioChange">
+                    <label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
+                        <view>
+                            <radio :value="item.value" :checked="index === current"/>
+                        </view>
+                        <view style="flex: 1;">{{item.name}}</view>
+                    </label>
+                </radio-group>
+            </view>
+        </uni-section>
+
+        <!--个人-->
+        <uni-section title="发票详情" type="line" v-if="current==0">
+            <view class="paddinglr30 margin-top-30">
+                <!-- 包含校验规则 -->
+                <uni-forms ref="baseFormPerson" :rules="rulesPerson" :modelValue="baseFormDataPerson">
+                    <uni-forms-item label="发票抬头" name="invoicetitle" required>
+                        <uni-easyinput v-model="baseFormDataPerson.invoicetitle" placeholder="请输入发票抬头"/>
+                    </uni-forms-item>
+
+                    <uni-forms-item label="电子邮箱" name="email" required>
+                        <uni-easyinput v-model="baseFormDataPerson.email" placeholder="请输入电子邮箱"/>
+                    </uni-forms-item>
+
+                    <uni-forms-item label="备注信息">
+                        <uni-easyinput type="textarea" v-model="baseFormDataPerson.remark" placeholder="备注"/>
+                    </uni-forms-item>
+                </uni-forms>
+            </view>
+        </uni-section>
+
+
+        <!--企业-->
+        <uni-section title="发票详情" type="line" v-if="current==1">
+            <view class="paddinglr30 margin-top-30">
+                <!-- 基础用法，不包含校验规则 -->
+                <uni-forms ref="baseForm" :rules="rules" :modelValue="baseFormData">
+                    <uni-forms-item label="发票抬头" name="invoicetitle" required>
+                        <uni-easyinput v-model="baseFormData.invoicetitle" placeholder="请输入发票抬头"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="纳税人识别号" name="userId" required>
+                        <uni-easyinput v-model="baseFormData.userId" placeholder="请输入纳税人识别号"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="注册地址">
+                        <uni-easyinput v-model="baseFormData.address" placeholder="请输入注册地址"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="注册电话">
+                        <uni-easyinput v-model="baseFormData.phone" placeholder="请输入注册电话"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="开户行">
+                        <uni-easyinput v-model="baseFormData.bank" placeholder="请输入开户行"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="开户账号">
+                        <uni-easyinput v-model="baseFormData.bankAccount" placeholder="请输入开户账号"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="电子邮箱" name="email" required>
+                        <uni-easyinput v-model="baseFormData.email" placeholder="请输入电子邮箱"/>
+                    </uni-forms-item>
+                    <uni-forms-item label="备注">
+                        <uni-easyinput type="textarea" v-model="baseFormData.remark" placeholder="备注"/>
+                    </uni-forms-item>
+                    <!--<uni-section title="纸质票邮寄方式" type="line">-->
+                    <!--<uni-forms-item label="邮寄地址" name="emsAdress" required="">-->
+                    <!--<uni-easyinput v-model="baseFormData.emsAdress" placeholder="请输入邮寄地址"/>-->
+                    <!--</uni-forms-item>-->
+                    <!--<uni-forms-item label="联系人">-->
+                    <!--<uni-easyinput v-model="baseFormData.emsUsername" placeholder="请输入联系人"/>-->
+                    <!--</uni-forms-item>-->
+                    <!--<uni-forms-item label="联系方式">-->
+                    <!--<uni-easyinput v-model="baseFormData.emsTel" placeholder="请输入联系方式"/>-->
+                    <!--</uni-forms-item>-->
+                    <!--</uni-section>-->
+                </uni-forms>
+
+            </view>
+        </uni-section>
+
+        <view class="paddinglr30 margin-top-30 uni-common-mb">
+            <button type="primary" @click="submit">确认</button>
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				items: [{
-						value: '1',
-						name: '个人'
-					},
-					{
-						value: '2',
-						name: '企业'
-					},
-					{
-						value: '3',
-						name: '非企业性单位'
-					},
-				],
-				current: 0,
-				baseFormData: {
-					invoicetitle: '',			
-					email: '',
-					remark: '',
-					emsAdress: '',
-					emsUsername: '',
-					emsTel: '',
-				},
-				// 校验规则
-				rules: {
-					invoicetitle: {
-						rules: [{
-							required: true,
-							errorMessage: '发票抬头不能为空'
-						}]
-					},			
-					email: {
-						rules: [{
-							required: true,
-							errorMessage: '电子邮箱不能为空'
-						}, ]
-					},
-					emsAdress: {
-						rules: [{
-							required: true,
-							errorMessage: '邮寄地址不能为空'
-						}, ]
-					},
-				},
-			};
-		},
-		onLoad() {},
-
-		onReady() {
-			// 设置自定义表单校验规则，必须在节点渲染完毕后执行
-			this.$refs.baseForm.setRules(this.rules)
-		},
-
-		methods: {
-			radioChange: function(evt) {
-				for (let i = 0; i < this.items.length; i++) {
-					if (this.items[i].value === evt.detail.value) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			submit(ref) {
-				this.$refs[ref].validate().then(res => {
-					console.log('success', res);
-					uni.showToast({
-						title: `校验通过`
-					})
-				}).catch(err => {
-					console.log('err', err);
-				})
-			}
-		},
-	}
+export default {
+  data() {
+    return {
+      titleIfo:'',
+      items: [{
+        value: '1',
+        name: '个人'
+      },
+        {
+          value: '2',
+          name: '企业'
+        },
+        // {
+        //   value: '3',
+        //   name: '非企业性单位'
+        // },
+      ],
+      current: 0,
+      baseFormDataPerson: {
+        invoicetitle: '',
+        email: '',
+        remark: '',
+      },
+      baseFormData: {
+        invoicetitle: '',
+        userId: '',
+        address: '',
+        phone: '',
+        bank: '',
+        bankAccount: '',
+        email: '',
+        remark: '',
+        // emsAdress: '',
+        // emsUsername: '',
+        // emsTel: '',
+      },
+      // 校验规则
+      rulesPerson: {
+        invoicetitle: {
+          rules: [{
+            required: true,
+            errorMessage: '发票抬头不能为空'
+          }]
+        },
+
+        email: {
+          rules: [{
+            required: true,
+            errorMessage: '电子邮箱不能为空'
+          },]
+        },
+
+      },
+      // 校验规则
+      rules: {
+        invoicetitle: {
+          rules: [{
+            required: true,
+            errorMessage: '发票抬头不能为空'
+          }]
+        },
+        userId: {
+          rules: [{
+            required: true,
+            errorMessage: '纳税人识别号不能为空'
+          }, {
+            format: 'number',
+            errorMessage: '纳税人识别号只能输入数字'
+          }]
+        },
+        email: {
+          rules: [{
+            required: true,
+            errorMessage: '电子邮箱不能为空'
+          },]
+        },
+        emsAdress: {
+          rules: [{
+            required: true,
+            errorMessage: '邮寄地址不能为空'
+          },]
+        },
+      },
+    };
+  },
+  onLoad() {
+    this.titleIfo = JSON.parse(uni.getStorageSync('titleIfo'))
+    console.log(this.titleIfo)
+    if(this.titleIfo.invoiceType == '0'){
+      this.current = 0
+
+      this.baseFormDataPerson.invoicetitle = this.titleIfo.name
+      this.baseFormDataPerson.email = this.titleIfo.email
+      this.baseFormDataPerson.remark = this.titleIfo.remark
+
+    }else{
+      this.current = 1
+
+      this.baseFormData.invoicetitle = this.titleIfo.name
+      this.baseFormData.email = this.titleIfo.email
+      this.baseFormData.remark = this.titleIfo.remark
+      this.baseFormData.bank = this.titleIfo.bankName
+      this.baseFormData.bankAccount = this.titleIfo.cardNo
+      this.baseFormData.address = this.titleIfo.address
+      this.baseFormData.userId  = this.titleIfo.taxid
+      this.baseFormData.phone  = this.titleIfo.phone
+
+    }
+  },
+  onReady() {
+    // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+    // this.$refs.baseForm.setRules(this.rules)
+  },
+  methods: {
+    radioChange: function (evt) {
+      for (let i = 0; i < this.items.length; i++) {
+        if (this.items[i].value === evt.detail.value) {
+          this.current = i;
+          break;
+        }
+      }
+    },
+    submit(ref) {
+      console.log()
+      if(this.current==0){
+        this.$refs['baseFormPerson'].validate().then(res => {
+          console.log('success', res);
+
+
+          let updateCustInvoiceInfo = this.$common.updateCustInvoiceInfo;
+          let jsondata = {
+            id: this.titleIfo.id,
+            name: this.baseFormDataPerson.invoicetitle,
+            email: this.baseFormDataPerson.email,
+            remark: this.baseFormDataPerson.remark,
+            invoiceType:'0',
+            isDefault:this.titleIfo.isDefault
+
+          };
+          uni.request({
+            url: updateCustInvoiceInfo,
+            data: JSON.stringify(this.$common.requestSign(jsondata)),
+            dataType: "json",
+            method: "POST",
+            success: (res) => {
+              console.log(res)
+              if (res.data.code == 0) {
+                uni.showToast({
+                  icon:'none',
+                  title: `编辑成功`
+                })
+                uni.navigateBack({
+                  delta: 1
+                })
+              }else{
+                uni.showToast({
+                  icon:'none',
+                  title: res.data.message
+                })
+
+              }
+            }
+          })
+
+        }).catch(err => {
+          console.log('err', err);
+        })
+      }
+      if(this.current==1){
+        this.$refs['baseForm'].validate().then(res => {
+
+          let updateCustInvoiceInfo = this.$common.updateCustInvoiceInfo;
+          let jsondata = {
+
+            id: this.titleIfo.id,
+            name: this.baseFormData.invoicetitle,
+            email: this.baseFormData.email,
+            remark: this.baseFormData.remark,
+            invoiceType:'1',
+            isDefault:this.titleIfo.isDefault,
+            taxid:this.baseFormData.userId,
+            bankName:this.baseFormData.bank,
+            cardNo:this.baseFormData.bankAccount,
+            address:this.baseFormData.address,
+            phone:this.baseFormData.phone,
+          };
+          uni.request({
+            url: updateCustInvoiceInfo,
+            data: JSON.stringify(this.$common.requestSign(jsondata)),
+            dataType: "json",
+            method: "POST",
+            success: (res) => {
+              console.log(res)
+              if (res.data.code == 0) {
+                uni.showToast({
+                  icon:'none',
+                  title: `编辑成功`
+                })
+                uni.navigateBack({
+                  delta: 1
+                })
+              }else{
+                uni.showToast({
+                  icon:'none',
+                  title: res.data.message
+                })
+
+              }
+            }
+          })
+
+        }).catch(err => {
+          console.log('err', err);
+        })
+      }
+    }
+  },
+}
 </script>
 
 <style lang="scss">
diff --git a/pages/elecRecord/elecRecord.vue b/pages/elecRecord/elecRecord.vue
index 3e801f3..ea7a8dd 100644
--- a/pages/elecRecord/elecRecord.vue
+++ b/pages/elecRecord/elecRecord.vue
@@ -1,47 +1,64 @@
 <template>
 	<view>
 		<view class="elec-content">
-			<view class="elec-card bg-white">
+			<view class="elec-card bg-white" v-for="(i, index) in custInvoiceHisDetailDTOList">
 				<view class="elec-card-left float-left">
-					<view class="elec-card-msg">黄石肯特科技发展有限公司</view>
-					<view class="elec-card-msg">折扣券</view>
-					<view class="elec-card-msg">万达车场8折折扣券</view>
-					<view class="elec-card-msg">¥5元/张 X 15张</view>
+					<view class="elec-card-msg">{{i.plName}}</view>
+					<view class="elec-card-msg">{{i.carNumber}}</view>
+					<view class="elec-card-msg">{{$common.formatDate(i.orderDate)}}</view>
+					<!--<view class="elec-card-msg">应收¥{{(i.orderTotalFee/100).toFixed(2)}}</view>-->
 				</view>
 				<view class="elec-card-right float-right">
 					<view class="elec-card-text">
-						75.00元
-					</view>
-				</view>
-			</view>
-			<view class="elec-card bg-white">
-				<view class="elec-card-left float-left">
-					<view class="elec-card-msg">黄石肯特科技发展有限公司</view>
-					<view class="elec-card-msg">折扣券</view>
-					<view class="elec-card-msg">万达车场8折折扣券</view>
-					<view class="elec-card-msg">¥5元/张 X 15张</view>
-				</view>
-				<view class="elec-card-right float-right">
-					<view class="elec-card-text">
-						75.00元
+						实收    ¥{{(i.orderActFee/100).toFixed(2)}}元
 					</view>
 				</view>
 			</view>
+			<!--<view class="elec-card bg-white">-->
+			<!--<view class="elec-card-left float-left">-->
+			<!--<view class="elec-card-msg">黄石肯特科技发展有限公司</view>-->
+			<!--<view class="elec-card-msg">折扣券</view>-->
+			<!--<view class="elec-card-msg">万达车场8折折扣券</view>-->
+			<!--<view class="elec-card-msg">¥5元/张 X 15张</view>-->
+			<!--</view>-->
+			<!--<view class="elec-card-right float-right">-->
+			<!--<view class="elec-card-text">-->
+			<!--75.00元-->
+			<!--</view>-->
+			<!--</view>-->
+			<!--</view>-->
+
+			<!--<view  class="novipcard_Mid">-->
+			<!--<image class="novipcard" src="../../static/vipcard/novipcard.png" mode="aspectFit"></image>-->
+			<!--<view class="novipcard_txt">-->
+			<!--暂无记录-->
+			<!--</view>-->
+
+			<!--</view>-->
+
 		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
+export default {
+  data() {
+    return {
+      custInvoiceHisDetailDTOList:'',
+      index:0,
+    }
+  },
+  onLoad(params) {
+    var pages = getCurrentPages();//当前页
+    var beforePage = pages[pages.length - 3];//上二个页面
+    console.log(beforePage.$vm.list)
+    console.log(params)
+    this.index = params.index
+    this.custInvoiceHisDetailDTOList = beforePage.$vm.list[this.index].custInvoiceHisDetailDTOList
+    console.log(this.custInvoiceHisDetailDTOList)
+  },
+  methods: {}
+}
 </script>
 
 <style lang="scss">
@@ -52,22 +69,23 @@
 
 	.elec-card {
 		width: 100%;
-		height: 200upx;
+		/*height: 200upx;*/
 		padding: 22upx 30upx;
 		line-height: 32upx;
 		border-bottom: 1px solid #e5e5e5;
+		overflow: hidden;
 	}
 
 	.elec-card-left {
 		width: 70%;
-		height: 200upx;
+		/*height: 200upx;*/
 
 	}
 
 	.elec-card-right {
 		width: 30%;
-		height: 200upx;
-		line-height: 200upx;
+		/*height: 200upx;*/
+		/*line-height: 200upx;*/
 	}
 
 	.elec-card-msg {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 565050a..d66555a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -182,16 +182,16 @@
 				});
 			},
 			toInvoicePage() {
-				uni.showToast({
-					title: '正在开发中...',
-					icon: 'none',
-					duration: 2000
-				})
+				// uni.showToast({
+				// 	title: '正在开发中...',
+				// 	icon: 'none',
+				// 	duration: 2000
+				// })
 				 
-				// uni.navigateTo({
-				// 	url: '../invoiceClaim/invoiceClaim'
+				uni.navigateTo({
+					url: '../invoiceClaim/invoiceClaim'
 
-				// });
+				});
 			},
 			toBusinessCardPage() {
 				uni.navigateTo({
diff --git a/pages/invoiceClaim/invoiceClaim.vue b/pages/invoiceClaim/invoiceClaim.vue
index 0f17cd7..37098ed 100644
--- a/pages/invoiceClaim/invoiceClaim.vue
+++ b/pages/invoiceClaim/invoiceClaim.vue
@@ -1,36 +1,35 @@
 <template>
-	<view>
-		<view class="claim-content">
-			<uni-list>
-				<uni-list-item title="充值发票" note="支持账户余额充值金额开具发票" clickable showArrow @click="payCell()" />
-				<uni-list-item title="开票历史" clickable showArrow @click="recordCell()" />
-			</uni-list>
-		</view>
-	</view>
+    <view>
+        <view class="claim-content">
+            <uni-list>
+                <uni-list-item title="充值发票" note="支持账户余额充值金额开具发票" clickable showArrow @click="payCell('3')"/>
+                <uni-list-item title="开票历史" clickable showArrow @click="recordCell"/>
+            </uni-list>
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
+export default {
+  data() {
+    return {}
+  },
+  methods: {
+    payCell(i) {
+      // invoiceType	是	Integer	发票类型。1-停车记录，2-会员卡，3-余额充值
+      uni.setStorageSync('type',i)  // 存储点击的是 什么类型。  1-停车记录，2-会员卡，3-余额充值
+      uni.navigateTo({
+        url: '../invoiceTitle/invoiceTitle'
 
-			}
-		},
-		methods: {
-			payCell(){
-				uni.navigateTo({
-					url: '../billing/billing'
-				
-				});
-			},
-			recordCell() {
-				uni.navigateTo({
-					url: '../invoiceRecord/invoiceRecord'
-
-				});
-			}
-		}
-	}
+      });
+    },
+    recordCell() {
+      uni.navigateTo({
+        url: '../invoiceRecord/invoiceRecord'
+      });
+    }
+  }
+}
 </script>
 
 <style>
diff --git a/pages/invoiceForm/invoiceForm.vue b/pages/invoiceForm/invoiceForm.vue
index 3d88105..d8004e5 100644
--- a/pages/invoiceForm/invoiceForm.vue
+++ b/pages/invoiceForm/invoiceForm.vue
@@ -1,76 +1,130 @@
 <template>
-	<view>
-		<uni-notice-bar backgroundColor="#f2fded" color="#51c24e" single showIcon text="已发送电子邮箱"></uni-notice-bar>
-		<uni-list>
-			<uni-list-item title="发票预览" clickable showArrow @click="previewCell" />
-		</uni-list>
+    <view>
+        <!--<uni-notice-bar backgroundColor="#f2fded" color="#51c24e" single showIcon text="已发送电子邮箱"></uni-notice-bar>-->
+        <uni-list>
+            <uni-list-item title="发票预览" clickable showArrow @click="previewCell"/>
 
-		<uni-list>
-			<view class="recordCon uni-list-cell-pd">
-				<text class="color-black">发票信息</text>
-			</view>
-			<view class="recordCon uni-list-cell-pd">
-				<text>电子邮箱：{{invoiceInfo.email}}</text>
-			</view>
-		</uni-list>
+        </uni-list>
 
-		<view class="bg-white border-bottom-1 pos-rel" @click="recordClick">
-			<view class="recordCon uni-list-cell-pd">
-				<text class="color-black">发票包含内容</text>
-			</view>
-			<view class="recordCon uni-list-cell-pd">
-				<text>该发票包含{{invoiceInfo.number}}笔交易</text>
-			</view>
-			<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
-			</view>
-		</view>
+        <uni-list>
+            <view class="recordCon uni-list-cell-pd">
+                <text class="color-black">发票信息</text>
+            </view>
+            <view class="recordCon uni-list-cell-pd">
+                <text>电子邮箱：{{invoiceInfo.email}}</text>
+            </view>
+        </uni-list>
 
-		<view class="margin-top-30">
-			<button type="primary" class="tel-btn">重发邮件</button>
-			<button class="tel-btn" v-if="tel.length>0" type="primary" plain="true" @click="call">客服电话:{{tel}}</button>
-		</view>
+        <view class="bg-white border-bottom-1 pos-rel" @click="recordClick">
+            <view class="recordCon uni-list-cell-pd">
+                <text class="color-black">发票包含内容</text>
+            </view>
+            <view class="recordCon uni-list-cell-pd">
+                <text>该发票包含{{len}}笔交易</text>
+            </view>
+            <view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
+            </view>
+        </view>
 
-	</view>
+        <view class="margin-top-30">
+            <button type="primary" class="tel-btn" @click="sentEmail">重发邮件</button>
+        </view>
+
+        <view class="margin-top-30">
+            <button class="tel-btn" v-if="tel.length>0" type="primary" plain="true" @click="call">客服电话:{{tel}}</button>
+        </view>
+
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				invoiceInfo: {
-					email: '123456@qq.com',
-					number: 0
-				},
-				tel: '400-6345688'
-			}
-		},
-		methods: {
-			previewCell() {
-				uni.navigateTo({
-					url: '../invoicePreview/invoicePreview'
-
-				});
-			},
-			recordClick() {
-				uni.navigateTo({
-					url: '../elecRecord/elecRecord'
+export default {
+  data() {
+    return {
+      invoiceInfo: {
+        email: '123456@qq.com',
+        number: 0
+      },
+      tel: '400-6345688',
+      invoiceId:'',
+      invoiceUrl:'',
+      index:0,
+      len:0
+    }
+  },
+  onLoad(params){
+    var pages = getCurrentPages();//当前页
+    var beforePage = pages[pages.length - 2];//上个页面
+    console.log(beforePage.$vm.list)
+    console.log(params)
 
-				});
-			},
-		}
-	}
+    this.invoiceInfo.email = params.custEmail
+    this.invoiceId = params.invoiceId
+    this.index = params.index
+    this.invoiceUrl =beforePage.$vm.list[this.index].invoiceUrl
+    this.len = params.len
+  },
+  methods: {
+    call(){
+      var me = this;
+      uni.makePhoneCall({
+        phoneNumber: me.tel //仅为示例
+      });
+    },
+    previewCell() {
+      uni.navigateTo({
+        url: '../invoicePreview/invoicePreview?index='+this.index
+      });
+      // window.open(this.invoiceUrl)
+    },
+    recordClick() {
+      uni.navigateTo({
+        url: '../elecRecord/elecRecord?index='+this.index
+      });
+    },
+    sentEmail(){
+      var resendInvoiceMail = this.$common.resendInvoiceMail;
+      var jsondata = {
+        invoiceId:this.invoiceId,
+        orgId:this.$common.public_orgId
+      };
+      uni.request({
+        url: resendInvoiceMail,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+        console.log(res)
+      console.log(res.data)
+      console.log(res.code)
+      if (res.data.code == 0) {
+        uni.showToast({
+          icon:'none',
+          title: `邮件发送成功`
+        })
+      }
+    }
+    })
+    }
+  }
+}
 </script>
 
-<style lang="scss">
-	.icon-arrowright {
-		color: #bbb;
-		font-size: 20px;
-		right: 2upx;
-		top: 60upx;
-	}
+<style scoped>
+    .icon-arrowright {
+        color: #bbb;
+        font-size: 20px;
+        right: 15upx;
+        top: 60upx;
+    }
+
+    .tel-btn {
+        width: 90%;
+        margin: 30upx auto;
+    }
+
+    >>> .uni-list-cell__content-title {
+        margin-left: 0 !important;
+    }
 
-	.tel-btn {
-		width: 90%;
-		margin: 30upx auto;
-	}
 </style>
diff --git a/pages/invoicePreview/invoicePreview.vue b/pages/invoicePreview/invoicePreview.vue
index 8c3b35f..b94cd42 100644
--- a/pages/invoicePreview/invoicePreview.vue
+++ b/pages/invoicePreview/invoicePreview.vue
@@ -1,17 +1,30 @@
 <template>
 	<view>
-		
+		<!--<image style="width: 100%" mode="scaleToFill" :src="src"-->
+		<!--@error="imageError"></image>-->
+		<web-view :src="invoiceUrl"></web-view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+export default {
+  data() {
+    return {
+      src: '',
+      invoiceUrl:'',
+      index:0,
+    };
+  },
+  onLoad(params) {
+    var pages = getCurrentPages();//当前页
+    var beforePage = pages[pages.length - 3];//上二个页面
+    console.log(beforePage.$vm.list)
+    console.log(params)
+    this.index = params.index
+    this.invoiceUrl = beforePage.$vm.list[this.index].invoiceUrl
+    console.log(this.invoiceUrl)
+  },
+}
 </script>
 
 <style lang="scss">
diff --git a/pages/invoiceRecord/invoiceRecord.vue b/pages/invoiceRecord/invoiceRecord.vue
index 541bd24..3c2ab48 100644
--- a/pages/invoiceRecord/invoiceRecord.vue
+++ b/pages/invoiceRecord/invoiceRecord.vue
@@ -1,58 +1,87 @@
 <template>
-	<view>
-		<view class="record-content">
-			<view class="bg-white border-bottom-1 pos-rel" @click="payClick">
-				<view class="recordCon uni-list-cell-pd">
-					<text class="color-black">余额充值</text>
-					<text>已发送电子邮箱</text>
-				</view>
-				<view class="recordCon uni-list-cell-pd">
-					<text>2020-10-01 01:01:01</text>
-					<text>￥3.00</text>
-				</view>
-				<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
-				</view>
-			</view>
-			<view class="bg-white pos-rel" @click="payClick">
-				<view class="recordCon uni-list-cell-pd">
-					<text class="color-black">余额充值</text>
-					<text>已发送电子邮箱</text>
-				</view>
-				<view class="recordCon uni-list-cell-pd">
-					<text>2020-10-01 01:01:01</text>
-					<text>￥3.00</text>
-				</view>
-				<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
-				</view>
-			</view>
-
-		</view>
-	</view>
+    <view>
+        <view class="record-content">
+            <view v-if="list.length>0">
+                <view class="bg-white border-bottom-1 pos-rel"  v-for="(i, index) in list" @click="payClick(i,index)">
+
+                    <view class="recordCon uni-list-cell-pd">
+                        <text class="color-black">{{i.invoiceBigType=='100'?'停车':i.invoiceBigType=='200'?'充值':'会员卡'}}</text>
+                        <!--发票状态，1 待开票，3已开票 2 已邮寄 4已下载（这是开票接口的过渡状态，给用户展示已开票）-->
+                        <text v-if="i.invoiceState==1">待开票</text>
+                        <text v-else-if="i.invoiceState==2">已邮寄 </text>
+                        <text v-else-if="i.invoiceState==3">已开票</text>
+                        <text v-else>已下载</text>
+                    </view>
+                    <view class="recordCon uni-list-cell-pd">
+                        <!--<text>{{$common.formatDate(new Date(i.custInvoiceHisDetailDTOList[0].orderDate * 1000),'yyyy-MM-dd hh:mm')}}</text>-->
+                        <text>{{$common.formatDate(i.custInvoiceHisDetailDTOList[0].orderDate)}}</text>
+                        <text>￥{{(i.invoiceTotalFee/100).toFixed(2)}}</text>
+
+                    </view>
+                    <view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
+                    </view>
+                </view>
+            </view>
+
+            <!--<view style="padding: 30px;text-align: center" v-else>暂无记录！</view>-->
+
+            <view class="novipcard_Mid" style="padding-top: 20px;" v-else>
+                <image class="novipcard" :src="noIcon" mode="aspectFit"></image>
+                <view class="novipcard_txt">
+                    暂无记录
+                </view>
+
+            </view>
+
+
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			payClick() {
-				uni.navigateTo({
-					url: '../invoiceForm/invoiceForm'
-
-				});
-			},
-		}
-	}
+export default {
+  data() {
+    return {
+      list:[],
+      noIcon:require('static/vipcard/novipcard.png'),
+    }
+  },
+  onShow(){
+    this.queryCustInvoiceHistoryList()
+  },
+  methods: {
+    queryCustInvoiceHistoryList() {
+
+      var queryCustInvoiceHistoryList = this.$common.queryCustInvoiceHistoryList;
+      var jsondata = {};
+      uni.request({
+        url: queryCustInvoiceHistoryList,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+          if (res.data.code == 0) {
+            this.list = res.data.data
+            console.log(this.list)
+          }
+        }
+      })
+    },
+    payClick(i,index) {
+      console.log(index)
+      uni.navigateTo({
+        url: '../invoiceForm/invoiceForm?custEmail='+i.custEmail+'&invoiceId='+i.invoiceId+'&index='+index+'&len='+i.custInvoiceHisDetailDTOList.length
+      });
+    },
+  }
+}
 </script>
 
 <style lang="scss">
-	.icon-arrowright {
-		color: #bbb;
-		font-size: 20px;
-		right: 2upx;
-		top: 60upx;
-	}
+    .icon-arrowright {
+        color: #bbb;
+        font-size: 20px;
+        right: 2upx;
+        top: 60upx;
+    }
 </style>
diff --git a/pages/invoiceTitle/invoiceTitle.vue b/pages/invoiceTitle/invoiceTitle.vue
index 012acbf..724cfa1 100644
--- a/pages/invoiceTitle/invoiceTitle.vue
+++ b/pages/invoiceTitle/invoiceTitle.vue
@@ -1,130 +1,240 @@
 <template>
-	<view>
-		<view>
-
-			<view class="uni-list">
-				<radio-group @change="titleChange">
-					<label class="display-block border-bottom-5" v-for="(item, index) in items" :key="item.value">
-						<view class="elec-card bg-white">
-							<view class="elec-card-left float-left">
-								<view class="elec-card-msg">黄石肯特科技发展有限公司</view>
-								<view class="elec-card-msg">发票类型:公司</view>
-							</view>
-							<view class="elec-card-right float-right">
-								<button class="mini-btn color-62c7ee" type="primary" size="mini">去使用</button>
-							</view>
-						</view>
-						<view class="uni-list-cell uni-list-cell-pd">
-							<view>
-								<radio :value="item.value" :checked="index === current" />
-							</view>
-							<view style="flex:1;">默认抬头</view>
-							<view>
-								<button class="mini-btn margin-left-5" type="primary" size="mini"
-									@click="detailLookBtn">查看</button>
-								<button class="mini-btn margin-left-5" type="default" size="mini"
-									@click="detailEditBtn">编辑</button>
-								<button class="mini-btn margin-left-5" type="warn" size="mini"
-									@click="detailDelBtn">删除</button>
-							</view>
-						</view>
-					</label>
-				</radio-group>
-			</view>
-			<view class="billing-all">
-				<button type="primary" class="title-submit" @click="addInvoiceTitle">添加发票抬头</button>
-			</view>
-		</view>
-	</view>
+    <view>
+        <view>
+
+            <view class="uni-list" v-if="items.length>0">
+                <radio-group @change="titleChange">
+                    <label class="display-block border-bottom-5" v-for="(item, index) in items" :key="item.value">
+                        <view class="elec-card bg-white">
+                            <view class="elec-card-left float-left" >
+                                <view class="elec-card-msg">{{item.name}}</view>
+                                <view class="elec-card-msg">发票类型:{{item.invoiceType | invoiceTypeFilter}}</view>
+                            </view>
+                            <view class="elec-card-right float-right"  @click="toUse(JSON.stringify(item))">
+                                <button class="mini-btn color-62c7ee" type="primary" size="mini" >
+                                    去使用
+                                </button>
+                            </view>
+                        </view>
+                        <view class="uni-list-cell uni-list-cell-pd">
+                            <view>
+                                <radio :value="JSON.stringify(item)" :checked="item.isDefault == 1"/>
+                            </view>
+                            <view style="flex:1;">默认抬头</view>
+                            <view>
+                                <button class="mini-btn margin-left-5" type="primary" size="mini"
+                                        @click="detailLookBtn(JSON.stringify(item), index)">查看
+                                </button>
+                                <button class="mini-btn margin-left-5" type="default" size="mini"
+                                        @click="detailEditBtn(JSON.stringify(item), index)">编辑
+                                </button>
+                                <button class="mini-btn margin-left-5" type="warn" size="mini"
+                                        @click="detailDelBtn(JSON.stringify(item), index)">删除
+                                </button>
+                            </view>
+                        </view>
+                    </label>
+                </radio-group>
+            </view>
+
+            <view style="padding: 30px;text-align: center" v-else>暂无抬头,请先添加！</view>
+            <view class="billing-all">
+                <button type="primary" class="title-submit" @click="addInvoiceTitle">添加发票抬头</button>
+            </view>
+        </view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				items: [{
-						value: '1',
-						checked: 'true'
-
-					},
-					{
-						value: '2'
-
-					},
-					{
-						value: '3'
-
-					},
-				],
-				current: 0,
-			};
-		},
-		methods: {
-			titleChange: function(evt) {
-				for (let i = 0; i < this.items.length; i++) {
-					if (this.items[i].value === evt.detail.value) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			detailLookBtn() {
-				uni.navigateTo({
-					url: '../companyMsg/companyMsg'
-				});
-			},
-			detailEditBtn() {
-				uni.navigateTo({
-					url: '../editTitle/editTitle'
-				});
-			},
-			detailDelBtn() {
-
-			},
-			addInvoiceTitle() {
-				uni.navigateTo({
-					url: '../addTitle/addTitle'
-				});
-			},
-		}
-	}
+export default {
+  data() {
+    return {
+      items: [
+      //   {
+      //   value: '1',
+      //   checked: 'true'
+      // },
+      //   {
+      //     value: '2'
+      //   },
+      //   {
+      //     value: '3'
+      //   },
+      ],
+      current: 0,
+    };
+  },
+  onLoad(params) {
+
+  },
+  onShow(){
+    this.queryCustInvoiceInfoList()
+  },
+  methods: {
+    queryCustInvoiceInfoList() {
+      let that = this
+      var queryCustInvoiceInfoList = this.$common.queryCustInvoiceInfoList;
+      var jsondata = {};
+      uni.request({
+        url: queryCustInvoiceInfoList,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+          console.log(res)
+          if (res.data.code == 0) {
+            this.items = res.data.data
+          }
+        }
+      })
+    },
+    titleChange: function (evt) {
+      console.log(JSON.parse(evt.detail.value))
+      let jsonData = JSON.parse(evt.detail.value)
+      // for (let i = 0; i < this.items.length; i++) {
+      //   if (this.items[i].default === evt.detail.value) {
+      //     this.current = i;
+      //     break;
+      //   }
+      // }
+      var updateCustInvoiceInfo = this.$common.updateCustInvoiceInfo;
+      var jsondata = {
+        address:jsonData.address,
+        bankName:jsonData.bankName,
+        cardNo:jsonData.cardNo,
+        isDefault:'1',
+        phone:jsonData.phone,
+        taxid:jsonData.taxid,
+        name:jsonData.name,
+        invoiceType:jsonData.invoiceType,
+        id:jsonData.id,
+        remark:jsonData.remark,
+        email:jsonData.email,
+
+
+        // name: this.baseFormDataPerson.invoicetitle,
+        // email: this.baseFormDataPerson.email,
+        // remark: this.baseFormDataPerson.remark,
+        // isDefault: '1',// 是否默认客户抬头信息，1表示是默认抬头信息，0不是默认抬头信息（默认0）
+        // invoiceType: '0', // 发票类型（个人、公司），0 表示个人，1表示公司
+
+
+      };
+      uni.request({
+        url: updateCustInvoiceInfo,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+          console.log(res)
+          if (res.data.code == 0) {
+            uni.showToast({
+              icon:'none',
+              title: `设置成功`
+            })
+          }
+        }
+      })
+    },
+    detailLookBtn(val) {
+      uni.setStorageSync('companyMsg',val)
+      uni.navigateTo({
+        url: '../companyMsg/companyMsg'
+      });
+    },
+    detailEditBtn(val,i) {
+      uni.setStorageSync('titleIfo',val)
+      uni.navigateTo({
+        url: '../editTitle/editTitle'
+      });
+    },
+    detailDelBtn(val,i) {
+      console.log(val)
+      console.log(i)
+      var deleteCustInvoiceInfoByID = this.$common.deleteCustInvoiceInfoByID;
+      var jsondata = {
+        id: JSON.parse(val).id,
+      };
+      uni.request({
+        url: deleteCustInvoiceInfoByID,
+        data: JSON.stringify(this.$common.requestSign(jsondata)),
+        dataType: "json",
+        method: "POST",
+        success: (res) => {
+          console.log(res)
+          if (res.data.code == 0) {
+            this.queryCustInvoiceInfoList()
+            uni.showToast({
+              icon:'none',
+              title: `删除成功`
+            })
+          }
+        }
+      })
+    },
+    addInvoiceTitle() {
+      uni.navigateTo({
+        url: '../addTitle/addTitle'
+      });
+    },
+    toUse(val) {
+      console.log(val)
+      uni.setStorageSync('useTitleIfo',val)
+      let i = JSON.parse(val)
+      uni.navigateTo({
+        url: '../billing/billing?invoiceType='+i.invoiceType+'&email='+i.email+'&name='+i.name+'&remark='+i.remark
+      });
+    }
+  },
+  filters:{
+    invoiceTypeFilter(val){
+      console.log(val)
+      if(val=='0'){
+        return '个人'
+      }
+      if(val=='1'){
+        return '企业'
+      }
+    }
+  }
+}
 </script>
 
 <style lang="scss">
-	.elec-card {
-		width: 100%;
-		height: 64upx;
-		padding: 22upx 30upx;
-
-		border-bottom: 1px solid #e5e5e5;
-	}
-
-	.elec-card-left {
-		width: 70%;
-		height: 64upx;
-
-	}
-
-	.elec-card-right {
-		width: 30%;
-		height: 64upx;
-		line-height: 64upx;
-	}
-
-	.elec-card-msg {
-		line-height: 32upx;
-		color: rgba(0, 0, 0, .7);
-
-	}
-
-	.billing-all {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		height: 46px;
-		line-height: 46px;
-		// font-size: 24px;
-
-	}
+    .elec-card {
+        width: 100%;
+        height: 64upx;
+        padding: 22upx 30upx;
+
+        border-bottom: 1px solid #e5e5e5;
+    }
+
+    .elec-card-left {
+        width: 70%;
+        height: 64upx;
+
+    }
+
+    .elec-card-right {
+        width: 26%;
+        height: 64upx;
+        line-height: 64upx;
+    }
+
+    .elec-card-msg {
+        line-height: 32upx;
+        color: rgba(0, 0, 0, .7);
+
+    }
+
+    .billing-all {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 46px;
+        line-height: 46px;
+        // font-size: 24px;
+
+    }
 </style>
--
libgit2 0.21.4