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

Compare commits

base: mkm:d80bac72e26ffeecff8085db60ab1bb234f247d1
Branches Tags
mkm:main
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
..
compare: mkm:47b428432635d26f54ef749f17a021a1eabc9a59
Branches Tags
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
mkm:main

No commits in common. "d80bac72e26ffeecff8085db60ab1bb234f247d1" and "47b428432635d26f54ef749f17a021a1eabc9a59" have entirely different histories.
d80bac72e2 ... 47b4284326

2 changed files with 986 additions and 1152 deletions
Show Stats Expand all files Collapse all files

3
pages/activeCode/subsidy.vue
View File

@ -193,7 +193,7 @@
this.mer_info.type_code = user.mer_info.type_code;
this.mer_id = user.service.mer_id;
this.getSubsidy();
this.getSubsidyRecord();
if(this.type==2)this.getSubsidyRecord();
// this.$nextTick(res=>{
// this.$refs.pupRef.open();
// })
@ -214,7 +214,6 @@
},
changeType(type){
this.type = type;
this.where.type = type;
this.getSubsidy();
this.getSubsidyRecord();
},

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

@ -24,8 +24,7 @@
</view>
<view>{{ orderInfo.user_address }}</view>
<!-- #ifdef H5 -->
<button class="copy copy-data"
:data-clipboard-text="'收货人姓名：'+orderInfo.real_name+'\n收货人电话：'+ orderInfo.user_phone+'\n收货人地址：'+orderInfo.user_address">复制</button>
<button class="copy copy-data" :data-clipboard-text="'收货人姓名：'+orderInfo.real_name+'\n收货人电话：'+ orderInfo.user_phone+'\n收货人地址：'+orderInfo.user_address">复制</button>
<!-- #endif -->
<!-- #ifdef MP || APP-PLUS -->
<button class="copy" @tap="copyText">复制</button>
@ -35,8 +34,7 @@
<image :src="`${domain}/static/images/line.jpg`" />
</view>
<view class="pos-order-goods">
<navigator :url="`/pages/goods_details/index?id=${item.cart_info.product.product_id}`" hover-class="none"
class="goods" v-for="(item, index) in orderInfo.orderProduct" :key="index">
<navigator :url="`/pages/goods_details/index?id=${item.cart_info.product.product_id}`" hover-class="none" class="goods" v-for="(item, index) in orderInfo.orderProduct" :key="index">
<view class="acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper">
<view class="pictrue">
@ -47,8 +45,7 @@
{{ item.cart_info.product.store_name }}
</view>
<view class="attr">{{ item.cart_info.product.suk }}</view>
<view class="attr" @click.stop="showBarCode(item.cart_info.productAttr.product)"
v-if="item.cart_info.productAttr.product&&item.cart_info.productAttr.product.bar_code">
<view class="attr" @click.stop="showBarCode(item.cart_info.productAttr.product)" v-if="item.cart_info.productAttr.product&&item.cart_info.productAttr.product.bar_code">
商品条码: {{ item.cart_info.productAttr.product.bar_code }}
</view>
</view>
@ -56,8 +53,7 @@
<view class="money">
<view class="x-money">￥{{ item.cart_info.productAttr.price }}</view>
<view class="num">x{{ item.product_num }}
<text class="font-color refund_num"
v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
</view>
<!-- <view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view> -->
</view>
@ -93,9 +89,7 @@
</view>
<view class="item acea-row row-between">
<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 class="item acea-row row-between">
<view>买家留言：</view>
@ -103,8 +97,7 @@
</view>
</view>
<view v-if="orderInfo.is_virtual == 1" class='wrapper'>
<view v-for="(item,index) in orderInfo.order_extend" v-if="item && index" :key="index"
class='item acea-row row-between'>
<view v-for="(item,index) in orderInfo.order_extend" v-if="item && index" :key="index" class='item acea-row row-between'>
<view>{{index}}：</view>
<view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
<view v-else class='conter virtual_image'>
@ -133,8 +126,7 @@
实付款：<span class="money font-color-red">￥{{ orderInfo.pay_price }}</span>
</view>
</view>
<view class="wrapper"
v-if="orderInfo.delivery_type != '3' && orderInfo.order_type === 0 && orderInfo.delivery_type">
<view class="wrapper" v-if="orderInfo.delivery_type != '3' && orderInfo.order_type === 0 && orderInfo.delivery_type">
<view class="item acea-row row-between">
<view>配送方式：</view>
<view class="conter" v-if="orderInfo.delivery_type === '1' || orderInfo.delivery_type === '4'">
@ -157,8 +149,7 @@
</view>
</view>
<view style="height:120upx;"></view>
<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'"
style="margin-bottom: var(--status-bar-height);">
<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="margin-bottom: var(--status-bar-height);">
<view class="more"></view>
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(order_id,1)">
同意
@ -177,55 +168,15 @@
确认付款
</view>
<view class="bnt delivery" @click="toPostagequ(orderInfo)"
v-if="orderInfo.status == 0&&orderInfo.activity_type==0&& orderInfo.order_type !=1 ">
去发货
<view class="bnt delivery" @click="toPostagequ(orderInfo)" v-if="orderInfo.status == 0&&orderInfo.activity_type==0&& orderInfo.order_type !=1 ">
收件码
</view>
<navigator class="bnt delivery"
v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0&&orderInfo.activity_type==98"
:url="'/pages/admin/delivery/index?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator>
<view class="bnt delivery"
v-if="orderInfo.paid == 1 && (orderInfo.status == 0 || orderInfo.status == 9) && orderInfo.order_type == 1"
@click="goCancellation">去核销</view>
<navigator class="bnt delivery" v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0&&orderInfo.activity_type==98" :url="'/pages/admin/delivery/index?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator>
<view class="bnt delivery" v-if="orderInfo.paid == 1 && (orderInfo.status == 0 || orderInfo.status == 9) && orderInfo.order_type == 1" @click="goCancellation">去核销</view>
</view>
<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)"
v-on:savePrice="savePrice" :status="status"></PriceChange>
<view class="form-wrap" v-if="popUpShow"
style="position: fixed;z-index: 11; top: 0;left: 0;width:100vw;height:100vh;background:rgba(0,0,0,.4);display: flex;align-items: center;justify-content: center;">
<view class="form">
<view class="form-item">
<view class="form-item-label">送货人姓名</view>
<view class="form-item-val">
<u-input v-model="deliveryForm.delivery_name" placeholder="请输入送货人姓名"
placeholderStyle="color:#999;font-size:26rpx;" border="surround"></u-input>
</view>
</view>
<view class="form-item">
<view class="form-item-label">送货人电话</view>
<view class="form-item-val">
<u-input v-model="deliveryForm.delivery_id" placeholder="请输入送货人电话"
placeholderStyle="color:#999;font-size:26rpx;" border="surround"></u-input>
</view>
</view>
<view class="form-item">
<view class="form-item-label">备注</view>
<view class="form-item-val">
<u-input v-model="deliveryForm.remark" placeholder="请输入备注"
placeholderStyle="color:#999;font-size:26rpx;"></u-input>
</view>
</view>
<view class="form-btn">
<view class="form-btn-cancel" @click="popUpShow = false">取消</view>
<view class="form-btn-confirm" @click="handleSubmitDelivery">确认</view>
</view>
</view>
</view>
<!-- <u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
:status="status"></PriceChange>
<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
<view style="text-align: center;margin-top: 30rpx;">
请把二维码展示给取货人员
</view>
@ -233,7 +184,7 @@
<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
</view>
</u-popup> -->
</u-popup>
<view class="bar-code" v-show="showBar" @click="showBar=false">
<barcode ref="code"></barcode>
</view>
@ -261,8 +212,7 @@
setOrderRefund,
orderCancellation,
logisticsCode,
postconfirm,
delivery
postconfirm
} from "@/api/admin";
import { isMoney } from '@/utils/validate.js'
import { HTTP_REQUEST_URL } from '@/config/app';
@ -274,13 +224,6 @@
props: {},
data: function() {
return {
// 去发货
deliveryForm: {
delivery_name: '',
delivery_id: '',
delivery_type: 2,
mer_id: ''
},
showBar: false,
order: false,
change: false,
@ -344,51 +287,15 @@
code: val.bar_code
});
},
// 保存送货人电话 姓名
handleSubmitDelivery(item) {
if (!this.deliveryForm.delivery_name) return this.$util.Tips({
title: "请输入送货人姓名!"
})
if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) {
return uni.showToast({
title: "手机号输入有误!",
icon: "none"
});
}
let that = this;
delivery(this.deliveryForm).then(res => {
if (res.status == 200) {
this.$util.Tips({
title: res.message
})
this.$nextTick(()=>{
that.popUpShow = false;
})
}
}).catch((err) => {
that.$util.Tips({
title: err
})
})
},
//收件码
toPostagequ(item){
this.deliveryForm.delivery_name = '';
this.deliveryForm.delivery_id = '';
this.deliveryForm.remark = '';
this.popUpShow = true
logisticsCode(item.order_id).then(res => {
this.deliveryForm.mer_id = item.mer_id;
this.deliveryForm.order_id = item.order_id;
this.popUpShow = true;
// this.popUpShow = true
// logisticsCode(item.order_id).then(res => {
// if (res.status == 200) {
// this.payCodeUrl = res.data.qrcode
// }
// })
if (res.status == 200) {
this.payCodeUrl = res.data.qrcode
}
})
},
// 关闭二维码弹窗
popUpClose() {
@ -412,7 +319,8 @@
url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}`
})
}
postconfirm(this.mer_id, data).then(res => {})
postconfirm(this.mer_id,data).then(res=>{
})
},
more: function() {
this.order = !this.order;
@ -433,7 +341,8 @@
},
copyText: function (e) {
// var copy = e.currentTarget.dataset.copy; //data-copy传过来的数值
let arr = [{
let arr = [
{
name: "收货人姓名",
value: this.orderInfo.real_name
},
@ -649,67 +558,6 @@
</script>
<style lang="scss">
.form {
position: relative;
z-index: 11;
padding: 40rpx 60rpx;
background-color: #fff;
border-radius: 20rpx;
.form-item {
display: flex;
align-items: center;
.form-item-label {
width: 140rpx;
font-size: 28rpx;
color: #333;
font-weight: bold;
margin-right: 20rpx;
}
.form-item-val {
flex: 1;
}
}
.form-btn {
display: flex;
justify-content: center;
margin-top: 50rpx;
.form-btn-cancel {
width: 83px;
height: 60rpx;
line-height: 60rpx;
border-radius: 30rpx;
text-align: center;
color: #2291F8;
border: 2rpx solid #2291F8;
margin-right: 40rpx;
}
.form-btn-confirm {
width: 83px;
height: 60rpx;
line-height: 60rpx;
background: linear-gradient(90deg, #2291F8 0%, #1CD1DC 100%);
border-radius: 30rpx;
text-align: center;
color: #fff;
font-size: 28rpx;
}
.form-btn-cancel:active {
background: rgba(209, 220, 255, .3);
}
.form-btn-confirm:active {
opacity: .8;
}
}
}
/*商户管理订单详情*/
.pos-order-details .header {
background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
@ -967,23 +815,19 @@
text-align: right;
max-width: 450rpx;
}
.order-details .wrapper .item .virtual_image {
// text-align: left;
margin-left: 50rpx;
}
.order-details .wrapper .item .virtual_image .picture{
width: 106rpx;
height: 106rpx;
border-radius: 8rpx;
margin-right: 10rpx;
&:last-child{
margin-right: 0;
}
}
.order-details .wrapper .item .conter .copy {
font-size: 20rpx;
color: #868686;
@ -997,7 +841,6 @@
justify-content: center;
border-radius: 16rpx;
}
.address .copy{
font-size: 20rpx;
color: #868686;
@ -1014,7 +857,6 @@
top: 20rpx;
}
.order-details .wrapper .actualPay {
border-top: 1upx solid #eee;
margin-top: 30upx;
@ -1113,12 +955,10 @@
text-align: right;
font-size: 28upx;
}
.pos-order-goods .goods .money .refund_num{
display: inline-block;
margin-left: 10rpx;
}
.pos-order-goods .goods .money .x-money {
color: #282828;
}
@ -1132,25 +972,20 @@
color: #999;
text-decoration: line-through;
}
.pos-order-goods .cancellate{
font-size: 24rpx;
float: right;
margin-top: 10rpx;
text{
margin-left: 26rpx;
}
}
.pos-order-goods .cancelled{
color: #FF9600;
}
.pos-order-goods .goods .uncancell{
color: #999999;
}
.public-total {
font-size: 28upx;
color: #282828;