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

修复已知问题

Browse Source
This commit is contained in:
赵忠林
2024-10-09 12:31:09 +08:00
parent 10533eb67d
commit 6161d9c1d3
12 changed files with 140 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+2 -2
View File
@@ -1,9 +1,9 @@
VITE_APP_NAME=后台管理系统
VITE_SOCKET_URL=wss://server.gxwebsoft.com
VITE_SERVER_URL=https://server.gxwebsoft.com/api
#VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
VITE_THINK_URL=https://gxtyzx-api.websoft.top/api
VITE_API_URL=https://modules.gxwebsoft.com/api
#VITE_SERVER_URL=http://127.0.0.1:9090/api
#VITE_API_URL=http://127.0.0.1:9001/api
VITE_THINK_URL=http://127.0.0.1:9099/api
#VITE_THINK_URL=http://127.0.0.1:9099/api
src/package/goods/order-detail.vue
+5 -2
View File
@@ -55,7 +55,10 @@
</uv-cell>
<uv-cell :title="`订单状态`" :cellStyle="{ padding: '8px' }">
<template v-slot:value>
<view v-if="form.payStatus == 0">
<view v-if="form.orderStatus === 2">
<span class="web-text-secondary">已取消</span>
</view>
<view v-else-if="form.payStatus === 0">
<!-- <uv-count-down :time="form.timestamp" format="mm:ss"></uv-count-down> -->
<span style="color: #ff0000">未支付</span>
</view>
@@ -70,7 +73,7 @@
</uni-card>
</block>
<uv-gap height="20"></uv-gap>
<view class="checkout-car" v-if="form.payStatus == 0">
<view class="checkout-car" v-if="form.payStatus === 0 && form.orderStatus !== 2">
<view class="car-total">
<text style="color: #ebcf00">￥</text>
<uv-count-to decimals="2" duration="30" color="#ebcf00" bold :endVal="form.payPrice"></uv-count-to>
src/package/goods/order.vue
+1 -1
View File
@@ -166,7 +166,7 @@ export default {
reload() {
const app = this;
const { where, userId } = this;
if (userId == 0) {
if (userId === 0) {
app.openLogin();
return;
}
src/package/user/card.vue
+14 -13
View File
@@ -10,15 +10,18 @@
v-for="(item, index) in cardList"
:key="index"
@click="openUrl('/package/user/card-detail?cardId=' + item.id)"
:style="{ background: `url(${item.image}) no-repeat center center`, backgroundSize: '100%', opacity: '0.85' }"
:style="{ background: `url(https://oss.wsdns.cn/20240920/5e3327e1ad97472e942c824ab1776f52.jpg?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90) no-repeat center center`, backgroundSize: '100%', opacity: '0.85' }"
>
<view class="content web-cell">
<view class="merchant-avatar">
<uv-avatar :src="item.merchantAvatar" size="36" style="border: 3rpx solid #ffffff"></uv-avatar>
</view>
<!-- <view class="merchant-avatar">-->
<!-- <uv-avatar :src="item.merchantAvatar" size="36" style="border: 3rpx solid #ffffff"></uv-avatar>-->
<!-- </view>-->
<view class="card-info web-cell-content">
<view class="title-bar">
<view class="web-text-heading" style="color: #ffffff; font-size: 17px; font-weight: 600">{{ item.name }}</view>
<view class="web-text-heading" style="color: #ffffff; font-size: 20px; font-weight: 600">{{ item.name }}</view>
<view class="desc py-3" style="text-align: left;">
{{ item.siteNames }}
</view>
<!-- <block v-if="item.type == 2">
<view class="desc web-text-heading" style="color: #ffffff; font-size: 14px">{{ item.month }}个月</view>
</block> -->
@@ -66,8 +69,7 @@
</template>
<script>
import * as Api from '@/api/booking/userCard';
import { pageWechatDeposit } from '@/api/shop/wechatDeposit';
import * as Api from '@/api/think/thinkUsersVip';
import { getWeek, getKey } from '@/utils/common';
export default {
@@ -137,15 +139,15 @@ export default {
reload() {
const app = this;
const { where, userId } = this;
if (userId == 0) {
if (userId === 0) {
app.openLogin();
return;
}
where.userId = userId;
where.uid = uni.getStorageSync('uid');
where.status = 1;
where.sceneType = 'myCardAll';
app.loadMore = 'loading';
Api.pageUserCard(where)
Api.pageThinkUsersVip(where)
.then((res) => {
console.log('res: ', res);
const list = res.list.map((d) => {
@@ -253,7 +255,7 @@ export default {
/* #endif */
justify-content: center;
align-items: center;
height: 150px;
height: 380rpx;
text-align: center;
}
@@ -278,14 +280,13 @@ export default {
.card-list {
.container {
width: 700rpx;
height: 200rpx;
height: 380rpx;
position: relative;
margin: 25rpx auto;
display: flex;
justify-content: space-between;
align-items: center;
border-radius: 20rpx;
position: relative;
box-shadow: 0 0px 6px 0 rgba(0, 0, 0, 0.2);
// background: linear-gradient(to right, #70b915, #008e04);
color: #ffffff;
src/package/user/coupon.vue
+1 -1
View File
@@ -126,7 +126,7 @@
app.openLogin()
return;
}
// where.userId = userId;
where.userId = userId;
uni.showLoading({
title: '数据读取中.'
})
src/package/user/ic-card-order.vue
+7 -7
View File
@@ -16,11 +16,11 @@
</view>
</view>
</uni-card>
<view class="btn-bar">
<uv-button class="save-user-profile"
:customStyle="{background: 'linear-gradient(to right, #70b915, #008e04)',borderRadius: '30px',color: '#ffffff'}"
text="添加" @click="add"></uv-button>
</view>
<!-- <view class="btn-bar">-->
<!-- <uv-button class="save-user-profile"-->
<!-- :customStyle="{background: 'linear-gradient(to right, #70b915, #008e04)',borderRadius: '30px',color: '#ffffff'}"-->
<!-- text="添加" @click="add"></uv-button>-->
<!-- </view>-->
<!-- 登录组件 -->
<ws-login ref="login" :logo="logo" @done="reload" />
<!-- EmergencyEdit弹窗 -->
@@ -101,7 +101,7 @@
Api.pageEmergency({
userId: userInfo.userId
}).then(res => {
app.list = res.list;
app.list = []
})
},
navTo(item) {
@@ -200,4 +200,4 @@
margin: auto;
clear: both;
}
</style>
</style>
src/package/user/invoice-show.vue
+3 -3
View File
@@ -7,7 +7,7 @@
<script>
// import { useUserStore } from '@/store/modules/user';
import * as Api from '@/api/booking/userInvoice';
import * as Api from '@/api/think/thinkInvoice';
import { copyText, openUrl } from '@/utils/common';
// import { useTenantStore } from '@/store/modules/tenant';
@@ -28,7 +28,7 @@ export default {
this.reload(e.id);
},
methods: {
async reload(orderNo) {
async reload(oid) {
const app = this;
// 当前登录用户信息
// const userInfo = await userStore.fetchUserInfo();
@@ -40,7 +40,7 @@ export default {
// }
// 读取最后一次
await Api.showInvoice(orderNo).then((res) => {
await Api.pageThinkInvoice({oid}).then((res) => {
if (res) {
const json = JSON.parse(res);
if (json.code) {
src/pages.json
+1 -1
View File
@@ -108,7 +108,7 @@
{
"path": "user/card",
"style": {
"navigationBarTitleText": "我的卡包",
"navigationBarTitleText": "会员服务",
"enablePullDownRefresh": false
}
},
src/pages/order.vue
+2 -2
View File
@@ -58,10 +58,10 @@
</button>
</view>
<view class="card-actions-item" v-if="item.payStatus == 1">
<button class="mini-btn" size="mini" v-if="item.isInvoice == 0" @click="onInvoice(item.orderId)">
<button class="mini-btn" size="mini" v-if="item.isOpen === 2" @click="onInvoice(item.orderId)">
申请开票
</button>
<button class="mini-btn" size="mini" v-else @click="showInvoice(item.orderId)">查看发票</button>
<button class="mini-btn" size="mini" v-else @click="showInvoice(item.id)">查看发票</button>
</view>
</view>
</uni-card>
src/pages/user.vue
+86 -82
View File
@@ -20,87 +20,87 @@
<!-- 我的订单 -->
<!-- <ws-user-order :order="order" :is-login="isLogin" @done="openLogin"></ws-user-order> -->
<!-- 其他功能 -->
<!-- <uni-card :border="false" :padding="0">-->
<!-- &lt;!&ndash; 场馆管理可见&ndash;&gt;-->
<!-- <block v-if="hasMerchantRole || hasMerchantClerkRole">-->
<!-- <view class="server" style="min-height: 200px">-->
<!-- <uni-list :border="false">-->
<!-- <block v-for="(item, index) in mpMenus" :key="index">-->
<!-- <block v-if="index === '1981'" v-for="(v,i) in item">-->
<!-- <uni-list-item :thumb="v.avatar" link @click="navTo(v)">-->
<!-- <template v-slot:body>-->
<!-- <view class="slot-box">-->
<!-- <text class="slot-text" :style="{ color: v.color ? v.color : '#333333' }">{{-->
<!-- v.title-->
<!-- }}-->
<!-- </text>-->
<!-- </view>-->
<!-- </template>-->
<!-- </uni-list-item>-->
<!-- </block>-->
<!-- </block>-->
<!-- </uni-list>-->
<!-- </view>-->
<!-- </block>-->
<!-- <block v-else>-->
<!-- &lt;!&ndash; 普通会员菜单 &ndash;&gt;-->
<!-- <view class="server" style="min-height: 200px">-->
<!-- <uni-list :border="false">-->
<!-- <block v-for="(item, index) in mpMenus" :key="index">-->
<!-- <block v-if="index === '1981'" v-for="(v,i) in item">-->
<!-- <uni-list-item :thumb="v.avatar" link @click="navTo(v)">-->
<!-- <template v-slot:body>-->
<!-- <view class="slot-box">-->
<!-- <text class="slot-text" :style="{ color: v.color ? v.color : '#333333' }">{{-->
<!-- v.title-->
<!-- }}-->
<!-- </text>-->
<!-- </view>-->
<!-- </template>-->
<!-- </uni-list-item>-->
<!-- </block>-->
<!-- </block>-->
<!-- </uni-list>-->
<!-- </view>-->
<!-- </block>-->
<!-- </uni-card>-->
<uni-card :border="false" :padding="0">
<!-- 场馆管理可见-->
<block v-if="hasMerchantRole || hasMerchantClerkRole">
<view class="server" style="min-height: 200px">
<uni-list :border="false">
<block v-for="(item, index) in mpMenus" :key="index">
<block v-if="index === '1981'" v-for="(v,i) in item">
<uni-list-item :thumb="v.avatar" link @click="navTo(v)">
<template v-slot:body>
<view class="slot-box">
<text class="slot-text" :style="{ color: v.color ? v.color : '#333333' }">{{
v.title
}}
</text>
</view>
</template>
</uni-list-item>
</block>
</block>
</uni-list>
</view>
</block>
<block v-else>
<!-- 普通会员菜单 -->
<view class="server" style="min-height: 200px">
<uni-list :border="false">
<block v-for="(item, index) in mpMenus" :key="index">
<block v-if="index === '1981'" v-for="(v,i) in item">
<uni-list-item :thumb="v.avatar" link @click="navTo(v)">
<template v-slot:body>
<view class="slot-box">
<text class="slot-text" :style="{ color: v.color ? v.color : '#333333' }">{{
v.title
}}
</text>
</view>
</template>
</uni-list-item>
</block>
</block>
</uni-list>
</view>
</block>
</uni-card>
<block v-for="(item, index) in mpMenus" :key="index">
<block v-if="index === '1981'">
<uni-card :title="item[0].groupName" :border="false" :padding="0">
<uv-skeleton rows="1" rowsHeight="30" rowsWidth="100%" :loading="mpMenus.length === 0" :title="false">
<div class="flex space-around py-6 flex-wrap">
<block v-for="(item,index) in item" :key="index">
<div
class="service-item flex flex-col justify-center items-center web-cell-content web-text-center px-20"
@click="navTo(item)">
<image :src="item.avatar" style="width: 30px; height: 30px;" mode="widthFix"></image>
<text style="white-space: nowrap">{{ item.title }}</text>
</div>
</block>
</div>
<w-gap height="5"></w-gap>
</uv-skeleton>
</uni-card>
</block>
<block v-if="index === '1982' && (hasMerchantClerkRole || hasMerchantRole)">
<uni-card :title="item[0].groupName" :border="false" :padding="0">
<uv-skeleton rows="1" rowsHeight="30" rowsWidth="100%" :loading="mpMenus.length === 0" :title="false">
<div class="flex space-around py-6 flex-wrap">
<block v-for="(item,index) in item" :key="index">
<div
class="service-item flex flex-col justify-center items-center web-cell-content web-text-center px-20"
@click="navTo(item)">
<image :src="item.avatar" style="width: 30px; height: 30px;" mode="widthFix"></image>
<text style="white-space: nowrap">{{ item.title }}</text>
</div>
</block>
</div>
<w-gap height="5"></w-gap>
</uv-skeleton>
</uni-card>
</block>
</block>
<!-- <block v-for="(item, index) in mpMenus" :key="index">-->
<!-- <block v-if="index === '1981'">-->
<!-- <uni-card :title="item[0].groupName" :border="false" :padding="0">-->
<!-- <uv-skeleton rows="1" rowsHeight="30" rowsWidth="100%" :loading="mpMenus.length === 0" :title="false">-->
<!-- <div class="flex space-around py-6 flex-wrap">-->
<!-- <block v-for="(item,index) in item" :key="index">-->
<!-- <div-->
<!-- class="service-item flex flex-col justify-center items-center web-cell-content web-text-center px-20"-->
<!-- @click="navTo(item)">-->
<!-- <uv-avatar :src="item.avatar" :size="24" mode="widthFix"></uv-avatar>-->
<!-- <text style="white-space: nowrap">{{ item.title }}</text>-->
<!-- </div>-->
<!-- </block>-->
<!-- </div>-->
<!-- <w-gap height="5"></w-gap>-->
<!-- </uv-skeleton>-->
<!-- </uni-card>-->
<!-- </block>-->
<!-- <block v-if="index === '1982' && (hasMerchantClerkRole || hasMerchantRole)">-->
<!-- <uni-card :title="item[0].groupName" :border="false" :padding="0">-->
<!-- <uv-skeleton rows="1" rowsHeight="30" rowsWidth="100%" :loading="mpMenus.length === 0" :title="false">-->
<!-- <div class="flex space-around py-6 flex-wrap">-->
<!-- <block v-for="(item,index) in item" :key="index">-->
<!-- <div-->
<!-- class="service-item flex flex-col justify-center items-center web-cell-content web-text-center px-20"-->
<!-- @click="navTo(item)">-->
<!-- <image :src="item.avatar" style="width: 30px; height: 30px;" mode="widthFix"></image>-->
<!-- <text style="white-space: nowrap">{{ item.title }}</text>-->
<!-- </div>-->
<!-- </block>-->
<!-- </div>-->
<!-- <w-gap height="5"></w-gap>-->
<!-- </uv-skeleton>-->
<!-- </uni-card>-->
<!-- </block>-->
<!-- </block>-->
<!-- <ws-personal :form="users" ref="personal" @done="reload" />-->
<!-- 登录组件 -->
<ws-login ref="login" :logo="logo" @done="reload"/>
@@ -122,13 +122,14 @@ import Layout from "@/components/layout.vue";
import {useTenantStore} from '@/store/modules/tenant';
import {authUser} from "@/api/user";
import UvAvatar from "@/uni_modules/uv-avatar/components/uv-avatar/uv-avatar.vue";
const tenantStore = useTenantStore();
const mpStore = useMpStore();
const userStore = useUserStore();
export default {
components: {Layout},
components: {UvAvatar, Layout},
data() {
return {
statusBarHeight: 104,
@@ -306,11 +307,14 @@ export default {
this.hideTools = false;
},
// 弹出登录提示框
openLogin() {
openLogin(text) {
if (!this.isLogin) {
this.$refs.login.open('bottom');
return false;
}
if(text){
uni.navigateTo({url: text})
}
}
}
};
src/uni_modules/ws-my-asset/components/ws-my-asset/ws-my-asset.vue
+4 -1
View File
@@ -1,5 +1,5 @@
<template>
<view class="my-asset" :style="`background: url(${config.myAssets})`">
<view class="my-asset" :style="`background: url(${config.myAssets})`" @click="openIntegral">
<view class="title">
我的积分
</view>
@@ -86,6 +86,9 @@ export default {
// this.coupon = res.toBeUsed;
// })
},
openIntegral(){
this.$emit('done', '/package/user/integral')
},
navTo(item) {
const app = this;
if (!this.isLogin) {
src/uni_modules/ws-user-card/components/ws-user-card/ws-user-card.vue
+14
View File
@@ -48,6 +48,20 @@
</template>
</uv-cell>
</uv-form-item>
<uv-form-item prop="form.truename" borderBottom>
<uv-cell title="真实姓名：">
<template v-slot:value>
<input placeholder="请输入真实姓名" v-model="form.truename"/>
</template>
</uv-cell>
</uv-form-item>
<uv-form-item prop="form.idcard" borderBottom>
<uv-cell title="身份证号码：">
<template v-slot:value>
<input placeholder="请输入身份证号码" v-model="form.idcard"/>
</template>
</uv-cell>
</uv-form-item>
</uv-form>
</view>
</uni-card>