From 84b6ff15c73fc0d0210a43b96acbbf4f9fb8e9a8 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Sat, 16 Mar 2024 22:46:10 +0800
Subject: [PATCH] ...

---
 src/pages.json                                     | 10 +++++-----
 src/pages/common/groupbuy/detail.vue               |  2 +-
 src/pages/mall/index.vue                           |  2 +-
 .../subs/goods/{goods-detail.vue => detail.vue}    |  2 +-
 src/pages/mall/subs/order/order-confirm.vue        |  2 +-
 src/pages/mall/subs/search/index.vue               |  1 -
 src/pages/mine/index.vue                           |  8 ++++----
 .../components/{address-item.vue => item.vue}      |  0
 .../subs/address/{add-address.vue => create.vue}   |  2 +-
 .../subs/address/{address-list.vue => index.vue}   |  6 +++---
 .../mine/subs/order/components/order-item.vue      |  2 +-
 .../subs/order/{order-detail.vue => detail.vue}    |  0
 .../mine/subs/order/{order-list.vue => index.vue}  |  0
 src/pages/mine/subs/profile/index.vue              | 14 +++++++++-----
 14 files changed, 27 insertions(+), 24 deletions(-)
 rename src/pages/mall/subs/goods/{goods-detail.vue => detail.vue} (99%)
 rename src/pages/mine/subs/address/components/{address-item.vue => item.vue} (100%)
 rename src/pages/mine/subs/address/{add-address.vue => create.vue} (98%)
 rename src/pages/mine/subs/address/{address-list.vue => index.vue} (74%)
 rename src/pages/mine/subs/order/{order-detail.vue => detail.vue} (100%)
 rename src/pages/mine/subs/order/{order-list.vue => index.vue} (100%)

diff --git a/src/pages.json b/src/pages.json
index 5501799..4c94eb4 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -85,7 +85,7 @@
       "root": "pages/mall/subs",
       "pages": [
         {
-          "path": "goods/goods-detail",
+          "path": "goods/detail",
           "style": {
             "navigationBarTitleText": "商品详情"
           }
@@ -138,13 +138,13 @@
           }
         },
         {
-          "path": "order/order-list",
+          "path": "order/index",
           "style": {
             "navigationBarTitleText": "我的订单"
           }
         },
         {
-          "path": "order/order-detail",
+          "path": "order/detail",
           "style": {
             "navigationBarTitleText": "订单详情"
           }
@@ -156,13 +156,13 @@
           }
         },
         {
-          "path": "address/address-list",
+          "path": "address/index",
           "style": {
             "navigationBarTitleText": "收货地址"
           }
         },
         {
-          "path": "address/add-address",
+          "path": "address/create",
           "style": {
             "navigationBarTitleText": "新增收货地址"
           }
diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index 7a3dc1b..4338142 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -89,7 +89,7 @@
           <text>商家</text>
         </view>
 
-        <view class='small-button-item' @click.stop='goPath("/pages/mine/subs/order/order-list")'>
+        <view class='small-button-item' @click.stop='goPath("/pages/mine/subs/order/index")'>
           <image :src='assetsUrl("ic_goods_order.png")' />
           <text>订单</text>
         </view>
diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue
index affab95..6f81a78 100644
--- a/src/pages/mall/index.vue
+++ b/src/pages/mall/index.vue
@@ -19,7 +19,7 @@
       <scroll-view class='goods-list' :scroll-y='true' type='custom'>
         <grid-view type='masonry' :cross-axis-count='2'>
           <view v-for='(item, index) in goodsList' :key='index' class='goods-item'
-                @click.stop='goPath(`/pages/mall/subs/goods/goods-detail?goodsId=${item.goodsId}`)'>
+                @click.stop='goPath(`/pages/mall/subs/goods/detail?goodsId=${item.goodsId}`)'>
             <image class='goods-image' :src='item.images' />
             <text class='goods-name'>{{ item.goodsName }}</text>
             <text class='goods-price'>¥{{ item.price }}</text>
diff --git a/src/pages/mall/subs/goods/goods-detail.vue b/src/pages/mall/subs/goods/detail.vue
similarity index 99%
rename from src/pages/mall/subs/goods/goods-detail.vue
rename to src/pages/mall/subs/goods/detail.vue
index 5f9ce09..77f59d8 100644
--- a/src/pages/mall/subs/goods/goods-detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -70,7 +70,7 @@
           <text>商家</text>
         </view>
 
-        <view class='small-button-item' @click.stop='goPath("/pages/mine/subs/order/order-list")'>
+        <view class='small-button-item' @click.stop='goPath("/pages/mine/subs/order/index")'>
           <image :src='assetsUrl("ic_goods_order.png")' />
           <text>订单</text>
         </view>
diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue
index 2c8801f..331820f 100644
--- a/src/pages/mall/subs/order/order-confirm.vue
+++ b/src/pages/mall/subs/order/order-confirm.vue
@@ -12,7 +12,7 @@
     </view>
 
     <view v-show='tabIndex==1' class='address-view c-flex-column'
-          @click.stop='goPath("/pages/mine/subs/address/address-list")'>
+          @click.stop='goPath("/pages/mine/subs/address/index")'>
       <view class='user-info c-flex-row'>
         <text>默认</text>
         <text>黄先生</text>
diff --git a/src/pages/mall/subs/search/index.vue b/src/pages/mall/subs/search/index.vue
index 1ef6380..2a51128 100644
--- a/src/pages/mall/subs/search/index.vue
+++ b/src/pages/mall/subs/search/index.vue
@@ -71,7 +71,6 @@ const goodsList = ref<GoodsBean[]>([1, 2, 3, 4, 1, 2, 2, 2]);
     display: flex;
     flex-direction: column;
     position: relative;
-    background: #666666;
     padding: 10rpx 10rpx;
     flex: 1;
 
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 7d08f8b..a4b389f 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -75,17 +75,17 @@ const officialAccountDialogRef = ref();
 const orderActionList = ref([{
   title: '进行中',
   icon: assetsUrl('ic_order_progressing.png'),
-  path: '/pages/mine/subs/order/order-list',
+  path: '/pages/mine/subs/order/index',
   amount: 10
 }, {
   title: '已结束',
   icon: assetsUrl('ic_order_finish.png'),
-  path: '/pages/mine/subs/order/order-list?index=1',
+  path: '/pages/mine/subs/order/index?index=1',
   amount: 0
 }, {
   title: '全部订单',
   icon: assetsUrl('ic_order_all.png'),
-  path: '/pages/mine/subs/order/order-list?index=2',
+  path: '/pages/mine/subs/order/index?index=2',
   amount: 0
 }]);
 
@@ -108,7 +108,7 @@ const serviceList = [
   {
     title: '收货地址',
     icon: assetsUrl('ic_member_service_address.png'),
-    path: '/pages/mine/subs/address/address-list'
+    path: '/pages/mine/subs/address/index'
   }, {
     title: '联系商家',
     icon: assetsUrl('ic_member_service_contact.png'),
diff --git a/src/pages/mine/subs/address/components/address-item.vue b/src/pages/mine/subs/address/components/item.vue
similarity index 100%
rename from src/pages/mine/subs/address/components/address-item.vue
rename to src/pages/mine/subs/address/components/item.vue
diff --git a/src/pages/mine/subs/address/add-address.vue b/src/pages/mine/subs/address/create.vue
similarity index 98%
rename from src/pages/mine/subs/address/add-address.vue
rename to src/pages/mine/subs/address/create.vue
index d2e96d7..de1223a 100644
--- a/src/pages/mine/subs/address/add-address.vue
+++ b/src/pages/mine/subs/address/create.vue
@@ -93,7 +93,7 @@ const save = () => {
 
     view:nth-of-type(1) {
       flex: 1;
-      margin: 5rpx 20rpx 0 0;
+      margin: 0 20rpx 0 0;
     }
 
     textarea {
diff --git a/src/pages/mine/subs/address/address-list.vue b/src/pages/mine/subs/address/index.vue
similarity index 74%
rename from src/pages/mine/subs/address/address-list.vue
rename to src/pages/mine/subs/address/index.vue
index c1b53df..7f880c5 100644
--- a/src/pages/mine/subs/address/address-list.vue
+++ b/src/pages/mine/subs/address/index.vue
@@ -1,18 +1,18 @@
 <template>
   <view class='content'>
     <scroll-view :scroll-y='true'>
-      <address-item v-for='(item,index) in addressList' :key='index' :item='item' />
+      <item v-for='(item,index) in addressList' :key='index' :item='item' />
     </scroll-view>
 
     <view class='bottom-button-view'>
-      <button class='primary-button' @click.stop='goPath("add-address")'>+新增地址</button>
+      <button class='primary-button' @click.stop='goPath("create")'>+新增地址</button>
     </view>
   </view>
 </template>
 
 <script lang='ts' setup>
 
-import AddressItem from './components/address-item.vue';
+import Item from './components/item.vue';
 import { goPath } from '@/utils';
 import { getAddressList } from '@/api/user';
 
diff --git a/src/pages/mine/subs/order/components/order-item.vue b/src/pages/mine/subs/order/components/order-item.vue
index c88c17f..1e72f1b 100644
--- a/src/pages/mine/subs/order/components/order-item.vue
+++ b/src/pages/mine/subs/order/components/order-item.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class='card-view' @click.stop='goPath("/pages/mine/subs/order/order-detail")'>
+  <view class='card-view' @click.stop='goPath("/pages/mine/subs/order/detail")'>
     <view class='goods-info-view c-flex-row'>
       <image class='goods-image' :src='assetsUrl("test_bg.png")' />
       <view class='c-flex-column' style='flex: 1;'>
diff --git a/src/pages/mine/subs/order/order-detail.vue b/src/pages/mine/subs/order/detail.vue
similarity index 100%
rename from src/pages/mine/subs/order/order-detail.vue
rename to src/pages/mine/subs/order/detail.vue
diff --git a/src/pages/mine/subs/order/order-list.vue b/src/pages/mine/subs/order/index.vue
similarity index 100%
rename from src/pages/mine/subs/order/order-list.vue
rename to src/pages/mine/subs/order/index.vue
diff --git a/src/pages/mine/subs/profile/index.vue b/src/pages/mine/subs/profile/index.vue
index efb0c3d..bd77a16 100644
--- a/src/pages/mine/subs/profile/index.vue
+++ b/src/pages/mine/subs/profile/index.vue
@@ -2,8 +2,8 @@
   <view class='content'>
     <view class='top-card-view'>
       <image class='bg-image' :src='assetsUrl("test_bg.png")' />
-      <image class='avatar-image' :src='assetsUrl("test_bg.png")' />
-      <text>设计小仙女</text>
+      <image class='avatar-image' :src='userInfo.image' />
+      <text>{{userInfo.nickName}}</text>
       <text>会员卡</text>
     </view>
 
@@ -11,20 +11,20 @@
       <view class='c-flex-row'>
         <text>头像</text>
         <view class='avatar-view'>
-          <image class='avatar-image' :src='assetsUrl("test_bg.png")' />
+          <image class='avatar-image' :src='userInfo.image' />
           <button class='avatar-btn' open-type='chooseAvatar' />
         </view>
       </view>
 
       <view class='c-flex-row'>
         <text class='nickname'>姓名</text>
-        <input placeholder='请输入姓名' type='nickname' />
+        <input placeholder='请输入姓名' type='nickname' v-model='userInfo.nickName' />
       </view>
 
       <view class='divider' />
       <view class='c-flex-row'>
         <text>手机号</text>
-        <input placeholder='15523653265' />
+        <input placeholder='15523653265' v-model='userInfo.telephone'/>
       </view>
 
       <view class='divider' />
@@ -57,6 +57,10 @@
 
 <script lang='ts' setup>
 import { assetsUrl } from '@/utils/assets';
+import { useUserStore } from '@/store';
+
+const store= useUserStore()
+const {userInfo} = storeToRefs(store)
 
 const currentGender = ref<number>(0);