XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test'

Browse Source
This commit is contained in:
YuanHuakk
2023-12-04 21:32:03 +08:00
parent b8ab7699e1 90cfa7938d
commit 659d2fd972
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "jdt-user", "name": "jdt-user",
"version": "3.0.1", "version": "3.0.2",
"private": true, "private": true,
"description": "", "description": "",
"templateInfo": { "templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass" "css": "sass"
}, },
"taroConfig": { "taroConfig": {
"version": "3.0.1" "version": "3.0.2"
}, },
"scripts": { "scripts": {
"build:weapp": "taro build --type weapp", "build:weapp": "taro build --type weapp",

7
src/pages/admin/withdrawal/index.vue
View File

@@ -103,12 +103,11 @@ const getData = async () => {
const res = await getWithdrawList({ const res = await getWithdrawList({
PageNum: pagination.value.page, PageNum: pagination.value.page,
PageSize: pagination.value.showPageSize, PageSize: pagination.value.showPageSize,
Bid: user_info.bid, Bid: user_info.data.bid,
}); });
data.value = res.data.data || []; data.value = res.data.data || [];
pagination.value.totalItems = res.data.total; pagination.value.totalItems = res.data.total;
row.value = res.data.data.integral || 0; row.value = res.data.integral || 0;
console.log(res);
} catch (e) { } catch (e) {
throw e; throw e;
} }
@@ -122,7 +121,7 @@ const add = async () => {
icon: "none", icon: "none",
}); });
const res = await addWithdraw({ const res = await addWithdraw({
Bid: user_info.bid, Bid: user_info.data.bid,
Number: Number(basicData.value.num), Number: Number(basicData.value.num),
}); });
Taro.showToast({ Taro.showToast({

25
src/pages/index/index.vue
View File

@@ -62,19 +62,18 @@ interface SwiperList {
const swiperList = ref<Array<Array<SwiperList>>>([]); const swiperList = ref<Array<Array<SwiperList>>>([]);
const userMenuList = ref([ const userMenuList = ref([
{ // {
id: 1, // id: 1,
label: "活动游戏", // label: "活动游戏",
url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync("token")}`, // url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync("token")}`,
icon: "//jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png", // icon: "//jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png",
}, // },
{ // {
id: 2, // id: 2,
label: "活动商品", // label: "活动商品",
// url: "/pages/hotGoods/index/index", // url: "/pages/hotGoods/index/index",
url: "", // icon: "//jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png",
icon: "//jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png", // },
},
{ {
id: 3, id: 3,
label: "商户入驻", label: "商户入驻",

2
src/pages/product/list/index.vue
View File

@@ -28,7 +28,7 @@ const getData = async () => {
const mey_type = Taro.getStorageSync("mer_type"); const mey_type = Taro.getStorageSync("mer_type");
const user_info = Taro.getStorageSync("userInfo"); const user_info = Taro.getStorageSync("userInfo");
const res = await productList({ const res = await productList({
bid: user_info.bid, bid: user_info.data.bid,
BType: mey_type, BType: mey_type,
}); });
console.log(res); console.log(res);

2
src/pages/users/user_setting/index.vue
View File

@@ -1,7 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import Taro from "@tarojs/taro"; import Taro from "@tarojs/taro";
import { ref } from "vue"; import { ref } from "vue";
import { getPersonalInfo, editPersonalInfo } from "@/api/user"; import { editPersonalInfo } from "@/api/user";
import { View } from "@tarojs/components"; import { View } from "@tarojs/components";
import { BASE_URL } from "@/utils/request"; import { BASE_URL } from "@/utils/request";