修改禅道问题

http/api.js

@@ -10,6 +10,7 @@ import {
 } from '@/utils/base64.js';
 import Request from '@/utils/luch-request/index.js';
 const http = new Request(options);
+let isTokenExpired = false;
 const checkNetworkStatus = () => {
 	return new Promise((resolve, reject) => {
 		uni.getNetworkType({
@@ -99,13 +100,15 @@ http.interceptors.response.use((response) => {
 		return Promise.reject(response);
 	}
 	/*  对响应错误做点什么 （statusCode !== 200）*/
-	if (response.data.code === 401) {
+	if (response.data.code === 401 && !isTokenExpireds) {
+		isTokenExpired = true;
 		uni.showModal({
 			title: '提示',
 			content: '登录状态失效，点击确定重新登录',
 			showCancel: false,
 			success: function(res) {
 				if (res.confirm) {
+					isTokenExpired = false;
 					uni.reLaunch({
 						url: '/pages/login/index'
 					});

manifest.json

@@ -2,8 +2,8 @@
     "name" : "库比森轮胎-经销商端",
     "appid" : "__UNI__D89E6F8",
     "description" : "",
-    "versionName" : "1.0.13",
-    "versionCode" : 1013,
+    "versionName" : "1.0.14",
+    "versionCode" : 1014,
     "transformPx" : false,
     "ios" : {
         "bundleIdentifer" : "uni.app.UNID89E6F8" // 替换为你的 Bundle ID

pages/home/claim/details.vue

@@ -27,7 +27,7 @@
 						<view style="display: flex;align-items: center;height: 36px;width: 100%;">
 							<view @click="handleInputFocus()" style="width: 100%;text-align: right;padding: 0 20rpx;"
 								:style="form.vehicleNumber?'color:#000;':'color:#B5B4B4;font-size: 24rpx;'">
-								{{form.vehicleNumber||form.auditStatus>0||form.claimSourceType>1?' ':'请输入车牌号'}}
+								{{form.vehicleNumber||(form.auditStatus>0||form.claimSourceType>1?' ':'请输入车牌号')}}
 							</view>
 						</view>
 						<uni-icons v-if="!(form.auditStatus>0||form.claimSourceType>1)" type="camera" size="24"
@@ -46,8 +46,7 @@
 				</uni-forms-item>
 				<uni-forms-item name="tyreSpecs" label="规格型号">
 					<uni-easyinput v-model="form.tyreSpecs" class="right-align" placeholder-class="placeholder-right"
-						placeholder="" :inputBorder="false"
-						:disabled="true" :clearable="false"></uni-easyinput>
+						placeholder="" :inputBorder="false" :disabled="true" :clearable="false"></uni-easyinput>
 				</uni-forms-item>
 				<uni-forms-item name="brandItem" label="花纹">
 					<uni-easyinput v-model="form.brandItem" class="right-align" placeholder-class="placeholder-right"
@@ -69,7 +68,8 @@
 				</uni-forms-item>
 				<uni-forms-item name="claimReason" label="理赔原因">
 					<uni-easyinput v-model="form.claimReason" class="right-align" type="textarea"
-						placeholder-class="placeholder-right" :placeholder="form.auditStatus>0||form.claimSourceType>1?' ':'请输入内容'" :inputBorder="false"
+						placeholder-class="placeholder-right"
+						:placeholder="form.auditStatus>0||form.claimSourceType>1?' ':'请输入内容'" :inputBorder="false"
 						:del-icon="!(form.auditStatus>0||form.claimSourceType>1)"
 						:disabled="form.auditStatus>0||form.claimSourceType>1"></uni-easyinput>
 				</uni-forms-item>
@@ -135,7 +135,7 @@
 		<u-keyboard ref="uKeyboard" mode="car" :show="carShow" @change="carChange" @backspace="backspace"
 			:showCancel="false" :showConfirm="false" @close="carShow=false" :safeAreaInsetBottom="true"
 			:autoChange="true"></u-keyboard>
-		<view v-if="form.claimSourceType==1" style="padding:30rpx 20rpx;">
+		<!--<view v-if="form.claimSourceType==1" style="padding:30rpx 20rpx;">
 			<debounce-button v-if="!form.id" bgColor="#03803B" @click="submit">保存</debounce-button>
 			<view v-if="form.auditStatus==0" style="display: flex;">
 				<debounce-button bgColor="#03803B" style="width: 260rpx;" @click="submit">保存</debounce-button>
@@ -143,6 +143,16 @@
 					@click="approval">提交</debounce-button>
 			</view>
 			<debounce-button type="warn" v-if="form.auditStatus==1" @click="revoke">撤销审核</debounce-button>
+		</view> -->
+		<view v-if="form.claimSourceType==1" class="nav-bottom-height">
+		</view>
+		<view v-if="form.claimSourceType==1" class="goods-nav-bottom">
+			<uni-goods-nav v-if="!form.id" :fill="true" :options="[]" :buttonGroup="buttonGroup"
+				@buttonClick="buttonClick" />
+			<uni-goods-nav v-if="form.auditStatus==0" :fill="true" :options="[]" :buttonGroup="buttonGroup2"
+				@buttonClick="buttonClick2" />
+			<uni-goods-nav v-if="form.auditStatus==1" :fill="true" :options="[]" :buttonGroup="buttonGroup3"
+				@buttonClick="buttonClick3" />
 		</view>
 	</view>
 </template>
@@ -164,6 +174,27 @@
 	export default {
 		data() {
 			return {
+				buttonGroup: [{
+					text: '保存',
+					backgroundColor: '#03803B',
+					color: '#fff'
+				}],
+				buttonGroup2: [{
+						text: '保存',
+						backgroundColor: '#03803B',
+						color: '#fff'
+					},
+					{
+						text: '提交',
+						backgroundColor: '#e64340',
+						color: '#fff'
+					}
+				],
+				buttonGroup3: [{
+					text: '撤销审核',
+					backgroundColor: '#e64340',
+					color: '#fff'
+				}],
 				carShow: false,
 				form: {
 					file1: null,
@@ -176,7 +207,7 @@
 					claimSourceType: 1,
 					tireQuantity: 1,
 					claimAmount: null,
-					claimType:1,
+					claimType: 1,
 					claimAttachmentList: [],
 				},
 				imageStyles: {
@@ -204,6 +235,24 @@
 			}
 		},
 		methods: {
+			buttonClick(e) {
+				if (e.index == 0) {
+					this.submit()
+				}
+			},
+			buttonClick2(e) {
+				if (e.index == 0) {
+					this.submit()
+				}
+				if (e.index == 1) {
+					this.approval()
+				}
+			},
+			buttonClick3(e) {
+				if (e.index == 0) {
+					this.revoke()
+				}
+			},
 			// 处理输入框聚焦事件
 			handleInputFocus() {
 				if (this.form.auditStatus > 0 || this.form.claimSourceType > 1) return
@@ -319,7 +368,7 @@
 						uni.chooseImage({
 							count: 1, //默认9
 							sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-							sourceType:['camera'],
+							sourceType: ['camera'],
 							success: function(file) {
 								uni.showLoading({
 									title: '加载中',
@@ -364,7 +413,7 @@
 						let _this = this
 						uni.scanCode({
 							scanType: ['barCode'],
-							onlyFromCamera:true,
+							onlyFromCamera: true,
 							success: function(res) {
 								_this.form.tyreNo = res.result
 								_this.getMaterialDetail(res.result)

pages/home/store/details.vue

@@ -258,16 +258,18 @@
 				</uni-forms-item>
 			</uni-forms>
 		</uni-section>
-		<view v-if="form.enableOrNot!=1" style="padding:30rpx 20rpx;">
-			<view v-if="form.checkStatus=='录入'||form.checkStatus=='审核驳回'"
-				style="display: flex;margin-bottom: 20rpx;justify-content: space-between;">
-				<debounce-button bgColor="#18bc37" style="width: 260rpx;" @click="approval(1)">通过</debounce-button>
-				<debounce-button type="warn" style="width: 260rpx;" @click="approval(2)">驳回</debounce-button>
-			</view>
-			<view class="">
+		<!--<view v-if="form.enableOrNot!=1" style="padding:30rpx 20rpx;">
+			<view>
 				<debounce-button bgColor="#03803B" @click="submit">保存</debounce-button>
 			</view>
-
+		</view> -->
+		<view v-if="form.enableOrNot!=1" class="nav-bottom-height">
+		</view>
+		<view v-if="form.enableOrNot!=1" class="goods-nav-bottom">
+			<uni-goods-nav v-if="form.checkStatus=='录入'||form.checkStatus=='审核驳回'" :fill="true" :options="[]" :buttonGroup="buttonGroup"
+				@buttonClick="buttonClick" />
+			<uni-goods-nav v-if="!(form.checkStatus=='录入'||form.checkStatus=='审核驳回')" :fill="true" :options="[]" :buttonGroup="buttonGroup2"
+				@buttonClick="buttonClick2" />
 		</view>
 	</view>
 </template>
@@ -292,6 +294,22 @@
 	export default {
 		data() {
 			return {
+				buttonGroup: [{
+						text: '通过',
+						backgroundColor: '#18bc37',
+						color: '#fff'
+					},
+					{
+						text: '驳回',
+						backgroundColor: '#e64340',
+						color: '#fff'
+					}
+				],
+				buttonGroup2: [{
+					text: '保存',
+					backgroundColor: '#03803B',
+					color: '#fff'
+				}],
 				corpsTypeShow: false,
 				storeAttributesShow: false,
 				chainAttributeShow: false,
@@ -367,6 +385,19 @@
 			uni.$off();
 		},
 		methods: {
+			buttonClick(e) {
+				if (e.index == 0) {
+					this.approval(1)
+				}
+				if (e.index == 1) {
+					this.approval(2)
+				}
+			},
+			buttonClick2(e) {
+				if (e.index == 0) {
+					this.submit()
+				}
+			},
 			openMap() {
 				if (this.form.enableOrNot != 1) {
 					if (this.form.longitude && this.form.dimension) {

static/customicons.css

@@ -2,7 +2,25 @@
   font-family: "customicons"; /* Project id 2878519 */
   src:url('/static/customicons.ttf') format('truetype');
 }
-
+.nav-bottom-height {
+	height: calc(50px + env(safe-area-inset-bottom)) !important;
+}
+.goods-nav-bottom {
+	// display: flex;
+	// flex-direction: column;
+	position: fixed;
+	z-index:1000;
+	left: 0;
+	right: 0;
+	/* #ifdef H5 */
+	left: var(--window-left);
+	right: var(--window-right);
+	/* #endif */
+	bottom: 0;
+	/* #ifndef APP-PLUS */
+	bottom: env(safe-area-inset-bottom);
+	/* #endif */
+}
 .customicons {
   font-family: "customicons" !important;
 }