mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

先货后款,入库,下单.收货,同意

Browse Source
This commit is contained in:
THK3121 2023-07-10 10:11:29 +08:00
parent 42b860b90e
commit 24415dc4ad
6 changed files with 2568 additions and 2546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/order_details/index.vue
View File

@ -220,6 +220,8 @@
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view> <view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter' <view class='conter'
v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view> v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
<view class='conter'
v-if="orderInfo.pay_type==8 ">先货后款</view>
</view> </view>
<view class='item acea-row row-between' v-if="orderInfo.mark"> <view class='item acea-row row-between' v-if="orderInfo.mark">
<view>买家留言：</view> <view>买家留言：</view>

24
pages/order_details/stay.vue
View File

@ -131,9 +131,14 @@
<view>商品总额：</view> <view>商品总额：</view>
<view class='conter'>￥{{orderInfo.total_price}}</view> <view class='conter'>￥{{orderInfo.total_price}}</view>
</view> </view>
<view class='item acea-row row-between' v-if="credit_buy == 1"> <view class='item acea-row row-between' v-if="orderInfo.orderList[0].merchant.settle_cycle">
<view>支付方式：</view> <view>支付方式：</view>
<view class='conter'>先货后款</view> <view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter'
v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
<view class='conter'
v-if="orderInfo.pay_type==8 ">先货后款</view>
</view> </view>
</view> </view>
@ -161,14 +166,14 @@
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
<view>实付款：</view> <view>实付款：</view>
<view class='conter' style="color: black;" v-if="credit_buy == 1">先货后款 : ￥{{orderInfo.pay_price}}</view> <view class='conter' style="color: black;" v-if="orderInfo.orderList[0].merchant.settle_cycle">先货后款 : ￥{{orderInfo.pay_price}}</view>
<view class='conter' style="color: black;">￥{{orderInfo.pay_price}}</view> <view class='conter' style="color: black;" v-else>￥{{orderInfo.pay_price}}</view>
<view class="conters" style="color: black;" v-if="credit_buy == 1"> <view class="conters" style="color: black;" v-if="orderInfo.orderList[0].merchant.settle_cycle">
结算周期到期后付款 ￥{{orderInfo.pay_price}} 结算周期到期后付款 ￥{{orderInfo.interest.total_amount}}
<image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image> <image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image>
</view> </view>
<view class="conters" v-if="credit_buy == 1"> <view class="conters" v-if="orderInfo.orderList[0].merchant.settle_cycle">
结算周期:30天 日利率:0.05% 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
</view> </view>
</view> </view>
@ -283,7 +288,7 @@
} }
}, },
computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0}, computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0},
mapGetters(['isLogin','uid','viewColor','keyColor'])), mapGetters(['isLogin','uid','viewColor','keyColor',])),
onLoad: function(options) { onLoad: function(options) {
this.credit_buy=options.credit_buy this.credit_buy=options.credit_buy
if(options.product_type)this.product_type=options.product_type if(options.product_type)this.product_type=options.product_type
@ -446,6 +451,7 @@
let _type = 0; let _type = 0;
uni.hideLoading(); uni.hideLoading();
that.$set(that, 'orderInfo', res.data); that.$set(that, 'orderInfo', res.data);
console.log(that.orderInfo.orderList[0].merchant.settle_cycle);
}).catch(err => { }).catch(err => {
// console.log(err) // console.log(err)
uni.hideLoading(); uni.hideLoading();

23
pages/product/list/index.vue
View File

@ -52,6 +52,11 @@
<image mode='widthFix' class="image" src="../static/images/product_specification.png"></image> <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
<text class="text">规格模板</text> <text class="text">规格模板</text>
</navigator> </navigator>
<navigator class="item" :url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
hover-class='none'>
<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
<text class="text">商品导入</text>
</navigator>
</view> </view>
</swiper-item> </swiper-item>
</block> </block>
@ -230,7 +235,20 @@
this.on_line = action this.on_line = action
console.log(this.on_line); console.log(this.on_line);
this.checkboxList1 = rowId this.checkboxList1 = rowId
if(!this.checkboxList1[0].sku && action == 0){
navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id,
product_id: this.data.product_id,
unique: this.data.unique,
});
}else{
this.data.product_id = this.checkboxList1[0].product_id
this.data.unique = this.checkboxList1[0].unique
this.show = true this.show = true
console.log(this.data);
}
}, },
close() { close() {
@ -245,6 +263,11 @@
this.$util.Tips({ this.$util.Tips({
title: res.message title: res.message
}) })
}).catch(err=>{
this.show=false
this.$util.Tips({
title: err.message
})
}) })
} }
if (this.on_line == 0) { if (this.on_line == 0) {

87
pages/users/order_confirm/index.vue
View File

@ -68,8 +68,7 @@
</view> </view>
<view class="progress_step"> <view class="progress_step">
<text class="name">尾款</text> <text class="name">尾款</text>
<text <text class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
</view> </view>
<view class="progress_pay"> <view class="progress_pay">
{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款 {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
@ -119,8 +118,7 @@
<view class="boxs"> <view class="boxs">
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>配送方式</view> <view>配送方式</view>
<view <view v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
class='discount' @tap="openShowBox(item,index)"> class='discount' @tap="openShowBox(item,index)">
{{item.order.isTake==0 ? deliveryName :'到店核销'}} {{item.order.isTake==0 ? deliveryName :'到店核销'}}
<text class='iconfont icon-jiantou'></text> <text class='iconfont icon-jiantou'></text>
@ -179,9 +177,8 @@
</view> </view>
<view class='item acea-row row-between-wrapper' v-if="textareaStatus"> <view class='item acea-row row-between-wrapper' v-if="textareaStatus">
<view style="width: 100px;">备注信息</view> <view style="width: 100px;">备注信息</view>
<input v-if="coupon.status===false" placeholder-class='placeholder' <input v-if="coupon.status===false" placeholder-class='placeholder' @input='bindHideKeyboard' value=""
@input='bindHideKeyboard' value="" name="mark" placeholder='选填备注信息' name="mark" placeholder='选填备注信息' v-model="msgObj[item.mer_id]"></input>
v-model="msgObj[item.mer_id]"></input>
</view> </view>
<view class="total"> <view class="total">
共{{item.order.total_num}}件 小计 共{{item.order.total_num}}件 小计
@ -191,7 +188,7 @@
<view class="total" v-if="item.credit_buy == 1"> <view class="total" v-if="item.credit_buy == 1">
实付 实付
<view class="price" ><text>￥</text>0.00</view> <view class="price"><text>￥</text>0.00</view>
</view> </view>
</view> </view>
</view> </view>
@ -203,40 +200,36 @@
<view v-if="item.key == 'mobile'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'mobile'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="item.value" placeholder="请填写手机号" <input type="text" v-model="item.value" placeholder="请填写手机号" placeholder-class='placeholder' />
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'email'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'email'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="item.value" placeholder="请填写邮箱" <input type="text" v-model="item.value" placeholder="请填写邮箱" placeholder-class='placeholder' />
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'idCard'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'idCard'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="item.value" placeholder="请填写身份证号" <input type="text" v-model="item.value" placeholder="请填写身份证号" placeholder-class='placeholder' />
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'text' || item.key == 'number'" <view v-if="item.key == 'text' || item.key == 'number'" class='item acea-row row-between-wrapper'>
class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<input v-if="item.key == 'text'" type="text" v-model="item.value" <input v-if="item.key == 'text'" type="text" v-model="item.value" :placeholder="'请填写'+item.title"
:placeholder="'请填写'+item.title" placeholder-class='placeholder' /> placeholder-class='placeholder' />
<input v-if="item.key == 'number'" type="number" v-model="item.value" <input v-if="item.key == 'number'" type="number" v-model="item.value" :placeholder="'请填写'+item.title"
:placeholder="'请填写'+item.title" placeholder-class='placeholder' /> placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view v-if="item.key == 'date'" class='item acea-row row-between-wrapper'> <view v-if="item.key == 'date'" class='item acea-row row-between-wrapper'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<picker mode="date" :value="item.value" start="1970-01-01" @change="bindDateChange"> <picker mode="date" :value="item.value" start="1970-01-01" @change="bindDateChange">
<input type="text" @click="getTime(index)" disabled v-model="item.value" <input type="text" @click="getTime(index)" disabled v-model="item.value" placeholder="请选择日期"
placeholder="请选择日期" placeholder-class='placeholder' /> placeholder-class='placeholder' />
</picker> </picker>
</view> </view>
</view> </view>
@ -244,16 +237,16 @@
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class='discount'> <view class='discount'>
<picker mode="time" :value="item.value" start="1970-01-01" @change="bindDateChange"> <picker mode="time" :value="item.value" start="1970-01-01" @change="bindDateChange">
<input type="text" @click="getTime(index)" disabled v-model="item.value" <input type="text" @click="getTime(index)" disabled v-model="item.value" placeholder="请选择时间"
placeholder="请选择时间" placeholder-class='placeholder' /> placeholder-class='placeholder' />
</picker> </picker>
</view> </view>
</view> </view>
<view v-if="item.key == 'image'" class='item'> <view v-if="item.key == 'image'" class='item'>
<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view> <view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
<view class="upload"> <view class="upload">
<view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn" <view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn" :data-index="indexn"
:data-index="indexn" @click="getPhotoClickIdx"> @click="getPhotoClickIdx">
<image :src="itemn"></image> <image :src="itemn"></image>
<text class="iconfont icon-guanbi4" @click.stop="DelPic(item,indexn)"></text> <text class="iconfont icon-guanbi4" @click.stop="DelPic(item,indexn)"></text>
</view> </view>
@ -282,15 +275,13 @@
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view><text class="item-require">*</text>收货人姓名</view> <view><text class="item-require">*</text>收货人姓名</view>
<view class='discount'> <view class='discount'>
<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名" <input type="text" v-model="post.real_name" placeholder="请填写收货人姓名" placeholder-class='placeholder' />
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view><text class="item-require">*</text>收货人电话</view> <view><text class="item-require">*</text>收货人电话</view>
<view class='discount'> <view class='discount'>
<input type="number" v-model="post.phone" placeholder="请填写收货人电话" <input type="number" v-model="post.phone" placeholder="请填写收货人电话" placeholder-class='placeholder' />
placeholder-class='placeholder' />
</view> </view>
</view> </view>
</form> </form>
@ -347,8 +338,7 @@
<view>店铺优惠金额：</view> <view>店铺优惠金额：</view>
<view class='money'>-￥{{coupon_price}}</view> <view class='money'>-￥{{coupon_price}}</view>
</view> </view>
<view class='item acea-row row-between-wrapper' <view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0">
v-if="open_integral && userInfo.integral>0 && order_type == 0">
<view>积分抵扣：</view> <view>积分抵扣：</view>
<view class='money'> <view class='money'>
<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text> <text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
@ -384,7 +374,7 @@
<view class="footer_count"> <view class="footer_count">
<view> <view>
合计: 合计:
<text class='pColor' v-if="cartArr[4].payStatus == 1" >￥0.00</text> <text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text>
<text class='pColor' v-else>￥{{totalPrice }}</text> <text class='pColor' v-else>￥{{totalPrice }}</text>
</view> </view>
<view style="font-size: 14px;color: #F84221;" v-if="cartArr[4].payStatus == 1"> <view style="font-size: 14px;color: #F84221;" v-if="cartArr[4].payStatus == 1">
@ -401,8 +391,8 @@
</view> </view>
<block v-if="coupon.status"> <block v-if="coupon.status">
<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'" <couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'"
@ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon" :openType='openType' @ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon" :openType='openType' @ChangCoupons="ChangCoupons"
@ChangCoupons="ChangCoupons" :coupon_amount='coupon_amount' :coupon_number='coupon_number'> :coupon_amount='coupon_amount' :coupon_number='coupon_number'>
</couponListWindow> </couponListWindow>
</block> </block>
<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address' <addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address'
@ -410,8 +400,8 @@
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing> <addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<block v-if="isShowBox"> <block v-if="isShowBox">
<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj" <checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj" :radioList="radioList"
:radioList="radioList" @close="boxClose" @confirmBtn="getData"> @close="boxClose" @confirmBtn="getData">
</checkDelivery> </checkDelivery>
</block> </block>
<!--优惠明细弹窗--> <!--优惠明细弹窗-->
@ -533,7 +523,7 @@
value: 'offline', value: 'offline',
title: '线下支付', title: '线下支付',
payStatus: 2, payStatus: 2,
},{ }, {
"name": "先货后款", "name": "先货后款",
"icon": "tan-a-lujing17324", "icon": "tan-a-lujing17324",
value: 'creditBuy', value: 'creditBuy',
@ -653,9 +643,9 @@
order_key: '', order_key: '',
is_take: '', is_take: '',
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
product_type:'', product_type: '',
interest_rate:'',//利率 interest_rate: '', //利率
settle_cycle:'',// 周期 settle_cycle: '', // 周期
}; };
}, },
computed: { computed: {
@ -673,7 +663,7 @@
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {
this.product_type=options.product_type this.product_type = options.product_type
this.seckillId = options.seckillId this.seckillId = options.seckillId
// #ifdef H5 // #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
@ -1077,12 +1067,12 @@
that.allow_address = res.data.allow_address that.allow_address = res.data.allow_address
that.deliveryName = res.data.order_model == 0 ? '快递配送' : '虚拟发货' that.deliveryName = res.data.order_model == 0 ? '快递配送' : '虚拟发货'
that.order_key = res.data.key that.order_key = res.data.key
that.interest_rate = res.data.order[0].interest_rate that.cartArr[4].title =
that.settle_cycle = res.data.order[0].settle_cycle `结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
console.log(that.settle_cycle); console.log(that.settle_cycle);
if(res.data.order[0].credit_buy == 1){ if (res.data.order[0].credit_buy == 1) {
this.cartArr[4].payStatus = 1 this.cartArr[4].payStatus = 1
}else{ } else {
this.cartArr[4].payStatus = 0 this.cartArr[4].payStatus = 0
} }
@ -1122,7 +1112,7 @@
phone: res.data.phone phone: res.data.phone
} }
console.log(that.addressId); console.log(that.addressId);
this.$nextTick(()=>{ this.$nextTick(() => {
this.getConfirm(that.addressId); this.getConfirm(that.addressId);
}) })
}) })
@ -1211,7 +1201,8 @@
callback_key = res.data.result.pay_key, callback_key = res.data.result.pay_key,
jsConfig = res.data.result.config, jsConfig = res.data.result.config,
goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message, goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message,
goPagesOrder='/pages/order_details/stay?order_id=' + orderId+'&credit_buy=1&product_type='+that.product_type ; goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&product_type=' + that
.product_type;
that.orderPay = true; that.orderPay = true;
uni.hideLoading(); uni.hideLoading();
switch (status) { switch (status) {

8
pages/users/order_list/index.vue
View File

@ -144,8 +144,8 @@
<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额 <view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
<text class='money p-color'>￥{{item.pay_price}}</text> <text class='money p-color'>￥{{item.pay_price}}</text>
</view> </view>
<view class="totalPrice" > <view class="totalPrice" v-if="product_type == 98">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.pay_price}} 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
</view> </view>
<view class='bottom acea-row row-right row-middle'> <view class='bottom acea-row row-right row-middle'>
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'> <view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
@ -673,9 +673,9 @@
}).then(res => { }).then(res => {
console.log(res); console.log(res);
that.isReady = true; that.isReady = true;
let list = res.data.list || []; let list = res.data.return || [];
let loadend = list.length < that.limit; let loadend = list.length < that.limit;
// console.log(that.orderList) console.log(that.orderList)
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
.orderList); .orderList);
that.$set(that, 'orderList', that.orderList); that.$set(that, 'orderList', that.orderList);

BIN
static/images/daoru.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB