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-15 17:27:06 +08:00
parent cc5ff53177
commit 5ce6dd0e9e
18 changed files with 401 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/orderGoods/index.vue
View File

@ -73,7 +73,7 @@
<view class="right-btn-box">
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && evaluate !==2 && orderData.refund_status" @click.stop="refund(item)">申请退款</view>
<view class="btn-item" v-if="item.is_reply == 0 && evaluate !==2 && item.is_refund < 1" @click.stop="refund(item)">申请退款</view>
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
</view>

2
manifest.json
View File

@ -3,7 +3,7 @@
"appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "1.0.18",
"versionCode" : 141,
"versionCode" : 142,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

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

@ -83,41 +83,43 @@
<text>订单监控</text>
</view>
<view class="footer_bon" v-for="(item,index) in OrderList" :key="index">
<view class="bon_top" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)">
<view class="public_img">
<image class="public_img" :src="val.cart_info.product.image" mode=""></image>
</view>
<view>
<view class="text_top">
<view class="text">
{{ val.cart_info.product.store_name }}
<view class="" v-for="(val, key) in item.orderProduct">
<view class="bon_top" :key="key" @click="toDetail(item)">
<view class="public_img">
<image class="public_img" :src="val.cart_info.product.image" mode=""></image>
</view>
<view>
<view class="text_top">
<view class="text">
{{ val.cart_info.product.store_name }}
</view>
<view class="monry">
￥{{ val.total_price }}
</view>
</view>
<view class="monry">
￥{{ val.total_price }}
<view class="text_order">
订单号: {{ item.order_sn }}
</view>
</view>
<view class="text_order">
订单号: {{ item.order_sn }}
</view>
</view>
</view>
<view class="bon_bon" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)">
<view class="order">
采购数量
<view class="txt">
{{ val.product_num }}
<view class="bon_bon" :key="key" @click="toDetail(item)">
<view class="order">
采购数量
<view class="txt">
{{ val.product_num }}
</view>
</view>
</view>
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
已售数量
<view class="txt">
{{ val.sales_volume }}
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
已售数量
<view class="txt">
{{ val.sales_volume }}
</view>
</view>
</view>
<view class="order">
库存数量
<view class="txt">
{{ val.product_num - val.sales_volume }}
<view class="order">
库存数量
<view class="txt">
{{ val.product_num - val.sales_volume }}
</view>
</view>
</view>
</view>
@ -434,7 +436,7 @@
}
.public_footer {
width: 90%;
width: 90vw;
margin: auto;
.footer_top {
@ -474,14 +476,14 @@
margin: 3px 0 3px 3px;
.text {
width: 180px;
width: 140px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.monry {
margin-left: 20px;
margin-left: 10px;
color: #F84221;
}
}

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

@ -11,41 +11,43 @@
</view>
<view class="pubilc_footer">
<view class="footer_bon" v-for="(item,index) in list" :key="index">
<view class="bon_top" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)">
<view class="public_img">
<image class="public_img" :src="val.cart_info.product.image" mode=""></image>
</view>
<view>
<view class="text_top">
<view class="text">
{{ val.cart_info.product.store_name }}
<view class="" v-for="(val, key) in item.orderProduct">
<view class="bon_top" :key="key" @click="toDetail(item)">
<view class="public_img">
<image class="public_img" :src="val.cart_info.product.image" mode=""></image>
</view>
<view>
<view class="text_top">
<view class="text">
{{ val.cart_info.product.store_name }}
</view>
<view class="monry">
￥{{ val.total_price }}
</view>
</view>
<view class="monry">
￥{{ val.total_price }}
<view class="text_order">
订单号: {{ item.order_sn }}
</view>
</view>
<view class="text_order">
订单号: {{ item.order_sn }}
</view>
</view>
</view>
<view class="bon_bon" v-for="(val, key) in item.orderProduct" :key="key" @click="toDetail(item)">
<view class="order">
采购数量
<view class="txt">
{{ val.product_num }}
<view class="bon_bon" :key="key" @click="toDetail(item)">
<view class="order">
采购数量
<view class="txt">
{{ val.product_num }}
</view>
</view>
</view>
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
已售数量
<view class="txt">
{{ val.sales_volume }}
<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
已售数量
<view class="txt">
{{ val.sales_volume }}
</view>
</view>
</view>
<view class="order">
库存数量
<view class="txt">
{{ val.product_num - val.sales_volume }}
<view class="order">
库存数量
<view class="txt">
{{ val.product_num - val.sales_volume }}
</view>
</view>
</view>
</view>

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

@ -148,10 +148,10 @@
<view style="height:120upx;"></view>
<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
<view class="more"></view>
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(item.group_order_id,1)">
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(order_id,1)">
同意
</view>
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(item.group_order_id,2)">
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(order_id,2)">
拒绝
</view>
<view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0">
@ -191,7 +191,8 @@
setAdminOrderRemark,
setOfflinePay,
setOrderRefund,
orderCancellation
orderCancellation,
postconfirm
} from "@/api/admin";
import { isMoney } from '@/utils/validate.js'
import { HTTP_REQUEST_URL } from '@/config/app';
@ -231,12 +232,12 @@
},
onLoad: function(option) {
let self = this
this.order_id = option.id
this.mer_id = option.mer_id
this.goname = option.goname
this.getIndex();
self.order_id = option.id
self.mer_id = option.mer_id
self.goname = option.goname
self.getIndex();
// #ifdef H5
this.$nextTick(function() {
self.$nextTick(function() {
var clipboard = new ClipboardJS('.copy-data');
// var copybtn = document.getElementsByClassName("copy-data");
// var clipboard = new Clipboard(copybtn);
@ -263,17 +264,16 @@
}
if(number == 1){
this.$nextTick(()=>{
this.where.status = 2;
delete this.where.is_verify;
this.init();
uni.navigateTo({
url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}`
})
})
}else if(number == 2){
uni.navigateTo({
url:`/pages/admin/orderList/index?types=1&merId=${this.merId}`
url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}`
})
}
postconfirm(this.merId,data).then(res=>{
console.log(res);
postconfirm(this.mer_id,data).then(res=>{
})
},
more: function() {

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

@ -142,10 +142,10 @@
<span v-if="where.status <= 1">应</span>
<span v-else>已</span>
支付
<span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
<span class="money">￥0.00</span> (邮费 ¥{{ item.pay_postage}})
</view>
<view class="public-total" v-if="item.pay_type == 8 ">
共1件商品，结算周期到期后付款￥{{ item.pay_price }}
共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }}
</view>
<view class="operation acea-row row-between-wrapper">
<view class="more">
@ -317,6 +317,7 @@
that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1;
console.log(that.list);
},
err => {
that.$util.Tips({ title: err });

113
pages/nongKe/supply_chain/merchant.vue
View File

@ -67,7 +67,7 @@
</view>
</view>
</scroll-view>
<button class="btn" @click="addshopcart">确定</button>
<button class="btn" @click="addshopcart">确定</button>
</view>
</u-popup>
</view>
@ -270,36 +270,21 @@
},
//购物车增加
addCart(item, index) {
this.goods[index].cart_num = this.goods[index].cart_num + 1
this.goods.numAdd = true
this.goodsLite = item
this.goodsindexL = index
},
subCart(item, index){
if( this.goods[index].cart_num == 0){
return
}else{
this.goods[index].cart_num = this.goods[index].cart_num - 1
this.goods.numAdd = true
this.goodsLite = item
this.goodsindexL = index
}
},
addshopcart() {
console.log(this.goodsLite);
console.log(this.goodsindexL);
let that = this
that.goods[index].cart_num = that.goods[index].cart_num + 1
that.goods.numAdd = true
that.goodsLite = item
that.goodsindexL = index
let q = {
is_new: 0,
product_id: that.goodsLite.product_id,
cart_num: that.goods[that.goodsindexL].cart_num,
product_attr_unique: that.goodsLite.unique,
product_attr_unique: that.goodsLite.unique,
// source: this.source,
product_type: 98,
spread_id: ''
};
postCartAdd(q).then(res => {
this.show = false
that.$util.Tips({
title: "添加购物车成功",
});
@ -310,6 +295,65 @@
title: res
});
});
},
subCart(item, index) {
let that = this
if (that.goods[index].cart_num == 0) {
return
} else {
that.goods[index].cart_num = that.goods[index].cart_num - 1
that.goods.numAdd = true
that.goodsLite = item
that.goodsindexL = index
let q = {
is_new: 0,
product_id: that.goodsLite.product_id,
cart_num: that.goods[that.goodsindexL].cart_num,
product_attr_unique: that.goodsLite.unique,
// source: this.source,
product_type: 98,
spread_id: ''
};
postCartAdd(q).then(res => {
that.$util.Tips({
title: "添加购物车成功",
});
})
.catch(res => {
this.show = false
return that.$util.Tips({
title: res
});
});
}
},
addshopcart() {
console.log(this.goodsLite);
console.log(this.goodsindexL);
this.show = false
// let that = this
// let q = {
// is_new: 0,
// product_id: that.goodsLite.product_id,
// cart_num: that.goods[that.goodsindexL].cart_num,
// product_attr_unique: that.goodsLite.unique,
// // source: this.source,
// product_type: 98,
// spread_id: ''
// };
// postCartAdd(q).then(res => {
// this.show = false
// that.$util.Tips({
// title: "添加购物车成功",
// });
// })
// .catch(res => {
// this.show = false
// return that.$util.Tips({
// title: res
// });
// });
}
},
onReachBottom() {
@ -487,7 +531,7 @@
}
.scroll-Y {
height: 50vh;
height: 50vh;
width: 90%;
margin: auto;
@ -510,12 +554,15 @@
}
.text {
width: 300px;
width: 200px;
height: 60px;
float: left;
view {
height: 30px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text {
color: #F84221;
@ -552,19 +599,21 @@
color: #FFFFFF;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
}
.on {
background-color: #e3e3e3;
color: #dedede;
}
}
}
.btn{
width: 100%;
height: 50px;
background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
border-radius: 24px 24px 24px 24px;
line-height: 50px;
color: white;
}
.btn {
width: 100%;
height: 50px;
background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
border-radius: 24px 24px 24px 24px;
line-height: 50px;
color: white;
}
</style>

2
pages/nongKe/supply_chain/shopping_trolley.vue
View File

@ -569,7 +569,7 @@
})
if (selectValue.length > 0) {
uni.navigateTo({
url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=${this.type_id}`
url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=12`
});
} else {
return this.$util.Tips({

3
pages/order_details/index.vue
View File

@ -313,8 +313,7 @@
</block>
<block v-if="orderInfo.status == 3">
<view class='bnt cancel' @click="delOrder">删除订单</view>
<view class="bnt cancel" @click="allRefund"
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
<view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0">批量退款</view>
<view class='bnt b-color' @click="goOrderConfirm"
v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
再次购买</view>

14
pages/order_details/stay.vue
View File

@ -13,7 +13,7 @@
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
</view>
<view class='data' v-else>
<view class='state'>已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快前往完成支付!</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>
@ -195,8 +195,8 @@
<image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image>
</view>
<view class="conters" v-if="this.pay_type == 8 && orderInfo.interest !== null">
结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天
日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
结算周期:{{orderInfo.interest.settle_cycle}}天
日利率:{{orderInfo.interest.rate}}%
</view>
</view>
@ -216,10 +216,14 @@
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
<image src="@/static/images/yuqi.png" mode="widthFix"></image>
</view>
<view class="textp">
<view class="textp" v-if="!this.be_overday">
<span>下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在{{this.be_overdue}}天后计息。</span>
<button class="shouhuobtn" @click="close">知道了</button>
</view>
<view class="textp" v-else>
<span>下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。现已逾期{{this.be_overdue}}天,请及时完成支付</span>
<button class="shouhuobtn" @click="close">知道了</button>
</view>
</view>
</u-popup>
</view>
@ -1153,7 +1157,7 @@
.warp {
position: absolute;
top: 30vh;
top: 29vh;
left: 60px;
width: 70%;
image{

10
pages/order_pay_status/index.vue
View File

@ -135,15 +135,14 @@
this.order_type = options.order_type;
this.status = options.status || 0;
this.msg = options.msg || '';
if(options.product_type){
this.product_type=options.product_type
}
if (this.isLogin) {
this.refreshData();
} else {
this.isAuto = true;
this.isShowAuth = true
}
console.log(options);
},
methods: {
refreshData(){
@ -204,14 +203,15 @@
* 去订单详情页面
*/
goOrderDetails: function(e) {
console.log(this.product_type);
let that = this;
if (this.product_type == 98) {
uni.redirectTo({
uni.navigateTo({
url: `/pages/users/order_list/index?status=1&product_type=${this.product_type}`
})
} else {
uni.redirectTo({
url: '/pages/users/order_list/index?status=1'
uni.navigateTo({
url: '/pages/users/order_list/index?status=1&product_type=0'
})
}

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

@ -122,15 +122,18 @@
<h4 v-if="this.on_line==1">线下入库</h4>
<h4 v-else>线上入库</h4>
<view class="guige">
<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
</u-radio>
</u-radio-group>
<scroll-view scroll-y="true" class="scroll_y">
<view>
<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
</u-radio>
</u-radio-group>
</view>
</scroll-view>
</view>
<view class="shuru" v-if="this.on_line == 1">
数量: <input type="number" v-model="data.number" placeholder="请输入" >
数量: <input type="number" v-model="data.number" placeholder="请输入">
</view>
<view class="btn">
<button class="btn_l" @click="close()">取消</button>
@ -239,14 +242,19 @@
this.checkboxList1 = rowId
console.log(this.on_line);
if (this.checkboxList1.length == 1 && action == 0) {
// this.show = true
navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id,
product_id: this.data.product_id,
unique: this.data.unique,
});
} else if (this.checkboxList1.length == 1 && action == 1) {
this.show = true
this.data.product_id = this.checkboxList1[0].product_id
this.data.unique = this.checkboxList1[0].unique
console.log(this.data);
} else {
this.show = true
console.log(this.data);
}
if (action == 2) {
uni.navigateTo({
@ -283,12 +291,20 @@
}
if (this.on_line == 0) {
console.log('12');
navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id,
product_id: this.data.product_id,
unique: this.data.unique,
if (!this.data.product_id) {
this.show = false
this.$util.Tips({
title: '请选择规格'
})
} else {
navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id,
product_id: this.data.product_id,
unique: this.data.unique,
});
}
});
}
},
@ -336,10 +352,10 @@
productLstApi(mer_id, that.where).then(
res => {
that.loading = false;
that.loaded = res.data.list.length < that.where.limit;
that.productList.push.apply(that.productList, res.data.list);
that.where.page = that.where.page + 1;
},
error => {
that.$util.Tips({
@ -747,6 +763,10 @@
.guige {
margin: 10px 0 10px 20px;
.scroll_y {
max-height: 150px;
}
}
.guiges {

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

@ -5,7 +5,7 @@
<view class="search">
<view class="search-content acea-row row-middle">
<text class="iconfont icon-sousuo"></text>
<input v-model="where.keyword" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
<input v-model="where.store_name" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
@confirm="handleSearch" />
</view>
</view>
@ -20,7 +20,7 @@
<view class='list' v-else>
<block>
<view class='item' v-for="(item,index) in shopList" :key="index">
<view v-for="(items,index) in item.orderProduct" :key="index">
<view >
<view class='title acea-row row-between-wrapper'>
<view class="acea-row row-middle left-wrapper">
{{item.merchant.mer_name}}
@ -29,18 +29,30 @@
<view>
<view>
<block>
<view class='item-info acea-row row-between row-top'>
<view class="_order">
订单号: {{item.order_sn}}
</view>
<view class='item-info acea-row row-between row-top' v-for="(items,indexs) in item.orderProduct" :key="indexs">
<view class='pictrue'>
<image :src="item.orderProduct[index].cart_info.product.image">
<image :src="items.cart_info.product.image">
</image>
</view>
<view class='text acea-row row-between'>
<view class='name line2'>
<view class='text'>
<view class='_left'>
{{items.cart_info.product.store_name}}
<view class="">
{{items.cart_info.productAttr.sku}}
</view>
</view>
<view class='name line2'>￥{{items.cart_info.product.price}}</view>
<view class='name line2'>x {{items.product_num}}</view>
<view class="_right">
<view class='name'>￥{{items.cart_info.productAttr.price}}</view>
<view class='name'>x {{items.product_num}}</view>
</view>
<!-- <view class="totalfooter">
<view class='bnt b-color' v-if="items.is_imported == 0 && item.orderProduct.length > 1"
@click="importshop(items.order_id,items.product_id,items.product_sku)">
立即导入</view>
</view> -->
</view>
</view>
</block>
@ -48,14 +60,16 @@
</view>
<view class='totalPrice'>
共1件商品，总金额
<text class='money'>￥{{items.product_price}}</text>
<text class='money'>￥{{item.pay_price}}</text>
</view>
<view class="totalfooter">
<view class='bnt b-color' v-if="item.orderProduct[index]"
@click="importshop(item.order_id,item.orderProduct[index].product_id,item.orderProduct[index].cart_info.productAttr.product_sku)">
立即导入</view>
</view>
<view>
{{item.orderProduct[0].is_imported}}
</view>
<view class="totalfooter">
<view class='bnt b-color' v-if="items.is_imported == 0"
@click="importshop(items.order_id,items.product_id,items.product_sku)">
立即导入</view>
</view>
</view>
</view>
</block>
@ -65,7 +79,7 @@
<view class="popen">
<h4>{{title}}</h4>
<view class="shuru">
点击确定，商品管理
点击确定，返回商品管理
</view>
<view class="btn">
<button class="btn_l" @click="closeasd()">取消</button>
@ -100,7 +114,7 @@
limit: 10,
status: 20,
product_type: 98,
keyword: '',
store_name: '',
},
data: {
product_id: '',
@ -123,10 +137,15 @@
},
methods: {
handleSearch() {
this.loaded = false;
this.where.page = 1;
this.shopList = [];
this.getList();
let that = this
that.loaded = false;
that.where.page = 1;
that.shopList = [];
getOrderList(that.where, that.mer_id).then(res => {
console.log(res);
that.shopList = res.data.list
console.log(that.shopList);
})
},
getList: function() {
if (this.loading || this.loaded) return;
@ -152,9 +171,9 @@
},
close() {
this.show = false
},
closeasd:function(){
closeasd: function() {
this.show = false
getOrderList(this.where, this.mer_id).then(res => {
console.log(res);
@ -235,7 +254,8 @@
height: 84rpx;
padding: 0 30rpx;
border-bottom: 1px solid #CCCCCC;
font-size: 28rpx;
font-size: 32rpx;
font-weight: 700;
color: #282828;
.left-wrapper {
@ -284,11 +304,21 @@
font-size: 28rpx;
color: #999;
margin-top: 6rpx;
position: relative;
display: flex;
justify-content: space-between;
._left {
width: 300rpx;
color: #282828;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.name {
width: 320rpx;
width: 100rpx;
color: #282828;
}
.money {
@ -296,10 +326,8 @@
float: right;
}
}
}
.event_name {
@ -318,26 +346,33 @@
margin-top: 10rpx;
}
._order {
font-size: 28rpx;
margin: 5px 0 0 15px;
}
.totalPrice {
font-size: 26rpx;
color: #282828;
text-align: right;
margin: 27rpx 0 0 30rpx;
padding: 0 30rpx 30rpx 0;
.money {
font-size: 34rpx;
font-weight: bold;
color: rgb(233, 51, 35);
}
}
.totalfooter{
.totalfooter {
width: 100%;
height: 50px;
position: relative;
border-top: 1px solid #CCCCCC;
.bnt {
position: absolute;
right: 10px;
@ -346,15 +381,16 @@
display: flex;
align-items: center;
justify-content: center;
border-radius: 50rpx;
border-radius: 50rpx;
font-size: 27rpx;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
color: white;
margin-left: 70%;
margin-top: 5px;
}
}
.bottom {
height: 107rpx;
padding: 0 30rpx;

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

@ -1071,7 +1071,7 @@
that.cartArr[4].title =
`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
console.log(res.data.order[0]);
if (res.data.order[0].credit_buy == 1 && this.type_id ==12){
if (res.data.order[0].credit_buy == 1 && this.type_id == 12 ){
this.cartArr[4].payStatus = 1
} else {
this.cartArr[4].payStatus = 0
@ -1202,10 +1202,8 @@
orderId = res.data.result.order_id,
callback_key = res.data.result.pay_key,
jsConfig = res.data.result.config,
goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +'&product_type=' + that
.product_type,
goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&product_type=' + that
.product_type;
goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +'&product_type=' + that.product_type,
goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&product_type=' + that.product_type;
that.orderPay = true;
uni.hideLoading();
switch (status) {
@ -1272,7 +1270,7 @@
orderInfo: jsConfig,
success: (e) => {
let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=支付成功';
'&msg=支付成功'+'&product_type=' + that.product_type;
return that.$util.Tips({
title: '支付成功',
icon: 'success'
@ -1283,7 +1281,7 @@
},
fail: (e) => {
let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付';
'&msg=取消支付'+'&product_type=' + that.product_type;
return that.$util.Tips({
title: '取消支付',
}, {
@ -1293,7 +1291,7 @@
},
complete: () => {
let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付';
'&msg=取消支付'+'&product_type=' + that.product_type;
return that.$util.Tips({
title: '取消支付',
}, {
@ -1329,7 +1327,7 @@
},
fail: function(e) {
let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'
orderId + '&msg=取消支付'+'&product_type=' + that.product_type
return that.$util.Tips({
title: '取消支付'
}, {
@ -1353,7 +1351,7 @@
case 'h5':
let host = window.location.protocol + "//" + window.location.host;
let url =
`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}`
`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}`
let eUrl = encodeURIComponent(url)
let jsurl = jsConfig.mweb_url || jsConfig.h5_url
let locations = `${jsurl}&redirect_url=${eUrl}`
@ -1378,7 +1376,7 @@
},
fail: (e) => {
let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=支付失败'
orderId + '&msg=支付失败'+'&product_type=' + that.product_type
return that.$util.Tips({
title: '支付失败'
}, {
@ -1389,7 +1387,7 @@
complete: () => {
uni.hideLoading();
let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'
orderId + '&msg=取消支付'+'&product_type=' + that.product_type
return that.$util.Tips({
title: '取消支付'
}, {
@ -1402,7 +1400,7 @@
// #endif
default:
let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'
orderId + '&msg=取消支付'+'&product_type=' + that.product_type
return that.$util.Tips({
title: '取消支付'
}, {

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

@ -66,8 +66,11 @@
<view class="acea-row row-middle left-wrapper">
{{item.group_order_sn}}
</view>
<view class='t-color'>
{{item.pay_type == 3 ? "待付款" : "去结算" }}
<view class='t-color' v-if="item.pay_type == 3 || item.pay_type == 1">
待付款
</view>
<view class='t-color' v-if="item.pay_type == 8">
待结算
</view>
</view>
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
@ -127,41 +130,42 @@
<view class='name line2'>{{goods.cart_info.product.store_name}}
</view>
<view class="name line2">{{goods.cart_info.productAttr.sku}}
</view>
<view class='money' v-if="item.pay_type == 8">
<view v-if="goods.cart_info.activeSku">
￥{{goods.cart_info.activeSku.active_price}}</view>
<view>
￥{{goods.cart_info.productAttr.price}}</view>
<view>x{{goods.product_num}}</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
<!-- <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
<view>
先货后款 实付:￥0.00
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
</view>
</view> -->
</view>
<view v-else class='money'>
<view>￥{{goods.cart_info.productAttr.price}}</view>
<view>x{{goods.product_num}}</view>
</view>
</view>
</view>
</block>
</view>
</view>
<view class='totalPrice' v-if="item.pay_type !== 8">
<view class='totalPrice' style="margin-right: 15px;" v-if="item.pay_type !== 8">
共{{item.total_num || 0}}件商品，总金额
<text class='money p-color'>￥{{item.pay_price}}</text>
</view>
<!-- <view class='totalPrice' v-else>先货后款 实付款:
<view class='totalPrice' style="margin-right: 15px;" v-else>先货后款 实付款:
<text class='money p-color'>￥0.00</text>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
<view class="totalPrice" style="margin-right: 15px;" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
</view> -->
<view class='bottom acea-row row-right row-middle' v-if=" item.pay_type == 3 ">
</view>
<view class='bottom acea-row row-right row-middle' v-if="item.pay_type == 3 || item.pay_type == 1">
<view class='bnt cancelBnt' @click.stop='cancelOrder(index,item.group_order_id)'>取消订单</view>
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
立即付款</view>
</view>
@ -246,6 +250,9 @@
<view class='name line2'>
<text>{{goods.cart_info.product.store_name}}</text>
</view>
<view class='name line2'>
<text>{{goods.cart_info.productAttr.sku}}</text>
</view>
<view style="margin-top: 10rpx;" class="t-color">
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
</view>
@ -267,33 +274,27 @@
<view v-if="goods.cart_info.activeSku">
￥{{goods.cart_info.activeSku.active_price}}</view>
<view>x{{goods.product_num}}</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
<view>
先货后款 实付:￥0.00
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
</view>
</view>
<view class='money' v-else>
<view>￥{{goods.cart_info.productAttr.price}}</view>
<view>x{{goods.product_num}}</view>
</view>
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8 ">
<view>
先货后款 实付:￥0.00
</view>
</view>
<view class="totalPrice" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
</view>
</view>
</view>
</view>
<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
<view class='totalPrice' v-if="item.activity_type == 2">
共{{item.orderNum || 0}}件商品，总金额
<text class='money p-color'>￥{{item.presell_price}}</text>
</view>
<view class="money" style="margin-left: 206px;" v-if="item.pay_type == 8 ">
<view>
先货后款 实付:￥0.00
</view>
</view>
</view>
<view class="totalPrice" style="margin-right: 18px;" v-if="item.pay_type == 8">
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.total_price || item.interest.total_amount}}
</view>
</view>
<view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
@ -377,7 +378,7 @@
orderPay,
groupOrderList,
orderTake,
applyInvoiceApi
applyInvoiceApi,
} from '@/api/order.js';
import {
getUserInfo
@ -868,7 +869,8 @@
},
close() {
this.show = false
}
},
},
onReachBottom: function() {
this.getOrderList();
@ -910,6 +912,8 @@
font-weight: bold;
color: #fff;
margin-bottom: 20rpx;
}
.my-order .header .picTxt .pictrue {
@ -1011,7 +1015,7 @@
font-size: 26rpx;
color: #282828;
text-align: right;
padding-left: 20px;
padding-left: 28px;
}
}
@ -1057,7 +1061,7 @@
color: #282828;
text-align: right;
margin: 27rpx 0 0 -30rpx;
padding: -1px 30rpx 30rpx 0;
padding: -1px 20rpx 30rpx 0;
}
.my-order .list .item .totalPrice .money {
@ -1240,4 +1244,7 @@
color: #999999;
}
}
.line2{
-webkit-line-clamp: 1;
}
</style>

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

@ -43,7 +43,7 @@
</view>
<view class="settel">
<view class='settel-t'>
<view>总价：</view>
<view>商品总价：</view>
<view class='conter'>￥ {{couponData.interest.total_price}}</view>
</view>
</view>
@ -146,6 +146,7 @@
};
},
onLoad(options) {
this.payType='weixin'
this.order_id = options.order_id
if (options.product_type) { this.product_type = options.product_type }
console.log(this.product_type);
@ -160,10 +161,8 @@
let active = e;
that.active = active;
that.animated = true;
console.log(active);
that.payType = that.cartArr[active].value;
if (that.payType == 'weixin') {
that.payType = that.from
}
console.log(that.payType);
},
getUserInfo() {
@ -200,7 +199,6 @@
})
}, 1000)
}
console.log(res);
}).catch(err=>{
uni.showToast({
title: err.message

2
pages/users/supply_procurement/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="conent">
<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=0`)">
<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
<view class="con_text">

99
pages/users/trading_hall/index.vue
View File

@ -11,11 +11,26 @@
</view>
</view>
<view class="recom">
<view class="recom_bnt">
<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)">
{{this.recomname}}
</rudon-rowMenuDotDotDot>
</view>
<view class="recom_bnt">
<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)">
{{this.recomname}}
</rudon-rowMenuDotDotDot>
</view>
</view>
</view>
<view class="type_switch">
<view class="recom_mend">
推荐
</view>
</view>
<view class="type_switch">
<view class="recom_mend">
调货
</view>
</view>
<view class="type_switch">
<view class="recom_mend">
打折专区
</view>
</view>
<view class="list">
@ -28,29 +43,14 @@
啊沙发上
</view>
<view class="item_name">
<image src="../user_grade/images/suozi.png" mode="widthFix"></image>
<image class="avater" src="../user_grade/images/suozi.png" mode="widthFix"></image>
<view class="item_name_text">
啊沙发上
</view>
</view>
</view>
<view class="item">
<image class="shopimg" src="@/static/images/2-002.png" mode="widthFix"></image>
<view class="item_text">
<span>调货</span> 夹岸数范德萨范德萨衣服上的
</view>
<view class="item_prices">
啊沙发上
</view>
<view class="item_name">
<image src="../user_grade/images/suozi.png" mode="widthFix"></image>
<view class="item_name_text">
啊沙发上
</view>
</view>
</view>
</view>
</view>
</template>
@ -80,7 +80,7 @@
text: '打折专区'
}
],
recomname:'',
recomname: '',
}
},
methods: {
@ -89,7 +89,7 @@
// 忽略初始化时的传入的空操作
if (action === '') {
this.recomname = this.options[0].text
}else{
} else {
this.recomname = this.options[action].text
}
},
@ -101,13 +101,10 @@
.header {
width: 100%;
display: flex;
justify-content: space-between;
justify-content: flex-start;
align-items: center;
.top-header {
// position: fixed;
// top: 0;
// left: 0;
z-index: 9999;
width: 80%;
background-color: #fff;
@ -150,28 +147,34 @@
display: flex;
justify-content: center;
align-items: center;
.recom_bnt{
}
.recom_bnt {}
}
}
.list{
.list {
width: 100%;
display: flex;
justify-content: space-around;
justify-content: flex-start;
align-items: center;
.item{
width: 40%;
.shopimg{
flex-wrap: wrap;
.item {
width: 45%;
margin: 9px;
.shopimg {
width: 100%;
}
.item_text{
.item_text {
width: 100%;
padding: 15px 10px 15px 10px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
span{
span {
height: 20px;
padding: 3px;
margin: 2px;
@ -180,12 +183,26 @@
color: white;
}
}
.item_prices{
.item_prices {
font-size: 18px;
color:#F84221;
color: #F84221;
padding-left: 15px;
border-bottom: 1px solid #707070;
}
.item_name {
width: 100%;
height: 50px;
display: flex;
align-items: center;
.avater {
margin: 5px;
width: 40px;
height: 40px;
}
}
}
}
</style>