root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

master
wangfukang 1 month ago
parent
0c2dcc35c0 e4a4c02782
commit
e645263b91
8 changed files with 855 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      components/tab-bar/myCenter.vue
  2. 8
      package1/address/addAddress.vue
  3. 40
      package1/address/addressList.vue
  4. 534
      package1/myCenter/partTimeJobRegister.vue
  5. 133
      package1/order/orderConfirm.vue
  6. 196
      package1/runErrand/runErrand.vue
  7. 6
      pages.json
  8. 2
      pages/index/index.vue

21
components/tab-bar/myCenter.vue
View File

@ -3,6 +3,16 @@
<view>22222222</view> <view>22222222</view>
<view style="margin-top: 200px;" @click="navigatorTo('addgoods')">新增商品</view> <view style="margin-top: 200px;" @click="navigatorTo('addgoods')">新增商品</view>
<view style="margin-top: 200px;" @click="navigatorTo('merchant')">商家入驻</view> <view style="margin-top: 200px;" @click="navigatorTo('merchant')">商家入驻</view>
<view style="margin-top: 100px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
<!-- 购物车弹窗 -->
<uni-popup ref="jianzhiPopup" background-color="rgba(2, 171, 255, 1)" borderRadius="40px 40px 40px 40px">
<view class="jianzhi-content" @tap="navigatorTo('partTimeReg')">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/faf25c687bc1417282ebac719fd1bfba.png" alt="" style="width: 100%;height: 100%;">
<view style="position: absolute;bottom: -50px;left: 130px;" @tap.stop="$refs.jianzhiPopup.close()">
<uni-icons type="close" size="40" color="#fff"></uni-icons>
</view>
</view>
</uni-popup>
</view> </view>
</template> </template>
@ -26,6 +36,12 @@
url = '/package1/myCenter/addGoods' url = '/package1/myCenter/addGoods'
}else if(e=='merchant'){ }else if(e=='merchant'){
url = '/package1/myCenter/myMerchant' url = '/package1/myCenter/myMerchant'
}else if(e == 'partTimeReg'){
url = '/package1/myCenter/partTimeJobRegister'
this.$refs.jianzhiPopup.close()
}else if(e=='jianzhizhuce'){
this.$refs.jianzhiPopup.open()
return
} }
uni.navigateTo({ uni.navigateTo({
url: url url: url
@ -46,4 +62,9 @@
height: 100%; height: 100%;
font-size: 28rpx; font-size: 28rpx;
} }
.jianzhi-content{
width: 300px;
height: 350px;
position: relative;
}
</style> </style>

8
package1/address/addAddress.vue
View File

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

40
package1/address/addressList.vue
View File

@ -0,0 +1,40 @@
<template>
<view class="address-box">
<view>收货地址</view>
<view class="box1" style="display: flex;padding: 20px;">
<view style="flex: 1;">
<view style="height: 21px;line-height: 21px;display: flex;">
<text style="font-size: 15px;font-weight: 700;">沁园春第三食堂A20窗口</text>
</view>
<view style="text-align: right;margin-left: 30px;color: #777;width: 73px;">
刘柳柳 18827381928
</view>
</view>
<view style="width: 18px;padding-top: 10px;">
编辑
</view>
</view>
<view class="">
新增地址
</view>
</view>
</template>
<script>
export default {
data() {
return {
selected: 'phone'
}
},
methods: {
openAddressBook(){
this.$refs.bookPopup.open('bottom')
}
}
}
</script>
<style>
</style>

534
package1/myCenter/partTimeJobRegister.vue
View File

@ -1,9 +1,541 @@
<template> <template>
<!-- 兼职注册 --> <!-- 兼职注册 -->
<view class="page1">
<view class="title">
<view class="title-sreach">
<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
<uni-icons type="left" size="28"></uni-icons>
</view>
</view>
</view>
<view class="content">
<view class="box1">
<view class="reg-name">
* 姓名
</view>
<view class="reg-value">
<input type="text" placeholder="请填写姓名"
style="background: #eee;height: 40px;line-height: 40px;padding: 9px 10px;border-radius: 10px;">
</view>
</view>
<view class="box1">
<view class="reg-name">
* 学生证上传 <text style="font-size: 12px;font-weight: 400;color: #777;">身份信息仅用于认证身份，平台会严格保密</text>
</view>
<view class="reg-value">
<img @tap="pictureAdd('mentou')"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/89d37db7e34c490da24c5dd62183bf2d.png" alt=""
style="width: 80px;height: 80px;background-size: 100%;margin-right: 10px;" />
<img @tap="largeImg" :src="formData.studentCard" alt=""
style="width: 80px;height: 80px;background-size: 100%;" />
</view>
</view>
<view class="box1">
<view class="reg-name">
* 兼职类型
</view>
<view class="reg-value" style="display: flex;">
<view class="box-check-btn" @tap="daimaiOrpaotui('daimai')"
:style="{background:formData.daimai?'rgba(180, 255, 238, 0.27)':'#eee',border:formData.daimai?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
代买饭
</view>
<view class="box-check-btn" @tap="daimaiOrpaotui('paotui')"
:style="{background:formData.paotui?'rgba(180, 255, 238, 0.27)':'#eee',border:formData.paotui?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
快递
</view>
</view>
</view>
<view class="box1" v-if="formData.daimai != false || formData.paotui != false">
<view class="reg-name">
* 规则配置
</view>
<view class="reg-value">
<view class="value1" v-if="formData.daimai">
<view class="value-title">
<view class="title-1">
代买饭规则
</view>
<view class="title-2" @tap="checkAddress">
选择地址
<uni-icons type="right" size="12"></uni-icons>
</view>
</view>
<view class="guize-list">
<view class="guize1">
<view class="guize1-qusong">
<view class="qusong1">
取
</view>
<view class="qusong2">
第三食堂
</view>
</view>
<view class="guize1-qusong">
<view class="qusong1">
送
</view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
1号宿舍楼
</view>
</view>
<view class="qusong3">
<input type="number" placeholder="填写配送费">
</view>
</view>
<view class="guize1">
<view class="guize1-qusong">
<view class="qusong1">
取
</view>
<view class="qusong2">
第三食堂
</view>
</view>
<view class="guize1-qusong">
<view class="qusong1">
送
</view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
1号宿舍楼
</view>
</view>
<view class="qusong3">
<input type="number" placeholder="填写配送费">
</view>
</view>
</view>
</view>
<view class="value1" v-if="formData.paotui">
<view class="value-title">
<view class="title-1">
快递规则
</view>
<view class="title-2" @tap="checkAddress">
选择地址
<uni-icons type="right" size="12"></uni-icons>
</view>
</view>
<view class="guize-list">
<view class="guize1">
<view class="guize1-qusong">
<view class="qusong1">
取
</view>
<view class="qusong2">
第三食堂
</view>
</view>
<view class="guize1-qusong">
<view class="qusong1">
送
</view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
1号宿舍楼
</view>
</view>
<view class="qusong3">
<input type="number" placeholder="填写配送费">
</view>
</view>
<view class="guize1">
<view class="guize1-qusong">
<view class="qusong1">
取
</view>
<view class="qusong2">
第三食堂
</view>
</view>
<view class="guize1-qusong">
<view class="qusong1">
送
</view>
<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
1号宿舍楼
</view>
</view>
<view class="qusong3">
<input type="number" placeholder="填写配送费">
</view>
</view>
</view>
</view>
</view>
</view>
<view
style="width: 120px;height: 140px;background: rgba(166, 255, 234, 1);margin: 10px auto;border-radius: 20px;text-align: center;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/3a4e68eb14d7417cbb4f15fa85907c64.jpg" alt=""
style="width: 90px;height: 90px;margin-top: 10px;" />
<view style="height: 25px;line-height: 25px;font-weight: 700;">关注公众号</view>
</view>
<view class="btn">
提交注册
</view>
</view>
<!-- 查看大图弹出层 -->
<uni-popup ref="imgPopup" background-color="#fff">
<view class="img-popup-content">
<img :src="bigImg" alt="" style="width: 100%;height: 100%;">
</view>
</uni-popup>
<!-- 规则选择弹出层 -->
<uni-popup ref="guizePopup" background-color="#fff">
<view class="guize-popup-content">
<view style="margin-top: 10px;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f06433fa1bd34b31948eaefe5338c357.png"
alt="" style="width: 102px;height: 25px;" />
</view>
<view style="margin-top: 10px;height: 45px;">
<view class="box-check-btn" @tap="qucanOrsongcan('qucan',index)" v-for="(item,index) in qucan" :key="index"
style="float: left;padding: 0 10px;width: auto;margin-bottom:10px;"
:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#eee',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
{{item.name}}
</view>
</view>
<view style="margin-top: 65px;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/32fd9d723fbf4d778f2631277d316940.png"
alt="" style="width: 102px;height: 25px;" />
</view>
<view style="margin-top: 10px;height: 45px;">
<view class="box-check-btn" @tap="qucanOrsongcan('songcan',index)" v-for="(item,index) in songcan" :key="index"
style="float: left;padding: 0 10px;width: auto;margin-bottom:10px;"
:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'#eee',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
{{item.name}}
</view>
</view>
<view class="guize-btn" @tap="closeGuize">
确定
</view>
<view style="position: absolute;bottom: -50px;left: 150px;" @tap.stop="$refs.guizePopup.close()">
<uni-icons type="close" size="40" color="#fff"></uni-icons>
</view>
</view>
</uni-popup>
</view>
</template> </template>
<script> <script>
export default {
data() {
return {
menuButtonInfo: {},
formData: {
paotui: false,
daimai: false,
studentCard: '',
},
bigImg: '',
qucan:[{
name:'第一食堂',
checked:false,
},{
name:'第二食堂',
checked:false,
},{
name:'第三食堂',
checked:false,
},{
name:'第四食堂',
checked:false,
}],
songcan:[{
name:'男生宿舍1号楼',
checked:false,
},{
name:'男生宿舍2号楼',
checked:false,
},{
name:'男生宿舍3号楼',
checked:false,
},{
name:'男生宿舍4号楼',
checked:false,
}]
}
},
components: {
},
onLoad() {
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
},
methods: {
back() {
uni.navigateBack()
},
//查看大图
largeImg(img) {
this.bigImg = this.formData.studentCard;
this.$refs.imgPopup.open()
},
daimaiOrpaotui(type) {
if (type == 'daimai') {
this.formData.daimai = !this.formData.daimai
} else {
this.formData.paotui = !this.formData.paotui
}
this.$forceUpdate()
},
qucanOrsongcan(type,index){
if (type == 'qucan') {
this.qucan[index].checked = !this.qucan[index].checked
} else {
this.songcan[index].checked = !this.songcan[index].checked
}
this.$forceUpdate()
},
closeGuize(){
this.$refs.guizePopup.close()
},
checkAddress(type) {
if (type == 'daimai') {
this.$refs.guizePopup.open()
} else {
this.$refs.guizePopup.open()
}
},
pictureAdd() {
let that = this
uni.chooseMedia({
count: 1,
mediaType: ['image'],
sourceType: ['album'],
success(res) {
uni.showLoading({
title: '加载中...',
mask: true
})
for (let i = 0; i < res.tempFiles.length; i++) {
that.upLoadFile(res.tempFiles[i].tempFilePath)
}
}
})
},
async upLoadFile(path) {
let that = this;
let hiver_token = uni.getStorageSync("hiver_token")
await uni.uploadFile({
url: that.tui.interfaceUrl() + '/upload/file',
filePath: path,
name: 'file',
header: {
"content-type": "multipart/form-data",
'accessToken': hiver_token
},
formData: {},
success: (uploadFileRes) => {
let pathData = JSON.parse(uploadFileRes.data)
that.formData.studentCard = pathData.result
that.$forceUpdate()
},
fail: (err) => {
uni.hideLoading();
uni.showToast({
title: JSON.stringify(err),
icon: 'none'
})
}
});
await setTimeout(res => {
uni.hideLoading();
}, 1000)
},
}
}
</script> </script>
<style> <style lang="scss">
page {
width: 100%;
height: 100%;
font-size: 24rpx;
background: #F5F8F5;
color: #00231C;
}
.page1 {
width: 100%;
height: 100%;
font-size: 24rpx;
position: relative;
}
.title {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/461dd2d5ba1f462ca05da7e2379d1d90.png') no-repeat;
width: 100%;
height: 320px;
background-size: 100%;
}
.title-sreach {
width: 100%;
display: flex;
height: 200rpx;
position: relative;
}
.back-btn {
position: absolute;
bottom: 0;
left: 0;
}
.content {
position: absolute;
top: 225px;
width: 100%;
border-radius: 20px;
background: #fff;
padding: 8px 10px;
}
.reg-name {
font-size: 16px;
font-weight: 700;
height: 35px;
line-height: 35px;
margin-top: 10px;
}
.reg-value {
margin-top: 5px;
}
.img-popup-content {
width: 500rpx;
height: 500rpx;
}
.box-check-btn {
width: 80px;
height: 35px;
background: rgba(180, 255, 238, 0.27);
text-align: center;
line-height: 35px;
border-radius: 35px;
font-weight: 700;
border: 1px solid rgba(180, 255, 238, 1);
margin-right: 10px;
}
.value1 {
background: #eee;
border-radius: 10px;
padding: 10px;
margin-bottom: 10px;
}
.value-title {
display: flex;
height: 35px;
line-height: 35px;
font-size: 15px;
font-weight: 400;
}
.title-1 {
font-weight: 700;
}
.title-2 {
flex: 1;
color: #777;
text-align: right;
}
.guize1-qusong {
display: flex;
flex: 1;
padding-top: 10px;
}
.guize1 {
display: flex;
margin-top: 10px;
}
.qusong1 {
width: 20px;
height: 20px;
background: rgba(0, 35, 28, 1);
color: #fff;
border-radius: 20px;
text-align: center;
line-height: 20px;
font-size: 10px;
z-index: 80;
}
.qusong2 {
height: 20px;
font-size: 12px;
line-height: 19px;
text-align: center;
background: rgba(166, 255, 234, 0.5);
padding: 0 10px;
margin-left: -5px;
font-weight: 700;
border-top-right-radius: 20px;
border-bottom-right-radius: 20px;
}
.qusong3 {
width: 95px;
height: 35px;
background: #fff;
border-radius: 5px;
padding: 5px 10px;
flex: 1;
}
.btn {
width: 95%;
height: 50px;
font-size: 16px;
font-weight: 700;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px;
line-height: 50px;
text-align: center;
margin: 20px auto;
}
.guize-popup-content {
height: auto;
background: #fff;
padding: 20px;
border-radius: 20px;
width: 90%;
margin: 0 auto;
max-height: 430px;
overflow: scroll;
position: relative;
}
.guize-btn{
background: #00231c;
border-radius: 50px;
height: 50px;
width: 100%;
margin: 60px auto 0;
color: #b4ffee;
clear: both;
text-align: center;
line-height: 50px;
font-size:15px;
font-weight: 700
}
</style> </style>

133
package1/order/orderConfirm.vue
View File

@ -0,0 +1,133 @@
<template>
<!-- 支付确认页 -->
<view class="page1">
<view class="title">
<view class="title-sreach">
<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
<uni-icons type="left" size="28"></uni-icons>
</view>
<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
支付订单
</view>
</view>
</view>
<view class="content">
<view class="box1">
<view style="height: 35px;line-height: 35px;text-align: center;">
支付剩余时间 59:09
</view>
<view style="height: 45px;line-height: 45px;text-align: center;font-weight: 700;font-size: 15px;">
￥<text style="font-size: 30px;">449.96</text>
</view>
<view style="height: 20px;text-align: center;color: red;">
若拼团失败，将会为您自动退款
</view>
</view>
<view class="box1" style="display: flex;padding: 20px;">
<view style="flex: 1;">
<view style="height: 21px;line-height: 21px;display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" alt="" style="width: 21px;height: 21px;margin-right: 10px;" />
<text style="font-size: 15px;font-weight: 700;">微信支付</text>
</view>
<view style="text-align: right;margin-left: 30px;color: #777;width: 73px;">
使用微信支付
</view>
</view>
<view style="width: 18px;padding-top: 10px;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png" alt="" style="width: 18px;height: 18px;" />
</view>
</view>
<view class="btn">
确认付款
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
menuButtonInfo: {}
}
},
onLoad(option) {
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
},
methods: {
back() {
uni.navigateBack()
}
}
}
</script>
<style lang="scss">
page {
width: 100%;
height: 100%;
font-size: 24rpx;
background: #F5F8F5;
color: #00231C;
}
.page1 {
width: 100%;
height: 100%;
font-size: 24rpx;
position: relative;
}
.title{
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
width: 100%;
height: 54%;
}
.title-sreach{
width: 100%;
display: flex;
height: 200rpx;
position: relative;
}
.back-btn{
position: absolute;
bottom: 0;
left: 0;
}
.title-name{
padding-top: 55px;
font-size: 36rpx;
font-weight: 700;
flex: 1;
text-align: center;
}
.content{
position: absolute;
top: 100px;
width: 95%;
margin-left: 2.5%;
}
.box1{
width: 95%;
margin: 0 auto 10px;
background: #fff;
border-radius: 10px;
padding: 10px;
}
.btn {
width: 95%;
height: 50px;
font-size: 16px;
font-weight: 700;
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
border-radius: 50px;
line-height: 50px;
text-align: center;
margin: 20px auto;
}
</style>

196
package1/runErrand/runErrand.vue
View File

@ -43,7 +43,7 @@
<view class="dizhi-ming"> <view class="dizhi-ming">
沁园春第三食堂A20窗口 沁园春第三食堂A20窗口
</view> </view>
<view class="dizhi-btn"> <view class="dizhi-btn" @tap="openAddressBook">
地址簿 地址簿
</view> </view>
</view> </view>
@ -57,7 +57,7 @@
<view class="dizhi-ming"> <view class="dizhi-ming">
沁园春第三食堂A20窗口 沁园春第三食堂A20窗口
</view> </view>
<view class="dizhi-btn"> <view class="dizhi-btn" @tap="openAddressBook">
地址簿 地址簿
</view> </view>
</view> </view>
@ -142,72 +142,30 @@
</view> </view>
<view class="content-box"> <view class="content-box">
<view class="content-title"> <view class="content-title">
取件重量<text>*</text> 特殊情况<text>*</text>
</view> </view>
<view style="flex: 1;"> <view style="flex: 1;">
<view class="duoxuan" @tap="checkWeightOrVolume('weight','5公斤以内')" <view class="duoxuan" @tap="checkWeightOrVolume"
:style="{'background':addFormData.weight == '5公斤以内' ?'rgba(166, 255, 234, 1)':'#eee'}"> :style="{'background':addFormData.isOverweightOrOvervolume?'rgba(166, 255, 234, 1)':'#eee'}">
5公斤以内 超重超大
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('weight','5-10公斤')"
:style="{'background':addFormData.weight == '5-10公斤' ?'rgba(166, 255, 234, 1)':'#eee'}">
5-10公斤
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('weight','10-15公斤')"
:style="{'background':addFormData.weight == '10-15公斤' ?'rgba(166, 255, 234, 1)':'#eee'}">
10-15公斤
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('weight','15-20公斤')"
:style="{'background':addFormData.weight == '15-20公斤' ?'rgba(166, 255, 234, 1)':'#eee'}">
15-20公斤
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('weight','20公斤以上')"
:style="{'background':addFormData.weight == '20公斤以上' ?'rgba(166, 255, 234, 1)':'#eee'}">
20公斤以上
</view> </view>
</view> </view>
</view> </view>
<view class="content-box"> <view class="content-box" style="line-height: 100px;">
<view class="content-title">
物品体积<text>*</text>
</view>
<view style="flex: 1;">
<view class="duoxuan" @tap="checkWeightOrVolume('volume','0.5立方米以下')"
:style="{'background':addFormData.volume == '0.5立方米以下' ?'rgba(166, 255, 234, 1)':'#eee'}">
0.5立方米以下
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('volume','0.5-1立方米')"
:style="{'background':addFormData.volume == '0.5-1立方米' ?'rgba(166, 255, 234, 1)':'#eee'}">
0.5-1立方米
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('volume','1.1-1.5立方米')"
:style="{'background':addFormData.volume == '1.1-1.5立方米' ?'rgba(166, 255, 234, 1)':'#eee'}">
1.1-1.5立方米
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('volume','1.6-2立方米')"
:style="{'background':addFormData.volume == '1.6-2立方米' ?'rgba(166, 255, 234, 1)':'#eee'}">
1.6-2立方米
</view>
<view class="duoxuan" @tap="checkWeightOrVolume('volume','2.1立方米以上')"
:style="{'background':addFormData.volume == '2.1立方米以上' ?'rgba(166, 255, 234, 1)':'#eee'}">
2.1立方米以上
</view>
</view>
</view>
<view class="content-box">
<view class="content-title"> <view class="content-title">
订单备注<text>*</text> 订单备注<text>*</text>
</view> </view>
<view style="flex: 1;"> <view style="height: 100px;background: #eee;border-radius: 20px;padding: 10px;width: 70%;">
<textarea name="" id="" cols="30" rows="10" placeholder="请填写备注"></textarea> <textarea name="" id="" cols="30" rows="10" placeholder="请填写备注"
style="height: 80px;width: 100%;"></textarea>
</view> </view>
</view> </view>
<view class="content-box"> <view class="content-box">
<view class="content-title"> <view class="content-title">
送达时间<text>*</text> 送达时间<text>*</text>
</view> </view>
<view style="flex: 1;" @tap="$refs.model.open();"> <view style="flex: 1;font-size: 14px;font-weight: 700;" @tap="checkTime">
选择送达时间 <uni-icons type="right"></uni-icons> {{addFormData.deliveryTime}} <uni-icons type="right"></uni-icons>
</view> </view>
</view> </view>
<view style="width: 100%;height: 120px;"></view> <view style="width: 100%;height: 120px;"></view>
@ -217,6 +175,13 @@
直接购买 直接购买
</view> </view>
</view> </view>
<!-- 地址簿弹出层 -->
<uni-popup ref="bookPopup" background-color="#fff">
<view class="book-popup-content">
<address-list></address-list>
</view>
</uni-popup>
<delivery-time-op @dataCallback="dataCallback" @timeCallback="timeCallback" :dodge="true" ref='model' <delivery-time-op @dataCallback="dataCallback" @timeCallback="timeCallback" :dodge="true" ref='model'
:content="content" :barHidth='600' title="选择预送达时间"> :content="content" :barHidth='600' title="选择预送达时间">
> </delivery-time-op> > </delivery-time-op>
@ -225,6 +190,7 @@
<script> <script>
import deliveryTimeOp from '@/components/delivery-time-op/delivery-time-op.vue' import deliveryTimeOp from '@/components/delivery-time-op/delivery-time-op.vue'
import addressList from '@/package1/address/addressList.vue'
export default { export default {
data() { data() {
return { return {
@ -240,35 +206,15 @@
code: '' code: ''
}], }],
picture: [], picture: [],
weight: '', isOverweightOrOvervolume: false,
volume: '' deliveryTime: '立即送达'
}, },
content: [{ content: []
timezh: "今天 (周三)",
timeformatter: "8-10",
id: 108,
timelist: [{
timestr: "立即送达",
}, {
timestr: "15:35",
}, {
timestr: "16:05",
}, {
timestr: "16:35",
}, {
timestr: "17:05",
}, {
timestr: "17:35",
}, {
timestr: "18:05",
}, {
timestr: "18:35",
}]
}]
} }
}, },
components: { components: {
deliveryTimeOp deliveryTimeOp,
addressList
}, },
onLoad() { onLoad() {
@ -277,12 +223,94 @@
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
}, },
methods: { methods: {
checkWeightOrVolume(type, value) { openAddressBook(){
if (type == 'weight') { this.$refs.bookPopup.open('bottom')
this.addFormData.weight = value
} else { },
this.addFormData.volume = value checkTime(){
this.$refs.model.open();
this.generateDeliveryTimes()
},
//时间选择器获取时间数据
generateDeliveryTimes() {
const now = new Date();
const today = new Date(now);
const tomorrow = new Date(now);
tomorrow.setDate(tomorrow.getDate() + 1);
// 星期几
const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
const todayWeekday = weekdays[today.getDay()];
const todayStr = `今天 (${todayWeekday})`;
// 明天的日期格式：月-日（不补零）
const month = tomorrow.getMonth() + 1;
const day = tomorrow.getDate();
const tomorrowStr = `${month}-${day}`;
// ----- 生成今天的时间列表 -----
const todayTimelist = [{
timestr: '自动送达'
}];
const currentHour = now.getHours();
const currentMinute = now.getMinutes();
// 计算下一个半小时点
let nextHour = currentHour;
let nextMinute = 30;
if (currentMinute >= 30) {
nextHour = currentHour + 1;
nextMinute = 0;
}
// 从下一个半小时点开始，直到 23:30
for (let h = nextHour; h <= 23; h++) {
const startMin = (h === nextHour) ? nextMinute : 0;
for (let m = startMin; m < 60; m += 30) {
if (h === 23 && m > 30) continue; // 不超过 23:30
const timeStr = `${h.toString().padStart(2, '0')}:${m.toString().padStart(2, '0')}`;
todayTimelist.push({
timestr: timeStr
});
}
} }
// ----- 生成明天的时间列表（全天 00:00 ~ 23:30）-----
const tomorrowTimelist = [];
for (let h = 0; h <= 23; h++) {
for (let m = 0; m < 60; m += 30) {
if (h === 23 && m > 30) continue;
const timeStr = `${h.toString().padStart(2, '0')}:${m.toString().padStart(2, '0')}`;
tomorrowTimelist.push({
timestr: timeStr
});
}
}
this.content = [{
timezh: todayStr,
timelist: todayTimelist
},
{
timezh: tomorrowStr,
timelist: tomorrowTimelist
}
];
},
//切换日期
dataCallback(type) {
console.log("11111111111")
},
//时间选择器点击后
timeCallback(val) {
this.addFormData.deliveryTime = val.timestr
this.$refs.model.close()
},
checkWeightOrVolume() {
this.addFormData.isOverweightOrOvervolume = !this.addFormData.isOverweightOrOvervolume
}, },
addCode() { addCode() {
this.addFormData.codeList.push({ this.addFormData.codeList.push({

6
pages.json
View File

@ -70,6 +70,12 @@
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "order/orderConfirm",
"style": {
"navigationBarTitleText": "订单支付页",
"navigationStyle": "custom"
}
},{ },{
"path": "payment/payment", "path": "payment/payment",
"style": { "style": {

2
pages/index/index.vue
View File

@ -496,7 +496,7 @@
url = '/package1/group/groupBuyList' url = '/package1/group/groupBuyList'
break; break;
case '3': case '3':
url = '/package1/order/orderDetail' url = '/package1/order/orderConfirm'
break; break;
case '4': case '4':
url = '' url = ''

Write Preview
Loading…
Cancel
Save