修改

assets/colorui/app.scss

@@ -364,15 +364,15 @@ button {
 
 
 /* start--去除button的所有默认样式--start */
-.btnCss {
-	padding: 0;
-	font-size: inherit;
-	line-height: inherit;
-	background-color: transparent;
-	color: inherit;
-}
-
-.btnCss {
-   border: none;
-}
+// .btnCss {
+// 	padding: 0;
+// 	font-size: inherit;
+// 	line-height: inherit;
+// 	background-color: transparent;
+// 	color: inherit;
+// }
+
+// .btnCss {
+//    border: none;
+// }
 /* end--去除button的所有默认样式--end */

assets/http/api.js

@@ -277,7 +277,11 @@ const area={
 	list:p => http.get('blade-system/region/lazy-tree', {params: p}),
 }
 
-
+const shopConfig={
+	list: p => http.get("ldt_goods/shopconfig/list", {
+		params: p
+	}),
+} 
 
 export const api = {
 	wxApp,
@@ -307,5 +311,6 @@ export const api = {
 	address,
 	userChannelPoint,
 	order,
-	area
+	area,
+	shopConfig
 }

assets/http/global.js

@@ -4,6 +4,7 @@ let global = {}
 global.baseUrl = 'https://ldt.guosen-fumao.cn/api/'
 global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
 
+
 // global.baseUrl = 'http://192.168.1.168:2366/'
 // global.WebSocketUrl = 'ws://192.168.1.168:2366/websocket/'
 

components/pay-confirm.vue

@@ -1,13 +1,13 @@
 <template>
 	<view >
-		<view class="center info" style="padding-bottom: 50rpx;">
+		<view class="center info" style="padding: 50rpx;">
 			<image v-if="paySuccess" src="/static/icon/pay-success.png" mode=""></image>
 			<image v-else :src="info.shop.cover" mode=""></image>
 			<text v-text="paySuccess?'支付成功':info.shop.name" class="text-lg"
 				style="color: #1C1C1C;font-size: 30rpx;"></text>
 		</view>
 
-		<view class="card" style="background-color: #FFFFFF;">
+		<view class="card" style="padding: 15rpx;">
 			<view class="flex flex-direction margin-bottom-40">
 				<text class="text-lg text-bold" v-text="paySuccess?'支付成功':'支付确认'"></text>
 				<text v-if="paySuccess" class=" text-sm margin-top-10"
@@ -50,27 +50,26 @@
 			</view>
 		</view>
 
-		<view class="center flex-direction" style="padding: 100rpx;">
+		<view class="center flex-direction " style="padding: 70rpx 0;" >
 			<text class="text-gray text-sm margin-bottom-20">感谢使用联兑通，越用越优惠</text>
 			<view @click="confirm" :class="paySuccess?'bg-green':'btn-bg-color'" class="cu-btn  flex  text-lg  round"
 				style="padding: 42rpx 0;width: 90%;">
 				<text v-text="paySuccess&&confirmText?confirmText:'确认支付'"></text>
 			</view>
 			<view @click="cancel" :class="paySuccess?'text-gray':'text-base'" class=" payConfirm"
-				style="margin-top: 50rpx;font-size: 30rpx;text-decoration: underline;">
+				style="margin-top: 30rpx;font-size: 30rpx;text-decoration: underline;">
 				<text v-text="paySuccess&&cancelText?cancelText:'暂不支付'"></text>
 			</view>
 		</view>
 	</view>
 </template>
-
 <script>
 	export default {
 		props: {
 			info: Object,
 			type: String,
 			confirmText: String,
-			cancelText: String
+			cancelText: String,
 		},
 		computed: {
 			paySuccess: {
@@ -88,6 +87,8 @@
 
 			}
 		},
+		created() {
+		},
 		methods: {
 			confirm() {
 				this.$emit('confirm')
@@ -108,8 +109,7 @@
 	.info {
 		display: flex;
 		justify-content: center;
-		align-content: center;
-		padding: 60rpx;
+		align-items: center;
 		flex-direction: column;
 
 		image {
@@ -125,13 +125,12 @@
 	}
 
 	.card {
-		margin: 0 40rpx;
+		margin: 0 70rpx;
 		border-radius: 20rpx;
-		padding: 40rpx;
 		background-color: #FFFFFF;
 
 		.item {
-			padding: 20rpx 0;
+			padding: 15rpx 0;
 			display: flex;
 			justify-content: space-between;
 			font-size: 28rpx;

pagesC/pages/checkstand/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="">
+	<view class=""  :style="{'height':height}">
 		<!-- #ifdef  MP-WEIXIN-->
 		<view class="">
 			<u-navbar :isBack="isBack" :title="title"></u-navbar>
@@ -42,7 +42,7 @@
 		</view>
 		
 		<toast ref="toast" ></toast>
-		<pay-confirm confirmText="确认" cancelText="继续支付" :type="payConfirmType" v-show="payShow" :info="info" @confirm="confirmClick" @cancel="cancelClick"></pay-confirm>
+		<pay-confirm confirmText="确认" :params="params" cancelText="继续支付" :type="payConfirmType" v-show="payShow" :info="info" @confirm="confirmClick" @cancel="cancelClick"></pay-confirm>
 	</view>
 </template>
 
@@ -58,6 +58,8 @@
 		},
 		data() {
 			return {
+				height:'',
+				
 				isH5:false,
 				//navbar
 				title:"收银台",
@@ -91,6 +93,7 @@
 			}
 		},
 		async onLoad(options) {
+			this.height=this.$u.sys().windowHeight + 'px';
 			if (!this.$isEmpty(options.query)) {
 				//h5跳转回小程序后重新赋值
 				let params = options.query.split(";")

pagesD/pages/menu/menu.vue

@@ -35,8 +35,8 @@
 									style="transform: rotate(90deg);margin-left: 6rpx;"></text>
 							</view>
 						</view>
-						<view class="bg-white">
-							<u-notice-bar mode="horizontal" :list="appProperties.shopNotice"></u-notice-bar>
+						<view class="bg-white" v-if="$isNotEmpty(appProperties.shopNotice)">
+							<u-notice-bar mode="horizontal" :list="[appProperties.shopNotice]"></u-notice-bar>
 						</view>
 					</view>
 				</view>
@@ -115,7 +115,7 @@
 			</block>
 		</block>
 		
-		<view class="" v-show="!isLoading">
+		<view class="" v-show="!isLoading && $isNotEmpty(goods)">
 			<!-- 购物车栏 begin -->
 			<view class="cart-box" v-if="cart && cart.length">
 				<view class="mark" @tap="cartPopupVisible = !cartPopupVisible">
@@ -287,13 +287,13 @@
 				shopDetail: {},
 				appProperties: {
 					"shopName": "",
-					"sendingPrice": 1, // 商家配送费
-					"packingPrice": 1, // 包装费
-					"sendingNeedLeastPrice": 2000, // 起送需要的最低价格
+					"sendingPrice": 0, // 商家配送费
+					"packingPrice": 0, // 包装费
+					"sendingNeedLeastPrice": 0, // 起送需要的最低价格
 					"businessStartTime": '09:00:00', // 营业开始时间, 开始的点必须在结束之前
-					"businessEndTime": '22:00:00', // 营业结束时间
+					"businessEndTime": '19:00:00', // 营业结束时间
 					"shopStatus": true, // 商家营业状态
-					"shopNotice": ['10点到22点可以送餐~'], // 公告
+					"shopNotice": '', // 公告
 				},
 				goods: {},
 				currentCategoryName: '', // 默认分类
@@ -470,14 +470,26 @@
 				await this.initShop()
 				await this.initMenu()
 				await this.initCart()
+				this.initShopConfig()
 			},
-			initShop() {
+			
+			async initShop() {
 				let params = {
 					id: this.shopId
 				}
-				this.$api.shop.detail(params).then(res => {
-					this.shopDetail = res.data
-					this.appProperties.shopName = this.shopDetail.name
+				let res=await this.$api.shop.detail(params)
+				this.shopDetail = res.data
+				this.appProperties.shopName=this.shopDetail.name
+			},
+			initShopConfig(){
+				let params={
+					shopId:this.shopId
+				}
+				this.$api.shopConfig.list(params).then(res=>{
+					if (this.$isNotEmpty(res.data.records)) {
+						this.$util.objectCopy(this.appProperties,res.data.records[0])
+						this.appProperties.shopName=this.shopDetail.name
+					}
 				})
 			},
 			async initMenu() {

utils/util.js

@@ -34,6 +34,15 @@ util.calculateDistance=(lat1, lng1, lat2, lng2)=> {
 },
 
 
+/**
+ * 对象键复制
+ */
+util.objectCopy = (target, source) => {
+	Object.keys(target).forEach(key => {
+		target[key] = source[key]
+	})
+}
+
 
 util.showModal=(content,title='提示')=>{
     return new Promise((resolve,reject)=>{