调拨、添加钢瓶、钢瓶扫码调拨

components/x-navbottom.vue

@@ -116,7 +116,7 @@
 	}
 
 	.activeName {
-		color: #3E80FF !important;
+		color: #3C9CFE !important;
 	}
 
 	.icon_image {

pages.json

@@ -47,6 +47,18 @@
 			}
 		},
 		{
+			"path": "pages/information/cylinder",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/information/transfer",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path": "pages/order/index",
 			"style": {
 				"navigationBarTitleText": "订单",

pages/information/cylinder.vue

@@ -0,0 +1,263 @@
+<template>
+	<!-- 添加钢瓶 -->
+	<view>
+		<u-navbar title="添加钢瓶" autoBack placeholder @leftClick="leftClick"></u-navbar>
+		<view class="card_cylinder">
+			<view class="title_index">钢瓶编号</view>
+			<view style="display: flex;align-items: center;">
+				<u-input border="surround" placeholder="点击输入" v-model="frequencyCoding"></u-input>
+				<view class="btn_add_card">
+					<u-button type="primary" text="添加" @click="addCode"></u-button>
+				</view>
+			</view>
+			<view class="scan_card_code">
+				<view style="display: flex;align-items: center;" @click="addLine">
+					<u-icon name="scan" size="26"></u-icon>
+					<view class="title_subhead">增加一条</view>
+				</view>
+				<view style="display: flex;align-items: center;margin-left: 30rpx;" @click="continuousAddition">
+					<u-icon name="scan" size="26"></u-icon>
+					<view class="title_subhead">连续扫码增加</view>
+				</view>
+			</view>
+			<view>
+				<view class="space_between card_code_trac" v-for="(item,index) in codeList" :key="index">
+					<view style="display: flex;align-items: center;">
+						<view class="item_current">{{index + 1}}</view>
+						<view class="item_title1">{{item}}</view>
+					</view>
+					<view class="item_title1 title_red" @click="delCode(index)">删除</view>
+				</view>
+			</view>
+		</view>
+		<view style="width: 100%;height: 120rpx;"></view>
+		<view class="card_btn">
+			<u-button style="margin-bottom: 20rpx;" type="primary" @click="submit">提交</u-button>
+		</view>
+		<u-popup :show="show" :round="10" mode="center" @close="close">
+			<view class="card_coding_scan">
+				<view class="title_coding">钢瓶编号</view>
+				<view class="coding_title1">{{scanCoding}}</view>
+				<view style="display: flex;align-items: center;">
+					<u-icon color="#19be6b" size="30" name="checkmark-circle-fill"></u-icon>
+					<view class="success_title">扫描成功</view>
+				</view>
+				<view class="title_coding">3秒后再次扫描</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				frequencyCoding: '',
+				codeList: [],
+				scanType: 1,
+				show: false,
+				scanCoding: '',
+				bottleType: 1,
+			}
+		},
+		onLoad(value) {
+			this.bottleType = value.status
+		},
+		methods: {
+			// 返回
+			leftClick(){
+				uni.$emit('refresh');
+			},
+			// 添加钢瓶
+			submit() {
+				let arrList = []
+				if (this.codeList.length == 0) {
+					if (!this.frequencyCoding) {
+						return uni.$u.toast('请先输入钢瓶编号')
+					} else {
+						arrList.push(this.frequencyCoding)
+					}
+				} else {
+					arrList = this.codeList
+				}
+				this.$api.post('/api/gas-cylinder-status', {
+					status: Number(this.bottleType),
+					innerCodeList: arrList
+				}).then(res => {
+					if (res.code == 200) {
+						this.codeList = []
+						this.frequencyCoding = ''
+						uni.$u.toast(res.msg)
+					}
+				})
+			},
+			// 删除录入钢瓶编号
+			delCode(index) {
+				this.codeList.splice(index, 1);
+			},
+			// 输入钢瓶编号添加
+			addCode() {
+				this.codeList.push(this.frequencyCoding)
+				this.codeList = Array.from(new Set(this.codeList));
+				this.frequencyCoding = ''
+			},
+			// 添加一条
+			addLine() {
+				this.scanType = 1
+				this.sweep()
+			},
+			// 连续添加
+			continuousAddition() {
+				this.scanType = 2
+				this.sweep()
+			},
+			// 扫一扫
+			sweep() {
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					scanType: ['qrCode'],
+					autoZoom: false,
+					success: (res) => {
+						console.log(res, '--------');
+						if (res.result) {
+							let url = res.result;
+							const arrf = url.split('=')
+							this.unitCoding(arrf[1])
+						} else {
+							console.log('请重新扫描');
+							return false;
+						}
+					},
+					fail: (res) => {
+						console.log('未识别到二维码1');
+					}
+				})
+			},
+			// 单位内编码获取
+			unitCoding(qrid) {
+				uni.showLoading({
+					title: '加载中'
+				});
+				uni.request({
+					url: 'http://qr.uinshine.com:9000/CommonAPI/product/getDetails', //仅为示例，并非真实接口地址。
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded', // 默认值
+					},
+					data: {
+						qr_id: qrid,
+					},
+					success: (res) => {
+						if (res.data.code == 0) {
+							var arr = res.data.data
+							if (this.scanType == 1) {
+								this.codeList.push(arr.inner_code)
+								this.codeList = Array.from(new Set(this.codeList));
+							} else {
+								this.show = true
+								this.codeList.push(arr.inner_code)
+								this.codeList = Array.from(new Set(this.codeList));
+								this.scanCoding = arr.inner_code
+								// 扫码间隔两秒
+								setTimeout(() => {
+									this.sweep()
+									this.show = false
+								}, 3000)
+							}
+							uni.hideLoading();
+						}
+					}
+				});
+			},
+			// 弹窗关闭
+			close() {
+				this.show = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title_index {
+		margin-bottom: 10rpx;
+		font-size: 34rpx;
+	}
+
+	.btn_add_card {
+		margin-left: 20rpx;
+	}
+
+	.card_cylinder {
+		padding: 30rpx;
+	}
+
+	.title_subhead {
+		margin-left: 6rpx;
+		font-size: 34rpx;
+		font-weight: 600;
+	}
+
+	.scan_card_code {
+		display: flex;
+		align-items: center;
+		margin-top: 20rpx;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid #d7d7d7;
+	}
+
+	.card_code_trac {
+		margin-top: 30rpx;
+		padding-bottom: 30rpx;
+		border-bottom: 1rpx solid #d7d7d7;
+	}
+
+	.item_current {
+		width: 40rpx;
+		color: #82848a;
+	}
+
+	.item_title1 {
+		margin-left: 10rpx;
+	}
+
+	.title_red {
+		color: #fa3534;
+	}
+
+	.card_btn {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 20rpx;
+		background-color: #fff;
+		padding-bottom: constant(safe-area-inset-bottom); //兼容 IOS<11.2
+		padding-bottom: env(safe-area-inset-bottom); //兼容 IOS>11.2
+	}
+
+	.card_coding_scan {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		width: 400rpx;
+		padding: 30rpx;
+	}
+
+	.title_coding {
+		font-size: 32rpx;
+		margin: 20rpx;
+	}
+
+	.success_title {
+		font-size: 40rpx;
+		margin-left: 10rpx;
+	}
+
+	.coding_title1 {
+		font-size: 60rpx;
+		margin-bottom: 20rpx;
+		font-weight: 600;
+	}
+</style>

pages/information/index.vue

@@ -1,29 +1,30 @@
 <template>
-	<!-- 信息 -->
+	<!-- 我的钢瓶 -->
 	<view class="card_information">
 		<view class="head_mine_title">我的钢瓶</view>
 		<view style="width: 100%;">
-			<u-tabs :list="bottleList" @click="bottleClick"></u-tabs>
+			<u-tabs :list="bottleList" lineWidth="40" :scrollable="false" @click="bottleClick"></u-tabs>
 		</view>
 		<view style="width: 100%;" v-if="list.length > 0">
 			<view class="card_dinay" v-for="(item,index) in list" :key="index">
-				<view class="item_title_dge">
-					<view class="item_dinay_title">{{item.title}}</view>
-					<u-badge bgColor="#f56c6c" :isDot="true" type="success"></u-badge>
-				</view>
-				<view class="item_title1">{{item.title1}}</view>
-				<view class="card_line">
-					<u-line color="#d7d7d7"></u-line>
-				</view>
-				<view class="space_between">
-					<view class="item_title1">订单编号:{{item.code}}</view>
-					<u-icon name="arrow-right"></u-icon>
+				<view style="display: flex;align-items: center;">
+					<view class="item_current">{{index + 1}}</view>
+					<view class="item_title1">{{item.inner_code}}</view>
 				</view>
+				<view class="iconfont icon-yehuaqiping icon_cylinder"></view>
 			</view>
 		</view>
 		<view class="empty_information" v-else>
 			<u-empty mode="message"></u-empty>
 		</view>
+		<view class="card_button_bottom">
+			<view class="bottom_btn_flex">
+				<view class="but_allot center_in" @click="addCylinder">添加</view>
+			</view>
+			<view class="bottom_btn_flex">
+				<view class="but_allot center_in" @click="transferCylinders">调拨</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -31,21 +32,50 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					title: '255'
-				}],
+				list: [],
 				bottleList: [{
 					name: '重瓶区',
 				}, {
 					name: '空瓶区',
 				}, {
 					name: '不合格瓶区'
-				}]
+				}],
+				current: 1,
 			}
 		},
-		methods:{
-			bottleClick(value){
-				console.log(value,266)
+		mounted() {
+			uni.$on('refresh', () => {
+				this.getList()
+			})
+			this.getList()
+		},
+		methods: {
+			bottleClick(value) {
+				this.current = value.index + 1
+				this.list = []
+				this.getList()
+			},
+			// 获取列表
+			getList() {
+				this.$api.get('/api/gas-cylinder-status', {
+					status: this.current,
+				}).then(res => {
+					if (res.code == 200) {
+						this.list = res.data.list
+					}
+				})
+			},
+			// 添加钢瓶
+			addCylinder() {
+				uni.navigateTo({
+					url: '/pages/information/cylinder?status=' + this.current
+				});
+			},
+			// 调拨钢瓶
+			transferCylinders() {
+				uni.navigateTo({
+					url: '/pages/information/transfer?status=' + this.current
+				});
 			}
 		}
 	}
@@ -65,34 +95,53 @@
 	}
 
 	.card_dinay {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 		width: calc(100% - 40rpx);
 		margin-top: 20rpx;
-		border: 1rpx solid #d7d7d7;
-		border-radius: 8rpx;
+		border-bottom: 1rpx solid #d7d7d7;
 		padding: 30rpx 20rpx;
 	}
 
-	.item_title_dge {
-		position: relative;
-		display: flex;
+	.item_current {
+		width: 40rpx;
+		color: #82848a;
 	}
 
-	.item_dinay_title {
-		font-size: 40rpx;
-		font-weight: 500;
-		margin-bottom: 20rpx;
+	.item_title1 {
+		margin-left: 10rpx;
 	}
 
-	.item_title1 {
-		font-size: 26rpx;
-		color: #7f7f7f;
+	.icon_cylinder {
+		font-size: 50rpx;
 	}
 
-	.card_line {
-		margin: 20rpx 0rpx;
+	.card_button_bottom {
+		position: absolute;
+		bottom: 20rpx;
+		left: 0;
+		right: 0;
+		background-color: #fff;
+		margin-bottom: 100rpx;
+		padding-bottom: constant(safe-area-inset-bottom); //兼容 IOS<11.2
+		padding-bottom: env(safe-area-inset-bottom); //兼容 IOS>11.2
+		display: flex;
+		align-items: center;
+	}
+
+	.bottom_btn_flex {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
-	.empty_information {
-		padding-top: 40%;
+	.but_allot {
+		width: 80%;
+		background-color: #3C9CFE;
+		padding: 20rpx;
+		color: #fff;
+		border-radius: 10rpx;
 	}
 </style>

pages/information/transfer.vue

@@ -0,0 +1,293 @@
+<template>
+	<!-- 调拨钢瓶 -->
+	<view>
+		<u-navbar title="钢瓶调拨" autoBack placeholder></u-navbar>
+		<view class="card_transfer">
+			<view style="display: flex;align-items: center;" @click="allotSweep">
+				<view class="tran_title">1.扫描调拨码</view>
+				<u-icon name="scan" size="30"></u-icon>
+			</view>
+			<view class="card_assigner_aaf" v-if="assignerFlag">
+				<view class="step_title">流转步骤</view>
+				<view class="flow_step_title">{{ getflowStep(assignerData) }}</view>
+				<view class="card_avatar">
+					<view style="display: flex;align-items: center;">
+						<image class="mine_image" src="../../static/portrait.png" mode=""></image>
+						<view class="card_user_title">
+							<view class="mine_phone">{{assignerData[2]}}</view>
+							<view class="mine_phone">{{assignerData[4]}}</view>
+						</view>
+					</view>
+					<view>调拨人</view>
+				</view>
+			</view>
+			<view class="space_between cylinder_ccsfs">
+				<view class="tran_title">2.钢瓶编号</view>
+				<view style="display: flex;align-items: center;">
+					<view class="blue_title" @click="checkAll">全选</view>
+					<view class="card_right_num">
+						<span class="blue_title">选择前</span>
+						<view class="num_card">
+							<u--input class="input_taaf" type="number" fontSize="12" inputAlign="center"
+								border="surround" @blur="howMany"></u--input>
+						</view>
+						<span class="blue_title">个</span>
+					</view>
+				</view>
+			</view>
+			<view style="width: 100%;">
+				<u-checkbox-group v-model="checked">
+					<view style="width: 100%;display: flex;flex-direction: column;">
+						<view class="card_dinay" v-for="(item,index) in list" :key="index">
+							<u-checkbox :name="item.id"></u-checkbox>
+							<view style="display: flex;align-items: center;margin-left: 20rpx;">
+								<view class="item_current">{{index + 1}}</view>
+								<view class="item_title1">{{item.inner_code}}</view>
+							</view>
+						</view>
+					</view>
+				</u-checkbox-group>
+			</view>
+		</view>
+		<view style="width: 100%;height: 120rpx;"></view>
+		<view class="card_btn">
+			<u-button style="margin-bottom: 20rpx;" type="primary" @click="submit">提交</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				checked: [],
+				list: [],
+				current: null,
+				assignerFlag: false,
+				assignerData: [],
+				flowStep: [{
+					id: '13',
+					title: '气站确认空瓶到达气站'
+				}, {
+					id: '016',
+					title: '气站确认重瓶到达气站'
+				}, {
+					id: '17',
+					title: '司机确认重瓶从气站出库'
+				}, {
+					id: '11',
+					title: '司机确认空瓶装车'
+				}, {
+					id: '033',
+					title: '司机确认空瓶从门店出库'
+				}, {
+					id: '31',
+					title: '门店确认重瓶卸货入库'
+				}, {
+					id: '35',
+					title: '门店确认未配送重瓶返库'
+				}, {
+					id: '21',
+					title: '门店回收空瓶'
+				}, {
+					id: '25',
+					title: '送气员重瓶出库'
+				}]
+			}
+		},
+		onLoad(value) {
+			this.current = value.status
+		},
+		mounted() {
+			this.getList()
+		},
+		methods: {
+			// 获取列表
+			getList() {
+				this.$api.get('/api/gas-cylinder-status', {
+					status: this.current,
+				}).then(res => {
+					if (res.code == 200) {
+						this.list = res.data.list
+					}
+				})
+			},
+			// 调拨提交
+			submit() {
+
+			},
+			// 扫一扫
+			allotSweep() {
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					scanType: ['qrCode'],
+					autoZoom: false,
+					success: (res) => {
+						console.log(res, '--------');
+						if (res.result) {
+							let url = res.result;
+
+							function getCharactersBefore(str, char) {
+								const index = str.indexOf(char);
+								if (index > -1) {
+									return str.substring(0, index);
+								}
+								return ''; // 如果字符不存在，返回空字符串
+							}
+							const title = getCharactersBefore(url, '?');
+							if (title == 'dialCode') {
+								this.assignerFlag = true
+
+								function getCharactersBefore1(str, char) {
+									const index = str.indexOf(char);
+									if (index > -1) {
+										return str.substring(index + 1);
+									}
+									return ''; // 如果字符不存在，返回空字符串
+								}
+								const arr = getCharactersBefore1(url, '?')
+								this.assignerData = arr.split(',')
+							}
+						} else {
+							console.log('请重新扫描');
+							return false;
+						}
+					},
+					fail: (res) => {
+						console.log('未识别到二维码1');
+					}
+				})
+			},
+			// 流转步骤文字
+			getflowStep(value) {
+				let title = ''
+				this.flowStep.forEach(item => {
+					if (item.id == value[0]) {
+						title = item.title
+					}
+				})
+				return title
+			},
+			// 输入第几个
+			howMany(value) {
+				const result = this.list.slice(0, value)
+				this.checked = []
+				result.forEach(item => {
+					this.checked.push(item.id)
+				})
+			},
+			// 全选
+			checkAll() {
+				this.checked = []
+				this.list.forEach(item => {
+					this.checked.push(item.id)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.card_transfer {
+		padding: 0rpx 30rpx;
+	}
+
+	.card_avatar {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.mine_image {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+	}
+
+	.card_user_title {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+	}
+
+	.mine_phone {
+		margin-left: 20rpx;
+		font-size: 30rpx;
+	}
+
+	.card_assigner_aaf {
+		margin-top: 20rpx;
+		padding: 30rpx;
+		border: 1rpx dashed #d7d7d7;
+	}
+
+	.step_title {
+		font-size: 34rpx;
+		font-weight: 600;
+	}
+
+	.flow_step_title {
+		font-size: 30rpx;
+		margin: 20rpx 0rpx;
+	}
+
+	.tran_title {
+		font-size: 36rpx;
+		font-weight: 600;
+	}
+
+	.cylinder_ccsfs {
+		margin-top: 30rpx;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid #d7d7d7;
+	}
+
+	.blue_title {
+		color: #2979ff;
+	}
+
+	.card_right_num {
+		margin-left: 40rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.num_card {
+		margin: 0rpx 8rpx;
+		width: 60rpx;
+	}
+
+	.input_taaf {
+		padding: 0rpx !important;
+	}
+
+	.card_dinay {
+		display: flex;
+		align-items: center;
+		width: calc(100% - 40rpx);
+		border-bottom: 1rpx solid #d7d7d7;
+		padding: 30rpx 20rpx;
+	}
+
+	.item_current {
+		width: 40rpx;
+		color: #82848a;
+	}
+
+	.item_title1 {
+		margin-left: 10rpx;
+	}
+
+	.card_btn {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 20rpx;
+		background-color: #fff;
+		padding-bottom: constant(safe-area-inset-bottom); //兼容 IOS<11.2
+		padding-bottom: env(safe-area-inset-bottom); //兼容 IOS>11.2
+	}
+</style>

pages/order/cannibalize.vue

@@ -25,10 +25,11 @@
 			var userInfo = this.$cache.getCache('userInfo')
 			this.userInfo = userInfo
 			const qr = new UQRCode();
-			let numarr = this.orderId + ',' + userInfo.id + ',' + userInfo.nickName + ',' + userInfo.dept.id + ',' +
+			let numarr = 'dialCode?' + this.orderId + ',' + userInfo.id + ',' + userInfo.nickName + ',' + userInfo.dept
+				.id + ',' +
 				userInfo.dept.name + ','
 			qr.data = numarr;
-			qr.size = 200;
+			qr.size = 140;
 			qr.make();
 			const ctx = uni.createCanvasContext('qrcode', this);
 			qr.canvasContext = ctx;

pages/order/cylinderTransfer.vue

@@ -22,29 +22,29 @@
 				// 气站
 				dataList1: [{
 					id: '13',
-					title: '确定空瓶到达气站'
+					title: '确认空瓶到达气站'
 				}, {
 					id: '016',
-					title: '确定重瓶到达气站'
+					title: '确认重瓶到达气站'
 				}],
 				// 司机
 				dataList2: [{
 					id: '17',
-					title: '确定重瓶从气站出库'
+					title: '确认重瓶从气站出库'
 				}, {
 					id: '11',
-					title: '确定空瓶装车'
+					title: '确认空瓶装车'
 				}, {
 					id: '033',
-					title: '确定重瓶从门店出库'
+					title: '确认重瓶从门店出库'
 				}],
 				// 门店
 				dataList3: [{
 					id: '31',
-					title: '确定重瓶卸货入库'
+					title: '确认重瓶卸货入库'
 				}, {
 					id: '35',
-					title: '确定未配送重瓶返库'
+					title: '确认未配送重瓶返库'
 				}, {
 					id: '21',
 					title: '门店回收空瓶'

unpackage/dist/dev/app-plus/static/fonts/demo_index.html

@@ -55,9 +55,9 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
-              <span class="icon iconfont">&#xe748;</span>
-                <div class="name">二维码</div>
-                <div class="code-name">&amp;#xe748;</div>
+              <span class="icon iconfont">&#xe69d;</span>
+                <div class="name">调拨</div>
+                <div class="code-name">&amp;#xe69d;</div>
               </li>
           
             <li class="dib">
@@ -210,9 +210,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1721109522375') format('woff2'),
-       url('iconfont.woff?t=1721109522375') format('woff'),
-       url('iconfont.ttf?t=1721109522375') format('truetype');
+  src: url('iconfont.woff2?t=1721114513553') format('woff2'),
+       url('iconfont.woff?t=1721114513553') format('woff'),
+       url('iconfont.ttf?t=1721114513553') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -239,20 +239,20 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
-            <span class="icon iconfont icon-erweima"></span>
+            <span class="icon iconfont icon-tiaobo"></span>
             <div class="name">
-              二维码
+              调拨
             </div>
-            <div class="code-name">.icon-erweima
+            <div class="code-name">.icon-tiaobo
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont icon-erweima1"></span>
+            <span class="icon iconfont icon-erweima"></span>
             <div class="name">
               二维码
             </div>
-            <div class="code-name">.icon-erweima1
+            <div class="code-name">.icon-erweima
             </div>
           </li>
           
@@ -474,18 +474,18 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-erweima"></use>
+                  <use xlink:href="#icon-tiaobo"></use>
                 </svg>
-                <div class="name">二维码</div>
-                <div class="code-name">#icon-erweima</div>
+                <div class="name">调拨</div>
+                <div class="code-name">#icon-tiaobo</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-erweima1"></use>
+                  <use xlink:href="#icon-erweima"></use>
                 </svg>
                 <div class="name">二维码</div>
-                <div class="code-name">#icon-erweima1</div>
+                <div class="code-name">#icon-erweima</div>
             </li>
           
             <li class="dib">

unpackage/dist/dev/app-plus/static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4430625 */
-  src: url('@/static/fonts/iconfont.woff2?t=1721109522375') format('woff2'),
-       url('@/static/fonts/iconfont.woff?t=1721109522375') format('woff'),
-       url('@/static/fonts/iconfont.ttf?t=1721109522375') format('truetype');
+  src: url('@/static/fonts/iconfont.woff2?t=1721114513553') format('woff2'),
+       url('@/static/fonts/iconfont.woff?t=1721114513553') format('woff'),
+       url('@/static/fonts/iconfont.ttf?t=1721114513553') format('truetype');
 }
 
 .iconfont {
@@ -13,11 +13,11 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-erweima:before {
-  content: "\e748";
+.icon-tiaobo:before {
+  content: "\e69d";
 }
 
-.icon-erweima1:before {
+.icon-erweima:before {
   content: "\e745";
 }
 

unpackage/dist/dev/app-plus/static/fonts/iconfont.json

@@ -6,16 +6,16 @@
   "description": "",
   "glyphs": [
     {
-      "icon_id": "681187",
-      "name": "二维码",
-      "font_class": "erweima",
-      "unicode": "e748",
-      "unicode_decimal": 59208
+      "icon_id": "10222328",
+      "name": "调拨",
+      "font_class": "tiaobo",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
     },
     {
       "icon_id": "1330723",
       "name": "二维码",
-      "font_class": "erweima1",
+      "font_class": "erweima",
       "unicode": "e745",
       "unicode_decimal": 59205
     },