Uniapp/lucky_shop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

revert: 所有代码与custom/common分支同

Browse Source
This commit is contained in:
ZF Sun
2026-01-05 15:56:49 +08:00
parent 8ef6975ee1
commit 60a0e5133e
219 changed files with 14860 additions and 15585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
components/ns-select-time/ns-select-time.vue
View File

@@ -10,8 +10,7 @@
<view class="body">
<!-- 左侧日期选择 -->
<scroll-view :scroll-y="true" class="left">
<view class="item" :class="index == keyJudge ? 'itemDay' : ''" v-for="(item, index) in dayData"
:key="index" @click="selectTime('days', index, 'yes')">
<view class="item" :class="index == keyJudge ? 'itemDay' : ''" v-for="(item, index) in dayData" :key="index" @click="selectTime('days', index, 'yes')">
<block v-if="item.title">{{ item.title }}</block>
<block v-else>{{ item.month }}</block>
<text class="itemtext">{{ item.Day }}</text>
@@ -19,11 +18,9 @@
</scroll-view>
<!-- 右侧时间选择 -->
<scroll-view :scroll-y="true" class="right">
<view class="item" :class="key == keyJudge && index == keys ? 'itemTime' : ''"
v-for="(item, index) in timeData" :key="index" @click="selectTime('time', index, 'yes')">
<view class="item" :class="key == keyJudge && index == keys ? 'itemTime' : ''" v-for="(item, index) in timeData" :key="index" @click="selectTime('time', index, 'yes')">
{{ item }}
<text v-if="key == keyJudge && index == keys"
class="iconfont icon-yuan_checked color-base-text"></text>
<text v-if="key == keyJudge && index == keys" class="iconfont icon-yuan_checked color-base-text"></text>
</view>
</scroll-view>
</view>
@@ -33,10 +30,11 @@
</template>
<script>
import uniPopup from '@/components/uni-popup/uni-popup.vue';
export default {
name: "nsSelectTime",
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
uniPopup
},
data() {
return {
@@ -59,7 +57,7 @@ export default {
};
},
methods: {
refresh() {
refresh(){
this.key = 0;
this.keys = 0;
this.keyJudge = 0;
@@ -92,7 +90,7 @@ export default {
this.key = this.keyJudge;
let obj = this.dayData[this.key];
obj.time = this.timeData[this.keys];
let time = obj.time.replace('立即配送（', '').replace('）', '');
let time = obj.time.replace('立即配送（','').replace('）','');
var dateTime = new Date();
var format = time.split('-');
@@ -104,13 +102,13 @@ export default {
let date = timeData[1].split('日')[0];
// 开始时间戳
dateTime.setHours(startHours[0], startHours[1], 0, 0);
obj.start_time = dateTime.getTime() / 1000;
dateTime.setHours(startHours[0],startHours[1],0,0);
obj.start_time = dateTime.getTime()/1000;
obj.start_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[0];
// 结束时间戳
dateTime.setHours(endHours[0], endHours[1], 0, 0);
obj.end_time = dateTime.getTime() / 1000;
dateTime.setHours(endHours[0],endHours[1],0,0);
obj.end_time = dateTime.getTime()/1000;
obj.end_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[1];
this.$emit('selectTime', { data: obj, type: judge });
@@ -159,16 +157,16 @@ export default {
for (let i = 0; i < mostDay; i++) {
let objects = {};
let dayStr = week[nowDay];
let dayStr = week[ nowDay ];
// 判断最大可预约时间
if (this.obj.dataTime.most_day > 0 && ((startTime + num * 86400) > (startTime + this.obj.dataTime.most_day * 86400))) {
if (this.obj.dataTime.most_day > 0 && ((startTime + num * 86400) > (startTime + this.obj.dataTime.most_day * 86400) ) ) {
this.judge = true;
break;
}
//判断当天是否能够配送、自提
if (type == 0 || judge || obj.indexOf(nowDay.toString()) != -1) {
let endTime = this.obj.dataTime.delivery_time[(this.obj.dataTime.delivery_time.length - 1)].end_time;
endTime -= this.obj.dataTime.time_interval * 60;
let endTime = this.obj.dataTime.delivery_time[ (this.obj.dataTime.delivery_time.length - 1) ].end_time;
endTime -= this.obj.dataTime.time_interval * 60;
switch (num) {
case 1:
if (i == 0) {
@@ -224,7 +222,7 @@ export default {
nowDay = 0;
}
num += 1;
if (this.obj.dataTime.most_day == 0 && i == 0) {
this.judge = true;
}
@@ -244,25 +242,25 @@ export default {
}
let timeData = [];
if (!this.obj.dataTime.delivery_time) {
this.obj.dataTime.delivery_time = [{ start_time: this.obj.dataTime.start_time, end_time: this.obj.dataTime.end_time }]
this.obj.dataTime.delivery_time = [ {start_time: this.obj.dataTime.start_time, end_time: this.obj.dataTime.end_time} ]
}
//判断选中是否为当天
let remainder = 0;
//当天配送自提的话，向后推迟30分钟
let newDayTime = JSON.parse(JSON.stringify(this.dayTime));
// newDayTime = Math.ceil(this.dayTime / 600) * 600 + 1800;
//判断选中是否为当天
let timeJudage = false;
if (this.dayData[this.keyJudge] && this.dayData[this.keyJudge].type && newDayTime > this.obj.dataTime.start_time) timeJudage = true;
let timeInterval = this.obj.dataTime.time_interval ? this.obj.dataTime.time_interval * 60 : 1200;
this.obj.dataTime.delivery_time.forEach(item => {
item.end_time = item.end_time ? item.end_time : 86400;
item.end_time = item.end_time ? item.end_time : 86400;
let num = parseInt((parseInt(item.end_time) - parseInt(item.start_time)) / timeInterval);
let time = timeJudage ? parseInt(newDayTime) : parseInt(item.start_time);
for (let i = 0; i < num; i++) {
@@ -273,12 +271,12 @@ export default {
if (time <= item.end_time) {
let text = '';
if (this.obj.delivery.delivery_type == 'local' && i == 0) {
text = '立即配送（' + this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval) + '）';
text = '立即配送（'+ this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval) + '）';
} else {
text = this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval);
}
timeData.push(text);
}
}
} else {
timeData.push(this.$util.getTimeStr(time));
}
@@ -303,7 +301,6 @@ export default {
<style lang="scss" scoped>
.box {
height: 728rpx;
.title {
padding: 0 30rpx;
box-sizing: border-box;
@@ -314,7 +311,6 @@ export default {
height: 90rpx;
line-height: 90rpx;
border-bottom: 1rpx solid #f7f4f4;
.icon-close {
font-size: 26rpx;
color: #909399;
@@ -324,18 +320,15 @@ export default {
transform: translateY(-50%);
}
}
.body {
width: 100%;
height: calc(100% - 90rpx);
display: flex;
align-items: center;
.left {
width: 230rpx;
background: #f8f8f8;
height: 100%;
.item {
width: 100%;
padding: 16rpx 30rpx;
@@ -345,18 +338,15 @@ export default {
display: flex;
align-items: center;
}
.itemDay {
background: #ffffff;
}
}
.right {
width: calc(100% - 230rpx);
height: 100%;
padding: 0 30rpx;
box-sizing: border-box;
.item {
width: 100%;
font-size: 24rpx;
@@ -365,13 +355,11 @@ export default {
align-items: center;
justify-content: space-between;
height: 72rpx;
.icon-yuan_checked {
font-size: 38rpx;
margin-right: 30rpx;
}
}
.itemTime {
color: var(--main-color);
}