Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

App.vue

@@ -3,25 +3,39 @@
 App.vue本身不是页面，这里不能编写视图元素，也就是没有<template>
 -->
 <script setup>
-import { onLaunch } from '@dcloudio/uni-app';
+	import {
+		onLaunch
+	} from '@dcloudio/uni-app';
 
-onLaunch(() => {
+	onLaunch(() => {
-	// console.log(uni.getExtConfigSync(),'uni.getExtConfigSync()')
+		uni.hideTabBar()
-	// getExtStoreId();
+		// #ifdef MP-WEIXIN
-	uni.hideTabBar()
+		uni.setInnerAudioOption({
-	// appConfig.env.JEEPAY_BASE_URL = "https://b.rscygroup.com"
+			obeyMuteSwitch: false
-	// 检查版本
+		});
-	// checkCurrVersion();
+		const updateManager = wx.getUpdateManager() // 小程序版本更新管理器
-});
+		updateManager.onCheckForUpdate(function(res) {
+			// 请求完新版本信息的回调
+		})
+		updateManager.onUpdateReady(function() {
+			// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+			updateManager.applyUpdate()
+
+		})
+		updateManager.onUpdateFailed(function() {
+			// 新版本下载失败
+		})
+		// #endif
+	});
 </script>
 
 <style lang="scss">
-/** 每个页面公共css */
+	/** 每个页面公共css */
-@import '@/commons/style/global.scss';
+	@import '@/commons/style/global.scss';
-@import '@/commons/style/common.scss';
+	@import '@/commons/style/common.scss';
 
-/**  uni 组件样式覆盖 */
+	/**  uni 组件样式覆盖 */
-@import '@/commons/style/uni-overwrite.scss';
+	@import '@/commons/style/uni-overwrite.scss';
 
-@import "uview-plus/index.scss";
+	@import "uview-plus/index.scss";
 </style>

pagesOrder/index/compoents/order-item.vue

@@ -59,7 +59,7 @@
 					<view class="no-wrap u-m-r-32">打包费</view>
 					<view>￥{{data.packFee||0}}</view>
 				</view>
-				<view class="u-flex u-row-between   u-m-t-32 u-col-top" v-if="data.seatInfo&&data.seatInfo.priceAmount>0">
+				<view class="u-flex u-row-between    u-col-top" v-if="data.seatInfo&&data.seatInfo.priceAmount>0">
 					<view class="no-wrap u-m-r-32">{{data.seatInfo.productName}}</view>
 					<view>￥{{data.seatInfo.priceAmount}}</view>
 				</view>