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

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