H5更新body显示di为空更改

common/js/api.js

@@ -42,7 +42,7 @@ export default {
 		return uni.api.post("user/subopeninvoicefixed", data);
 	},
 	szzpyfailccho(data) { //开票审核失败回显
-		return uni.api.post("szzpy/failccho", data,false);
+		return uni.api.post("szzpy/failccho", data, false);
 	},
 	storeinvoicingrecordsthatneed(data) { //开票记录（固定开票）
 		return uni.api.post("store/invoicingrecordsthatneed", data);
@@ -86,7 +86,7 @@ export default {
 	szzpyhurl(data) {
 		return uni.api.post("szzpy/h5url", data);
 	},
-	szzpygetprovinceno(data) {//地区
+	szzpygetprovinceno(data) { //地区
 		return uni.api.post("szzpy/getprovinceno", data);
 	},
 	storebindinginvopush(data) {
@@ -107,7 +107,7 @@ export default {
 	hfivegetstoreinfo(data) {
 		return uni.api.post("hfive/getstoreinfo", data, false);
 	},
-	storestoreinfo(data) {//固定开票的接口上传
+	storestoreinfo(data) { //固定开票的接口上传
 		return uni.api.post("store/storeinfo", data);
 	},
 
@@ -148,13 +148,13 @@ export default {
 		return uni.api.post("hfive/setdefault", data);
 	},
 	invoicedorderlist(data) { //订单列表
-		return uni.api.post("hfive/invoicedorderlist", data,false);
+		return uni.api.post("hfive/invoicedorderlist", data, false);
 	},
 	hfivestatuslist(data) { //订单列表
 		return uni.api.post("hfive/statuslist", data);
 	},
 	invoicingrecordsthatneed(data) { //审核开票记录
-		return uni.api.post("hfive/invoicingrecordsthatneed", data,false);
+		return uni.api.post("hfive/invoicingrecordsthatneed", data, false);
 	},
 	newissuedbyliststatus(data) { //开票人列表(带状态)
 		return uni.api.post("hfive/newissuedbyliststatus", data);
@@ -190,6 +190,9 @@ export default {
 		return uni.api.post("user/judgeuseridentity", data);
 	},
 	getrulelist(data) { //菜单列表
-		return uni.api.post("store/getrulelist", data,false);
+		return uni.api.post("store/getrulelist", data, false);
+	},
+	checkqrcodestatus(data) { //检查二维码状态
+		return uni.api.post("user/checkqrcodestatus", data);
 	},
 }

components/navseat.vue

@@ -80,7 +80,7 @@
 			// // #endif
 			shownav: {
 				type: Boolean,
-				default: true
+				default: false
 			},
 			title: {
 				type: String,

framework/0-conf.js

@@ -5,9 +5,9 @@ const proxyApi = "/api/"
 
 // #ifdef H5
 // const baseUrl = debug ? proxyApi : "https://invoice.sxczgkj.cn/api"
-// const baseUrl = 'https://invoice.sxczgkj.cn/api/' //正式
+const baseUrl = 'https://invoice.sxczgkj.cn/api/' //正式
 // const baseUrl = 'http://192.168.1.6:8888/api/'//本地
-const baseUrl = 'https://test.invoice.sxczgkj.cn/api/'//测试
+// const baseUrl = 'https://test.invoice.sxczgkj.cn/api/'//测试
 // import VConsole from "./vConsole.js"
 if (debug) {
 	// new VConsole()

framework/11-api.js

@@ -9,7 +9,7 @@ uni.pro.interceptor('request', {
 		return options
 	},
 	success(res) {
-		if (res.code >= 400) {
+		if (res.data.code == 1) {
 			return res.data
 		} else {
 			return res.data

pages/electric/bluetools.vue

@@ -45,7 +45,7 @@
 		</view>
 		<view class="listinput flex-between">
 			<view class="listinput_left">
-				<input type="text" v-model="form.c_phone" placeholder="请输电话" />
+				<input type="number" v-model="form.c_phone" placeholder="请输电话" />
 			</view>
 		</view>
 		<view class="listinput flex-between">
@@ -55,7 +55,7 @@
 		</view>
 		<view class="listinput flex-between">
 			<view class="listinput_left">
-				<input type="text" v-model="form.c_bank_account" placeholder="请输入银行账号" />
+				<input type="number" v-model="form.c_bank_account" placeholder="请输入银行账号" />
 			</view>
 		</view>
 		<view class="titletop flex-start">
@@ -91,7 +91,7 @@
 		</view>
 		<view class="listinput flex-between">
 			<view class="listinput_left">
-				<input type="text" v-model="form.xfyhzh" placeholder="请入销售银行账号" />
+				<input type="number" v-model="form.xfyhzh" placeholder="请入销售银行账号" />
 			</view>
 		</view>
 		<view class="titletop flex-start">
@@ -103,7 +103,7 @@
 		</view>
 		<!-- <view class="listinput flex-between">
 			<view class="listinput_left">
-				<input type="text" v-model="form.mobile" placeholder="请输入手机号" />
+				<input type="number" v-model="form.mobile" placeholder="请输入手机号" />
 			</view>
 		</view> -->
 		<view class="listinput flex-between">

pages/electric/issuer.vue

@@ -150,7 +150,7 @@
 					<view class="addshowboxinput flex-colum-start">
 						<text class="addshowboxinputtext">*办税人手机号码</text>
 						<view class="addshowboxinput_inp">
-							<input type="text" disabled placeholder="请输入" v-model="addform.taxphone" />
+							<input type="number" disabled placeholder="请输入" v-model="addform.taxphone" />
 						</view>
 					</view>
 				</view>

pages/hindex/index.vue

@@ -34,7 +34,7 @@
 			</view>
 			<view class="Box_box flex-between">
 				<view class="Box_boxone">*手机号</view>
-				<view class="Box_boxtow"><input type="text" v-model="form.mobile" placeholder="请填写联系电话" /></view>
+				<view class="Box_boxtow"><input type="number" v-model="form.mobile" placeholder="请填写联系电话" /></view>
 			</view>
 			<template v-if="form.user_type == 2">
 				<view class="Box_box flex-between" @click="showElse = !showElse">
@@ -52,7 +52,7 @@
 					</view>
 					<view class="Box_box flex-between">
 						<view class="Box_boxone">联系电话</view>
-						<view class="Box_boxtow"><input type="text" v-model="form.c_phone" placeholder="请填写公司联系电话" />
+						<view class="Box_boxtow"><input type="number" v-model="form.c_phone" placeholder="请填写公司联系电话" />
 						</view>
 					</view>
 					<view class="Box_box flex-between">
@@ -94,7 +94,8 @@
 			<u-icon name="weixin-fill" color="#04be02" size="28"></u-icon>
 			微信抬头一键导入
 		</view>
-		<view class="content_bottom" @click="saveMerchantBaseInfo">确定</view>
+		<view class="content_bottom" :style="disabled?'':'background:rgb(219 214 214);color: #666666;'"
+			@click="saveMerchantBaseInfo">确定</view>
 	</view>
 </template>
 
@@ -110,6 +111,7 @@
 		data() {
 			return {
 				showtext: 0,
+				disabled: false,
 				subCategoryList: [],
 				form: {
 					user_type: 2,
@@ -163,6 +165,14 @@
 			this.showtitle = true
 			this.form.open_id = uni.cache.get('open_id')
 			// #endif
+			let RES = await this.api.checkqrcodestatus({
+				id: this.form.id
+			})
+			if (RES.code == 1) {
+				this.disabled = true
+			} else {
+				this.disabled = false
+			}
 			// 开票失败的回显
 			if (e.view_type == 'fail') {
 				this.form.view_type = e.view_type;
@@ -335,6 +345,9 @@
 				});
 			},
 			async saveMerchantBaseInfo() {
+				if (!this.disabled) {
+					return false;
+				}
 				if (this.form.user_name == null || this.form.user_name == '') {
 					uni.showToast({
 						title: '请输入名称',

pages/hindex/indexs.vue

@@ -38,7 +38,7 @@
 			</view>
 			<view class="Box_box flex-between">
 				<view>*手机号</view>
-				<view><input type="text" v-model="form.mobile" placeholder="请填写联系电话" /></view>
+				<view><input type="number" v-model="form.mobile" placeholder="请填写联系电话" /></view>
 			</view>
 			<view class="Box_box flex-between">
 				<view>*开票价格</view>
@@ -82,7 +82,6 @@
 			return {
 				showtext: 0,
 				subCategoryList: [],
-				open_id: '',
 				form: {
 					id: '',
 					user_type: 2,
@@ -108,7 +107,6 @@
 				try {
 					if (e.q) {
 						const q = decodeURIComponent(e.q) // 获取到二维码原始链接内容
-						// this.form.id = e.id
 						let queryParams = {};
 						let queryString = q.split('?')[1];
 						if (queryString) {
@@ -122,24 +120,21 @@
 					}
 				} catch (e) {}
 			} else {
-				this.form.body = e.id
+				this.form.body = e.id ? e.id : e.body
 			}
 			// 获取开票抬头
 			// 这是H5
 			// #ifdef H5
-			this.getInvoiceList()
+			if (e.body) {
-			this.form.body = e.id
+				this.form.body = e.id ? e.id : e.body
-			this.form.open_id = e.open_id
+				this.form.open_id = e.open_id
+			}
 			// #endif
-
-
 			// 这是微信
 			// #ifdef MP-WEIXIN
 			this.showtitle = true
 			this.form.open_id = uni.cache.get('open_id')
 			// #endif
-
-
 			try {
 				let res = await this.api.szzpyfailccho({
 					id: this.form.body,
@@ -242,7 +237,6 @@
 					});
 					return false;
 				}
-				// http://localhost:8080/pages/hindex/index?id=12&open_id=102132
 				let res = await this.api.usersubopeninvoicefixed(this.form)
 				if (res.code == 1) {
 					uni.showToast({
@@ -274,7 +268,6 @@
 				this.form.mobile = ''
 			},
 			async getOrder() { //搜索值
-				console.log(this.form.open_id)
 				let res = await this.api.enterprisestore({
 					like: this.form.user_name,
 					open_id: this.form.open_id,

pages/index/drawer.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="Box_box flex-between">
 				<view>开票员电话</view>
-				<view class="Box_box_input"><input type="text" v-model="form.taxphone" placeholder="请填写开票员电话"
+				<view class="Box_box_input"><input type="number" v-model="form.taxphone" placeholder="请填写开票员电话"
 						data-key="mobile" /></view>
 			</view>
 			<view class="Box_box flex-between" @click="showpicker = true">

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<!-- 占位符导航栏 -->
 		<navseat :opacity='false' :title='"首页"' :titleshow='true' :iconshow='false' :heightshow='true'
-			:namecolor='"#fff"' iconcolor='#fff'></navseat>
+			:namecolor='"#fff"' iconcolor='#fff' ></navseat>
 		<view class="topswiper" v-if="restype == 2">
 			<u-swiper :list="swiperlist" height="166"></u-swiper>
 			<view class="onetopswiper">
@@ -18,22 +18,33 @@
 			</view>
 		</view>
 		<view class="Box flex-between" v-if="restype == 1 && improveinformation">
-			<view class="content flex-colum" @click="merchantindex" v-if="store_status == 2">
+			<view class="content flex-colum" @click="indexInvoicing" v-if="improveinformation">
-				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item3.png" mode="aspectFill">
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item3.png" mode="aspectFill"></image>
-				</image>
-				<text>固定开票</text>
-			</view>
-			<view class="content flex-colum" @click="indexInvoicing" v-if="store_status == 1">
-				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item3.png" mode="aspectFill">
-				</image>
 				<text>极速开票</text>
 			</view>
-
+			<view class="content flex-colum" @click="webview" v-if="improveinformation">
-			<view class="content flex-colum" v-for="(item,index) in list" @click="clickcontent(item)" :key="index"
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item2.png" mode="aspectFill"></image>
-				v-if="item.show">
+				<text>后台管理</text>
-				<image :src="item.imge" mode="aspectFill">
+			</view>
-				</image>
+			<view class="content flex-colum" @click="indexorder" v-if="improveinformation">
-				<text>{{item.name}}</text>
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item1.png" mode="aspectFill"></image>
+				<text>开票记录</text>
+			</view>
+			<view class="content flex-colum" @click="notification" v-if="improveinformation">
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item6.png" mode="aspectFill"></image>
+				<text>绑定通知</text>
+			</view>
+			<view class="content flex-colum" @click="drawer" v-if="improveinformation">
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item5.png" mode="aspectFill"></image>
+				<text>开票员列表</text>
+			</view>
+			<view class="content flex-colum" @click="billingcode" v-if="improveinformation">
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item7.png" mode="aspectFill"></image>
+				<text>开票码</text>
+			</view>
+			<view class="content flex-colum" @click="auditbilling" v-if="improveinformation">
+				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item8.png" mode="aspectFill"></image>
+				<text>审核开票</text>
 			</view>
 			<!-- 	<view class="content flex-colum" @click="jumpToMiniProgram" v-if="improveinformation">
 				<image src="https://czg-invoicing.oss-cn-beijing.aliyuncs.com/static/item8.png" mode="aspectFill"></image>
@@ -205,6 +216,7 @@
 			try {
 				let res = await this.api.getrulelist()
 				this.list = res.data
+				console.log(res)
 			} catch (e) {
 				//TODO handle the exception
 			}

pages/index/information.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="Box_box flex-between">
 				<view>法人手机号</view>
-				<view class="Box_box_input"><input type="text" :disabled='disabled' v-model="form.phone"
+				<view class="Box_box_input"><input type="number" :disabled='disabled' v-model="form.phone"
 						placeholder="请填写法人手机号" data-key="mobile" /></view>
 			</view>
 			<view class="Box_box flex-between">
@@ -51,7 +51,7 @@
 			</view>
 			<view class="Box_box flex-between">
 				<view>开票员手机号码</view>
-				<view class="Box_box_input"><input type="text" :disabled='disabled' v-model="form.taxphone"
+				<view class="Box_box_input"><input type="number" :disabled='disabled' v-model="form.taxphone"
 						placeholder="请填写开票员手机号码" data-key="mobile" /></view>
 			</view>
 			<view class="Box_box flex-between">

pages/index/orderinfo.vue

@@ -36,10 +36,14 @@
 				<text class="classvie_itemone">项目名称：</text>
 				<text class="classvie_itemtow">{{ datalsit.article }}</text>
 			</view>
-			<view class="classvie_item flex-start">
+			<view class="classvie_item flex-start" v-if="datalsit.createtime">
-				<text class="classvie_itemone">开票时间：</text>
+				<text class="classvie_itemone">创建时间：</text>
 				<text class="classvie_itemtow">{{ datalsit.createtime }}</text>
 			</view>
+			<view class="classvie_item flex-start" v-if="datalsit.kprq">
+				<text class="classvie_itemone">开票时间：</text>
+				<text class="classvie_itemtow">{{ datalsit.kprq }}</text>
+			</view>
 		</view>
 	</view>
 </template>

pages/index/orderinfos.vue

@@ -46,9 +46,13 @@
 				<text class="classvie_itemone">项目名称：</text>
 				<text class="classvie_itemtow">{{datalsit.article}}</text>
 			</view>
-			<view class="classvie_item flex-start">
+			<view class="classvie_item flex-start" v-if="datalsit.createtime">
+				<text class="classvie_itemone">创建时间：</text>
+				<text class="classvie_itemtow">{{ datalsit.createtime }}</text>
+			</view>
+			<view class="classvie_item flex-start" v-if="datalsit.kprq">
 				<text class="classvie_itemone">开票时间：</text>
-				<text class="classvie_itemtow">{{datalsit.createtime}}</text>
+				<text class="classvie_itemtow">{{ datalsit.kprq }}</text>
 			</view>
 		</view>
 		<view class="content_boxt_tow">
@@ -116,9 +120,9 @@
 					// 调用绘制方法将二维码图案绘制到canvas上
 					qr.drawCanvas();
 				} else {
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.navigateBack()
-					},1000)
+					}, 1000)
 				}
 			},
 			savealbum(e) {

pages/login/login.vue

@@ -6,7 +6,7 @@
 		<view class="top_box">
 			<view class="top_box_one">
 				<text class="top_box_one_text">手机号码</text>
-				<input type="text" v-model="form.account" :adjust-position="false" placeholder="请输入手机号码" maxlength="-1"
+				<input type="number" v-model="form.account" :adjust-position="false" placeholder="请输入手机号码" maxlength="-1"
 					data-key="mobile" />
 			</view>
 			<!-- 	<view class="top_box_one">

pages/login/password.vue

@@ -5,7 +5,7 @@
 			<view class="top_box">
 				<view class="top_box_one">
 					<text class="top_box_one_text">手机号码</text>
-					<input type="text" v-model="form.phone" placeholder="请输入手机号码" data-key="mobile" />
+					<input type="number" v-model="form.phone" placeholder="请输入手机号码" data-key="mobile" />
 				</view>
 				<view class="top_box_one">
 					<text class="top_box_one_text">密码</text>

pages/login/register.vue

@@ -8,7 +8,7 @@
 		<view class="top_box" :style="h">
 			<view class="top_box_one">
 				<text class="top_box_one_text">手机号码</text>
-				<input type="text" v-model="form.phone" placeholder="请输入手机号码" data-key="mobile" />
+				<input type="number" v-model="form.phone" placeholder="请输入手机号码" data-key="mobile" />
 			</view>
 			<view class="top_box_one">
 				<text class="top_box_one_text">密码</text>

pages/merchant/information.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="Box_box flex-between">
 				<view>请填写法人手机号</view>
-				<view class="Box_box_input"><input type="text" :disabled='disabled' v-model="form.phone"
+				<view class="Box_box_input"><input type="number" :disabled='disabled' v-model="form.phone"
 						placeholder="请填写" data-key="mobile" /></view>
 			</view>
 		</view>

unpackage/dist/build/web/index.html

@@ -3,4 +3,4 @@
 			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.02fb05d3.js></script><script src=/static/js/index.a34fe316.js></script></body></html>
+				'" />')</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.773df081.js></script><script src=/static/js/index.519ef1d2.js></script></body></html>