Skip to content

7
7-Eleven
Commit 8eb554a4 by 谢中龙
Options

修改下单问题

parent 6b93300b
Showing with 63 additions and 47 deletions
src/pages/confirmOrder/confirmOrder.js
......@@ -23,6 +23,11 @@ wxService.page({
noSelectPrice: '',
plusSpread: '',
goodsAddress: false,
uAddress : {
name : '',
phone : '',
address : '',
},
citys: null,
cityView: '',
multiIndex: [0, 0, 0],
......@@ -55,6 +60,12 @@ wxService.page({
wx.hideShareMenu();
this.getMyLocationInfo();
},
//输入
onInput(e){
let key = e.target.dataset.name;
let value = e.detail.value;
this.data.uAddress[key] = value;
},
////获取位置信息并获取附近门店信息
getMyLocationInfo(cb) {
let _this = this;
......@@ -307,30 +318,30 @@ wxService.page({
const { goodsAddress } = this.data
// 保存地址 && 支付
if (goodsAddress) {
if (!e.detail.value.name) {
if (!this.data.uAddress.name) {
wx.showToast({
title: `请输入姓名`,
title: `请输入收货人姓名`,
icon: 'none'
})
return false;
}
if (!e.detail.value.phone) {
if (!this.data.uAddress.phone) {
wx.showToast({
title: `请输入电话`,
title: `请输入收货人电话`,
icon: 'none'
})
return false;
}
if (!this.data.cityView) {
wx.showToast({
title: `请选择地区`,
title: `请选择收货地区`,
icon: 'none'
})
return false;
}
if (!e.detail.value.address) {
if (!this.data.uAddress.address) {
wx.showToast({
title: `请输入详细地址`,
title: `请输入收货详细地址`,
icon: 'none'
})
return false;
......@@ -340,12 +351,12 @@ wxService.page({
this.setData({
params: {
userId: memberId,
name: e.detail.value.name,
phone: e.detail.value.phone,
name: this.data.uAddress.name,
phone: this.data.uAddress.phone,
province: this.data.params.province,
city: this.data.params.city,
district: this.data.params.district,
address: e.detail.value.address,
address: this.data.uAddress.address,
type: this.data.isSelect ? 1 : 0
}
});
......@@ -737,8 +748,9 @@ wxService.page({
let amount = data.amount || 0
wx.requestPayment(Object.assign({
success(res) {
wx.hideLoading()
wx.hideLoading()
// 支付成功页面
//消息订阅
let baseUserInfo = wx.getStorageSync('_baseUserInfo');
wxService.post(`${'/merchant/message/wxSubMsgMapping/getListByParams'}`, {
......
src/pages/confirmOrder/confirmOrder.wxml
......@@ -15,8 +15,15 @@
<view class="address-wrap" wx:if="{{currentType == 'delivery'}}">
<block wx:if="{{goodsAddress}}">
<view class="address-section">
<input class="address-input" name="name" placeholder="请输入收货人姓名" />
<input class="address-input" name="phone" placeholder="请输入手机号码" />
<input class="address-input" name="name"
data-name="name" value='{{uAddress.name}}'
bindinput='onInput'
placeholder="请输入收货人姓名" />
<input class="address-input" name="phone"
data-name="phone"
bindinput='onInput'
value='{{uAddress.phone}}'
placeholder="请输入手机号码" />
</view>
<view class="address-section">
<picker
......@@ -43,7 +50,12 @@
</picker>
</view>
<view class="address-section">
<input class="address-input address-detail" name="address" placeholder="请输入路名门牌号" />
<input class="address-input address-detail"
name="address"
bindinput='onInput'
data-name="address"
value='{{uAddress.address}}'
placeholder="请输入路名门牌号" />
</view>
</block>
<block wx:if="{{!goodsAddress}}">
......
src/pages/logistics/logistics.js
......@@ -15,7 +15,10 @@ wxService.page({
orderCode:'',
orderLogisticsNo: '',
params: null,
hasLogisticInfo : false
hasLogisticInfo : false,
logisticCompanyName: '',
logisticNo : '',
},
/**
......@@ -33,11 +36,15 @@ wxService.page({
let detail = JSON.parse(params)
// supplierCode code
if(detail.id){
this.data.logisticCompanyName = detail.logistic.supplierName ? detail.logistic.supplierName : '暂无';
this.data.logisticNo = detail.logistic.code ? detail.logistic.code : '暂无';
this.setData({
params,
orderId: detail.id,
orderCode: detail.logistic.supplierCode,
orderLogisticsNo: detail.logistic.code
orderLogisticsNo: detail.logistic.code,
logisticCompanyName: this.data.logisticCompanyName,
logisticNo: this.data.logisticNo,
},()=>{
const {orderCode, orderLogisticsNo} = this.data
this.getLogisticsInfo(orderCode, orderLogisticsNo)
......
src/pages/logistics/logistics.json
{
"navigationBarTitleText": "物流详情",
"usingComponents": {
"empty": "/component/empty/empty",
"go-home": "/component/goHome/goHome",
"go-guid": "/component/goGuid/goGuid"
}
......
src/pages/logistics/logistics.wxml
<!--pages/logistics/logistics.wxml-->
<view class="page-logistics" wx:if="{{orderId && hasLogisticInfo}}">
<view class="page-logistics" >
<view class="header-wrap">
<image class="header-bg" src="https://img3.bigaka.com/prd/3001/202003/20200309/300106606827-975c-4d80-a176-c1830857107b.jpg" />
<view class="logistics-status">
<view class="status">物流公司：{{logisData.company}}</view>
<view class="desc">物流单号：{{logisData.no}}</view>
<view class="status">物流公司：{{logisticCompanyName}}</view>
<view class="desc">物流单号：{{logisticNo}}</view>
<view class="copy" bindtap="copy" data-content="89687687687687786">复制</view>
</view>
</view>
<!-- 物流时间轴 -->
<view class='expressRecord'>
<view class='expressRecord' wx:if="{{orderId && hasLogisticInfo}}">
<view class='expressRecord-single-close' wx:for="{{logisData.list}}" wx:key="{{index}}">
<view class='expressRecord-single-noReach-online-top-close'>
<view class="online-top-close {{index ==0 ? 'online-top-closing' : ''}}" />
<view class="dot-icon">
<!-- 订单提交成功 -->
<!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/submit-order.png"></image> -->
<!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/submit-order-primary.png"></image> -->
<!-- 订单发货 -->
<!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/deliver.png"></image> -->
<!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/deliver-success.png"></image> -->
<!-- 运输 -->
<!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/transport.png"></image> -->
<!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/transport-success.png"></image> -->
<!-- 签收 -->
<!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/sign.png"></image> -->
<!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/sign-success.png"></image> -->
<!-- 交易完成 -->
<image class="dot-icon-closing" src="/assets/imgs/7_1_0/trade-success.png" />
</view>
<view class='dot-close' wx:if="{{false}}" />
......@@ -55,14 +38,16 @@
</view>
</view>
<view class="button-wrap">
<!-- <view class="button-wrap">
<button class="btn btn-primary btn-lg" bindtap="handelConfirmReceipt">确认收货</button>
<button class="btn btn-lg btn-gray" bindtap="handelReturnGood">申请退款</button>
</view>
</view>
<view wx:else class="df no-logis">
当前暂无物流信息
</view> -->
</view>
<!-- <view wx:if="{{!orderId || !hasLogisticInfo}}" class="df no-logis">
</view> -->
<!-- 空 -->
<empty text="当前暂无快递物流信息，请耐心等待~" wx:if="{{!orderId || !hasLogisticInfo}}"/>
<!--goHome-->
<go-home/>
......
src/pages/logistics/logistics.wxss
......@@ -30,7 +30,7 @@ page{
font-weight: bold;
}
.logistics-status .desc{
font-size: 26rpx;
font-size: 28rpx;
margin-top: 8rpx;
display: inline-block;
}
......
src/pages/order/order.js
......@@ -211,9 +211,7 @@ wxService.page({
item.count = item.canRefundNum;
});
// let obj = {
// id :
// }
delete copyOrderInfo.orderStore;
let params = JSON.stringify(copyOrderInfo);
......
src/pages/orderDetail/orderDetail.js
......@@ -293,6 +293,8 @@ wxService.page({
item.count = item.canRefundNum;
});
delete copyOrderInfo.orderStore;
let params = JSON.stringify(copyOrderInfo);
// 退款申请
wxService.router(`/pages/logistics/logistics`).search({params})
......
src/pages/refund/refund.js
......@@ -129,7 +129,6 @@ wxService.page({
}
}
})
},
//获取退款原因列表
getReasonList() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment