xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复冲突

Browse Source 
Signed-off-by: Bluemark <kongdy@bluemark.cn>
This commit is contained in:
Bluemark
2023-12-13 01:56:36 +00:00
committed by Gitee
parent cf2c782c0e 25a82c1812
commit 7c2ab0b7ad
24 changed files with 1231 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sheep/api/app.js
+5 -3
View File
@@ -115,12 +115,14 @@ export default {
formData: {
group,
},
// TODO 芋艿：临时写死
header: {
// Accept: 'text/json',
// Authorization: token,
Accept : '*/*',
'tenant-id' :'1',
Authorization: 'Bearer test247',
Accept : '*/*',
'tenant-id' :'1',
'terminal': 20,
Authorization: 'Bearer test247',
},
success: (uploadFileRes) => {
let result = JSON.parse(uploadFileRes.data);
sheep/api/cart.js
+1
View File
@@ -14,6 +14,7 @@ export default {
request({
url: '/app-api/trade/cart/add',
method: 'POST',
// TODO 芋艿：这里没提示
custom: {
showSuccess: true,
successMsg: '已添加到购物车~',
sheep/api/goods.js
-1
View File
@@ -36,7 +36,6 @@ export default {
showError: false,
},
}),
// 商品评价列表
comment: (id, params = {}) =>
request({
sheep/api/order.js
-6
View File
@@ -85,12 +85,6 @@ export default {
params: data2
})
},
// calc: (data) =>
// request({
// url: 'order/order/calc',
// method: 'POST',
// data,
// }),
// 创建订单
create: (data) =>
request({
sheep/api/pay/channel.js
+14
View File
@@ -0,0 +1,14 @@
import request from '@/sheep/request';
const PayChannelApi = {
// 获得指定应用的开启的支付渠道编码列表
getEnableChannelCodeList: (appId) => {
return request({
url: '/app-api/pay/channel/get-enable-code-list',
method: 'GET',
params: { appId }
});
},
};
export default PayChannelApi;
sheep/api/pay/order.js
+22
View File
@@ -0,0 +1,22 @@
import request from '@/sheep/request';
const PayOrderApi = {
// 获得支付订单
getOrder: (id) => {
return request({
url: '/app-api/pay/order/get',
method: 'GET',
params: { id }
});
},
// 提交支付订单
submitOrder: (data) => {
return request({
url: '/app-api/pay/order/submit',
method: 'POST',
data
});
}
};
export default PayOrderApi;
sheep/api/product/comment.js
+1
View File
@@ -1,6 +1,7 @@
import request from '@/sheep/request';
const CommentApi = {
// 获得商品评价分页
getCommentPage: (spuId, pageNo, pageSize, type) => {
return request({
sheep/api/promotion/activity.js
+1 -1
View File
@@ -13,4 +13,4 @@ const ActivityApi = {
},
};
export default ActivityApi;
export default ActivityApi;
sheep/api/promotion/coupon.js
+30 -26
View File
@@ -1,29 +1,33 @@
import request from '@/sheep/request';
export default {
// 获得优惠劵模板列表
getCouponTemplateListByIds: (ids) => {
return request({
url: '/app-api/promotion/coupon-template/list-by-ids',
method: 'GET',
params: {
ids
},
});
},
// 获得优惠劵模版列表
getCouponTemplateList: (params) => {
return request({
url: `/app-api/promotion/coupon/match-list?price=${params.price}&spuIds=${params.spuIds}&skuIds=${params.skuIds}&categoryIds=${params.categoryIds}`,
method: 'GET',
// params,
});
},
// getCouponTemplateList: (spuId, productScope, count) => {
// return request({
// url: '/app-api/promotion/coupon-template/list',
// method: 'GET',
// params: { spuId, productScope, count },
// });
// },
};
// 获得优惠劵模板列表
getCouponTemplateListByIds: (ids) => {
return request({
url: '/app-api/promotion/coupon-template/list-by-ids',
method: 'GET',
params: { ids },
});
},
// 获得优惠劵模版列表
getCouponTemplateList: (spuId, productScope, count) => {
return request({
url: '/app-api/promotion/coupon-template/list',
method: 'GET',
params: { spuId, productScope, count },
});
},
// 获得匹配指定商品的优惠劵列表
getMatchCouponList: (price, spuIds, skuIds, categoryIds) => {
return request({
url: '/app-api/promotion/coupon/match-list',
method: 'GET',
params: {
price,
spuIds: spuIds.join(','),
skuIds: skuIds.join(','),
categoryIds: categoryIds.join(','),
},
});
}
};
sheep/api/trade/cart.js
+47
View File
@@ -0,0 +1,47 @@
import request2 from '@/sheep/request2';
const CartApi = {
addCart: (data) => {
return request2({
url: '/app-api/trade/cart/add',
method: 'POST',
data: data,
// TODO 芋艿：这里没提示
custom: {
showSuccess: true,
successMsg: '已添加到购物车~',
}
});
},
updateCartCount: (data) => {
return request2({
url: '/app-api/trade/cart/update-count',
method: 'PUT',
data: data
});
},
updateCartSelected: (data) => {
return request2({
url: '/app-api/trade/cart/update-selected',
method: 'PUT',
data: data
});
},
deleteCart: (ids) => {
return request2({
url: '/app-api/trade/cart/delete',
method: 'DELETE',
params: {
ids
}
});
},
getCartList: () => {
return request2({
url: '/app-api/trade/cart/list',
method: 'GET',
});
},
};
export default CartApi;
sheep/api/trade/order.js
+53
View File
@@ -0,0 +1,53 @@
import request2 from '@/sheep/request2';
const OrderApi = {
// 计算订单信息
settlementOrder: (data) => {
const data2 = {
...data,
};
// 移除多余字段
if (!(data.couponId > 0)) {
delete data2.couponId;
}
if (!(data.addressId > 0)) {
delete data2.addressId;
}
// 解决 SpringMVC 接受 List<Item> 参数的问题
delete data2.items;
for (let i = 0; i < data.items.length; i++) {
data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
if (data.items[i].cartId) {
data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
}
}
const queryString = Object.keys(data2)
.map((key) => key + '=' + data2[key])
.join('&');
return request2({
url: `trade/order/settlement?${queryString}`,
method: 'GET',
});
},
// 创建订单
createOrder: (data) => {
return request2({
url: `trade/order/create`,
method: 'POST',
data,
});
},
// 获得订单
getOrder: (id) => {
return request2({
url: `trade/order/get-detail`,
method: 'GET',
params: {
id,
},
});
},
};
export default OrderApi;
sheep/components/s-coupon-select/s-coupon-select.vue
+17 -7
View File
@@ -1,3 +1,4 @@
<!-- 订单确认的优惠劵选择弹窗 -->
<template>
<su-popup
:show="show"
@@ -16,20 +17,21 @@
:enable-back-to-top="true"
>
<view class="subtitle ss-m-l-20">可使用优惠券</view>
<view v-for="(item, index) in state.couponInfo.can_use" :key="index">
<view v-for="(item, index) in state.couponInfo" :key="index">
<s-coupon-list :data="item" type="user" :disabled="false">
<template #default>
<label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
<radio
color="var(--ui-BG-Main)"
style="transform: scale(0.8)"
:checked="state.couponId == item.id"
:checked="state.couponId === item.id"
@tap.stop="radioChange(item.id)"
/>
</label>
</template>
</s-coupon-list>
</view>
<!-- TODO 芋艿：未来接口需要支持下
<view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
<view v-for="item in state.couponInfo.cannot_use" :key="item.id">
<s-coupon-list :data="item" type="user" :disabled="true">
@@ -41,6 +43,7 @@
</template>
</s-coupon-list>
</view>
-->
</scroll-view>
</view>
<view class="modal-footer ss-flex">
@@ -50,8 +53,9 @@
</template>
<script setup>
import { computed, reactive } from 'vue';
const props = defineProps({
modelValue: {
modelValue: { // 优惠劵列表
type: Object,
default() {},
},
@@ -60,21 +64,27 @@
default: false,
},
});
const emits = defineEmits(['confirm', 'close']);
const state = reactive({
couponInfo: computed(() => props.modelValue),
couponId: 0,
couponInfo: computed(() => props.modelValue), // 优惠劵列表
couponId: 0, // 选中的优惠劵编号
});
// 选中优惠劵
function radioChange(couponId) {
if (state.couponId == couponId) {
if (state.couponId === couponId) {
state.couponId = 0;
} else {
state.couponId = couponId;
}
}
// 确认优惠劵
const onConfirm = () => {
emits('confirm', state.couponId);
};
}
</script>
<style lang="scss" scoped>
:deep() {
sheep/components/s-goods-item/s-goods-item.vue
+2 -1
View File
@@ -26,7 +26,7 @@
:style="[{ color: priceColor }]"
v-if="price && Number(price) > 0"
>
￥{{ price }}
￥{{ fen2yuan(price) }}
</view>
<view v-if="score && Number(price) > 0">+</view>
<view class="price-text ss-flex ss-col-center" v-if="score">
@@ -54,6 +54,7 @@
<script setup>
import sheep from '@/sheep';
import { computed } from 'vue';
import { fen2yuan } from '../../hooks/useGoods';
/**
* 订单卡片
*
sheep/hooks/useGoods.js
+69 -18
View File
@@ -82,26 +82,77 @@ export function formatGoodsSwiper(urlList) {
/**
* 格式化订单状态的颜色
* @param type 订单类型
*
* @param order 订单
* @return {string} 颜色的 class 名称
*/
export function formatOrderColor(type) {
switch (type) {
case 'apply_refund':
case 'groupon_ing':
case 'nocomment':
case 'noget':
case 'nosend':
return 'warning-color';
case 'closed':
case 'groupon_invalid':
case 'cancel':
case 'refund_agree':
return 'danger-color';
case 'completed':
return 'success-color';
case 'unpaid':
return 'info-color';
export function formatOrderColor(order) {
if (order.status === 0) {
return 'info-color';
}
if (order.status === 10
|| order.status === 20
|| (order.status === 30 && !order.commentStatus)) {
return 'warning-color';
}
if (order.status === 30 && order.commentStatus) {
return 'success-color';
}
return 'danger-color';
}
/**
* 格式化订单状态
*
* @param order 订单
*/
export function formatOrderStatus(order) {
if (order.status === 0) {
return '待付款';
}
if (order.status === 10 && order.deliveryType === 1) {
return '待发货';
}
if (order.status === 10 && order.deliveryType === 2) {
return '待核销';
}
if (order.status === 20) {
return '待收货';
}
if (order.status === 30 && !order.commentStatus) {
return '待评价';
}
if (order.status === 30 && order.commentStatus) {
return '已完成';
}
return '已关闭';
}
/**
* 处理订单的 button 操作按钮数组
*
* @param order 订单
*/
export function handleOrderButtons(order) {
order.buttons = []
if (order.type === 3) { // 查看拼团
order.buttons.push('combination');
}
if (order.status === 20) { // 确认收货
order.buttons.push('confirm');
}
if (order.logisticsId > 0) { // 查看物流
order.buttons.push('express');
}
if (order.status === 0) { // 取消订单 / 发起支付
order.buttons.push('cancel');
order.buttons.push('pay');
}
if (order.status === 30 && !order.commentStatus) { // 发起评价
order.buttons.push('comment');
}
if (order.status === 40) { // 删除订单
order.buttons.push('delete');
}
}
sheep/platform/pay.js
+99 -33
View File
@@ -3,19 +3,20 @@ import sheep from '@/sheep';
import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
// #endif
import { getRootUrl } from '@/sheep/helper';
import PayOrderApi from '@/sheep/api/pay/order';
/**
* 支付
*
* @param {String} payment = ['wechat','alipay','wallet','offline'] - 支付方式
* @param {String} orderType = ['goods','recharge','groupon'] - 订单类型
* @param {String} orderSN - 订单号
* @param {String} id - 订单号
*/
export default class SheepPay {
constructor(payment, orderType, orderSN) {
constructor(payment, orderType, id) {
this.payment = payment;
this.orderSN = orderSN;
this.id = id;
this.orderType = orderType;
this.payAction();
}
@@ -29,8 +30,8 @@ export default class SheepPay {
alipay: () => {
this.redirectPay(); // 现在公众号可以直接跳转支付宝页面
},
money: () => {
this.moneyPay();
wallet: () => {
this.walletPay();
},
offline: () => {
this.offlinePay();
@@ -43,8 +44,8 @@ export default class SheepPay {
alipay: () => {
this.copyPayLink();
},
money: () => {
this.moneyPay();
wallet: () => {
this.walletPay();
},
offline: () => {
this.offlinePay();
@@ -57,8 +58,8 @@ export default class SheepPay {
alipay: () => {
this.alipay();
},
money: () => {
this.moneyPay();
wallet: () => {
this.walletPay();
},
offline: () => {
this.offlinePay();
@@ -71,8 +72,8 @@ export default class SheepPay {
alipay: () => {
this.redirectPay();
},
money: () => {
this.moneyPay();
wallet: () => {
this.walletPay();
},
offline: () => {
this.offlinePay();
@@ -83,18 +84,21 @@ export default class SheepPay {
}
// 预支付
prepay() {
prepay(channel) {
return new Promise((resolve, reject) => {
let data = {
order_sn: this.orderSN,
payment: this.payment,
id: this.id,
channelCode: channel,
channelExtras: {}
};
if (uni.getStorageSync('openid')) {
data.openid = uni.getStorageSync('openid');
}
sheep.$api.pay.prepay(data).then((res) => {
res.error === 0 && resolve(res);
if (res.error === -1 && res.msg === 'miss_openid') {
PayOrderApi.submitOrder(data).then((res) => {
// 成功时
res.code === 0 && resolve(res);
// 失败时
if (res.code !== 0 && res.msg === 'miss_openid') {
uni.showModal({
title: '微信支付',
content: '请先绑定微信再使用微信支付',
@@ -109,7 +113,7 @@ export default class SheepPay {
});
}
// #ifdef H5
// 微信公众号JSSDK支付
// 微信公众号JSSDK支付 TODO 芋艿：待接入
async wechatOfficialAccountPay() {
let that = this;
let { error, data, msg } = await this.prepay();
@@ -130,21 +134,21 @@ export default class SheepPay {
});
}
//浏览器微信H5支付
//浏览器微信H5支付 TODO 芋艿：待接入
async wechatWapPay() {
const { error, data } = await this.prepay();
if (error === 0) {
const redirect_url = `${getRootUrl()}pages/pay/result?orderSN=${this.orderSN}&payment=${this.payment
const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment
}&orderType=${this.orderType}`;
location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`;
}
}
// 支付链接
// 支付链接 TODO 芋艿：待接入
async redirectPay() {
let { error, data } = await this.prepay();
if (error === 0) {
const redirect_url = `${getRootUrl()}pages/pay/result?orderSN=${this.orderSN}&payment=${this.payment
const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment
}&orderType=${this.orderType}`;
location.href = data.pay_data + encodeURIComponent(redirect_url);
}
@@ -152,7 +156,7 @@ export default class SheepPay {
// #endif
// 微信小程序支付
// 微信小程序支付 TODO 芋艿：待接入
async wechatMiniProgramPay() {
let that = this;
let result = await this.prepay();
@@ -173,18 +177,18 @@ export default class SheepPay {
}
// 余额支付
async moneyPay() {
const { error } = await this.prepay();
error === 0 && this.payResult('success');
async walletPay() {
const { code } = await this.prepay('wallet');
code === 0 && this.payResult('success');
}
// 货到付款
// 货到付款 TODO 芋艿：待接入
async offlinePay() {
const { error } = await this.prepay();
error === 0 && this.payResult('success');
}
// 支付宝复制链接支付
// 支付宝复制链接支付 TODO 芋艿：待接入
async copyPayLink() {
let that = this;
let { error, data } = await this.prepay();
@@ -203,7 +207,7 @@ export default class SheepPay {
}
}
// 支付宝支付
// 支付宝支付 TODO 芋艿：待接入
async alipay() {
let that = this;
const { error, data } = await this.prepay();
@@ -225,7 +229,7 @@ export default class SheepPay {
}
}
// 微信支付
// 微信支付 TODO 芋艿：待接入
async wechatAppPay() {
let that = this;
let { error, data } = await this.prepay();
@@ -246,10 +250,72 @@ export default class SheepPay {
// 支付结果跳转,success:成功，fail:失败
payResult(resultType) {
sheep.$router.redirect('/pages/pay/result', {
orderSN: this.orderSN,
payment: this.payment, //重新支付的时候使用
payState: resultType,
id: this.id,
orderType: this.orderType,
payState: resultType
});
}
}
export function getPayMethods(channels) {
const payMethods = [
{
icon: '/static/img/shop/pay/wechat.png',
title: '微信支付',
value: 'wechat',
disabled: true,
},
{
icon: '/static/img/shop/pay/alipay.png',
title: '支付宝支付',
value: 'alipay',
disabled: true,
},
{
icon: '/static/img/shop/pay/wallet.png',
title: '余额支付',
value: 'wallet',
disabled: true,
},
{
icon: '/static/img/shop/pay/apple.png',
title: 'Apple Pay',
value: 'apple',
disabled: true,
},
{
icon: '/static/img/shop/pay/wallet.png',
title: '模拟支付',
value: 'mock',
disabled: true,
}
];
const platform = sheep.$platform.name
// 1. 处理【微信支付】
const wechatMethod = payMethods[0];
if ((platform === 'WechatOfficialAccount' && channels.includes('wx_pub'))
|| platform === 'WechatMiniProgram' && channels.includes('wx_lite')
|| platform === 'App' && channels.includes('wx_app')) {
wechatMethod.disabled = false;
}
// 2. 处理【支付宝支付】
const alipayMethod = payMethods[1];
if ((platform === 'WechatOfficialAccount' && channels.includes('alipay_wap'))
|| platform === 'WechatMiniProgram' && channels.includes('alipay_wap')
|| platform === 'App' && channels.includes('alipay_app')) {
alipayMethod.disabled = false;
}
// 3. 处理【余额支付】
const walletMethod = payMethods[2];
if (channels.includes('wallet')) {
walletMethod.disabled = false;
}
// 4. 处理【苹果支付】TODO 芋艿：未来接入
// 5. 处理【模拟支付】
const mockMethod = payMethods[4];
if (channels.includes('mock')) {
mockMethod.disabled = false;
}
return payMethods;
}
sheep/store/app.js
+2 -2
View File
@@ -23,8 +23,8 @@ const app = defineStore({
copytime: '', // 版权信息 II
},
platform: {
payment: [], // 支持的支付方式
recharge_payment: [], // 支持的充值支付方式
payment: [], // 支持的支付方式 TODO 芋艿：可删除
recharge_payment: [], // 支持的充值支付方式 TODO 芋艿：可删除
share: {
methods: [], // 支持的分享方式
forwardInfo: {}, // 默认转发信息
sheep/store/cart.js
+93 -110
View File
@@ -1,120 +1,103 @@
import {
defineStore
} from 'pinia';
import cartApi from '@/sheep/api/cart';
import { defineStore } from 'pinia';
import CartApi from '@/sheep/api/trade/cart';
const cart = defineStore({
id: 'cart',
state: () => ({
list: [], // 购物车列表
selectedIds: [], // 已选列表
isAllSelected: false, //是否全选
cartSelectedTotalPrice: '0.00', // 选中项总金额
}),
getters: {
totalPriceSelected: (state) => {
let price = 0;
if (!state.selectedIds.length) return price.toFixed(2);
state.list.forEach((item) => {
price += state.selectedIds.includes(item.id) ?
Number(item.sku.price / 100) * item.count :
0;
});
return price.toFixed(2);
},
},
actions: {
// 获取购物车列表
async getList() {
const {
data,
code
} = await cartApi.list();
if (code === 0) {
this.list = data.validList;
}
},
// 添加购物车
async add(goodsInfo) {
console.log()
const {
code
} = await cartApi.append({
// goods_id: goodsInfo.goods_id,
// goods_num: goodsInfo.goods_num,
// goods_sku_price_id: goodsInfo.id,
count: goodsInfo.goods_num,
skuId: goodsInfo.id,
});
if (code === 0) {
this.getList();
}
},
id: 'cart',
state: () => ({
list: [], // 购物车列表
selectedIds: [], // 已选列表
isAllSelected: false, // 是否全选
totalPriceSelected: 0, // 选中项总金额
}),
actions: {
// 获取购物车列表
async getList() {
const { data, code } = await CartApi.getCartList();
if (code === 0) {
this.list = data.validList;
// 更新购物车
async update(goodsInfo) {
const {
error
} = await cartApi.update({
id: goodsInfo.goods_id,
count: goodsInfo.goods_num,
goods_sku_price_id: goodsInfo.goods_sku_price_id,
});
if (error === 0) {
// this.getList();
}
},
// 计算各种关联属性
this.selectedIds = [];
this.isAllSelected = true;
this.totalPriceSelected = 0;
this.list.forEach((item) => {
if (item.selected) {
this.selectedIds.push(item.id);
this.totalPriceSelected += item.count * item.sku.price;
} else {
this.isAllSelected = false;
}
});
}
},
// 移除购物车
async delete(ids) {
if (typeof ids === 'array') {
ids = ids.join(',');
}
const {
code
} = await cartApi.delete(ids);
if (code === 0) {
this.selectAll(false);
this.getList();
}
},
// 添加购物车
async add(goodsInfo) {
// 添加购物项
const { code } = await CartApi.addCart({
skuId: goodsInfo.id,
count: goodsInfo.goods_num,
});
// 刷新购物车列表
if (code === 0) {
await this.getList();
}
},
// 选择购物车商品
selectSingle(goodsId) {
if (!this.selectedIds.includes(goodsId)) {
this.selectedIds.push(goodsId);
} else {
this.selectedIds.splice(this.selectedIds.indexOf(goodsId), 1);
}
this.isAllSelected = this.selectedIds.length === this.list.length;
},
// 更新购物车
async update(goodsInfo) {
const { code } = await CartApi.updateCartCount({
id: goodsInfo.goods_id,
count: goodsInfo.goods_num,
});
if (code === 0) {
await this.getList();
}
},
// 全选
selectAll(flag) {
this.isAllSelected = flag;
if (!flag) {
this.selectedIds = [];
} else {
this.list.forEach((item) => {
this.selectedIds.push(item.id);
});
}
},
// 移除购物车
async delete(ids) {
const { code } = await CartApi.deleteCart(ids.join(','));
if (code === 0) {
await this.getList();
}
},
// 清空购物车
emptyList() {
this.list = [];
this.selectedIds = [];
this.isAllSelected = false;
this.cartSelectedTotalPrice = '0.00';
},
},
persist: {
enabled: true,
strategies: [{
key: 'cart-store',
}, ],
},
// 单选购物车商品
async selectSingle(goodsId) {
const { code } = await CartApi.updateCartSelected({
ids: [goodsId],
selected: !this.selectedIds.includes(goodsId), // 取反
});
if (code === 0) {
await this.getList();
}
},
// 全选购物车商品
async selectAll(flag) {
const { code } = await CartApi.updateCartSelected({
ids: this.list.map((item) => item.id),
selected: flag
});
if (code === 0) {
await this.getList();
}
},
// 清空购物车
async emptyList() {
await this.delete(this.list.map((item) => item.id));
},
},
persist: {
enabled: true,
strategies: [
{
key: 'cart-store',
},
],
},
});
export default cart;