Waiting/suke-mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Waiting
2024-03-16 22:46:10 +08:00
parent 8b0ad91bd4
commit 84b6ff15c7
14 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages.json
View File

@@ -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": "新增收货地址"
}

2
src/pages/common/groupbuy/detail.vue
View File

@@ -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>

2
src/pages/mall/index.vue
View File

@@ -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>

2
src/pages/mall/subs/goods/goods-detail.vue → src/pages/mall/subs/goods/detail.vue
View File

@@ -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>

2
src/pages/mall/subs/order/order-confirm.vue
View File

@@ -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>

1
src/pages/mall/subs/search/index.vue
View File

@@ -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;

8
src/pages/mine/index.vue
View File

@@ -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'),

0
src/pages/mine/subs/address/components/address-item.vue → src/pages/mine/subs/address/components/item.vue
View File

2
src/pages/mine/subs/address/add-address.vue → src/pages/mine/subs/address/create.vue
View File

@@ -93,7 +93,7 @@ const save = () => {
view:nth-of-type(1) {
flex: 1;
margin: 5rpx 20rpx 0 0;
margin: 0 20rpx 0 0;
}
textarea {

6
src/pages/mine/subs/address/address-list.vue → src/pages/mine/subs/address/index.vue
View File

@@ -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';

2
src/pages/mine/subs/order/components/order-item.vue
View File

@@ -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;'>

0
src/pages/mine/subs/order/order-detail.vue → src/pages/mine/subs/order/detail.vue
View File

0
src/pages/mine/subs/order/order-list.vue → src/pages/mine/subs/order/index.vue
View File

14
src/pages/mine/subs/profile/index.vue
View File

@@ -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);