diff --git a/components/wanghexu-timeslot/wanghexu-timeslot.vue b/components/wanghexu-timeslot/wanghexu-timeslot.vue
new file mode 100644
index 0000000..a5ba27e
--- /dev/null
+++ b/components/wanghexu-timeslot/wanghexu-timeslot.vue
@@ -0,0 +1,290 @@
+
+
+
+
+
+ 取消
+ {{title}}
+ 确认
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+
+ {{item}}时
+
+
+ {{item}}分
+
+
+
+
+
+
+
+
+ {{item}}时
+
+
+ {{item}}分
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c8dc2d2..043e1d1 100644
--- a/pages.json
+++ b/pages.json
@@ -108,6 +108,24 @@
{
"root": "pages/user",
"pages": [
+ {
+ "path": "info/detail",
+ "style": {
+ "navigationBarTitleText": "个人信息"
+ },
+ "meta": {
+ "auth": true
+ }
+ },
+ {
+ "path": "info/index",
+ "style": {
+ "navigationBarTitleText": "修改信息"
+ },
+ "meta": {
+ "auth": true
+ }
+ },
{
"path": "wallet/money",
"style": {
diff --git a/pages/index/my.vue b/pages/index/my.vue
index a7d2124..00a5e98 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -10,9 +10,9 @@
{{ userInfo.mobile }}
-
+
+
+
@@ -102,6 +102,10 @@ function navService(item) {
peach.$router.go(item.path)
}
+function handleNav() {
+ peach.$router.go('/pages/user/info/detail')
+}
+
function logOut() {
uni.showModal({
title: '提示',
diff --git a/pages/user/info/detail.vue b/pages/user/info/detail.vue
new file mode 100644
index 0000000..d9bf62c
--- /dev/null
+++ b/pages/user/info/detail.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+ {{ list[item] }}
+
+
+ {{ res[item] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/info/index.vue b/pages/user/info/index.vue
new file mode 100644
index 0000000..6d4f7a1
--- /dev/null
+++ b/pages/user/info/index.vue
@@ -0,0 +1,441 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/peach/api/member/user.js b/peach/api/member/user.js
index 730ad1c..27acd6d 100644
--- a/peach/api/member/user.js
+++ b/peach/api/member/user.js
@@ -1,46 +1,71 @@
import request from '@/peach/request'
const UserUtil = {
- // 获取用户信息
- getUserInfo: () => {
- return request({
- url: '/particulars/member/get',
- method: 'GET',
- })
- },
+ // 获取用户信息
+ getUserInfo: () => {
+ return request({
+ url: '/particulars/member/get',
+ method: 'GET',
+ })
+ },
- // 获取钱包
- getWalletInfo: () => {
- return request({
- url: '/pay/wallet/get',
- method: 'GET',
- })
- },
+ // 获取钱包
+ getWalletInfo: () => {
+ return request({
+ url: '/pay/wallet/get',
+ method: 'GET',
+ })
+ },
- // 首页统计
- getHomeStatistics: () => {
- return request({
- url: '/statistics/index/get-count',
- method: 'GET',
- })
- },
+ // 首页统计
+ getHomeStatistics: () => {
+ return request({
+ url: '/statistics/index/get-count',
+ method: 'GET',
+ })
+ },
- /**
- * @author Ankkaya
- * @description 用户列表
- * @param {String} mobile - 手机号
- * @param {String} nickname - 用户昵称
- * @param {Number} pageNo - 页码
- * @param {Number} pageSize - 每页条数
- * @returns {Type}
- */
- getUserList: (data) => {
- return request({
- url: '/particulars/point/page-member',
- method: 'GET',
- params: data,
- })
- },
+ /**
+ * @author Ankkaya
+ * @description 用户列表
+ * @param {String} mobile - 手机号
+ * @param {String} nickname - 用户昵称
+ * @param {Number} pageNo - 页码
+ * @param {Number} pageSize - 每页条数
+ * @returns {Type}
+ */
+ getUserList: (data) => {
+ return request({
+ url: '/particulars/point/page-member',
+ method: 'GET',
+ params: data,
+ })
+ },
+
+ // 用户详情
+ getUserDetail: () => {
+ return request({
+ url: '/shop/particulars/get',
+ method: 'GET',
+ })
+ },
+
+ // 修改用户信息
+ editUserInfo: (data) => {
+ return request({
+ url: '/shop/particulars/update',
+ method: 'PUT',
+ data,
+ })
+ },
+
+ // 区域列表
+ getAreaList: () => {
+ return request({
+ url: '/system/area/tree',
+ method: 'GET',
+ })
+ },
}
export default UserUtil
diff --git a/peach/api/trade/goods.js b/peach/api/trade/goods.js
index 6ce6fde..3a78894 100644
--- a/peach/api/trade/goods.js
+++ b/peach/api/trade/goods.js
@@ -137,6 +137,19 @@ const GoodsApi = {
},
})
},
+
+ // 更改商品状态
+ changeProductStatus: (data) => {
+ return request({
+ url: '/product/spu/update-status',
+ method: 'PUT',
+ data,
+ custom: {
+ successMsg: '操作成功',
+ showSuccess: true,
+ },
+ })
+ },
}
export default GoodsApi
diff --git a/peach/components/p-goods-column/p-goods-column.vue b/peach/components/p-goods-column/p-goods-column.vue
index 722a64a..bcdbd05 100644
--- a/peach/components/p-goods-column/p-goods-column.vue
+++ b/peach/components/p-goods-column/p-goods-column.vue
@@ -1,7 +1,12 @@
-
+
+ 商品已下架
+
@@ -180,12 +188,34 @@ function clickGoods(mark) {
}
},
})
+ } else if (mark === 'inventory') {
+ uni.showModal({
+ title: '提示',
+ content: `是否${props.data.status === 1 ? '下架' : '上架'}该商品？`,
+ success: async (res) => {
+ if (res.confirm)
+ await GoodsApi.changeProductStatus({
+ id: props.data.id,
+ status: props.data.status === 1 ? 0 : 1,
+ })
+ emits('refresh')
+ },
+ })
}
}
diff --git a/peach/components/p-toolbar/p-toolbar.vue b/peach/components/p-toolbar/p-toolbar.vue
new file mode 100644
index 0000000..c401a1d
--- /dev/null
+++ b/peach/components/p-toolbar/p-toolbar.vue
@@ -0,0 +1,129 @@
+
+
+
+
+ {{ cancelText }}
+
+
+ {{ title }}
+
+
+ {{ confirmText }}
+
+
+
+
+
+
+
+
diff --git a/static/merchant3.jpg b/static/merchant3.jpg
new file mode 100644
index 0000000..f5b3ba3
Binary files /dev/null and b/static/merchant3.jpg differ