From 759e714ff129c16bac68c2679ecc7dbf7db861d7 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 10 May 2024 16:16:17 +0800
Subject: [PATCH] uu

---
 common/api/common.js           |  5 +-
 common/api/url.js              |  3 +-
 common/api/user.js             |  2 +-
 pages/print/courierNote.vue    |  4 +-
 pages/tabBar/mine/mine.vue     |  2 +-
 pages/user/exclusiveQrcode.vue | 85 ++++++++++++++++++++--------------
 6 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/common/api/common.js b/common/api/common.js
index 2def30c..0c1f82f 100644
--- a/common/api/common.js
+++ b/common/api/common.js
@@ -1,5 +1,5 @@
 import { coreRequest } from '@/common/request'
-import url from "./url"
+import url, { host } from "./url"
 
 export const getEmisCountry = (data = {})=> {
 	return coreRequest(url.getEmisCountry, data, {}, 'GET')
@@ -54,5 +54,8 @@ export const getLatestNotices = (data = {})=> {
 	return coreRequest(url.getLatestNotices, data, {}, "GET")
 }
 
+export const getStaffQRCodePng = (data = {})=> {
+	return coreRequest(url.getStaffQRCodePng, data, {}, "GET")
+}
 
 
diff --git a/common/api/url.js b/common/api/url.js
index 68ca306..3867573 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -5,6 +5,7 @@ export default {
   uploadFile: '/common/ossUpload',
   loginByApp: `/loginByApp`, // 登录
   getInfoByApp: `/getInfoByApp`,// 获取用户基本信息
+  getStaffQRCodePng: `/emis/emisStaff/getStaffQRCodePng`,// 获取用户基本信息
   
   getEmisCountry: `/emis/emisCountry/list`, // 获取国家列表
   getEmisRegion: `/emis/emisRegion/list`,// 获取省市区列表
@@ -40,7 +41,7 @@ export default {
   getOrderDetail: `/emis/emisWaybill/getWaybillDetail`, // 订单详情
   
   scanRecord: `/emis/emisTmsScanRecord/scan`, // 扫描-  揽收
-  getRealGetWaybillPrintData: `/emis/emisWaybill/realGetWaybillPrintData`, // 运单 打印数据
+  getRealGetWaybillPrintData: `/emis/emisWaybill/realGetWaybillPng`, // 运单 打印数据
   
   getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
   
diff --git a/common/api/user.js b/common/api/user.js
index be981b8..73b8166 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -7,4 +7,4 @@ export const loginByApp = (data = {})=> {
 
 export const getInfoByApp = (data = {})=> {
 	return coreRequest(url.getInfoByApp, data, {}, 'GET')
-}
\ No newline at end of file
+}
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index 8d95638..f3ab5ae 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -18,7 +18,7 @@
 					</u-row>
 					<u-row custom-style="margin-top:20rpx;" justify="end">
 						<u-row>
-							<text class="pr-30">是否已打印F</text>
+							<text class="pr-30">是否已打印</text>
 							<u-switch v-model="submitParam.hasPrinted"
 								active-color="#B12D29" size="34"></u-switch>
 						</u-row>
@@ -158,7 +158,7 @@
 				// val && ()
 			}),
 			handleSubmit() {
-				// this.getRealGetWaybillPrintData()
+				this.getRealGetWaybillPrintData()
 				this.goto("print/bluetoothPrinter")
 				// this.goto("print/bluetooth-mini-printer")
 			},
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index e80fbf6..f58bb29 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -17,7 +17,7 @@
 								<view class="pl-30">
 									<u-row>
 										<u-text :text="userInfo.empName" color="#fff" size="32" bold="true"></u-text>
-										<view class="ml-20 clr-wht font-24 pos-rlt" style="padding: 8rpx 12rpx;">南京网点
+										<view class="ml-20 clr-wht font-24 pos-rlt" style="padding: 8rpx 12rpx;">{{userInfo.ownerSiteName}}
 											<view class="pos-abt-all" style="z-index: 0;background: #FFFFFF;opacity: 0.2;border-radius: 20rpx;"></view>
 										</view>
 									</u-row>
diff --git a/pages/user/exclusiveQrcode.vue b/pages/user/exclusiveQrcode.vue
index 5de8833..47cdcb4 100644
--- a/pages/user/exclusiveQrcode.vue
+++ b/pages/user/exclusiveQrcode.vue
@@ -1,56 +1,73 @@
 <template>
-	<view style="padding: 2rpx 30rpx;">
-		
-		<view class="blcok-white" style="padding: 40rpx 0;">
-			<u-row justify="center">
-				<view>
-					<u-row>
-						<u-avatar size="120"></u-avatar>
-						<view class="pl-30">
-							<u-row>
-								<u-text text="张三"  size="32" bold="true"></u-text>
-								<view class="ml-20 font-24 pos-rlt" style="padding: 8rpx 12rpx;">南京网点
-									<view class="pos-abt-all" style="z-index: 0;background: #999;opacity: 0.2;border-radius: 20rpx;"></view>
-								</view>
-							</u-row>
-							<view class="mt-20 font-24">13712345678</view>
-						</view>
-					</u-row>
-					<view class="mt-30">
-						<u-image height="600" width="600" radius="10"></u-image>
-					</view>
-					
-					<view class="mt-40">
-						<u-row justify="between">
-							<view style="width: 200rpx;">
-								<u-button type="primary" custom-style="border-radius: 10rpx;">保存到本地</u-button>
-							</view>
-							<view style="width: 200rpx;">
-								<u-button type="primary" plain="true" custom-style="border-radius: 10rpx;">打印</u-button>
+	<tpx-page>
+		<view style="padding: 2rpx 30rpx;">
+			
+			<view class="blcok-white" style="padding: 40rpx 0;">
+				<u-row justify="center">
+					<view>
+						<u-row>
+							<u-avatar size="120"></u-avatar>
+							<view class="pl-30">
+								<u-row>
+									<u-text :text="userInfo.empName"  size="32" bold="true"></u-text>
+									<view class="ml-20 font-24 pos-rlt" style="padding: 8rpx 12rpx;">{{userInfo.ownerSiteName}}
+										<view class="pos-abt-all" style="z-index: 0;background: #999;opacity: 0.2;border-radius: 20rpx;"></view>
+									</view>
+								</u-row>
+								<view class="mt-20 font-24">{{userInfo.phonenumber}}</view>
 							</view>
 						</u-row>
+						<view class="mt-30">
+							<u-image height="600" width="600" radius="10" :src="qrCodeImgUrl"></u-image>
+						</view>
+						
+						<view class="mt-40">
+							<u-row justify="between">
+								<view style="width: 200rpx;" @click="handleSave">
+									<u-button type="primary" custom-style="border-radius: 10rpx;">保存到本地</u-button>
+								</view>
+								<view style="width: 200rpx;">
+									<u-button type="primary" plain="true" custom-style="border-radius: 10rpx;">打印</u-button>
+								</view>
+							</u-row>
+						</view>
 					</view>
-				</view>
-			</u-row>
+				</u-row>
+			</view>
 		</view>
-	</view>
+	</tpx-page>
 </template>
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
+	import * as apiService from "@/common/api"
+	
 	export default {
+		computed: {
+		    userInfo() {
+		      return this.$store.getters.userInfo
+		    }
+		},
 		props: {
 		},
 		data() {
 			return {
-				
+				qrCodeImgUrl: ''
 			}
 		},
 		onShareAppMessage() {
 			return {
 			}
 		},
+		onLoad() {
+			this.initData()
+		},
 		methods: {
-			getCdnUrl,
+			async initData(){
+				let res = await apiService.getStaffQRCodePng({ _loading: true })
+				this.qrCodeImgUrl = res.data
+			},
+			handleSave(){
+				
+			},
 		}
 	}
 </script>