Augcl
/
popularize-front
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

修复bug

master
前端-胡立永 1 month ago
parent
9a2929d2a7
commit
aa6ec55ce1
13 changed files with 67 additions and 376 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      components/cart/CardList.vue
  2. +7
    -0
      pages.json
  3. +0
    -358
      pages_login/loginAndRegisterAndForgetPassword.vue
  4. +17
    -2
      pages_my/qiandao-list.vue
  5. +0
    -0
      pages_my/static/user-icon-1.png
  6. +0
    -0
      pages_my/static/user-icon-2.png
  7. +0
    -0
      pages_my/static/user-icon-3.png
  8. +0
    -0
      pages_my/static/user-icon-4.png
  9. +0
    -0
      pages_my/static/user-icon-5.png
  10. +5
    -5
      pages_my/user-info.vue
  11. +3
    -3
      pages_order/huodong-detail.vue
  12. +34
    -6
      pages_order/payOrder.vue
  13. +0
    -1
      static/image/center/11.svg

+ 1
- 1
components/cart/CardList.vue View File

@ -15,7 +15,7 @@
<view class="date">{{item.startTime}}</view>
<view class="address">{{item.address}}</view>
</view>
<view class="price"><text>总计</text>¥{{item.price}}</view>
<view class="price"><text>总计</text>¥{{item.payPrice}}</view>
</view>
</view>
<view class="button-sp-area">


+ 7
- 0
pages.json View File

@ -53,6 +53,13 @@
"navigationBarTextStyle": "white"
}
},
{
"path": "payOrder",
"style": {
"navigationStyle": "custom" ,
"navigationBarTextStyle": "white"
}
},
{
"path": "orderDetails",
"style": {


+ 0
- 358
pages_login/loginAndRegisterAndForgetPassword.vue View File

@ -1,358 +0,0 @@
<template>
<view class="refundsOrExchange">
<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" />
<view class="frame">
<!-- 登录和注册 -->
<view class="loginRegister" v-if='titleIndex!=2'>
<!-- 标题 -->
<view class="title">{{titleList[titleIndex]}}</view>
<!-- 头像 -->
<view class="userIamge">
<view>
<img src="/static/image/center/11.svg" alt="" style="width: 100%;height: 100%;">
</view>
</view>
<!-- 用户名&密码&隐私条款 -->
<view class="form">
<view>
<uv-input v-model="form.account" placeholder="请输入账号" border="surround" shape='circle'
clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
</view>
<view>
<uv-input v-model="form.password" password placeholder="请输入密码" border="surround" shape='circle'
clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
</view>
<view>
<uv-checkbox-group v-model="checkboxValue" shape="circle">
<view class="content">
<view style="display: flex;flex-wrap: wrap;">
<uv-checkbox size="30rpx" :name="1"></uv-checkbox>
请你阅读并同意我们的<span style="color: #fd5100"
@click="jump(1)">《隐私条款》</span>和<span
style="color: #fd5100"
@click="jump(2)">《用户协议》</span>
</view>
</view>
</uv-checkbox-group>
</view>
</view>
</view>
<!-- 忘记密码 -->
<view class='forgetPassword' v-if='titleIndex==2'>
<!-- 标题 -->
<view class="title">{{titleList[titleIndex]}}</view>
<!-- 表单 -->
<view class="form1">
<view class="userName">
<uv-input v-model="form1.userName" placeholder="请输入手机号/用户/邮箱" border="surround" shape='circle'
clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
</view>
<view class="code">
<view class="left">
<uv-input v-model="form1.code" placeholder="请输入验证码" border="surround" shape='circle'
clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
</view>
<view class="right">
<view>
<uv-toast ref="toast"></uv-toast>
<uv-code :seconds="seconds" @end="end" @start="start" ref="code"
@change="codeChange"></uv-code>
<uv-button @tap="getCode" iconSize='10rpx' color='#fd5100'
shape='circle'>{{tips}}</uv-button>
</view>
</view>
</view>
<view class="password1">
<uv-input v-model="form1.password1" placeholder="设置您的新密码(6到50个字符)" password clearable
border="surround" shape='circle' :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
</view>
<view class="password2">
<uv-input v-model="form1.password2" placeholder="重新确认密码" password clearable border="surround"
shape='circle' :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
</view>
</view>
</view>
<!-- 按钮 -->
<view class="btn"
@click="submit">
<button class='a'>{{titleList[titleIndex]}}</button>
</view>
<!-- tab -->
<!-- <view class="bottomTab">
<span :class="titleIndex==0 ? 'tabbarItemActive' : 'tabbarItemNoActive'"
@click='changePage(0)'>注册账号</span>
<span style="color: #9c9fa4">|</span>
<span :class="titleIndex==1 ? 'tabbarItemActive' : 'tabbarItemNoActive'"
@click='changePage(1)'>账号登录</span>
<span style="color: #9c9fa4">|</span>
<span :class="titleIndex==2 ? 'tabbarItemActive' : 'tabbarItemNoActive'"
@click='changePage(2)'>忘记密码</span>
</view> -->
</view>
<configPopup ref="popup"></configPopup>
</view>
</template>
<script>
import configPopup from '@/components/config/configPopup.vue';
export default {
components: {
configPopup
},
onLoad(option) {
this.titleIndex = option.index || 1
},
data() {
return {
titleIndex: 0,
titleList: ['注册', '登录', '重置密码'],
checkboxValue: [],
form: {
account: '13135294009',
password: 'lzx123456',
},
form1: {
userName: '',
code: '',
password1: '',
password2: '',
},
tips: '获取验证码',
seconds: 60,
}
},
methods: {
jump(type) {//1 隐私协议 2服务条款
if(type == 1) {
uni.navigateTo({
url:'/pages_login/yinsixieyi'
})
}else {
uni.navigateTo({
url:'/pages_login/fuwutiaokuan'
})
}
},
submit(){
if(!this.checkboxValue.length){
return uni.showToast({
title: '请先同意隐私协议',
icon:'none'
})
}
if(this.$utils.verificationAll(this.form, {
account: '请输入账号',
password: '请输入密码',
})){
return
}
this.$store.commit('accountLogin', this.form)
},
// 切换页面
changePage(index) {
this.titleIndex = index
},
confirm() {
},
codeChange(text) {
this.tips = text;
},
getCode() {
if (this.$refs.code.canGetCode) {
// 模拟向后端请求验证码
uni.showLoading({
title: '正在获取验证码'
})
setTimeout(() => {
uni.hideLoading();
// 这里此提示会被this.start()方法中的提示覆盖
uni.$uv.toast('验证码已发送');
// 通知验证码组件内部开始倒计时
this.$refs.code.start();
}, 2000);
} else {
uni.$uv.toast('请勿重复发送');
}
},
end() {
// uni.$uv.toast('倒计时结束');
},
start() {
// uni.$uv.toast('倒计时开始');
}
}
}
</script>
<style lang="scss" scoped>
* {
box-sizing: border-box;
}
.refundsOrExchange {
background-color: #FFF;
height: 100vh;
.frame {
background-color: #FFF;
.loginRegister {
display: flex;
flex-direction: column;
gap: 40rpx;
.title {
display: flex;
justify-content: center;
align-items: flex-end;
height: 10vh;
color: #000;
font-size: 40rpx;
font-weight: 700;
}
.userIamge {
display: flex;
justify-content: center;
height: 10vh;
>view:nth-of-type(1) {
width: 25%;
height: 100%;
border-radius: 50%;
overflow: hidden;
}
}
.form {
line-height: 50rpx;
>view:nth-of-type(1) {
padding: 20rpx 100rpx;
}
>view:nth-of-type(2) {
padding: 0 100rpx;
}
>view:nth-of-type(3) {
display: flex;
padding: 30rpx 100rpx 0 100rpx;
font-size: 22rpx
}
}
}
.btn {
// height: 5vh;
display: flex;
justify-content: center;
margin: 90rpx 0 0 0;
.a {
display: flex;
justify-content: center;
align-items: center;
width: 70%;
height: 80rpx;
color: #FFF;
background-color: $uni-color;
border: 1px solid red;
border-radius: 100rpx;
font-size: 30rpx;
}
}
.bottomTab {
display: flex;
justify-content: space-between;
height: 10vh;
padding: 0 80rpx;
margin-top: 30rpx;
.tabbarItemActive {
color: $uni-color;
}
.tabbarItemNoActive {
color: #9c9fa4;
}
}
.forgetPassword {
padding: 100rpx 40rpx 0 40rpx;
.title {
display: flex;
justify-content: center;
align-items: flex-end;
height: 10vh;
color: #000;
font-size: 40rpx;
font-weight: 700;
}
.form1 {
display: flex;
flex-direction: column;
gap: 30rpx;
margin-top: 20rpx;
padding: 20rpx 80rpx;
.userName {
// padding: 20rpx 100 rpx;
}
.code {
display: flex;
width: 100%;
.left {
width: 55%;
}
.right {
width: 45%;
height: 100%;
>view:nth-of-type(1) {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
}
}
}
.password1 {}
.password2 {}
}
}
}
}
</style>

+ 17
- 2
pages_my/qiandao-list.vue View File

@ -11,10 +11,10 @@
<view class="val-text">
<view>{{item.name}}</view>
<view class="phone-box">{{item.phone}}</view>
<view class="type-box">{{item.type}}X{{item.num}}</view>
<view class="type-box">{{typeList[item.typeprice].name}}X{{item.num}}</view>
</view>
<view class="choose-box">
<view class="normol-box" v-if="i == 1"></view>
<view class="normol-box" v-if="item.state == 0"></view>
<image src="./static/choose-icon.png" mode="widthFix" v-else></image>
</view>
</view>
@ -44,6 +44,20 @@
detail : {
activityInfo : {},
},
typeList:[
{
name:'早鸟票',
price:168
},
{
name:'单人票',
price:198.01
},
{
name:'尊享票',
price:268
}
],
}
},
onPageScroll(e) {
@ -55,6 +69,7 @@
},
onLoad({id}) {
this.queryParams.recruitId = id
this.queryParams.pageSize = 20
this.getActivityInfo()
},
methods:{


static/image/center/user-icon-1.png → pages_my/static/user-icon-1.png View File


static/image/center/user-icon-2.png → pages_my/static/user-icon-2.png View File


static/image/center/user-icon-3.png → pages_my/static/user-icon-3.png View File


static/image/center/user-icon-4.png → pages_my/static/user-icon-4.png View File


static/image/center/user-icon-5.png → pages_my/static/user-icon-5.png View File


+ 5
- 5
pages_my/user-info.vue View File

@ -33,7 +33,7 @@
<view class="form-box">
<view class="form-box-line">
<view class="label-box">
<image src="@/static/image/center/user-icon-1.png" mode="widthFix"></image>
<image src="./static/user-icon-1.png" mode="widthFix"></image>
<view>国籍</view>
</view>
<view class="value-box">
@ -42,7 +42,7 @@
</view>
<view class="form-box-line">
<view class="label-box">
<image src="@/static/image/center/user-icon-2.png" mode="widthFix"></image>
<image src="./static/user-icon-2.png" mode="widthFix"></image>
<view>学历</view>
</view>
<view class="value-box">
@ -51,7 +51,7 @@
</view>
<view class="form-box-line">
<view class="label-box">
<image src="@/static/image/center/user-icon-3.png" mode="widthFix"></image>
<image src="./static/user-icon-3.png" mode="widthFix"></image>
<view>行业</view>
</view>
<view class="value-box">
@ -60,7 +60,7 @@
</view>
<view class="form-box-line">
<view class="label-box">
<image src="@/static/image/center/user-icon-4.png" mode="widthFix"></image>
<image src="./static/user-icon-4.png" mode="widthFix"></image>
<view>电话</view>
</view>
<view class="value-box">
@ -69,7 +69,7 @@
</view>
<view class="form-box-line">
<view class="label-box">
<image src="@/static/image/center/user-icon-5.png" mode="widthFix"></image>
<image src="./static/user-icon-5.png" mode="widthFix"></image>
<view>性别</view>
</view>
<view class="value-box">


+ 3
- 3
pages_order/huodong-detail.vue View File

@ -5,7 +5,7 @@
<view class="content">
<view class="content-head">
<image class="image-box" :src="imageArr[0]" mode="aspectFill"></image>
<image class="image-box" :src="imageArr" mode="aspectFill"></image>
<view class="msg-box">
<view class="msg-box-title">{{activityDetails.title}}</view>
<view class="msg-box-time">开始时间：{{activityDetails.startTime}}</view>
@ -160,8 +160,8 @@
},
computed:{
imageArr() {
return this.activityDetails
&& this.activityDetails.image.split(',')
return this.activityDetails.image
&& this.activityDetails.image.split(',')[0]
}
},
onShareAppMessage(res) {


+ 34
- 6
pages_order/payOrder.vue View File

@ -18,17 +18,31 @@
<view class="date">{{dataInfo.startTime}}</view>
<view class="address">{{dataInfo.address}}</view>
</view>
<view class="price"><text>总计</text>¥{{dataInfo.payPrice}}</view>
<view class="price"><text>价格</text>¥{{dataInfo.payPrice}}</view>
</view>
</view>
</view>
<view class="orderInfo">
<view class="title">订单信息</view>
<view class="details">
<uv-cell :border="false" titleStyle="{color: 'red'}" title="订单编号" :value="showOrderId"></uv-cell>
<uv-cell :border="false" titleStyle="{color: 'red'}" title="下单时间" :value="dataInfo.createTime"></uv-cell>
<uv-cell :border="false" titleStyle="{color: 'red'}" title="订单金额" :value="'¥' + dataInfo.payPrice"></uv-cell>
<uv-cell :border="false" titleStyle="{color: 'red'}" title="订单状态" :value="orderStatus"></uv-cell>
<uv-cell :border="false"
title="购票数量">
<template #value>
<uv-number-box v-model="num"/>
</template>
</uv-cell>
<uv-cell :border="false"
title="购票内容"
:value="typeList[dataInfo.type].name"
/>
<uv-cell :border="false"
title="订单总金额" :value="'¥' + (dataInfo.payPrice * num)"></uv-cell>
<uv-cell :border="false"
title="订单状态" :value="orderStatus"></uv-cell>
</view>
</view>
@ -69,7 +83,21 @@
customStyle:{
color:'#FF5858'
},
num : 0,
num : 1,
typeList:[
{
name:'早鸟票',
price:168
},
{
name:'单人票',
price:198.01
},
{
name:'尊享票',
price:268
}
],
}
},
onLoad(e) {


+ 0
- 1
static/image/center/11.svg View File

@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1726157567630" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6220" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M513.536 628.6336c101.6832 0 280.8832 38.7072 310.8864 193.7408 77.5168-77.5168 124.928-185.9584 124.928-305.0496 0-241.152-194.6624-435.8144-435.8144-435.8144S77.7216 277.0944 77.7216 517.2224c0 119.0912 47.4112 227.6352 124.928 306.0736 30.0032-154.9312 209.2032-194.6624 310.8864-194.6624z m0-439.7056c112.3328 0 204.3904 91.0336 204.3904 204.3904 0 112.3328-91.0336 204.3904-204.3904 204.3904a203.776 203.776 0 0 1-204.3904-204.3904c0.1024-112.4352 92.0576-204.3904 204.3904-204.3904z m0 0" fill="#cdcdcd" p-id="6221"></path><path d="M515.4816 1006.8992c-65.8432 0-129.8432-12.9024-189.952-38.4-58.1632-24.576-110.2848-59.8016-155.136-104.5504A485.56032 485.56032 0 0 1 65.8432 708.8128c-25.6-60.2112-38.5024-124.1088-38.5024-189.952 0-65.8432 12.9024-129.8432 38.4-189.952 24.576-58.1632 59.8016-110.2848 104.5504-155.136 44.8512-44.8512 96.9728-79.9744 155.136-104.5504C385.6384 43.6224 449.536 30.72 515.4816 30.72c65.8432 0 129.8432 12.9024 189.952 38.4 58.1632 24.576 110.2848 59.8016 155.136 104.5504 44.8512 44.8512 79.9744 96.9728 104.5504 155.136C990.6176 389.0176 1003.52 452.9152 1003.52 518.8608c0 65.8432-12.9024 129.8432-38.4 189.952-24.576 58.1632-59.8016 110.2848-104.5504 155.136a485.56032 485.56032 0 0 1-155.136 104.5504 484.39296 484.39296 0 0 1-189.952 38.4z m0-936.8576c-60.6208 0-119.3984 11.8784-174.6944 35.2256a447.76448 447.76448 0 0 0-142.6432 96.1536A444.42624 444.42624 0 0 0 101.9904 344.064a446.70976 446.70976 0 0 0-35.2256 174.6944c0 60.6208 11.8784 119.3984 35.2256 174.6944 22.6304 53.4528 54.9888 101.4784 96.1536 142.6432 41.1648 41.2672 89.1904 73.6256 142.6432 96.1536 55.296 23.3472 114.0736 35.2256 174.6944 35.2256 60.6208 0 119.3984-11.8784 174.6944-35.2256 53.4528-22.6304 101.4784-54.9888 142.6432-96.1536 41.2672-41.1648 73.6256-89.1904 96.1536-142.6432 23.3472-55.296 35.2256-114.0736 35.2256-174.6944 0-60.6208-11.8784-119.3984-35.2256-174.6944a447.76448 447.76448 0 0 0-96.1536-142.6432 444.42624 444.42624 0 0 0-142.6432-96.1536 447.44704 447.44704 0 0 0-174.6944-35.2256z m0 0" fill="#cdcdcd" p-id="6222"></path></svg>

Write Preview
Loading…
Cancel
Save