Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

pages/groupMeal/goods/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-container">
 		<!-- 导航栏 -->
-		<u-navbar :autoBack="true" :placeholder="true" :border-bottom="false">
+		<u-navbar :custom-back="goHome" :placeholder="true" :border-bottom="false">
 			<view class="navbar-title">团餐商品列表</view>
 			<view slot="right" class="navbar-right">
 				<text class="nav-btn" @click="addGoods">添加商品</text>
@@ -259,6 +259,12 @@ export default {
 		this.getData();
 	},
 	methods: {
+		// 返回首页
+		goHome() {
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		},
 		// 商品数据
 		getData() {
 			uni.showLoading({

pages/store/businessInfor.vue

@@ -80,7 +80,7 @@
 			<button class="cu-btn round line-gray  shadow" @click="back()">取消</button>
 			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="sumbit">提交</button>
 		</view>
-		<u-picker v-model="show" mode="time" @confirm="selectTime" style="z-index: 999 !important;"></u-picker>
+		<u-picker v-model="show" mode="time" :default-time="date" @confirm="selectTime" style="z-index: 999 !important;"></u-picker>
 	</view>
 </template>