页面优化,Api接口调整

This commit is contained in:
itgaojian163 2025-06-24 14:08:30 +08:00
parent 38a5bcbe8d
commit 4e9fe10da5
48 changed files with 582 additions and 380 deletions

View File

@ -54,10 +54,48 @@ const expandList = [{
label: '加急' label: '加急'
} }
] ]
const menuList = [{
icon: "ic-user",
title: "个人信息",
path: "/pages/mine/mineAccount/mineInfo/mineInfo"
}, {
icon: 'ic-msg',
title: '消息通知',
path: '/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice'
}, {
icon: 'ic-refund',
title: '退款项目',
path: '/pages/copyright/refund/refund'
}, {
icon: 'ic-repair',
title: '补正项目',
path: '/pages/copyright/repair/repair'
}, {
icon: 'ic-invoice-info',
title: '发票抬头',
path: '/pages/mine/mineAccount/invoiceInfo/invoiceInfo'
}, {
icon: "ic-invoice",
title: "发票管理",
path: "/pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage"
}, {
icon: "ic-pay-record",
title: "资金流水",
path: "/pages/mine/mineAccount/minePayRecord/minePayRecord"
}, {
icon: "ic-order",
title: "我的订单",
path: "/pages/mine/mineAccount/mineOrder/mineOrder"
}, {
icon: "ic-contact",
title: "产权联系人",
path: "/pages/mine/mineAccount/mineContact/mineContact"
}]
export { export {
stateList, stateList,
kindList, kindList,
typeList, typeList,
homeTypeList, homeTypeList,
expandList expandList,
menuList
} }

View File

@ -5,6 +5,8 @@ import {
get get
} from "../cache/storage.js"; } from "../cache/storage.js";
// 公共API // 公共API
const proName = 'plug'
const userId = get('userId')
const apiPath = { const apiPath = {
mineInvoiceOrderList: '/api/invoicerecharge/recharge-listpage/{userId}/{status}', //可以开具发票的订单 mineInvoiceOrderList: '/api/invoicerecharge/recharge-listpage/{userId}/{status}', //可以开具发票的订单
mineInvoiceList: '/api/invoice-config/listpage/{userId}', //我的开票信息 mineInvoiceList: '/api/invoice-config/listpage/{userId}', //我的开票信息
@ -19,59 +21,88 @@ const apiPath = {
} }
class InvoiceApi { class InvoiceApi {
// 通用路径参数替换方法
static #replacePathParams(path, params) {
return Object.entries(params).reduce(
(acc, [key, value]) => acc.replace(`{${key}}`, value),
path
)
}
// 通用请求方法
static requestHandler(endpoint, method, data = null, pathParams = {}) {
const path = Object.keys(pathParams).length ?
this.#replacePathParams(endpoint, pathParams) :
endpoint
return request(path, method, data, proName)
}
//获取可以开具发票的订单 //获取可以开具发票的订单
static doGetMineInvoiceOrderList(data, status) { static doGetMineInvoiceOrderList(data, status) {
const userId = get('userId') return this.requestHandler(apiPath.mineInvoiceOrderList, "GET", data, {
const path = apiPath.mineInvoiceOrderList.replace('{userId}', userId).replace('{status}', status) userId: userId,
return request(path, "GET", data, null, 'plug') status: status
})
} }
// 获取字典列表
static doGetDicListByPId(id) { static doGetDicListByPId(id) {
const path = apiPath.dicByPId.replace('{pId}', id) const path = apiPath.dicByPId.replace('{pId}', id)
return request(path, "GET") return request(path, "GET")
} }
//我的开票信息
// 我的开票信息
static doGetMineInvoiceList(data) { static doGetMineInvoiceList(data) {
const userId = get('userId') return this.requestHandler(apiPath.mineInvoiceList, "GET", data, {
const path = apiPath.mineInvoiceList.replace('{userId}', userId) userId: get('userId')
return request(path, "GET", data, null, 'plug') });
} }
//保存我的开票信息
// 保存我的开票信息
static doSaveMineInvoiceInfo(data) { static doSaveMineInvoiceInfo(data) {
const userId = get('userId') return this.requestHandler(apiPath.saveInvoiceInfo, "POST", data, {
const path = apiPath.saveInvoiceInfo.replace('{userId}', userId) userId: get('userId')
return request(path, "POST", data, null, 'plug') });
} }
//编辑开票信息
// 编辑开票信息
static doUpdateMineInvoiceInfo(id, data) { static doUpdateMineInvoiceInfo(id, data) {
const path = apiPath.updateInvoiceInfo.replace('{invoiceId}', id) return this.requestHandler(apiPath.updateInvoiceInfo, "PUT", data, {
return request(path, "PUT", data, null, 'plug') invoiceId: id
});
} }
//删除开票信息
// 删除开票信息
static doDelMineInvoiceInfo(id) { static doDelMineInvoiceInfo(id) {
const path = apiPath.deleteInvoiceInfo.replace('{ids}', id) return this.requestHandler(apiPath.deleteInvoiceInfo, "DELETE", null, {
return request(path, "DELETE", null, null, 'plug') ids: id
});
} }
//开票申请列表
// 开票申请列表(已修改,保持原有结构)
static doGetInvoiceRecordList(data) { static doGetInvoiceRecordList(data) {
const userId = get('userId') return this.requestHandler(apiPath.mineInvoiceRecordList, "GET", data, {
const path = apiPath.mineInvoiceRecordList.replace('{userId}', userId) userId: get('userId')
return request(path, "GET", data, null, 'plug') });
} }
//取消开票申请
// 取消开票申请
static doCancelInvoiceRecord(id) { static doCancelInvoiceRecord(id) {
const path = apiPath.cancelInvoiceRecord.replace('{invoiceRechargeId}', id) return this.requestHandler(apiPath.cancelInvoiceRecord, "PUT", null, {
return request(path, "PUT", null, null, 'plug') invoiceRechargeId: id
});
} }
//提交开票申请
// 提交开票申请
static doSaveInvoiceRecord(data) { static doSaveInvoiceRecord(data) {
const userId = get('userId') return this.requestHandler(apiPath.saveInvoiceRecord, "POST", data, {
const path = apiPath.saveInvoiceRecord.replace('{userId}', userId) userId: get('userId')
return request(path, "POST", data, null, 'plug') });
} }
//修改开票申请
// 修改开票申请
static doUpdateInvoiceRecord(id, data) { static doUpdateInvoiceRecord(id, data) {
const path = apiPath.updateInvoiceRecord.replace('{invoiceRechargeId}', id) return this.requestHandler(apiPath.updateInvoiceRecord, "PUT", data, {
return request(path, 'PUT', data, null, 'plug') invoiceRechargeId: id
});
} }
} }

View File

@ -7,10 +7,26 @@ const apiPath = {
getPayOrder: '/api/pay/get-pay', //获取支付订单 getPayOrder: '/api/pay/get-pay', //获取支付订单
enterprisePay: '/api/pay/pay-account-recharge/${accountRechargeId}', //企业付款完成支付 enterprisePay: '/api/pay/pay-account-recharge/${accountRechargeId}', //企业付款完成支付
enterpriseAccountInfo: '/api/pay/get-pay-system-bank', //获取公司账户信息 enterpriseAccountInfo: '/api/pay/get-pay-system-bank', //获取公司账户信息
wxPayParams: '/api/accountrecharge/save-wx-pay-prepay-id', //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID wxPayParams: '/api/accountrecharge/save-wx-pay-prepay-id', //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID
bdPayParams:'/api/accountrecharge/save-bd-pay-order-info' bdPayParams: '/api/accountrecharge/save-bd-pay-order-info'
} }
const proName = 'operator'
class PayApi { class PayApi {
// 通用路径参数替换方法
static #replacePathParams(path, params) {
return Object.entries(params).reduce(
(acc, [key, value]) => acc.replace(`{${key}}`, value),
path
)
}
// 通用请求方法
static requestHandler(endpoint, method, data = null, pathParams = {}) {
const path = Object.keys(pathParams).length ?
this.#replacePathParams(endpoint, pathParams) :
endpoint
return request(path, method, data, proName)
}
static doGetBuyPackageList(type, data) { static doGetBuyPackageList(type, data) {
const path = apiPath.getBuyPackageList.replace('${type}', type); const path = apiPath.getBuyPackageList.replace('${type}', type);
return request(path, "GET", data); return request(path, "GET", data);
@ -28,13 +44,14 @@ class PayApi {
static doGetOrder(data) { static doGetOrder(data) {
return request(apiPath.getPayOrder, "POST", data) return request(apiPath.getPayOrder, "POST", data)
} }
//获取微信支付参数 // 获取微信支付参数
static doGetWxPayParams(data) { static doGetWxPayParams(data) {
return request(apiPath.wxPayParams, "POST", data, null, "operator") return this.requestHandler(apiPath.wxPayParams, "POST", data);
} }
//获取百度支付参数
static doGetBdPayParams(data){ // 获取百度支付参数
return request(apiPath.bdPayParams,"POST",data,null,"operator") static doGetBdPayParams(data) {
return this.requestHandler(apiPath.bdPayParams, "POST", data);
} }
} }

View File

@ -258,7 +258,8 @@
}, },
"tabBar": { "tabBar": {
"color": "#515151", "color": "#515151",
"selectedColor": "#FE9944", "selectedColor": "#FE9944",
"height": "70px",
"list": [{ "list": [{
"pagePath": "pages/index/home", "pagePath": "pages/index/home",
"text": "首页", "text": "首页",

View File

@ -67,10 +67,10 @@
<view class="pro-list-name">{{item.projName}}</view> <view class="pro-list-name">{{item.projName}}</view>
</view> </view>
<view class="pro-list-item-left-footer"> <view class="pro-list-item-left-footer">
<view class="pro-list-item-left-tag">{{item.gmtCreate}}</view>
<view class="pro-list-item-left-tag mr-10 single-line"> <view class="pro-list-item-left-tag mr-10 single-line">
{{item.authorName}} {{item.authorName}}
</view> </view>
<view class="pro-list-item-left-tag">{{item.gmtCreate}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -334,21 +334,9 @@
_self.msgType = 'success' _self.msgType = 'success'
_self.$refs.msg.open() _self.$refs.msg.open()
//TODO //TODO
// setTimeout(() => {
// _self.backPageRefresh()
// }, 2000);
setTimeout(() => { setTimeout(() => {
uni.navigateBack({ _self.backPageRefresh()
success: function() { }, 1500);
let pages = getCurrentPages();
let prevPage = pages[pages.length - 2];
if (prevPage && typeof prevPage.doRefreshList ===
'function') {
prevPage.doRefreshList()
}
}
});
}, 1500)
}) })
.catch(err => { .catch(err => {
wx.hideLoading() wx.hideLoading()
@ -380,6 +368,12 @@
return false return false
} }
return true return true
},
backPageRefresh() {
var pages = getCurrentPages()
let prevPage = pages[pages.length - 2];
prevPage.$vm.needRefresh = true
uni.navigateBack()
} }
} }
} }
@ -464,13 +458,17 @@
border-radius: 10rpx; border-radius: 10rpx;
padding: 30rpx; padding: 30rpx;
margin: 10rpx; margin: 10rpx;
box-shadow: 1rpx 1rpx 2rpx 2rpx $bg-gray-input-color; border-bottom: 1rpx solid $divider-color;
} }
.pro-list-item:nth-of-type(n+2) { .pro-list-item:nth-of-type(n+2) {
margin-top: 20rpx; margin-top: 20rpx;
} }
.pro-list-item:last-of-type {
border-bottom: none;
}
.pro-list-item-left { .pro-list-item-left {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@ -76,10 +76,10 @@
:nodes="'已通过补正<span style=color:red;font-size:28rpx;font-weight:bold;>'+ item.approvedCount+'</span>次'"></rich-text> :nodes="'已通过补正<span style=color:red;font-size:28rpx;font-weight:bold;>'+ item.approvedCount+'</span>次'"></rich-text>
</view> </view>
<view class="pro-list-item-left-footer"> <view class="pro-list-item-left-footer">
<view class="pro-list-item-left-tag mr-10 single-line"> <view class="pro-list-item-left-tag">{{item.gmtCreate}}</view>
<view class="pro-list-item-left-tag single-line">
{{item.authorName}} {{item.authorName}}
</view> </view>
<view class="pro-list-item-left-tag">{{item.gmtCreate}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -382,18 +382,10 @@
_self.msgHint = '提交操作已顺利完成,我们会尽快审核,还请耐心等待' _self.msgHint = '提交操作已顺利完成,我们会尽快审核,还请耐心等待'
_self.msgType = 'success' _self.msgType = 'success'
_self.$refs.msg.open() _self.$refs.msg.open()
setTimeout(() => { setTimeout(()=>{
uni.navigateBack({ _self.backPageRefresh()
success: function() { },1500)
let pages = getCurrentPages();
let prevPage = pages[pages.length - 2];
if (prevPage && typeof prevPage.doRefreshList ===
'function') {
prevPage.doRefreshList()
}
}
});
}, 1500)
}) })
.catch(err => { .catch(err => {
uni.hideLoading() uni.hideLoading()
@ -430,7 +422,13 @@
return false return false
} }
return true return true
}, },
backPageRefresh() {
var pages = getCurrentPages()
let prevPage = pages[pages.length - 2];
prevPage.$vm.needRefresh = true
uni.navigateBack()
}
}, },
}; };
</script> </script>
@ -514,13 +512,17 @@
border-radius: 10rpx; border-radius: 10rpx;
padding: 30rpx; padding: 30rpx;
margin: 10rpx; margin: 10rpx;
box-shadow: 1rpx 1rpx 2rpx 2rpx $bg-gray-input-color; border-bottom: 1rpx solid $divider-color;
} }
.pro-list-item:nth-of-type(n+2) { .pro-list-item:nth-of-type(n+2) {
margin-top: 20rpx; margin-top: 20rpx;
} }
.pro-list-item:last-of-type {
border-bottom: none;
}
.pro-list-item-left { .pro-list-item-left {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@ -41,77 +41,77 @@
</view> </view>
</view> </view>
<!-- #ifdef MP-TOUTIAO || MP-WEIXIN --> <!-- #ifdef MP-TOUTIAO || MP-WEIXIN -->
<view style="margin-top: 120rpx;"> <view style="margin-top: 120rpx;">
<!-- #endif --> <!-- #endif -->
<!-- #ifndef MP-TOUTIAO || MP-WEIXIN --> <!-- #ifndef MP-TOUTIAO || MP-WEIXIN -->
<view style="margin-top: 80rpx;"> <view style="margin-top: 80rpx;">
<!-- #endif --> <!-- #endif -->
<ContainerLoading :loadingVisible="loadingState"> <ContainerLoading :loadingVisible="loadingState">
<scroll-view scroll-y style="height: 85vh;" :lower-threshold="100" refresher-background="#FFFFFF00" <scroll-view scroll-y style="height: 85vh;" :lower-threshold="100" refresher-background="#FFFFFF00"
@scrolltolower="doLoadMore"> @scrolltolower="doLoadMore">
<view class="repair-list-box"> <view class="repair-list-box">
<block v-for="(item,index) in refundList" :key="index"> <block v-for="(item,index) in refundList" :key="index">
<view class="repair-list-item"> <view class="repair-list-item">
<view class="repair-item-title-box" :data-value="item" @click="showReason"> <view class="repair-item-title-box" :data-value="item" @click="showReason">
<view class="repair-title-box"> <view class="repair-title-box">
<view :class="repairStatusColor(item.applyStatus)" <view :class="repairStatusColor(item.applyStatus)"
class="repair-status-content"> class="repair-status-content">
{{repairStatus(item.applyStatus)}} {{repairStatus(item.applyStatus)}}
</view>
</view>
<view class="repair-title-apply-time">{{item.gmtCreate}}</view>
</view>
<view class="divider-v mt-20"></view>
<view class="repair-name-box mt-10">
<view :data-value="item" @click="showReason" class="repair-title-content">
{{item.projName}}
</view>
<view v-if="item.applyStatus=='PENDING'" class="icon-cancel-yellow size-48"
@click="cancelApply" :data-value="item"></view>
</view>
<view :data-value="item" @click="showReason"
class="repair-reason-desc multiple-2-ellipsis">{{item.refundReason}}</view>
<view class="repair-footer-box">
<view class="repair-attr-box" :data-value="item" @click="showReason">
<view class="repair-attr-item">{{item.userInfoName}}</view>
<rich-text :nodes="moneyTxt(10,14,item.projPayment/100)"></rich-text>
</view> </view>
</view> </view>
<view class="repair-title-apply-time">{{item.gmtCreate}}</view>
</view>
<view class="divider-v mt-20"></view>
<view class="repair-name-box mt-10">
<view :data-value="item" @click="showReason" class="repair-title-content">
{{item.projName}}
</view>
<view v-if="item.applyStatus=='PENDING'" class="icon-cancel-yellow size-48"
@click="cancelApply" :data-value="item"></view>
</view>
<view :data-value="item" @click="showReason"
class="repair-reason-desc multiple-2-ellipsis">{{item.refundReason}}</view>
<view class="repair-footer-box">
<view class="repair-attr-box" :data-value="item" @click="showReason">
<view class="repair-attr-item">{{item.userInfoName}}</view>
<rich-text :nodes="moneyTxt(10,14,item.projPayment/100)"></rich-text>
</view>
</view> </view>
</block>
<uni-load-more :status="hasMore"></uni-load-more>
</view>
</scroll-view>
</ContainerLoading>
</view>
<uni-popup type="message" ref="msg">
<uni-popup-message :type="msgType" :message="msgHint" :duration="2000"></uni-popup-message>
</uni-popup>
<DownloadProgress :isShow="downloading" :progress="downloadProgress"></DownloadProgress>
<uni-popup ref="reasonDialog" type="center" background-color="#fff" border-radius="15rpx 15rpx 15rpx 15rpx">
<view class="bottom-dialog-container" style="width: 80vw;">
<view class="approve-title">退款原因</view>
<view v-if="reasonItem != null" class="approve-content mt-10">{{reasonItem.refundReason}}</view>
<view class="approve-title mt-10">退款凭证</view>
<view v-if="reasonItem != null" class="approve-img-box mt-10">
<block v-for="(item,index) in reasonItem.refundVoucherFileKVs" :key="index">
<view class="approve-img-item single-line" @click="previewImg" :data-item="item">
{{item.value}}
</view> </view>
</block> </block>
<uni-load-more :status="hasMore"></uni-load-more>
</view> </view>
</scroll-view> <view v-if="reasonItem != null && reasonItem.gmtReview !=''" class="approve-content-box">
</ContainerLoading> <view class="approve-title mt-10">审核时间</view>
</view> <view class="approve-content mt-10">{{reasonItem.gmtReview}}</view>
<uni-popup type="message" ref="msg"> <view class="approve-title mt-10">审核意见</view>
<uni-popup-message :type="msgType" :message="msgHint" :duration="2000"></uni-popup-message> <view class="approve-content mt-10">{{reasonItem.reviewReason}}</view>
</uni-popup> </view>
<DownloadProgress :isShow="downloading" :progress="downloadProgress"></DownloadProgress> <view class="close-btn" @click="closeDialog">关闭</view>
<uni-popup ref="reasonDialog" type="center" background-color="#fff" border-radius="15rpx 15rpx 15rpx 15rpx">
<view class="bottom-dialog-container" style="width: 80vw;">
<view class="approve-title">退款原因</view>
<view v-if="reasonItem != null" class="approve-content mt-10">{{reasonItem.refundReason}}</view>
<view class="approve-title mt-10">退款凭证</view>
<view v-if="reasonItem != null" class="approve-img-box mt-10">
<block v-for="(item,index) in reasonItem.refundVoucherFileKVs" :key="index">
<view class="approve-img-item single-line" @click="previewImg" :data-item="item">
{{item.value}}
</view>
</block>
</view> </view>
<view v-if="reasonItem != null && reasonItem.gmtReview !=''" class="approve-content-box"> </uni-popup>
<view class="approve-title mt-10">审核时间</view>
<view class="approve-content mt-10">{{reasonItem.gmtReview}}</view>
<view class="approve-title mt-10">审核意见</view>
<view class="approve-content mt-10">{{reasonItem.reviewReason}}</view>
</view>
<view class="close-btn" @click="closeDialog">关闭</view>
</view>
</uni-popup>
</view> </view>
</template> </template>
<script> <script>
@ -183,6 +183,15 @@
}) })
this.doRefreshList() this.doRefreshList()
}, },
onShow() {
if (this.needRefresh) {
this.needRefresh = false
this.doRefreshList()
}
},
onPullDownRefresh() {
this.doRefreshList()
},
methods: { methods: {
repairStatusColor, repairStatusColor,
repairStatus, repairStatus,
@ -235,6 +244,7 @@
_self.loadingState = isRefresh ? 'loading' : '' _self.loadingState = isRefresh ? 'loading' : ''
ProApi.doGetMineRefundProList(_self.pageData) ProApi.doGetMineRefundProList(_self.pageData)
.then(res => { .then(res => {
uni.stopPullDownRefresh()
var status = 'success' var status = 'success'
status = res.rows && res.rows.length > 0 ? 'success' : 'empty' status = res.rows && res.rows.length > 0 ? 'success' : 'empty'
_self.loadingState = isRefresh ? status : '' _self.loadingState = isRefresh ? status : ''
@ -244,6 +254,7 @@
_self.hasMore = _self.refundList.length < res.total ? 'more' : 'noMore' _self.hasMore = _self.refundList.length < res.total ? 'more' : 'noMore'
}) })
.catch(err => { .catch(err => {
uni.stopPullDownRefresh()
_self.loadingState = 'error' _self.loadingState = 'error'
_self.listRefreshTrig = false _self.listRefreshTrig = false
_self.isLoadMore = false _self.isLoadMore = false

View File

@ -162,12 +162,12 @@
</view> </view>
<text class="download-item-desc">软件的鉴别材料-操作手册</text> <text class="download-item-desc">软件的鉴别材料-操作手册</text>
<view class="download-btn-box"> <view class="download-btn-box">
<view class="download-btn blue" @click="doDownloadDatum" <view class="download-btn blue" @click="doDownloadDatum" data-type="docx"
data-path="/route/proj/download/manual/"> data-path="/route/proj/download/manual/">
<view class="ic-doc" style="width: 20px;height: 20px;"></view> <view class="ic-doc" style="width: 20px;height: 20px;"></view>
<view class="download-btn-txt">Word格式</view> <view class="download-btn-txt">Word格式</view>
</view> </view>
<view class="download-btn red" @click="doDownloadDatum" <view class="download-btn red" @click="doDownloadDatum" data-type="pdf"
data-path="/route/proj/download/manual/pdf/"> data-path="/route/proj/download/manual/pdf/">
<view class="ic-pdf" style="width: 20px;height: 20px;"></view> <view class="ic-pdf" style="width: 20px;height: 20px;"></view>
<view class="download-btn-txt">PDF格式</view> <view class="download-btn-txt">PDF格式</view>
@ -184,12 +184,12 @@
</view> </view>
<text class="download-item-desc">软件的鉴别材料-项目源代码</text> <text class="download-item-desc">软件的鉴别材料-项目源代码</text>
<view class="download-btn-box"> <view class="download-btn-box">
<view class="download-btn blue" @click="doDownloadDatum" <view class="download-btn blue" @click="doDownloadDatum" data-type="docx"
data-path="/route/proj/download/code/"> data-path="/route/proj/download/code/">
<view class="ic-doc" style="width: 20px;height: 20px;"></view> <view class="ic-doc" style="width: 20px;height: 20px;"></view>
<view class="download-btn-txt">Word格式</view> <view class="download-btn-txt">Word格式</view>
</view> </view>
<view class="download-btn red" @click="doDownloadDatum" <view class="download-btn red" @click="doDownloadDatum" data-type="pdf"
data-path="/route/proj/download/code/pdf/"> data-path="/route/proj/download/code/pdf/">
<view class="ic-pdf" style="width: 20px;height: 20px;"></view> <view class="ic-pdf" style="width: 20px;height: 20px;"></view>
<view class="download-btn-txt">PDF格式</view> <view class="download-btn-txt">PDF格式</view>
@ -313,6 +313,15 @@
}); });
this.doRefreshList() this.doRefreshList()
}, },
onShow() {
if (this.needRefresh) {
this.needRefresh = false
this.doRefreshList()
}
},
onPullDownRefresh() {
this.doRefreshList()
},
methods: { methods: {
repairStatusColor, repairStatusColor,
repairStatus, repairStatus,
@ -415,23 +424,24 @@
} }
}, },
// //
doDownload(url, header) { doDownload(url, header, filePath) {
const _self = this const _self = this
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const downloadTask = uni.downloadFile({ const downloadTask = uni.downloadFile({
url: url, url: url,
filePath: filePath,
header: header, header: header,
success: resolve, success: resolve,
fail: reject fail: reject
}) })
downloadTask.onProgressUpdate(res => { downloadTask.onProgressUpdate(res => {
_self.downloadProgress = res.progress _self.downloadProgress = Number(res.progress)
}) })
}) })
}, },
// //
//path : //path :
async download(path) { async download(path, fileType) {
const _self = this const _self = this
_self.downloadProgress = 0 // _self.downloadProgress = 0 //
_self.downloading = true // _self.downloading = true //
@ -441,13 +451,15 @@
if (token) { if (token) {
header.Auth = `Bearer ${token}`; header.Auth = `Bearer ${token}`;
} }
const downloadRes = await _self.doDownload(url, header) const filePath = 'bdfile://usr/' + this.tempDownloadPro.projId + '.' + fileType
const downloadRes = await _self.doDownload(url, header, filePath)
console.log('下载返回', downloadRes) console.log('下载返回', downloadRes)
if (downloadRes && downloadRes.statusCode == 200) { if (downloadRes && downloadRes.statusCode == 200) {
_self.downloadProgress = 0 _self.downloadProgress = 0
_self.downloading = false _self.downloading = false
uni.openDocument({ uni.openDocument({
filePath: downloadRes.tempFilePath, filePath: downloadRes.filePath,
fileType: fileType,
showMenu: true, showMenu: true,
success: res => { success: res => {
@ -505,6 +517,7 @@
_self.loadingState = isRefresh ? 'loading' : '' _self.loadingState = isRefresh ? 'loading' : ''
ProApi.doGetMineRepairList(_self.pageData) ProApi.doGetMineRepairList(_self.pageData)
.then(res => { .then(res => {
uni.stopPullDownRefresh()
console.log(res) console.log(res)
var status = 'success' var status = 'success'
status = res.rows && res.rows.length > 0 ? 'success' : 'empty' status = res.rows && res.rows.length > 0 ? 'success' : 'empty'
@ -514,6 +527,7 @@
_self.hasMore = _self.repairList.length < res.total ? 'more' : 'noMore' _self.hasMore = _self.repairList.length < res.total ? 'more' : 'noMore'
}) })
.catch(err => { .catch(err => {
uni.stopPullDownRefresh()
_self.loadingState = 'error' _self.loadingState = 'error'
_self.isLoadMore = false _self.isLoadMore = false
_self.hasMore = 'more' _self.hasMore = 'more'
@ -528,8 +542,9 @@
doDownloadDatum(e) { doDownloadDatum(e) {
const _self = this const _self = this
const path = e.currentTarget.dataset.path const path = e.currentTarget.dataset.path
const fileType = e.currentTarget.dataset.type
const url = copyrightUrl + path + this.tempDownloadPro.projId const url = copyrightUrl + path + this.tempDownloadPro.projId
_self.download(url) _self.download(url, fileType)
}, },
// //
applyRepair() { applyRepair() {
@ -1015,9 +1030,9 @@
align-items: center; align-items: center;
padding: 15rpx; padding: 15rpx;
border-radius: 5px; border-radius: 5px;
flex: 1; flex: 1;
box-shadow: 0rpx 0rpx 2rpx $bg-gray-input-color; box-shadow: 0rpx 0rpx 2rpx $bg-gray-input-color;
font-weight: bold; font-weight: bold;
} }
.download-btn:nth-child(2) { .download-btn:nth-child(2) {
@ -1078,7 +1093,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: $bg-green-light-color; background-color: $bg-green-light-color;
width: 72rpx; width: 72rpx;
height: 72rpx; height: 72rpx;

View File

@ -172,6 +172,9 @@
}); });
this.doRefreshList() this.doRefreshList()
}, },
onPullDownRefresh() {
this.doRefreshList()
},
methods: { methods: {
closeDialog() { closeDialog() {
this.companyName = '' this.companyName = ''
@ -274,6 +277,7 @@
_self.loadingState = isRefresh ? 'loading' : '' _self.loadingState = isRefresh ? 'loading' : ''
InvoiceApi.doGetMineInvoiceList(_self.pageData) InvoiceApi.doGetMineInvoiceList(_self.pageData)
.then(res => { .then(res => {
uni.stopPullDownRefresh()
console.log(res) console.log(res)
var status = 'success' var status = 'success'
status = res.rows && res.rows.length > 0 ? 'success' : 'empty' status = res.rows && res.rows.length > 0 ? 'success' : 'empty'
@ -283,6 +287,7 @@
_self.hasMore = _self.invoiceInfoList.length < res.total ? 'more' : 'noMore' _self.hasMore = _self.invoiceInfoList.length < res.total ? 'more' : 'noMore'
}) })
.catch(err => { .catch(err => {
uni.stopPullDownRefresh()
_self.loadingState = 'error' _self.loadingState = 'error'
_self.isLoadMore = false _self.isLoadMore = false
_self.hasMore = 'more' _self.hasMore = 'more'
@ -412,11 +417,7 @@
} }
return true return true
}, },
}, }
onPullDownRefresh() {
this.doRefreshList()
uni.stopPullDownRefresh()
},
}; };
</script> </script>

View File

@ -110,6 +110,15 @@
}); });
this.doRefreshList() this.doRefreshList()
}, },
onShow() {
if (this.needRefresh) {
this.needRefresh = false
this.doRefreshList()
}
},
onPullDownRefresh() {
this.doRefreshList()
},
methods: { methods: {
invoiceStatus, invoiceStatus,
invoiceStatusColor, invoiceStatusColor,
@ -213,6 +222,7 @@
_self.loadingState = isRefresh ? 'loading' : '' _self.loadingState = isRefresh ? 'loading' : ''
InvoiceApi.doGetInvoiceRecordList(_self.pageData) InvoiceApi.doGetInvoiceRecordList(_self.pageData)
.then(res => { .then(res => {
uni.stopPullDownRefresh()
console.log(res) console.log(res)
var status = 'success' var status = 'success'
status = res.rows && res.rows.length > 0 ? 'success' : 'empty' status = res.rows && res.rows.length > 0 ? 'success' : 'empty'
@ -222,15 +232,12 @@
_self.isLoadMore = false _self.isLoadMore = false
}) })
.catch(err => { .catch(err => {
uni.stopPullDownRefresh()
_self.loadingState = 'error' _self.loadingState = 'error'
_self.hasMore = 'more' _self.hasMore = 'more'
_self.isLoadMore = false _self.isLoadMore = false
}) })
}, },
},
onPullDownRefresh() {
this.doRefreshList()
uni.stopPullDownRefresh()
} }
}; };
</script> </script>
@ -239,7 +246,7 @@
.add-btn { .add-btn {
border-radius: 4px; border-radius: 4px;
background-color: $btn-green-color; background-color: $btn-green-color;
color: rgba(255, 255, 255, 1); color: $white-color;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
text-align: center; text-align: center;
@ -289,17 +296,17 @@
.red { .red {
background-color: $bg-red-color; background-color: $bg-red-color;
color: rgba(255, 255, 255, 1); color: $white-color;
} }
.green { .green {
background-color: $bg-green-color; background-color: $bg-green-color;
color: rgba(255, 255, 255, 1); color: $white-color;
} }
.green:active { .green:active {
background-color: $bg-green-deep-color; background-color: $bg-green-deep-color;
color: rgba(255, 255, 255, 1); color: $white-color;
} }
.options-btn:nth-of-type(n+2) { .options-btn:nth-of-type(n+2) {
@ -419,7 +426,7 @@
line-height: 20px; line-height: 20px;
border-radius: 4px; border-radius: 4px;
background-color: $btn-green-color; background-color: $btn-green-color;
color: rgba(255, 255, 255, 1); color: $white-color;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
font-family: PingFangSC-regular; font-family: PingFangSC-regular;
@ -430,7 +437,7 @@
line-height: 20px; line-height: 20px;
border-radius: 4px; border-radius: 4px;
background-color: $btn-red-color; background-color: $btn-red-color;
color: rgba(255, 255, 255, 1); color: $white-color;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
font-family: PingFangSC-regular; font-family: PingFangSC-regular;

View File

@ -22,8 +22,7 @@
<view class="invoice-info-item-content"> <view class="invoice-info-item-content">
<radio-group class="custom-radio-group" @change="changeType"> <radio-group class="custom-radio-group" @change="changeType">
<block v-for="(item,index) in typeList" :key="index"> <block v-for="(item,index) in typeList" :key="index">
<radio :checked="typeId==item.dataName" <radio :checked="typeId==item.dataName" :value="item.dataName">
:value="item.dataName">
{{item.dataName}} {{item.dataName}}
</radio> </radio>
</block> </block>
@ -35,8 +34,7 @@
<view class="invoice-info-item-content"> <view class="invoice-info-item-content">
<radio-group class="custom-radio-group" @change="changeContent"> <radio-group class="custom-radio-group" @change="changeContent">
<block v-for="(item,index) in contentList" :key="index"> <block v-for="(item,index) in contentList" :key="index">
<radio :checked="contentId==item.dataName" <radio :checked="contentId==item.dataName" :value="item.dataName">{{item.dataName}}</radio>
:value="item.dataName">{{item.dataName}}</radio>
</block> </block>
</radio-group> </radio-group>
</view> </view>
@ -46,8 +44,7 @@
<view class="invoice-info-item-content"> <view class="invoice-info-item-content">
<radio-group class="custom-radio-group" @change="changeRate"> <radio-group class="custom-radio-group" @change="changeRate">
<block v-for="(item,index) in rateList" :key="index"> <block v-for="(item,index) in rateList" :key="index">
<radio :checked="rateId==item.dataName" <radio :checked="rateId==item.dataName" :value="item.dataName">
:value="item.dataName">
{{item.dataName}} {{item.dataName}}
</radio> </radio>
</block> </block>
@ -206,15 +203,18 @@
rows: 100 rows: 100
} }
const _self = this const _self = this
const type = InvoiceApi.doGetDicListByPId('e0251d55-cd52-4f57-be92-b2bef8a6dd62') const type = InvoiceApi.doGetDicListByPId(
const content = InvoiceApi.doGetDicListByPId('b67d5208-db1d-4d0e-99de-cc22d9d50041') 'e0251d55-cd52-4f57-be92-b2bef8a6dd62') // e0251d55-cd52-4f57-be92-b2bef8a6dd62
const rate = InvoiceApi.doGetDicListByPId('e4808c45-64ee-42fa-a413-a470fbdc0aea') const content = InvoiceApi.doGetDicListByPId(
'b67d5208-db1d-4d0e-99de-cc22d9d50041') // b67d5208-db1d-4d0e-99de-cc22d9d50041
const rate = InvoiceApi.doGetDicListByPId(
'e4808c45-64ee-42fa-a413-a470fbdc0aea') // e4808c45-64ee-42fa-a413-a470fbdc0aea
const info = InvoiceApi.doGetMineInvoiceList(pageData) const info = InvoiceApi.doGetMineInvoiceList(pageData)
const list = [type, content, rate, info] const list = [type, content, rate, info]
Promise.all(list) Promise.all(list)
.then(res => { .then(res => {
uni.hideLoading() uni.hideLoading()
console.log(res[3]) console.log(res)
_self.contentList = res[0] _self.contentList = res[0]
_self.rateList = res[1] _self.rateList = res[1]
_self.typeList = res[2] _self.typeList = res[2]
@ -396,10 +396,7 @@
backPageRefresh() { backPageRefresh() {
let pages = getCurrentPages(); let pages = getCurrentPages();
let prevPage = pages[pages.length - 2]; let prevPage = pages[pages.length - 2];
if (prevPage && typeof prevPage.doRefreshList === prevPage.$vm.needRefresh = true
'function') {
prevPage.doRefreshList()
}
uni.navigateBack() uni.navigateBack()
}, },
closeDialog(e) { closeDialog(e) {
@ -483,7 +480,7 @@
} }
.invoice-info-item-content { .invoice-info-item-content {
font-size: 24rpx; font-size: 28rpx;
padding-left: 20rpx; padding-left: 20rpx;
margin-left: 15rpx; margin-left: 15rpx;
flex: 1; flex: 1;

View File

@ -71,6 +71,9 @@
import { import {
pxToRpx pxToRpx
} from '@/common/js/util.js' } from '@/common/js/util.js'
import {
menuList
} from '@/common/js/data.js'
export default { export default {
data() { data() {
return { return {
@ -83,43 +86,7 @@
animationData: {}, animationData: {},
animation: null, animation: null,
alertMsg: '', //alertDialog alertMsg: '', //alertDialog
menuList: [{ menuList: menuList,
icon: "ic-user",
title: "个人信息",
path: "/pages/mine/mineAccount/mineInfo/mineInfo"
}, {
icon: 'ic-msg',
title: '消息通知',
path: '/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice'
}, {
icon: 'ic-refund',
title: '退款项目',
path: '/pages/copyright/refund/refund'
}, {
icon: 'ic-repair',
title: '补正项目',
path: '/pages/copyright/repair/repair'
}, {
icon: 'ic-invoice-info',
title: '发票抬头',
path: '/pages/mine/mineAccount/invoiceInfo/invoiceInfo'
}, {
icon: "ic-pay-record",
title: "资金流水",
path: "/pages/mine/mineAccount/minePayRecord/minePayRecord"
}, {
icon: "ic-order",
title: "我的订单",
path: "/pages/mine/mineAccount/mineOrder/mineOrder"
}, {
icon: "ic-invoice",
title: "发票管理",
path: "/pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage"
}, {
icon: "ic-contact",
title: "产权联系人",
path: "/pages/mine/mineAccount/mineContact/mineContact"
}],
msgType: 'info', msgType: 'info',
msgTxt: '', msgTxt: '',
allPrice: 0, // allPrice: 0, //

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 415 B

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"data.js","sources":["common/js/data.js"],"sourcesContent":["const kindList = [{\r\n\t\"value\": \"CODE\",\r\n\t\"title\": \"代码\"\r\n}, {\r\n\t\"title\": \"操作手册\",\r\n\t\"value\": \"MANUAL\"\r\n}, {\r\n\t\"title\": \"全部\",\r\n\t\"value\": \"ALL\"\r\n}]\r\nconst typeList = [{\r\n\t\"title\": \"一次补正\",\r\n\t\"value\": \"CORRECTION1\"\r\n}, {\r\n\t\"title\": \"二次补正\",\r\n\t\"value\": \"CORRECTION2\"\r\n}]\r\nconst stateList = [{\r\n\t\"title\": \"待审核\",\r\n\t\"value\": \"PENDING\"\r\n}, {\r\n\t\"title\": \"已通过\",\r\n\t\"value\": \"APPROVED\"\r\n}, {\r\n\t\"title\": \"未通过\",\r\n\t\"value\": \"REJECTED\"\r\n}, {\r\n\t\"title\": \"已取消\",\r\n\t\"value\": \"CANCELED\"\r\n}]\r\nconst homeTypeList = [{\r\n\t\tvalue: 'FREE',\r\n\t\tlabel: '免费试用'\r\n\t},\r\n\t{\r\n\t\tvalue: 'MATERIAL',\r\n\t\tlabel: '写材料'\r\n\t},\r\n\t{\r\n\t\tvalue: 'ALL',\r\n\t\tlabel: '全托管'\r\n\t}\r\n]\r\nconst expandList = [{\r\n\t\tvalue: 'PKG',\r\n\t\tlabel: '安装包'\r\n\t},\r\n\t{\r\n\t\tvalue: 'VIDEO_DEMO',\r\n\t\tlabel: '演示视频'\r\n\t},\r\n\t{\r\n\t\tvalue: 'URGENT',\r\n\t\tlabel: '加急'\r\n\t}\r\n]\r\nexport {\r\n\tstateList,\r\n\tkindList,\r\n\ttypeList,\r\n\thomeTypeList,\r\n\texpandList\r\n}"],"names":[],"mappings":";AAAK,MAAC,WAAW,CAAC;AAAA,EACjB,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,CAAC;AACI,MAAC,WAAW,CAAC;AAAA,EACjB,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,CAAC;AACI,MAAC,YAAY,CAAC;AAAA,EAClB,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,CAAC;AACI,MAAC,eAAe;AAAA,EAAC;AAAA,IACpB,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AACF;AACK,MAAC,aAAa;AAAA,EAAC;AAAA,IAClB,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AACF;;;;;;"} {"version":3,"file":"data.js","sources":["common/js/data.js"],"sourcesContent":["const kindList = [{\r\n\t\"value\": \"CODE\",\r\n\t\"title\": \"代码\"\r\n}, {\r\n\t\"title\": \"操作手册\",\r\n\t\"value\": \"MANUAL\"\r\n}, {\r\n\t\"title\": \"全部\",\r\n\t\"value\": \"ALL\"\r\n}]\r\nconst typeList = [{\r\n\t\"title\": \"一次补正\",\r\n\t\"value\": \"CORRECTION1\"\r\n}, {\r\n\t\"title\": \"二次补正\",\r\n\t\"value\": \"CORRECTION2\"\r\n}]\r\nconst stateList = [{\r\n\t\"title\": \"待审核\",\r\n\t\"value\": \"PENDING\"\r\n}, {\r\n\t\"title\": \"已通过\",\r\n\t\"value\": \"APPROVED\"\r\n}, {\r\n\t\"title\": \"未通过\",\r\n\t\"value\": \"REJECTED\"\r\n}, {\r\n\t\"title\": \"已取消\",\r\n\t\"value\": \"CANCELED\"\r\n}]\r\nconst homeTypeList = [{\r\n\t\tvalue: 'FREE',\r\n\t\tlabel: '免费试用'\r\n\t},\r\n\t{\r\n\t\tvalue: 'MATERIAL',\r\n\t\tlabel: '写材料'\r\n\t},\r\n\t{\r\n\t\tvalue: 'ALL',\r\n\t\tlabel: '全托管'\r\n\t}\r\n]\r\nconst expandList = [{\r\n\t\tvalue: 'PKG',\r\n\t\tlabel: '安装包'\r\n\t},\r\n\t{\r\n\t\tvalue: 'VIDEO_DEMO',\r\n\t\tlabel: '演示视频'\r\n\t},\r\n\t{\r\n\t\tvalue: 'URGENT',\r\n\t\tlabel: '加急'\r\n\t}\r\n]\r\nconst menuList = [{\r\n\ticon: \"ic-user\",\r\n\ttitle: \"个人信息\",\r\n\tpath: \"/pages/mine/mineAccount/mineInfo/mineInfo\"\r\n}, {\r\n\ticon: 'ic-msg',\r\n\ttitle: '消息通知',\r\n\tpath: '/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice'\r\n}, {\r\n\ticon: 'ic-refund',\r\n\ttitle: '退款项目',\r\n\tpath: '/pages/copyright/refund/refund'\r\n}, {\r\n\ticon: 'ic-repair',\r\n\ttitle: '补正项目',\r\n\tpath: '/pages/copyright/repair/repair'\r\n}, {\r\n\ticon: 'ic-invoice-info',\r\n\ttitle: '发票抬头',\r\n\tpath: '/pages/mine/mineAccount/invoiceInfo/invoiceInfo'\r\n}, {\r\n\ticon: \"ic-invoice\",\r\n\ttitle: \"发票管理\",\r\n\tpath: \"/pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage\"\r\n}, {\r\n\ticon: \"ic-pay-record\",\r\n\ttitle: \"资金流水\",\r\n\tpath: \"/pages/mine/mineAccount/minePayRecord/minePayRecord\"\r\n}, {\r\n\ticon: \"ic-order\",\r\n\ttitle: \"我的订单\",\r\n\tpath: \"/pages/mine/mineAccount/mineOrder/mineOrder\"\r\n}, {\r\n\ticon: \"ic-contact\",\r\n\ttitle: \"产权联系人\",\r\n\tpath: \"/pages/mine/mineAccount/mineContact/mineContact\"\r\n}]\r\nexport {\r\n\tstateList,\r\n\tkindList,\r\n\ttypeList,\r\n\thomeTypeList,\r\n\texpandList,\r\n\tmenuList\r\n}"],"names":[],"mappings":";AAAK,MAAC,WAAW,CAAC;AAAA,EACjB,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,CAAC;AACI,MAAC,WAAW,CAAC;AAAA,EACjB,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,CAAC;AACI,MAAC,YAAY,CAAC;AAAA,EAClB,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,GAAG;AAAA,EACF,SAAS;AAAA,EACT,SAAS;AACV,CAAC;AACI,MAAC,eAAe;AAAA,EAAC;AAAA,IACpB,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AACF;AACK,MAAC,aAAa;AAAA,EAAC;AAAA,IAClB,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AAAA,EACD;AAAA,IACC,OAAO;AAAA,IACP,OAAO;AAAA,EACP;AACF;AACK,MAAC,WAAW,CAAC;AAAA,EACjB,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,GAAG;AAAA,EACF,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AACP,CAAC;;;;;;;"}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"payApi.js","sources":["common/js/net/payApi.js"],"sourcesContent":["import {\r\n\trequest\r\n} from './http.js'\r\n// 公共API\r\nconst apiPath = {\r\n\tgetBuyPackageList: '/api/proj/servicepkg/packageinfo/listpage/${type}/self', //获取可以购买的套餐包列表\r\n\tgetPayOrder: '/api/pay/get-pay', //获取支付订单\r\n\tenterprisePay: '/api/pay/pay-account-recharge/${accountRechargeId}', //企业付款完成支付\r\n\tenterpriseAccountInfo: '/api/pay/get-pay-system-bank', //获取公司账户信息\r\n\twxPayParams: '/api/accountrecharge/save-wx-pay-prepay-id', //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID\n\tbdPayParams:'/api/accountrecharge/save-bd-pay-order-info'\r\n}\r\nclass PayApi {\r\n\tstatic doGetBuyPackageList(type, data) {\r\n\t\tconst path = apiPath.getBuyPackageList.replace('${type}', type);\r\n\t\treturn request(path, \"GET\", data);\r\n\t}\r\n\t//对公转账完成\r\n\tstatic doCompleteEnterprisePay(url, data) {\r\n\t\tconst path = apiPath.enterprisePay.replace('${accountRechargeId}', url)\r\n\t\treturn request(path, \"POST\", data)\r\n\t}\r\n\t//获取账户信息\r\n\tstatic doGetEnterpriseAccountInfo() {\r\n\t\treturn request(apiPath.enterpriseAccountInfo, \"GET\")\r\n\t}\r\n\t//获取订单\r\n\tstatic doGetOrder(data) {\r\n\t\treturn request(apiPath.getPayOrder, \"POST\", data)\r\n\t}\r\n\t//获取微信支付参数\r\n\tstatic doGetWxPayParams(data) {\r\n\t\treturn request(apiPath.wxPayParams, \"POST\", data, null, \"operator\")\r\n\t}\n\t//获取百度支付参数\n\tstatic doGetBdPayParams(data){\n\t\treturn request(apiPath.bdPayParams,\"POST\",data,null,\"operator\")\n\t}\r\n}\r\n\r\nexport default PayApi;"],"names":["request"],"mappings":";;AAIA,MAAM,UAAU;AAAA,EACf,mBAAmB;AAAA;AAAA,EACnB,aAAa;AAAA;AAAA,EACb,eAAe;AAAA;AAAA,EACf,uBAAuB;AAAA;AAAA,EACvB,aAAa;AAAA;AAAA,EACb,aAAY;AACb;AACA,MAAM,OAAO;AAAA,EACZ,OAAO,oBAAoB,MAAM,MAAM;AACtC,UAAM,OAAO,QAAQ,kBAAkB,QAAQ,WAAW,IAAI;AAC9D,WAAOA,2BAAQ,MAAM,OAAO,IAAI;AAAA,EAChC;AAAA;AAAA,EAED,OAAO,wBAAwB,KAAK,MAAM;AACzC,UAAM,OAAO,QAAQ,cAAc,QAAQ,wBAAwB,GAAG;AACtE,WAAOA,2BAAQ,MAAM,QAAQ,IAAI;AAAA,EACjC;AAAA;AAAA,EAED,OAAO,6BAA6B;AACnC,WAAOA,2BAAQ,QAAQ,uBAAuB,KAAK;AAAA,EACnD;AAAA;AAAA,EAED,OAAO,WAAW,MAAM;AACvB,WAAOA,mBAAO,QAAC,QAAQ,aAAa,QAAQ,IAAI;AAAA,EAChD;AAAA;AAAA,EAED,OAAO,iBAAiB,MAAM;AAC7B,WAAOA,mBAAAA,QAAQ,QAAQ,aAAa,QAAQ,MAAM,MAAM,UAAU;AAAA,EAClE;AAAA;AAAA,EAED,OAAO,iBAAiB,MAAK;AAC5B,WAAOA,mBAAAA,QAAQ,QAAQ,aAAY,QAAO,MAAK,MAAK,UAAU;AAAA,EAC9D;AACF;;"} {"version":3,"file":"payApi.js","sources":["common/js/net/payApi.js"],"sourcesContent":["import {\r\n\trequest\r\n} from './http.js'\r\n// 公共API\r\nconst apiPath = {\r\n\tgetBuyPackageList: '/api/proj/servicepkg/packageinfo/listpage/${type}/self', //获取可以购买的套餐包列表\r\n\tgetPayOrder: '/api/pay/get-pay', //获取支付订单\r\n\tenterprisePay: '/api/pay/pay-account-recharge/${accountRechargeId}', //企业付款完成支付\r\n\tenterpriseAccountInfo: '/api/pay/get-pay-system-bank', //获取公司账户信息\r\n\twxPayParams: '/api/accountrecharge/save-wx-pay-prepay-id', //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID\r\n\tbdPayParams: '/api/accountrecharge/save-bd-pay-order-info'\r\n}\r\nconst proName = 'operator'\r\nclass PayApi {\r\n\t// 通用路径参数替换方法\r\n\tstatic #replacePathParams(path, params) {\r\n\t\treturn Object.entries(params).reduce(\r\n\t\t\t(acc, [key, value]) => acc.replace(`{${key}}`, value),\r\n\t\t\tpath\r\n\t\t)\r\n\t}\r\n\r\n\t// 通用请求方法\r\n\tstatic requestHandler(endpoint, method, data = null, pathParams = {}) {\r\n\t\tconst path = Object.keys(pathParams).length ?\r\n\t\t\tthis.#replacePathParams(endpoint, pathParams) :\r\n\t\t\tendpoint\r\n\t\treturn request(path, method, data, proName)\r\n\t}\r\n\tstatic doGetBuyPackageList(type, data) {\r\n\t\tconst path = apiPath.getBuyPackageList.replace('${type}', type);\r\n\t\treturn request(path, \"GET\", data);\r\n\t}\r\n\t//对公转账完成\r\n\tstatic doCompleteEnterprisePay(url, data) {\r\n\t\tconst path = apiPath.enterprisePay.replace('${accountRechargeId}', url)\r\n\t\treturn request(path, \"POST\", data)\r\n\t}\r\n\t//获取账户信息\r\n\tstatic doGetEnterpriseAccountInfo() {\r\n\t\treturn request(apiPath.enterpriseAccountInfo, \"GET\")\r\n\t}\r\n\t//获取订单\r\n\tstatic doGetOrder(data) {\r\n\t\treturn request(apiPath.getPayOrder, \"POST\", data)\r\n\t}\r\n\t// 获取微信支付参数\r\n\tstatic doGetWxPayParams(data) {\r\n\t\treturn this.requestHandler(apiPath.wxPayParams, \"POST\", data);\r\n\t}\r\n\r\n\t// 获取百度支付参数\r\n\tstatic doGetBdPayParams(data) {\r\n\t\treturn this.requestHandler(apiPath.bdPayParams, \"POST\", data);\r\n\t}\r\n}\r\n\r\nexport default PayApi;"],"names":["request"],"mappings":";;;;;;;;;;;;;;;;AAIA,MAAM,UAAU;AAAA,EACf,mBAAmB;AAAA;AAAA,EACnB,aAAa;AAAA;AAAA,EACb,eAAe;AAAA;AAAA,EACf,uBAAuB;AAAA;AAAA,EACvB,aAAa;AAAA;AAAA,EACb,aAAa;AACd;AACA,MAAM,UAAU;AAChB,MAAM,OAAO;AAAA;AAAA,EAUZ,OAAO,eAAe,UAAU,QAAQ,OAAO,MAAM,aAAa,IAAI;AACrE,UAAM,OAAO,OAAO,KAAK,UAAU,EAAE,SACpC,sBAAK,0CAAL,WAAwB,UAAU,cAClC;AACD,WAAOA,mBAAO,QAAC,MAAM,QAAQ,MAAM,OAAO;AAAA,EAC1C;AAAA,EACD,OAAO,oBAAoB,MAAM,MAAM;AACtC,UAAM,OAAO,QAAQ,kBAAkB,QAAQ,WAAW,IAAI;AAC9D,WAAOA,2BAAQ,MAAM,OAAO,IAAI;AAAA,EAChC;AAAA;AAAA,EAED,OAAO,wBAAwB,KAAK,MAAM;AACzC,UAAM,OAAO,QAAQ,cAAc,QAAQ,wBAAwB,GAAG;AACtE,WAAOA,2BAAQ,MAAM,QAAQ,IAAI;AAAA,EACjC;AAAA;AAAA,EAED,OAAO,6BAA6B;AACnC,WAAOA,2BAAQ,QAAQ,uBAAuB,KAAK;AAAA,EACnD;AAAA;AAAA,EAED,OAAO,WAAW,MAAM;AACvB,WAAOA,mBAAO,QAAC,QAAQ,aAAa,QAAQ,IAAI;AAAA,EAChD;AAAA;AAAA,EAED,OAAO,iBAAiB,MAAM;AAC7B,WAAO,KAAK,eAAe,QAAQ,aAAa,QAAQ,IAAI;AAAA,EAC5D;AAAA;AAAA,EAGD,OAAO,iBAAiB,MAAM;AAC7B,WAAO,KAAK,eAAe,QAAQ,aAAa,QAAQ,IAAI;AAAA,EAC5D;AACF;AAxCQ;AAAA,uBAAkB,SAAC,MAAM,QAAQ;AACvC,SAAO,OAAO,QAAQ,MAAM,EAAE;AAAA,IAC7B,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,IAAI,QAAQ,IAAI,GAAG,KAAK,KAAK;AAAA,IACpD;AAAA,EACA;AACD;AAAA;AALD,aAFK,QAEE;;"}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

View File

@ -57,9 +57,47 @@ const expandList = [
label: "加急" label: "加急"
} }
]; ];
const menuList = [{
icon: "ic-user",
title: "个人信息",
path: "/pages/mine/mineAccount/mineInfo/mineInfo"
}, {
icon: "ic-msg",
title: "消息通知",
path: "/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice"
}, {
icon: "ic-refund",
title: "退款项目",
path: "/pages/copyright/refund/refund"
}, {
icon: "ic-repair",
title: "补正项目",
path: "/pages/copyright/repair/repair"
}, {
icon: "ic-invoice-info",
title: "发票抬头",
path: "/pages/mine/mineAccount/invoiceInfo/invoiceInfo"
}, {
icon: "ic-invoice",
title: "发票管理",
path: "/pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage"
}, {
icon: "ic-pay-record",
title: "资金流水",
path: "/pages/mine/mineAccount/minePayRecord/minePayRecord"
}, {
icon: "ic-order",
title: "我的订单",
path: "/pages/mine/mineAccount/mineOrder/mineOrder"
}, {
icon: "ic-contact",
title: "产权联系人",
path: "/pages/mine/mineAccount/mineContact/mineContact"
}];
exports.expandList = expandList; exports.expandList = expandList;
exports.homeTypeList = homeTypeList; exports.homeTypeList = homeTypeList;
exports.kindList = kindList; exports.kindList = kindList;
exports.menuList = menuList;
exports.stateList = stateList; exports.stateList = stateList;
exports.typeList = typeList; exports.typeList = typeList;
//# sourceMappingURL=../../../.sourcemap/mp-baidu/common/js/data.js.map //# sourceMappingURL=../../../.sourcemap/mp-baidu/common/js/data.js.map

View File

@ -1,6 +1,22 @@
"use strict"; "use strict";
var __accessCheck = (obj, member, msg) => {
if (!member.has(obj))
throw TypeError("Cannot " + msg);
};
var __privateAdd = (obj, member, value) => {
if (member.has(obj))
throw TypeError("Cannot add the same private member more than once");
member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
};
var __privateMethod = (obj, member, method) => {
__accessCheck(obj, member, "access private method");
return method;
};
var _replacePathParams, replacePathParams_fn;
const common_js_net_http = require("./http.js"); const common_js_net_http = require("./http.js");
const common_js_cache_storage = require("../cache/storage.js"); const common_js_cache_storage = require("../cache/storage.js");
const proName = "plug";
const userId = common_js_cache_storage.get("userId");
const apiPath = { const apiPath = {
mineInvoiceOrderList: "/api/invoicerecharge/recharge-listpage/{userId}/{status}", mineInvoiceOrderList: "/api/invoicerecharge/recharge-listpage/{userId}/{status}",
//可以开具发票的订单 //可以开具发票的订单
@ -24,60 +40,80 @@ const apiPath = {
//数据字典 //数据字典
}; };
class InvoiceApi { class InvoiceApi {
// 通用请求方法
static requestHandler(endpoint, method, data = null, pathParams = {}) {
const path = Object.keys(pathParams).length ? __privateMethod(this, _replacePathParams, replacePathParams_fn).call(this, endpoint, pathParams) : endpoint;
return common_js_net_http.request(path, method, data, proName);
}
//获取可以开具发票的订单 //获取可以开具发票的订单
static doGetMineInvoiceOrderList(data, status) { static doGetMineInvoiceOrderList(data, status) {
const userId = common_js_cache_storage.get("userId"); return this.requestHandler(apiPath.mineInvoiceOrderList, "GET", data, {
const path = apiPath.mineInvoiceOrderList.replace("{userId}", userId).replace("{status}", status); userId,
return common_js_net_http.request(path, "GET", data, null, "plug"); status
});
} }
// 获取字典列表
static doGetDicListByPId(id) { static doGetDicListByPId(id) {
const path = apiPath.dicByPId.replace("{pId}", id); const path = apiPath.dicByPId.replace("{pId}", id);
return common_js_net_http.request(path, "GET"); return common_js_net_http.request(path, "GET");
} }
//我的开票信息 // 我的开票信息
static doGetMineInvoiceList(data) { static doGetMineInvoiceList(data) {
const userId = common_js_cache_storage.get("userId"); return this.requestHandler(apiPath.mineInvoiceList, "GET", data, {
const path = apiPath.mineInvoiceList.replace("{userId}", userId); userId: common_js_cache_storage.get("userId")
return common_js_net_http.request(path, "GET", data, null, "plug"); });
} }
//保存我的开票信息 // 保存我的开票信息
static doSaveMineInvoiceInfo(data) { static doSaveMineInvoiceInfo(data) {
const userId = common_js_cache_storage.get("userId"); return this.requestHandler(apiPath.saveInvoiceInfo, "POST", data, {
const path = apiPath.saveInvoiceInfo.replace("{userId}", userId); userId: common_js_cache_storage.get("userId")
return common_js_net_http.request(path, "POST", data, null, "plug"); });
} }
//编辑开票信息 // 编辑开票信息
static doUpdateMineInvoiceInfo(id, data) { static doUpdateMineInvoiceInfo(id, data) {
const path = apiPath.updateInvoiceInfo.replace("{invoiceId}", id); return this.requestHandler(apiPath.updateInvoiceInfo, "PUT", data, {
return common_js_net_http.request(path, "PUT", data, null, "plug"); invoiceId: id
});
} }
//删除开票信息 // 删除开票信息
static doDelMineInvoiceInfo(id) { static doDelMineInvoiceInfo(id) {
const path = apiPath.deleteInvoiceInfo.replace("{ids}", id); return this.requestHandler(apiPath.deleteInvoiceInfo, "DELETE", null, {
return common_js_net_http.request(path, "DELETE", null, null, "plug"); ids: id
});
} }
//开票申请列表 // 开票申请列表(已修改,保持原有结构)
static doGetInvoiceRecordList(data) { static doGetInvoiceRecordList(data) {
const userId = common_js_cache_storage.get("userId"); return this.requestHandler(apiPath.mineInvoiceRecordList, "GET", data, {
const path = apiPath.mineInvoiceRecordList.replace("{userId}", userId); userId: common_js_cache_storage.get("userId")
return common_js_net_http.request(path, "GET", data, null, "plug"); });
} }
//取消开票申请 // 取消开票申请
static doCancelInvoiceRecord(id) { static doCancelInvoiceRecord(id) {
const path = apiPath.cancelInvoiceRecord.replace("{invoiceRechargeId}", id); return this.requestHandler(apiPath.cancelInvoiceRecord, "PUT", null, {
return common_js_net_http.request(path, "PUT", null, null, "plug"); invoiceRechargeId: id
});
} }
//提交开票申请 // 提交开票申请
static doSaveInvoiceRecord(data) { static doSaveInvoiceRecord(data) {
const userId = common_js_cache_storage.get("userId"); return this.requestHandler(apiPath.saveInvoiceRecord, "POST", data, {
const path = apiPath.saveInvoiceRecord.replace("{userId}", userId); userId: common_js_cache_storage.get("userId")
return common_js_net_http.request(path, "POST", data, null, "plug"); });
} }
//修改开票申请 // 修改开票申请
static doUpdateInvoiceRecord(id, data) { static doUpdateInvoiceRecord(id, data) {
const path = apiPath.updateInvoiceRecord.replace("{invoiceRechargeId}", id); return this.requestHandler(apiPath.updateInvoiceRecord, "PUT", data, {
return common_js_net_http.request(path, "PUT", data, null, "plug"); invoiceRechargeId: id
});
} }
} }
_replacePathParams = new WeakSet();
replacePathParams_fn = function(path, params) {
return Object.entries(params).reduce(
(acc, [key, value]) => acc.replace(`{${key}}`, value),
path
);
};
// 通用路径参数替换方法
__privateAdd(InvoiceApi, _replacePathParams);
exports.InvoiceApi = InvoiceApi; exports.InvoiceApi = InvoiceApi;
//# sourceMappingURL=../../../../.sourcemap/mp-baidu/common/js/net/InvoiceApi.js.map //# sourceMappingURL=../../../../.sourcemap/mp-baidu/common/js/net/InvoiceApi.js.map

View File

@ -1,4 +1,18 @@
"use strict"; "use strict";
var __accessCheck = (obj, member, msg) => {
if (!member.has(obj))
throw TypeError("Cannot " + msg);
};
var __privateAdd = (obj, member, value) => {
if (member.has(obj))
throw TypeError("Cannot add the same private member more than once");
member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
};
var __privateMethod = (obj, member, method) => {
__accessCheck(obj, member, "access private method");
return method;
};
var _replacePathParams, replacePathParams_fn;
const common_js_net_http = require("./http.js"); const common_js_net_http = require("./http.js");
const apiPath = { const apiPath = {
getBuyPackageList: "/api/proj/servicepkg/packageinfo/listpage/${type}/self", getBuyPackageList: "/api/proj/servicepkg/packageinfo/listpage/${type}/self",
@ -13,7 +27,13 @@ const apiPath = {
//获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID //获取微信支付所需参数 rechargeMoney金额 packageInfoId套餐包ID
bdPayParams: "/api/accountrecharge/save-bd-pay-order-info" bdPayParams: "/api/accountrecharge/save-bd-pay-order-info"
}; };
const proName = "operator";
class PayApi { class PayApi {
// 通用请求方法
static requestHandler(endpoint, method, data = null, pathParams = {}) {
const path = Object.keys(pathParams).length ? __privateMethod(this, _replacePathParams, replacePathParams_fn).call(this, endpoint, pathParams) : endpoint;
return common_js_net_http.request(path, method, data, proName);
}
static doGetBuyPackageList(type, data) { static doGetBuyPackageList(type, data) {
const path = apiPath.getBuyPackageList.replace("${type}", type); const path = apiPath.getBuyPackageList.replace("${type}", type);
return common_js_net_http.request(path, "GET", data); return common_js_net_http.request(path, "GET", data);
@ -31,14 +51,23 @@ class PayApi {
static doGetOrder(data) { static doGetOrder(data) {
return common_js_net_http.request(apiPath.getPayOrder, "POST", data); return common_js_net_http.request(apiPath.getPayOrder, "POST", data);
} }
//获取微信支付参数 // 获取微信支付参数
static doGetWxPayParams(data) { static doGetWxPayParams(data) {
return common_js_net_http.request(apiPath.wxPayParams, "POST", data, null, "operator"); return this.requestHandler(apiPath.wxPayParams, "POST", data);
} }
//获取百度支付参数 // 获取百度支付参数
static doGetBdPayParams(data) { static doGetBdPayParams(data) {
return common_js_net_http.request(apiPath.bdPayParams, "POST", data, null, "operator"); return this.requestHandler(apiPath.bdPayParams, "POST", data);
} }
} }
_replacePathParams = new WeakSet();
replacePathParams_fn = function(path, params) {
return Object.entries(params).reduce(
(acc, [key, value]) => acc.replace(`{${key}}`, value),
path
);
};
// 通用路径参数替换方法
__privateAdd(PayApi, _replacePathParams);
exports.PayApi = PayApi; exports.PayApi = PayApi;
//# sourceMappingURL=../../../../.sourcemap/mp-baidu/common/js/net/payApi.js.map //# sourceMappingURL=../../../../.sourcemap/mp-baidu/common/js/net/payApi.js.map

View File

@ -7333,7 +7333,7 @@ function isConsoleWritable() {
function initRuntimeSocketService() { function initRuntimeSocketService() {
const hosts = "127.0.0.1,192.168.0.132"; const hosts = "127.0.0.1,192.168.0.132";
const port = "8090"; const port = "8090";
const id2 = "mp-baidu_l0ZcfF"; const id2 = "mp-baidu_8D76bK";
const lazy = typeof swan !== "undefined"; const lazy = typeof swan !== "undefined";
let restoreError = lazy ? () => { let restoreError = lazy ? () => {
} : initOnError(); } : initOnError();
@ -8671,6 +8671,7 @@ const globalStyle = {
const tabBar = { const tabBar = {
color: "#515151", color: "#515151",
selectedColor: "#FE9944", selectedColor: "#FE9944",
height: "70px",
list: [ list: [
{ {
pagePath: "pages/index/home", pagePath: "pages/index/home",

View File

@ -85,11 +85,14 @@
border-radius: 10rpx; border-radius: 10rpx;
padding: 30rpx; padding: 30rpx;
margin: 10rpx; margin: 10rpx;
box-shadow: 1rpx 1rpx 2rpx 2rpx #F9FAFB; border-bottom: 1rpx solid #F0F0F0;
} }
.pro-list-item.data-v-8fd51228:nth-of-type(n+2) { .pro-list-item.data-v-8fd51228:nth-of-type(n+2) {
margin-top: 20rpx; margin-top: 20rpx;
} }
.pro-list-item.data-v-8fd51228:last-of-type {
border-bottom: none;
}
.pro-list-item-left.data-v-8fd51228 { .pro-list-item-left.data-v-8fd51228 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@ -226,15 +226,7 @@ const _sfc_main = {
_self.msgType = "success"; _self.msgType = "success";
_self.$refs.msg.open(); _self.$refs.msg.open();
setTimeout(() => { setTimeout(() => {
common_vendor.index.navigateBack({ _self.backPageRefresh();
success: function() {
let pages = getCurrentPages();
let prevPage = pages[pages.length - 2];
if (prevPage && typeof prevPage.doRefreshList === "function") {
prevPage.doRefreshList();
}
}
});
}, 1500); }, 1500);
}).catch((err) => { }).catch((err) => {
wx.hideLoading(); wx.hideLoading();
@ -266,6 +258,12 @@ const _sfc_main = {
return false; return false;
} }
return true; return true;
},
backPageRefresh() {
var pages = getCurrentPages();
let prevPage = pages[pages.length - 2];
prevPage.$vm.needRefresh = true;
common_vendor.index.navigateBack();
} }
} }
}; };
@ -317,8 +315,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
b: item.projId, b: item.projId,
c: $data.tempSelPro != null && $data.tempSelPro.projId == item.projId, c: $data.tempSelPro != null && $data.tempSelPro.projId == item.projId,
d: common_vendor.t(item.projName), d: common_vendor.t(item.projName),
e: common_vendor.t(item.authorName), e: common_vendor.t(item.gmtCreate),
f: common_vendor.t(item.gmtCreate), f: common_vendor.t(item.authorName),
g: item, g: item,
h: item h: item
}; };

View File

@ -1 +1 @@
<view class="page-container data-v-8fd51228"><swiper class="data-v-8fd51228" indicator-dots style="height:120rpx" autoplay indicator-active-color="#fff"><swiper-item class="data-v-8fd51228"><image class="data-v-8fd51228" src="{{a}}" style="width:100vw;height:120rpx"></image></swiper-item><swiper-item class="data-v-8fd51228"><image class="data-v-8fd51228" src="{{b}}" style="width:100vw;height:120rpx"></image></swiper-item></swiper><view class="apply-box data-v-8fd51228"><text class="label data-v-8fd51228">申请退款</text><view class="apply-item-row mt-20 ml-10 data-v-8fd51228"><view class="apply-title star data-v-8fd51228" style="align-self:center">退款软著</view><view class="apply-content data-v-8fd51228" bindtap="{{e}}"><view class="{{['data-v-8fd51228', d]}}">{{c}}</view><view class="icon-arrow-solid data-v-8fd51228"></view></view></view><view class="apply-item-column mt-20 ml-10 data-v-8fd51228"><view class="apply-title star data-v-8fd51228">退款原因</view><textarea bindinput="{{f}}" value="{{g}}" placeholder="请输入退款原因" placeholder-style="font-size:28rpx;color:$text-gray-hint-color" class="reason-content mt-10 data-v-8fd51228"></textarea></view><view class="apply-item-column mt-20 ml-10 data-v-8fd51228"><view class="apply-title star data-v-8fd51228">退款凭证</view><view class="mt-10 data-v-8fd51228"><uni-file-picker s-if="{{j}}" class="r data-v-8fd51228" u-r="imgPicker" binddelete="__e" bindselect="__e" u-i="8fd51228-0" eO="{{i}}" u-p="{{j}}"></uni-file-picker></view><view class="hint data-v-8fd51228"> *上传完整的补正通知书或者完整的补正通知书的截图,要求右上方的流水号和右下方的补正通知书的日期都得完整显示 </view></view></view><view class="bottom-fixed-footer data-v-8fd51228"><view class="bottom-btn-green data-v-8fd51228" bindtap="{{k}}">提交</view></view><uni-popup s-if="{{z}}" class="r data-v-8fd51228" u-s="{{['d']}}" u-r="proDialog" u-i="8fd51228-1" u-p="{{z}}"><view class="bottom-dialog-container data-v-8fd51228"><view class="dialog-title-box data-v-8fd51228"><view class="search-container data-v-8fd51228"><input placeholder="请输入项目名称" class="search-input data-v-8fd51228" value="{{l}}" bindinput="{{m}}" type="text" bindconfirm="{{n}}" confirm-type="search"/></view><view class="icon-close size-48 data-v-8fd51228" bindtap="{{o}}"></view></view><view style="height:600rpx" class="mt-10 data-v-8fd51228"><container-loading-vue s-if="{{w}}" class="data-v-8fd51228" u-s="{{['d']}}" u-i="8fd51228-2,8fd51228-1" u-p="{{w}}"><scroll-view class="data-v-8fd51228" scroll-y style="height:580rpx" lower-threshold="{{10}}" binddoRefresh="{{t}}" refresher-background="#FFFFFF00" bindscrolltolower="{{v}}"><view class="pro-list-box data-v-8fd51228"><radio-group class="data-v-8fd51228" bindchange="{{r}}"><view s-for="item in p trackBy item.a" class="pro-list-item data-v-8fd51228" data-value="{{item.h}}"><radio class="data-v-8fd51228" value="{{item.b}}" checked="{{item.c}}"></radio><view class="pro-list-item-left data-v-8fd51228" bindtap="{{q}}" data-value="{{item.g}}"><view class="pro-list-item-left-title data-v-8fd51228"><view class="pro-list-name data-v-8fd51228">{{item.d}}</view></view><view class="pro-list-item-left-footer data-v-8fd51228"><view class="pro-list-item-left-tag mr-10 single-line data-v-8fd51228">{{item.e}}</view><view class="pro-list-item-left-tag data-v-8fd51228">{{item.f}}</view></view></view></view></radio-group><uni-load-more s-if="{{s}}" class="data-v-8fd51228" u-i="8fd51228-3,8fd51228-2" u-p="{{s}}"></uni-load-more></view></scroll-view></container-loading-vue></view><view class="bottom-btn-green data-v-8fd51228" bindtap="{{x}}">确定</view></view></uni-popup><uni-popup s-if="{{C}}" class="r data-v-8fd51228" u-s="{{['d']}}" u-r="msg" u-i="8fd51228-4" u-p="{{C}}"><uni-popup-message s-if="{{A}}" class="data-v-8fd51228" u-i="8fd51228-5,8fd51228-4" u-p="{{A}}"></uni-popup-message></uni-popup></view> <view class="page-container data-v-8fd51228"><swiper class="data-v-8fd51228" indicator-dots style="height:120rpx" autoplay indicator-active-color="#fff"><swiper-item class="data-v-8fd51228"><image class="data-v-8fd51228" src="{{a}}" style="width:100vw;height:120rpx"></image></swiper-item><swiper-item class="data-v-8fd51228"><image class="data-v-8fd51228" src="{{b}}" style="width:100vw;height:120rpx"></image></swiper-item></swiper><view class="apply-box data-v-8fd51228"><text class="label data-v-8fd51228">申请退款</text><view class="apply-item-row mt-20 ml-10 data-v-8fd51228"><view class="apply-title star data-v-8fd51228" style="align-self:center">退款软著</view><view class="apply-content data-v-8fd51228" bindtap="{{e}}"><view class="{{['data-v-8fd51228', d]}}">{{c}}</view><view class="icon-arrow-solid data-v-8fd51228"></view></view></view><view class="apply-item-column mt-20 ml-10 data-v-8fd51228"><view class="apply-title star data-v-8fd51228">退款原因</view><textarea bindinput="{{f}}" value="{{g}}" placeholder="请输入退款原因" placeholder-style="font-size:28rpx;color:$text-gray-hint-color" class="reason-content mt-10 data-v-8fd51228"></textarea></view><view class="apply-item-column mt-20 ml-10 data-v-8fd51228"><view class="apply-title star data-v-8fd51228">退款凭证</view><view class="mt-10 data-v-8fd51228"><uni-file-picker s-if="{{j}}" class="r data-v-8fd51228" u-r="imgPicker" binddelete="__e" bindselect="__e" u-i="8fd51228-0" eO="{{i}}" u-p="{{j}}"></uni-file-picker></view><view class="hint data-v-8fd51228"> *上传完整的补正通知书或者完整的补正通知书的截图,要求右上方的流水号和右下方的补正通知书的日期都得完整显示 </view></view></view><view class="bottom-fixed-footer data-v-8fd51228"><view class="bottom-btn-green data-v-8fd51228" bindtap="{{k}}">提交</view></view><uni-popup s-if="{{z}}" class="r data-v-8fd51228" u-s="{{['d']}}" u-r="proDialog" u-i="8fd51228-1" u-p="{{z}}"><view class="bottom-dialog-container data-v-8fd51228"><view class="dialog-title-box data-v-8fd51228"><view class="search-container data-v-8fd51228"><input placeholder="请输入项目名称" class="search-input data-v-8fd51228" value="{{l}}" bindinput="{{m}}" type="text" bindconfirm="{{n}}" confirm-type="search"/></view><view class="icon-close size-48 data-v-8fd51228" bindtap="{{o}}"></view></view><view style="height:600rpx" class="mt-10 data-v-8fd51228"><container-loading-vue s-if="{{w}}" class="data-v-8fd51228" u-s="{{['d']}}" u-i="8fd51228-2,8fd51228-1" u-p="{{w}}"><scroll-view class="data-v-8fd51228" scroll-y style="height:580rpx" lower-threshold="{{10}}" binddoRefresh="{{t}}" refresher-background="#FFFFFF00" bindscrolltolower="{{v}}"><view class="pro-list-box data-v-8fd51228"><radio-group class="data-v-8fd51228" bindchange="{{r}}"><view s-for="item in p trackBy item.a" class="pro-list-item data-v-8fd51228" data-value="{{item.h}}"><radio class="data-v-8fd51228" value="{{item.b}}" checked="{{item.c}}"></radio><view class="pro-list-item-left data-v-8fd51228" bindtap="{{q}}" data-value="{{item.g}}"><view class="pro-list-item-left-title data-v-8fd51228"><view class="pro-list-name data-v-8fd51228">{{item.d}}</view></view><view class="pro-list-item-left-footer data-v-8fd51228"><view class="pro-list-item-left-tag data-v-8fd51228">{{item.e}}</view><view class="pro-list-item-left-tag mr-10 single-line data-v-8fd51228">{{item.f}}</view></view></view></view></radio-group><uni-load-more s-if="{{s}}" class="data-v-8fd51228" u-i="8fd51228-3,8fd51228-2" u-p="{{s}}"></uni-load-more></view></scroll-view></container-loading-vue></view><view class="bottom-btn-green data-v-8fd51228" bindtap="{{x}}">确定</view></view></uni-popup><uni-popup s-if="{{C}}" class="r data-v-8fd51228" u-s="{{['d']}}" u-r="msg" u-i="8fd51228-4" u-p="{{C}}"><uni-popup-message s-if="{{A}}" class="data-v-8fd51228" u-i="8fd51228-5,8fd51228-4" u-p="{{A}}"></uni-popup-message></uni-popup></view>

View File

@ -85,11 +85,14 @@
border-radius: 10rpx; border-radius: 10rpx;
padding: 30rpx; padding: 30rpx;
margin: 10rpx; margin: 10rpx;
box-shadow: 1rpx 1rpx 2rpx 2rpx #F9FAFB; border-bottom: 1rpx solid #F0F0F0;
} }
.pro-list-item.data-v-4a9d8e58:nth-of-type(n+2) { .pro-list-item.data-v-4a9d8e58:nth-of-type(n+2) {
margin-top: 20rpx; margin-top: 20rpx;
} }
.pro-list-item.data-v-4a9d8e58:last-of-type {
border-bottom: none;
}
.pro-list-item-left.data-v-4a9d8e58 { .pro-list-item-left.data-v-4a9d8e58 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@ -238,15 +238,7 @@ const _sfc_main = {
_self.msgType = "success"; _self.msgType = "success";
_self.$refs.msg.open(); _self.$refs.msg.open();
setTimeout(() => { setTimeout(() => {
common_vendor.index.navigateBack({ _self.backPageRefresh();
success: function() {
let pages = getCurrentPages();
let prevPage = pages[pages.length - 2];
if (prevPage && typeof prevPage.doRefreshList === "function") {
prevPage.doRefreshList();
}
}
});
}, 1500); }, 1500);
}).catch((err) => { }).catch((err) => {
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
@ -283,6 +275,12 @@ const _sfc_main = {
return false; return false;
} }
return true; return true;
},
backPageRefresh() {
var pages = getCurrentPages();
let prevPage = pages[pages.length - 2];
prevPage.$vm.needRefresh = true;
common_vendor.index.navigateBack();
} }
} }
}; };
@ -338,8 +336,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
c: $data.tempSelPro != null && $data.tempSelPro.projId == item.projId, c: $data.tempSelPro != null && $data.tempSelPro.projId == item.projId,
d: common_vendor.t(item.projName), d: common_vendor.t(item.projName),
e: "已通过补正<span style=color:red;font-size:28rpx;font-weight:bold;>" + item.approvedCount + "</span>次", e: "已通过补正<span style=color:red;font-size:28rpx;font-weight:bold;>" + item.approvedCount + "</span>次",
f: common_vendor.t(item.authorName), f: common_vendor.t(item.gmtCreate),
g: common_vendor.t(item.gmtCreate), g: common_vendor.t(item.authorName),
h: item, h: item,
i: item i: item
}; };

File diff suppressed because one or more lines are too long

View File

@ -63,6 +63,15 @@ const _sfc_main = {
}); });
this.doRefreshList(); this.doRefreshList();
}, },
onShow() {
if (this.needRefresh) {
this.needRefresh = false;
this.doRefreshList();
}
},
onPullDownRefresh() {
this.doRefreshList();
},
methods: { methods: {
repairStatusColor: common_js_conver.repairStatusColor, repairStatusColor: common_js_conver.repairStatusColor,
repairStatus: common_js_conver.repairStatus, repairStatus: common_js_conver.repairStatus,
@ -114,6 +123,7 @@ const _sfc_main = {
_self.refundList = isRefresh ? [] : _self.refundList; _self.refundList = isRefresh ? [] : _self.refundList;
_self.loadingState = isRefresh ? "loading" : ""; _self.loadingState = isRefresh ? "loading" : "";
common_js_net_projectApi.ProApi.doGetMineRefundProList(_self.pageData).then((res) => { common_js_net_projectApi.ProApi.doGetMineRefundProList(_self.pageData).then((res) => {
common_vendor.index.stopPullDownRefresh();
var status = "success"; var status = "success";
status = res.rows && res.rows.length > 0 ? "success" : "empty"; status = res.rows && res.rows.length > 0 ? "success" : "empty";
_self.loadingState = isRefresh ? status : ""; _self.loadingState = isRefresh ? status : "";
@ -122,6 +132,7 @@ const _sfc_main = {
_self.isLoadMore = false; _self.isLoadMore = false;
_self.hasMore = _self.refundList.length < res.total ? "more" : "noMore"; _self.hasMore = _self.refundList.length < res.total ? "more" : "noMore";
}).catch((err) => { }).catch((err) => {
common_vendor.index.stopPullDownRefresh();
_self.loadingState = "error"; _self.loadingState = "error";
_self.listRefreshTrig = false; _self.listRefreshTrig = false;
_self.isLoadMore = false; _self.isLoadMore = false;
@ -170,7 +181,7 @@ const _sfc_main = {
const _self = this; const _self = this;
_self.$refs.reasonDialog.close(); _self.$refs.reasonDialog.close();
const item = e.currentTarget.dataset.item; const item = e.currentTarget.dataset.item;
common_vendor.index.__f__("log", "at pages/copyright/refund/refund.vue:296", item); common_vendor.index.__f__("log", "at pages/copyright/refund/refund.vue:307", item);
const fileName = item.value; const fileName = item.value;
const path = item.url; const path = item.url;
if (fileName.toLowerCase().endsWith(".pdf")) { if (fileName.toLowerCase().endsWith(".pdf")) {
@ -243,7 +254,7 @@ const _sfc_main = {
header.Auth = `Bearer ${token}`; header.Auth = `Bearer ${token}`;
} }
const downloadRes = await _self.doDownload(url, header); const downloadRes = await _self.doDownload(url, header);
common_vendor.index.__f__("log", "at pages/copyright/refund/refund.vue:374", "下载返回", downloadRes); common_vendor.index.__f__("log", "at pages/copyright/refund/refund.vue:385", "下载返回", downloadRes);
if (downloadRes && downloadRes.statusCode == 200) { if (downloadRes && downloadRes.statusCode == 200) {
_self.downloadProgress = 0; _self.downloadProgress = 0;
_self.downloading = false; _self.downloading = false;

View File

@ -88,6 +88,15 @@ const _sfc_main = {
}); });
this.doRefreshList(); this.doRefreshList();
}, },
onShow() {
if (this.needRefresh) {
this.needRefresh = false;
this.doRefreshList();
}
},
onPullDownRefresh() {
this.doRefreshList();
},
methods: { methods: {
repairStatusColor: common_js_conver.repairStatusColor, repairStatusColor: common_js_conver.repairStatusColor,
repairStatus: common_js_conver.repairStatus, repairStatus: common_js_conver.repairStatus,
@ -164,7 +173,7 @@ const _sfc_main = {
return value; return value;
}); });
this.reasonItem = item; this.reasonItem = item;
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:394", item); common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:403", item);
this.$refs.reasonDialog.open(); this.$refs.reasonDialog.open();
}, },
//预览补正凭证 //预览补正凭证
@ -172,7 +181,7 @@ const _sfc_main = {
const _self = this; const _self = this;
_self.$refs.reasonDialog.close(); _self.$refs.reasonDialog.close();
const item = e.currentTarget.dataset.item; const item = e.currentTarget.dataset.item;
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:402", item); common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:411", item);
const fileName = item.value; const fileName = item.value;
const path = item.url; const path = item.url;
if (fileName.toLowerCase().endsWith(".pdf")) { if (fileName.toLowerCase().endsWith(".pdf")) {
@ -185,23 +194,24 @@ const _sfc_main = {
} }
}, },
//下载文件 //下载文件
doDownload(url, header) { doDownload(url, header, filePath) {
const _self = this; const _self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const downloadTask = common_vendor.index.downloadFile({ const downloadTask = common_vendor.index.downloadFile({
url, url,
filePath,
header, header,
success: resolve, success: resolve,
fail: reject fail: reject
}); });
downloadTask.onProgressUpdate((res) => { downloadTask.onProgressUpdate((res) => {
_self.downloadProgress = res.progress; _self.downloadProgress = Number(res.progress);
}); });
}); });
}, },
//点击下载 //点击下载
//path :文件地址 //path :文件地址
async download(path) { async download(path, fileType) {
const _self = this; const _self = this;
_self.downloadProgress = 0; _self.downloadProgress = 0;
_self.downloading = true; _self.downloading = true;
@ -211,13 +221,15 @@ const _sfc_main = {
if (token) { if (token) {
header.Auth = `Bearer ${token}`; header.Auth = `Bearer ${token}`;
} }
const downloadRes = await _self.doDownload(url, header); const filePath = "bdfile://usr/" + this.tempDownloadPro.projId + "." + fileType;
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:445", "下载返回", downloadRes); const downloadRes = await _self.doDownload(url, header, filePath);
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:456", "下载返回", downloadRes);
if (downloadRes && downloadRes.statusCode == 200) { if (downloadRes && downloadRes.statusCode == 200) {
_self.downloadProgress = 0; _self.downloadProgress = 0;
_self.downloading = false; _self.downloading = false;
common_vendor.index.openDocument({ common_vendor.index.openDocument({
filePath: downloadRes.tempFilePath, filePath: downloadRes.filePath,
fileType,
showMenu: true, showMenu: true,
success: (res) => { success: (res) => {
}, },
@ -240,7 +252,7 @@ const _sfc_main = {
}, },
//刷新 //刷新
doRefreshList() { doRefreshList() {
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:474", "正在刷新..."); common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:486", "正在刷新...");
const _self = this; const _self = this;
_self.loadingState = "loading"; _self.loadingState = "loading";
_self.hasMore = "more"; _self.hasMore = "more";
@ -272,7 +284,8 @@ const _sfc_main = {
_self.repairList = isRefresh ? [] : _self.repairList; _self.repairList = isRefresh ? [] : _self.repairList;
_self.loadingState = isRefresh ? "loading" : ""; _self.loadingState = isRefresh ? "loading" : "";
common_js_net_projectApi.ProApi.doGetMineRepairList(_self.pageData).then((res) => { common_js_net_projectApi.ProApi.doGetMineRepairList(_self.pageData).then((res) => {
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:508", res); common_vendor.index.stopPullDownRefresh();
common_vendor.index.__f__("log", "at pages/copyright/repair/repair.vue:521", res);
var status = "success"; var status = "success";
status = res.rows && res.rows.length > 0 ? "success" : "empty"; status = res.rows && res.rows.length > 0 ? "success" : "empty";
_self.loadingState = isRefresh ? status : ""; _self.loadingState = isRefresh ? status : "";
@ -280,6 +293,7 @@ const _sfc_main = {
_self.isLoadMore = false; _self.isLoadMore = false;
_self.hasMore = _self.repairList.length < res.total ? "more" : "noMore"; _self.hasMore = _self.repairList.length < res.total ? "more" : "noMore";
}).catch((err) => { }).catch((err) => {
common_vendor.index.stopPullDownRefresh();
_self.loadingState = "error"; _self.loadingState = "error";
_self.isLoadMore = false; _self.isLoadMore = false;
_self.hasMore = "more"; _self.hasMore = "more";
@ -294,8 +308,9 @@ const _sfc_main = {
doDownloadDatum(e) { doDownloadDatum(e) {
const _self = this; const _self = this;
const path = e.currentTarget.dataset.path; const path = e.currentTarget.dataset.path;
const fileType = e.currentTarget.dataset.type;
const url = common_js_net_mainUrl.copyrightUrl + path + this.tempDownloadPro.projId; const url = common_js_net_mainUrl.copyrightUrl + path + this.tempDownloadPro.projId;
_self.download(url); _self.download(url, fileType);
}, },
//去申请补正 //去申请补正
applyRepair() { applyRepair() {

File diff suppressed because one or more lines are too long

View File

@ -65,6 +65,9 @@ const _sfc_main = {
}); });
this.doRefreshList(); this.doRefreshList();
}, },
onPullDownRefresh() {
this.doRefreshList();
},
methods: { methods: {
closeDialog() { closeDialog() {
this.companyName = ""; this.companyName = "";
@ -140,7 +143,7 @@ const _sfc_main = {
this.doRefreshList(); this.doRefreshList();
}, },
doRefreshList() { doRefreshList() {
common_vendor.index.__f__("log", "at pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue:250", "正在刷新..."); common_vendor.index.__f__("log", "at pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue:253", "正在刷新...");
const _self = this; const _self = this;
_self.loadingState = "loading"; _self.loadingState = "loading";
_self.hasMore = "more"; _self.hasMore = "more";
@ -165,7 +168,8 @@ const _sfc_main = {
_self.invoiceInfoList = isRefresh ? [] : _self.invoiceInfoList; _self.invoiceInfoList = isRefresh ? [] : _self.invoiceInfoList;
_self.loadingState = isRefresh ? "loading" : ""; _self.loadingState = isRefresh ? "loading" : "";
common_js_net_InvoiceApi.InvoiceApi.doGetMineInvoiceList(_self.pageData).then((res) => { common_js_net_InvoiceApi.InvoiceApi.doGetMineInvoiceList(_self.pageData).then((res) => {
common_vendor.index.__f__("log", "at pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue:277", res); common_vendor.index.stopPullDownRefresh();
common_vendor.index.__f__("log", "at pages/mine/mineAccount/invoiceInfo/invoiceInfo.vue:281", res);
var status = "success"; var status = "success";
status = res.rows && res.rows.length > 0 ? "success" : "empty"; status = res.rows && res.rows.length > 0 ? "success" : "empty";
_self.loadingState = isRefresh ? status : ""; _self.loadingState = isRefresh ? status : "";
@ -173,6 +177,7 @@ const _sfc_main = {
_self.isLoadMore = false; _self.isLoadMore = false;
_self.hasMore = _self.invoiceInfoList.length < res.total ? "more" : "noMore"; _self.hasMore = _self.invoiceInfoList.length < res.total ? "more" : "noMore";
}).catch((err) => { }).catch((err) => {
common_vendor.index.stopPullDownRefresh();
_self.loadingState = "error"; _self.loadingState = "error";
_self.isLoadMore = false; _self.isLoadMore = false;
_self.hasMore = "more"; _self.hasMore = "more";
@ -296,10 +301,6 @@ const _sfc_main = {
} }
return true; return true;
} }
},
onPullDownRefresh() {
this.doRefreshList();
common_vendor.index.stopPullDownRefresh();
} }
}; };
if (!Array) { if (!Array) {

View File

@ -21,7 +21,7 @@
.add-btn.data-v-d48a47ca { .add-btn.data-v-d48a47ca {
border-radius: 4px; border-radius: 4px;
background-color: #4EAF79; background-color: #4EAF79;
color: white; color: #FFFFFF;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
text-align: center; text-align: center;
@ -60,15 +60,15 @@
} }
.red.data-v-d48a47ca { .red.data-v-d48a47ca {
background-color: #F7312A6B; background-color: #F7312A6B;
color: white; color: #FFFFFF;
} }
.green.data-v-d48a47ca { .green.data-v-d48a47ca {
background-color: #78e2846b; background-color: #78e2846b;
color: white; color: #FFFFFF;
} }
.green.data-v-d48a47ca:active { .green.data-v-d48a47ca:active {
background-color: #39C7C1; background-color: #39C7C1;
color: white; color: #FFFFFF;
} }
.options-btn.data-v-d48a47ca:nth-of-type(n+2) { .options-btn.data-v-d48a47ca:nth-of-type(n+2) {
margin-left: 10rpx; margin-left: 10rpx;
@ -170,7 +170,7 @@
line-height: 20px; line-height: 20px;
border-radius: 4px; border-radius: 4px;
background-color: #4EAF79; background-color: #4EAF79;
color: white; color: #FFFFFF;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
font-family: PingFangSC-regular; font-family: PingFangSC-regular;
@ -180,7 +180,7 @@
line-height: 20px; line-height: 20px;
border-radius: 4px; border-radius: 4px;
background-color: #F7312A; background-color: #F7312A;
color: white; color: #FFFFFF;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
font-family: PingFangSC-regular; font-family: PingFangSC-regular;

View File

@ -43,6 +43,15 @@ const _sfc_main = {
}); });
this.doRefreshList(); this.doRefreshList();
}, },
onShow() {
if (this.needRefresh) {
this.needRefresh = false;
this.doRefreshList();
}
},
onPullDownRefresh() {
this.doRefreshList();
},
methods: { methods: {
invoiceStatus: common_js_conver.invoiceStatus, invoiceStatus: common_js_conver.invoiceStatus,
invoiceStatusColor: common_js_conver.invoiceStatusColor, invoiceStatusColor: common_js_conver.invoiceStatusColor,
@ -100,7 +109,7 @@ const _sfc_main = {
}); });
common_js_net_InvoiceApi.InvoiceApi.doCancelInvoiceRecord(item.invoiceRechargeId).then((res) => { common_js_net_InvoiceApi.InvoiceApi.doCancelInvoiceRecord(item.invoiceRechargeId).then((res) => {
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage.vue:171", res); common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage.vue:180", res);
_self.msgHint = "取消成功"; _self.msgHint = "取消成功";
_self.msgType = "success"; _self.msgType = "success";
_self.$refs.msg.open(); _self.$refs.msg.open();
@ -119,7 +128,7 @@ const _sfc_main = {
}); });
}, },
doRefreshList() { doRefreshList() {
common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage.vue:191", "正在刷新..."); common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage.vue:200", "正在刷新...");
const _self = this; const _self = this;
_self.loadingState = "loading"; _self.loadingState = "loading";
_self.hasMore = "more"; _self.hasMore = "more";
@ -142,7 +151,8 @@ const _sfc_main = {
_self.recordList = isRefresh ? [] : _self.recordList; _self.recordList = isRefresh ? [] : _self.recordList;
_self.loadingState = isRefresh ? "loading" : ""; _self.loadingState = isRefresh ? "loading" : "";
common_js_net_InvoiceApi.InvoiceApi.doGetInvoiceRecordList(_self.pageData).then((res) => { common_js_net_InvoiceApi.InvoiceApi.doGetInvoiceRecordList(_self.pageData).then((res) => {
common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage.vue:216", res); common_vendor.index.stopPullDownRefresh();
common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage.vue:226", res);
var status = "success"; var status = "success";
status = res.rows && res.rows.length > 0 ? "success" : "empty"; status = res.rows && res.rows.length > 0 ? "success" : "empty";
_self.loadingState = isRefresh ? status : ""; _self.loadingState = isRefresh ? status : "";
@ -150,15 +160,12 @@ const _sfc_main = {
_self.hasMore = _self.recordList.length < res.total ? "more" : "noMore"; _self.hasMore = _self.recordList.length < res.total ? "more" : "noMore";
_self.isLoadMore = false; _self.isLoadMore = false;
}).catch((err) => { }).catch((err) => {
common_vendor.index.stopPullDownRefresh();
_self.loadingState = "error"; _self.loadingState = "error";
_self.hasMore = "more"; _self.hasMore = "more";
_self.isLoadMore = false; _self.isLoadMore = false;
}); });
} }
},
onPullDownRefresh() {
this.doRefreshList();
common_vendor.index.stopPullDownRefresh();
} }
}; };
if (!Array) { if (!Array) {

View File

@ -78,7 +78,7 @@
font-size: 28rpx; font-size: 28rpx;
} }
.invoice-info-item-content.data-v-a34784c2 { .invoice-info-item-content.data-v-a34784c2 {
font-size: 24rpx; font-size: 28rpx;
padding-left: 20rpx; padding-left: 20rpx;
margin-left: 15rpx; margin-left: 15rpx;
flex: 1; flex: 1;

View File

@ -86,14 +86,20 @@ const _sfc_main = {
rows: 100 rows: 100
}; };
const _self = this; const _self = this;
const type = common_js_net_InvoiceApi.InvoiceApi.doGetDicListByPId("e0251d55-cd52-4f57-be92-b2bef8a6dd62"); const type = common_js_net_InvoiceApi.InvoiceApi.doGetDicListByPId(
const content = common_js_net_InvoiceApi.InvoiceApi.doGetDicListByPId("b67d5208-db1d-4d0e-99de-cc22d9d50041"); "e0251d55-cd52-4f57-be92-b2bef8a6dd62"
const rate = common_js_net_InvoiceApi.InvoiceApi.doGetDicListByPId("e4808c45-64ee-42fa-a413-a470fbdc0aea"); );
const content = common_js_net_InvoiceApi.InvoiceApi.doGetDicListByPId(
"b67d5208-db1d-4d0e-99de-cc22d9d50041"
);
const rate = common_js_net_InvoiceApi.InvoiceApi.doGetDicListByPId(
"e4808c45-64ee-42fa-a413-a470fbdc0aea"
);
const info = common_js_net_InvoiceApi.InvoiceApi.doGetMineInvoiceList(pageData); const info = common_js_net_InvoiceApi.InvoiceApi.doGetMineInvoiceList(pageData);
const list = [type, content, rate, info]; const list = [type, content, rate, info];
Promise.all(list).then((res) => { Promise.all(list).then((res) => {
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineMakeInvoice/mineMakeInvoice.vue:217", res[3]); common_vendor.index.__f__("log", "at pages/mine/mineAccount/mineMakeInvoice/mineMakeInvoice.vue:217", res);
_self.contentList = res[0]; _self.contentList = res[0];
_self.rateList = res[1]; _self.rateList = res[1];
_self.typeList = res[2]; _self.typeList = res[2];
@ -267,9 +273,7 @@ const _sfc_main = {
backPageRefresh() { backPageRefresh() {
let pages = getCurrentPages(); let pages = getCurrentPages();
let prevPage = pages[pages.length - 2]; let prevPage = pages[pages.length - 2];
if (prevPage && typeof prevPage.doRefreshList === "function") { prevPage.$vm.needRefresh = true;
prevPage.doRefreshList();
}
common_vendor.index.navigateBack(); common_vendor.index.navigateBack();
}, },
closeDialog(e) { closeDialog(e) {

View File

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const common_js_net_UserApi = require("../../../common/js/net/UserApi.js"); const common_js_net_UserApi = require("../../../common/js/net/UserApi.js");
const common_js_net_projectApi = require("../../../common/js/net/projectApi.js"); const common_js_net_projectApi = require("../../../common/js/net/projectApi.js");
const common_js_util = require("../../../common/js/util.js"); const common_js_util = require("../../../common/js/util.js");
const common_js_data = require("../../../common/js/data.js");
const common_assets = require("../../../common/assets.js"); const common_assets = require("../../../common/assets.js");
const _sfc_main = { const _sfc_main = {
data() { data() {
@ -17,43 +18,7 @@ const _sfc_main = {
animation: null, animation: null,
alertMsg: "", alertMsg: "",
//alertDialog提示内容 //alertDialog提示内容
menuList: [{ menuList: common_js_data.menuList,
icon: "ic-user",
title: "个人信息",
path: "/pages/mine/mineAccount/mineInfo/mineInfo"
}, {
icon: "ic-msg",
title: "消息通知",
path: "/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice"
}, {
icon: "ic-refund",
title: "退款项目",
path: "/pages/copyright/refund/refund"
}, {
icon: "ic-repair",
title: "补正项目",
path: "/pages/copyright/repair/repair"
}, {
icon: "ic-invoice-info",
title: "发票抬头",
path: "/pages/mine/mineAccount/invoiceInfo/invoiceInfo"
}, {
icon: "ic-pay-record",
title: "资金流水",
path: "/pages/mine/mineAccount/minePayRecord/minePayRecord"
}, {
icon: "ic-order",
title: "我的订单",
path: "/pages/mine/mineAccount/mineOrder/mineOrder"
}, {
icon: "ic-invoice",
title: "发票管理",
path: "/pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage"
}, {
icon: "ic-contact",
title: "产权联系人",
path: "/pages/mine/mineAccount/mineContact/mineContact"
}],
msgType: "info", msgType: "info",
msgTxt: "", msgTxt: "",
allPrice: 0, allPrice: 0,
@ -91,7 +56,7 @@ const _sfc_main = {
const deviceInfo = common_vendor.index.getSystemInfoSync(); const deviceInfo = common_vendor.index.getSystemInfoSync();
this.statusBarHeight = deviceInfo.statusBarHeight; this.statusBarHeight = deviceInfo.statusBarHeight;
this.totalHeight = deviceInfo.osName.toLowerCase() == "ios" ? 48 : 50; this.totalHeight = deviceInfo.osName.toLowerCase() == "ios" ? 48 : 50;
common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:165", "手机平台", deviceInfo.osName); common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:132", "手机平台", deviceInfo.osName);
}, },
//计算高度 //计算高度
calculateRemainingHeight() { calculateRemainingHeight() {
@ -99,7 +64,7 @@ const _sfc_main = {
const windowHeight = systemInfo.windowHeight; const windowHeight = systemInfo.windowHeight;
const screenWidth = systemInfo.screenWidth; const screenWidth = systemInfo.screenWidth;
const screenHeight = systemInfo.screenHeight; const screenHeight = systemInfo.screenHeight;
common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:175", windowHeight); common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:142", windowHeight);
const query = common_vendor.index.createSelectorQuery().in(this); const query = common_vendor.index.createSelectorQuery().in(this);
query.select("#func-box").boundingClientRect((data) => { query.select("#func-box").boundingClientRect((data) => {
if (data) { if (data) {
@ -109,7 +74,7 @@ const _sfc_main = {
let coverHeight = common_js_util.pxToRpx(this.contentHeight, screenWidth); let coverHeight = common_js_util.pxToRpx(this.contentHeight, screenWidth);
this.contentHeight = coverHeight; this.contentHeight = coverHeight;
} else { } else {
common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:194", "未获取到高度"); common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:161", "未获取到高度");
} }
}).exec(); }).exec();
}, },
@ -162,7 +127,7 @@ const _sfc_main = {
const _self = this; const _self = this;
common_js_net_projectApi.ProApi.doGetPrice().then((res) => { common_js_net_projectApi.ProApi.doGetPrice().then((res) => {
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:248", res); common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:215", res);
res.projTypes.forEach((el) => { res.projTypes.forEach((el) => {
if (el.type == "ALL") { if (el.type == "ALL") {
_self.allPrice = el.price; _self.allPrice = el.price;
@ -210,7 +175,7 @@ const _sfc_main = {
_self.allCount = res.ALL; _self.allCount = res.ALL;
_self.materialCount = res.MATERIAL; _self.materialCount = res.MATERIAL;
}).catch((err) => { }).catch((err) => {
common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:303", err); common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:270", err);
_self.allCount = 0; _self.allCount = 0;
_self.materialCount = 0; _self.materialCount = 0;
_self.msgType = "error"; _self.msgType = "error";
@ -232,7 +197,7 @@ const _sfc_main = {
}; };
common_js_net_projectApi.ProApi.doGetPackageList(data).then((res) => { common_js_net_projectApi.ProApi.doGetPackageList(data).then((res) => {
common_vendor.index.hideLoading(); common_vendor.index.hideLoading();
common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:326", res.rows); common_vendor.index.__f__("log", "at pages/mine/mineIndex/mineIndex.vue:293", res.rows);
if (res.rows && res.rows.length > 0) { if (res.rows && res.rows.length > 0) {
const packageId = res.rows[0].packageInfoId; const packageId = res.rows[0].packageInfoId;
const price = type == "ALL" ? _self.allPrice : _self.materialPrice; const price = type == "ALL" ? _self.allPrice : _self.materialPrice;

View File

@ -6,9 +6,14 @@
"ignore": [] "ignore": []
}, },
"enhance": true, "enhance": true,
"ignorePrefixCss": false "ignorePrefixCss": false,
"quickPreview": true
}, },
"selected": -3 "selected": -2,
"forceChanged": {
"quickPreview": true,
"originMode": "optiAmd"
}
}, },
"host": "baiduboxapp", "host": "baiduboxapp",
"projectname": "ts_aimz", "projectname": "ts_aimz",
@ -16,7 +21,10 @@
"autoAudits": false, "autoAudits": false,
"urlCheck": false "urlCheck": false
}, },
"preview": { "swan": {
"packageId": 1208021 "baiduboxapp": {
"swanJsVersion": "3.970.2",
"extensionJsVersion": "1.21.2"
}
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 415 B