diff --git a/components.d.ts b/components.d.ts
index 6df8adc..8316022 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -23,6 +23,7 @@ declare module '@vue/runtime-core' {
     NutInput: typeof import('@nutui/nutui-taro')['Input']
     NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
     NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
+    NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
     NutPicker: typeof import('@nutui/nutui-taro')['Picker']
     NutPopup: typeof import('@nutui/nutui-taro')['Popup']
     NutPrice: typeof import('@nutui/nutui-taro')['Price']
@@ -33,6 +34,8 @@ declare module '@vue/runtime-core' {
     NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
     NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
     NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
+    NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
     Pay: typeof import('./src/components/Pay.vue')['default']
+    Upload: typeof import('./src/components/Upload.vue')['default']
   }
 }
diff --git a/package.json b/package.json
index dc66776..b53ff35 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "@tarojs/runtime": "3.6.11",
     "@tarojs/shared": "3.6.11",
     "@tarojs/taro": "3.6.11",
+    "dayjs": "^1.11.9",
     "pinia": "^2.1.6",
     "vue": "^3.2.40"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f022802..2bbb069 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,12 +56,12 @@ dependencies:
   '@tarojs/taro':
     specifier: 3.6.11
     version: 3.6.11(postcss@8.4.27)(vue@3.2.40)
+  dayjs:
+    specifier: ^1.11.9
+    version: 1.11.9
   pinia:
     specifier: ^2.1.6
     version: 2.1.6(typescript@4.1.2)(vue@3.2.40)
-  uqrcodejs:
-    specifier: ^4.0.7
-    version: 4.0.7
   vue:
     specifier: ^3.2.40
     version: 3.2.40
@@ -6423,6 +6423,10 @@ packages:
       whatwg-url: 12.0.1
     dev: true
 
+  /dayjs@1.11.9:
+    resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==}
+    dev: false
+
   /debug@2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
@@ -13809,10 +13813,6 @@ packages:
       tslib: 2.6.1
     dev: false
 
-  /uqrcodejs@4.0.7:
-    resolution: {integrity: sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA==}
-    dev: false
-
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
diff --git a/src/api/goods.ts b/src/api/goods.ts
index 11214ea..de1ed3a 100644
--- a/src/api/goods.ts
+++ b/src/api/goods.ts
@@ -25,4 +25,18 @@ export const getActiveGoods = () => request('/goods', {}, 'POST')
 export const getActiveGoodsDetail = (data: object) => request('/goods/details', data, 'POST')
 
 // 活动商品下单
-export const createActiveOrder = (data: object) => request('/order/place', data, 'POST')
\ No newline at end of file
+export const createActiveOrder = (data: object) => request('/order/place', data, 'POST')
+
+// 活动订单列表
+export const getActiveOrderList = (data: object) => request('/user/order', data, 'POST')
+
+// 获取分类列表
+export const getCategoryList = () => request('/goods/class', {}, 'POST')
+
+
+// 活动订单删除
+export const deleteActiveOrder = (data: object) => request('/user/order/remove', data, 'POST')
+
+
+// 积分订单删除
+export const deleteJfOrder = (data: object) => request('/user/point/remove', data, 'POST')
\ No newline at end of file
diff --git a/src/api/order.ts b/src/api/order.ts
index 4b08776..14c7178 100644
--- a/src/api/order.ts
+++ b/src/api/order.ts
@@ -1,4 +1,8 @@
 import request from '@/utils/request'
 
 // 订单支付
-export const payOrder = (data: object) => request('/order/confirmOrder', data, 'POST')
\ No newline at end of file
+export const payOrder = (data: object) => request('/order/confirmOrder', data, 'POST')
+
+
+// 获取订单统计
+export const getOrderStatistics = (data: object) => request('/user/order/count', data, 'POST')
\ No newline at end of file
diff --git a/src/api/user.ts b/src/api/user.ts
index 985f7be..31a425e 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -4,16 +4,18 @@ import request from "@/utils/request";
 export const login = (data: object) => request("/login", data, "POST");
 
 // 获取用户信息
-export const getUserInfo = () => request("/user/detail", {}, "GET");
+// export const getUserInfo = () => request("/user/detail", {}, "GET");
 
 // 获取短信验证码
-export const getVerifyCode = (data: object) => request("/getSmsCode", data, "POST");
+export const getVerifyCode = (data: object) =>
+    request("/getSmsCode", data, "POST");
 
 // 商家入驻申请
-export const applyMer = (data: object) => request("/store/settle", data, "POST");
+export const applyMer = (data: object) =>
+    request("/store/settle", data, "POST");
 
 // 获取商家类型列表
-export const getMerTypeList = () => request("/store/getOther", {},"POST");
+export const getMerTypeList = () => request("/store/getOther", {}, "POST");
 
 // 获取个人信息
 export const getPersonalInfo = () => request("/user/info", {}, "POST");
@@ -22,4 +24,32 @@ export const getPersonalInfo = () => request("/user/info", {}, "POST");
 export const getBanner = () => request("/rotation", {}, "POST");
 
 // 获取积分订单列表
-export const getIntegralOrderList = (data: object) => request("/user/pointOrder", data, "POST");
+export const getIntegralOrderList = (data: object) =>
+    request("/user/pointOrder", data, "POST");
+
+// 修改个人信息
+export const editPersonalInfo = (data: object) =>
+    request("/user/editInfo", data, "POST");
+
+// 积分明细
+export const getIntegralDetail = (data: object) =>
+    request("/user/pulseRecord", data, "POST");
+
+// 豆子明细
+export const getBeanDetail = (data: object) =>
+    request("/user/pointRecord", data, "POST");
+
+// 授权手机号
+export const getPhone = (data: object) =>
+    request("/user/getPhone", data, "POST");
+
+// 获取推广积分明细
+export const getTGIntegralDetail = (data: object) =>
+    request("/user/referee/point", data, "POST");
+
+// 获取推广用户列表
+export const getTGUserList = (data: object) =>
+    request("/user/referee/list", data, "POST");
+
+//  绑定上级
+export const bindParent = (data: object) => request("/user/bindCode", data, "POST");
diff --git a/src/app.config.ts b/src/app.config.ts
index 9658966..72c0bbb 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -15,6 +15,9 @@ export default defineAppConfig({
                 "settled_mer/index",
                 "order_list_detail/index",
                 "account/index",
+                "distribution/index",
+                "distribution/integral/index",
+                "distribution/userlist/index",
             ],
         },
         {
@@ -35,7 +38,7 @@ export default defineAppConfig({
         },
         {
             root: "pages/hotGoods",
-            pages: ["index/index"],
+            pages: ["index/index", "hot_list/index"],
         },
     ],
     window: {
@@ -56,18 +59,18 @@ export default defineAppConfig({
                 selectedIconPath: "static/tabbar/1-002.png",
                 text: "首页",
             },
-            {
-                pagePath: "pages/category/index",
-                iconPath: "static/tabbar/2-001.png",
-                selectedIconPath: "static/tabbar/2-002.png",
-                text: "分类",
-            },
-            {
-                pagePath: "pages/cart/index",
-                iconPath: "static/tabbar/3-001.png",
-                selectedIconPath: "static/tabbar/3-002.png",
-                text: "购物车",
-            },
+            // {
+            //     pagePath: "pages/category/index",
+            //     iconPath: "static/tabbar/2-001.png",
+            //     selectedIconPath: "static/tabbar/2-002.png",
+            //     text: "分类",
+            // },
+            // {
+            //     pagePath: "pages/cart/index",
+            //     iconPath: "static/tabbar/3-001.png",
+            //     selectedIconPath: "static/tabbar/3-002.png",
+            //     text: "购物车",
+            // },
             {
                 pagePath: "pages/user/index",
                 iconPath: "static/tabbar/4-001.png",
@@ -84,4 +87,5 @@ export default defineAppConfig({
     requiredBackgroundModes: ["audio", "location"],
     // @ts-ignore
     requiredPrivateInfos: ["getLocation"],
+    lazyCodeLoading: "requiredComponents",
 });
diff --git a/src/components/Pay.vue b/src/components/Pay.vue
index b17dce0..2df4ad7 100644
--- a/src/components/Pay.vue
+++ b/src/components/Pay.vue
@@ -29,7 +29,7 @@
                 <nut-cell
                     v-if="payType === 'jf'"
                     title="积分支付"
-                    desc="剩余积分:18888"
+                    :desc="`剩余积分:${info.integral || 0}`"
                     is-link
                     @click="goPay()"
                 >
@@ -46,10 +46,12 @@
 </template>
 
 <script setup lang="ts">
+import { ref, watch } from "vue";
 import { IconFont } from "@nutui/icons-vue-taro";
 import Taro from "@tarojs/taro";
 import { payOrder } from "@/api/order";
 import { payJfOrder } from "@/api/goods";
+import { getPersonalInfo } from "@/api/user";
 
 const prop = defineProps({
     isShowPay: {
@@ -70,7 +72,28 @@ const prop = defineProps({
     },
 });
 
-const emit = defineEmits(["closePay"]);
+const emit = defineEmits(["closePay", "successPay"]);
+
+const info = ref<any>({});
+
+watch(
+    () => prop.isShowPay,
+    () => {
+        getInfo();
+    }
+);
+
+const getInfo = async () => {
+    try {
+        const res = await getPersonalInfo();
+        info.value = res.data.data;
+    } catch (error) {
+        Taro.showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
 
 const goPay = async () => {
     if (!prop.jfInfo)
@@ -80,7 +103,6 @@ const goPay = async () => {
         });
     if (prop.payType === "wx") {
         try {
-            console.log(prop.jfInfo);
             const { data } = await payOrder({
                 oid: prop.jfInfo.oid,
             });
@@ -90,16 +112,17 @@ const goPay = async () => {
                 package: data.data.package,
                 signType: data.data.signType,
                 paySign: data.data.paySign,
-                success: function (res) {
-                    console.log(res);
+                success: function () {
                     Taro.showToast({
                         title: "支付成功",
                         icon: "success",
                         duration: 2000,
                     });
+                    Taro.navigateTo({
+                        url: "/pages/hotGoods/hot_list/index",
+                    });
                 },
-                fail: function (res) {
-                    console.log(res);
+                fail: function () {
                     Taro.showToast({
                         title: "支付失败",
                         icon: "none",
@@ -107,6 +130,7 @@ const goPay = async () => {
                     });
                 },
             });
+            emit("closePay", false);
         } catch (e) {
             Taro.showToast({
                 title: e.msg,
@@ -120,8 +144,11 @@ const goPay = async () => {
             icon: "success",
             duration: 2000,
         });
+        Taro.navigateTo({
+            url: "/pages/users/order_list/index",
+        });
+        emit("closePay", false);
     }
-    emit("closePay", false);
 };
 
 const closePay = () => {
diff --git a/src/components/Upload.vue b/src/components/Upload.vue
new file mode 100644
index 0000000..33222b3
--- /dev/null
+++ b/src/components/Upload.vue
@@ -0,0 +1,62 @@
+<template>
+    <view>
+        <nut-uploader
+            v-model:file-list="fileList"
+            :url="config.url"
+            :maximum="max"
+            :headers="config.headers"
+            @success="success"
+            @failure="failure"
+            :multiple="false"
+        ></nut-uploader>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { BASE_URL } from "@/utils/request";
+import { computed, ref } from "vue";
+import Taro from "@tarojs/taro";
+
+const props = defineProps({
+    list: {
+        type: Array,
+        default: () => [],
+    },
+    max: {
+        type: Number,
+        default: 1,
+    },
+});
+
+const emits = defineEmits(["update:list"]);
+
+const fileList = computed({
+    get: () => props.list,
+    set: (val) => emits("update:list", val),
+});
+
+const config = ref({
+    url: `${BASE_URL}/upload`,
+    headers: {
+        token: Taro.getStorageSync("token"),
+    },
+});
+
+const success = (res: any) => {
+    const data = JSON.parse(res.responseText.data);
+    res.fileItem.url = data.data.data;
+    Taro.showToast({
+        title: "上传成功",
+        icon: "success",
+    });
+};
+
+const failure = () => {
+    Taro.showToast({
+        title: "上传失败",
+        icon: "error",
+    });
+};
+</script>
+
+<style lang="scss"></style>
diff --git a/src/pages/admin/verify/index.vue b/src/pages/admin/verify/index.vue
index 9251f1a..6f445ff 100644
--- a/src/pages/admin/verify/index.vue
+++ b/src/pages/admin/verify/index.vue
@@ -34,9 +34,9 @@ const scanCode = () => {
         scanType: ["qrCode"],
         success: async (res) => {
             try {
-                const user = JSON.parse(Taro.getStorageSync("userInfo"));
+                const mer_type = JSON.parse(Taro.getStorageSync("mer_type"));
                 let data;
-                if (user.mer_type === 1) {
+                if (mer_type === 1) {
                     data = await activeOrderVerify({
                         oid: res.result,
                     });
@@ -44,6 +44,7 @@ const scanCode = () => {
                     data = await orderVerify({
                         oid: res.result,
                     });
+                    
                 }
                 Taro.showToast({
                     title: data.msg,
diff --git a/src/pages/category/index.vue b/src/pages/category/index.vue
index cb888d3..98df524 100644
--- a/src/pages/category/index.vue
+++ b/src/pages/category/index.vue
@@ -1,39 +1,43 @@
 <template>
-    <nut-tabs style="height:100vh" v-model="val" title-scroll name="tab4value" direction="vertical">
-        <nut-tab-pane v-for="item in list" :title="(item.name as string)"> Tab {{ item.name }}</nut-tab-pane>
+    <nut-tabs
+        style="height: 100vh"
+        v-model="val"
+        title-scroll
+        name="tab4value"
+        direction="vertical"
+    >
+        <nut-tab-pane v-for="item in list" :title="(item.name as string)">
+            Tab {{ item.name }}</nut-tab-pane
+        >
     </nut-tabs>
 </template>
 
 <script lang="ts" setup>
-import Taro from '@tarojs/taro'
-import {ref} from 'vue'
-import {getMerTypeList} from '@/api/user'
+import Taro from "@tarojs/taro";
+import { ref } from "vue";
+import { getCategoryList } from "@/api/goods";
 
-const val = ref('0')
+const val = ref("0");
 
 interface List {
-    ID?: number
-    name?: string
+    ID?: number;
+    name?: string;
 }
 
-const list = ref<Array<List>>([])
+const list = ref<Array<List>>([]);
 
 Taro.useLoad(() => {
-    getGoodsType()
-    console.log('load')
-})
+    getGoodsType();
+    console.log("load");
+});
 
-Taro.useDidShow(() => {
-})
+Taro.useDidShow(() => {});
 
 // 获取商品分类
 const getGoodsType = async () => {
-    const res = await getMerTypeList()
-    list.value = res.data.class
-}
-
+    const res = await getCategoryList();
+    list.value = res.data.data;
+};
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>
diff --git a/src/pages/game/gamedetail/index.vue b/src/pages/game/gamedetail/index.vue
index fcb2ca7..b24f784 100644
--- a/src/pages/game/gamedetail/index.vue
+++ b/src/pages/game/gamedetail/index.vue
@@ -1,6 +1,11 @@
 <template>
     <view>
-        <view class="head-wrapper" :style="'top:' + statusHeight + 'px'">
+        <view
+            class="head-wrapper"
+            :style="{
+                top: statusHeight + 'px',
+            }"
+        >
             <view class="head-menu">
                 <Left class="iconfont" @click="returns" />
                 <Home class="iconfont" @click="goHome" />
@@ -57,13 +62,13 @@ import {
     navigateTo,
 } from "@tarojs/taro";
 import { Left, Home } from "@nutui/icons-vue-taro";
-var statusBarHeight = (getSystemInfoSync().statusBarHeight as number);
+var statusBarHeight = getSystemInfoSync().statusBarHeight as number;
 
 console.log(statusBarHeight);
 
 const statusHeight = ref<number>(statusBarHeight);
 
-const swiperList = ref([]);
+// const swiperList = ref([]);
 
 useLoad((options) => {
     console.log(options);
@@ -81,7 +86,7 @@ const goHome = () => {
 
 const toGame = () => {
     navigateTo({
-        url: "/pages/game/gamehome/index",
+        url: "/pages/game/gameview/index",
     });
 };
 </script>
diff --git a/src/pages/game/gamehome/index.vue b/src/pages/game/gamehome/index.vue
index e0ba927..1cf7e5e 100644
--- a/src/pages/game/gamehome/index.vue
+++ b/src/pages/game/gamehome/index.vue
@@ -1,43 +1,40 @@
 <template>
     <view>
-        <view
-            v-for="item in listVal"
-            :key="item.id"
-            class="list-box"
-            :class="{ listBoxAnim: item.status }"
-            @click="toDetails(item.id)"
-        >
-            <view>摇骰子</view>
-        </view>
+        <web-view :src="url"></web-view>
     </view>
 </template>
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { useLoad, navigateTo } from "@tarojs/taro";
+import { useLoad } from "@tarojs/taro";
 
-const listVal = ref<any>([]);
+// const listVal = ref<any>([]);
 
-useLoad(() => {
-    getList();
+const url = ref("");
+
+useLoad((options) => {
+    console.log(options);
+    // getList();
+    url.value = `https://www.jdt168.com/public/#/pages/index/index?uid=${options.uid}`;
+    console.log(url.value);
 });
 
-const getList = () => {
-    for (let i = 0; i < 1; i++) {
-        setTimeout(() => {
-            listVal.value.push({
-                id: i,
-                status: true,
-            });
-        }, 50 * i);
-    }
-};
+// const getList = () => {
+//     for (let i = 0; i < 1; i++) {
+//         setTimeout(() => {
+//             listVal.value.push({
+//                 id: i,
+//                 status: true,
+//             });
+//         }, 50 * i);
+//     }
+// };
 
-const toDetails = (id: string) => {
-    navigateTo({
-        url: "/pages/game/gamedetail/index?id=" + id,
-    });
-};
+// const toDetails = (id: string) => {
+//     navigateTo({
+//         url: "/pages/game/gamedetail/index?id=" + id,
+//     });
+// };
 </script>
 
 <style lang="scss">
diff --git a/src/pages/game/gameview/index.config.ts b/src/pages/game/gameview/index.config.ts
index e69de29..f2515b4 100644
--- a/src/pages/game/gameview/index.config.ts
+++ b/src/pages/game/gameview/index.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationBarTitleText: "GameView",
+});
diff --git a/src/pages/game/gameview/index.vue b/src/pages/game/gameview/index.vue
index 5d5480f..e4f70b4 100644
--- a/src/pages/game/gameview/index.vue
+++ b/src/pages/game/gameview/index.vue
@@ -1,13 +1,22 @@
 <template>
-    <view>
-
-    </view>
+    <web-view
+        style="height: 100vh; width: 100vw"
+        :src="`https://www.jdt168.com/public/?uid=${user.uid}`"
+    ></web-view>
 </template>
 
 <script setup lang="ts">
+import { ref } from "vue";
+import { getStorageSync, useLoad } from "@tarojs/taro";
+import { WebView } from "@tarojs/components";
 
+const gameUrl = ref("");
+
+const user = getStorageSync("userInfo");
+
+useLoad(() => {
+    console.log(user);
+});
 </script>
 
-<style lang="scss">
-
-</style>
\ No newline at end of file
+<style lang="scss"></style>
diff --git a/src/pages/goods/goods_detail/index.vue b/src/pages/goods/goods_detail/index.vue
index 8c98fc6..cddd839 100644
--- a/src/pages/goods/goods_detail/index.vue
+++ b/src/pages/goods/goods_detail/index.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="app">
-        <view class="head-wrapper" :style="`top:${BarHeight}px`">
+        <view class="head-wrapper" :style="{ top: BarHeight + 'px' }">
             <view class="head-menu">
                 <Left class="iconfont" @click="returns" />
                 <Home class="iconfont" @click="goHome" />
@@ -14,7 +14,7 @@
             auto-play="3000"
         >
             <nut-swiper-item v-for="(itm, idx) in swiperList" :key="idx">
-                <img :src="itm.url" :alt="itm.id.toString()" />
+                <img :src="itm" :alt="idx.toString()" />
             </nut-swiper-item>
         </nut-swiper>
         <!-- 标题价格 -->
@@ -28,14 +28,21 @@
                 />
             </view>
             <view class="title">{{ goodInfo.name }} </view>
+            <view class="sub">{{ goodInfo.profile }} </view>
         </view>
         <nut-cell title="请选择规格: " is-link @click="openSku"></nut-cell>
         <!-- 产品介绍 -->
         <view class="rich-box">
             <view class="title">产品介绍</view>
-            <view v-if="goodInfo.details" v-html="goodInfo.details"></view>
+            <rich-text
+                v-if="goodInfo.details"
+                class="rich"
+                :nodes="goodInfo.details"
+            ></rich-text>
             <nut-empty v-else description="暂无产品介绍"></nut-empty>
+            
         </view>
+        <view style="height: 9vh"></view>
         <!-- 底部 -->
         <view class="bottom-box">
             <view class="left">
@@ -43,7 +50,11 @@
                     <Home />
                     <view>首页</view>
                 </view>
-                <view class="icon" v-if="payType === 'jf'" @click="toPage('/pages/cart/index')">
+                <view
+                    class="icon"
+                    v-if="payType === 'jf'"
+                    @click="toPage('/pages/cart/index')"
+                >
                     <Cart />
                     <view>购物车</view>
                 </view>
@@ -53,7 +64,7 @@
                 </view>
             </view>
             <!-- 占位 -->
-            <view style="height: 155px"></view>
+            
             <view>
                 <nut-button
                     v-if="payType === 'jf'"
@@ -62,7 +73,10 @@
                     @click="add_cart()"
                     >加入购物车
                 </nut-button>
-                <nut-button :style="payType === 'wx' ? 'width: 200px':''" type="primary" @click="toOrderDetail()"
+                <nut-button
+                    :style="payType === 'wx' ? 'width: 200px' : ''"
+                    type="primary"
+                    @click="toOrderDetail()"
                     >{{ payType === "jf" ? "立即兑换" : "立即购买" }}
                 </nut-button>
             </view>
@@ -118,37 +132,19 @@ import {
     getActiveGoodsDetail,
     addCart,
     createOrder,
-    payOrder,
     createActiveOrder,
 } from "@/api/goods";
 import Pay from "@/components/Pay.vue";
 
 const BarHeight = ref((statusBarHeight as number) + 7);
 
-const swiperList = ref([
-    {
-        id: 1,
-        url: "https://storage.360buyimg.com/jdc-article/NutUItaro34.jpg",
-    },
-    {
-        id: 2,
-        url: "https://storage.360buyimg.com/jdc-article/NutUItaro2.jpg",
-    },
-    {
-        id: 3,
-        url: "https://storage.360buyimg.com/jdc-article/welcomenutui.jpg",
-    },
-    {
-        id: 4,
-        url: "https://storage.360buyimg.com/jdc-article/fristfabu.jpg",
-    },
-]);
+const swiperList = ref([]);
 
 const isSkuShow = ref(false);
 
 const isShowPay = ref(false);
 
-const sku = ref([]);
+// const sku = ref([]);
 
 const payType = ref("");
 
@@ -164,6 +160,7 @@ interface GoodInfo {
     details?: string;
     sku?: any[];
     stock?: number;
+    profile?: string;
 }
 
 const goodInfo = ref<GoodInfo>({});
@@ -177,11 +174,15 @@ const get_good_detail = async (gid: string) => {
     try {
         let res: any;
         if (payType.value === "jf") {
-            res = await getGoodsDetail({ gid: Number(gid) });
+            res = await getGoodsDetail({ gid: gid });
         } else {
             res = await getActiveGoodsDetail({ gid: gid });
         }
         goodInfo.value = res.data.data;
+
+        swiperList.value = res.data.data.rotation.split(",");
+
+        console.log(goodInfo.value);
     } catch (e) {
         Taro.showToast({
             title: e.msg,
@@ -217,13 +218,13 @@ const openSku = () => {
     isSkuShow.value = true;
 };
 
-const selectSku = () => {};
-const clickBtnOperate = () => {};
-const close = () => {};
+// const selectSku = () => {};
+// const clickBtnOperate = () => {};
+// const close = () => {};
 const add_cart = async () => {
     if (isSkuShow.value === false) return openSku();
     try {
-        await addCart({ gid: Number(goodInfo.value.gid) });
+        await addCart({ gid: goodInfo.value.gid });
         Taro.showToast({
             title: "加入购物车成功",
             icon: "success",
@@ -248,20 +249,22 @@ const toOrderDetail = async () => {
         if (payType.value === "jf") {
             res = await createOrder([
                 {
-                    gid: Number(goodInfo.value.gid),
+                    gid: goodInfo.value.gid,
                     count: Number(count.value),
                 },
             ]);
         } else {
             res = await createActiveOrder({
                 gid: goodInfo.value.gid,
-                stock: count.value,
+                stock: Number(count.value),
             });
         }
 
         orderData.value = res.data.data;
 
         isShowPay.value = true;
+
+        count.value = 1;
     } catch (e) {
         Taro.showToast({
             title: e.msg,
@@ -334,7 +337,7 @@ const toPage = (url: string, type: number = 1) => {
 
 .nut-swiper-item img {
     width: 100%;
-    height: 450px;
+    height: 550px;
 }
 
 .card {
@@ -346,6 +349,11 @@ const toPage = (url: string, type: number = 1) => {
         font-weight: bold;
         color: #333;
     }
+
+    .sub {
+        font-size: 24px;
+        color: #999;
+    }
 }
 
 .rich-box {
@@ -361,6 +369,17 @@ const toPage = (url: string, type: number = 1) => {
         font-weight: bold;
         color: #333;
     }
+
+    .rich {
+        box-sizing: border-box;
+        // &[img] {
+        //     max-width: 100%;
+        // }
+
+        // &[alt] {
+        //     max-width: 100%;
+        // }
+    }
 }
 
 .nut-sku {
diff --git a/src/pages/hotGoods/hot_list/index.config.ts b/src/pages/hotGoods/hot_list/index.config.ts
new file mode 100644
index 0000000..d760809
--- /dev/null
+++ b/src/pages/hotGoods/hot_list/index.config.ts
@@ -0,0 +1,4 @@
+export default definePageConfig({
+    navigationBarTitleText: '活动订单',
+  })
+  
\ No newline at end of file
diff --git a/src/pages/hotGoods/hot_list/index.vue b/src/pages/hotGoods/hot_list/index.vue
new file mode 100644
index 0000000..6039d3d
--- /dev/null
+++ b/src/pages/hotGoods/hot_list/index.vue
@@ -0,0 +1,376 @@
+<script lang="ts" setup>
+import { ref } from "vue";
+import {
+    useLoad,
+    useReachBottom,
+    showToast,
+    navigateTo,
+    setStorageSync,
+} from "@tarojs/taro";
+import Pay from "@/components/Pay.vue";
+import { getActiveOrderList, deleteActiveOrder } from "@/api/goods";
+import { getOrderStatistics } from "@/api/order";
+
+const tabValue = ref(0);
+
+const isShowPay = ref(false);
+
+const tabsList = ref([
+    {
+        title: "全部",
+        value: 0,
+        num: 0,
+    },
+    {
+        title: "待付款",
+        value: 1,
+        num: 0,
+    },
+    {
+        title: "待使用",
+        value: 2,
+        num: 0,
+    },
+    {
+        title: "已使用",
+        value: 3,
+        num: 0,
+    },
+    {
+        title: "已失效",
+        value: 4,
+        num: 0,
+    },
+]);
+
+const jfInfo = ref({});
+
+interface OrderList {
+    add_time: string;
+    status: number;
+    BindGoods: {
+        cover: string;
+        name: string;
+        number: number;
+    };
+    count: number;
+    number: number;
+}
+
+const orderList = ref<OrderList[]>([]);
+
+useLoad((options) => {
+    console.log(options);
+    // tabValue.value = Number(options.type);
+    getList();
+});
+
+const countInfo = ref<any>({});
+
+const getTj = async () => {
+    try {
+        const res = await getOrderStatistics({
+            type: 1,
+        });
+        countInfo.value = res.data.data;
+        console.log(res);
+        tabsList.value[0].num = countInfo.value.A;
+        tabsList.value[1].num = countInfo.value.B;
+        tabsList.value[2].num = countInfo.value.C;
+        tabsList.value[3].num = countInfo.value.D;
+        tabsList.value[4].num = countInfo.value.F;
+    } catch (error) {
+        showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
+
+const getList = async () => {
+    try {
+        const res = await getActiveOrderList({
+            status: tabValue.value,
+        });
+        console.log(res);
+        orderList.value = res.data.data;
+    } catch (error) {
+        showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+    getTj();
+};
+
+const tabChange = (index: number) => {
+    tabValue.value = index;
+    getList();
+};
+
+useReachBottom(() => {
+    console.log("useReachBottom");
+});
+
+const openPay = (item: OrderList) => {
+    isShowPay.value = true;
+    jfInfo.value = item;
+};
+
+const errPay = () => {
+    isShowPay.value = false;
+    showToast({
+        title: "支付失败",
+        icon: "none",
+    });
+    jfInfo.value = {};
+    getList();
+};
+
+// const successPay = (val: boolean) => {
+//     isShowPay.value = val;
+//     showToast({
+//         title: "支付成功",
+//         icon: "none",
+//     });
+//     jfInfo.value = {};
+//     getList();
+// };
+
+const closePay = () => {
+    isShowPay.value = false;
+    showToast({
+        title: "支付取消",
+        icon: "none",
+    });
+    jfInfo.value = {};
+    getList();
+};
+
+const toDetail = (item: any) => {
+    setStorageSync("item", item);
+    navigateTo({
+        url: `/pages/users/order_list_detail/index?Id=${item.oid}&type=1`,
+    });
+};
+
+const delOrder = async (oid: string) => {
+    try {
+        const res = await deleteActiveOrder({
+            oid,
+        });
+        console.log(res);
+        getList();
+    } catch (error) {
+        showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
+</script>
+
+<template>
+    <view>
+        <view class="topTips">
+            <view>
+                <view style="font-weight: bold">订单信息</view>
+                <view style="font-size: 15px"
+                    >总消费(元)：{{ countInfo.Total || 0 }}
+                </view>
+            </view>
+            <image src="../static/user/order_list_top.png" />
+        </view>
+        <view class="tabs-box">
+            <view
+                v-for="item in tabsList"
+                :key="item.value"
+                @click="tabChange(item.value)"
+            >
+                <view class="text">{{ item.title }}</view>
+                <view>{{ item.num }}</view>
+                <view
+                    class="line"
+                    :class="{ lineColor: item.value === tabValue }"
+                ></view>
+            </view>
+        </view>
+        <view v-if="orderList.length > 0">
+            <view
+                class="order-card"
+                v-for="(item, index) in orderList"
+                :key="index"
+            >
+                <view class="top">
+                    <view>{{
+                        item.add_time.slice(0, 19).replace("T", " ")
+                    }}</view>
+                    <view style="color: red">{{
+                        item.status === 0
+                            ? "待付款"
+                            : item.status === 1
+                            ? "待使用"
+                            : item.status === 2
+                            ? "已使用"
+                            : "已失效"
+                    }}</view>
+                </view>
+                <view class="line"></view>
+                <view class="center">
+                    <view class="top">
+                        <image :src="item.BindGoods.cover" />
+                        <view class="title">{{ item.BindGoods.name }} </view>
+                        <view class="right">
+                            <view>{{ item.number }}</view>
+                            <view>x{{ item.count }}</view>
+                        </view>
+                    </view>
+                    <!-- <view
+                        class="bom"
+                        style="text-align: right; font-size: 13px"
+                    >
+                        共{{ item.count }}件商品,实付(元):
+                        <text style="color: red">{{ item.number }}</text>
+                    </view> -->
+                </view>
+                <view class="line"></view>
+                <view class="btn">
+                    <nut-button
+                        v-if="item.status === 0"
+                        plain
+                        size="small"
+                        type="primary"
+                        @click="delOrder(item.oid)"
+                        >删除订单
+                    </nut-button>
+                    <nut-button
+                        style="margin-left: 5px"
+                        size="small"
+                        type="primary"
+                        @click="toDetail(item)"
+                        >查看详情
+                    </nut-button>
+                    <nut-button
+                        style="margin-left: 5px"
+                        size="small"
+                        type="primary"
+                        v-if="item.status === 0"
+                        @click="openPay(item)"
+                        >立即付款
+                    </nut-button>
+                </view>
+            </view>
+        </view>
+        <nut-empty v-else description="暂无订单"></nut-empty>
+        <pay
+            :isShowPay="isShowPay"
+            payType="wx"
+            @errPay="errPay"
+            @closePay="closePay"
+            :jfInfo="jfInfo"
+        />
+    </view>
+</template>
+
+<style lang="scss">
+.topTips {
+    box-sizing: border-box;
+    width: 100%;
+    background-color: #ff0000;
+    color: #ffffff;
+    padding: 20px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    image {
+        width: 150px;
+        height: 150px;
+    }
+}
+
+.tabs-box {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    height: auto;
+    background-color: #fff;
+    padding: 0 20px;
+    text-align: center;
+
+    .text {
+        margin: 10px 20px;
+        align-items: center;
+    }
+
+    .line {
+        margin: 0 auto;
+        width: 50px;
+        height: 5px;
+        border-radius: 30px;
+        transition: all 0.3s ease-in-out;
+    }
+
+    .lineColor {
+        background-color: #ff0000;
+    }
+}
+
+.order-card {
+    width: 95%;
+    box-sizing: border-box;
+    margin: 15px auto;
+    background-color: #fff;
+    border-radius: 10px;
+    padding: 20px;
+
+    .line {
+        width: 100%;
+        height: 1px;
+        background-color: #f5f5f5;
+        margin: 10px;
+    }
+
+    .top {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+    .btn {
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+    }
+
+    .center {
+        .top {
+            display: flex;
+            justify-content: space-between;
+            // align-items: flex-start;
+
+            image {
+                width: 150px;
+                height: 150px;
+            }
+
+            .title {
+                margin-left: 10px;
+                display: -webkit-box;
+                overflow: hidden;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                text-overflow: ellipsis;
+                width: 350px;
+            }
+
+            .right {
+                margin-left: 10px;
+                font-size: 28px;
+                text-align: right;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/pages/hotGoods/index/index.vue b/src/pages/hotGoods/index/index.vue
index 8c90926..5872c9b 100644
--- a/src/pages/hotGoods/index/index.vue
+++ b/src/pages/hotGoods/index/index.vue
@@ -3,14 +3,18 @@
         <!-- 金刚区 -->
         <view class="top-box">
             <view class="item">
-                <view>我的订单</view>
+                <view @click="hotGoodsDetail">
+                    <IconFont
+                        name="http://article.biliimg.com/bfs/article/131eda0add8662808d97ffb1191d19bf3e420647.png"
+                        size="40"
+                    />
+                    <view>我的订单</view>
+                </view>
             </view>
             <view class="item">
                 <view></view>
             </view>
-            <view class="item">
-
-            </view>
+            <view class="item"> </view>
             <view class="item">
                 <view></view>
             </view>
@@ -45,6 +49,7 @@
 import { ref } from "vue";
 import { useLoad, navigateTo } from "@tarojs/taro";
 import { getActiveGoods } from "../../../api/goods";
+import { IconFont } from "@nutui/icons-vue-taro";
 
 const list = ref<any>([]);
 
@@ -63,6 +68,12 @@ const toGoodDetails = (id: number) => {
         url: `/pages/goods/goods_detail/index?gid=${id}&type=1`,
     });
 };
+
+const hotGoodsDetail = () => {
+    navigateTo({
+        url: `/pages/hotGoods/hot_list/index`,
+    });
+};
 </script>
 
 <style lang="scss">
@@ -70,14 +81,14 @@ const toGoodDetails = (id: number) => {
     display: flex;
     justify-content: space-between;
     margin: 10px 20px 0 20px;
+    background-color: #fff;
+    border-radius: 10px;
 
     .item {
         width: 150px;
-        height: 150px;
+        padding: 10px;
         background-color: #fff;
-        border-radius: 10px;
         text-align: center;
-        line-height: 150px;
     }
 }
 
diff --git a/src/pages/hotGoods/static/user/order_list_top.png b/src/pages/hotGoods/static/user/order_list_top.png
new file mode 100644
index 0000000..67bfbd7
Binary files /dev/null and b/src/pages/hotGoods/static/user/order_list_top.png differ
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a31cd0c..dfd9fca 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,259 +1,242 @@
 <template>
-  <view class="app">
-    <!--  搜索  -->
-    <nut-searchbar
-        v-model="searchValue"
-        placeholder="要搜索点什么？"
-    ></nut-searchbar>
-    <!--  幻灯片  -->
-    <nut-swiper
-        :init-page="0"
-        :pagination-visible="true"
-        pagination-color="#426543"
-        auto-play="3000"
-    >
-      <nut-swiper-item v-for="(itm, idx) in swiperList" :key="idx">
-        <img :src="itm.url" :alt="itm.id.toString()"/>
-      </nut-swiper-item>
-    </nut-swiper>
-    <!--  金刚区  -->
-    <view class="navbar">
-      <nut-grid :gutter="10" :border="false">
-        <nut-grid-item
-            v-for="item in userMenuList"
-            :key="item.id"
-            :text="item.label"
-            @click="toPage(item.url)"
+    <view class="app">
+        <!--  搜索  -->
+        <nut-searchbar
+            v-model="searchValue"
+            placeholder="要搜索点什么？"
+        ></nut-searchbar>
+        <!--  幻灯片  -->
+        <nut-swiper
+            :init-page="0"
+            :pagination-visible="true"
+            pagination-color="#426543"
+            auto-play="3000"
         >
-          <image :src="item.icon"/>
-        </nut-grid-item>
-      </nut-grid>
-    </view>
-    <!--  标题  -->
-    <view class="titleImg">为你推荐</view>
-    <!--  商品列表  -->
-    <view class="goodBox">
-      <view
-          class="good"
-          v-for="item in list"
-          :key="item.gid"
-          @click.stop="toGoodDetails(item.gid as number)"
-      >
-        <image
-            :src="(item.cover as string)"
-        />
-        <view class="good-text-box">
-          <text class="good-text"
-          >{{ item.name }}
-          </text
-          >
-          <view class="good-price-box">
-            <text class="good-text-price">
-              <text style="font-size: 20px">{{ item.number }}</text>
-              积分
-            </text>
-            <Cart size="20" color="#ff0000" @click.stop="add_cart(item.gid as number)"/>
-          </view>
+            <nut-swiper-item v-for="(itm, idx) in swiperList" :key="idx">
+                <img :src="itm.url" :alt="itm.ID.toString()" />
+            </nut-swiper-item>
+        </nut-swiper>
+        <!--  金刚区  -->
+        <view class="navbar">
+            <nut-grid :gutter="10" :border="false">
+                <nut-grid-item
+                    v-for="item in userMenuList"
+                    :key="item.id"
+                    :text="item.label"
+                    @click="toPage(item.url)"
+                >
+                    <image :src="item.icon" />
+                </nut-grid-item>
+            </nut-grid>
+        </view>
+        <!--  标题  -->
+        <view class="titleImg">为你推荐</view>
+        <!--  商品列表  -->
+        <view class="goodBox">
+            <view
+                class="good"
+                v-for="item in list"
+                :key="item.gid"
+                @click.stop="toGoodDetails(item.gid as number)"
+            >
+                <image :src="(item.cover as string)" />
+                <view class="good-text-box">
+                    <text class="good-text">{{ item.name }} </text>
+                    <view class="good-price-box">
+                        <text class="good-text-price">
+                            <text style="font-size: 20px">{{
+                                item.number
+                            }}</text>
+                            积分
+                        </text>
+                        <!-- <Cart
+                            size="20"
+                            color="#ff0000"
+                            @click.stop="add_cart(item.gid as number)"
+                        /> -->
+                    </view>
+                </view>
+            </view>
         </view>
-      </view>
     </view>
-  </view>
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue'
-import {Cart} from '@nutui/icons-vue-taro'
-import Taro from '@tarojs/taro'
-import {getBanner} from '@/api/user'
-import {getGoodsList, addCart} from '@/api/goods'
+import { ref } from "vue";
+// import { Cart } from "@nutui/icons-vue-taro";
+import Taro from "@tarojs/taro";
+import { getBanner } from "@/api/user";
+import { getGoodsList, addCart } from "@/api/goods";
 
-const searchValue = ref('')
+const searchValue = ref("");
 // const tabvalue = ref("0");
 
-const swiperList = ref([
-  {
-    id: 1,
-    url: 'https://storage.360buyimg.com/jdc-article/NutUItaro34.jpg'
-  },
-  {
-    id: 2,
-    url: 'https://storage.360buyimg.com/jdc-article/NutUItaro2.jpg'
-  },
-  {
-    id: 3,
-    url: 'https://storage.360buyimg.com/jdc-article/welcomenutui.jpg'
-  },
-  {
-    id: 4,
-    url: 'https://storage.360buyimg.com/jdc-article/fristfabu.jpg'
-  }
-])
+const swiperList = ref<any>([]);
 
 const userMenuList = ref([
-  {
-    id: 1,
-    label: '活动游戏',
-    url: '/pages/game/gamehome/index',
-    icon: 'http://jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png'
-  },
-  {
-    id: 2,
-    label: '活动商品',
-    url: '/pages/hotGoods/index/index',
-    icon: 'http://jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png'
-  },
-  {
-    id: 3,
-    label: '商户入驻',
-    url: '/pages/users/settled_mer/index',
-    icon: 'http://jdt168.com/uploads/merchant/20220829/6fe67b93721a42aedc842c4f19d6f2d3.png'
-  },
-  {
-    id: 4,
-    label: '最新资讯',
-    url: '',
-    icon: 'http://jdt168.com/uploads/merchant/20220829/b975136a9b64aab69bf11d75a194f1ea.png'
-  }
-])
+    {
+        id: 1,
+        label: "活动游戏",
+        url: `/pages/game/gamehome/index?uid=${Taro.getStorageSync("token")}`,
+        icon: "http://jdt168.com/uploads/merchant/20220829/caad6be8983e88c41d28da7d124bc37b.png",
+    },
+    {
+        id: 2,
+        label: "活动商品",
+        url: "/pages/hotGoods/index/index",
+        icon: "http://jdt168.com/uploads/def/20230509/d59e7fcb65a88bc56694dae4f9d21b51.png",
+    },
+    {
+        id: 3,
+        label: "商户入驻",
+        url: "/pages/users/settled_mer/index",
+        icon: "http://jdt168.com/uploads/merchant/20220829/6fe67b93721a42aedc842c4f19d6f2d3.png",
+    },
+    {
+        id: 4,
+        label: "最新资讯",
+        url: "",
+        icon: "http://jdt168.com/uploads/merchant/20220829/b975136a9b64aab69bf11d75a194f1ea.png",
+    },
+]);
 
 interface List {
-  gid?: number
-  name?: string
-  number?: number
-  cover?: string
+    gid?: number;
+    name?: string;
+    number?: number;
+    cover?: string;
 }
 
-const list = ref<Array<List>>([])
+const list = ref<Array<List>>([]);
 
 Taro.useLoad(() => {
-  getBannerList()
-  get_goods_list()
-})
+    getBannerList();
+    get_goods_list();
+});
 
 const get_goods_list = async () => {
-  const {data} = await getGoodsList()
-  list.value = data.data
-}
+    const { data } = await getGoodsList();
+    list.value = data.data;
+};
 
 const getBannerList = async () => {
-  const {data}: any = await getBanner()
-  console.log(data)
-}
+    const { data }: any = await getBanner();
+    swiperList.value = data.data;
+};
 
-const add_cart = async (gid: number) => {
-  try {
-    await addCart({gid: Number(gid)})
-    Taro.showToast({
-      title: '加入购物车成功',
-      icon: 'success',
-      duration: 2000
-    })
-  } catch (e) {
-    Taro.showToast({
-      title: e.msg,
-      icon: 'none'
-    })
-  }
-
-}
+// const add_cart = async (gid: number) => {
+//     try {
+//         await addCart({ gid });
+//         Taro.showToast({
+//             title: "加入购物车成功",
+//             icon: "success",
+//             duration: 2000,
+//         });
+//     } catch (e) {
+//         Taro.showToast({
+//             title: e.msg,
+//             icon: "none",
+//         });
+//     }
+// };
 
 const toPage = (url: string) => {
-  Taro.navigateTo({
-    url: url
-  })
-}
+    Taro.navigateTo({
+        url: url,
+    });
+};
 
 const toGoodDetails = (gid: number) => {
-  Taro.navigateTo({
-    url: `/pages/goods/goods_detail/index?gid=${gid}`
-  })
-}
+    Taro.navigateTo({
+        url: `/pages/goods/goods_detail/index?gid=${gid}`,
+    });
+};
 </script>
 
 <style lang="scss">
 .app {
-  box-sizing: border-box;
-  background-color: #f5f5f5;
+    box-sizing: border-box;
+    background-color: #f5f5f5;
 }
 
 .nut-swiper-item img {
-  width: 100%;
-  height: 350px;
+    width: 100%;
+    height: 350px;
 }
 
 .titleImg {
-  margin-top: 10px;
-  width: 100%;
-  height: 50px;
-  box-sizing: border-box;
-  background-image: url("~@/static/index/index-title.png");
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 50%;
-  text-align: center;
-  line-height: 50px;
-  color: #ff0000;
-  font-weight: bold;
+    margin-top: 10px;
+    width: 100%;
+    height: 50px;
+    box-sizing: border-box;
+    background-image: url("~@/static/index/index-title.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 50%;
+    text-align: center;
+    line-height: 50px;
+    color: #ff0000;
+    font-weight: bold;
 }
 
 .navbar {
-  background-color: #ffffff;
+    background-color: #ffffff;
 
-  image {
-    width: 80px;
-    height: 80px;
-  }
+    image {
+        width: 80px;
+        height: 80px;
+    }
 }
 
 .goodBox {
-  display: flex;
-  padding: 20px;
-  flex-wrap: wrap;
-  justify-content: space-between;
+    display: flex;
+    padding: 20px;
+    flex-wrap: wrap;
+    justify-content: space-between;
 
-  .good {
-    width: 340px;
-    background-color: #fff;
-    margin-bottom: 20px;
-    border-bottom-left-radius: 15px;
-    border-bottom-right-radius: 15px;
+    .good {
+        width: 340px;
+        background-color: #fff;
+        margin-bottom: 20px;
+        border-bottom-left-radius: 15px;
+        border-bottom-right-radius: 15px;
 
-    image {
-      width: 100%;
-      height: 350px;
-    }
-
-    .good-text-box {
-      padding: 10px;
-
-      .good-text {
-        flex-shrink: 0;
-        font-size: 28px;
-        color: #333;
-        font-weight: 400;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        overflow: hidden;
-        word-break: break-word;
-      }
-
-      .good-price-box {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-top: 10px;
-
-        .good-text-price {
-          font-size: 28px;
-          font-weight: bold;
-          color: #ff0000;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 1;
-          overflow: hidden;
+        image {
+            width: 100%;
+            height: 350px;
+        }
+
+        .good-text-box {
+            padding: 10px;
+
+            .good-text {
+                flex-shrink: 0;
+                font-size: 28px;
+                color: #333;
+                font-weight: 400;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
+                overflow: hidden;
+                word-break: break-word;
+            }
+
+            .good-price-box {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-top: 10px;
+
+                .good-text-price {
+                    font-size: 28px;
+                    font-weight: bold;
+                    color: #ff0000;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 1;
+                    overflow: hidden;
+                }
+            }
         }
-      }
     }
-  }
 }
 </style>
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index 46bec3c..e35dc54 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -3,24 +3,33 @@
         <view
             class="user-center-card__header__transparent"
             v-if="isLogin"
-            :style="{width: isLogin ? '100%' : '70%'}"
+            :style="{ width: isLogin ? '100%' : '70%' }"
         >
             <view class="user-center-card__header__avatar">
                 <nut-avatar size="large">
-                    <img
-                        :src="userInfo.avatarUrl"
-                    />
+                    <img :src="userInfo.avatarUrl" />
                 </nut-avatar>
             </view>
             <view class="user-center-card__header__info">
-                <view class="user-center-card__header__info__name">{{ userInfo.nickName }}</view>
-                <view class="user-center-card__header__info__desc"
-                >ID:{{ userInfo.ID }}
-                </view
-                >
+                <view class="user-center-card__header__info__name">{{
+                    userInfo.nickName
+                }}</view>
+                <view v-if="!userInfo.phone">
+                    <nut-button
+                        size="mini"
+                        open-type="getPhoneNumber"
+                        @getphonenumber="getphonenumber"
+                        >点击绑定手机号
+                    </nut-button>
+                </view>
             </view>
             <view class="rightIcon">
-                <Setting @click="toSetting" size="22"/>
+                <Scan style="margin-right: 20px" @click="scanCode" size="22" />
+                <Setting
+                    style="margin-right: 20px"
+                    @click="toSetting"
+                    size="22"
+                />
             </view>
         </view>
         <view v-else class="user-center-card__header__transparent">
@@ -35,9 +44,8 @@
                 <view
                     class="user-center-card__header__info__name"
                     @tap="clickLogin"
-                >点击立即授权
-                </view
-                >
+                    >点击立即授权
+                </view>
             </view>
         </view>
         <view class="container">
@@ -47,24 +55,40 @@
                     <view>我的订单</view>
                     <view class="sub" @click="toOrderList(0)">
                         <view>全部订单</view>
-                        <ArrowRight/>
+                        <ArrowRight />
                     </view>
                 </view>
                 <view class="center">
                     <view class="center-t" @click="toOrderList(1)">
-                        <Order size="25px"/>
+                        <!-- <Order size="25px"/> -->
+                        <IconFont
+                            name="http://article.biliimg.com/bfs/article/131eda0add8662808d97ffb1191d19bf3e420647.png"
+                            size="40"
+                        />
                         <view class="center-text">待付款</view>
                     </view>
                     <view class="center-t" @click="toOrderList(2)">
-                        <Clock size="25px"/>
+                        <!-- <Clock size="25px"/> -->
+                        <IconFont
+                            name="http://article.biliimg.com/bfs/article/002434c9ed4774cb732517eb27e0ff547a41c606.png"
+                            size="40"
+                        />
                         <view class="center-text">待使用</view>
                     </view>
                     <view class="center-t" @click="toOrderList(3)">
-                        <Shop size="25px"/>
+                        <!-- <Shop size="25px"/> -->
+                        <IconFont
+                            name="http://article.biliimg.com/bfs/article/7c2ca0228180fe5f3b1d74b0043d80e76c42eb7d.png"
+                            size="40"
+                        />
                         <view class="center-text">已使用</view>
                     </view>
                     <view class="center-t" @click="toOrderList(4)">
-                        <Del size="25px"/>
+                        <!-- <Del size="25px"/> -->
+                        <IconFont
+                            name="http://article.biliimg.com/bfs/article/c4f4e069dddfa7104f794a46a759a7ed478b81ea.png"
+                            size="40"
+                        />
                         <view class="center-text">已失效</view>
                     </view>
                 </view>
@@ -89,7 +113,7 @@
             </view>
 
             <!--  商家管理  -->
-            <view class="mer-box" v-if="userInfo.bid !== 0">
+            <view class="mer-box" v-if="userInfo.bid">
                 <nut-grid :gutter="10" :border="false">
                     <nut-grid-item
                         :border="false"
@@ -101,12 +125,12 @@
                             name="https://img11.360buyimg.com/imagetools/jfs/t1/137646/13/7132/1648/5f4c748bE43da8ddd/a3f06d51dcae7b60.png"
                         ></IconFont>
                     </nut-grid-item>
-                    <nut-grid-item text="订单统计">
+                    <!-- <nut-grid-item text="订单统计">
                         <IconFont
                             size="50"
                             name="https://img11.360buyimg.com/imagetools/jfs/t1/137646/13/7132/1648/5f4c748bE43da8ddd/a3f06d51dcae7b60.png"
                         ></IconFont>
-                    </nut-grid-item>
+                    </nut-grid-item> -->
                 </nut-grid>
             </view>
 
@@ -114,73 +138,85 @@
             <!--<view class="copy">© 2023 </view>-->
         </view>
         <!-- 登录 -->
-        <Auth :visible="isShowLogin" @update:visible="cancelLogin" @ok="getUserInfo"/>
+        <Auth
+            :visible="isShowLogin"
+            @update:visible="cancelLogin"
+            @ok="getUserInfo"
+        />
     </view>
 </template>
 
 <script lang="ts" setup>
-import {ref} from 'vue'
-import {
-    ArrowRight,
-    Order,
-    Del,
-    Clock,
-    Shop,
-    Setting,
-    IconFont
-} from '@nutui/icons-vue-taro'
-import Taro from '@tarojs/taro'
-import Auth from '@/components/Auth.vue'
-import {getPersonalInfo} from '@/api/user'
+import { ref } from "vue";
+import { ArrowRight, Setting, IconFont, Scan } from "@nutui/icons-vue-taro";
+import Taro from "@tarojs/taro";
+import Auth from "@/components/Auth.vue";
+import { getPersonalInfo, getPhone, bindParent } from "@/api/user";
 
-const isShowLogin = ref(false)
+const isShowLogin = ref(false);
 
-const isLogin = ref(false)
+const isLogin = ref(false);
 
 interface UserInfo {
-    nickName?: string
-    avatarUrl?: string
-    ID?: string
-    bid?: number
+    nickName?: string;
+    avatarUrl?: string;
+    ID?: string;
+    bid?: string;
+    phone?: string;
+    uid?: string;
 }
 
-const userInfo = ref<UserInfo>({})
+const userInfo = ref<UserInfo>({});
 
-Taro.useLoad(() => {
-    const token = Taro.getStorageSync('token')
+Taro.useDidShow(() => {
+    const token = Taro.getStorageSync("token");
     if (token) {
-        getUserInfo()
+        getUserInfo();
     }
-})
+});
 
 const cancelLogin = () => {
-    isShowLogin.value = false
-}
+    isShowLogin.value = false;
+};
 
 const getUserInfo = async () => {
     Taro.showLoading({
-        title: '加载中'
-    })
-    const res = await getPersonalInfo()
-    userInfo.value = res.data.data
-    Taro.setStorageSync('userInfo', res.data.data)
-    isLogin.value = true
-    cancelLogin()
-    Taro.hideLoading()
-}
+        title: "加载中",
+    });
+    const res = await getPersonalInfo();
+    userInfo.value = res.data.data;
+    Taro.setStorageSync("userInfo", res.data.data);
+    Taro.setStorageSync("mer_type", res.data.store_type);
+    isLogin.value = true;
+    cancelLogin();
+    Taro.hideLoading();
+};
+
+const getphonenumber = async (e: any) => {
+    await getPhone({
+        uid: userInfo.value.uid,
+        code: e.detail.code,
+    });
+    getUserInfo();
+};
 
 const toOrderList = (e: number) => {
+    if (!isLogin)
+        return Taro.showToast({
+            title: "请先登录",
+            icon: "none",
+        });
     Taro.navigateTo({
-        url: `/pages/users/order_list/index?type=${e}`
-    })
-}
+        url: `/pages/users/order_list/index?type=${e}`,
+    });
+};
 
 const userMenuList = ref([
     {
         id: 1,
-        label: '我的账户',
-        url: '/pages/users/account/index',
-        icon: 'http://jdt168.com/uploads/default/20220829/e819815623276fdbb9a54d685292e5c7.png'
+        label: "我的账户",
+        url: "/pages/users/account/index",
+        icon: "http://jdt168.com/uploads/default/20220829/e819815623276fdbb9a54d685292e5c7.png",
     },
     // {
     //     id: 2,
@@ -190,40 +226,62 @@ const userMenuList = ref([
     // },
     {
         id: 3,
-        label: '分销中心',
-        url: '',
-        icon: 'http://jdt168.com/uploads/default/20220829/73656833c1d849c050638f9ee9903b9d.png'
+        label: "我的推广",
+        url: "/pages/users/distribution/index",
+        icon: "http://jdt168.com/uploads/default/20220829/73656833c1d849c050638f9ee9903b9d.png",
     },
     {
         id: 4,
-        label: '关注商家',
-        url: '',
-        icon: 'http://jdt168.com/uploads/default/20220829/13637589cd20785aa21fca1d4f9b26bc.png'
+        label: "关注商家",
+        url: "",
+        icon: "http://jdt168.com/uploads/default/20220829/13637589cd20785aa21fca1d4f9b26bc.png",
     },
     {
         id: 5,
-        label: '问题反馈',
-        url: '',
-        icon: 'http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png'
-    }
-])
+        label: "问题反馈",
+        url: "",
+        icon: "http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png",
+    },
+]);
 
 const toSetting = () => {
     Taro.navigateTo({
-        url: '/pages/users/setting/index'
-    })
-}
+        url: "/pages/users/setting/index",
+    });
+};
 
 const clickLogin = () => {
-    isShowLogin.value = true
-}
+    isShowLogin.value = true;
+};
 
 const toPage = (url: string) => {
-    console.log(url)
     Taro.navigateTo({
-        url: url
-    })
-}
+        url: url,
+    });
+};
+
+const scanCode = () => {
+    Taro.scanCode({
+        onlyFromCamera: true,
+        scanType: ["qrCode"],
+        success: async (data) => {
+            try {
+                await bindParent({
+                    uid: data.result,
+                });
+                Taro.showToast({
+                    title: "绑定成功",
+                    icon: "none",
+                });
+            } catch (error) {
+                Taro.showToast({
+                    title: error.msg,
+                    icon: "none",
+                });
+            }
+        },
+    });
+};
 </script>
 
 <style lang="scss">
@@ -307,7 +365,7 @@ const toPage = (url: string) => {
             align-items: center;
 
             .center-text {
-                margin-top: 20px;
+                margin-top: 15px;
             }
         }
     }
diff --git a/src/pages/users/account/index.vue b/src/pages/users/account/index.vue
index 91abf84..7811b4c 100644
--- a/src/pages/users/account/index.vue
+++ b/src/pages/users/account/index.vue
@@ -1,31 +1,154 @@
 <script lang="ts" setup>
+import { ref } from "vue";
+import { showToast, useLoad, getStorageSync } from "@tarojs/taro";
+import { getIntegralDetail, getBeanDetail } from "@/api/user";
 
+const tabValue = ref(0);
+
+const tabsList = ref([
+    {
+        title: "积分明细",
+        value: 0,
+    },
+    {
+        title: "豆子明细",
+        value: 1,
+    },
+]);
+
+const tabChange = (index: number) => {
+    tabValue.value = index;
+    getList();
+};
+
+const data = ref([]);
+
+const userInfo = ref<any>({});
+
+useLoad(() => {
+    getList();
+    userInfo.value = getStorageSync("userInfo");
+});
+
+const page = ref({
+    PageNum: 1,
+    PageSize: 10,
+    ItemCount: 0,
+});
+
+const pageChange = (e: number) => {
+    page.value.PageNum = e;
+    getList();
+};
+
+const getList = async () => {
+    try {
+        let res: any;
+        if (tabValue.value === 0) {
+            res = await getBeanDetail({
+                PageNum: page.value.PageNum,
+                PageSize: page.value.PageSize,
+            });
+        } else {
+            res = await getIntegralDetail({
+                PageNum: page.value.PageNum,
+                PageSize: page.value.PageSize,
+            });
+        }
+        data.value = res.data.data || [];
+        page.value.ItemCount = res.data.count;
+    } catch (error) {
+        showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
 </script>
 
 <template>
     <view>
         <view class="card">
-            <view class="greeting">Hello! YuanHuakk</view>
+            <!-- <view class="greeting">Hello! YuanHuakk</view> -->
             <view class="info">
                 <view class="left">
                     <view>
-                        <view class="num">豆子：188888</view>
+                        <view class="num">豆子: {{ userInfo.pulse }}</view>
                     </view>
                     <view>
-                        <view class="num">积分：188888</view>
+                        <view class="num">积分: {{ userInfo.integral }}</view>
                     </view>
                 </view>
-                <image class="img" src="https://picdm.sunbangyan.cn/2023/08/15/ste192.png"/>
+                <!-- <image class="img" src="https://picdm.sunbangyan.cn/2023/08/15/ste192.png"/> -->
             </view>
         </view>
+        <view class="tabs-box">
+            <view
+                v-for="item in tabsList"
+                :key="item.value"
+                @click="tabChange(item.value)"
+            >
+                <view class="text">{{ item.title }}</view>
+                <view
+                    class="line"
+                    :class="{ lineColor: item.value === tabValue }"
+                ></view>
+            </view>
+        </view>
+        <view v-if="data.length > 0">
+            <view v-if="tabValue === 0">
+                <view
+                    class="card-list"
+                    v-for="(item, index) in (data as any[])"
+                    :key="index"
+                >
+                    <view class="left">
+                        <view>购买商品：{{ item.goods_name }}</view>
+                        <view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
+                    </view>
+                    <view class="right">
+                        <view style="color: green"
+                            >-<text>{{ item.number }}积分</text></view
+                        >
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <view
+                    class="card-list"
+                    v-for="(item, index) in (data as any[])"
+                    :key="index"
+                >
+                    <view class="left">
+                        <view>购买商品：{{ item.goods_name }}</view>
+                        <view>支付金额：{{ item.order_number }}元</view>
+                        <view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
+                    </view>
+                    <view class="right">
+                        <view style="color: red"
+                            >+<text>{{ item.number }}</text
+                            >豆子</view
+                        >
+                    </view>
+                </view>
+            </view>
+            <nut-pagination
+                v-model="page.PageNum"
+                :total-items="page.ItemCount"
+                :items-per-page="page.PageSize"
+                @change="pageChange"
+            />
+        </view>
+        <nut-empty v-else description="暂无明细"></nut-empty>
     </view>
 </template>
 
 <style lang="scss">
-page {
-    //background-color: #111;
+.nut-pagination {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
 }
-
 .card {
     width: 90%;
     height: 300px;
@@ -35,7 +158,7 @@ page {
     background-size: 100% 100%;
     background-repeat: no-repeat;
     margin: 10px auto;
-    color: #D0A568;
+    color: #d0a568;
     padding: 20px;
 
     .greeting {
@@ -50,7 +173,8 @@ page {
         .left {
             height: 300px;
             width: 50%;
-            text-align: center;
+            text-align: left;
+            margin-left: 50px;
             display: flex;
             flex-direction: column;
             justify-content: center;
@@ -67,7 +191,42 @@ page {
             height: 270px;
         }
     }
-
-
 }
-</style>
\ No newline at end of file
+
+.tabs-box {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+    align-items: center;
+    height: auto;
+    background-color: #fff;
+    padding: 0 20px;
+    text-align: center;
+
+    .text {
+        margin: 10px 20px;
+        align-items: center;
+    }
+
+    .line {
+        margin: 0 auto;
+        width: 50px;
+        height: 5px;
+        border-radius: 30px;
+        transition: all 0.3s ease-in-out;
+    }
+
+    .lineColor {
+        background-color: #ff0000;
+    }
+}
+.card-list {
+    margin: 10px 20px;
+    background-color: #fff;
+    display: flex;
+    border-radius: 10px;
+    padding: 20px;
+    justify-content: space-between;
+    align-items: center;
+}
+</style>
diff --git a/src/pages/users/distribution/index.config.ts b/src/pages/users/distribution/index.config.ts
new file mode 100644
index 0000000..a3f7e34
--- /dev/null
+++ b/src/pages/users/distribution/index.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationBarTitleText: "我的推广",
+});
diff --git a/src/pages/users/distribution/index.vue b/src/pages/users/distribution/index.vue
new file mode 100644
index 0000000..54a74bb
--- /dev/null
+++ b/src/pages/users/distribution/index.vue
@@ -0,0 +1,105 @@
+<template>
+    <view>
+        <view class="card-list">
+            <view
+                class="item"
+                v-for="(item, index) in list"
+                :key="index"
+                @click="clickItem(item)"
+            >
+                <view class="text">
+                    <IconFont :name="item.icon" color="red" size="30" />
+                    <view>{{ item.label }}</view>
+                </view>
+            </view>
+            <view style="width: 45%;"></view>
+        </view>
+        <!-- 二维码弹窗 -->
+        <nut-popup :style="{ padding: '30px 50px' }" v-model:visible="show">
+            <view class="popup">
+                <view>推荐人二维码绑定</view>
+                <image :src="urlCode" />
+            </view>
+        </nut-popup>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+import { IconFont } from "@nutui/icons-vue-taro";
+import Taro from "@tarojs/taro";
+
+const show = ref(false);
+
+const urlCode = ref("");
+
+const list = ref([
+    {
+        id: 1,
+        icon: "scan",
+        label: "推广名片",
+    },
+    {
+        id: 2,
+        icon: "date",
+        label: "积分明细",
+    },
+    {
+        id: 3,
+        icon: "my2",
+        label: "推广用户",
+    },
+]);
+
+const clickItem = (item: any) => {
+    if (item.id === 1) {
+        urlCode.value = `https://api.pwmqr.com/qrcode/create?url=${Taro.getStorageSync(
+            "token"
+        )}`;
+        show.value = true;
+    } else if (item.id === 2) {
+        Taro.navigateTo({
+            url: "/pages/users/distribution/integral/index",
+        });
+    } else {
+        Taro.navigateTo({
+            url: "/pages/users/distribution/userlist/index",
+        });
+    }
+};
+</script>
+
+<style lang="scss">
+.card-list {
+    display: flex;
+    justify-content: space-evenly;
+    flex-wrap: wrap;
+
+    .item {
+        width: 45%;
+        height: 200px;
+        background-color: #fff;
+        border-radius: 20px;
+        margin-top: 10px;
+        text-align: center;
+        padding: 10px;
+        position: relative;
+
+        .text {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+    }
+}
+
+.popup {
+    text-align: center;
+
+    image {
+        width: 300px;
+        height: 300px;
+    }
+}
+</style>
diff --git a/src/pages/users/distribution/integral/index.config.ts b/src/pages/users/distribution/integral/index.config.ts
new file mode 100644
index 0000000..922df3a
--- /dev/null
+++ b/src/pages/users/distribution/integral/index.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationBarTitleText: "积分明细",
+});
diff --git a/src/pages/users/distribution/integral/index.vue b/src/pages/users/distribution/integral/index.vue
new file mode 100644
index 0000000..9865572
--- /dev/null
+++ b/src/pages/users/distribution/integral/index.vue
@@ -0,0 +1,85 @@
+<template>
+    <view>
+        <view v-if="data.length > 0">
+            <view
+                class="card-list"
+                v-for="(item, index) in (data as any[])"
+                :key="index"
+            >
+                <view class="left">
+                    <view>昵称：{{ item.nick_name }}</view>
+                    <view>购买商品：{{ item.goods_name }}</view>
+                    <view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
+                </view>
+                <view class="right">
+                    <view style="color: red"
+                        >+<text>{{ item.number }}积分</text></view
+                    >
+                </view>
+            </view>
+            <nut-pagination
+                v-model="page.PageNum"
+                :total-items="page.ItemCount"
+                :items-per-page="page.PageSize"
+                @change="pageChange"
+            />
+        </view>
+        <view v-else>
+            <nut-empty description="暂无积分明细" />
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { useLoad, showToast } from "@tarojs/taro";
+import { ref } from "vue";
+import { getTGIntegralDetail } from "../../../../api/user";
+
+const data = ref([]);
+
+useLoad(() => {
+    getData();
+});
+
+const page = ref({
+    PageNum: 1,
+    PageSize: 10,
+    ItemCount: 0,
+});
+
+const pageChange = (e: number) => {
+    page.value.PageNum = e;
+    getData();
+};
+
+const getData = async () => {
+    try {
+        const res = await getTGIntegralDetail({
+            PageNum: page.value.PageNum,
+            PageSize: page.value.PageSize,
+        });
+        data.value = res.data.data || [];
+        page.value.ItemCount = res.data.count;
+    } catch (error) {
+        showToast({ title: error.msg, icon: "none" });
+    }
+};
+</script>
+
+<style lang="scss">
+.card-list {
+    margin: 10px 20px;
+    background-color: #fff;
+    display: flex;
+    border-radius: 10px;
+    padding: 20px;
+    justify-content: space-between;
+    align-items: center;
+}
+.nut-pagination {
+    position: absolute;
+    margin-top: 10px;
+    left: 50%;
+    transform: translateX(-50%);
+}
+</style>
diff --git a/src/pages/users/distribution/userlist/index.config.ts b/src/pages/users/distribution/userlist/index.config.ts
new file mode 100644
index 0000000..a8a7a0e
--- /dev/null
+++ b/src/pages/users/distribution/userlist/index.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationBarTitleText: "推广人统计",
+});
diff --git a/src/pages/users/distribution/userlist/index.vue b/src/pages/users/distribution/userlist/index.vue
new file mode 100644
index 0000000..59501e9
--- /dev/null
+++ b/src/pages/users/distribution/userlist/index.vue
@@ -0,0 +1,93 @@
+<template>
+    <view>
+        <view v-if="data.length > 0">
+            <view
+                class="card-list"
+                v-for="(item, index) in (data as any[])"
+                :key="index"
+            >
+                <view class="left">
+                    <image :src="item.avatarUrl" />
+                    <view class="text">
+                        <view>{{ item.nickName }}</view>
+                        <view>{{ item.phone }}</view>
+                    </view>
+                    
+                </view>
+                <view class="right"></view>
+            </view>
+            <nut-pagination
+                v-model="page.PageNum"
+                :total-items="page.ItemCount"
+                :items-per-page="page.PageSize"
+                @change="pageChange"
+            />
+        </view>
+        <view v-else>
+            <nut-empty description="暂无明细"></nut-empty>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+import { useLoad, showToast } from "@tarojs/taro";
+import { getTGUserList } from "../../../../api/user";
+
+useLoad(() => {
+    getData();
+});
+
+const data = ref([]);
+
+const page = ref({ PageNum: 1, PageSize: 10, ItemCount: 0 });
+
+const pageChange = (e: number) => {
+    page.value.PageNum = e;
+    getData();
+};
+
+const getData = async () => {
+    try {
+        const res = await getTGUserList({
+            PageNum: page.value.PageNum,
+            PageSize: page.value.PageSize,
+        });
+        data.value = res.data.data || [];
+        page.value.ItemCount = res.data.count;
+    } catch (error) {
+        showToast({ title: error.msg, icon: "none" });
+    }
+};
+</script>
+
+<style lang="scss">
+.nut-pagination {
+    position: absolute;
+    margin-top: 10px;
+    left: 50%;
+    transform: translateX(-50%);
+}
+
+.card-list {
+    width: 700px;
+    background-color: #fff;
+    margin: 10px auto;
+    border-radius: 10px;
+    padding: 20px;
+
+    .left {
+        display: flex;
+        align-items: center;
+        image {
+            width: 100px;
+            height: 100px;
+            border-radius: 50%;
+        }
+
+        .text {
+            margin-left: 20px;
+        }
+    }
+}
+</style>
diff --git a/src/pages/users/order_list/index.js b/src/pages/users/order_list/index.js
new file mode 100644
index 0000000..e8a1f12
--- /dev/null
+++ b/src/pages/users/order_list/index.js
@@ -0,0 +1,9 @@
+const obj = {
+    a: 1,
+    b: 3,
+    c: 10,
+};
+
+Object.keys(obj).forEach((item, index) => {
+    console.log(obj[item]);
+});
diff --git a/src/pages/users/order_list/index.vue b/src/pages/users/order_list/index.vue
index bce8f97..085ec9d 100644
--- a/src/pages/users/order_list/index.vue
+++ b/src/pages/users/order_list/index.vue
@@ -9,6 +9,8 @@ import {
 } from "@tarojs/taro";
 import Pay from "@/components/Pay.vue";
 import { getIntegralOrderList } from "@/api/user";
+import { deleteJfOrder } from "@/api/goods";
+import { getOrderStatistics } from "@/api/order";
 
 const tabValue = ref(0);
 
@@ -18,7 +20,7 @@ const tabsList = ref([
     {
         title: "全部",
         value: 0,
-        num: 3,
+        num: 0,
     },
     {
         title: "待付款",
@@ -28,23 +30,24 @@ const tabsList = ref([
     {
         title: "待使用",
         value: 2,
-        num: 1,
+        num: 0,
     },
     {
         title: "已使用",
         value: 3,
-        num: 1,
+        num: 0,
     },
     {
         title: "已失效",
         value: 4,
-        num: 1,
+        num: 0,
     },
 ]);
 
 const jfInfo = ref({});
 
 interface OrderList {
+    oid: string;
     add_time: string;
     status: number;
     BindGoods: {
@@ -68,6 +71,7 @@ const getList = async () => {
         const res = await getIntegralOrderList({
             status: tabValue.value,
         });
+
         console.log(res);
         orderList.value = res.data.data;
     } catch (error) {
@@ -76,6 +80,7 @@ const getList = async () => {
             icon: "none",
         });
     }
+    getTj();
 };
 
 const tabChange = (index: number) => {
@@ -88,9 +93,8 @@ useReachBottom(() => {
 });
 
 const openPay = (item: OrderList) => {
-    console.log("openPay", item);
     isShowPay.value = true;
-    jfInfo.value = item;
+    jfInfo.value = [item];
 };
 
 const errPay = () => {
@@ -100,6 +104,7 @@ const errPay = () => {
         icon: "none",
     });
     jfInfo.value = {};
+    getList();
 };
 const closePay = () => {
     isShowPay.value = false;
@@ -108,6 +113,7 @@ const closePay = () => {
         icon: "none",
     });
     jfInfo.value = {};
+    getList();
 };
 
 const toDetail = (item: any) => {
@@ -116,6 +122,40 @@ const toDetail = (item: any) => {
         url: `/pages/users/order_list_detail/index?orderId=${item.oid}`,
     });
 };
+
+const delOrder = async (oid: string) => {
+    try {
+        const res = await deleteJfOrder({ oid });
+        console.log(res);
+    } catch (error) {
+        showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+    getList();
+};
+
+const countInfo = ref<any>({});
+
+const getTj = async () => {
+    try {
+        const res = await getOrderStatistics({
+            type: 2,
+        });
+        countInfo.value = res.data.data;
+        tabsList.value[0].num = countInfo.value.A || 0;
+        tabsList.value[1].num = countInfo.value.B || 0;
+        tabsList.value[2].num = countInfo.value.C || 0;
+        tabsList.value[3].num = countInfo.value.D || 0;
+        tabsList.value[4].num = countInfo.value.F || 0;
+    } catch (error) {
+        showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
 </script>
 
 <template>
@@ -124,7 +164,7 @@ const toDetail = (item: any) => {
             <view>
                 <view style="font-weight: bold">订单信息</view>
                 <view style="font-size: 15px"
-                    >消费订单：{{ 10 || 0 }} 总消费积分：{{ 12312 || 0 }}
+                    >总消费积分：{{ countInfo.Total || 0 }}
                 </view>
             </view>
             <image src="../static/user/order_list_top.png" />
@@ -167,17 +207,17 @@ const toDetail = (item: any) => {
                         <image :src="item.BindGoods.cover" />
                         <view class="title">{{ item.BindGoods.name }} </view>
                         <view class="right">
-                            <view>{{ item.BindGoods.number }}</view>
+                            <view>{{ item.number }}</view>
                             <view>x{{ item.count }}</view>
                         </view>
                     </view>
-                    <view
+                    <!-- <view
                         class="bom"
                         style="text-align: right; font-size: 13px"
                     >
                         共{{ item.count }}件商品,实付积分:
                         <text style="color: red">{{ item.number }}</text>
-                    </view>
+                    </view> -->
                 </view>
                 <view class="line"></view>
                 <view class="btn">
@@ -186,6 +226,7 @@ const toDetail = (item: any) => {
                         plain
                         size="small"
                         type="primary"
+                        @click="delOrder(item.oid)"
                         >取消订单
                     </nut-button>
                     <nut-button
diff --git a/src/pages/users/order_list_detail/index.vue b/src/pages/users/order_list_detail/index.vue
index 78a1f56..146ee32 100644
--- a/src/pages/users/order_list_detail/index.vue
+++ b/src/pages/users/order_list_detail/index.vue
@@ -48,7 +48,7 @@
                             >{{ goodInfo.BindGoods.name }}
                         </view>
                         <view class="right">
-                            <view>{{ goodInfo.BindGoods.number }}</view>
+                            <view>{{ goodInfo.number }}</view>
                             <view>x{{ goodInfo.count }}</view>
                         </view>
                     </view>
@@ -59,6 +59,15 @@
                 title="下单时间:"
                 :desc="goodInfo.add_time.slice(0, 19)"
             ></nut-cell>
+            <nut-cell
+                v-if="goodInfo.expires !== 0"
+                title="商品过期时间:"
+                :desc="
+                    dayjs
+                        .unix(goodInfo.expires)
+                        .format('YYYY-MM-DD HH:mm:ss')
+                "
+            ></nut-cell>
             <nut-cell
                 title="支付状态:"
                 :desc="
@@ -72,14 +81,14 @@
                 "
             ></nut-cell>
             <nut-cell
-                title="商品总价(积分):"
+                :title="`商品总价(${type === '1' ? '元' : '积分'}):`"
                 :desc="goodInfo.number"
             ></nut-cell>
             <nut-cell>
                 <template #default>
                     <view style="text-align: right; width: 100%">
                         <view
-                            >实付款(积分):
+                            >实付款({{ type === "1" ? "元" : "积分" }}):
                             <nut-price
                                 :price="goodInfo.number"
                                 size="normal"
@@ -91,13 +100,13 @@
             </nut-cell>
         </nut-cell-group>
         <view class="btn">
-            <nut-button
+            <!-- <nut-button
                 plain
                 v-if="goodInfo.status === 0"
                 size="small"
                 type="primary"
                 >取消订单
-            </nut-button>
+            </nut-button> -->
             <nut-button
                 v-if="goodInfo.status === 0"
                 style="margin-left: 5px"
@@ -130,6 +139,13 @@
                 <image class="qrcode" :src="url"></image>
             </view>
         </nut-popup>
+        <pay
+            :isShowPay="isShowPay"
+            :payType="type === '1' ? 'wx' : 'jf'"
+            @errPay="errPay"
+            @closePay="closePay"
+            :jfInfo="jfInfo"
+        />
     </view>
 </template>
 
@@ -139,9 +155,11 @@ import {
     getStorageSync,
     makePhoneCall,
     openLocation,
+    showToast,
 } from "@tarojs/taro";
 import { Service, Find } from "@nutui/icons-vue-taro";
 import { ref } from "vue";
+import dayjs from "dayjs";
 
 const goodInfo = ref<any>({});
 
@@ -165,11 +183,15 @@ const statusList = ref([
 ]);
 
 const isShowCode = ref(false);
+const isShowPay = ref(false);
+const jfInfo = ref<any>({});
+
+const type = ref("");
 
 const url = ref("");
 
 useLoad((options) => {
-    console.log("options", options);
+    type.value = options.type;
     goodInfo.value = getStorageSync("item");
 });
 
@@ -187,7 +209,27 @@ const toAdder = () => {
     });
 };
 
-const openPay = () => {};
+const openPay = () => {
+    isShowPay.value = true;
+    jfInfo.value = getStorageSync("item");
+};
+
+const errPay = () => {
+    isShowPay.value = false;
+    showToast({
+        title: "支付失败",
+        icon: "none",
+    });
+    jfInfo.value = {};
+};
+const closePay = () => {
+    isShowPay.value = false;
+    showToast({
+        title: "支付取消",
+        icon: "none",
+    });
+    jfInfo.value = {};
+};
 
 const openCode = () => {
     url.value = `https://api.pwmqr.com/qrcode/create?url=${goodInfo.value.oid}`;
diff --git a/src/pages/users/settled_mer/index.vue b/src/pages/users/settled_mer/index.vue
index 478016d..e639c32 100644
--- a/src/pages/users/settled_mer/index.vue
+++ b/src/pages/users/settled_mer/index.vue
@@ -1,213 +1,388 @@
 <script lang="ts" setup>
-import Taro from '@tarojs/taro'
-import {ref} from 'vue'
-import {getVerifyCode, applyMer, getMerTypeList} from '@/api/user'
+import Taro from "@tarojs/taro";
+import { ref } from "vue";
+import { getVerifyCode, applyMer, getMerTypeList } from "@/api/user";
+import Upload from "@/components/Upload.vue";
 
-const visible = ref(false)
+const visible = ref(false);
 
-const merType = ref(false)
+const merType = ref(false);
 
-
-const merGooType = ref(false)
+const merGooType = ref(false);
 
 // 验证码按钮文字
-const smsStr = ref('获取验证码')
+const smsStr = ref("获取验证码");
 
 // 验证码按钮是否禁用
-const smsDisabled = ref(false)
+const smsDisabled = ref(false);
 
 // 表单数据
-const formValue = ref({
-    name: '',
-    userName: '',
-    phone: '',
-    code: '',
-    bType: '',
-    merTypeStr: '',
-    classId: '',
-    merGooTypeStr: ''
-})
+const formValue = ref<any>({
+    name: "",
+    userName: "",
+    phone: "",
+    code: "",
+    bType: "",
+    merTypeStr: "",
+    classId: "",
+    merGooTypeStr: "",
+    license: [],
+    front: [],
+    back: [],
+    head_photo: [],
+    img: [],
+});
 
-const merGooList = ref([])
+const merGooList = ref([]);
 
-const merList = ref([])
+const merList = ref([]);
 
 // 表单校验
-const ruleForm = ref<any>(null)
+const ruleForm = ref<any>(null);
 
 Taro.useLoad(() => {
-    getMerType()
-})
+    getMerType();
+});
 
 // 获取商户类型
 const getMerType = async () => {
     try {
-        const res = await getMerTypeList()
-        console.log(res)
+        const res = await getMerTypeList();
+        console.log(res);
         merList.value = res.data.type.map((item: any) => {
             return {
                 text: item.name,
-                value: item.ID
-            }
-        })
+                value: item.ID,
+            };
+        });
         merGooList.value = res.data.class.map((item: any) => {
             return {
                 text: item.name,
-                value: item.ID
-            }
-        })
+                value: item.ID,
+            };
+        });
     } catch (e) {
         Taro.showToast({
             title: e.msg,
-            icon: 'none'
-        })
+            icon: "none",
+        });
     }
-}
+};
 
 // 关闭弹窗
 const onOk = async () => {
     try {
-        const res = await applyMer(formValue.value)
+        const data = {
+            ...formValue.value,
+            license: formValue.value.license[0]?.url,
+            front: formValue.value.front[0]?.url,
+            back: formValue.value.back[0]?.url,
+            head_photo: formValue.value.head_photo[0]?.url,
+            img: formValue.value.img.map((item: any) => item.url),
+        };
+        const res = await applyMer(data);
         Taro.showToast({
             title: res.msg,
-            icon: 'none'
-        })
+            icon: "none",
+        });
     } catch (e) {
         Taro.showToast({
             title: e.msg,
-            icon: 'none'
-        })
+            icon: "none",
+        });
     }
-    visible.value = false
-}
+    visible.value = false;
+};
 
 // 打开弹窗
-const open = () => {
-    console.log('open')
-    visible.value = true
-}
+// const open = () => {
+//     console.log("open");
+//     visible.value = true;
+// };
 
 // 获取验证码
 const getSmsCode = () => {
-    ruleForm.value.validate('phone').then(async ({valid}: any) => {
+    ruleForm.value.validate("phone").then(async ({ valid }: any) => {
         if (valid) {
             try {
                 await getVerifyCode({
-                    phone: formValue.value.phone.toString()
-                })
-                smsDisabled.value = true
-                let time = 10
+                    phone: formValue.value.phone.toString(),
+                });
+                smsDisabled.value = true;
+                let time = 60;
                 const timer = setInterval(() => {
-                    time--
-                    smsStr.value = `${time}s`
+                    time--;
+                    smsStr.value = `${time}s`;
                     if (time === 0) {
-                        clearInterval(timer)
-                        smsDisabled.value = false
-                        smsStr.value = '获取验证码'
+                        clearInterval(timer);
+                        smsDisabled.value = false;
+                        smsStr.value = "获取验证码";
                     }
-                }, 1000)
+                }, 1000);
             } catch (e) {
                 Taro.showToast({
                     title: e.message,
-                    icon: 'none'
-                })
+                    icon: "none",
+                });
             }
         }
-    })
-}
+    });
+};
 
 // 选择商户类型
 const confirmMerType = (e: any) => {
-    formValue.value.merTypeStr = e.selectedOptions[0].text
-    formValue.value.bType = e.selectedOptions[0].value
-    merType.value = false
-}
+    formValue.value.merTypeStr = e.selectedOptions[0].text;
+    formValue.value.bType = e.selectedOptions[0].value;
+    merType.value = false;
+};
 
 // 选择经营类目
 const confirmGooType = (e: any) => {
-    formValue.value.merGooTypeStr = e.selectedOptions[0].text
-    formValue.value.classId = e.selectedOptions[0].value
-    merGooType.value = false
-}
+    formValue.value.merGooTypeStr = e.selectedOptions[0].text;
+    formValue.value.classId = e.selectedOptions[0].value;
+    merGooType.value = false;
+};
 
 // 提交
 const submit = () => {
-    ruleForm.value.validate().then(({valid, errors}: any) => {
+    ruleForm.value.validate().then(({ valid, errors }: any) => {
         if (valid) {
-            console.log('success', formValue.value)
-            visible.value = true
+            console.log("success", formValue.value);
+            visible.value = true;
         } else {
-            console.log('error submit!!', errors)
+            console.log("error submit!!", errors);
         }
-    })
-}
+    });
+};
 </script>
 
 <template>
     <view>
         <nut-form ref="ruleForm" class="form" :model-value="formValue">
-            <nut-form-item required label="商户名称" prop="name" :rules="[{
-        required: true,
-        message: '请输入商户名称',
-      }]">
-                <input type="text" v-model="formValue.name" placeholder="请输入商户名称"/>
+            <nut-form-item
+                required
+                label="商户名称"
+                prop="name"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请输入商户名称',
+                    },
+                ]"
+            >
+                <input
+                    type="text"
+                    v-model="formValue.name"
+                    placeholder="请输入商户名称"
+                />
             </nut-form-item>
-            <nut-form-item required label="用户姓名" prop="userName" :rules="[{
-        required: true,
-        message: '请输入用户姓名',
-      }]">
-                <input type="text" v-model="formValue.userName" placeholder="请输入真实姓名"/>
+            <nut-form-item
+                required
+                label="用户姓名"
+                prop="userName"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请输入用户姓名',
+                    },
+                ]"
+            >
+                <input
+                    type="text"
+                    v-model="formValue.userName"
+                    placeholder="请输入真实姓名"
+                />
             </nut-form-item>
-            <nut-form-item required label="联系电话" prop="phone" :rules="[{
-        required: true,
-        message: '请输入正确的电话号码',
-        regex: /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
-      }]">
-                <input type="text" :maxlength="11" v-model="formValue.phone" placeholder="请输入联系电话"/>
+            <nut-form-item
+                required
+                label="联系电话"
+                prop="phone"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请输入正确的电话号码',
+                        regex: /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
+                    },
+                ]"
+            >
+                <input
+                    type="text"
+                    :maxlength="11"
+                    v-model="formValue.phone"
+                    placeholder="请输入联系电话"
+                />
             </nut-form-item>
-            <nut-form-item required label="验证码" prop="code" :rules="[{
-        required: true,
-        message: '请输入验证码',
-      }]">
+            <nut-form-item
+                required
+                label="验证码"
+                prop="code"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请输入验证码',
+                    },
+                ]"
+            >
                 <view class="yanCode">
-                    <input type="text" :maxlength="6" v-model="formValue.code" placeholder="请输入验证码"/>
-                    <nut-button style="width: 100px; padding: 3px" plain type="primary" size="mini"
-                                :disabled="smsDisabled" round
-                                @click="getSmsCode">
+                    <input
+                        type="text"
+                        :maxlength="6"
+                        v-model="formValue.code"
+                        placeholder="请输入验证码"
+                    />
+                    <nut-button
+                        style="width: 100px; padding: 3px"
+                        plain
+                        type="primary"
+                        size="mini"
+                        :disabled="smsDisabled"
+                        round
+                        @click="getSmsCode"
+                    >
                         {{ smsStr }}
                     </nut-button>
                 </view>
             </nut-form-item>
-            <nut-form-item required label="商户类型" prop="merTypeStr" :rules="[{
-        required: true,
-        message: '请选择商户类型',
-      }]">
-                <input type="text" :disabled="true" v-model="formValue.merTypeStr" placeholder="请选择商户类型"
-                       @click="merType = true"/>
+            <nut-form-item
+                required
+                label="商户类型"
+                prop="merTypeStr"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请选择商户类型',
+                    },
+                ]"
+            >
+                <input
+                    type="text"
+                    :disabled="true"
+                    v-model="formValue.merTypeStr"
+                    placeholder="请选择商户类型"
+                    @click="merType = true"
+                />
                 <nut-popup position="bottom" v-model:visible="merType">
-                    <nut-picker :columns="merList" title="商户类型" @confirm="confirmMerType"
-                                @cancel="merType = false"></nut-picker>
+                    <nut-picker
+                        :columns="merList"
+                        title="商户类型"
+                        @confirm="confirmMerType"
+                        @cancel="merType = false"
+                    ></nut-picker>
                 </nut-popup>
             </nut-form-item>
-            <nut-form-item required label="经营类目" prop="merGooTypeStr" :rules="[{
-        required: true,
-        message: '请选择经营类目',
-      }]">
-                <input type="text" :disabled="true" v-model="formValue.merGooTypeStr" placeholder="请选择经营类目"
-                       @click="merGooType = true"/>
+            <nut-form-item
+                required
+                label="经营类目"
+                prop="merGooTypeStr"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请选择经营类目',
+                    },
+                ]"
+            >
+                <input
+                    type="text"
+                    :disabled="true"
+                    v-model="formValue.merGooTypeStr"
+                    placeholder="请选择经营类目"
+                    @click="merGooType = true"
+                />
                 <nut-popup position="bottom" v-model:visible="merGooType">
-                    <nut-picker :columns="merGooList" title="商户类型" @confirm="confirmGooType"
-                                @cancel="merGooType = false"></nut-picker>
+                    <nut-picker
+                        :columns="merGooList"
+                        title="商户类型"
+                        @confirm="confirmGooType"
+                        @cancel="merGooType = false"
+                    ></nut-picker>
                 </nut-popup>
             </nut-form-item>
-            <!--            <nut-form-item label="资质上传" prop="img">-->
-            <!--                <nut-uploader url="www.baidu.com"></nut-uploader>-->
-            <!--            </nut-form-item>-->
+            <nut-form-item
+                required
+                label="营业执照"
+                prop="license"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请上传营业执照',
+                        validator: (value) => {
+                            return value.length > 0;
+                        },
+                    },
+                ]"
+            >
+                <Upload v-model:list="formValue.license" />
+            </nut-form-item>
+            <nut-form-item
+                required
+                label="法人身份证（正面）"
+                prop="front"
+                :rules="[
+                    {
+                        required: true,
+                        message: '法人身份证（正面）',
+                        validator: (value) => {
+                            return value.length > 0;
+                        },
+                    },
+                ]"
+            >
+                <Upload v-model:list="formValue.front" />
+            </nut-form-item>
+            <nut-form-item
+                required
+                label="法人身份证（反面）"
+                prop="back"
+                :rules="[
+                    {
+                        required: true,
+                        message: '法人身份证（反面）',
+                        validator: (value) => {
+                            return value.length > 0;
+                        },
+                    },
+                ]"
+            >
+                <Upload v-model:list="formValue.back" />
+            </nut-form-item>
+            <nut-form-item
+                required
+                label="门头照"
+                prop="head_photo"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请上传门头照',
+                        validator: (value) => {
+                            return value.length > 0;
+                        },
+                    },
+                ]"
+            >
+                <Upload v-model:list="formValue.head_photo" />
+            </nut-form-item>
+            <nut-form-item
+                required
+                label="店内照"
+                prop="img"
+                :rules="[
+                    {
+                        required: true,
+                        message: '请上传店内照至少3张',
+                        validator: (value) => {
+                            return value.length >= 3;
+                        },
+                    },
+                ]"
+            >
+                <Upload v-model:list="formValue.img" :max="5" />
+            </nut-form-item>
 
             <view class="btn">
-                <nut-button block type="primary" round @click="submit()">提交</nut-button>
+                <nut-button block type="primary" round @click="submit()"
+                    >提交</nut-button
+                >
             </view>
-
         </nut-form>
         <!--  入驻协议弹窗  -->
         <nut-dialog
@@ -226,14 +401,15 @@ const submit = () => {
 page {
     background-image: url("~@/static/merchantBg.jpg");
     background-size: 100%;
-    background-color: #E93423;
+    background-color: #e93423;
     background-repeat: no-repeat;
 }
 
-
 .form {
     position: relative;
-    top: 300px;
+    top: 200px;
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
 
     .btn {
         padding: 20px;
@@ -247,4 +423,4 @@ page {
     justify-content: space-between;
     align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/users/user_setting/index.vue b/src/pages/users/user_setting/index.vue
index b7b5447..8cf5c95 100644
--- a/src/pages/users/user_setting/index.vue
+++ b/src/pages/users/user_setting/index.vue
@@ -1,94 +1,218 @@
 <script lang="ts" setup>
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
+import { ref } from "vue";
+import { getPersonalInfo, editPersonalInfo, getPhone } from "@/api/user";
+import { View } from "@tarojs/components";
+import { BASE_URL } from "@/utils/request";
 
-const toPage = (e: string) => {
-}
+// const toPage = (e: string) => {};
+
+const userInfo = ref<any>({});
+
+Taro.useLoad(() => {
+    const data = Taro.getStorageSync("userInfo");
+    userInfo.value = data;
+});
 
 const logOut = () => {
-  Taro.showModal({
-    title: '提示',
-    content: '确定退出登录吗？',
-    success: function (res) {
-      if (res.confirm) {
-        Taro.removeStorageSync('token')
-        Taro.removeStorageSync('userInfo')
-        Taro.reLaunch({
-          url: '/pages/index/index'
-        })
-      } else if (res.cancel) {
-        console.log('用户点击取消')
-      }
-    }
-  })
-}
+    Taro.showModal({
+        title: "提示",
+        content: "确定退出登录吗？",
+        success: function (res) {
+            if (res.confirm) {
+                Taro.removeStorageSync("token");
+                Taro.removeStorageSync("userInfo");
+                Taro.reLaunch({
+                    url: "/pages/index/index",
+                });
+            } else if (res.cancel) {
+                console.log("用户点击取消");
+            }
+        },
+    });
+};
 
+const chooseavatar = (e: any) => {
+    Taro.uploadFile({
+        url: `${BASE_URL}/app/upload`,
+        filePath: e.detail.avatarUrl,
+        name: "file",
+        header: {
+            token: Taro.getStorageSync("token"),
+        },
+        success: function (res) {
+            const data = JSON.parse(res.data);
+            userInfo.value.avatarUrl = data.data.data;
+        },
+    });
+};
+
+const subUser = async () => {
+    try {
+        const reg =
+            /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
+        if (!reg.test(userInfo.value.phone))
+            return Taro.showToast({
+                title: "请输入正确的手机号码",
+                icon: "none",
+            });
+        const res = await editPersonalInfo(userInfo.value);
+        Taro.showToast({
+            title: res.msg,
+            icon: "none",
+        });
+        Taro.switchTab({
+            url: "/pages/user/index",
+        });
+    } catch (error) {
+        Taro.showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
+
+const getUserInfo = async () => {
+    try {
+        const res = await getPersonalInfo();
+        userInfo.value = res.data.data;
+    } catch (error) {
+        Taro.showToast({
+            title: error.msg,
+            icon: "none",
+        });
+    }
+};
 </script>
 
 <template>
-  <view class="app">
-    <view class="user-card">
-      <view>管理我的账号</view>
-      <view class="avatar-card">
-        <view class="left">
-          <nut-avatar size="large">
-            <img
-                src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
-            />
-          </nut-avatar>
-          <view class="name">微信用户</view>
-        </view>
-      </view>
-    </view>
-    <nut-cell-group>
-      <nut-cell title="昵称" desc="微信用户" is-link></nut-cell>
-      <nut-cell title="ID" desc="1" is-link></nut-cell>
-      <nut-cell title="手机号码" desc="18888888888" is-link></nut-cell>
-      <nut-cell title="登录密码" desc="修改登录密码" is-link></nut-cell>
-      <nut-cell title="注销账号" desc="账号注销后不能恢复" is-link></nut-cell>
-    </nut-cell-group>
-    <view class="btn">
-      <nut-button block type="primary" @click="logOut">退出登录</nut-button>
-    </view>
+    <view class="app">
+        <view class="user-card">
+            <view>管理我的账号</view>
+            <!-- {{ userInfo }} -->
+            <view class="avatar-card">
+                <view class="left">
+                    <nut-button
+                        open-type="chooseAvatar"
+                        @chooseavatar="chooseavatar"
+                    >
+                        <nut-avatar size="large">
+                            <img
+                                style="border-radius: 50%"
+                                :src="userInfo.avatarUrl"
+                            />
+                        </nut-avatar>
+                    </nut-button>
 
-  </view>
+                    <view class="name">{{ userInfo.nickName }}</view>
+                </view>
+            </view>
+        </view>
+        <nut-cell-group>
+            <!-- :desc="userInfo.nickName"  -->
+            <nut-cell title="昵称">
+                <template v-slot:link>
+                    <nut-input
+                        v-model="userInfo.nickName"
+                        :border="false"
+                        input-align="right"
+                        placeholder="请输入昵称"
+                    /> </template
+            ></nut-cell>
+            <nut-cell title="手机号码">
+                <template v-slot:link>
+                    <nut-input
+                        v-model="userInfo.phone"
+                        :border="false"
+                        input-align="right"
+                        disabled
+                    />
+                </template>
+            </nut-cell>
+            <nut-cell title="登录密码">
+                <template v-slot:link>
+                    <nut-input
+                        v-model="userInfo.password"
+                        :border="false"
+                        input-align="right"
+                        placeholder="修改登录密码"
+                    />
+                </template>
+            </nut-cell>
+            <nut-cell title="注销账号" desc="账号注销后不能恢复" is-link>
+            </nut-cell>
+        </nut-cell-group>
+        <view class="btn">
+            <nut-button block @click="subUser">保存信息</nut-button>
+        </view>
+        <view class="btn">
+            <nut-button block type="primary" @click="logOut"
+                >退出登录</nut-button
+            >
+        </view>
+    </view>
 </template>
 
 <style lang="scss">
 .user-card {
-  width: 100%;
-  background-color: #fff;
-  box-sizing: border-box;
-  margin: auto;
-  position: relative;
-  top: 10px;
-  padding: 30px;
-
-  .avatar-card {
-    background-color: rgba(255, 0, 0, 0.1);
-    margin: 20px auto;
-    border-radius: 20px;
-    border: 1px solid #ff0000;
-    display: flex;
-    align-items: center;
-    padding: 30px;
+    width: 100%;
+    background-color: #fff;
+    box-sizing: border-box;
+    margin: auto;
     position: relative;
+    top: 10px;
+    padding: 30px;
 
-    .left {
-      margin-left: 10px;
-      display: flex;
-      align-items: center;
-      position: relative;
-      justify-content: space-between;
+    .avatar-card {
+        background-color: rgba(255, 0, 0, 0.1);
+        margin: 20px auto;
+        border-radius: 20px;
+        border: 1px solid #ff0000;
+        display: flex;
+        align-items: center;
+        padding: 30px;
+        position: relative;
 
-      .name {
-        margin-left: 10px;
-      }
+        .left {
+            margin-left: 10px;
+            display: flex;
+            align-items: center;
+            position: relative;
+            justify-content: space-between;
+
+            .name {
+                margin-left: 10px;
+            }
+            .nut-button {
+                margin: 0 auto;
+                width: 125px;
+                height: 125px;
+                border-radius: 50%;
+            }
+        }
     }
-  }
 }
 
 .btn {
-  padding: 0 40px;
+    padding: 0 40px;
+    margin-bottom: 20px;
 }
 
-</style>
\ No newline at end of file
+.nut-input {
+    width: 400px !important;
+    padding: 0 !important;
+}
+
+.nut-cell {
+    display: flex;
+    align-items: center;
+}
+
+.phoneBtn {
+    padding: 0 !important;
+    margin: 0 !important;
+    border-radius: 0 !important;
+    background-color: transparent !important;
+    border: none !important;
+}
+</style>
diff --git a/src/static/user/1.png b/src/static/user/1.png
new file mode 100644
index 0000000..937278d
Binary files /dev/null and b/src/static/user/1.png differ
diff --git a/src/static/user/2.png b/src/static/user/2.png
new file mode 100644
index 0000000..b4cf28e
Binary files /dev/null and b/src/static/user/2.png differ
diff --git a/src/static/user/3.png b/src/static/user/3.png
new file mode 100644
index 0000000..e9c55a8
Binary files /dev/null and b/src/static/user/3.png differ
diff --git a/src/static/user/4.png b/src/static/user/4.png
new file mode 100644
index 0000000..cd4b0d9
Binary files /dev/null and b/src/static/user/4.png differ
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 667d29e..9cd61bd 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,6 +1,9 @@
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
 
-const BASE_URL = process.env.NODE_ENV === 'development' ? 'http://192.168.2.3:9000' : 'https://www.wanzhuanyongcheng.cn'
+export const BASE_URL =
+    process.env.NODE_ENV === "development"
+        ? "http://192.168.2.3:9000/app"
+        : "https://www.wanzhuanyongcheng.cn/app";
 
 interface Res<T> {
     code: number;
@@ -8,41 +11,47 @@ interface Res<T> {
     msg: string;
 }
 
-type Method = 'GET' | 'POST' | 'PUT' | 'DELETE';
+type Method = "GET" | "POST" | "PUT" | "DELETE";
 
 const request = (
     url: string,
     data: object = {},
-    method: Method = 'GET'
+    method: Method = "GET"
 ): Promise<Res<any>> => {
     return new Promise((resolve, reject) => {
         Taro.showLoading({
-            title: '加载中...',
-            mask: true
-        })
+            title: "加载中...",
+            mask: true,
+        });
         Taro.request({
-            url: BASE_URL + '/app' + url,
+            url: BASE_URL + url,
             data: data,
             method: method,
             header: {
-                'content-type': 'application/json',
-                token: Taro.getStorageSync('token')
+                "content-type": "application/json",
+                token: Taro.getStorageSync("token"),
             },
-            success: ({data}) => {
-                Taro.hideLoading()
-                if (data.code !== 200)
-                    return reject({code: 1, msg: data.msg})
-                resolve(data)
+            success: ({ data }) => {
+                Taro.hideLoading();
+                if (data.code !== 200) {
+                    Taro.showToast({
+                        title: data.msg,
+                        icon: "none",
+                    });
+                    reject(data);
+                    return;
+                }
+                resolve(data);
             },
             fail: () => {
                 Taro.showToast({
-                    title: '服务器异常',
-                    icon: 'none'
-                })
-                reject({code: 1, msg: '服务器异常'})
-            }
-        })
-    })
-}
+                    title: "服务器异常",
+                    icon: "none",
+                });
+                reject({ code: 1, msg: "服务器异常" });
+            },
+        });
+    });
+};
 
-export default request
\ No newline at end of file
+export default request;