From 4ebbbd8b293b81a776561d54a13191c567d17f1a Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Wed, 23 Apr 2025 08:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jiuyi2/api/shop.js | 27 +++++
jiuyi2/common/js/config.js | 4 +-
jiuyi2/pages/index/wallet/get.vue | 26 ++++-
jiuyi2/pages/release/video.vue | 3 +-
jiuyi2/pages/shop/order/index.vue | 6 +-
jiuyi2/pages/shop/store/commodities.vue | 14 ++-
jiuyi2/pages/shop/store/order.vue | 133 ++++++++++++++++--------
jiuyi2/vite.config.js | 4 +-
8 files changed, 159 insertions(+), 58 deletions(-)
diff --git a/jiuyi2/api/shop.js b/jiuyi2/api/shop.js
index 134690f2..a2880293 100644
--- a/jiuyi2/api/shop.js
+++ b/jiuyi2/api/shop.js
@@ -316,6 +316,7 @@ const shop = {
return util.request({
url: `/shopify/appProductionApi/getProductionListByUserId`,
data: param.data,
+ query: param.query,
method: 'GET',
load: true,
})
@@ -537,6 +538,32 @@ const shop = {
load: true,
})
},
+
+ /**
+ * 商家拒绝售后
+ * @param {Object} param
+ */
+ setShopOrderUnrefund(param) {
+ return util.request({
+ url: `/shopify/refundOrder/dealRefundOrderNo`,
+ method: 'POST',
+ data: param.data,
+ load: true,
+ })
+ },
+
+ /**
+ * 商家同意售后
+ * @param {Object} param
+ */
+ setShopOrderRefund(param) {
+ return util.request({
+ url: `/shopify/refundOrder/dealRefundOrderYes`,
+ method: 'POST',
+ data: param.data,
+ load: true,
+ })
+ },
}
export default shop
\ No newline at end of file
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 7b93c528..1082619b 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,9 +6,9 @@ const config = {
// host: 'h5api',
// #endif
// #ifndef H5
- host: 'http://91f.xyz:8080',
+ // host: 'http://91f.xyz:8080',
// host: 'http://liuyd.cpolar.top',
- // host: 'http://5vpc5z.natappfree.cc',
+ host: 'http://heucy7.natappfree.cc',
// #endif
// 是否vivo显示
showVivo: true,
diff --git a/jiuyi2/pages/index/wallet/get.vue b/jiuyi2/pages/index/wallet/get.vue
index 924dd8f3..45dd8894 100644
--- a/jiuyi2/pages/index/wallet/get.vue
+++ b/jiuyi2/pages/index/wallet/get.vue
@@ -3,7 +3,8 @@
import {
reactive,
- ref
+ ref,
+ getCurrentInstance,
} from 'vue';
import {
onLoad,
@@ -14,7 +15,12 @@
import util from '@/common/js/util';
// 接口
import api from '@/api/index.js';
+ // 二级支付
+ import secondPwd from '@/components/mine/payPwd.vue'
+ const {
+ proxy
+ } = getCurrentInstance()
// 表单
const form = reactive({
withdrawAmount: '',
@@ -123,7 +129,7 @@
}
// 点击提现
- function handleSubmit() {
+ function handleShowPwd() {
if (!form.withdrawAmount) {
util.alert('提现金额不能为空')
return
@@ -132,8 +138,8 @@
util.alert(`提现金额不能小于${config.minWithdrawalAmount}`)
return
}
- //
- typeList[typeIndex.value].confirm()
+
+ proxy.$refs.secondPwdRef.open()
}
// 提现到支付宝
@@ -189,6 +195,12 @@
// 获取钱包
util.getPurse()
}
+
+ // 提交
+ function handleSubmit() {
+ //
+ typeList[typeIndex.value].confirm()
+ }
@@ -266,12 +278,16 @@
- 提现
+ 提现
+
+
+
diff --git a/jiuyi2/pages/release/video.vue b/jiuyi2/pages/release/video.vue
index 897df1cb..b46c21c7 100644
--- a/jiuyi2/pages/release/video.vue
+++ b/jiuyi2/pages/release/video.vue
@@ -423,7 +423,8 @@
// 获取已发布的商品列表
function getProductList() {
api.shop.getProductionListByUserId({
- data: {
+ query: {
+ code: 'GIFT_PACK',
pageNum: product.pageNum,
pageSize: product.pageSize,
}
diff --git a/jiuyi2/pages/shop/order/index.vue b/jiuyi2/pages/shop/order/index.vue
index 4e0bc3ec..a4f2309f 100644
--- a/jiuyi2/pages/shop/order/index.vue
+++ b/jiuyi2/pages/shop/order/index.vue
@@ -278,7 +278,7 @@
-
diff --git a/jiuyi2/pages/shop/store/commodities.vue b/jiuyi2/pages/shop/store/commodities.vue
index d5b456a6..1319329b 100644
--- a/jiuyi2/pages/shop/store/commodities.vue
+++ b/jiuyi2/pages/shop/store/commodities.vue
@@ -30,12 +30,12 @@
// 开启监听
addListener()
})
-
+
onUnload(() => {
// 关闭监听
removeListener()
})
-
+
onReachBottom(() => {
// 获取更多商品
getMoreList()
@@ -77,7 +77,7 @@
function getList() {
//
api.shop.getProductionListByUserId({
- data: {
+ query: {
pageSize: product.pageSize,
pageNum: product.pageNum,
}
@@ -161,7 +161,10 @@
- {{item.name}}
+
+ {{item.name}}
+ 礼包专区
+
销量：{{item.sales}}
@@ -191,4 +194,7 @@
\ No newline at end of file
diff --git a/jiuyi2/pages/shop/store/order.vue b/jiuyi2/pages/shop/store/order.vue
index 8c577e7b..d24a0f42 100644
--- a/jiuyi2/pages/shop/store/order.vue
+++ b/jiuyi2/pages/shop/store/order.vue
@@ -118,7 +118,7 @@
// 编辑订单状态文字
if (item.refundStatus != 0) {
item.status_text = {
- '0': '待审核',
+ '0': '待商家审核',
'1': '商家拒绝',
'2': '退款中',
'3': '已退款',
@@ -244,6 +244,45 @@
})
})
}
+
+ /**
+ * 商家拒绝售后
+ * @param {Object} item 订单项
+ */
+ function handleUnrefund(item) {
+ api.shop.setShopOrderUnrefund({
+ data: {
+ // 订单id
+ id: item.refundOrder.id,
+ // 订单编号
+ refundOrderNo: item.orderNo,
+ // 订单金额
+ refundPrice: item.totalPrice,
+ },
+ }).then(res => {
+ if (res.code === 200) {
+ // 重载列表
+ refreshList()
+ return
+ }
+ util.alert({
+ content: res.msg,
+ showCancel: false
+ })
+ })
+ }
+
+ /**
+ * 预览图片
+ * @param {Array} urls
+ * @param {Number} current
+ */
+ function viewImage(urls, current) {
+ uni.previewImage({
+ urls,
+ current,
+ })
+ }
@@ -271,54 +310,66 @@
-
-
+
+
+
+
+
+
-
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 7c3e8398..035c00ad 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,9 +3,9 @@ import {
} from 'vite';
import uni from '@dcloudio/vite-plugin-uni';
-let target = 'http://91f.xyz:8080'
+// let target = 'http://91f.xyz:8080'
// let target = 'http://liuyd.cpolar.top'
-// let target = 'http://e7dtri.natappfree.cc'
+let target = 'http://yjggbt.natappfree.cc'
export default defineConfig({
plugins: [uni()],