diff --git a/manifest.json b/manifest.json
index 849cf13..44b6df3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.5",
-    "versionCode" : 145,
+    "versionName" : "1.4.6",
+    "versionCode" : 146,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -199,9 +199,9 @@
                 }
             },
             "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_ISPRODUCTION_IOS" : "true",
                 "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
                 "JPUSH_OPPO_APPKEY" : "",
                 "JPUSH_OPPO_APPID" : "",
                 "JPUSH_OPPO_APPSECRET" : "",
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 1517bb5..d7fc7a7 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -146,7 +146,7 @@
 			</view>
 		</view>
 		<view style="height:120upx;"></view>
-		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="margin-bottom: var(--status-bar-height);">
+		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="padding-bottom: var(--status-bar-height);">
 			<view class="more"></view>
       <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(order_id,1)">
       	同意
diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue
index 2f54607..9a3d94d 100644
--- a/pages/admin/order_cancellation/index.vue
+++ b/pages/admin/order_cancellation/index.vue
@@ -131,8 +131,12 @@
 						// console.log(self.verify_code);
 						verifierOrder(self.mer_id,self.verify_code)
 							.then(res => {
+								// uni.navigateTo({
+								// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+								// });
+								
 								uni.navigateTo({
-									url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+									url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
 								});
 							})
 							.catch(res => {
@@ -161,8 +165,11 @@
 						scanType: ["qrCode", "barCode"]
 					}).then(res=>{
 						this.verify_code = res.resultStr
+						// uni.navigateTo({
+						// 	url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+						// });
 						uni.navigateTo({
-							url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
+							url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
 						});
 						// this.codeChange();
 					}).catch(res => {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index b91603b..41562cc 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -704,11 +704,6 @@
 			that.getConfig();
 			uni.hideLoading();
 		},
-
-		onHide() {
-
-			this.CartCount = 0
-		},
 		/**
 		 * 用户点击右上角分享
 		 */
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index fd8c56e..69e7b32 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -306,7 +306,7 @@
 			<view class="content-clip"></view>
 			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
 				<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
-				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
+				<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view>
 				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
 					class=" acea-row row-right row-middle">
 					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 9b25334..27ee2c1 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -8,14 +8,14 @@
 					</div>
 				</div>
 				<div class="whiteBg" v-if="formItem === 1">
-					<div class="title acea-row row-center-wrapper">
+					<div class="title acea-row row-center-wrappe">
 						<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
 							@click="navTap(index)" :key="index">
 							{{ item }}
 						</div>
 					</div>
 					<div class="list" :hidden="current !== 1">
-						<form @submit.prevent="submit">
+						<form @submit.prevent="submit">r
 							<div class="item">
 								<div class="acea-row row-middle">
 									<image src="/static/images/phone_1.png"></image>
@@ -47,11 +47,13 @@
 									v-model="account" />
 							</div>
 						</div>
+						
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" />
+							
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+									v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -61,8 +63,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" />
+								<input type="number" placeholder="填写验证码"  placeholder-class="placeholder" class="codeIput"
+									v-model="codeVal" maxlength="4" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -95,8 +97,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<input type="number" placeholder="填写验证码"   maxLength='4'  placeholder-class="placeholder" class="codeIput"
 									v-model="captcha" />
+									
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -110,10 +113,11 @@
 									v-model="password" />
 							</div>
 						</div>
+						
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
 									v-model="codeVal" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
@@ -156,16 +160,18 @@
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
+					
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput"
+						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
 							v-model="captcha"></input>
+							
 						<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 							@click="handleVerify">
 							{{ text }}
 						</button>
 					</view>
 					<view class="item">
-						<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
+						<input type='password' placeholder='填写登录密码'  placeholder-class='placeholder'
 							v-model="password"></input>
 					</view>
 					<view class="protocol acea-row row-between-wrapper">
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 48848b7..f5a8ecc 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -164,13 +164,14 @@
 								<view class='discount'>暂无优惠券</view>
 							</block>
 						</view> -->
-						<!-- <view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
+						<view class='item acea-row row-between-wrapper'>
 							<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
 							<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
 								{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
 								<text class='iconfont icon-jiantou'></text>
 							</view>
-						</view> -->
+						</view>
+						
 						<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
 							class="item acea-row row-between-wrapper"
 							style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
@@ -382,6 +383,7 @@
 				</view>
 			</view>
 			<view style='height:140rpx;'></view>
+			
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 813fd98..f540c1a 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -250,8 +250,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-								<!-- 	<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 55fe401..0ea1728 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -259,8 +259,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
index d8df1e0..59c3119 100644
--- a/pages/users/order_list/order.vue
+++ b/pages/users/order_list/order.vue
@@ -247,8 +247,8 @@
 								</view>
 							</view>
 							<view class='bottom acea-row row-right row-middle'>
-								<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-									@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+								<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+									@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 									<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index 1dcd9a1..e25d0d6 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -257,8 +257,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>