lilei 2 лет назад
Родитель
Сommit
64cf7571f8
3 измененных файлов с 19 добавлено и 10 удалено
  1. 6 2
      libs/printTools.js
  2. 2 2
      pages/shelfSetting/editShelfHw.vue
  3. 11 6
      pages/userCenter/index.vue

+ 6 - 2
libs/printTools.js

@@ -72,7 +72,7 @@ export const printText = function(tsc,text){
 }
 // 60 * 40 尺寸模板
 export const printTempl = function(tsc,data){
-	let top = 48 // 距离顶部
+	let top = 32 // 距离顶部
 	const left = 8 // 距离左边
 	const lightHeight = 24 // 行高3mm,1mm = 8点
 	const pageW = 60 // 页签宽度mm
@@ -90,8 +90,10 @@ export const printTempl = function(tsc,data){
 	// 经销商文字高度,是否换行
 	top = textFormat(command,data.dealerName,maxFontNums,left,top,lightHeight,"center",1)
 	// 数字货架名称文字
-	top = top+30
+	top = top+10
+	top = textFormat(command,data.shelfName,maxFontNums,left,top,lightHeight,"center",1)
 	// 二维码
+	top = top+15
 	command.setQR(left*6, top, "M", 5, "A", data.barCode)
 	// 货位号
 	const rightTop = textFormat(command,data.shelfPlaceCode,rightMaxFnums,rightLeft,top,lightHeight,"left",4)
@@ -124,7 +126,9 @@ export const printMiniTempl = function(tsc,data){
 	top = textFormat(command,data.dealerName,maxFontNums,left,top,lightHeight,"center",1)
 	// 数字货架名称文字
 	top = top+10
+	top = textFormat(command,data.shelfName,maxFontNums,left,top,lightHeight,"center",1)
 	// 二维码
+	top = top+10
 	command.setQR(left, top, "M", 5, "A", data.barCode)
 	// 货位号
 	const rightTop = textFormat(command,data.shelfPlaceCode,rightMaxFnums,rightLeft,top,lightHeight,"left",3)

+ 2 - 2
pages/shelfSetting/editShelfHw.vue

@@ -26,7 +26,7 @@
 									{{productEntity.name}}
 								</view>
 								<view>
-									当前库存:{{productEntity.qty||0}} {{productEntity.unit}}
+									当前库存:{{productEntity.currQty||0}} {{productEntity.unit}}
 								</view>
 							</view>
 						</view>
@@ -171,7 +171,7 @@
 					  code: res.data.productCode,
 					  name: res.data.productName,
 					  productMsg: res.data.productImageUrl,
-					  currQty: res.data.currQty,
+					  currQty: res.data.qty,
 					  unit: res.data.productEntity.unit
 				  }
 			      this.form.productSn = res.data.productSn

+ 11 - 6
pages/userCenter/index.vue

@@ -20,12 +20,14 @@
 		<view class="user-list">
 			<u-cell-group>
 				<u-cell-item icon="lock" icon-size="38" :icon-style="{color:'#00aaff'}" index="2" @click="toPage(1)" title="修改密码"></u-cell-item>
-				<u-cell-item icon="file-text" icon-size="38" :icon-style="{color:'#00aaff'}" index="0" @click="toPage(0)" title="服务协议及隐私政策"></u-cell-item>
 				<u-cell-item icon="volume-up" icon-size="38" :icon-style="{color:'#00aaff'}" index="1" @click="toPage(3)" title="消息">
 					<u-badge :count="noReadNums" :absolute="false" slot="right-icon"></u-badge>
 				</u-cell-item>
-				<!-- <u-cell-item icon="info-circle" icon-size="38" :icon-style="{color:'#55aa00'}" index="1" @click="toPage" title="关于我们"></u-cell-item> -->
+			</u-cell-group>
+			<u-cell-group>
 				<u-cell-item icon="info-circle" icon-size="38" :icon-style="{color:'#00aaff'}" index="1" @click="toPage(2)" :value="curVer.version" title="版本检查"></u-cell-item>
+				<!-- <u-cell-item icon="info-circle" icon-size="38" :icon-style="{color:'#55aa00'}" index="1" @click="toPage" title="关于我们"></u-cell-item> -->
+				<u-cell-item icon="file-text" icon-size="38" :icon-style="{color:'#00aaff'}" index="0" @click="toPage(0)" title="服务协议及隐私政策"></u-cell-item>
 			</u-cell-group>
 		</view>
 		<!-- 退出 -->
@@ -227,10 +229,13 @@
 			}
 		}
 		.user-list{
-			border-radius: 15upx;
-			margin: 20upx;
-			overflow: hidden;
-			box-shadow: 0upx 3upx 6upx #eee;
+			padding: 0 20upx;
+			> view{
+				margin: 20upx 0;
+				border-radius: 15upx;
+				box-shadow: 0upx 3upx 6upx #eee;
+				overflow: hidden;
+			}
 		}
 		.user-btn{
 			padding: 85rpx 200rpx;