From 524071f96ca9eeb82d358219063eeeb632f6bea5 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Fri, 13 Jun 2025 10:33:47 +0800
Subject: [PATCH 1/5] xiabin
---
.../src/views/shoppingCarts/shoppingCarts.vue | 21 +++++++++++++------
.../src/views/shoppingCarts/sureOrders.vue | 1 +
.../src/views/userCenter/orderDetails.vue | 3 +++
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
index eb54efa..5bdd4e2 100644
--- a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
+++ b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
@@ -86,10 +86,10 @@
结算
-
+
+
@@ -117,7 +117,7 @@ let isAll = ref(false);
let data = ref([]);
let page = reactive({
current: 1,
- size: 100,
+ size: 20,
});
let ids = ref([]);
@@ -161,6 +161,14 @@ onMounted(() => {
});
});
+const pagination = (value) => {
+ page.current = value;
+ shoppingCart(page).then((res) => {
+ data.value = res.data.records;
+ addIsCheckProperty(data);
+ });
+};
+
function addIsCheckProperty(data) {
if (Array.isArray(data)) {
data.forEach((item) => {
@@ -411,6 +419,7 @@ function removeCheckedItems(data) {
background: $color-fff;
}
.fix-top {
+ z-index: 999;
top: 0;
display: inline-flex;
justify-content: space-between;
@@ -461,8 +470,8 @@ function removeCheckedItems(data) {
bottom: 38px;
}
.fix-bottom {
- // bottom: 30px;
- bottom: 0;
+ bottom: 30px;
+ // bottom: 0;
display: inline-flex;
justify-content: space-between;
width: 100%;
diff --git a/sub-operation-service/src/views/shoppingCarts/sureOrders.vue b/sub-operation-service/src/views/shoppingCarts/sureOrders.vue
index b291c56..24b6e2a 100644
--- a/sub-operation-service/src/views/shoppingCarts/sureOrders.vue
+++ b/sub-operation-service/src/views/shoppingCarts/sureOrders.vue
@@ -40,6 +40,7 @@
+
确认订单信息
diff --git a/sub-operation-service/src/views/userCenter/orderDetails.vue b/sub-operation-service/src/views/userCenter/orderDetails.vue
index bd124f0..cd691cd 100644
--- a/sub-operation-service/src/views/userCenter/orderDetails.vue
+++ b/sub-operation-service/src/views/userCenter/orderDetails.vue
@@ -341,6 +341,9 @@ const back = () => {
.order-list-warp-left {
width: 55%;
height: 70vh;
+ overflow: hidden;
+ overflow-y: scroll;
+ scrollbar-width: none;
.order-list-warp-left-title {
margin-top: 20px;
font-size: 18px;
From ae80ff266f136389660ebf7a0b15da0c25a0a2bc Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Fri, 13 Jun 2025 13:46:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?xiabin=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/store/modules/coop.js | 15 ++++
.../coOp/components/TabBasicInfo.vue | 29 +++----
.../coOp/components/TabBusinessInfo.vue | 32 ++++----
.../coOp/components/TabCreditEvaluation.vue | 32 ++++----
.../coOp/components/TabMember.vue | 76 ++++++++++---------
.../coOp/components/TabRegister.vue | 32 ++++----
.../views/productOperateMain/coOp/index.vue | 16 ++++
7 files changed, 137 insertions(+), 95 deletions(-)
create mode 100644 sub-government-affairs-service/src/store/modules/coop.js
diff --git a/sub-government-affairs-service/src/store/modules/coop.js b/sub-government-affairs-service/src/store/modules/coop.js
new file mode 100644
index 0000000..b87a2f5
--- /dev/null
+++ b/sub-government-affairs-service/src/store/modules/coop.js
@@ -0,0 +1,15 @@
+import { defineStore } from 'pinia';
+import { getEnterList } from '@/apis/businessEntity';
+
+export const useCoop = defineStore('useCoop', {
+ state: () => ({
+ data: {},
+ }),
+ actions: {
+ //订单
+ getData(params) {
+ return Promise.resolve((useCoop().$state.data = params));
+ },
+ },
+ getters: {},
+});
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue
index a7f06d0..14f0296 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue
@@ -32,6 +32,7 @@
+
@@ -72,6 +73,8 @@ import cloneDeep from 'lodash/cloneDeep';
import { CommonUpload } from '@/apis/index';
import { ElMessage } from 'element-plus';
import Attrs from './Attrs.vue';
+import { useCoop } from '../../../../store/modules/coop';
+const localForm = useCoop().$state.data;
const props = defineProps({
modelValue: {
@@ -79,7 +82,7 @@ const props = defineProps({
required: true,
default: () => ({}),
},
- readonly: Boolean,
+ // readonly: Boolean,
});
const ossUrl = 'http://gov-cloud.oss-cn-chengdu.aliyuncs.com/';
@@ -89,16 +92,16 @@ const businessLicenceList = ref([]);
const emit = defineEmits(['update:modelValue']);
// 建立本地副本,避免直接修改 props
-const localForm = ref({ ...props.modelValue });
+// const localForm = ref({ ...props.modelValue });
// 深度监听本地副本的变化,实时更新父组件
-watch(
- localForm,
- (newVal) => {
- emit('update:modelValue', { ...newVal });
- },
- { deep: true }
-);
+// watch(
+// localForm,
+// (newVal) => {
+// emit('update:modelValue', { ...newVal });
+// },
+// { deep: true }
+// );
// watch(
// () => props.modelValue,
// (newVal) => {
@@ -151,21 +154,21 @@ const handleExceed = () => {
};
// 初始化时如果有图片,设置预览
-if (localForm.value.cooperativePhoto) {
+if (localForm.cooperativePhoto) {
cooperativePhotoList.value = [
{
name: '合作社照片',
- url: ossUrl + localForm.value.cooperativePhoto,
+ url: ossUrl + localForm.cooperativePhoto,
status: 'success',
},
];
}
-if (localForm.value.businessLicence) {
+if (localForm.businessLicence) {
businessLicenceList.value = [
{
name: '营业执照',
- url: ossUrl + localForm.value.businessLicence,
+ url: ossUrl + localForm.businessLicence,
status: 'success',
},
];
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue
index 2d829c1..c92b8a2 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue
@@ -71,6 +71,8 @@
import { reactive, watch } from 'vue';
import { Plus } from '@element-plus/icons-vue';
import cloneDeep from 'lodash/cloneDeep';
+import { useCoop } from '../../../../store/modules/coop';
+const localForm = useCoop().$state.data;
const props = defineProps({
modelValue: {
@@ -86,23 +88,23 @@ const props = defineProps({
const emit = defineEmits(['update:modelValue']);
// 本地副本,存放各表的文件列表
-const localForm = reactive(cloneDeep(props.modelValue));
+// const localForm = reactive(cloneDeep(props.modelValue));
// watch 同步回父组件
-watch(
- () => localForm,
- (val) => {
- emit('update:modelValue', { ...val });
- },
- { deep: true }
-);
-watch(
- () => props.modelValue,
- (newVal) => {
- Object.assign(localForm, cloneDeep(newVal));
- },
- { deep: true }
-);
+// watch(
+// () => localForm,
+// (val) => {
+// emit('update:modelValue', { ...val });
+// },
+// { deep: true }
+// );
+// watch(
+// () => props.modelValue,
+// (newVal) => {
+// Object.assign(localForm, cloneDeep(newVal));
+// },
+// { deep: true }
+// );
// 下载模板(可替换为真实下载地址)
function downloadTemplate(type) {
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue
index 572772d..f84a48f 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue
@@ -28,6 +28,8 @@