mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

Browse Source
This commit is contained in:
weipengfei 2024-03-16 18:01:36 +08:00
commit a9de257e24
4 changed files with 1302 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
api/order.js
View File

@ -9,6 +9,14 @@
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
/**
* 上传对公账户凭证
* @param numType boolean true 购物车数量,false=购物车产品数量
*/
export function uploadEnvidenceApi(orderId, url) {
return request.post("order/upload/" + orderId + '?url=' + url);
}
/**
* 获取购物车列表
* @param numType boolean true 购物车数量,false=购物车产品数量
@ -226,45 +234,63 @@ export function postOrderComputed(key, data) {
// 生成订单
export function orderCreate(data) {
return request.post("order/create",data,{ noAuth : true });
return request.post("order/create", data, {
noAuth: true
});
}
// 新的生成订单
export function createOrder(data) {
return request.post("v2/order/create",data,{ noAuth : true });
return request.post("v2/order/create", data, {
noAuth: true
});
}
// 未支付订单
export function groupOrderList(data) {
return request.get("order/group_order_list",data,{ noAuth : true });
return request.get("order/group_order_list", data, {
noAuth: true
});
}
// 批量退款列表
export function refundBatch(id) {
return request.get("refund/batch_product/"+id,{ noAuth : true });
return request.get("refund/batch_product/" + id, {
noAuth: true
});
}
// 退款商品
export function refundProduct(id, data) {
return request.get("refund/product/"+id,data,{ noAuth : true });
return request.get("refund/product/" + id, data, {
noAuth: true
});
}
// 申请退款
export function refundApply(id, data) {
return request.post("refund/apply/"+id,data,{ noAuth : true });
return request.post("refund/apply/" + id, data, {
noAuth: true
});
}
// 退款理由
export function refundMessage() {
return request.get("common/refund_message",{ noAuth : true });
return request.get("common/refund_message", {
noAuth: true
});
}
// 退款列表
export function refundList(data) {
return request.get("refund/list",data,{ noAuth : true });
return request.get("refund/list", data, {
noAuth: true
});
}
// 退款详情
export function refundDetail(id) {
return request.get("refund/detail/"+id,{ noAuth : true });
return request.get("refund/detail/" + id, {
noAuth: true
});
}
// 物流列表
@ -274,17 +300,23 @@ export function expressList() {
// 退回商品提交
export function refundBackGoods(id, data) {
return request.post("refund/back_goods/"+id,data,{ noAuth : true });
return request.post("refund/back_goods/" + id, data, {
noAuth: true
});
}
// 退款记录删除
export function refundDel(id) {
return request.post("refund/del/"+id,{ noAuth : true });
return request.post("refund/del/" + id, {
noAuth: true
});
}
// 退款记录删除
export function refundExpress(id) {
return request.get("refund/express/"+id,{ noAuth : true });
return request.get("refund/express/" + id, {
noAuth: true
});
}
// 核销二维码
@ -318,7 +350,9 @@ export function getReceiptOrder(id){
* @param object data
*/
export function getCallBackUrlApi(key) {
return request.get('common/pay_key/'+key, {},{ noAuth : true});
return request.get('common/pay_key/' + key, {}, {
noAuth: true
});
}
/**
* 发票订单

64
pages/store/home/index.vue
View File

@ -11,12 +11,12 @@
<text class="search-txt">搜索商品名称</text>
<text class="search-btn">搜索</text>
</navigator>
<view class="iconfont icon-gouwuche" style="color: #fff;" @click="toGwc"></view>
</view>
<view class="shop">
<view class="shop-img">
<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar">
<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar"
radius="10">
<template v-slot:loading>
<u-loading-icon color="#999"></u-loading-icon>
</template>
@ -24,7 +24,7 @@
</view>
<view class="shop-info">
<view class="shop-info-title line1">{{store.mer_name}}</view>
<view class="shop-info-title">{{store.mer_name}}</view>
<view class="shop-info-eva">
<view class="star">
<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
@ -32,13 +32,14 @@
<text
style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
</view>
<view class="shop-info-sale">月销2000+</view>
<view class="shop-info-sale">月销{{store.sales}}+</view>
<view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view>
<view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)"></view>
<view v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
</view>
<view class="shop-info-runtime">营业时间 : 90:00－21:00</view>
<view class="shop-info-addr iconfont iconfont-xiangyou">{{store.mer_address}}</view>
<view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation">
{{store.mer_address}}</view>
</view>
<view class="shop-logo">
@ -687,23 +688,37 @@
}
},
// #endif
mounted: function() {
const query = uni.createSelectorQuery().in(this);
// query.select('#store').boundingClientRect(data => {
// this.storeHeight = data.height;
// this.storeTop = data.top;
// }).exec();
},
methods: {
// 购物车
toGwc() {
uni.switchTab({
url: "/pages/order_addcart/order_addcart",
fail(err) {
console.log(err);
}
// 查看地图
showMaoLocation: function() {
if (!this.store.lat || !this.store.long) return this
.$util.Tips({
title: '请设置允许商城访问您的位置！'
});
let that = this,
lat = parseFloat(this.store.lat),
long = parseFloat(this.store.long)
//#ifdef H5
if (that.$wechat.isWeixin() === true) {
that.$wechat.seeLocation({
latitude: Number(lat),
longitude: Number(long),
address: this.store.mer_address ? this.store.mer_address : ''
}).then(res => {
console.log('success');
})
} else {
//#endif
uni.openLocation({
latitude: lat,
longitude: long,
address: this.store.mer_address ? this.store.mer_address : '',
scale: 8,
success: function() {},
});
// #ifdef H5
}
//#endif
},
// 列表高度
@ -1167,8 +1182,8 @@
.header {
position: relative;
padding: 0 34rpx;
height: calc(300rpx + var(--status-bar-height));
padding: 0 34rpx 20rpx;
min-height: calc(300rpx + var(--status-bar-height));
background-color: #40AE36;
.head-menu {
@ -1194,7 +1209,7 @@
align-items: center;
height: 58rpx;
border-radius: 29rpx;
margin: 0 32rpx;
margin-left: 32rpx;
background-color: #FFFFFF;
.iconfont {
@ -1237,6 +1252,8 @@
.shop-img {
margin-right: 20rpx;
border-radius: 10rpx;
overflow: hidden;
}
.shop-info {
@ -1246,6 +1263,7 @@
font-weight: 600;
font-size: 28rpx;
color: #FFFFFF;
word-break: break-word;
}
.shop-info-eva {

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

@ -1518,6 +1518,15 @@
url: goPages + '&status=1'
});
break;
case "public":
//对公账户
return that.$util.Tips({
title: '下单成功,请上传支付凭证!'
}, {
tab: 5,
url: "/pages/users/order_list/index"
});
break;
// #ifdef H5
case 'h5':
let host = window.location.protocol + "//" + window.location.host;

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

@ -7,8 +7,10 @@
<text class="iconfont icon-fanhui" style="font-size: 36rpx;"></text>
</view>
<view class="btn_tab">
<view class="tab_item" :class="{'tab_item_active': sale_type==1}" @click="changeSaleType(1)">用户订单</view>
<view v-if="mer_info.mer_settlement_agree_status" class="tab_item" :class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
<view class="tab_item" :class="{'tab_item_active': sale_type==1}" @click="changeSaleType(1)">
用户订单</view>
<view v-if="mer_info.mer_settlement_agree_status" class="tab_item"
:class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
</view>
<view class="btn_car">
<text class="iconfont icon-gouwuche" style="font-size: 36rpx;"></text>
@ -81,7 +83,8 @@
<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
<view class="info">
<view class="title">预售尾款订单转到这里了！</view>
<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看</view>
<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
</view>
</view>
<view class="photo acea-row row-between">
<view class='picture'>
@ -123,7 +126,8 @@
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
<view class="event_ship event_color">发货时间：
<!--全款预售-->
<text v-if="goods.cart_info.productPresell.presell_type === 1">
<text
v-if="goods.cart_info.productPresell.presell_type === 1">
{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
</text>
<!--定金预售-->
@ -132,13 +136,16 @@
</view>
</view>
<view class='money'>
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
</view>
<view>x{{goods.product_num}}</view>
</view>
</view>
<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
<view v-if="goods.cart_info.productPresell.presell_type === 2"
class="event_price">
定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
尾款待支付 <text class="t-color">￥{{ order.presellOrder.pay_price }}</text>
尾款待支付 <text
class="t-color">￥{{ order.presellOrder.pay_price }}</text>
</view>
</view>
</block>
@ -158,7 +165,8 @@
{{goods.cart_info.product.store_name}}
</view>
<view class='money' v-if="item.orderList[0].activity_type == 4">
<view v-if="goods.cart_info.activeSku">￥{{goods.cart_info.activeSku.active_price}}</view>
<view v-if="goods.cart_info.activeSku">
￥{{goods.cart_info.activeSku.active_price}}</view>
<view>x{{goods.product_num}}</view>
</view>
<view v-else class='money'>
@ -170,11 +178,17 @@
</block>
</view>
</view>
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">共{{item.total_num || 0}}件商品，总金额
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
共{{item.total_num || 0}}件商品，总金额
<text class='money p-color'>￥{{item.pay_price}}</text>
</view>
<view class='bottom acea-row row-right row-middle'>
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>立即付款</view>
<view class='bottom acea-row row-right row-middle' v-if="item.pay_type != 10">
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
立即付款</view>
</view>
<view class='bottom acea-row row-right row-middle' v-else>
<view class='bnt b-color' @click.stop='uploadEnvidence(item.group_order_id)'>
上传凭证</view>
</view>
</view>
</view>
@ -190,7 +204,8 @@
<text class="iconfont icon-xiangyou"></text>
</view>
<view v-if="item.status == 0" class='t-color'>
<text v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
<text
v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
<text v-else>待发货</text>
</view>
<view v-if="item.status == 1" class='t-color'>待收货</view>
@ -199,8 +214,8 @@
<view v-if="item.status == -1" class='t-color'>已退款</view>
</view>
<view v-if="item.activity_type === 2">
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct"
:key="index">
<view class='item-info acea-row row-between row-top'
v-for="(goods,index) in item.orderProduct" :key="index">
<view class='pictrue'>
<image
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
@ -209,7 +224,8 @@
<view class='text acea-row row-between'>
<view class='name '>
<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
<text
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
<view v-if="item.status == 0" class="event_ship event_color">发货时间：
<!--全款预售-->
<text
@ -220,7 +236,8 @@
</view>
</view>
<view style="margin-top: 10rpx;" class="t-color">
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
</view>
</view>
<view class='money'>
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
@ -230,8 +247,8 @@
</view>
</view>
<view v-else>
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct"
:key="index">
<view class='item-info acea-row row-between row-top'
v-for="(goods,index) in item.orderProduct" :key="index">
<view class='pictrue'>
<image
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
@ -245,7 +262,8 @@
<text>{{goods.cart_info.product.store_name}}</text>
</view>
<view style="margin-top: 10rpx;" class="t-color">
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
</view>
</view>
<view class='money' v-if="item.activity_type == 3">
<view v-if="goods.cart_info.productAssistAttr">
@ -253,7 +271,8 @@
<view>x{{goods.product_num}}</view>
</view>
<view class='money' v-else-if="item.activity_type == 4">
<view v-if="goods.cart_info.activeSku">￥{{goods.cart_info.activeSku.active_price}}</view>
<view v-if="goods.cart_info.activeSku">
￥{{goods.cart_info.activeSku.active_price}}</view>
<view>x{{goods.product_num}}</view>
</view>
<view class='money' v-else>
@ -271,34 +290,38 @@
</view>
</view>
<view class='bottom acea-row row-right row-middle'>
<view v-if="!item.receipt && item.status != -1 && item.open_receipt == 1 && item.order_type!==1"
<view
v-if="!item.receipt && item.status != -1 && item.open_receipt == 1 && item.order_type!==1"
class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view>
<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
</block>
<block v-if="item.status == 1">
<view class='bnt cancelBnt' v-if="item.delivery_type == 1 || item.delivery_type == 2"
<view class='bnt cancelBnt'
v-if="item.delivery_type == 1 || item.delivery_type == 2"
@click='goOrderDetails(item.order_id)'>查看物流</view>
<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"
<!-- <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>
</navigator> -->
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
</view>
</block>
<block v-if="item.status == 3">
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
<navigator v-if="community_status == 1 && !item.community_id"
v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
查看详情</view>
<!-- <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> -->
<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
</block>
</view>
@ -339,18 +362,31 @@
orderPay,
groupOrderList,
orderTake,
applyInvoiceApi
applyInvoiceApi,
uploadEnvidenceApi
} from '@/api/order.js';
import { getUserInfo } from '@/api/user.js';
import { openOrderSubscribe } from '@/utils/SubscribeMessage.js';
import {
getUserInfo
} from '@/api/user.js';
import {
openOrderSubscribe
} from '@/utils/SubscribeMessage.js';
import payment from '@/components/payment';
import home from '@/components/home/index.vue';
import addInvoicing from '@/components/addInvoicing';
import { mapGetters } from "vuex";
import {
mapGetters
} from "vuex";
import emptyPage from '@/components/emptyPage.vue';
import { configMap } from '@/utils'
import { HTTP_REQUEST_URL } from '@/config/app';
import { toLogin } from '@/libs/login.js';
import {
configMap
} from '@/utils'
import {
HTTP_REQUEST_URL
} from '@/config/app';
import {
toLogin
} from '@/libs/login.js';
export default {
components: {
payment,
@ -393,6 +429,14 @@
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
},
{
name: "对公转账",
icon: "icon-yuezhifu",
value: 'public',
title: '对公转账',
number: 0,
payStatus: 1
}
],
pay_close: false,
@ -534,6 +578,25 @@
this.pay_order_id = order_id.toString()
this.$set(this, 'totalPrice', pay_price);
},
// 对公转账,上传支付凭证
uploadEnvidence(orderid) {
let that = this;
that.$util.uploadImageOne('upload/image', function(res) {
uploadEnvidenceApi(orderid, res.data.path).then(res => {
if (res.status == 200) {
that.$util.Tips({
title: "上传成功,请等待后台审核!"
})
} else {
that.$util.Tips({
title: res.message
})
}
})
});
},
/**
* 支付成功回调
*
@ -658,7 +721,8 @@
let list = res.data.list || [];
let loadend = list.length < that.limit;
console.log(that.orderList)
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that.orderList);
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
.orderList);
that.$set(that, 'orderList', that.orderList);
that.getProductCount();
that.loadend = loadend;
@ -675,7 +739,8 @@
}).then(res => {
let list = res.data.list || [];
let loadend = list.length < that.limit;
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that.orderList);
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
.orderList);
that.$set(that, 'orderList', that.orderList);
that.getProductCount();
that.loadend = loadend;
@ -1139,11 +1204,13 @@
}
}
}
.new-nav-tab {
margin: 0 !important;
width: 100% !important;
height: auto !important;
border-radius: 0 !important;
.item {
padding: 10rpx !important;
}