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:
jia 2023-08-19 18:57:17 +08:00
parent 29153eeb59
commit c42cf88d26
13 changed files with 124 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/addressWindow/index.vue
View File

@ -8,7 +8,7 @@
<text class='iconfont icon-ditu' :class='active==index?"t-color":""'></text>
<view class='address'>
<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
<view class='line1'>{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}</view>
<view class='line1'>{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.brigade}}{{item.detail}}</view>
</view>
<text class='iconfont icon-complete' :class='active==index?"t-color":""'></text>
</view>

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

@ -169,10 +169,10 @@
一键改价
</view>
<view class="bnt" @click="modify(item, 1)">订单备注</view>
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0"
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&item.activity_type==98"
@click="toPostage(item)">去发货
</view>
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0"
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&item.activity_type==0"
@click="toPostagequ(item)">收件码
</view>
<view class="bnt bnt_color"

2
pages/index/index.vue
View File

@ -46,7 +46,7 @@
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<u-loadmore :status="status" />
<u-loadmore :status="status" v-if="cateGoods.length>0" />
<!-- <view class="bg_color"></view> -->
<!-- <m-tabbar native>

31
pages/order_pay_status/index.vue
View File

@ -37,7 +37,7 @@
</view>
</view>
<!--失败时： 重新购买 -->
<view @tap="goOrderDetails">
<view @tap="goOrderDetails(order_pay_info.paid)">
<button formType="submit" class='returnBnt gColor' hover-class='none'>查看订单</button>
</view>
<!-- <view @tap="goOrderDetails" v-if="order_pay_info.paid==0 && status==1">
@ -161,7 +161,6 @@
this.isAuto = true;
this.isShowAuth = true
}
console.log(options);
},
methods: {
refreshData() {
@ -220,16 +219,30 @@
*
* 去订单详情页面
*/
goOrderDetails: function(e) {
goOrderDetails: function(val) {
let that = this;
if (this.product_type == 98) {
uni.navigateTo({
url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}`
})
if(val==1){
uni.navigateTo({
url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}`
})
}else{
uni.navigateTo({
url: `/pages/users/order_list/indexCopy?status=0&product_type=${this.product_type}`
})
}
} else {
uni.navigateTo({
url: '/pages/users/order_list/index?status=1&product_type=0'
})
if(val==1){
uni.navigateTo({
url: '/pages/users/order_list/index?status=1&product_type=0'
})
}else{
uni.navigateTo({
url: '/pages/users/order_list/index?status=0&product_type=0'
})
}
}
}

8
pages/product/basicSet.vue
View File

@ -129,15 +129,15 @@
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view>
<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" v-if="credit_buy"></i>开启先货后款：</view>
<u-switch v-model="credit_buy" @change="change"></u-switch>
</view>
<view class="item_cell flex_a_c">
<view class="item_cell flex_a_c" v-if="credit_buy">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
</view>
<view class="remarks">*周期结算时间范围为:15~90 周期单位为:天</view>
<view class="item_cell flex_a_c">
<view class="remarks" v-if="credit_buy">*周期结算时间范围为:15~90 周期单位为:天</view>
<view class="item_cell flex_a_c" v-if="credit_buy">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
</view>

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

@ -281,6 +281,7 @@
this.$util.Tips({
title: res.message
})
this.getList(this.mer_id);
}).catch(err => {
this.show = false
this.$util.Tips({

164
pages/releaseManagement/index.vue
View File

@ -7,9 +7,9 @@
</view>
<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
<view class="content-content">
<view class="" v-if='tabTitle=="tabTwo"' v-for="(item,i) in orderList" :key='i'>
<view class="content-onea"
style="margin-bottom: 23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
<view class="" v-for="(item,i) in orderList" :key='i'
style=" border-radius: 14rpx 14rpx 14rpx 14rpx;margin-bottom: 23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
<view :class="tabTitle=='tabTwo'?'content-onea':'content-one'">
<view class="content-one-img">
<image :src="item.image" mode="aspectFit"></image>
</view>
@ -74,151 +74,7 @@
</view>
</view>
<view v-else-if="tabTitle=='tabFive'">
<view class="" v-for="(item,i) in orderList" :key='i'
style="margin-bottom: 23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
<view class="content-one">
<view class="content-one-img">
<image :src="item.image" mode="aspectFit"></image>
</view>
<view class="content-one-txt">
<view class="one-txt-a">
{{item.title}}
</view>
<view class="one-txt-b">
<view class="txt-b-a">
￥ {{item.discount_price}}
</view>
<view class="txt-b-b">
结算价:￥{{item.discount_price}}
</view>
</view>
<view v-if="item.resale_type==1">
类型:调货
</view>
<view v-else>
类型:打折
</view>
</view>
</view>
<view class="content-two_one" v-if='tabTitle=="tabOne"'>
<view class="content-two-edit" @click="soldEdit(item) ">
编辑
</view>
</view>
<view class="content-two-two" v-if='tabTitle=="tabTwo"'>
<!-- <view class="content-two-delete">
删除
</view>
<view class="content-two-edit">
编辑
</view>
-->
</view>
<view class="content-two-three" v-if='tabTitle=="tabThree"'>
<view class="content-two-delete" @click="pendingDeletion(item)">
删除
</view>
<view class="content-two-edit" @click="editReviewe(item)">
编辑
</view>
</view>
<view class="content-two-four" v-if='tabTitle=="tabFour"'>
<view class="content-two-delete" @click="auditDelete(item)">
删除
</view>
<view class="content-two-edit" @click="auditEdit(item)">
编辑
</view>
</view>
<view class="content-two-five" v-if='tabTitle=="tabFive"'>
<view class="content-two-delete" @click="passDelete(item)">
拒绝
</view>
<view class="content-two-agree" @click="passagree(item)">
同意
</view>
</view>
</view>
</view>
<view v-else>
<view class="" v-for="(item,i) in orderList" :key='i'
style="margin-bottom: 23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
<view class="content-one">
<view class="content-one-img">
<image :src="item.image" mode="aspectFit"></image>
</view>
<view class="content-one-txt">
<view class="one-txt-a">
{{item.title}}
</view>
<view class="one-txt-b">
<view class="txt-b-b" v-if="item.resale_type==1">
类型:调货
</view>
<view class="txt-b-b" v-else>
类型:打折
</view>
</view>
</view>
</view>
<view class="content-two_one" v-if='tabTitle=="tabOne"'>
<view class="content-two-edit" @click="soldEdit(item) ">
编辑
</view>
</view>
<view class="content-two-two" v-if='tabTitle=="tabTwo"'>
<!-- <view class="content-two-delete">
删除
</view>
<view class="content-two-edit">
编辑
</view>
-->
</view>
<view class="content-two-three" v-if='tabTitle=="tabThree"'>
<view class="content-two-delete" @click="pendingDeletion(item)">
删除
</view>
<view class="content-two-edit" @click="editReviewe(item)">
编辑
</view>
</view>
<view class="content-two-four" v-if='tabTitle=="tabFour"'>
<view class="content-two-delete" @click="auditDelete(item)">
删除
</view>
<view class="content-two-edit" @click="auditEdit(item)">
编辑
</view>
</view>
<view class="content-two-five" v-if='tabTitle=="tabFive"'>
<view class="content-two-delete" @click="passDelete(item)">
拒绝
</view>
<view class="content-two-agree" @click="passagree(item)">
同意
</view>
</view>
</view>
</view>
</view>
@ -252,7 +108,7 @@
activeItem: "tabOne",
tabTitle: "",
orderList: [],
glist: [],
where: {
page: 1,
limit: 10,
@ -287,23 +143,21 @@
}
},
onLoad(num) {
this.tabTitle = this.tabs[0].name
if (num.key == '2') {
this.activeItem = 'tabThree'
}
this.list()
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
// console.log(this.tabs[0])
},
methods: {
tabClick(e) { //点击获取当前标签数据
this.orderList = []
this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名
this.where.status = e.value
this.orderList = []
this.list()
},
list() {
getResale(this.where).then(res => {
@ -327,7 +181,7 @@
}
},
//待审核 删除
//审核未通过 删除
pendingDeletion(item) {
getResaledelete(item.community_id).then(res => {
@ -430,7 +284,7 @@
padding-top: 28rpx;
border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1;
position: relative;

3
pages/trading_hall/adddiscounts/index.vue
View File

@ -322,6 +322,9 @@
this.type = options.gtype
if (this.type) {
this.list()
uni.setNavigationBarTitle({
title: '编辑打折'
})
}
this.tabActive = options.type || 1;
if (this.community_app_switch.length == 1) {

5
pages/trading_hall/transfer_goods/index.vue
View File

@ -321,7 +321,7 @@
// uni.hideTabBar()
this.id = options.id;
this.type = options.gtype
this.tabActive = options.type || 1;
if (this.community_app_switch.length == 1) {
this.tabActive = this.community_app_switch[0]
@ -335,6 +335,9 @@
}
if (this.type) {
this.list()
uni.setNavigationBarTitle({
title: '编辑调货'
})
}
this.videoContext = uni.createVideoContext("myvideo", this);
},

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

@ -8,8 +8,10 @@
<text class='phone'>{{addressInfo.phone}}</text>
</view>
<view>
<text class='default t-color'
v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}}{{addressInfo.brigade}}
v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}
</view>
</view>
<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
@ -1115,6 +1117,7 @@
if (that.addressId) {
getAddressDetail(that.addressId).then(res => {
res.data.is_default = parseInt(res.data.is_default);
that.addressInfo = res.data || {};
that.addressId = res.data.address_id || 0;
that.address.addressId = res.data.address_id || 0;
@ -1127,6 +1130,7 @@
this.getConfirm(that.addressId);
})
})
} else {
getAddressList().then(res => {
that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};

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

@ -27,15 +27,15 @@
<view>待付款</view>
<view class='num'>{{orderData.noPay || 0}}</view>
</view>
<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
<view>待发货</view>
<view class='num'>{{orderData.noPostage || 0}}</view>
</view>
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
<view>待收货</view>
<view class='num '>{{orderData.noDeliver || 0}}</view>
</view>
<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
<view>待评价</view>
<view class='num'>{{orderData.noComment || 0}}</view>
</view>
@ -160,18 +160,19 @@
<view class="store-name">{{item.merchant.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text>
</view>
<view v-if="item.status == 0" class='t-color'>
<view v-if="item.order_status ==7" class='t-color'>
<text
v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
<!-- <text v-else>待发货</text> -->
</view>
<view v-if="item.status == 0 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.status == 0 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.status == 1" class='t-color'>待收货</view>
<view v-if="item.status == 2 && item.pay_type !== 8" class='t-color'>待评价</view>
<view v-if="item.status == 3" class='t-color'>已完成</view>
<view v-if="item.status == -1" class='t-color'>已退款</view>
<view v-if="item.status == 2 && item.pay_type == 8" class='t-color'>待结算</view>
<view v-if="item.order_status == 2 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.order_status == 1 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.order_status == 3" class='t-color'>待收货</view>
<view v-if="item.order_status == 4 && item.pay_type !== 8" class='t-color'>待评价</view>
<view v-if="item.order_status == 5" class='t-color'>已完成</view>
<view v-if="item.order_status == 6" class='t-color'>已退款</view>
<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算</view>
</view>
<view v-if="item.activity_type === 2">
@ -261,10 +262,12 @@
<view class='bnt b-color' @tap='confirmOrder(item,index)'>取件码</view>
</block>
<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>
<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>
</block>
@ -416,7 +419,7 @@
this.getOrderData();
this.getOrderList();
this.getUserInfo();
this.getpreSellOrderList();
// this.getpreSellOrderList();
} else {
this.isAuto = true;
this.isShowAuth = true
@ -493,7 +496,9 @@
*/
getOrderData: function() {
let that = this;
orderData({product_type:0}).then(res => {
orderData({
product_type: 0
}).then(res => {
that.$set(that, 'orderData', res.data);
})
},
@ -598,9 +603,9 @@
// uni.navigateTo({
// url: '/pages/order_details/index?order_id=' + order_id
// })
uni.navigateTo({
url: '/pages/order_details/index?order_id=' + order_id
})
uni.navigateTo({
url: '/pages/order_details/index?order_id=' + order_id
})
} else {
uni.navigateTo({
url: '/pages/order_details/index?order_id=' + order_id
@ -644,6 +649,7 @@
*/
statusClick: function(status) {
if (status == this.orderStatus) return;
this.orderStatus = status;
this.loadend = false;
this.loading = false;
@ -683,8 +689,14 @@
that.page = that.page + 1
})
} else {
let arr;
if (that.orderStatus > -1) {
arr = that.orderStatus
} else {
arr = ''
}
getOrderList({
status: that.orderStatus - 1,
status: arr,
page: that.page,
limit: that.limit,
product_type: 0
@ -760,17 +772,17 @@
},
// 确认收货
confirmOrder: function(item, index) {
uni.showModal({
title: '取件码',
content: item.logistics_code,
success: function(res) {
if (res.confirm) {
// console.log('用户点击确定');
} else if (res.cancel) {
// console.log('用户点击取消');
}
}
})
uni.showModal({
title: '取件码',
content: item.logistics_code,
success: function(res) {
if (res.confirm) {
// console.log('用户点击确定');
} else if (res.cancel) {
// console.log('用户点击取消');
}
}
})
// let that = this;
// uni.showModal({
// title: '确认收货',
@ -782,7 +794,7 @@
// title: '操作成功',
// icon: 'success'
// }, function() {
// that.orderList.splice(index, 1);
// that.getOrderData();
// });

44
pages/users/order_list/indexCopy.vue
View File

@ -23,19 +23,19 @@
<view>全部</view>
<view class='num'>{{orderData.orderCount || 0}}</view>
</view>
<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
<view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
<view>待付款</view>
<view class='num'>{{orderData.noPay || 0}}</view>
</view>
<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
<view>待发货</view>
<view class='num'>{{orderData.noPostage || 0}}</view>
</view>
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
<view class='item' :class='orderStatus==3? "on": ""' @click="statusClick(3)">
<view>待收货</view>
<view class='num '>{{orderData.noDeliver || 0}}</view>
</view>
<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
<view>待评价</view>
<view class='num'>{{orderData.noComment || 0}}</view>
</view>
@ -160,19 +160,21 @@
<view class="store-name">{{item.merchant.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text>
</view>
<view v-if="item.status == 0" class='t-color'>
<view v-if="item.order_status ==7" class='t-color'>
<text
v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
<!-- <text v-else>待发货</text> -->
</view>
<view v-if="item.status == 0 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.status == 0 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.status == 1" class='t-color'>待收货</view>
<view v-if="item.status == 2 && item.pay_type !== 8" class='t-color'>待评价</view>
<view v-if="item.status == 3" class='t-color'>已完成</view>
<view v-if="item.status == -1" class='t-color'>已退款</view>
<view v-if="item.status == 2 && item.pay_type == 8" class='t-color'>待结算</view>
<view v-if="item.order_status == 2 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.order_status == 1 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.order_status == 3" class='t-color'>待收货</view>
<view v-if="item.order_status == 4 && item.pay_type !== 8" class='t-color'>待评价
</view>
<view v-if="item.order_status == 5" class='t-color'>已完成</view>
<view v-if="item.order_status == 6" class='t-color'>已退款</view>
<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算
</view>
</view>
<view v-if="item.activity_type === 2">
<view class='item-info acea-row row-between row-top'
@ -416,7 +418,7 @@
this.getOrderData();
this.getOrderList();
this.getUserInfo();
this.getpreSellOrderList();
// this.getpreSellOrderList();
} else {
this.isAuto = true;
this.isShowAuth = true
@ -494,7 +496,7 @@
getOrderData: function() {
let that = this;
orderData({
product_type:98
product_type: 98
}).then(res => {
// console.log(res.data)
that.$set(that, 'orderData', res.data);
@ -653,7 +655,7 @@
groupOrderList({
page: that.page,
limit: that.limit,
product_type:98
product_type: 98
}).then(res => {
that.isReady = true;
let list = res.data.list || [];
@ -670,11 +672,17 @@
that.page = that.page + 1
})
} else {
let arr;
if (that.orderStatus > -1) {
arr = that.orderStatus
} else {
arr = ''
}
getOrderList({
status: that.orderStatus - 1,
status: arr,
page: that.page,
limit: that.limit,
product_type:98
product_type: 98
}).then(res => {
let list = res.data.list || [];
let loadend = list.length < that.limit;

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

@ -76,7 +76,7 @@
<view class="empty_wrapper" v-if="emptyShow">
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
</view>
<u-loadmore :status="status" />
<u-loadmore :status="status" v-if="datatlist.length>0"/>
</view>
</template>