mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单暂存修改

This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-26 11:14:07 +08:00
parent 18a02eaacb
commit 1e7a8f76d1
3 changed files with 50 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name": "惠农商户平台", "name": "惠农商户平台",
"appid": "__UNI__1EE148C", "appid": "__UNI__1EE148C",
"description": "", "description": "",
"versionName": "1.4.9", "versionName": "1.5.0",
"versionCode": 1490, "versionCode": 1500,
"transformPx": false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus": {

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

@ -42,6 +42,7 @@
</view> </view>
</view> </view>
<view v-if="(where.status == 6)" class="list"> <view v-if="(where.status == 6)" class="list">
<view class="item" v-for="(item, index) in list" :key="index"> <view class="item" v-for="(item, index) in list" :key="index">
<view class="order-num acea-row row-middle"> <view class="order-num acea-row row-middle">
@ -103,20 +104,21 @@
<view v-else-if="(where.status == 7)" class="list"> <view v-else-if="(where.status == 7)" class="list">
<block v-for="(item, index) in list" :key="index"> <block v-for="(item, index) in list" :key="index">
<view class="item" v-if="item.order && item.order.length > 0"> <view class="item">
<view class="order-num acea-row row-middle"> <view class="order-num acea-row row-middle">
暂存单号：{{ item.order && item.order[0] && item.order[0].order_sn }} 暂存单号：{{ item.order_sn }}
<text class="time">暂存时间：{{ item.order && item.order[0] && item.order[0].create_time }}</text> <text class="time">暂存时间：{{ item.c_time }}</text>
<text class="fk_status" <text class="fk_status" v-if="item.order_status == 0">未支付</text>
v-if="where.status == 7 && item.order[0].order_type == 0&&(item.order[0].activity_type==98||item.order[0].activity_type==99)">待发货</text> <text class="fk_status" v-if="item.order_status == 1">待核销</text>
<text class="fk_status" <text class="fk_status" v-if="item.order_status == 2">待发货</text>
v-if="(where.status == 2 || (item.order[0].order_type === 0 && item.order[0].status === 0 && item.order[0].paid == 1)) && item.order[0].order_type == 0 && item.order[0].order_type !=1 && item.order[0].activity_type==0 ">待发货</text> <text class="fk_status" v-if="item.order_status == 3">待收货</text>
<text class="fk_status" <text class="fk_status" v-if="item.order_status == 4">待评价</text>
v-if="((item.order[0].order_type == 1 && item.order[0].status === 0 && item.order[0].paid == 1) && item.order[0].order_type == 1) || where.is_verify == 1">待核销</text> <text class="fk_status" v-if="item.order_status == 5">交易完成</text>
<text class="fk_status" v-if="item.order_status == 6">退款</text>
</view> </view>
<view class="pos-order-goods" v-for="(val, key) in item.order[0].orderProduct" :key="key" <view class="pos-order-goods" v-for="(val, key) in item.storeOrder.orderProduct" :key="key"
@click="toDetail(item)"> @click="toDetail(item)">
<view class="goods acea-row row-between-wrapper" v-if="val.cart_info && val.cart_info.product"> <view class="goods acea-row row-between-wrapper" v-if="val.cart_info">
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
<view class="pictrue"> <view class="pictrue">
<image :src="val.cart_info.product.image || val.cart_info.productAttr.image" /> <image :src="val.cart_info.product.image || val.cart_info.productAttr.image" />
@ -134,35 +136,22 @@
</view> </view>
</view> </view>
<view class="money refund-money"> <view class="money refund-money">
<view class="num">x{{ item.order[0].total_num }}</view> <view class="num">x{{ item.storeOrder.total_num }}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="item-status">
<text v-if="item.status == -1" class="iconfont icon-yijujue1"></text>
<text v-if="item.status == 0" class="iconfont icon-tuikuanzhong on"></text>
<text v-if="item.status == 1 || item.status == 2" class="iconfont icon-tuihuozhong on"></text>
<text v-if="item.status == 3" class="iconfont icon-yituikuan1"></text>
<text v-if="item.status == -2" class="iconfont icon-yiquxiao"></text>
</view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="more"></view> <view class="more"></view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view class="bnt" @click="modify(item.order[0], item.order[0].status)">订单备注</view> <view class="bnt" @click="modify(item, 1)">订单备注</view>
<view class="bnt bnt_color" <view class="bnt bnt_color" v-if="item.order_status == 1" @click="toDetail(item)">去核销</view>
v-if="where.status == 2 && item.order[0].order_type == 0&&(item.order[0].activity_type==98||item.order[0].activity_type==99)" <view class="bnt bnt_color" v-if="item.order_status == 2" @click="toPostagequ(item)">去发货
@click="toPostage(item)">去发货
</view> </view>
<view class="bnt bnt_color"
v-if="(where.status == 2 || (item.order[0].order_type === 0 && item.order[0].status === 0 && item.order[0].paid == 1)) && item.order[0].order_type == 0 && item.order[0].order_type !=1 && item.order[0].activity_type==0" <navigator class="bnt bnt_color" v-if="item.order_status == 6"
@click="toPostagequ(item)">去发货 :url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">
</view> 立即退款
<view class="bnt bnt_color"
v-if="((item.order[0].order_type == 1 && item.order[0].status === 0 && item.order[0].paid == 1) && item.order[0].order_type == 1) || where.is_verify == 1"
@click="toDetail(item)">去核销</view>
<navigator class="bnt bnt_color" v-if="item.status == 0"
:url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款
</navigator> </navigator>
</view> </view>
</view> </view>
@ -578,21 +567,18 @@
} }
setRefundMark(that.merId, that.refundInfo.refund_order_id, { setRefundMark(that.merId, that.refundInfo.refund_order_id, {
mer_mark: that.refundInfo.mer_mark mer_mark: that.refundInfo.mer_mark
}).then( }).then(res => {
res => {
that.refundMark = false; that.refundMark = false;
this.$util.Tips({ this.$util.Tips({
title: res.message, title: res.message,
icon: 'success' icon: 'success'
}) })
}, }, err => {
err => {
that.refundMark = false; that.refundMark = false;
that.$util.Tips({ that.$util.Tips({
title: err title: err
}); });
} });
);
}, },
changeclose: function(msg) { changeclose: function(msg) {
this.change = msg; this.change = msg;
@ -629,9 +615,6 @@
}) })
if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) { if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) {
console.log(3123123);
return uni.showToast({ return uni.showToast({
title: "手机号输入有误!", title: "手机号输入有误!",
icon: "none" icon: "none"
@ -662,19 +645,15 @@
this.deliveryForm.delivery_id = ''; this.deliveryForm.delivery_id = '';
this.deliveryForm.remark = ''; this.deliveryForm.remark = '';
if (item.mer_id) {
this.deliveryForm.mer_id = item.mer_id; this.deliveryForm.mer_id = item.mer_id;
this.deliveryForm.order_id = item.order_id; this.deliveryForm.order_id = item.order_id;
} else {
this.deliveryForm.mer_id = item.order[0].mer_id;
this.deliveryForm.order_id = item.order[0].order_id;
}
this.popUpShow = true; this.popUpShow = true;
// this.shipment.delivery_name = this.shipment.to_name
// this.shipment.delivery_id = this.shipment.to_phone
// logisticsCode(item.order_id).then(res => {
// if (res.status == 200) {
// this.payCodeUrl = res.data.qrcode
// }
// })
}, },
toPostage(item) { toPostage(item) {
@ -767,8 +746,8 @@
order_id = item.order_id; order_id = item.order_id;
mer_id = item.mer_id; mer_id = item.mer_id;
} else { } else {
order_id = item.order[0].order_id; order_id = item.order_id;
mer_id = item.order[0].merchant.mer_id; mer_id = item.mer_id;
} }
uni.navigateTo({ uni.navigateTo({

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

@ -142,11 +142,12 @@
</view> </view>
</view> </view>
</view> </view>
<u-empty v-else text="暂无商品~" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
</u-empty>
</view> </view>
<Loading :loaded="loaded" :loading="loading"></Loading> <Loading :loaded="loaded" :loading="loading"></Loading>
<u-empty v-if="!productList || productList.length == 0" text="暂无商品~" mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png">
</u-empty>
</view> </view>
<u-popup :show="show" @close="close" mode="center" bgColor='transparent'> <u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
<image src="@/static/images/xianxia.png" mode="widthFix"></image> <image src="@/static/images/xianxia.png" mode="widthFix"></image>