Merge branch 'test'

package.json

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

src/pages/admin/withdrawal/index.vue

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

src/pages/index/index.vue

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

src/pages/product/list/index.vue

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

src/pages/users/user_setting/index.vue

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