傅豪杰 11 months ago
parent
commit
af1f9fd072

+ 12 - 1
src/api/index.js

@@ -146,7 +146,7 @@ export function LJYforgetPassword(data) {
     })
 }
 
-//修改密码
+//获取信息
 export function getSysUserInfoByUserIdAPI(data) {
     return request({
         url: '/tianzong/personal/getSysUserInfoByUserId.do',
@@ -157,5 +157,16 @@ export function getSysUserInfoByUserIdAPI(data) {
 }
 
 
+//获取微信
+export function getWxConfig(data) {
+    return request({
+        url: '/tianzong/weixin/getWxConfig',
+        method: 'post',
+        data: data,
+        emulateJSON: true
+    })
+}
+
+
 
 

+ 33 - 31
src/pages/components/HomePage.vue

@@ -2,7 +2,8 @@
 	<div>
 		<div class="content">
 			<div class="sm">
-				<van-search v-model="value" @search="onSearch" placeholder="点击搜索单号" />
+				<!-- <van-search v-model="value" @search="onSearch" placeholder="点击搜索单号" /> -->
+				<van-search v-model="value" placeholder="点击搜索单号" />
 				<img @click="wxScanCode()" src="@/assets/user/u4.png" alt="">
 			</div>
 			<!-- 显示 -->
@@ -50,7 +51,7 @@
 </template>
 
 <script>
-import { appFindYourShipment, appStatistics, getSysUserInfoByUserIdAPI } from '../../api/index'
+import { appFindYourShipment, appStatistics, getSysUserInfoByUserIdAPI, getWxConfig } from '../../api/index'
 import {
 	Toast,
 	Dialog
@@ -285,45 +286,46 @@ export default {
 		},
 
 		async wxScanCodeA() {
-			const res = await appFindYourShipment({ expressNo: 'SF202303221917' }, { emulateJSON: true })
-			if (res.msg == 'success') {
-				this.$store.state.shipment = res
-				this.$router.push('ScannerResult')
-			} else {
-				Toast('找不到此单号')
-			}
-			console.log(res, '+++++++++==')
-
-		},
 
 
-		//单号搜索
-		onSearch(val) {
-			this.$router.push({
-				path: '/Sysearch',
-				query: {
-					expressNo: val,
-					searchType: "1" //1.搜索全部 2.搜索快件 3.搜索寄件
-				}
-			})
-		},
-	
+		// const res = await appFindYourShipment({ expressNo: 'SF202303221917' }, { emulateJSON: true })
+		// if (res.msg == 'success') {
+		// 	this.$store.state.shipment = res
+		// 	this.$router.push('ScannerResult')
+		// } else {
+		// 	Toast('找不到此单号')
+		// }
+		// console.log(res, '+++++++++==')
 
-		echart1(obj) {
-			console.log("图表数据:" + JSON.stringify(obj))
+	},
 
-		},
 
-		async getUser() {
-			const res = await getSysUserInfoByUserIdAPI({ userId: localStorage.getItem("userId") })
-			this.$store.state.user = res.sysUserInfo
-			console.log(this.$store.state.user, 'this.$state.state.user')
-		}
+	//单号搜索
+	onSearch(val) {
+		this.$router.push({
+			path: '/Sysearch',
+			query: {
+				expressNo: val,
+				searchType: "1" //1.搜索全部 2.搜索快件 3.搜索寄件
+			}
+		})
+	},
 
+	echart1(obj) {
+		console.log("图表数据:" + JSON.stringify(obj))
 
 	},
 
+	async getUser() {
+		const res = await getSysUserInfoByUserIdAPI({ userId: localStorage.getItem("userId") })
+		this.$store.state.user = res.sysUserInfo
+		console.log(this.$store.state.user, 'this.$state.state.user')
+	}
+
+
 }
+
+
 </script>
 
 <style scoped lang="less">

+ 1 - 1
src/pages/components/ScrollRefresh.vue

@@ -69,7 +69,7 @@ export default {
             // 距离底部20px以内 && 还有数据 && 没有正在加载中
             if (scrollBottom <= 20 && !this.noData && !this.loading) {
                 this.pagination.page += 1;
-                this.getData();
+                this.loadData()
             }
         },
         async loadData(isClear) {

+ 3 - 3
src/pages/components/Waitsent.vue

@@ -15,7 +15,7 @@
                     </div>
                     <!-- 各个运单 -->
                     <div class="batchss"
-                        :style="{ overflow: item.openCard ? 'auto' : 'hidden', height: item.openCard ? 'auto' : '130px', }">
+                        :style="{ overflow: item.openCard ? 'auto' : 'hidden', height: item.openCard ? 'auto' : '150px', }">
                         <div class="batch-middel" v-for="(unfold, index) in item.list" :key="index">
                             <div class="batch-middel-text">
                                 <div class="batch-middel-text-style">[{{ unfold.expressCompany }}]运单号:{{
@@ -272,7 +272,7 @@ export default {
 
 
 .batchss {
-    height: 130px;
+    // height: 130px;
     // overflow: hidden;
 }
 
@@ -292,7 +292,7 @@ export default {
     }
 
     &-middel {
-        height: 120px;
+        // height: 120px;
         background-color: #f2f2f2;
         border-radius: 12px;
         margin: 10px 6px;