12.02

App.vue

@@ -1,5 +1,9 @@
 <script>
 	import {
+		request
+	} from 'common/request/request'
+	require("promise.prototype.finally").shim()
+	import {
 		mapState,
 		mapMutations
 	} from 'vuex'

common/request/request.js

@@ -36,7 +36,7 @@ export function request(config) {
 
 //在uni-app中使用对app有效果，h5不需要
 axios.defaults.adapter = function (config) {
-	config.headers.Authorization = uni.getStorageSync('token');
+	config.headers.token = uni.getStorageSync('token');
     return new Promise((resolve, reject) => {
         var settle = require('axios/lib/core/settle');
         var buildURL = require('axios/lib/helpers/buildURL');

pages.json

@@ -57,18 +57,6 @@
 					"titleNView": false
 				}
 			}
-		},
-		{
-			"path": "pages/login/upgrade",
-			"style": {
-				"navigationStyle": "custom", // 取消本页面的导航栏
-				"app-plus": {
-					"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
-					"background": "transparent", // 背景透明
-					"backgroundColor": "rgba(0,0,0,0)", // 背景透明
-					"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
-				}
-			}
 		}
 	],
 	"subPackages": [{

pages/home/scancode/index.vue

@@ -47,6 +47,28 @@
 		<view>
 		</view>
 		<u-toast ref="repeat" position="bottom" />
+		<u-popup mode="bottom" v-model="show_s" :mask-close-able="false" :safe-area-inset-bottom="true">
+			<view class="confrim-btn">
+				<u-button @click="show_s = false;" style="float: left;border: none;" :hair-line="false" :plain="false">取消</u-button>
+				<u-button @click="container" style="float: right;border: none;" :hair-line="false" :plain="false">确定</u-button>
+			</view>
+			<view class="content_s">
+				<scroll-view scroll-y="true" style="height: 300rpx;font-size: 40rpx;margin-bottom: 40rpx;margin-top: 100rpx;">
+					{{regular}}
+				</scroll-view>
+			</view>
+		</u-popup>
+		<u-popup mode="bottom" v-model="show_d" :mask-close-able="false" :safe-area-inset-bottom="true">
+			<view class="confrim-btn">
+				<u-button @click="show_d = false;" style="float: left;border: none;" :hair-line="false" :plain="false">取消</u-button>
+				<u-button @click="container_s" style="float: right;border: none;" :hair-line="false" :plain="false">确定</u-button>
+			</view>
+			<view class="content_s">
+				<scroll-view scroll-y="true" style="height: 200rpx;">
+					{{regular}}
+				</scroll-view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -64,26 +86,30 @@
 				content: '请输入轮胎胎号',
 				number_s: '',
 				number_a: '',
+				regular: '轮胎非正规是否入库',
 				lisi: [],
 				background: {
 					backgroundColor: '#0094fe',
 				},
 				show: true,
+				show_s: false,
+				show_d: false,
+				res: ''
 			}
 		},
 		created() {
 			uni.getNetworkType({
-			    success: function (res) {
+				success: function(res) {
 					let none = res.networkType
-			        console.log(res.networkType);
-					if(none == 'none'){
+					console.log(res.networkType);
+					if (none == 'none') {
 						uni.showToast({
 							icon: 'none',
 							title: '无网络，请连接网络后再试~',
 							position: "bottom"
 						})
 					}
-			    }
+				}
 			});
 			const innerAudioContext = uni.createInnerAudioContext();
 			innerAudioContext.autoplay = true;
@@ -109,6 +135,16 @@
 						}
 					}).then(res => {
 						console.log(res.data.code)
+						if (res.data.code == 500) {
+							this.$refs.repeat.show({
+								title: '请扫描或输入正确的胎号',
+								type: 'default',
+								position: 'bottom'
+							})
+							return
+						}
+						this.res = res
+						console.log(res.data.data[0].isRegular)
 						for (let i = 0; i < this.lisi.length; i++) {
 							if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
 								this.$refs.repeat.show({
@@ -117,45 +153,19 @@
 									position: 'bottom'
 								})
 								return
-							} else if (res.data.data[0].flagRegular == 1) {
-								this.$refs.repeat.show({
-									title: '轮胎非正规',
-									type: 'default',
-									position: 'bottom'
-								})
-								return
 							}
 						}
-						if (res.data.code == 500) {
-							this.$refs.repeat.show({
-								title: res.data.msg,
-								type: 'default',
-								position: 'bottom'
-							})
+						if (res.data.data[0].isRegular == 1) {
+							console.log(res.data.data[0].isRegular)
+							// this.$refs.repeat.show({
+							// 	title: '轮胎非正规',
+							// 	type: 'default',
+							// 	position: 'bottom'
+							// })
+							this.show_s = true
 							return
 						}
-
-						this.$refs.repeat.show({
-							title: '录入成功',
-							type: 'success',
-							position: 'bottom'
-						})
-						this.number_a = ""
-						console.log("我成功啦")
-						console.log(res)
-						this.lisi.push({
-							specs: res.data.data[0].specs,
-							flagRegular: res.data.data[0].isRegular,
-							diameter: res.data.data[0].diameter,
-							maktx: res.data.data[0].maktx,
-							pattern: res.data.data[0].pattern,
-							soldToPartyKunnr: res.data.data[0].soldToPartyKunnr,
-							matnr: res.data.data[0].matnr,
-							tireNumber: res.data.data[0].tirenumber,
-							brand: res.data.data[0].brand,
-							shippedDate: res.data.data[0].shippedDate,
-							scanWay: '0'
-						})
+						this.container()
 						console.log(this.lisi)
 					}).catch(err => {
 						this.$refs.repeat.show({
@@ -169,20 +179,46 @@
 						// Loading.close()
 					})
 			},
+			container() {
+				this.$refs.repeat.show({
+					title: '录入成功',
+					type: 'success',
+					position: 'bottom'
+				})
+				console.log(this.res.data.data[0].specs)
+				this.show_s = false
+				this.number_a = ''
+				console.log("我成功啦.")
+				this.lisi.push({
+					specs: this.res.data.data[0].specs,
+					flagRegular: this.res.data.data[0].isRegular,
+					diameter: this.res.data.data[0].diameter,
+					maktx: this.res.data.data[0].maktx,
+					pattern: this.res.data.data[0].pattern,
+					soldToPartyKunnr: this.res.data.data[0].soldToPartyKunnr,
+					matnr: this.res.data.data[0].matnr,
+					tireNumber: this.res.data.data[0].tirenumber,
+					brand: this.res.data.data[0].brand,
+					shippedDate: this.res.data.data[0].shippedDate,
+					plyRating: this.res.data.data[0].plyRating,
+					scanWay: '0'
+				})
+				console.log(this.lisi)
+			},
 			//获取扫码控件
 			getScanCode(val) {
 				uni.getNetworkType({
-				    success: function (res) {
+					success: function(res) {
 						let none = res.networkType
-				        console.log(res.networkType);
-						if(none == 'none'){
+						console.log(res.networkType);
+						if (none == 'none') {
 							uni.showToast({
 								icon: 'none',
 								title: '无网络，请连接网络后再试~',
 								position: "bottom"
 							})
 						}
-				    }
+					}
 				});
 				console.log(val)
 				this.number = val
@@ -196,6 +232,7 @@
 							tyreNum: this.number_s
 						}
 					}).then(res => {
+						this.res_s = res
 						this.tips = "胎号"
 						for (let i = 0; i < this.lisi.length; i++) {
 							if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
@@ -210,7 +247,7 @@
 						}
 						if (res.data.code == 500) {
 							this.$refs.repeat.show({
-								title: res.data.msg,
+								title: '请扫描或输入正确的胎号',
 								type: 'default',
 								position: 'bottom'
 							})
@@ -226,39 +263,17 @@
 							});
 							return
 						}
-						this.number_s = ""
-						console.log("我成功啦")
-						console.log(res)
-
-						this.lisi.push({
-							specs: res.data.data[0].specs,
-							flagRegular: res.data.data[0].isRegular,
-							diameter: res.data.data[0].diameter,
-							maktx: res.data.data[0].maktx,
-							pattern: res.data.data[0].pattern,
-							soldToPartyKunnr: res.data.data[0].soldToPartyKunnr,
-							matnr: res.data.data[0].matnr,
-							tireNumber: res.data.data[0].tirenumber,
-							brand: res.data.data[0].brand,
-							shippedDate: res.data.data[0].shippedDate,
-							plyRating: res.data.data[0].plyRating,
-							scanWay: '1'
-						})
-						const innerAudioContext = uni.createInnerAudioContext();
-						innerAudioContext.autoplay = true;
-						innerAudioContext.src = '../../../static/mp3/scansuccess.mp3';
-						innerAudioContext.onPlay(() => {
-							console.log('开始播放');
-						});
-						innerAudioContext.onError((res) => {
-							console.log(res.errMsg);
-							console.log(res.errCode);
-						});
-						this.$refs.repeat.show({
-							title: '扫码成功',
-							type: 'success',
-							position: 'bottom'
-						})
+						if (res.data.data[0].isRegular == 1) {
+							console.log(res.data.data[0].isRegular)
+							this.$refs.repeat.show({
+								title: '轮胎非正规',
+								type: 'default',
+								position: 'bottom'
+							})
+							this.show_d = true
+							return
+						}
+						this.container_s()
 						console.log(this.lisi)
 					}).catch(err => {
 						if (code == 400) {
@@ -281,6 +296,42 @@
 						// Loading.close()
 					})
 			},
+			container_s() {
+				console.log("什么？？？？")
+				this.number_s = ''
+				console.log("我成功啦")
+				console.log(this.res_s)
+				
+				this.lisi.push({
+					specs: this.res_s.data.data[0].specs,
+					flagRegular: this.res_s.data.data[0].isRegular,
+					diameter: this.res_s.data.data[0].diameter,
+					maktx: this.res_s.data.data[0].maktx,
+					pattern: this.res_s.data.data[0].pattern,
+					soldToPartyKunnr: this.res_s.data.data[0].soldToPartyKunnr,
+					matnr: this.res_s.data.data[0].matnr,
+					tireNumber: this.res_s.data.data[0].tirenumber,
+					brand: this.res_s.data.data[0].brand,
+					shippedDate: this.res_s.data.data[0].shippedDate,
+					plyRating: this.res_s.data.data[0].plyRating,
+					scanWay: '1'
+				})
+				const innerAudioContext = uni.createInnerAudioContext();
+				innerAudioContext.autoplay = true;
+				innerAudioContext.src = '../../../static/mp3/scansuccess.mp3';
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放');
+				});
+				innerAudioContext.onError((res) => {
+					console.log(res.errMsg);
+					console.log(res.errCode);
+				});
+				this.$refs.repeat.show({
+					title: '扫码成功',
+					type: 'success',
+					position: 'bottom'
+				})
+			},
 			confirm(index) {
 				console.log(index + "什么情况")
 				this.lisi.splice(index, 1)
@@ -351,6 +402,11 @@
 		padding-top: 400px;
 	}
 
+	.content_s {
+		padding: 24rpx;
+		text-align: center;
+	}
+
 	.logo {
 		height: 200rpx;
 		width: 200rpx;

pages/home/scancode/scancodeout.vue

@@ -145,6 +145,7 @@
 							tireNumber: res.data.data[0].tirenumber,
 							brand: res.data.data[0].brand,
 							shippedDate: res.data.data[0].shippedDate,
+							plyRating: res.data.data[0].plyRating,
 							scanWay: '0'
 						})
 						console.log(this.lisi)

pages/login/upgrade.vue

@@ -1,53 +0,0 @@
-<template>
-	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级"
-		title="发现新版本" @cancel="cancel" @confirm="confirm"
-	>
-		<view class="u-update-content">
-			<rich-text :nodes="content"></rich-text>
-		</view>
-	</u-modal>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				show: true,
-				// 传递给uni-app"rich-text"组件的内容，可以使用"<br>"进行换行
-				content: `
-					1. 修复badge组件的size参数无效问题<br>
-					2. 新增Modal模态框组件<br>
-					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
-					4. 修复键盘组件在微信小程序上遮罩无效的问题
-				`,
-			}
-		},
-		onReady() {
-			this.show = true;
-		},
-		methods: {
-			cancel() {
-				this.closeModal();
-			},
-			confirm() {
-				this.closeModal();
-			},
-			closeModal() {
-				uni.navigateBack();
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.u-full-content {
-		background-color: #00C777;
-	}
-	
-	.u-update-content {
-		font-size: 26rpx;
-		color: $u-content-color;
-		line-height: 1.7;
-		padding: 30rpx;
-	}
-</style>

pages/me/Delivery-details/index.vue

@@ -144,7 +144,7 @@
 				this.page = 1
 				this.itemList = []
 				this.beginDate = e.startDate + " 00:00:00",
-				this.endDate = e.endDate + " 00:00:00",
+				this.endDate = e.endDate + " 23:59:59",
 				console.log(e);
 				this.getPage()
 			},

pages/me/Warehousing-details/index.vue

@@ -146,7 +146,7 @@
 				this.page = 1
 				this.itemList = []
 				this.beginDate = e.startDate + " 00:00:00"
-				this.endDate = e.endDate + " 00:00:00"
+				this.endDate = e.endDate + " 23:59:59"
 				console.log(e)
 				console.log("触发了")
 				console.log(this.show_d)

pages/me/setting/setting.vue

@@ -1,186 +1,148 @@
 <template>
-  <view>
-    <!-- 设置 -->
-    <u-card
-      :border="false"
-      padding="30"
-      box-shadow="0px 1px 10px rgba(0,0,0,0.2)"
-      border-radius="20"
-      :show-foot="false"
-      :show-head="false"
-	   @click="tishi"
-    >
-      <view slot="body">
-        <view class="u-flex u-row-between">
-          <view class="">
-            <u-image
-              width="130rpx"
-              height="130rpx"
-              :src="userInfo.storeImageUrl"
-              :lazy-load="true"
-              shape="circle"
-            >
-              <view
-                slot="error"
-                style="font-size: 24rpx"
-                :fade="true"
-                duration="450"
-                >加载失败
-              </view>
-            </u-image>
-          </view>
-          <view class="u-flex">
-            <view class="u-m-r-50" style="color: #0d79ec; font-size: 32rpx"
-              >修改头像</view
-            >
-            <u-icon name="arrow-right" color="#0D79EC" size="28"></u-icon>
-          </view>
-        </view>
-      </view>
-    </u-card>
-    <u-card
-      :border="false"
-      padding="20"
-      box-shadow="0px 1px 10px rgba(0,0,0,0.2)"
-      border-radius="20"
-      :show-foot="false"
-      :show-head="false"
-    >
-      <view slot="body">
-        <template>
-          <u-cell-group :border="false">
-            <u-cell-item title="收货地址管理" @click="tishi">
-              <u-icon
-                slot="icon"
-                size="42"
-                name="location-o"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-            <u-cell-item title="门店名称" :value="userInfo.storeName" :arrow="false">
-              <u-icon
-                slot="icon"
-                size="42"
-                name="shop-o"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-            <u-cell-item title="门店联系人" :value="userInfo.contactName" :arrow="false">
-              <u-icon
-                slot="icon"
-                size="42"
-                name="contact"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-            <u-cell-item title="联系电话" :value="userInfo.storePhone" :arrow="false">
-              <u-icon
-                slot="icon"
-                size="42"
-                name="phone-o"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-            <u-cell-item title="用户协议">
-              <u-icon
-                slot="icon"
-                size="42"
-                name="friends-o"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-            <u-cell-item title="隐私政策">
-              <u-icon
-                slot="icon"
-                size="42"
-                name="info-o"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-            <u-cell-item
-              title="版本检测"
-              value="1.00"
-              :arrow="false"
-              :border-bottom="false"
-            >
-              <u-icon
-                slot="icon"
-                size="42"
-                name="setting-o"
-                custom-prefix="van-icon"
-                color="#0095FF"
-                style="margin-right: 10rpx"
-              ></u-icon>
-            </u-cell-item>
-          </u-cell-group>
-        </template>
-      </view>
-    </u-card>
-    <u-button type="primary" @click="exit" style="margin: 20rpx"
-      >安全退出</u-button
-    >
-  </view>
+	<view>
+		<!-- 设置 -->
+		<u-card :border="false" padding="30" box-shadow="0px 1px 10px rgba(0,0,0,0.2)" border-radius="20" :show-foot="false"
+		 :show-head="false" @click="tishi">
+			<view slot="body">
+				<view class="u-flex u-row-between">
+					<view class="">
+						<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle">
+							<view slot="error" style="font-size: 24rpx" :fade="true" duration="450">加载失败
+							</view>
+						</u-image>
+					</view>
+					<view class="u-flex">
+						<view class="u-m-r-50" style="color: #0d79ec; font-size: 32rpx">修改头像</view>
+						<u-icon name="arrow-right" color="#0D79EC" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+		</u-card>
+		<u-card :border="false" padding="20" box-shadow="0px 1px 10px rgba(0,0,0,0.2)" border-radius="20" :show-foot="false"
+		 :show-head="false">
+			<view slot="body">
+				<template>
+					<u-cell-group :border="false">
+						<u-cell-item title="收货地址管理" @click="tishi">
+							<u-icon slot="icon" size="42" name="location-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+						<u-cell-item title="门店名称" :value="userInfo.storeName" :arrow="false">
+							<u-icon slot="icon" size="42" name="shop-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+						<u-cell-item title="门店联系人" :value="userInfo.contactName" :arrow="false">
+							<u-icon slot="icon" size="42" name="contact" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+						<u-cell-item title="联系电话" :value="userInfo.storePhone" :arrow="false">
+							<u-icon slot="icon" size="42" name="phone-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+						<u-cell-item title="用户协议">
+							<u-icon slot="icon" size="42" name="friends-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+						<u-cell-item title="隐私政策">
+							<u-icon slot="icon" size="42" name="info-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+						<u-cell-item title="版本检测" :value="edition_s" :arrow="false" :border-bottom="false" @click="edition">
+							<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
+						</u-cell-item>
+					</u-cell-group>
+				</template>
+			</view>
+		</u-card>
+		<u-button type="primary" @click="exit" style="margin: 20rpx">安全退出</u-button>
+	</view>
 </template>
 
 <script>
-import { mapMutations } from "vuex";
-import { request } from "../../../common/request/request";
-require("promise.prototype.finally").shim();
-export default {
-  data() {
-    return {
-      userInfo: {},
-    };
-  },
-  created() {
-    this.getMyinfo();
-  },
-  methods: {
-    ...mapMutations(["logout"]),
-    exit() {
-      this.logout();
-      this.$u.route({
-        url: "pages/login/index",
-        type: "reLaunch",
-      });
-    },
-    getMyinfo() {
-      request({
-        url: "/myapp/selectStore",
-        method: "post",
-        data: {
-          storeId: this.$store.state.storeInfo.storeId,
-        },
-      })
-        .then((res) => {
-          this.userInfo = res.data.data;
-          console.log(this.userInfo);
-        })
-        .catch((err) => {
-          console.log(err);
-        })
-        .finally(() => {
-          this.loading = false;
-          uni.hideLoading();
-        });
-	},
-	tishi(){
-		this.$u.toast('此功能暂不开放');
-	}
-  },
-};
+	import {
+		mapMutations
+	} from "vuex";
+	import {
+		request
+	} from "../../../common/request/request";
+	require("promise.prototype.finally").shim();
+	export default {
+		data() {
+			return {
+				userInfo: {},
+				edition_s: ''
+			};
+		},
+		created() {
+			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+				console.log(wgtinfo);
+				console.log(wgtinfo.version); //版本号
+				this.edition_s = wgtinfo.version
+			})
+			this.getMyinfo();
+		},
+		methods: {
+			...mapMutations(["logout"]),
+			exit() {
+				this.logout();
+				this.$u.route({
+					url: "pages/login/index",
+					type: "reLaunch",
+				});
+			},
+			edition() {
+				request({
+						url: '/baseReq/apkUpgrade',
+						method: 'get',
+						params: {
+							osType: 0
+						}
+					}).then(res => {
+						console.log(res)
+						console.log(res.data.forceVersion) //最低版本
+						console.log(res.data.msg) //更新文案
+						console.log(res.data.url) //下载最新版地址
+						console.log(res.data.version) //最新版本
+							if (this.edition_s == res.data.forceVersion) {
+								console.log("已满足最低版本")
+							} else if (this.edition_s == res.data.version) {
+								console.log("已满足最高版本")
+								uni.showToast({
+									icon: 'none',
+									title: '已经是最新版本了！',
+									position: "bottom"
+								})
+								this.closeModal();
+							} else {
+								console.log("全部不满足")
+							}
+
+					}).catch(err => {
+						console.log(err)
+					})
+					.finally(() => {
+						// Loading.close()
+					})
+			},
+			getMyinfo() {
+				request({
+						url: "/myapp/selectStore",
+						method: "post",
+						data: {
+							storeId: this.$store.state.storeInfo.storeId,
+						},
+					})
+					.then((res) => {
+						this.userInfo = res.data.data;
+						console.log(this.userInfo);
+					})
+					.catch((err) => {
+						console.log(err);
+					})
+					.finally(() => {
+						this.loading = false;
+						uni.hideLoading();
+					});
+			},
+			tishi() {
+				this.$u.toast('此功能暂不开放');
+			}
+		},
+	};
 </script>
 
 <style>