Merge branch 'master' into master-pro

components/list-scroll-view/index.vue

@@ -145,7 +145,7 @@ export default {
 					this.dataList = this.dataList.concat(records);
 					this.mescroll.endBySize(records.length, result.total || result[this.keyName].total);
 				} else {
-					this.$tip.error('数据请求发生错误');
+					this.$tip.error(res.data.message || '数据请求发生错误');
 					this.mescroll.endErr();
 				}
 			}).catch(e => {

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/groupMeal/orders/order-details.vue

@@ -13,11 +13,11 @@
 					<!-- <text>¥{{product.costPrice}}</text> -->
 				</view>
 				<!-- 退款中 -->
-				<view class="span" v-if="product.fundStatus == 2">
+				<!-- <view class="span" v-if="product.fundStatus == 2">
 					商家同意退款，处理时间：{{ product.refundTime }}
-				</view>
+				</view> -->
 				<!-- 退款失败 -->
-				<view class="span" v-else-if="product.fundStatus == 3">
+				<view class="span" v-if="product.fundStatus == 3">
 					商家拒绝退款，处理时间：{{ product.refundTime }}
 				</view>
 				<!-- 退款成功 -->
@@ -43,7 +43,7 @@
 					<view class="box">
 						<view class="name">{{ product.packageName }}</view>
 						<view class="price">
-							<text class="p">¥<text class="v">{{ product.price }}</text>/份</text>
+							<text class="p">¥<text class="v">{{ product.priceEach }}</text>/份</text>
 							<text class="r">实付款：<text class="p">¥<text class="v">{{ product.price }}</text></text></text>
 						</view>
 					</view>

pages/login/settled.vue

@@ -301,7 +301,6 @@
 					phone: uni.getStorageSync('phone'),
 					ordinaryUserId: null,
 					storeExtent: null,
-					address: '',
 					longitude: '',
 					latitude: '',
 					typeLabel: null,
@@ -365,10 +364,11 @@
 			})] : []
 			let storageData = uni.getStorageSync('address');
 			// this.form.address = storageData.address
-			this.form.latitude = storageData.lat
-			this.form.longitude = storageData.lng
+			this.form.latitude = storageData.lat || 37.855068;
+			this.form.longitude = storageData.lng ||  112.536392
 		},
 		async onLoad(data) {
+		
 			if (data.loginType) {
 				// data.loginType =2  需要根据merchantId查询商户临时数据
 				// data.loginType =3  不需要回显
@@ -419,7 +419,6 @@
 			} else {
 				if (data.params) {
 					let obj = JSON.parse(decodeURIComponent(data.params));
-
 					this.title = '店铺信息'
 					this.tab = 1
 					obj.lifespanType = obj.lifespanType ? obj.lifespanType : '1'

pages/product/creatProduct.vue

@@ -48,14 +48,14 @@
 						商品封面图<span>*</span>
 					</view>
 					<view class="tips">
-						支持jpg、png格式
+						支持jpg、png格式，大小在2M以内
 					</view>
 					<view v-if="tabIndex==1">
 						<image v-for="(val,index) in fmImageList" :key="index" :src="val.url" mode=""
 							style="width: 140rpx;height:140rpx;border-radius: 4px; border: 1px solid #ebecee;margin-right:20rpx;margin-bottom:10rpx">
 						</image>
 					</view>
-					<u-upload v-else ref="uUpload" :action="action" :file-list="fmImageList" @on-success="handleSuccess"
+					<u-upload v-else ref="uUpload" :action="action" :file-list="fmImageList" :max-size="2 * 1024 * 1024" @on-success="handleSuccess"
 						@on-remove=" handleRemove" max-count="1" width="140rpx" height="140rpx"></u-upload>
 				</view>
 				<view class="item upload">

pages/store/addHours.vue

@@ -269,15 +269,18 @@ export default {
             return hours * 60 + minutes
         },
         sumbit() {
-            let data = {
-                merchantId: this.merchantId,
-                timeType: this.timeType.length > 0 ? 1 : 2,
-                period: this.selectedIndices.length > 0 ? this.selectedIndices.join('、') : null,
-                middleTime: this.timeArr.length >= 1 ? this.timeArr[0].value : null,
-                beginTime: this.timeArr.length >= 2 ? this.timeArr[1].value : null,
-                endTime: this.timeArr.length >= 3 ? this.timeArr[2].value : null,
-                id:this.arrData.index==1 || this.arrData.index==0?this.arrData.arr[this.arrData.index].id:null
-            }
+          // 按照周一至周日的顺序排序选中的营业日
+          const weekOrder = ['周一', '周二', '周三', '周四', '周五', '周六', '周日' ,'整周'];
+          const sortedPeriod = this.selectedIndices.sort((a, b) => weekOrder.indexOf(a) - weekOrder.indexOf(b));
+          let data = {
+              merchantId: this.merchantId,
+              timeType: this.timeType.length > 0 ? 1 : 2,
+              period: this.selectedIndices.length > 0 ? sortedPeriod.join('、') : null,
+              middleTime: this.timeArr.length >= 1 ? this.timeArr[0].value : null,
+              beginTime: this.timeArr.length >= 2 ? this.timeArr[1].value : null,
+              endTime: this.timeArr.length >= 3 ? this.timeArr[2].value : null,
+              id:this.arrData.index==1 || this.arrData.index==0?this.arrData.arr[this.arrData.index].id:null
+          }
             if(this.selectedIndices.length==0){
 				this.$tip.toast('请选择营业日');
                 return

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>
 

pages/store/selectTdMap.vue

@@ -321,7 +321,7 @@
 				uni.request({
 					url: `https://api.tianditu.gov.cn/v2/search?postStr=${encodeURIComponent(JSON.stringify(postStr))}&type=query&tk=${this.tk}`,
 					success: (res) => {
-						if (res.data.code == 200 && res.data) {
+						if (res.statusCode == 200 && res.data) {
 							this.searchResults = res.data.pois.map(item => ({
 								...item,
 								location: item.lonlat