Compare commits

..

No commits in common. "wzm" and "main" have entirely different histories.
wzm ... main

7 changed files with 53 additions and 193 deletions

View File

@ -483,11 +483,10 @@
line-height: 70rpx;
text-align: center;
color: #999999;
border: 2rpx solid #323232;
border: 2rpx solid #999999;
border-radius: 276rpx 276rpx 276rpx 276rpx;
margin-right: 10rpx;
}
.btn_InvIng {
width: 180rpx;

View File

@ -117,7 +117,7 @@
:safeAreaInsetBottom="false" :closeable="false">
<view class="popupBox flex justify-start align-items flex-column">
<view class="pop-header flex align-items flex-column flex-start">
<span class="name">请确认是否取消报名</span>
<span class="name white-space">请确认是否取消报名</span>
<span class="price">
若频繁取消可能会影响账号部分功能使用建议您确认行程后再操作
</span>
@ -1139,7 +1139,7 @@
}
.name {
width: 320rpx;
width: 288rpx;
height: 36rpx;
font-family: PingFang SC Bold, PingFang SC Bold;
font-weight: 600;

View File

@ -124,19 +124,11 @@
</view>
</view>
<view class="footer align-items flex-column" style="justify-content: space-between;">
<view class="footer flex align-items flex-column" style="justify-content: space-between;">
<view @click="service(detailAny.id)" class="footer-right flex justify-center align-items"
v-if="status == 9">
<span> 申请售后 </span>
</view>
<view @click="toAddInvoic(detailAny.id)" class="footer-right flex justify-center align-items"
v-if="detailAny.status == 9 && detailAny.invoice_status == 0 && detailAny.detail.feel == 0">
<span> 开发票 </span>
</view>
<view @click="checkInvoice(detailAny.invoiceaplpy.id)" class="footer-right2 flex justify-center align-items"
v-if="detailAny.status == 9 && detailAny.invoice_status == 2 && detailAny.detail.feel == 0">
<span> 查看发票 </span>
</view>
</view>
</view>
</view>
@ -261,19 +253,6 @@
url: `/packageA/afterSales/index?id=${id}`
})
},
//
toAddInvoic(id, order_no) {
const num = 1
uni.navigateTo({
url: '/packageB/invoice/addInvoice?id=' + id + "&order_nos=" + order_no + "&num=" + num
})
},
//
checkInvoice(id, order_no) {
uni.navigateTo({
url: '/packageB/invoice/invoiceInfo?id=' + id + "&order_no=" + order_no
})
},
//
dateWeeks(timestamp) {
return dateWeek(timestamp)
@ -558,7 +537,6 @@
width: 100%;
height: 166rpx;
margin-top: 50rpx;
display: grid;
.footer-right {
width: 690rpx;
@ -574,21 +552,6 @@
color: #BBFC5B;
}
}
.footer-right2 {
width: 690rpx;
height: 90rpx;
background: #f5f5f5;
border-radius: 148rpx;
border: 2rpx solid #323232;
span {
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
font-size: 36rpx;
color: #9C9C9C;
}
}
.footer-right1 {
width: 690rpx;

View File

@ -109,15 +109,15 @@
</u-form-item>
<u-form-item label="抬头名称" prop="invoice_header" required>
<u-input inputAlign="right" v-model="form.invoice_header" placeholder="请输入抬头名称"
<u-input inputAlign="right" v-model="form.invoice_header" type="number" placeholder="请输入抬头名称"
border="none" />
</u-form-item>
<u-form-item label="单位税号" prop="tax_id" v-if="form.head_type == 'corporate'">
<u-input inputAlign="right" v-model="form.tax_id" placeholder="请输入单位税号"
<u-input inputAlign="right" v-model="form.tax_id" type="number" placeholder="请输入单位税号"
border="none" />
</u-form-item>
<u-form-item label="注册地址" prop="enterprise_address" v-if="form.head_type == 'corporate'">
<u-input inputAlign="right" style="width:400rpx" v-model="form.enterprise_address" placeholder="必填"
<u-input inputAlign="right" style="width:400rpx" v-model="form.enterprise_address" type="number" placeholder="必填"
border="none" />
</u-form-item>
<u-form-item label="注册电话" prop="enterprise_phone" v-if="form.invoice_type == 'special'">
@ -125,7 +125,7 @@
border="none" />
</u-form-item>
<u-form-item label="开户银行" prop="bank_deposit" v-if="form.head_type == 'corporate'">
<u-input inputAlign="right" v-model="form.bank_deposit" placeholder="必填"
<u-input inputAlign="right" v-model="form.bank_deposit" type="number" placeholder="必填"
border="none" />
</u-form-item>
<u-form-item label="银行账号" prop="bank_number" v-if="form.head_type == 'corporate'">
@ -141,7 +141,7 @@
placeholder="请输入发票预留手机号" border="none" />
</u-form-item>
<u-form-item label="邮箱地址" prop="invoice_reservation_email" required>
<u-input inputAlign="right" v-model="form.invoice_reservation_email"
<u-input inputAlign="right" v-model="form.invoice_reservation_email" type="number"
placeholder="请输入发票预留邮箱" border="none" />
</u-form-item>
</view>
@ -186,7 +186,7 @@
</view>
<view class="textSec">{{item.tax_id}}</view>
</view>
<view class="manageEdit" @click.stop="editHead(item.id)">
<view class="manageEdit">
<image style="width: 50rpx;height: 50rpx;" src="https://naweigetetest2.hschool.com.cn/miniapp/invoice/manageEdit.png"
mode=""></image>
</view>
@ -215,7 +215,7 @@
</scroll-view>
<view class="popup-footer1">
<view class="popup-footer">
<view class="headBtn" style="width: 90%;height: 90rpx;background-color: #323232;border-radius: 148rpx;color: #BBFC5B;font-size: 36rpx;
font-weight: 400;
line-height: 50rpx;
@ -228,7 +228,7 @@
text-align: center;
position: fixed;
bottom: 66rpx;">
<view @click="addHead()">添加抬头</view>
<view>添加抬头</view>
</view>
</view>
</view>
@ -382,10 +382,6 @@
}
console.log('order_nos:', this.order_nos,'totalPrice:',this.totalPrice);
},
onShow() {
this.headShow = false;
this.getHeadList();
},
onReady() {
console.log('设置规则:', this.rules);
this.$refs.uForm.setRules(this.rules);
@ -489,18 +485,6 @@
console.log('5555',this.form);
this.closeHeadShow();
},
addHead() {
uni.navigateTo({
url: '/packageB/invoice/addHead'
})
},
editHead(id) {
this.HeadId = id
console.log('HeadId',this.HeadId);
uni.navigateTo({
url: '/packageB/invoice/addHead?id=' + this.HeadId
})
},
submit() {
console.log('sub1');
if (this.form.invoice_reservation_phone == '') {
@ -1017,40 +1001,8 @@
margin-left: 2%;
}
}
}
.popup-footer1 {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
.headBtn {
width: 90%;
height: 90rpx;
background-color: #323232;
border-radius: 148rpx;
color: #BBFC5B;
font-size: 36rpx;
font-weight: 400;
line-height: 50rpx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
text-transform: none;
font-style: normal;
display: flex;
justify-content: center;
align-items: center;
text-align: center;
position: fixed;
bottom: 66rpx;
margin-left: 2%;
}
}
}

View File

@ -18,14 +18,7 @@
<!-- <span class="lines" ></span> -->
</span>
</view>
<!-- 信息提醒 -->
<view class="manageRecord" v-if="selected == 2">
<image style="width: 36rpx;height: 36rpx;margin-right: 10rpx;" src="https://naweigetetest2.hschool.com.cn/miniapp/invoice/manageRecord.png" mode="">
</image>
<view>抬头信息仅用于开具发票请勿用于转账等其他用途谨防受骗</view>
</view>
<view style="min-height: 100vh;margin-top: 80rpx;width: 100%;">
<!-- 合开发票 -->
<view v-if="selected == 0">
@ -56,7 +49,7 @@
<view class="invoiceBtn" @click="handleIssueInvoice()">
<view>申请开票</view>
</view>
<view class="bottom_box flex justify-center align-items"
<view class="bottom_box flex justify-center align-items" style="height: 1240rpx;width: 100%;"
v-if="unInvoiceList.length == 0">
<view style="text-align: center;">
<image src="/static/no.png" style="width: 150rpx;height: 150rpx;"></image>
@ -64,8 +57,10 @@
</view>
</view>
</view>
<!-- 提交记录 -->
<view class="recordList" v-else-if="selected == 1">
<!-- v-if="item[index].length == 1" -->
@ -154,7 +149,7 @@
</view>
</view>
<view class="bottom_box flex justify-center align-items"
<view class="bottom_box flex justify-center align-items" style="height: 1240rpx;width: 100%;"
v-if="recordList.length == 0">
<view style="text-align: center;">
<image src="/static/no.png" style="width: 150rpx;height: 150rpx;"></image>
@ -163,9 +158,14 @@
</view>
</view>
<!-- 抬头管理 -->
<view class="manageList" v-else>
<!-- 信息提醒 -->
<view class="manageRecord">
<image style="width: 36rpx;height: 36rpx;" src="https://naweigetetest2.hschool.com.cn/miniapp/invoice/manageRecord.png" mode="">
</image>
<text style="margin-left: 10rpx;">抬头信息仅用于开具发票请勿用于转账等其他用途谨防受骗</text>
</view>
<!-- 专用 -->
<view class="manageList-item" v-for="(item,index) in headList" :key="index" style="margin-bottom: 20rpx;">
<view class="manage-type" v-if="item.head_type == 'corporate'">专业发票抬头</view>
@ -203,14 +203,11 @@
</view>
</view>-->
<!-- 按钮 -->
<view class="footer-mangBtn">
<view class="invoiceBtn" @click="addHead()">
<view>添加发票抬头</view>
</view>
<view class="invoiceBtn" @click="addHead()">
<view>添加发票抬头</view>
</view>
<view class="bottom_box flex justify-center align-items"
<view class="bottom_box flex justify-center align-items" style="height: 1240rpx;width: 100%;"
v-if="headList.length == 0">
<view style="text-align: center;">
<image src="/static/no.png" style="width: 150rpx;height: 150rpx;"></image>
@ -662,12 +659,11 @@
.record-tabs {
background: #f5f5f5;
// background: #ffffff;
width: 100%;
z-index: 1000;
display: flex;
overflow-x: auto;
position: fixed;
position: relative;
top: 90rpx;
margin: 10rpx 0;
border-radius: 30rpx;
@ -690,7 +686,6 @@
line-height: 26rpx;
flex: 0 0 auto;
position: relative;
z-index: 1000;
}
.s-header.selected {
@ -701,7 +696,6 @@
// font-size: 32rpx;
color: #323232;
line-height: 28rpx;
z-index: 1000;
}
}
@ -712,7 +706,6 @@
height: auto;
display: block;
justify-content: center;
margin-top: 120rpx;
.recordList-item {
@ -896,35 +889,28 @@
}
}
}
.manageRecord {
z-index: 100;
position: fixed;
top: 70rpx;
// width: 100%;
// margin: 0rpx 20rpx 20rpx 20rpx;
padding: 20rpx ;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #EB1B1B;
line-height: 32rpx;
text-align: left;
font-style: normal;
text-transform: none;
align-items: center;
display: flex;
justify-content: center;
background-color: #f5f5f5;
// margin: 0 auto;
}
.manageList {
display: grid;
justify-content: center;
margin-top: 80rpx;
// padding-top: 20rpx;
.manageRecord {
margin: 20rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #EB1B1B;
line-height: 32rpx;
text-align: left;
font-style: normal;
text-transform: none;
align-items: center;
display: flex;
justify-content: center;
// margin: 0 auto;
}
.manageList-item {
background-color: #ffffff;
padding: 20rpx 0;
@ -1012,50 +998,10 @@
}
}
}
.footer-mangBtn {
width: 100%;
height: 160rpx;
background-color: #ffffff;
position: fixed;
bottom: 0;
left: 0;
.invoiceBtn {
width: 90%;
height: 90rpx;
background-color: #323232;
border-radius: 148rpx;
color: #BBFC5B;
font-size: 36rpx;
font-weight: 400;
line-height: 50rpx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
text-transform: none;
font-style: normal;
display: flex;
justify-content: center;
align-items: center;
text-align: center;
position: fixed;
bottom: 32rpx;
margin-left: 5%;
}
}
}
}
.bottom_box{
display: grid;
justify-content: center;
align-items: center;
width: 100%;
position: absolute;
top:40%;
}
}

View File

@ -47,7 +47,7 @@
<u-icon v-if="imagesIndex != 0" name="arrow-left" @click="changeLeft()"></u-icon>
</view>
<image style="width: 280px;height: 240px;margin: 0rpx 26rpx;" :src="imagesList[imagesIndex]" mode=""></image>
<image style="width: 320px;height: 240px;margin: 0rpx 26rpx;" :src="imagesList[imagesIndex]" mode=""></image>
<view style="width: 20rpx;height: 20rpx;">
<u-icon v-if="imagesIndex != iamgesListIndexNum" name="arrow-right" @click="changeRight()"></u-icon>
</view>
@ -69,9 +69,9 @@
data() {
return {
popupStyImg: {
width: '650rpx',
width: '700rpx',
padding: '24rpx 24rpx 42rpx 24rpx',
height: '600rpx',
height: '500rpx',
margin: '0 auto', //
display: 'flex',
justifyContent: 'start',

View File

@ -39,7 +39,7 @@
机构联系人
</view>
<view>
<input type="text" placeholder="请输入机构联系人姓名" class="input" v-model="formData.realname"
<input type="text" placeholder="请输入机构姓名" class="input" v-model="formData.realname"
placeholder-class="plasty" />
</view>
</view>
@ -69,9 +69,9 @@
<view class="text_lab">
详细地址
</view>
<view style="width: 400rpx;">
<view>
<input type="text" placeholder="请输入详细地址" class="input" v-model="formData.desc"
style="width: 400rpx;" placeholder-class="plasty" />
placeholder-class="plasty" />
</view>
</view>