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

242
api/order.js
View File

@ -9,19 +9,27 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import request from "@/utils/request.js"; 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=购物车产品数量 * @param numType boolean true 购物车数量,false=购物车产品数量
*/ */
export function getCartCounts(data) { export function getCartCounts(data) {
return request.get("user/cart/count", data); return request.get("user/cart/count", data);
} }
/** /**
* 获取购物车列表 * 获取购物车列表
* *
*/ */
export function getCartList(data) { export function getCartList(data) {
return request.get("user/cart/lst", data); return request.get("user/cart/lst", data);
} }
/** /**
@ -30,74 +38,74 @@ export function getCartList(data) {
* @param int number 修改数量 * @param int number 修改数量
*/ */
export function changeCartNum(cartId, data) { export function changeCartNum(cartId, data) {
return request.post("user/cart/change/"+cartId,data); return request.post("user/cart/change/" + cartId, data);
} }
/** /**
* 清除购物车 * 清除购物车
* @param object ids * @param object ids
*/ */
export function cartDel(data){ export function cartDel(data) {
return request.post('user/cart/delete', data); return request.post('user/cart/delete', data);
} }
/** /**
* 购物车商品属性 * 购物车商品属性
* @param object ids * @param object ids
*/ */
export function cartProductAttr(id){ export function cartProductAttr(id) {
return request.get(`store/product/get_attr_value/${id}`); return request.get(`store/product/get_attr_value/${id}`);
} }
/** /**
* 订单列表 * 订单列表
* @param object data * @param object data
*/ */
export function getOrderList(data){ export function getOrderList(data) {
return request.get('order/list',data); return request.get('order/list', data);
} }
/** /**
* 订单产品信息 * 订单产品信息
* @param string unique * @param string unique
*/ */
export function orderProduct(orderId){ export function orderProduct(orderId) {
return request.get('reply/product/'+orderId); return request.get('reply/product/' + orderId);
} }
/** /**
* 订单评价 * 订单评价
* @param object data * @param object data
* *
*/ */
export function orderComment(id,data){ export function orderComment(id, data) {
return request.post('reply/'+id,data); return request.post('reply/' + id, data);
} }
/** /**
* 订单支付 * 订单支付
* @param object data * @param object data
*/ */
export function orderPay(id,data){ export function orderPay(id, data) {
return request.post('order/pay/'+id,data); return request.post('order/pay/' + id, data);
} }
/** /**
* 积分商品订单支付 * 积分商品订单支付
* @param object data * @param object data
*/ */
export function integralOrderPay(id,data){ export function integralOrderPay(id, data) {
return request.post('order/points/pay/'+id,data); return request.post('order/points/pay/' + id, data);
} }
/** /**
* 订单统计数据 * 订单统计数据
*/ */
export function orderData(data){ export function orderData(data) {
return request.get('order/number', data) return request.get('order/number', data)
} }
/** /**
* 订单取消 * 订单取消
* @param string id * @param string id
* *
*/ */
// export function orderCancel(id){ // export function orderCancel(id){
// return request.post('order/cancel',{id:id}); // return request.post('order/cancel',{id:id});
// } // }
@ -106,57 +114,57 @@ export function orderData(data){
* 未支付订单取消 * 未支付订单取消
* @param string id * @param string id
* *
*/ */
export function unOrderCancel(id){ export function unOrderCancel(id) {
return request.post('order/cancel/'+id); return request.post('order/cancel/' + id);
} }
/** /**
* 删除已完成订单 * 删除已完成订单
* @param string uni * @param string uni
* *
*/ */
export function orderDel(id){ export function orderDel(id) {
return request.post('order/del/'+id); return request.post('order/del/' + id);
} }
/** /**
* 订单详情 * 订单详情
* @param string uni * @param string uni
*/ */
export function getOrderDetail(uni){ export function getOrderDetail(uni) {
return request.get('order/detail/'+uni); return request.get('order/detail/' + uni);
} }
/** /**
* 订单详情 * 订单详情
* @param string uni * @param string uni
*/ */
export function groupOrderDetail(uni){ export function groupOrderDetail(uni) {
return request.get('order/group_order_detail/'+uni); return request.get('order/group_order_detail/' + uni);
} }
// 支付状态订单 // 支付状态订单
export function getPayOrder(uni){ export function getPayOrder(uni) {
return request.get('order/status/'+uni); return request.get('order/status/' + uni);
} }
/** /**
* 再次下单 * 再次下单
* @param string uni * @param string uni
* *
*/ */
export function orderAgain(data){ export function orderAgain(data) {
return request.post('user/cart/again',data); return request.post('user/cart/again', data);
} }
/** /**
* 订单收货 * 订单收货
* @param string uni * @param string uni
* *
*/ */
export function orderTake(uni){ export function orderTake(uni) {
return request.post('order/take/'+uni); return request.post('order/take/' + uni);
} }
/** /**
@ -164,52 +172,52 @@ export function orderTake(uni){
* @returns {*} * @returns {*}
*/ */
export function express(id) { export function express(id) {
return request.post("order/express/" + id); return request.post("order/express/" + id);
} }
/** /**
* 退款单查询物流信息 * 退款单查询物流信息
* @returns {*} * @returns {*}
*/ */
export function refundOrderExpress(merId,id) { export function refundOrderExpress(merId, id) {
return request.get(`server/${merId}/refund/express/${id}`); return request.get(`server/${merId}/refund/express/${id}`);
} }
/** /**
* 获取退款理由 * 获取退款理由
* *
*/ */
export function ordeRefundReason(){ export function ordeRefundReason() {
return request.get('order/refund/reason'); return request.get('order/refund/reason');
} }
/** /**
* 订单退款审核 * 订单退款审核
* @param object data * @param object data
*/ */
export function orderRefundVerify(data){ export function orderRefundVerify(data) {
return request.post('order/refund/verify',data); return request.post('order/refund/verify', data);
} }
/** /**
* 订单确认获取订单详细信息 * 订单确认获取订单详细信息
* @param string cartId * @param string cartId
*/ */
export function orderConfirm(data){ export function orderConfirm(data) {
return request.post('order/check', data); return request.post('order/check', data);
} }
/** /**
* 订单确认获取订单详细信息 * 订单确认获取订单详细信息
* @param string cartId * @param string cartId
*/ */
export function getOrderConfirm(data){ export function getOrderConfirm(data) {
return request.post('v2/order/check', data); return request.post('v2/order/check', data);
} }
/** /**
* 获取当前金额能使用的优惠卷 * 获取当前金额能使用的优惠卷
* @param string price * @param string price
* *
*/ */
export function getCouponsOrderPrice(price, data){ export function getCouponsOrderPrice(price, data) {
return request.get('coupons/order/' + price, data) return request.get('coupons/order/' + price, data)
} }
@ -221,50 +229,68 @@ export function getCouponsOrderPrice(price, data){
* @returns {*} * @returns {*}
*/ */
export function postOrderComputed(key, data) { export function postOrderComputed(key, data) {
return request.post("/order/computed/" + key, data); return request.post("/order/computed/" + key, data);
} }
// 生成订单 // 生成订单
export function orderCreate(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) { 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) { 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) { 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) { 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) { 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() { export function refundMessage() {
return request.get("common/refund_message",{ noAuth : true }); return request.get("common/refund_message", {
noAuth: true
});
} }
// 退款列表 // 退款列表
export function refundList(data) { export function refundList(data) {
return request.get("refund/list",data,{ noAuth : true }); return request.get("refund/list", data, {
noAuth: true
});
} }
// 退款详情 // 退款详情
export function refundDetail(id) { export function refundDetail(id) {
return request.get("refund/detail/"+id,{ noAuth : true }); return request.get("refund/detail/" + id, {
noAuth: true
});
} }
// 物流列表 // 物流列表
@ -273,71 +299,79 @@ export function expressList() {
} }
// 退回商品提交 // 退回商品提交
export function refundBackGoods(id,data) { 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) { export function refundDel(id) {
return request.post("refund/del/"+id,{ noAuth : true }); return request.post("refund/del/" + id, {
noAuth: true
});
} }
// 退款记录删除 // 退款记录删除
export function refundExpress(id) { export function refundExpress(id) {
return request.get("refund/express/"+id,{ noAuth : true }); return request.get("refund/express/" + id, {
noAuth: true
});
} }
// 核销二维码 // 核销二维码
export function verifyCode(id) { export function verifyCode(id) {
return request.get("order/verify_code/"+id); return request.get("order/verify_code/" + id);
} }
/** /**
* 预售尾款支付 * 预售尾款支付
* @param object data * @param object data
*/ */
export function presellOrderPay(id,data){ export function presellOrderPay(id, data) {
return request.post('presell/pay/'+id,data); return request.post('presell/pay/' + id, data);
} }
/** /**
* 发票订单 * 发票订单
* @param object data * @param object data
*/ */
export function receiptOrder(data){ export function receiptOrder(data) {
return request.get('user/receipt/order',data); return request.get('user/receipt/order', data);
} }
/** /**
* 发票订单 * 发票订单
* @param object data * @param object data
*/ */
export function getReceiptOrder(id){ export function getReceiptOrder(id) {
return request.get('user/receipt/order/'+id); return request.get('user/receipt/order/' + id);
} }
/** /**
* 发票订单 * 发票订单
* @param object data * @param object data
*/ */
export function getCallBackUrlApi(key){ export function getCallBackUrlApi(key) {
return request.get('common/pay_key/'+key, {},{ noAuth : true}); return request.get('common/pay_key/' + key, {}, {
noAuth: true
});
} }
/** /**
* 发票订单 * 发票订单
* @param object data * @param object data
*/ */
export function develiveryDetail(id){ export function develiveryDetail(id) {
return request.get(`order/delivery/${id}`); return request.get(`order/delivery/${id}`);
} }
/** /**
* 订单申请开票 * 订单申请开票
* @param object data * @param object data
*/ */
export function applyInvoiceApi(id, data){ export function applyInvoiceApi(id, data) {
return request.post(`order/receipt/${id}`, data); return request.post(`order/receipt/${id}`, data);
} }
/** /**
* 退款单取消申请 * 退款单取消申请
* @param object data * @param object data
*/ */
export function refundCancelApi(id){ export function refundCancelApi(id) {
return request.post(`refund/cancel/${id}`); return request.post(`refund/cancel/${id}`);
} }

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

@ -11,12 +11,12 @@
<text class="search-txt">搜索商品名称</text> <text class="search-txt">搜索商品名称</text>
<text class="search-btn">搜索</text> <text class="search-btn">搜索</text>
</navigator> </navigator>
<view class="iconfont icon-gouwuche" style="color: #fff;" @click="toGwc"></view>
</view> </view>
<view class="shop"> <view class="shop">
<view class="shop-img"> <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> <template v-slot:loading>
<u-loading-icon color="#999"></u-loading-icon> <u-loading-icon color="#999"></u-loading-icon>
</template> </template>
@ -24,7 +24,7 @@
</view> </view>
<view class="shop-info"> <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="shop-info-eva">
<view class="star"> <view class="star">
<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21" <u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
@ -32,13 +32,14 @@
<text <text
style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text> style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
</view> </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-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-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 v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
</view> </view>
<view class="shop-info-runtime">营业时间 : 90:00－21:00</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>
<view class="shop-logo"> <view class="shop-logo">
@ -687,23 +688,37 @@
} }
}, },
// #endif // #endif
mounted: function() {
const query = uni.createSelectorQuery().in(this);
// query.select('#store').boundingClientRect(data => {
// this.storeHeight = data.height;
// this.storeTop = data.top;
// }).exec();
},
methods: { methods: {
// 购物车 // 查看地图
toGwc() { showMaoLocation: function() {
uni.switchTab({ if (!this.store.lat || !this.store.long) return this
url: "/pages/order_addcart/order_addcart", .$util.Tips({
fail(err) { title: '请设置允许商城访问您的位置！'
console.log(err); });
} 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 { .header {
position: relative; position: relative;
padding: 0 34rpx; padding: 0 34rpx 20rpx;
height: calc(300rpx + var(--status-bar-height)); min-height: calc(300rpx + var(--status-bar-height));
background-color: #40AE36; background-color: #40AE36;
.head-menu { .head-menu {
@ -1194,7 +1209,7 @@
align-items: center; align-items: center;
height: 58rpx; height: 58rpx;
border-radius: 29rpx; border-radius: 29rpx;
margin: 0 32rpx; margin-left: 32rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
.iconfont { .iconfont {
@ -1237,6 +1252,8 @@
.shop-img { .shop-img {
margin-right: 20rpx; margin-right: 20rpx;
border-radius: 10rpx;
overflow: hidden;
} }
.shop-info { .shop-info {
@ -1246,6 +1263,7 @@
font-weight: 600; font-weight: 600;
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
word-break: break-word;
} }
.shop-info-eva { .shop-info-eva {

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

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

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

File diff suppressed because it is too large Load Diff