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-11 16:08:44 +08:00
parent 1231351d29
commit 893ca1ed81
13 changed files with 456 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -9,7 +9,7 @@
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// #ifdef APP-PLUS // #ifdef APP-PLUS
var jpushModule = uni.requireNativePlugin("JG-JPush"); let jpushModule = uni.requireNativePlugin("JG-JPush");
// #endif // #endif
import { import {
checkLogin checkLogin

2
pages.json
View File

@ -982,7 +982,7 @@
"path": "plant_release/index", "path": "plant_release/index",
"style": { "style": {
"navigationBarTitleText": "内容发布", "navigationBarTitleText": "内容发布",
"enablePullDownRefresh":true "enablePullDownRefresh": false
} }
}, },
{ {

400
pages/admin/order/index.vue
View File

@ -77,54 +77,47 @@
</view> </view>
</view> </view>
</view> </view>
<view class="public_footer"> <view class="public_footer" v-if="this.type_id == 12">
<view class="footer_top"> <view class="footer_top">
<image src="@/static/images/jiankong.png"></image> <image src="@/static/images/jiankong.png"></image>
<text>订单监控</text> <text>订单监控</text>
</view> </view>
<view class="footer_bon"> <view class="list">
<view class="bon_top"> <view class="item" v-for="(item, index) in OrderList" :key="index">
<view class="public_img"> <view class="order-num acea-row row-middle">
图 订单号：{{ item.order_sn }}
</view> <text class="time">下单时间：{{ item.create_time }}</text>
<view > </view>
<view class="text_top"> <view class="pos-order-goods" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)">
<view class="text"> <view class="goods">
啊十分大师傅但是发sdfsfasfsfs <view class="acea-row row-between-wrapper">
</view> <view class="picTxt acea-row row-between-wrapper">
<view class="monry"> <view class="pictrue">
$ 100.00 <image :src="val.cart_info.product.image" />
</view> </view>
</view> <view class="text acea-row row-between row-column">
<view class="text_order"> <view class="info ">
是的方法 {{ val.cart_info.product.store_name }}
</view> </view>
</view> <view class="attr" v-if="val.cart_info.productAttr.sku">
</view> {{ val.cart_info.productAttr.sku }}
<view class="bon_bon"> </view>
<view class="order"> </view>
采购数量 </view>
<view class="txt"> <view class="money">
sdfa <view class="x-money">￥{{ val.total_price }}</view>
</view> <view class="x-money">采购数量：{{ val.product_num }}</view>
</view> <view class="x-money">已售数量：{{ val.sales_volume }}</view>
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;"> <view class="num">库存量{{ val.product_num - val.sales_volume }}</view>
已售数量 </view>
<view class="txt"> </view>
sdfa </view>
</view> </view>
</view> </view>
<view class="order"> </view>
库存数量 </view>
<view class="txt"> <button v-if="this.type_id == 12" class="footer-bnt" @click="navigator()">查看更多 ></button>
sdfa <!-- <view class="public-wrapper">
</view>
</view>
</view>
</view>
</view>
<button class="footer-bnt" @click="navigator()">查看更多 ></button>
<!-- <view class="public-wrapper">
<navigator class="item" :url="`/pages/admin/order/monitor?merId=${mer_id}`" <navigator class="item" :url="`/pages/admin/order/monitor?merId=${mer_id}`"
hover-class="none"> hover-class="none">
<view class="num">订单监控</view> <view class="num">订单监控</view>
@ -136,7 +129,7 @@
</template> </template>
<script> <script>
import { getStatisticsInfo, getStatisticsMonth, orderStatistics, orderPrice } from "@/api/admin"; import { getStatisticsInfo, getStatisticsMonth, orderStatistics, orderPrice, purchaseOrder } from "@/api/admin";
import Loading from '@/components/Loading/index.vue' import Loading from '@/components/Loading/index.vue'
export default { export default {
name: 'adminOrder', name: 'adminOrder',
@ -152,22 +145,28 @@
month: {} month: {}
}, },
list: [], list: [],
OrderList: [], //订单数组
where: { where: {
page: 1, page: 1,
limit: 15, limit: 10,
status: 1,
keyword: '',
product_type: '' product_type: ''
}, },
loaded: false, loaded: false,
loading: false, loading: false,
mer_id: '', mer_id: '',
type_id: '', //店铺类型
} }
}, },
onLoad(options) { onLoad(options) {
this.type_id = options.type_id
this.where.product_type = options.product_type ?? 0 this.where.product_type = options.product_type ?? 0
this.mer_id = options.mer_id this.mer_id = options.mer_id
options.product_type ? uni.setStorageSync("PRODUCT_TYPE", 98) : uni.removeStorageSync("PRODUCT_TYPE"); options.product_type ? uni.setStorageSync("PRODUCT_TYPE", 98) : uni.removeStorageSync("PRODUCT_TYPE");
this.getOrderStatistics(this.mer_id); this.getOrderStatistics(this.mer_id);
this.getList(this.mer_id) this.getList(this.mer_id)
this.purchaseOrderList(this.mer_id)
}, },
methods: { methods: {
getIndex: function() { getIndex: function() {
@ -218,11 +217,23 @@
} }
); );
}, },
navigator(){ toDetail(item) {
uni.navigateTo({ uni.navigateTo({
url:`/pages/admin/order/monitor?merId=${this.mer_id}` url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
}) })
} },
navigator() {
uni.navigateTo({
url: `/pages/admin/order/monitor?merId=${this.mer_id}`
})
},
purchaseOrderList(mer_id) {
this.where.limit = 2
purchaseOrder(this.where, mer_id).then(res => {
console.log(res);
this.OrderList = res.data
})
}
}, },
onReachBottom() { onReachBottom() {
this.getList(this.mer_id) this.getList(this.mer_id)
@ -230,7 +241,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.popupn { .popupn {
position: fixed; position: fixed;
width: 100%; width: 100%;
@ -365,13 +376,14 @@
background-color: #fff; background-color: #fff;
border-radius: 10upx; border-radius: 10upx;
padding-top: 25upx; padding-top: 25upx;
.item{
.num{ .item {
display: flex; .num {
justify-content: flex-start; display: flex;
align-items: center; justify-content: flex-start;
} align-items: center;
} }
}
} }
.public-wrapper .nav { .public-wrapper .nav {
@ -405,90 +417,194 @@
border-bottom: 1px solid #f7f7f7; border-bottom: 1px solid #f7f7f7;
height: 70upx; height: 70upx;
font-size: 24upx; font-size: 24upx;
} }
.public-wrapper .conter .item .turnover { .public-wrapper .conter .item .turnover {
color: #d84242; color: #d84242;
} }
.public_footer{
width: 90%; .public_footer {
margin: auto; width: 90%;
.footer_top{ margin: auto;
display: flex;
align-items: center; .footer_top {
margin: 16px 0 16px 0; display: flex;
image{ align-items: center;
width: 22px; margin: 16px 0 16px 0;
height: 22px;
margin-right: 5px; image {
} width: 22px;
} height: 22px;
.footer_bon{ margin-right: 5px;
width: 100%; }
border-radius: 8px; }
background-color: #fff;
padding-bottom: 10px; .list {
margin-bottom: 10px; margin-top: 20upx;
.bon_top{ margin-bottom: 20px;
display: flex;
justify-content: flex-start; .item {
align-items: center; background-color: #fff;
.public_img{ width: 100%;
width: 60px; position: relative;
height: 60px; margin-top: 20px;
margin: 12px;
} .item-status {
.text_top{ position: absolute;
display: flex; top: 14rpx;
justify-content: flex-start; right: 20rpx;
align-items: center;
margin: 3px 0 3px 0; .iconfont {
.text{ font-size: 98rpx;
width: 180px; color: #CCCCCC;
background-color: #2291f8;
overflow: hidden; &.on {
white-space:nowrap; color: #FFE3BC;
text-overflow:ellipsis; }
} }
.monry{ }
margin-left: 20px;
color: #F84221; .order-num {
} height: 124upx;
} border-bottom: 1px solid #eee;
} font-size: 30upx;
.bon_bon{ font-weight: bold;
width: 90%; color: #282828;
height: 66px; padding: 0 30upx;
background: #F5F5F5; position: relative;
border-radius: 4px 4px 4px 4px;
display: flex; .time {
justify-content: center; font-size: 26upx;
align-items: center; font-weight: normal;
text-align: center; color: #999;
margin: auto; margin-top: -40upx;
margin-bottom: 10px; }
.order{ }
width: 120px;
.txt{ .pos-order-goods {
margin-top: 5px; padding: 0 30upx;
} background-color: #fff;
}
} .goods {
} padding-top: 20rpx;
overflow: hidden;
border-top: 1px dashed #e5e5e5;
.uncancell {
color: #999999;
}
.picTxt {
width: 450upx;
.pictrue {
width: 130upx;
height: 130upx;
image {
width: 100%;
height: 100%;
border-radius: 6upx;
}
}
.text {
flex-direction: column;
width: 150px;
.info {
font-size: 28upx;
color: #282828;
&.refund-info {
width: 460upx;
}
}
.refund-y-money {
margin-top: 16rpx;
font-size: 26rpx;
}
.attr {
margin-top: 5rpx;
font-size: 24upx;
color: #999;
}
}
}
.money {
width: 164upx;
text-align: right;
font-size: 28upx;
&.refund-money {
width: auto;
position: relative;
top: -50rpx;
.num {
color: #999999;
}
}
.refund-num {
font-size: 24rpx;
color: #282828;
}
.num {
color: #ff9600;
margin: 5upx 0;
}
.x-money {
color: #282828;
}
.y-money {
color: #999;
text-decoration: line-through;
}
}
.refund_num {
display: inline-block;
margin-left: 10rpx;
}
}
.cancellate {
font-size: 24rpx;
float: right;
margin-top: 10rpx;
text {
margin-left: 26rpx;
}
}
.cancelled {
color: #FF9600;
}
}
}
}
} }
.footer-bnt{
margin-top: 20px; .footer-bnt {
width: 100px; width: 100px;
height: 40px; height: 40px;
border-radius: 15px; border-radius: 15px;
margin: auto; margin: auto;
line-height: 40px; line-height: 40px;
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
background-color: #f5f5f5; background-color: #f5f5f5;
color: #999999; color: #999999;
font-size: 13px font-size: 13px
} }
</style> </style>

2
pages/admin/order/monitor.vue
View File

@ -185,7 +185,7 @@
} }
.pos-order-list .list { .pos-order-list .list {
margin-top: 210upx; margin-top: 100upx;
} }
.pos-order-list .list .item { .pos-order-list .list .item {

2
pages/admin/orderDetail/index.vue
View File

@ -86,7 +86,7 @@
</view> </view>
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>支付方式：</view> <view>支付方式：</view>
<view class="conter">{{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }}</view> <view class="conter">{{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "先货后款" }}</view>
</view> </view>
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>买家留言：</view> <view>买家留言：</view>

16
pages/admin/orderList/index.vue
View File

@ -265,11 +265,17 @@
id:id, id:id,
type:number type:number
} }
this.$nextTick(()=>{ if(number == 1){
this.where.status = 2; this.$nextTick(()=>{
delete this.where.is_verify; this.where.status = 2;
this.init(); delete this.where.is_verify;
}) this.init();
})
}else if(number == 2){
uni.navigateTo({
url:`/pages/admin/orderList/index?types=1&merId=${this.merId}`
})
}
postconfirm(this.merId,data).then(res=>{ postconfirm(this.merId,data).then(res=>{
console.log(res); console.log(res);
}) })

6
pages/gather/gather.vue
View File

@ -13,7 +13,7 @@
<text class="text">在售管理</text> <text class="text">在售管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98`)"> @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
<text class="text">财务管理</text> <text class="text">财务管理</text>
</view> </view>
@ -102,7 +102,7 @@
</image> </image>
<text class="text">订单核销</text> <text class="text">订单核销</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)"> <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image> </image>
<text class="text">订单管理</text> <text class="text">订单管理</text>
@ -173,7 +173,7 @@
</image> </image>
<text class="text">订单核销</text> <text class="text">订单核销</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)"> <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image> </image>
<text class="text">订单管理</text> <text class="text">订单管理</text>

177
pages/order_details/stay.vue
View File

@ -3,12 +3,13 @@
<view class='order-details'> <view class='order-details'>
<!-- 给header上与data上加on为退款订单--> <!-- 给header上与data上加on为退款订单-->
<view v-if="orderInfo.orderList && orderInfo.orderList[0].activity_type != 2"> <view v-if="orderInfo.orderList && orderInfo.orderList[0].activity_type != 2">
<view class='header acea-row row-middle'> <view class='header acea-row row-middle' v-if="this.be_overdue">
<view class='pictrue'> <view class='pictrue'>
<image :src="imgUrl+'/static/order_1.gif'"></image> <image :src="imgUrl+'/static/order_1.gif'"></image>
</view> </view>
<view class='data'> <view class='data'>
<view class='state'>请在{{orderInfo.cancel_time}}前完成支付!</view> <view class='state'>请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</view>
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view> <view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
</view> </view>
</view> </view>
@ -166,13 +167,15 @@
</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="orderInfo.orderList[0].merchant.settle_cycle">先货后款 : ￥{{orderInfo.pay_price}}</view> <view class='conter' style="color: black;" v-if="this.pay_type == 8">先货后款 实付: ￥<text style="color: #E93323;" >
{{orderInfo.pay_price}}
</text></view>
<view class='conter' style="color: black;" v-else>￥{{orderInfo.pay_price}}</view> <view class='conter' style="color: black;" v-else>￥{{orderInfo.pay_price}}</view>
<view class="conters" style="color: black;" v-if="orderInfo.orderList[0].merchant.settle_cycle"> <view class="conters" style="color: black;" v-if="this.pay_type == 8">
结算周期到期后付款 ￥{{orderInfo.interest.total_amount}} 结算周期到期后付款 ￥{{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="orderInfo.orderList[0].merchant.settle_cycle"> <view class="conters" v-if="this.pay_type == 8">
结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}% 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
</view> </view>
</view> </view>
@ -185,16 +188,18 @@
</view> </view>
</view> </view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment> <!-- <payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment> -->
<u-popup :show="show" bgColor='transparent' mode='center'> <u-popup :show="show" bgColor='transparent' mode='center'>
<view class="warp"> <view class="stybgc">
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image> <view class="warp">
<image src="@/static/images/yuqi.png" mode="widthFix"></image> <image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
</view> <image src="@/static/images/yuqi.png" mode="widthFix"></image>
<view class="textp"> </view>
<span>下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在xx天xx小时后计息。</span> <view class="textp">
<button class="shouhuobtn" @click="close">知道了</button> <span>下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在{{this.be_overdue}}天后计息。</span>
</view> <button class="shouhuobtn" @click="close">知道了</button>
</view>
</view>
</u-popup> </u-popup>
</view> </view>
</template> </template>
@ -266,6 +271,7 @@
], ],
pay_close: false, pay_close: false,
pay_order_id: '', pay_order_id: '',
pay_type:'',//是否为先货后款订单
totalPrice: '0', totalPrice: '0',
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权 isShowAuth: false, //是否隐藏授权
@ -276,7 +282,9 @@
}, },
show:false, show:false,
credit_buy:'', credit_buy:'',
product_type:0 product_type:0,
be_overdue:'',//逾期时间
be_overhours:'',//逾期小时
}; };
}, },
watch: { watch: {
@ -389,11 +397,15 @@
* *
*/ */
pay_open: function() { pay_open: function() {
this.pay_close = true; uni.navigateTo({
this.pay_order_id = this.orderInfo.group_order_id.toString(); url: '/pages/users/payment/payment?order_id=' + this.order_id + '&product_type=' + this.product_type
this.totalPrice = this.orderInfo.pay_price; });
console.log(this.pay_order_id); // this.pay_close = true;
console.log(this.totalPrice); // this.pay_order_id = this.orderInfo.group_order_id.toString();
// this.totalPrice = this.orderInfo.pay_price;
// console.log(this.pay_order_id);
// console.log(this.totalPrice);
}, },
/** /**
* 支付成功回调 * 支付成功回调
@ -451,7 +463,11 @@
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); this.pay_type=this.orderInfo.pay_type
if(this.orderInfo.interest.start_time){
this.moerTime(this.orderInfo.interest.start_time)
}
console.log(that.orderInfo.interest);
}).catch(err => { }).catch(err => {
// console.log(err) // console.log(err)
uni.hideLoading(); uni.hideLoading();
@ -498,6 +514,21 @@
} }
}); });
}, },
//计算是否逾期
moerTime(autoTime){
var date1 = (Date.parse(new Date()))/1000;
var date2 = (Date.parse(new Date(autoTime)))/1000;
var date3 = (date2- date1)*1000;
this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
this.be_overhours = Math.floor(leave1 / (3600 * 1000));
if(this.be_overdue == 0 || this.be_overdue < 0 ){
var date1 = (Date.parse(new Date()))/1000;
var date2 = (Date.parse(new Date(autoTime)))/1000;
var date3 = (date2- date1)*1000;
this.be_overdue =Math.floor(date3 / (24 * 3600 * 1000));
}
}
} }
} }
</script> </script>
@ -739,7 +770,6 @@
border-radius: 50rpx; border-radius: 50rpx;
color: #fff; color: #fff;
font-size: 27rpx; font-size: 27rpx;
z-index: 1;
} }
.bgColor{ .bgColor{
background-color: var(--view-theme); background-color: var(--view-theme);
@ -999,50 +1029,61 @@
bottom: 5px; bottom: 5px;
color: white; color: white;
} }
.warp {
margin: auto; .stybgc{
background-color: rgba(0, 0, 0,0.5);
.guanbi { width: 100vw;
position: absolute; height: 100vh;
right: 0px; position: relative;
z-index: 1; .warp {
width: 30px; position: absolute;
height: 30px; top:30vh;
} left: 30px;
}
.guanbi {
.textp { position: absolute;
width: 320px; right: 0px;
padding-bottom: 20px; z-index: 1;
position: absolute; width: 30px;
top: 110px; height: 30px;
border-radius: 10px; }
span { }
display: block;
width: 280px; .textp {
padding-top: 20px; position: absolute;
margin: auto; top: 44vh;
} left: 35px;
width: 320px;
.shouhuobtn { padding-bottom: 20px;
margin: auto; border-radius: 10px;
line-height: 54px; span {
margin-top: 30px; display: block;
width: 191px; width: 290px;
height: 54px; padding-top: 20px;
color: white; margin: auto;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); }
border-radius: 27px 27px 27px 27px;
} .shouhuobtn {
margin: auto;
.cle { line-height: 54px;
margin: auto; margin-top: 30px;
text-align: center; width: 191px;
margin-top: 15px; height: 54px;
height: 40px; color: white;
background-color: #FFFFFF; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
border-radius: 10px; border-radius: 27px 27px 27px 27px;
color: #999999; }
}
} .cle {
margin: auto;
text-align: center;
margin-top: 15px;
height: 40px;
background-color: #FFFFFF;
border-radius: 10px;
color: #999999;
}
}
}
</style> </style>

28
pages/product/basicSet.vue
View File

@ -54,7 +54,7 @@
<view class="street_bg"> <view class="street_bg">
<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view> <view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
<block v-if="images[2].img"> <block v-if="images[2].img">
<u--image :showLoading="true" :src="images[2].img" width="388px" height="210.53rpx" radius="4px" <u--image :showLoading="true" :src="images[2].img" width="360px" height="210.53rpx" radius="4px"
@click="delImg(2)"></u--image> @click="delImg(2)"></u--image>
</block> </block>
<view v-else class="street_img flex_a_c" @click="seleckImage(2)"> <view v-else class="street_img flex_a_c" @click="seleckImage(2)">
@ -132,14 +132,14 @@
</view> </view>
<view class="item_cell flex_a_c"> <view class="item_cell flex_a_c">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天"> <input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天" >
</view> </view>
<view class="remarks">*周期结算时间范围为:15~100 周期单位为:天</view> <view class="remarks">*周期结算时间范围为:15~90 周期单位为:天</view>
<view class="item_cell flex_a_c"> <view class="item_cell flex_a_c">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
<input type="number" v-model="interest_rate" placeholder="请输入 /利率单位为: %"> <input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
</view> </view>
<view class="remarks">*利率结算范围为:0.035 ~ 0.01 利率单位为:%</view> <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view>
<!-- <view class="item_cell"> <!-- <view class="item_cell">
<view class="if_btn flex_a_c_j_sb"> <view class="if_btn flex_a_c_j_sb">
<text class="sub_title">是否开启商户：</text> <text class="sub_title">是否开启商户：</text>
@ -239,7 +239,7 @@
mer_address: '', mer_address: '',
id: '', id: '',
mer_certificate: '', mer_certificate: '',
credit_buy:0,//开启信用购 credit_buy:false,//开启信用购
interest_rate:'',//利率 interest_rate:'',//利率
settle_cycle:'',//周期 settle_cycle:'',//周期
} }
@ -275,7 +275,7 @@
this.servicePhone = res.data.service_phone this.servicePhone = res.data.service_phone
this.mer_address = res.data.mer_address this.mer_address = res.data.mer_address
this.merState = res.data.mer_state === 1 ? true : false this.merState = res.data.mer_state === 1 ? true : false
this.credit_buy = res.data.credit_buy this.credit_buy = res.data.credit_buy === 1 ?true : false
if( res.data.settle_cycle == 0){ if( res.data.settle_cycle == 0){
this.settle_cycle='' this.settle_cycle=''
}else{ }else{
@ -297,6 +297,7 @@
}, },
//开启信用购 //开启信用购
change(e){ change(e){
this.credit_buy = e
console.log(e); console.log(e);
}, },
// 上传店铺背景 // 上传店铺背景
@ -320,6 +321,16 @@
}) })
}, },
submitData() { submitData() {
if(this.settle_cycle<15){
this.settle_cycle=15
}else if(this.settle_cycle > 90){
this.settle_cycle=90
}
if(this.interest_rate<0.01){
this.interest_rate=0.01
}else if(this.interest_rate > 0.1){
this.interest_rate=0.1
}
let data = { let data = {
mer_banner: this.images[0].img, mer_banner: this.images[0].img,
mer_avatar: this.images[1].img, mer_avatar: this.images[1].img,
@ -361,8 +372,9 @@
}) })
}, },
selfLocation() { selfLocation() {
console.log('123');
uni.getLocation({ uni.getLocation({
type: 'gcj02', type: 'wgs84',
success: (res) => { success: (res) => {
this.latitude = res.latitude.toString(); this.latitude = res.latitude.toString();
this.longitude = res.longitude.toString(); this.longitude = res.longitude.toString();

23
pages/users/online_warehousing/index.vue
View File

@ -3,7 +3,13 @@
<view class="top"> <view class="top">
<!-- --> <!-- -->
</view> </view>
<view class='list'> <view class="bgc_img" v-if="!this.shopList">
<image src="@/static/images/empty-box.png" mode="widthFix"></image>
<view class="txt">
暂无商品订单~
</view>
</view>
<view class='list' v-else>
<block> <block>
<view class='item' v-for="(item,index) in shopList" :key="index"> <view class='item' v-for="(item,index) in shopList" :key="index">
<view v-for="(items,index) in item.orderProduct" :key="index"> <view v-for="(items,index) in item.orderProduct" :key="index">
@ -79,7 +85,7 @@
where: { where: {
page: 1, page: 1,
limit: 10, limit: 10,
status: 2, status: 20,
product_type: 98 product_type: 98
}, },
data: { data: {
@ -149,6 +155,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.top { .top {
background-color: red; background-color: red;
height: 55px; height: 55px;
@ -159,7 +166,17 @@
padding-top: 10px !important; padding-top: 10px !important;
} }
} }
.bgc_img{
position: absolute;
top: 30vh;
left: 10vw;
image{
width: 300px;
}
.txt{
text-align: center;
}
}
.list { .list {
width: 690rpx; width: 690rpx;
margin: 14rpx auto 0 auto; margin: 14rpx auto 0 auto;

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

@ -186,8 +186,7 @@
<view class="price" v-if="item.isTake == 1"><text>￥</text>{{ item.order.org_price}}</view> <view class="price" v-if="item.isTake == 1"><text>￥</text>{{ item.order.org_price}}</view>
</view> </view>
<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>

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

@ -249,7 +249,6 @@
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@click.stop='applyInvoice(item.order_id)'>申请开票</view> @click.stop='applyInvoice(item.order_id)'>申请开票</view>
<block v-if="item.status == 0 || item.status == 9 || item.status == -1"> <block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view> <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block> </block>
<block v-if="item.status == 1"> <block v-if="item.status == 1">
@ -259,12 +258,7 @@
<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view> <view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
</block> </block>
<block v-if="item.status == 2"> <block v-if="item.status == 2">
<navigator v-if="community_status == 1 && !item.community_id"
:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
class='bnt colorBnt' hover-class="none">
<text class="iconfont icon-fabu"></text>
发布种草
</navigator>
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价 <view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
</view> </view>
</block> </block>
@ -543,6 +537,7 @@
* *
*/ */
goPay: function(pay_price, order_id) { goPay: function(pay_price, order_id) {
console.log(order_id);
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/payment/payment?order_id=' + order_id + '&product_type=' + this.product_type url: '/pages/users/payment/payment?order_id=' + order_id + '&product_type=' + this.product_type
}); });
@ -1180,4 +1175,5 @@
color: #999999; color: #999999;
} }
} }
</style> </style>

34
pages/users/payment/payment.vue
View File

@ -47,12 +47,13 @@
<view class='conter'>￥ {{couponData.orderList[0].pay_price}}</view> <view class='conter'>￥ {{couponData.orderList[0].pay_price}}</view>
</view> </view>
</view> </view>
<view class="settel"> <view class="settel" v-if="this.be_overdue == 0 || this.be_overdue < 0">
<view class='settel-t'> <view class='settel-t'>
<view>利息合计:</view> <view>利息合计:</view>
<view class="conter"> <view class="conter">
<view class='con_text'>￥ {{couponData.orderList[0].pay_price}}</view> <view class='con_text'>￥ {{couponData.orderList[0].pay_price}}</view>
<view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">（已逾期1天)</view> <view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">
已逾期{{this.be_overday}}天</view>
</view> </view>
</view> </view>
@ -64,7 +65,7 @@
<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>￥{{couponData.orderList[0].pay_price}}</text> <text class='pColor' v-else>￥{{couponData.orderList[0].pay_price}}</text>
</view> </view>
<view style="font-size: 14px;color: #F84221;" v-if="couponData.pay_type == 8"> <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0">
可结算周期到期后再付款￥{{totalPrice}} 可结算周期到期后再付款￥{{totalPrice}}
</view> </view>
</view> </view>
@ -139,15 +140,19 @@
], ],
order_id: '', order_id: '',
product_type: 0, product_type: 0,
mer_id:'' mer_id:'',
be_overdue:'',//逾期时间
be_overday:'',//逾期天数
}; };
}, },
onLoad(options) { onLoad(options) {
this.order_id = options.order_id this.order_id = options.order_id
if (options.product_type) { this.product_type = options.product_type } if (options.product_type) { this.product_type = options.product_type }
console.log(this.product_type); console.log(this.product_type);
this.getOrderInfo() this.$nextTick(()=>{
this.getUserInfo() this.getOrderInfo()
this.getUserInfo()
})
}, },
methods: { methods: {
payItem: function(e) { payItem: function(e) {
@ -170,7 +175,9 @@
getOrderInfo() { getOrderInfo() {
groupOrderDetail(this.order_id, this.product_type).then(res => { groupOrderDetail(this.order_id, this.product_type).then(res => {
this.couponData = res.data this.couponData = res.data
console.log(res); this.$nextTick(()=>{
this.moerTime(this.couponData.interest.start_time)
})
}) })
}, },
SubOrder() { SubOrder() {
@ -213,6 +220,19 @@
}) })
} }
},
//计算是否逾期
moerTime(autoTime){
var date1 = (Date.parse(new Date()))/1000;
var date2 = (Date.parse(new Date(autoTime)))/1000;
var date3 = (date2- date1)*1000;
this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
if(this.be_overdue == 0 || this.be_overdue < 0 ){
var date1 = (Date.parse(new Date()))/1000;
var date2 = (Date.parse(new Date(autoTime)))/1000;
var date3 = (date2- date1)*1000;
this.be_overday =Math.floor(date3 / (24 * 3600 * 1000));
}
} }
} }