diff --git a/apis/trade.js b/apis/trade.js index 5ed1afb..afb5e10 100644 --- a/apis/trade.js +++ b/apis/trade.js @@ -19,9 +19,9 @@ export function gettradingHallList(data) { }, { hideLoading: true } ) -} -// 我的报价 -export function getMyreplyList(data) { +} +// 我的报价 +export function getMyReplyList(data) { return http.get( { url: '/base-paper-trading/get/my-reply-list', @@ -29,24 +29,24 @@ export function getMyreplyList(data) { }, { hideLoading: true } ) -} -// 提交报价 -export function updataEnquiryReply(data) { +} +// 提交报价 +export function updateEnquiryReply(data) { return http.post({ - url: '/base-paper-trading/update/enquiry-reply?userId='+data.userId, + url: '/base-paper-trading/update/enquiry-reply?userId=' + data.userId, data }) -} -// 获取报价详情 +} +// 获取报价详情 export function enquiryReplyDetail(data) { return http.get( { - url: '/base-paper-trading/get/enquiry-reply-detail/'+data, + url: '/base-paper-trading/get/enquiry-reply-detail/' + data }, { hideLoading: true } ) -} -// 消息列表 +} +// 消息列表 export function systemMessageList(data) { return http.get( { @@ -55,19 +55,11 @@ export function systemMessageList(data) { }, { hideLoading: true } ) -} -// 系统消息已读 +} +// 系统消息已读 export function systemRead(data) { return http.post({ url: '/base-paper-trading/set/message-read', data }) -} - - - - - - - - +} diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue index 2b389c3..0bd63f1 100644 --- a/components/bussiness-components/packingStationItem.vue +++ b/components/bussiness-components/packingStationItem.vue @@ -134,7 +134,7 @@ export default { .info { width: 750rpx; padding: 30rpx 32rpx 48rpx; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); display: flex; flex-direction: row; align-items: flex-start; diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 8eb31c0..7e56836 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -1,296 +1,306 @@ + diff --git a/pages/add-record/index.vue b/pages/add-record/index.vue index 36a30ef..e5d0f9b 100644 --- a/pages/add-record/index.vue +++ b/pages/add-record/index.vue @@ -1,290 +1,287 @@ + diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index 0203ac0..1e46fa5 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -191,7 +191,7 @@ export default { align-items: center; height: 88rpx; background: #ffffff; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .left-title { font-size: 30rpx; @@ -213,7 +213,7 @@ export default { align-items: center; height: 148rpx; background: #ffffff; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .image { width: 100rpx; diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 4ea7829..8c0266b 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -251,7 +251,7 @@ export default { }, methods: { gotoTap() { - go2('follow-up-records') + go2('follow-up-records', { customerEnterpriseId: this.info.id }) }, getBaseInfo() { getBaseInfo({ customerId: this.customerId }).then((res) => { @@ -296,7 +296,7 @@ export default { justify-content: space-between; height: 88rpx; line-height: 88rpx; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .left-text { @@ -395,7 +395,7 @@ export default { height: 80rpx; line-height: 80rpx; background: #ffffff; - border-top: 2rpx solid #dddddd; + border-top: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; .icon { @@ -423,7 +423,7 @@ export default { height: 80rpx; line-height: 80rpx; background: #ffffff; - border-top: 2rpx solid #dddddd; + border-top: 2rpx solid rgba(221, 221, 221, 0.5); padding: 0rpx 32rpx; font-size: 28rpx; color: #007aff; diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index ee95823..4971dd0 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -125,15 +125,15 @@ export default { emptyText: '暂无设备信息~', background: '#F7F8FA', disabled: false, - emptyImage: '/static/imgs/order/order-empty.png' + emptyImage: '/static/imgs/order/order-empty.png' }, seemoreFlag: 0, params: { asc: '', desc: '', duration: '3', - customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效、 - // customerEnterpriseId: '651107734133018624', + customerEnterpriseId: this.$store.state.supplierInfo.id || null // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效、 + // customerEnterpriseId: '651107734133018624', }, pagination: { pageNum: 0, // 初始会执行一次下拉加载 @@ -180,10 +180,10 @@ export default { .then((res) => { // console.log('设备信息', res.records) if (res) { - res.records.forEach((el) => { - el.collapse = false - el.isShowSelect = false - }) + res.records.forEach((el) => { + el.collapse = false + el.isShowSelect = false + }) if (this.pagination.pageNum == 1) { this.list = res.records } else { @@ -309,8 +309,8 @@ export default { } } .content { - border-bottom: 2rpx solid #dddddd; - border-top: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); + border-top: 2rpx solid rgba(221, 221, 221, 0.5); .info { display: flex; flex-direction: row; diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue index 698b29d..d8afb64 100644 --- a/pages/client-detail/index.vue +++ b/pages/client-detail/index.vue @@ -215,7 +215,7 @@ export default { align-items: center; height: 96rpx; background: #ffffff; - border-top: 2rpx solid #dddddd; + border-top: 2rpx solid rgba(221, 221, 221, 0.5); .cancel-text { flex-grow: 1; flex-shrink: 1; diff --git a/pages/client-detail/lv-select.vue b/pages/client-detail/lv-select.vue index 5f5bbf0..86b288d 100644 --- a/pages/client-detail/lv-select.vue +++ b/pages/client-detail/lv-select.vue @@ -186,7 +186,7 @@ box-sizing: border-box; } .unishadow{ - box-shadow: 0rpx 1rpx 5rpx #DDDDDD; + box-shadow: 0rpx 1rpx 5rpx rgba(221,221,221,0.5); } .uni-search-form{ position: relative; @@ -247,7 +247,7 @@ width: 75%; // 下拉框宽度 background-color: #FFFFFF; border-radius: 6px; - box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px; + box-shadow: rgba(221,221,221,0.5) 4px 4px 8px, rgba(221,221,221,0.5) -4px -4px 8px; z-index: 999; } .uni-combox__selector-scroll { @@ -282,7 +282,7 @@ color: #808080; } .uni-combox__selector-item:hover { - background-color: #DDDDDD; + background-color: rgba(221,221,221,0.5); } .uni-combox__selector-empty:last-child, .uni-combox__selector-item:last-child { diff --git a/pages/contract-manage/index.vue b/pages/contract-manage/index.vue index cbd2cef..1e4115f 100644 --- a/pages/contract-manage/index.vue +++ b/pages/contract-manage/index.vue @@ -251,7 +251,7 @@ export default { .footer { width: 750rpx; padding: 24rpx 32rpx; - border-top: 1px solid #dddddd; + border-top: 1px solid rgba(221, 221, 221, 0.5); } } diff --git a/pages/credit-order-list/index.vue b/pages/credit-order-list/index.vue index 2f6cd5d..da05d78 100644 --- a/pages/credit-order-list/index.vue +++ b/pages/credit-order-list/index.vue @@ -34,7 +34,7 @@ class="order-item flex-row-center-start" v-for="(order, index) in item.orderItmes" :key="order.productId" - :style="{ borderTop: index == 0 ? '' : '1px solid #dddddd' }" + :style="{ borderTop: index == 0 ? '' : '1px solid rgba(221,221,221,0.5)' }" > @@ -184,12 +184,12 @@ export default { margin-bottom: 20rpx; .header { padding: 24rpx 32rpx; - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid rgba(221, 221, 221, 0.5); } .content { padding: 0 32rpx; width: 750rpx; - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid rgba(221, 221, 221, 0.5); .order-item { width: 686rpx; padding: 24rpx 0; diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue index 5946918..acea003 100644 --- a/pages/follow-up-records/index.vue +++ b/pages/follow-up-records/index.vue @@ -77,7 +77,7 @@ export default { params: { asc: '', desc: '', - customerEnterpriseId: [this.$store.state.supplierInfo.id], + customerEnterpriseId: null, mallSupplierId: this.$store.state.supplierInfo.supplierId || null // enterpriseIds : ['651107734133018624'], // mallSupplierId : '670334117090562048', @@ -99,8 +99,12 @@ export default { }) }, onShow() { - console.log('onShow') - this.getList() + this.downCallback() + }, + onLoad(option) { + if (option.customerEnterpriseId) { + this.params.customerEnterpriseId = option.customerEnterpriseId + } }, methods: { back, @@ -213,7 +217,7 @@ export default { justify-content: center; padding-top: 20rpx; background: #ffffff; - // border-top: 2rpx solid #dddddd; + // border-top: 2rpx solid rgba(221,221,221,0.5); // padding: 0rpx 32rpx; font-size: 28rpx; color: #007aff; diff --git a/pages/mall/index.vue b/pages/mall/index.vue index afc3aa8..a145863 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -117,7 +117,7 @@ export default { pageSize: 10, storeId: null, name: null, - supplierId: this.$store.state.supplierInfo.supplierId + supplierId: this.$store.state.supplierInfo.supplierId, }, listData: [], logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif', @@ -342,7 +342,7 @@ export default { } .content { background: #ffffff; - border-bottom: 2rpx solid #dddddd; + border-bottom: 2rpx solid rgba(221, 221, 221, 0.5); display: flex; flex-direction: row; padding: 24rpx 0rpx 24rpx 32rpx; diff --git a/pages/message/platform-message.vue b/pages/message/platform-message.vue index 03f234e..9e1b78d 100644 --- a/pages/message/platform-message.vue +++ b/pages/message/platform-message.vue @@ -1,113 +1,111 @@ diff --git a/pages/message/system-message.vue b/pages/message/system-message.vue index 673b363..ae813be 100644 --- a/pages/message/system-message.vue +++ b/pages/message/system-message.vue @@ -1,116 +1,144 @@ + diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue index b63c5bf..4fd7930 100644 --- a/pages/quotation-details/index.vue +++ b/pages/quotation-details/index.vue @@ -1,79 +1,79 @@ + diff --git a/pages/setting/index.vue b/pages/setting/index.vue index e8eea2d..b48308b 100644 --- a/pages/setting/index.vue +++ b/pages/setting/index.vue @@ -17,11 +17,18 @@ + + + + 退出登录 + + +