From 931e2e043fb486a6e2bcdf98c3524abb6383091e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=87?= <2020377497@qq.com>
Date: Thu, 11 Jan 2024 11:12:57 +0800
Subject: [PATCH] upda
---
App.vue | 10 ++++---
api/store/user.js | 8 ++++++
api/store/userMembers.js | 8 ++++++
components/yGoods/index.vue | 2 +-
store/index/index.vue | 6 ++++-
store/order/index.vue | 4 +--
store/setup/index.vue | 11 +++++---
store/shop/list.vue | 9 ++++---
store/user/edit.vue | 52 ++++++++++++++++++++++++++++++++++++-
store/user/editGoods.vue | 20 ++++++--------
store/user/list.vue | 12 ++++++---
store/user/memberList.vue | 20 +++++++++++---
12 files changed, 125 insertions(+), 37 deletions(-)
diff --git a/App.vue b/App.vue
index e999e4a..043e271 100644
--- a/App.vue
+++ b/App.vue
@@ -17,14 +17,15 @@ export default {
@import "tailwindcss/base";
@import "tailwindcss/utilities";
-* {
+*,
+page,
+view,
+text {
box-sizing: border-box;
margin: 0;
padding: 0;
}
-
-
*::-webkit-scrollbar {
height: 0px;
width: 0px;
@@ -53,11 +54,12 @@ export default {
page {
// min-height: calc(100vh - 44px);
- min-height: calc(100vh);
+ min-height: calc(100dvh);
background-color: rgb(247 248 250);
box-sizing: border-box;
display: flex;
flex-direction: column;
+ padding-top: var(--status-bar-height);
}
.content {
diff --git a/api/store/user.js b/api/store/user.js
index 5b2b4a2..04e3bfa 100644
--- a/api/store/user.js
+++ b/api/store/user.js
@@ -37,6 +37,14 @@ export default {
})
},
+ UpdateLevel(data) {
+ return request({
+ url: "/admin/user/UpdateLevel",
+ method: "GET",
+ data,
+ })
+ },
+
diff --git a/api/store/userMembers.js b/api/store/userMembers.js
index 1c0e492..4177987 100644
--- a/api/store/userMembers.js
+++ b/api/store/userMembers.js
@@ -44,5 +44,13 @@ export default {
})
},
+ CreateDiscount(data) {
+ return request({
+ url: "/admin/UserMembers/CreateDiscount",
+ method: "POST",
+ data,
+ })
+ },
+
};
\ No newline at end of file
diff --git a/components/yGoods/index.vue b/components/yGoods/index.vue
index 2842e62..78086d6 100644
--- a/components/yGoods/index.vue
+++ b/components/yGoods/index.vue
@@ -2,7 +2,7 @@
- 已选择 {{ LArr.length || 0 }} 件商品
+ 已选择 {{ props.modelValue.length || 0 }} 件商品
diff --git a/store/index/index.vue b/store/index/index.vue
index eed248f..b952d13 100644
--- a/store/index/index.vue
+++ b/store/index/index.vue
@@ -315,4 +315,8 @@ getOrderGood({ index: 0 });
-
+
diff --git a/store/order/index.vue b/store/order/index.vue
index 5fef050..7255306 100644
--- a/store/order/index.vue
+++ b/store/order/index.vue
@@ -136,14 +136,14 @@
-
+
应付: {{ (Number(item.total_price) + Number(item.delivery_money)).toFixed(2) }} 元
余额支付: {{ item.pay_balance }} 元
优惠: {{ ((Number(item.total_price) + Number(item.delivery_money)) -
item.pay_price).toFixed(2) }} 元
-
+ 占位
实付: {{ item.pay_price }} 元
diff --git a/store/setup/index.vue b/store/setup/index.vue
index e18741e..4c1bfde 100644
--- a/store/setup/index.vue
+++ b/store/setup/index.vue
@@ -36,9 +36,9 @@
+ text: 'name',
+ value: 'id',
+ }" v-model="storeData.district" @change="select">
@@ -279,6 +279,9 @@ export default {
-
diff --git a/store/shop/list.vue b/store/shop/list.vue
index d39975b..83b7972 100644
--- a/store/shop/list.vue
+++ b/store/shop/list.vue
@@ -48,9 +48,10 @@
-
-
-
+
+
+
+
@@ -89,7 +90,7 @@ const user_info = uni.getStorageSync("user_info");
const shopList = ref({});
const changeS = async (row) => {
- const { fetchData } = await useApi(shop.editStatus, { loading })
+ const { fetchData, result } = await useApi(shop.editStatus, { loading })
fetchData({
id: row.id,
diff --git a/store/user/edit.vue b/store/user/edit.vue
index 34d6bcc..9fd27b8 100644
--- a/store/user/edit.vue
+++ b/store/user/edit.vue
@@ -18,7 +18,15 @@
- {{ userInfo.nickname }}
+
+ {{ userInfo.nickname }}
+
+
+ v {{ userInfo.user_merge.member_level }}
+
+
+ 修改等级
+
@@ -116,6 +124,9 @@
+
+
+
@@ -125,9 +136,11 @@
import { ref } from 'vue';
import utils from '@/utils/utils.js';
import user from '@/api/store/user.js';
+import userMembers from '@/api/store/userMembers.js';
import yList from "/components/yList/index.vue";
import kevyloading from "@/components/kevy-loading/kevy-loading";
import { useMessage } from '@/uni_modules/wot-design-uni'
+import { useApi } from "@/hooks/useApi.js"
const message = useMessage()
import {
@@ -255,6 +268,43 @@ onLoad(async (e) => {
loading.value = false
})
+const showLv = ref(false);
+const actionsLv = ref([])
+
+const changeLevel = e => {
+ console.log(e);
+ loading.value = true
+ user.UpdateLevel({
+ user_merge_id: userInfo.value.user_merge.id,
+ level: e.item.level,
+ }).then(async (res) => {
+ loading.value = true
+ const data = await user.userItem({ id: userInfo.value.id });
+ userInfo.value = data.data
+ loading.value = false
+
+ })
+}
+
+/**
+ * 获取数据的函数
+ */
+const getmemberList = async () => {
+ const { fetchData } = await useApi(userMembers.LevelShow, { loading })
+
+ fetchData().then(res => {
+ actionsLv.value = res.data.map(item => {
+ return {
+ ...item,
+ subname: `等级 ${item.level}`
+ }
+ });
+ actionsLv.value.ok = true;
+ })
+};
+
+getmemberList()
+