|
|
@@ -14,8 +14,8 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 地址 -->
|
|
|
- <navigator v-if="tabCurrentIndex == 1" url="/pages/set/address?source=1" class="address-section">
|
|
|
- <view class="order-content" v-if="addressData.real_name">
|
|
|
+ <navigator v-if="tabCurrentIndex == 1" url="/pages/set/address?source=1" class="address-section margin-b-30">
|
|
|
+ <view class="order-content " v-if="addressData.real_name">
|
|
|
<view class="cen">
|
|
|
<view class="top">
|
|
|
<text class="name">{{ addressData.real_name }}</text>
|
|
|
@@ -33,7 +33,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</navigator>
|
|
|
- <navigator v-if="tabCurrentIndex == 2" url="/pages/order/shopList?type=1" class="address-section">
|
|
|
+ <navigator url="/pages/order/shopList?type=1" class="address-section">
|
|
|
<view class="shop-box" v-if="shopAddress.name">
|
|
|
<view class="shop-top flex">
|
|
|
<view class="flex shop-title">
|
|
|
@@ -49,7 +49,7 @@
|
|
|
电话：{{ shopAddress.phone }}
|
|
|
</view>
|
|
|
<text class="shop-address">
|
|
|
- 地区：{{ shopAddress._detailed_address }}
|
|
|
+ 地区：{{shopAddress.address+shopAddress.detailed_address}}
|
|
|
</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -61,7 +61,6 @@
|
|
|
</view>
|
|
|
</navigator>
|
|
|
<view class="goodsList">
|
|
|
-
|
|
|
<view class="goods-section" v-for="(ls, ind) in shopList" :key="ind">
|
|
|
<!-- 商品列表 -->
|
|
|
<view class="g-item">
|
|
|
@@ -84,14 +83,31 @@
|
|
|
</view>
|
|
|
<!-- 金额明细 -->
|
|
|
<view class="yt-list">
|
|
|
- <view class="yt-list-cell b-b" v-if="tabCurrentIndex == 2">
|
|
|
- <text class="cell-tit clamp">姓名</text>
|
|
|
- <input class="desc" type="text" v-model="addressData.real_name" placeholder="请填写备注信息" placeholder-class="placeholder" />
|
|
|
- </view>
|
|
|
- <view class="yt-list-cell b-b" v-if="tabCurrentIndex == 2">
|
|
|
- <text class="cell-tit clamp">手机号</text>
|
|
|
- <input class="desc" type="text" v-model="addressData.phone" placeholder="请填写备注信息" placeholder-class="placeholder" />
|
|
|
- </view>
|
|
|
+ <template v-if="tabCurrentIndex == 1">
|
|
|
+ <view class="yt-list-cell b-b">
|
|
|
+ <text class="cell-tit clamp">送货日期</text>
|
|
|
+ <view @click="openTime" class="desc">
|
|
|
+ <text v-if="day.day">
|
|
|
+ {{timeList[checkedTime].name+day.time}}
|
|
|
+ </text>
|
|
|
+ <text v-else>
|
|
|
+ 请选择送货日期
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </template>
|
|
|
+ <template v-if="tabCurrentIndex == 2">
|
|
|
+ <view class="yt-list-cell b-b">
|
|
|
+ <text class="cell-tit clamp">姓名</text>
|
|
|
+ <input class="desc" type="text" v-model="addressData.real_name" placeholder="请填写备注信息"
|
|
|
+ placeholder-class="placeholder" />
|
|
|
+ </view>
|
|
|
+ <view class="yt-list-cell b-b">
|
|
|
+ <text class="cell-tit clamp">手机号</text>
|
|
|
+ <input class="desc" type="text" v-model="addressData.phone" placeholder="请填写备注信息"
|
|
|
+ placeholder-class="placeholder" />
|
|
|
+ </view>
|
|
|
+ </template>
|
|
|
<view class="yt-list-cell b-b">
|
|
|
<text class="cell-tit clamp">运费</text>
|
|
|
<text class="cell-tip disabled">{{ Postage }}</text>
|
|
|
@@ -104,7 +120,7 @@
|
|
|
|
|
|
|
|
|
<view class="yt-list">
|
|
|
- <view class="yt-list-cell b-b" v-if="fx" @click="payType='weixin'">
|
|
|
+ <view class="yt-list-cell b-b" @click="payType='weixin'">
|
|
|
<view class="cell-tit flex">
|
|
|
<image class="orderIcon" src="../../static/icon/orderWx.png" mode="widthFix"></image>
|
|
|
<text class="margin-l-10">微信支付</text>
|
|
|
@@ -145,6 +161,33 @@
|
|
|
</view>
|
|
|
<text class="submit" :class="{submitNo:payLoding}" @click="payLoding?'':submit()">提交订单</text>
|
|
|
</view>
|
|
|
+
|
|
|
+ <uni-popup class="alertTime" ref="popup" type="bottom">
|
|
|
+ <view class="alert-box position-relative">
|
|
|
+ <view class="alert-title ">
|
|
|
+ 选择预计送达时间
|
|
|
+ </view>
|
|
|
+ <view class="tip iconfont iconclose" @click="$refs.popup.close()"></view>
|
|
|
+ <view class="flex">
|
|
|
+ <view class="left-title">
|
|
|
+ <view class="title" :class="{action:checkedTime==ind}" v-for="(item,ind) in timeList"
|
|
|
+ @click="changeCheckedTime(item,ind)">
|
|
|
+ {{item.name+'('+item.day+')'}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="right-content">
|
|
|
+ <view class="list flex" v-for="(item,ind) in timeList[checkedTime].list" @click="checkedShopTime(item)">
|
|
|
+ <view class="time">
|
|
|
+ {{item.time}}
|
|
|
+ </view>
|
|
|
+ <view class="checked">
|
|
|
+ 剩余：{{item.door_number-item.day_number}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </uni-popup>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -161,6 +204,9 @@
|
|
|
import {
|
|
|
getUserInfo
|
|
|
} from '@/api/user.js';
|
|
|
+ import {
|
|
|
+ storeday
|
|
|
+ } from '@/api/water.js';
|
|
|
// #ifdef H5
|
|
|
import weixinObj from "@/plugin/jweixin-module/index.js";
|
|
|
// #endif
|
|
|
@@ -204,9 +250,57 @@
|
|
|
orderId: '', //订单id
|
|
|
now_money: 0, //余额
|
|
|
onShopId: -1, //默认-1为不存在商家id
|
|
|
- system_store: [], //到店自提列表仓库
|
|
|
+ // 下单日期
|
|
|
+ day: {
|
|
|
+ day:'',
|
|
|
+ id:'',
|
|
|
+ time:''
|
|
|
+ },
|
|
|
+ // 当前选中的日期对象
|
|
|
+ checkedTime: 0,
|
|
|
+ // 保存每周日子
|
|
|
+ timeName: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
|
|
|
+ // 保存日期列表
|
|
|
+ timeList: [{
|
|
|
+ name: '今天',
|
|
|
+ day: '',
|
|
|
+ time: '',
|
|
|
+ list: []
|
|
|
+ }, {
|
|
|
+ name: '明天',
|
|
|
+ day: '',
|
|
|
+ time: '',
|
|
|
+ list: []
|
|
|
+ }, {
|
|
|
+ name: '',
|
|
|
+ day: '',
|
|
|
+ time: '',
|
|
|
+ list: []
|
|
|
+ }, {
|
|
|
+ name: '',
|
|
|
+ day: '',
|
|
|
+ time: '',
|
|
|
+ list: []
|
|
|
+ }]
|
|
|
};
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ shopAddress(newValue, oldValue) {
|
|
|
+ console.log(newValue,'newValue');
|
|
|
+ for (let i = 0; i < this.timeList.length; i++) {
|
|
|
+ const item = this.timeList[i];
|
|
|
+ const day = `${item.time.getFullYear()}-${item.time.getMonth()+1}-${item.time.getDate()}`
|
|
|
+ storeday({
|
|
|
+ store_id:newValue.id,
|
|
|
+ day
|
|
|
+ }).then(({
|
|
|
+ data
|
|
|
+ }) => {
|
|
|
+ item.list= data;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
onLoad(option) {
|
|
|
// 保存当前商品在购物车中的id
|
|
|
this.cartId = option.id;
|
|
|
@@ -216,8 +310,11 @@
|
|
|
}
|
|
|
this.loadData();
|
|
|
this.userinfo();
|
|
|
+ // 初始化送货时间
|
|
|
+ this.timeInit();
|
|
|
},
|
|
|
computed: {
|
|
|
+ // 计算是否免运费
|
|
|
Postage() {
|
|
|
let money = +this.moneyAll.storePostage;
|
|
|
if (money == 0) {
|
|
|
@@ -229,10 +326,43 @@
|
|
|
payAllMoney() {
|
|
|
return +this.moneyAll.totalPrice + +this.moneyAll.vipPrice;
|
|
|
},
|
|
|
- ...mapState('shop', ['shopDetail']),
|
|
|
- ...mapState(['fx'])
|
|
|
+ ...mapState('shop', ['shopDetail'])
|
|
|
},
|
|
|
methods: {
|
|
|
+ checkedShopTime(item){
|
|
|
+ this.day = item;
|
|
|
+ this.$refs.popup.close();
|
|
|
+ },
|
|
|
+ // 选中的时间对象
|
|
|
+ changeCheckedTime(item, ind) {
|
|
|
+ this.checkedTime = ind;
|
|
|
+ },
|
|
|
+ // 打开弹窗
|
|
|
+ openTime() {
|
|
|
+ // 打开弹出窗
|
|
|
+ this.$refs.popup.open();
|
|
|
+ },
|
|
|
+ // 初始化送货时间
|
|
|
+ timeInit() {
|
|
|
+ // 保存当前时间
|
|
|
+ const startTime = new Date();
|
|
|
+ for (let i = 0; i < this.timeList.length; i++) {
|
|
|
+ const item = this.timeList[i]
|
|
|
+ // 保存今天时间戳
|
|
|
+ item.time = new Date(startTime.getTime() + 86400000 * i);
|
|
|
+ // 获取今日周几
|
|
|
+ item.day = this.timeName[item.time.getDay()];
|
|
|
+ if (!item.name) {
|
|
|
+ // 获取今日日期
|
|
|
+ item.name = `${item.time.getMonth()+1}月${item.time.getDate()}日`
|
|
|
+ }
|
|
|
+ }
|
|
|
+ console.log(this.timeList, 'this.timeList');
|
|
|
+ },
|
|
|
+ // 送货时间修改
|
|
|
+ changeTime(res) {
|
|
|
+ console.log(res);
|
|
|
+ },
|
|
|
// 加载用户基础信息
|
|
|
userinfo() {
|
|
|
getUserInfo({}).then(({
|
|
|
@@ -267,7 +397,7 @@
|
|
|
confirm({
|
|
|
cartId: obj.cartId + '',
|
|
|
longitude: uni.getStorageSync('CACHE_LONGITUDE'),
|
|
|
- latitude:uni.getStorageSync('CACHE_LATITUDE'),
|
|
|
+ latitude: uni.getStorageSync('CACHE_LATITUDE'),
|
|
|
}).then(({
|
|
|
data
|
|
|
}) => {
|
|
|
@@ -276,6 +406,7 @@
|
|
|
obj.moneyAll = data.priceGroup; //金额数据
|
|
|
obj.orderKey = data.orderKey; //订单key
|
|
|
obj.shopAddress = data.system_store; //到店自提列表
|
|
|
+ obj.shopAddress.address = data.system_store.address.join(','); //到店自提列表
|
|
|
// 计算金额
|
|
|
this.payMoneyNub();
|
|
|
});
|
|
|
@@ -404,15 +535,14 @@
|
|
|
// 初次订单创建
|
|
|
firstCreateOrder() {
|
|
|
let obj = this;
|
|
|
- // 获取下单页面数据
|
|
|
- let prepage = obj;
|
|
|
+ console.log(obj.day,'obj.day');
|
|
|
let data = {
|
|
|
- real_name: prepage.addressData.real_name, //联系人名称
|
|
|
- phone: prepage.addressData.phone, //联系人号码
|
|
|
- addressId: prepage.addressData.id, //支付地址id
|
|
|
+ real_name: obj.addressData.real_name, //联系人名称
|
|
|
+ phone: obj.addressData.phone, //联系人号码
|
|
|
+ addressId: obj.addressData.id, //支付地址id
|
|
|
useIntegral: 0, //是否积分抵扣1为是0为否
|
|
|
payType: obj.payType, //支付类型 weixin-微信 yue-余额
|
|
|
- mark: prepage.desc, //备注
|
|
|
+ mark: obj.desc, //备注
|
|
|
// #ifdef H5
|
|
|
from: 'weixin', //来源
|
|
|
// #endif
|
|
|
@@ -423,11 +553,10 @@
|
|
|
from: 'app', //来源
|
|
|
// #endif
|
|
|
shipping_type: obj.tabCurrentIndex, //提货方式 1 快递 2自提
|
|
|
- store_id:obj.shopAddress.id||''
|
|
|
+ store_id: obj.shopAddress.id || '',
|
|
|
+ day:obj.day.day,
|
|
|
+ door_id:obj.day.door_id
|
|
|
};
|
|
|
- if(obj.tabCurrentIndex == 2) {
|
|
|
- data.store_id = obj.shopAddress.id
|
|
|
- }
|
|
|
// 生成订单
|
|
|
createOrderkey(data, obj.orderKey)
|
|
|
.then(({
|
|
|
@@ -472,9 +601,10 @@
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
|
- .content{
|
|
|
+ .content {
|
|
|
padding-bottom: 100rpx;
|
|
|
}
|
|
|
+
|
|
|
.address-section {
|
|
|
border-radius: 20rpx;
|
|
|
padding: 30rpx;
|
|
|
@@ -820,13 +950,16 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- .shop-box{
|
|
|
+
|
|
|
+ .shop-box {
|
|
|
.shop-top {
|
|
|
width: 100%;
|
|
|
- .shop-title{
|
|
|
+
|
|
|
+ .shop-title {
|
|
|
width: 0px;
|
|
|
flex-grow: 1;
|
|
|
justify-content: flex-start;
|
|
|
+
|
|
|
.shopImg {
|
|
|
height: 65rpx;
|
|
|
width: 65rpx;
|
|
|
@@ -834,12 +967,14 @@
|
|
|
margin-right: 20rpx;
|
|
|
flex-shrink: 0;
|
|
|
}
|
|
|
- .shop-name{
|
|
|
+
|
|
|
+ .shop-name {
|
|
|
font-weight: bold;
|
|
|
font-size: $font-lg;
|
|
|
}
|
|
|
}
|
|
|
- .shop-tip{
|
|
|
+
|
|
|
+ .shop-tip {
|
|
|
color: #FFF;
|
|
|
padding: 5rpx 10rpx;
|
|
|
font-size: $font-sm;
|
|
|
@@ -847,10 +982,59 @@
|
|
|
border-radius: 5rpx;
|
|
|
}
|
|
|
}
|
|
|
- .shop-content{
|
|
|
- color: $font-color-light;
|
|
|
+
|
|
|
+ .shop-content {
|
|
|
+ color: $font-color-light;
|
|
|
font-size: $font-sm;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ .alertTime {
|
|
|
+ z-index: 1000;
|
|
|
+
|
|
|
+ .alert-box {
|
|
|
+ background-color: #FFF;
|
|
|
+ border-top-right-radius: 20rpx;
|
|
|
+ border-top-left-radius: 20rpx;
|
|
|
+ min-height: 70vh;
|
|
|
+ .right-content{
|
|
|
+ width: 70%;
|
|
|
+ .list{
|
|
|
+ padding: 20rpx 30rpx;
|
|
|
+ font-size: $font-sm;
|
|
|
+ border-bottom: 1px solid $border-color-light;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .left-title {
|
|
|
+ width: 30%;
|
|
|
+ align-self: flex-start;
|
|
|
+ .title {
|
|
|
+ padding: 30rpx;
|
|
|
+ text-align: center;
|
|
|
+ font-weight: bold;
|
|
|
+ font-size: $font-sm;
|
|
|
+ background-color: rgba(246, 246, 246, 1);
|
|
|
+
|
|
|
+ &.action {
|
|
|
+ background-color: #FFF;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .alert-title {
|
|
|
+ text-align: center;
|
|
|
+ padding: 30rpx;
|
|
|
+ line-height: 1;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+
|
|
|
+ .tip {
|
|
|
+ position: absolute;
|
|
|
+ top: 30rpx;
|
|
|
+ right: 30rpx;
|
|
|
+ color: $font-color-disabled;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
