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

1

This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-24 09:37:17 +08:00
parent d8b90ee847
commit 18a02eaacb
2 changed files with 81 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,12 @@
<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 && item.order[0] && item.order[0].order_sn }}
<text class="time">暂存时间：{{ item.order && item.order[0] && item.order[0].create_time }}</text> <text class="time">暂存时间：{{ item.order && item.order[0] && item.order[0].create_time }}</text>
<text class="fk_status"
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="(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[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>
</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.order[0].orderProduct" :key="key"
@click="toDetail(item)"> @click="toDetail(item)">
@ -140,18 +146,24 @@
<text v-if="item.status == -2" class="iconfont icon-yiquxiao"></text> <text v-if="item.status == -2" class="iconfont icon-yiquxiao"></text>
</view> </view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="more"> <view class="more"></view>
</view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<!-- <view class="bnt" @click="refundModify(item, 1)">订单备注</view> <view class="bnt" @click="modify(item.order[0], item.order[0].status)">订单备注</view>
<view class="bnt bnt_color"
v-if="where.status == 2 && item.order[0].order_type == 0&&(item.order[0].activity_type==98||item.order[0].activity_type==99)"
@click="toPostage(item)">去发货
</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"
@click="toPostagequ(item)">去发货
</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" <navigator class="bnt bnt_color" v-if="item.status == 0"
:url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款 :url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款
</navigator> </navigator>
<navigator class="bnt" v-if="item.status == 2"
:url="'/pages/users/goods_logistics/index?refundId='+item.refund_order_id+'&merId='+merId">
查看物流
</navigator>
<view class="bnt bnt_color" v-if="item.status == 2" @tap='confirmOrder(item)'>确认收货</view> -->
</view> </view>
</view> </view>
</view> </view>
@ -197,11 +209,6 @@
<!-- <view class="refund-num" v-if="val.product_num-val.refund_num>0">{{val.product_num-val.refund_num}}件{{val.is_refund==1?'退款中' : val.is_refund==2 ? '已退款' : val.is_refund==3?'全部退款':''}}</view> --> <!-- <view class="refund-num" v-if="val.product_num-val.refund_num>0">{{val.product_num-val.refund_num}}件{{val.is_refund==1?'退款中' : val.is_refund==2 ? '已退款' : val.is_refund==3?'全部退款':''}}</view> -->
</view> </view>
</view> </view>
<!-- <view v-if="item.order_type == 1" class="cancellate">
<text class="uncancell">1件已核销</text>
<text class="uncancell">1件已退款</text>
<text class="cancelled">1件退款中</text>
</view> -->
</view> </view>
</view> </view>
@ -260,8 +267,10 @@
<image src="/static/images/no_thing.png" mode="widthFix"></image> <image src="/static/images/no_thing.png" mode="widthFix"></image>
<view class="nothing_text">暂无订单~</view> <view class="nothing_text">暂无订单~</view>
</view> </view>
<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" <PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)"
v-on:savePrice="savePrice" :status="status"></PriceChange> v-on:savePrice="savePrice" :status="status"></PriceChange>
<view> <view>
<view class="priceChange" :class="refundMark === true ? 'on' : ''"> <view class="priceChange" :class="refundMark === true ? 'on' : ''">
<view class="priceTitle"> <view class="priceTitle">
@ -428,6 +437,15 @@
this.getIndex(); this.getIndex();
}, },
methods: { methods: {
// 状态
statusParse(item) {
const status = item.order[0].status;
if (status == 0) return "待发货";
if (status == 1) return "待收货";
if (status == 2) return "待评价";
if (status == 3) return "已完成";
},
// 关闭二维码弹窗 // 关闭二维码弹窗
popUpClose() { popUpClose() {
this.popUpShow = false this.popUpShow = false
@ -470,36 +488,31 @@
// 获取数据 // 获取数据
getIndex() { getIndex() {
let that = this; let that = this;
// console.log(that.merId)
if (that.loading || that.loaded) return; if (that.loading || that.loaded) return;
that.loading = true; that.loading = true;
if (that.where.status == 6) { if (that.where.status == 6) {
getRefundOrderList(that.where, that.merId).then( getRefundOrderList(that.where, that.merId).then(res => {
res => { that.loading = false;
that.loading = false; that.loaded = res.data.list.length < that.where.limit;
that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list); that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
}, }, err => {
err => { that.$util.Tips({
that.$util.Tips({ title: err
title: err });
}); });
}
);
} else if (that.where.status == 7) { } else if (that.where.status == 7) {
lockList(that.where, that.merId).then(res => { lockList(that.where, that.merId).then(res => {
that.loading = false; that.loading = false;
that.loaded = res.data.list.length < that.where.limit; that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list); that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1; that.where.page = that.where.page + 1;
}, }, err => {
err => { that.$util.Tips({
that.$util.Tips({ title: err
title: err });
}); })
})
} else { } else {
getOrderList(that.where, that.merId).then( getOrderList(that.where, that.merId).then(
res => { res => {
@ -923,6 +936,12 @@
position: relative; position: relative;
} }
.fk_status {
position: absolute;
right: 20rpx;
top: 20rpx;
}
.pos-order-list .list .item .order-status { .pos-order-list .list .item .order-status {
color: #ff9600; color: #ff9600;
position: absolute; position: absolute;

31
pages/product/basicSet.vue
View File

@ -102,7 +102,6 @@
<view class="item_cell flex_a_c" <view class="item_cell flex_a_c"
style="display: flex;justify-content: space-between;align-items: flex-start;"> style="display: flex;justify-content: space-between;align-items: flex-start;">
<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 class="com_input" type="text" v-model="mer_address" placeholder="输入商户地址"> -->
<view class="input" style="flex: 1;margin-right: 15rpx;">{{mer_address}}</view> <view class="input" style="flex: 1;margin-right: 15rpx;">{{mer_address}}</view>
<view class="get_site flex_a_c" @click="navTo('/pages/select_address/select_address_n')"> <view class="get_site flex_a_c" @click="navTo('/pages/select_address/select_address_n')">
<i class="iconfont icon-dizhi"></i> <i class="iconfont icon-dizhi"></i>
@ -196,10 +195,12 @@
<script> <script>
import { import {
navigateBack, navigateBack,
Toast Toast
} from '@/libs/uniApi.js' } from '@/libs/uniApi.js'
import {
getGeocoder,
} from '@/api/store.js';
import { import {
merchantUpdateAPI, merchantUpdateAPI,
merchantInfoAPI merchantInfoAPI
@ -357,7 +358,12 @@
this.mer_take_time = res.data.mer_take_time this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword this.cruxText = res.data.mer_keyword
this.mer_address = res.data.mer_address;
if (!res.data.mer_address) {
this.selfLocation();
} else {
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 === 1 ? true : false this.credit_buy = res.data.credit_buy === 1 ? true : false
if (res.data.settle_cycle == 0) { if (res.data.settle_cycle == 0) {
@ -461,12 +467,25 @@
}, },
selfLocation() { selfLocation() {
let that = this;
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
success: (res) => { success: (res) => {
this.latitude = res.latitude.toString(); that.latitude = res.latitude.toString();
this.longitude = res.longitude.toString(); that.longitude = res.longitude.toString();
this.longLati = `${res.latitude},${res.longitude}` that.longLati = `${res.latitude},${res.longitude}`
getGeocoder({
lat: that.latitude,
long: that.longitude
}).then(res => {
this.mer_address = res.data.address;
}).catch(err => {
uni.showToast({
title: err,
icon: 'none'
})
this.street = '定位失败'
})
}, },
fail: (err) => { fail: (err) => {
Toast(err) Toast(err)