修改开票逻辑

common/js/api.js

@@ -7,44 +7,10 @@ let baseUrl = 'https://intp.xingtongworld.com'
 
 let API = {
 	baseUrl: baseUrl,
-	// 获取SDK数据
-	getJsSdkData(data, success, fail, boolean=true){
-		API.sendRequest('post', data, '/wechat/Wechat/getJsSdkData', success, fail, boolean)
-	},
-	// 获取申请数据
-	getQrCode(data, success, fail, boolean=true){
-		API.sendRequest('get', data, '/api/InvoiceIssuance/getQrCode', success, fail, boolean)
-	},
-	// 获取申请数据
-	getErrorInfo(data, success, fail, boolean=true){
-		API.sendRequest('get', data, '/api/InvoiceIssuance/getErrorInfo', success, fail, boolean)
-	},
-	// 获取申请数据
-	getApplyData(data, success, fail, boolean=true){
-		API.sendRequest('get', data, '/api/InvoiceIssuance/getApplyData', success, fail, boolean)
-	},
-	// 首页数据列表
-	Home(data, success, fail, boolean=true){
-		API.sendRequest('post', data, '/api/InvoiceIssuance/getList', success, fail, boolean)
-	},
-	// 验证是否缴费
-	validateFeePay(data, success, fail, boolean=true){
-		API.sendRequest('post', data, '/api/InvoiceIssuance/validateFeePay', success, fail, boolean)
-	},
-	// 手机号获取验证码
-	sendSms(data, success, fail, boolean=true){
-		API.sendRequest('post', data, '/wechat/wechat/sendSms', success, fail, boolean)
-	},
-	// 获取微信授权登录基本信息
+	
+	// 登录
 	getWxCode(data, success, fail){
-		API.sendRequest('get', data, '/wechat/login/getWxCode', success, fail)
-	},
-	// 获取微信code进行登录
-	wx(data, success, fail){
-		API.sendRequest('get', data, '/wechat/login/wx', success, fail)
-	},
-	getFeeInvoiceHead(data, success, fail, boolean=true){
-		API.sendRequest('get', data, '/api/InvoiceIssuance/getFeeInvoiceHead', success, fail, boolean)
+		API.sendRequest('post', data, '/common/pub/login', success, fail)
 	},
 	// 通用api
 	request(url, data, success, fail, boolean=true){

pages/Invoicing/Invoicing.vue

@@ -50,6 +50,10 @@
 										</view>
 									</view>
 								</uni-forms-item>
+								<uni-forms-item label="纳税人编号" required name="name" :label-width="90" v-if="list1.merge==1">
+									<!-- <view class="list3_box" v-if="list2.tax_number" :style="{color: list2.tax_number ? '#000' : '#999'}">{{list2.tax_number?list2.tax_number:'请输入请输入纳税人识别号'}}</view> -->
+									<uni-easyinput style="margin-left: 16rpx;" type="text" v-model="list2.tax_number" :inputBorder="false" placeholder="请输入纳税人编号"></uni-easyinput>
+								</uni-forms-item>
 								<view class="form-title">接收方式：</view>
 								<uni-forms-item label="手机号码" required name="name" :label-width="90">
 									<uni-easyinput style="margin-left: 16rpx;" type="text" v-model="list1.phone" :inputBorder="false" @blur="onInput" placeholder="请输入可用手机号码"></uni-easyinput>
@@ -112,13 +116,13 @@
 								</radio-group>
 							</uni-forms-item>
 							<uni-forms-item label="名称" name="name" :label-width="90" v-if="list2.type=='0'">
-								<view class="list3_box">{{list2.title}}</view>
+								<view class="list3_box">{{list2.title?list2.title:list2.title1}}</view>
 							</uni-forms-item>
 							<uni-forms-item label="税号" name="name" :label-width="90" v-if="list2.type=='0'">
 								<view class="list3_box">{{list2.tax_number?list2.tax_number:list2.tax_number1}}</view>
 							</uni-forms-item>
 							<uni-forms-item label="姓名" name="name" :label-width="90" v-if="list2.type=='1'">
-								<view class="list3_box">{{list2.title}}</view>
+								<view class="list3_box">{{list2.title?list2.title:list2.title1}}</view>
 							</uni-forms-item>
 							<uni-forms-item label="身份证" name="name" :label-width="90" v-if="list2.type=='1'">
 								<view class="list3_box">{{list2.tax_number?list2.tax_number:list2.tax_number1}}</view>
@@ -244,8 +248,7 @@
 				// 用户编号数据列表
 				candidates: [],
 				//合并开票
-				mergelist: [{text: '不合并',value: '0'}],
-				// ,{text: '合并',value: '1'}
+				mergelist: [{text: '不合并',value: '0'},{text: '合并',value: '1'}],
 				form1:{},
 				form2:{},
 				text:''
@@ -365,18 +368,18 @@
 						this.stepsIndex = 1
 						return
 					}
-					if(!this.list2.title){
+					if(!this.list2.title1&&!this.list2.title){
 						uni.showToast({title: '请输入抬头名称',icon: 'none'});
 						this.stepsIndex = 1
 						return
 					}
-					if(!this.list2.tax_number&&this.list2.type=='0'){
+					if(!this.list2.tax_number1&&!this.list2.tax_number&&this.list2.type=='0'){
 						uni.showToast({title: '请输入税号',icon: 'none'});
 						this.stepsIndex = 1
 						return
 					}
 					const taxiD1 = /^([A-Z0-9]{18})$/
-					if (!taxiD1.test(this.list2.tax_number)&&this.list2.type=='0') {
+					if (!taxiD1.test(this.list2.tax_number1)&&!taxiD1.test(this.list2.tax_number)&&this.list2.type=='0') {
 						uni.showToast({
 							title: '请输入有效的税号',
 							icon: 'none'
@@ -477,7 +480,7 @@
 						_this.list2.title = res.data.title;
 						_this.list2.tax_number = res.data.tax_number;
 						_this.list1.email = res.data.email;
-						console.log(res.data.email);
+						console.log(res.data);
 					})
 				// #endif
 			},
@@ -485,7 +488,9 @@
 				let data = {
 					pucode: this.list1.pucode,
 					expire_time: this.list1.expire_time,
-					project_id: this.list1.project_id
+					project_id: this.list1.project_id,
+					merge: this.list1.merge,
+					tax_number: this.list1.merge==1?this.list2.tax_number:''
 				}
 				if(!this.amount){
 					this.stepsIndex = 0;

unpackage/dist/build/web/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>Waterinvoice_uiapp</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.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0e233154.js></script><script src=./static/js/index.6dd2517e.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.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0e233154.js></script><script src=./static/js/index.eea67daa.js></script></body></html>

unpackage/dist/build/web/static/js/pages-Invoiced-fail.2723627f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-Invoiced-fail"],{"4dd5":function(e,t,n){"use strict";n.r(t);var a=n("9a82"),o=n("e538");for(var i in o)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(i);n("c3cd");var c=n("828b"),d=Object(c["a"])(o["default"],a["b"],a["c"],!1,null,"7f56f803",null,!1,a["a"],void 0);t["default"]=d.exports},"88e1":function(e,t,n){var a=n("97dc");a.__esModule&&(a=a.default),"string"===typeof a&&(a=[[e.i,a,""]]),a.locals&&(e.exports=a.locals);var o=n("967d").default;o("1e53c36e",a,!0,{sourceMap:!1,shadowMode:!1})},"97dc":function(e,t,n){var a=n("c86c");t=a(!1),t.push([e.i,".center[data-v-7f56f803]{text-align:center;margin-top:%?100?%;padding:0 %?100?%}",""]),e.exports=t},"9a82":function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement,t=this._self._c||e;return t("v-uni-view",[t("v-uni-view",{staticClass:"center"},[this._v(this._s(this.content))])],1)},o=[]},c3cd:function(e,t,n){"use strict";var a=n("88e1"),o=n.n(a);o.a},ce48:function(e,t,n){"use strict";n("6a54");var a=n("f5bd").default;Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=a(n("d599")),i={data:function(){return{content:""}},onLoad:function(e){var t=this;if(e.id){var n={id:e.id};o.default.getErrorInfo(n,(function(e){t.content=e.data.content}))}},methods:{}};t.default=i},d599:function(e,t,n){"use strict";n("6a54");var a=n("f5bd").default;Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=a(n("9b1b")),i="http://120.234.15.170:8078",c={baseUrl:i,getJsSdkData:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("post",e,"/wechat/Wechat/getJsSdkData",t,n,a)},getQrCode:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("get",e,"/api/InvoiceIssuance/getQrCode",t,n,a)},getErrorInfo:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("get",e,"/api/InvoiceIssuance/getErrorInfo",t,n,a)},getApplyData:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("get",e,"/api/InvoiceIssuance/getApplyData",t,n,a)},Home:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("post",e,"/api/InvoiceIssuance/getList",t,n,a)},validateFeePay:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("post",e,"/api/InvoiceIssuance/validateFeePay",t,n,a)},sendSms:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("post",e,"/wechat/wechat/sendSms",t,n,a)},getWxCode:function(e,t,n){c.sendRequest("get",e,"/wechat/login/getWxCode",t,n)},wx:function(e,t,n){c.sendRequest("get",e,"/wechat/login/wx",t,n)},getFeeInvoiceHead:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];c.sendRequest("get",e,"/api/InvoiceIssuance/getFeeInvoiceHead",t,n,a)},request:function(e,t,n,a){var o=!(arguments.length>4&&void 0!==arguments[4])||arguments[4];c.sendRequest("post",t,e,n,a,o)},sendRequest:function(e,t,n,a,c,d){var s="";s="post"==e?"application/x-www-form-urlencoded":"application/json";var u={};d&&(u.header={"Content-Type":s,Accept:"application/json, text/javascript, */*; q=0.01",token:uni.getStorageSync("AccessToken")||""}),uni.request((0,o.default)((0,o.default)({url:i+n,method:e,data:t},u),{},{success:function(e){1!=e.data.code&&-8!=e.data.code?(-14!=e.data.code&&-997!=e.data.code||(uni.removeStorageSync("AccessToken"),uni.removeStorageSync("phone"),uni.removeStorageSync("pucode"),uni.removeStorageSync("openid"),setTimeout((function(){uni.$emit("tokenExpired"),uni.reLaunch({url:"/pages/index/index"})}),2600)),"/api/InvoiceIssuance/validateFeePay"!==n&&uni.showToast({title:e.data.msg||e.msg,icon:"none"})):a&&a(e.data)}}))}},d=c;t.default=d},e538:function(e,t,n){"use strict";n.r(t);var a=n("ce48"),o=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(i);t["default"]=o.a}}]);

unpackage/dist/build/web/static/js/pages-login-wxlogin.158974ab.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-login-wxlogin"],{5113:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement,t=this._self._c||e;return t("v-uni-view")},o=[]},"75b1":function(e,t,n){"use strict";n("6a54");var a=n("f5bd").default;Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=a(n("d599")),i={data:function(){return{code:"",state:"",state1:"",appId:"",redirectUri:""}},onLoad:function(e){this.checkWeChatCode()},methods:{checkWeChatCode:function(){var e=this;o.default.getWxCode({},(function(t){1==t.code&&(e.redirectUri=t.data.redirectUri,e.appId=t.data.appId,e.state=t.data.state,e.getCode())}))},getCode:function(){var e=encodeURIComponent(o.default.baseUrl+"/wechat/");window.location.href="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+this.appId+"&redirect_uri="+e+"&response_type=code&scope=snsapi_userinfo&state="+this.state+"#wechat_redirect"}}};t.default=i},d599:function(e,t,n){"use strict";n("6a54");var a=n("f5bd").default;Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=a(n("9b1b")),i="http://120.234.15.170:8078",d={baseUrl:i,getJsSdkData:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("post",e,"/wechat/Wechat/getJsSdkData",t,n,a)},getQrCode:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("get",e,"/api/InvoiceIssuance/getQrCode",t,n,a)},getErrorInfo:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("get",e,"/api/InvoiceIssuance/getErrorInfo",t,n,a)},getApplyData:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("get",e,"/api/InvoiceIssuance/getApplyData",t,n,a)},Home:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("post",e,"/api/InvoiceIssuance/getList",t,n,a)},validateFeePay:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("post",e,"/api/InvoiceIssuance/validateFeePay",t,n,a)},sendSms:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("post",e,"/wechat/wechat/sendSms",t,n,a)},getWxCode:function(e,t,n){d.sendRequest("get",e,"/wechat/login/getWxCode",t,n)},wx:function(e,t,n){d.sendRequest("get",e,"/wechat/login/wx",t,n)},getFeeInvoiceHead:function(e,t,n){var a=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];d.sendRequest("get",e,"/api/InvoiceIssuance/getFeeInvoiceHead",t,n,a)},request:function(e,t,n,a){var o=!(arguments.length>4&&void 0!==arguments[4])||arguments[4];d.sendRequest("post",t,e,n,a,o)},sendRequest:function(e,t,n,a,d,c){var s="";s="post"==e?"application/x-www-form-urlencoded":"application/json";var u={};c&&(u.header={"Content-Type":s,Accept:"application/json, text/javascript, */*; q=0.01",token:uni.getStorageSync("AccessToken")||""}),uni.request((0,o.default)((0,o.default)({url:i+n,method:e,data:t},u),{},{success:function(e){1!=e.data.code&&-8!=e.data.code?(-14!=e.data.code&&-997!=e.data.code||(uni.removeStorageSync("AccessToken"),uni.removeStorageSync("phone"),uni.removeStorageSync("pucode"),uni.removeStorageSync("openid"),setTimeout((function(){uni.$emit("tokenExpired"),uni.reLaunch({url:"/pages/index/index"})}),2600)),"/api/InvoiceIssuance/validateFeePay"!==n&&uni.showToast({title:e.data.msg||e.msg,icon:"none"})):a&&a(e.data)}}))}},c=d;t.default=c},db07:function(e,t,n){"use strict";n.r(t);var a=n("75b1"),o=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(i);t["default"]=o.a},e411:function(e,t,n){"use strict";n.r(t);var a=n("5113"),o=n("db07");for(var i in o)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(i);var d=n("828b"),c=Object(d["a"])(o["default"],a["b"],a["c"],!1,null,"1a8792d2",null,!1,a["a"],void 0);t["default"]=c.exports}}]);