gxwebsoft/gxtyzx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拆分admin分包，修复会员卡支付bug

Browse Source
This commit is contained in:
赵忠林
2024-07-16 00:14:30 +08:00
parent f3c18408d3
commit 8d682fbe81
13 changed files with 475 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/UniappTool.xml
Generated
+6 -2
View File
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="cn.fjdmy.uniapp.UniappProjectDataService">
<option name="basePath" value="$PROJECT_DIR$/src" />
<option name="generalBasePath" value="$PROJECT_DIR$" />
<option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
<option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
<option name="manifestPath" value="$PROJECT_DIR$/src/manifest.json" />
<option name="pagesPath" value="$PROJECT_DIR$/src/pages.json" />
<option name="scanNum" value="1" />
<option name="type" value="store" />
<option name="uniapp" value="true" />
<option name="uniappCli" value="true" />
<option name="vueVersion" value="3" />
</component>
</project>
src/package/booking/confirm.vue
+4 -3
View File
@@ -180,7 +180,7 @@ import { useCarStore } from '@/store/modules/car';
import { useUserStore } from '@/store/modules/user';
const userStore = useUserStore();
const carStore = useCarStore();
const { merchantId, orderInfo, period, totalPrice, reducePrice, payPrice, childrenPrice, carNum, carNum2, merchant, type, dateTime } = storeToRefs(carStore);
const { merchantId, merchantCode, orderInfo, period, totalPrice, reducePrice, payPrice, childrenPrice, carNum, carNum2, merchant, type, dateTime } = storeToRefs(carStore);
export default {
data() {
@@ -197,6 +197,7 @@ export default {
// 场馆信息
merchant,
merchantId,
merchantCode,
orderInfo,
carNum,
carNum2: 0,
@@ -386,9 +387,9 @@ export default {
const app = this;
const { payPrice } = this
return new Promise((resolve, reject) => {
const { merchantId } = this;
const { merchantId,merchantCode } = this;
UserCardApi.findUseCard({
sid: merchantId,
sid: merchantCode,
payPrice
})
.then((result) => {
src/package/user/card-detail-record.vue
+5 -2
View File
@@ -3,7 +3,7 @@
<!-- 其他功能 -->
<block v-for="(item, index) in list" :key="index">
<uni-card :border="false" :is-shadow="false" :padding="0">
<uv-cell :title="item.comments" :label="item.createTime" :value="`${item.price}`" :cellStyle="{ padding: '10px 0' }" :border="false"></uv-cell>
<uv-cell :title="item.comments" :label="item.createTime" :value="`￥${item.price}`" :cellStyle="{ padding: '10px 0' }" :border="false"></uv-cell>
</uni-card>
</block>
<!-- 登录组件 -->
@@ -48,7 +48,10 @@ export default {
// 获取会员卡使用记录
Api.pageUserCardLog({cardId}).then((res) => {
app.list = res.list;
app.list = res.list.map(d => {
d.createTime = uni.$uv.date(d.createTime,'yyyy-mm-dd hh:MM:ss')
return d;
});
});
},
navTo(item) {
src/package/user/personal.vue
+19 -19
View File
@@ -31,25 +31,25 @@
</template>
</uv-cell>
</uv-form-item>
<uv-form-item prop="form.idCard" borderBottom>
<uv-cell title="上传证件">
<template v-slot:right-icon>
<uv-icon size="40rpx" name="camera" @click="onIdCard(item)"></uv-icon>
</template>
</uv-cell>
</uv-form-item>
<uv-form-item prop="form.idCard" borderBottom>
<uv-cell>
<template v-slot:label>
<image src="https://oss.wsdns.cn/20240502/ec8c13037e7d4d40931b49fd45b23c61.png?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90" style="width: 80rpx" mode="widthFix" />
</template>
</uv-cell>
<uv-cell>
<template v-slot:label>
<image src="https://oss.wsdns.cn/20240502/ec8c13037e7d4d40931b49fd45b23c61.png?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90" style="width: 80rpx" mode="widthFix" />
</template>
</uv-cell>
</uv-form-item>
<!-- <uv-form-item prop="form.idCard" borderBottom>-->
<!-- <uv-cell title="上传证件">-->
<!-- <template v-slot:right-icon>-->
<!-- <uv-icon size="40rpx" name="camera" @click="onIdCard(item)"></uv-icon>-->
<!-- </template>-->
<!-- </uv-cell>-->
<!-- </uv-form-item>-->
<!-- <uv-form-item prop="form.idCard" borderBottom>-->
<!-- <uv-cell>-->
<!-- <template v-slot:label>-->
<!-- <image src="https://oss.wsdns.cn/20240502/ec8c13037e7d4d40931b49fd45b23c61.png?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90" style="width: 80rpx" mode="widthFix" />-->
<!-- </template>-->
<!-- </uv-cell>-->
<!-- <uv-cell>-->
<!-- <template v-slot:label>-->
<!-- <image src="https://oss.wsdns.cn/20240502/ec8c13037e7d4d40931b49fd45b23c61.png?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90" style="width: 80rpx" mode="widthFix" />-->
<!-- </template>-->
<!-- </uv-cell>-->
<!-- </uv-form-item>-->
</uv-form>
</view>
</uni-card>
src/package/admin/count.vue → src/packageAdmin/admin/count.vue
View File
src/package/admin/field.vue → src/packageAdmin/admin/field.vue
View File
src/package/admin/order-detail.vue → src/packageAdmin/admin/order-detail.vue
View File
src/package/admin/order-scan.vue → src/packageAdmin/admin/order-scan.vue
View File
src/package/admin/search.vue → src/packageAdmin/admin/search.vue
View File
src/package/admin/index.vue → src/packageAdmin/index.vue
+3 -3
View File
@@ -1,11 +1,11 @@
<template>
<view class="page">
<uv-gap height="20"></uv-gap>
<!-- <uv-gap height="20"></uv-gap>-->
<!-- <uni-nav-bar dark :fixed="true" shadow background-color="#2ba91c" status-bar left-icon="left" left-text="返回" title="场地管理" @clickLeft="goBack" /> -->
<!-- 顶部距离 -->
<!-- <view class="header" :style="'margin-top: ' + statusBarHeight + 'px'"></view> -->
<!-- 用户信息 -->
<ws-admin-card :merchantList="merchantList" :merchantId="merchantId" :data="userInfo" :is-login="isLogin" @openLogin="openLogin" />
<!-- <ws-admin-card :merchantList="merchantList" :merchantId="merchantId" :data="userInfo" :is-login="isLogin" @openLogin="openLogin" />-->
<block v-if="hideTools">
<uni-card :border="false" :padding="'18px 8px'">
<uv-skeleton rows="2" :loading="hideTools" :title="false"></uv-skeleton>
@@ -55,7 +55,7 @@
<script>
import { useUserStore } from '@/store/modules/user';
import * as UserApi from '@/api/booking/users';
import * as MpMenuApi from '@/api/cms/mp-menu/index';
import * as MpMenuApi from '@/api/cms/mp-menu';
import * as MerchantApi from '@/api/shop/merchant';
import { updateUsers } from '@/api/shop/users';
import { openUrl } from '@/utils/common';
src/pages.json
+428 -402
View File
@@ -1,404 +1,430 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "广西体育中心",
"enablePullDownRefresh": false
}
},
{
"path": "pages/shop/shop",
"style": {
"navigationBarTitleText": "商城",
"enablePullDownRefresh": false
}
},
{
"path": "pages/order/order",
"style": {
"navigationBarTitleText": "我的订单",
"enablePullDownRefresh": false
}
},
{
"path": "pages/user/user",
"style": {
"navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}
],
"subPackages": [{
"root": "package",
"pages": [{
"path": "user/personal",
"style": {
"navigationBarTitleText": "个人资料",
"enablePullDownRefresh": false
}
}, {
"path": "user/emergency",
"style": {
"navigationBarTitleText": "紧急联系人",
"enablePullDownRefresh": false
}
}, {
"path": "user/coupon",
"style": {
"navigationBarTitleText": "我的券包",
"enablePullDownRefresh": false
}
}, {
"path": "user/integral",
"style": {
"navigationBarTitleText": "我的积分",
"enablePullDownRefresh": false
}
},
{
"path": "user/invoice",
"style": {
"navigationBarTitleText": "开票发票",
"enablePullDownRefresh": false
}
},
{
"path": "user/invoice-edit",
"style": {
"navigationBarTitleText": "修改开票信息",
"enablePullDownRefresh": false
}
},
{
"path": "user/invoice-show",
"style": {
"navigationBarTitleText": "查看开票信息",
"enablePullDownRefresh": false
}
}
,{
"path": "user/balance-log",
"style": {
"navigationBarTitleText": "余额明细",
"enablePullDownRefresh": false
}
}, {
"path": "user/card",
"style": {
"navigationBarTitleText": "我的卡包",
"enablePullDownRefresh": false
}
}, {
"path": "user/card-detail",
"style": {
"navigationBarTitleText": "会员卡详情",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail-merchant",
"style": {
"navigationBarTitleText": "适用场馆",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail-about",
"style": {
"navigationBarTitleText": "会员卡详情",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail-record",
"style": {
"navigationBarTitleText": "使用记录",
"enablePullDownRefresh": false
}
},
{
"path": "user/pay-password",
"style": {
"navigationBarTitleText": "设置支付密码",
"enablePullDownRefresh": false
}
}, {
"path": "user/address",
"style": {
"navigationBarTitleText": "收货地址",
"enablePullDownRefresh": false
}
}, {
"path": "user/ic-card",
"style": {
"navigationBarTitleText": "IC卡激活",
"enablePullDownRefresh": false
}
}, {
"path": "user/ic-card-order",
"style": {
"navigationBarTitleText": "支付卡订单",
"enablePullDownRefresh": false
}
},
{
"path": "order/index",
"style": {
"navigationBarTitleText": "订单列表",
"enablePullDownRefresh": false
}
},
{
"path": "user/qrcode",
"style": {
"navigationBarTitleText": "我的二维码名片",
"enablePullDownRefresh": false
}
},
{
"path": "goods/detail",
"style": {
"navigationBarTitleText": "商品详情",
"enablePullDownRefresh": false
}
},
{
"path": "goods/checkout",
"style": {
"navigationBarTitleText": "订单确认",
"enablePullDownRefresh": false
}
},
{
"path": "goods/order",
"style": {
"navigationBarTitleText": "商城订单"
}
},
{
"path": "card/index",
"style": {
"navigationBarTitleText": "购买VIP会员卡"
}
},
{
"path": "card/checkout",
"style": {
"navigationBarTitleText": "订单确认"
}
},
{
"path": "article/index",
"style": {
"navigationBarTitleText": "文章列表",
"enablePullDownRefresh": false
}
},
{
"path": "article/detail",
"style": {
"navigationBarTitleText": "文章详情",
"enablePullDownRefresh": false
}
}, {
"path": "booking/merchant",
"style": {
"navigationBarTitleText": "订单核销",
"enablePullDownRefresh": false
}
},
{
"path": "booking/index",
"style": {
"navigationBarTitleText": "场地信息"
}
},
{
"path": "booking/checkout",
"style": {
"navigationBarTitleText": "场地预定"
}
},
{
"path": "booking/confirm",
"style": {
"navigationBarTitleText": "订单确认"
}
},
{
"path": "booking/cashier",
"style": {
"navigationBarTitleText": "订单确认"
}
},
{
"path": "order/detail",
"style": {
"navigationBarTitleText": "订单详情"
}
}, {
"path": "course/index",
"style": {
"navigationBarTitleText": "培训课程",
"enablePullDownRefresh": false
}
}, {
"path": "course/list",
"style": {
"navigationBarTitleText": "课程列表",
"enablePullDownRefresh": false
}
}, {
"path": "course/detail",
"style": {
"navigationBarTitleText": "课程详情",
"enablePullDownRefresh": false
}
}, {
"path": "course/checkout",
"style": {
"navigationBarTitleText": "订单确认",
"enablePullDownRefresh": false
}
},{
"path": "course/student",
"style": {
"navigationBarTitleText": "学员管理",
"enablePullDownRefresh": false
}
},
{
"path": "admin/index",
"style": {
"navigationBarTitleText": "管理中心"
}
}, {
"path": "admin/order-scan",
"style": {
"navigationBarTitleText": "订单核销",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
"path": "admin/field",
"style": {
"navigationBarTitleText": "场地管理",
"enablePullDownRefresh": false
}
},{
"path": "admin/order-detail",
"style": {
"navigationBarTitleText": "订单信息",
"enablePullDownRefresh": false
}
},{
"path": "admin/search",
"style": {
"navigationBarTitleText": "订单查询",
"enablePullDownRefresh": false
}
},{
"path": "admin/count",
"style": {
"navigationBarTitleText": "统计分析",
"enablePullDownRefresh": false
}
},
{
"path": "teacher/detail",
"style": {
"navigationBarTitleText": "教练介绍",
"enablePullDownRefresh": false
}
},
{
"path" : "match/index",
"style" :
{
"navigationBarTitleText" : "赛事活动"
}
},
{
"path" : "match/detail",
"style" :
{
"navigationBarTitleText" : "活动详情"
}
},
{
"path" : "match/checkout",
"style" :
{
"navigationBarTitleText" : "赛事活动报名"
}
},
{
"path" : "cooperate/index",
"style" :
{
"navigationBarTitleText" : "商务合作"
}
},
{
"path" : "coupon/index",
"style" :
{
"navigationBarTitleText" : "领劵中心"
}
}
]
}],
"tabBar": {
"color": "#000000",
"selectedColor": "#d81e06",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"fontSize": "14px",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home-active.png",
"text": "首页"
},
{
"pagePath": "pages/shop/shop",
"iconPath": "static/tabbar/shop.png",
"selectedIconPath": "static/tabbar/shop-active.png",
"text": "商城"
},
{
"pagePath": "pages/order/order",
"iconPath": "static/tabbar/order.png",
"selectedIconPath": "static/tabbar/order-active.png",
"text": "订单"
},
{
"pagePath": "pages/user/user",
"iconPath": "static/tabbar/user.png",
"selectedIconPath": "static/tabbar/user-active.png",
"text": "我的"
}
]
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "webSoft",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
// #ifdef H5
"maxWidth": 750,
"rpxCalcMaxDeviceWidth": 750, // rpx 计算所支持的最大设备宽度，单位 px，默认值为 960
"rpxCalcBaseDeviceWidth": 560, // rpx 计算使用的基准设备宽度，设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算，单位 px，默认值为 375
"rpxCalcIncludeWidth": 9999 // rpx 计算特殊处理的值，始终按实际的设备宽度计算，单位 rpx，默认值为 750
// #endif
},
"uniIdRouter": {},
"permission": {
"scope.writeClipboard": {
"desc": "你的剪贴板将用于小程序的复制操作"
}
}
"pages": [
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "广西体育中心",
"enablePullDownRefresh": false
}
},
{
"path": "pages/shop/shop",
"style": {
"navigationBarTitleText": "商城",
"enablePullDownRefresh": false
}
},
{
"path": "pages/order/order",
"style": {
"navigationBarTitleText": "我的订单",
"enablePullDownRefresh": false
}
},
{
"path": "pages/user/user",
"style": {
"navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}
],
"subPackages": [
{
"root": "package",
"pages": [
{
"path": "user/personal",
"style": {
"navigationBarTitleText": "个人资料",
"enablePullDownRefresh": false
}
},
{
"path": "user/emergency",
"style": {
"navigationBarTitleText": "紧急联系人",
"enablePullDownRefresh": false
}
},
{
"path": "user/coupon",
"style": {
"navigationBarTitleText": "我的券包",
"enablePullDownRefresh": false
}
},
{
"path": "user/integral",
"style": {
"navigationBarTitleText": "我的积分",
"enablePullDownRefresh": false
}
},
{
"path": "user/invoice",
"style": {
"navigationBarTitleText": "开票发票",
"enablePullDownRefresh": false
}
},
{
"path": "user/invoice-edit",
"style": {
"navigationBarTitleText": "修改开票信息",
"enablePullDownRefresh": false
}
},
{
"path": "user/invoice-show",
"style": {
"navigationBarTitleText": "查看开票信息",
"enablePullDownRefresh": false
}
},
{
"path": "user/balance-log",
"style": {
"navigationBarTitleText": "余额明细",
"enablePullDownRefresh": false
}
},
{
"path": "user/card",
"style": {
"navigationBarTitleText": "我的卡包",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail",
"style": {
"navigationBarTitleText": "会员卡详情",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail-merchant",
"style": {
"navigationBarTitleText": "适用场馆",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail-about",
"style": {
"navigationBarTitleText": "会员卡详情",
"enablePullDownRefresh": false
}
},
{
"path": "user/card-detail-record",
"style": {
"navigationBarTitleText": "使用记录",
"enablePullDownRefresh": false
}
},
{
"path": "user/pay-password",
"style": {
"navigationBarTitleText": "设置支付密码",
"enablePullDownRefresh": false
}
},
{
"path": "user/address",
"style": {
"navigationBarTitleText": "收货地址",
"enablePullDownRefresh": false
}
},
{
"path": "user/ic-card",
"style": {
"navigationBarTitleText": "IC卡激活",
"enablePullDownRefresh": false
}
},
{
"path": "user/ic-card-order",
"style": {
"navigationBarTitleText": "支付卡订单",
"enablePullDownRefresh": false
}
},
{
"path": "order/index",
"style": {
"navigationBarTitleText": "订单列表",
"enablePullDownRefresh": false
}
},
{
"path": "user/qrcode",
"style": {
"navigationBarTitleText": "我的二维码名片",
"enablePullDownRefresh": false
}
},
{
"path": "goods/detail",
"style": {
"navigationBarTitleText": "商品详情",
"enablePullDownRefresh": false
}
},
{
"path": "goods/checkout",
"style": {
"navigationBarTitleText": "订单确认",
"enablePullDownRefresh": false
}
},
{
"path": "goods/order",
"style": {
"navigationBarTitleText": "商城订单"
}
},
{
"path": "card/index",
"style": {
"navigationBarTitleText": "购买VIP会员卡"
}
},
{
"path": "card/checkout",
"style": {
"navigationBarTitleText": "订单确认"
}
},
{
"path": "article/index",
"style": {
"navigationBarTitleText": "文章列表",
"enablePullDownRefresh": false
}
},
{
"path": "article/detail",
"style": {
"navigationBarTitleText": "文章详情",
"enablePullDownRefresh": false
}
},
{
"path": "booking/merchant",
"style": {
"navigationBarTitleText": "订单核销",
"enablePullDownRefresh": false
}
},
{
"path": "booking/index",
"style": {
"navigationBarTitleText": "场地信息"
}
},
{
"path": "booking/checkout",
"style": {
"navigationBarTitleText": "场地预定"
}
},
{
"path": "booking/confirm",
"style": {
"navigationBarTitleText": "订单确认"
}
},
{
"path": "booking/cashier",
"style": {
"navigationBarTitleText": "订单确认"
}
},
{
"path": "order/detail",
"style": {
"navigationBarTitleText": "订单详情"
}
},
{
"path": "course/index",
"style": {
"navigationBarTitleText": "培训课程",
"enablePullDownRefresh": false
}
},
{
"path": "course/list",
"style": {
"navigationBarTitleText": "课程列表",
"enablePullDownRefresh": false
}
},
{
"path": "course/detail",
"style": {
"navigationBarTitleText": "课程详情",
"enablePullDownRefresh": false
}
},
{
"path": "course/checkout",
"style": {
"navigationBarTitleText": "订单确认",
"enablePullDownRefresh": false
}
},
{
"path": "course/student",
"style": {
"navigationBarTitleText": "学员管理",
"enablePullDownRefresh": false
}
},
{
"path": "teacher/detail",
"style": {
"navigationBarTitleText": "教练介绍",
"enablePullDownRefresh": false
}
},
{
"path": "match/index",
"style": {
"navigationBarTitleText": "赛事活动"
}
},
{
"path": "match/detail",
"style": {
"navigationBarTitleText": "活动详情"
}
},
{
"path": "match/checkout",
"style": {
"navigationBarTitleText": "赛事活动报名"
}
},
{
"path": "cooperate/index",
"style": {
"navigationBarTitleText": "商务合作"
}
},
{
"path": "coupon/index",
"style": {
"navigationBarTitleText": "领劵中心"
}
}
]
},
{
"root": "packageAdmin",
"pages": [
{
"path": "/index",
"style": {
"navigationBarTitleText": "管理中心"
}
},
{
"path": "admin/order-scan",
"style": {
"navigationBarTitleText": "订单核销",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "admin/field",
"style": {
"navigationBarTitleText": "场地管理",
"enablePullDownRefresh": false
}
},
{
"path": "admin/order-detail",
"style": {
"navigationBarTitleText": "订单信息",
"enablePullDownRefresh": false
}
},
{
"path": "admin/search",
"style": {
"navigationBarTitleText": "订单查询",
"enablePullDownRefresh": false
}
},
{
"path": "admin/count",
"style": {
"navigationBarTitleText": "统计分析",
"enablePullDownRefresh": false
}
}
]
}
],
"tabBar": {
"color": "#000000",
"selectedColor": "#d81e06",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"fontSize": "14px",
"list": [
{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home-active.png",
"text": "首页"
},
{
"pagePath": "pages/shop/shop",
"iconPath": "static/tabbar/shop.png",
"selectedIconPath": "static/tabbar/shop-active.png",
"text": "商城"
},
{
"pagePath": "pages/order/order",
"iconPath": "static/tabbar/order.png",
"selectedIconPath": "static/tabbar/order-active.png",
"text": "订单"
},
{
"pagePath": "pages/user/user",
"iconPath": "static/tabbar/user.png",
"selectedIconPath": "static/tabbar/user-active.png",
"text": "我的"
}
]
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "webSoft",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
// #ifdef H5
"maxWidth": 750,
"rpxCalcMaxDeviceWidth": 750,
// rpx 计算所支持的最大设备宽度，单位 px，默认值为 960
"rpxCalcBaseDeviceWidth": 560,
// rpx 计算使用的基准设备宽度，设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算，单位 px，默认值为 375
"rpxCalcIncludeWidth": 9999
// rpx 计算特殊处理的值，始终按实际的设备宽度计算，单位 rpx，默认值为 750
// #endif
},
"uniIdRouter": {},
"permission": {
"scope.writeClipboard": {
"desc": "你的剪贴板将用于小程序的复制操作"
}
}
}
src/store/modules/car.ts
+3
View File
@@ -13,6 +13,7 @@ export interface CarState {
merchantId: Number | null;
merchantName: String | null;
merchantCode: Number | null;
sid: String | null;
merchant: Merchant | null;
order: Order | null;
orderInfo: OrderInfo[] | null;
@@ -37,6 +38,8 @@ export const useCarStore = defineStore({
merchantName: null,
// 场馆编号
merchantCode: null,
// 场馆编号
sid: null,
// 场馆信息
merchant: null,
// 订单信息
src/uni_modules/ws-user-card/components/ws-user-card/ws-user-card.vue
+7 -3
View File
@@ -1,6 +1,6 @@
<template>
<view class="user-card" @click="openLogin" v-if="form">
<view class="userinfo" @click.stop="openPersonal">
<view class="user-card" @click="openLogin">
<view class="userinfo" v-if="form">
<view class="avatar">
<image v-if="isLogin" :src="form.avatarUrl" mode="aspectFill"></image>
<!-- <uni-icons v-else type="contact-filled" color="#f3f3f3" size="100"></uni-icons> -->
@@ -114,7 +114,11 @@ export default {
},
methods: {
openLogin() {
this.$emit('openLogin');
if(this.isLogin){
this.$refs.personal.open('center');
}else{
this.$emit('openLogin');
}
},
openPersonal() {
this.$refs.personal.open('center');