修复部分bug

components/menuAssembly/index.vue

@@ -34,7 +34,7 @@
 								<view class="price" v-if="getSku(item).price!=getSku(item).discount">￥<text class="num">{{ Utils.isInteger(getSku(item).price) }}</text></view>
 							</view>
 							<view class="addbox" v-if="shopState!==0">
-								<image v-if="getSku(item).state==1" @click.stop="getallNum(item, category)" class="add" :src="'../../static/imgs/jiahao.png'" />
+								<image v-if="getSku(item).state==1" @click.stop="cart(item, category)" class="add" :src="'../../static/imgs/jiahao.png'" />
 								<!-- <u-icon  class="add" name="plus-circle-fill" color="#0050F6" @click.stop="getallNum(item, category)" size="22"></u-icon> -->
 								<div v-if="getSku(item).state!=1"  style="color: #858585;font-size: 20rpx;margin-top:16rpx">已售罄</div>
 							</view>

mineSubPackage/pages/coupon/index.vue

@@ -59,7 +59,7 @@ export default {
                 let timeStart = ''
                 let timeEnd = ''
                 if(item.useStartTime){
-                    timeStart = item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
+                    timeStart = Date.parse(item.useStartTime)<new Date().valueOf()<Date.parse(item.useEndTime)?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
                 }
                 if(item.useEndTime){
                     timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.')

orderSubPackage/pages/settlement/index.vue

@@ -350,6 +350,12 @@ export default {
 			}
 		},
 		messageAndSave() {
+			if(!this.TermsStatus&&!this.agreeTerms){
+				this.showToast({ title: "请同意下方协议条款" });
+				return
+			}else{
+				if(this.agreeTerms)uni.setStorageSync('TermsStatus',true)
+			}
 			let needChoseMsg = true
 			const { sendMsgFlag1, flagExpireData } = this.sendMsgData
 			const HasMessageFlag = JSON.stringify(sendMsgFlag1)=='true'||JSON.stringify(sendMsgFlag1)=='false'?true:true
@@ -374,12 +380,6 @@ export default {
 				this.saveReserve()
 			}
 			return
-			if(!this.TermsStatus&&!this.agreeTerms){
-				this.showToast({ title: "请同意下方协议条款" });
-				return
-			}else{
-				if(this.agreeTerms)uni.setStorageSync('TermsStatus',true)
-			}
 			const tmpid = ['1uErx-15S-3vuopXSvvsxCeM_Jd-1iZC-nXzd2yW3QU', 'Q4HDwBEvpTXpwtZktqWm4SZOTEuQK1x48xjqjD2GqyM', 'Fu_CPIXa0cnJ4EDdVKqFQ3qqKJccMqt2oorI5mfNq74']
 			const val = {}
 			wx.requestSubscribeMessage({

store/modules/order.js

@@ -17,7 +17,7 @@ const order = {
                 let timeStart = ''
                 let timeEnd = ''
                 if(item.useStartTime){
-                    timeStart = item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
+                    timeStart = Date.parse(item.useStartTime)<new Date().valueOf()<Date.parse(item.useEndTime)?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
                 }
                 if(item.useEndTime){
                     timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.')
@@ -59,7 +59,7 @@ const order = {
                 let timeStart = ''
                 let timeEnd = ''
                 if(item.useStartTime){
-                    timeStart = item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
+                    timeStart = Date.parse(item.useStartTime)<new Date().valueOf()<Date.parse(item.useEndTime)?'':item.useStartTime.slice(0,11).replace(new RegExp('-','g'), '.')
                 }
                 if(item.useEndTime){
                     timeEnd = item.useEndTime.slice(0,11).replace(new RegExp('-','g'), '.')