diff --git a/apis/index.js b/apis/index.js index 5949a9c..d893939 100644 --- a/apis/index.js +++ b/apis/index.js @@ -9,8 +9,8 @@ import store from '@/store' // 基础配置 const config = { - apiUrl : 'https://oapi.lianshang.vip/api/', - apiUrls : 'https://oapi.lianshang.vip/', + apiUrl : 'https://oapi.lianshang.vip/api/', // 正式环境 + apiUrls : 'https://storage.lianshang.vip/', // 图片路径(测试/正式) timeout : 60000 } diff --git a/apis/interfaces/setting.js b/apis/interfaces/setting.js index f903b7c..2e00959 100644 --- a/apis/interfaces/setting.js +++ b/apis/interfaces/setting.js @@ -78,6 +78,15 @@ const companyStatus = () => { }) } +// 是否允许企业能开通 +const companyIsallow = () => { + return request({ + url: 'companies/applies/isallow', + method:'POST' + }) +} + + export { login, @@ -88,5 +97,6 @@ export { resetUserInfo, getUserSettingInfo, aboutUs, - companyStatus + companyStatus, + companyIsallow } diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index 8bbf401..6b794f4 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -27,7 +27,7 @@ - {{toast}} + @@ -129,7 +129,7 @@ export default { // 数据空 .goods--null{ width: 100%; - padding: 20vh 0; + padding: 200rpx 0; text-align: center; font-size: $title-size-m; color: $text-gray; diff --git a/components/no-list-components/index.vue b/components/no-list-components/index.vue index 85d597f..ce6f5e2 100644 --- a/components/no-list-components/index.vue +++ b/components/no-list-components/index.vue @@ -1,72 +1,72 @@ diff --git a/pages/company/approve.vue b/pages/company/approve.vue index 8f3b19b..e0a840d 100644 --- a/pages/company/approve.vue +++ b/pages/company/approve.vue @@ -304,7 +304,7 @@ .btns{ padding-top: $padding * 2; button{ - background: $mian-color-deep; + background: $mian-color; border-radius: 0; height: 90rpx; line-height: 90rpx; diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue index 8d9b540..cff7fa0 100644 --- a/pages/coupons/add.vue +++ b/pages/coupons/add.vue @@ -125,8 +125,8 @@ ], timeIndex : 0, times : [ - { type: 2, text: '固定时间(区间范围)' }, - { type: 1, text: '延期券(用户领取后有效天数)' } + { type: 1, text: '固定时间(区间范围)' }, + { type: 2, text: '延期券(用户领取后有效天数)' } ], showDatePicker : false, // 活动弹出层时间 datePickerValue : [], // 活动时间 @@ -211,7 +211,7 @@ days : this.timeNumber, goodsable_ids : this.coupongoods } - + console.log(valuss) pushCoupons(valuss).then(res => { uni.showModal({ title : '提示', diff --git a/pages/coupons/management.vue b/pages/coupons/management.vue index 4d52c42..63ad199 100644 --- a/pages/coupons/management.vue +++ b/pages/coupons/management.vue @@ -17,7 +17,7 @@ - + {{item.price || 0}} @@ -45,7 +45,7 @@ - 暂无相关优惠券 + @@ -177,17 +177,8 @@ // 空提示 .list-null{ width: 100vw; - height: 100vh; - box-sizing: border-box; - text-align: center; - @extend .vertical; - .sub-title{ - color: $text-gray; - font-size: $title-size-m; - } - .icon{ - width: 288rpx; - } + // height: 100vh; + padding-top: 200rpx; } // 订单管理 .coupons{ diff --git a/pages/coupons/selectGoods.vue b/pages/coupons/selectGoods.vue index e2614d9..1f313d9 100644 --- a/pages/coupons/selectGoods.vue +++ b/pages/coupons/selectGoods.vue @@ -1,35 +1,38 @@ diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index c86e235..2651e58 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -89,7 +89,8 @@ wechatbind, resetUserInfo, getUserSettingInfo, - companyStatus + companyStatus, + companyIsallow } from '@/apis/interfaces/setting' import { uploads @@ -141,9 +142,18 @@ company(code) { if (code === -1) { // 跳转到企业认证页面 - this.$Router.push({ - name:'companyApprove' + companyIsallow().then(res=>{ + this.$Router.push({ + name:'companyApprove' + }) + }).catch(err=>{ + this.$refs.uToast.show({ + title: err.message, + type: 'primary', + duration: 3000 + }) }) + } else if (code === 2) { // 跳转到企业认证页面 this.$Router.push({ diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue index f6594b2..80240fc 100644 --- a/pages/wallet/extract.vue +++ b/pages/wallet/extract.vue @@ -34,7 +34,7 @@ ≈ ¥{{total.toFixed(2)}} 提现至银行卡 - 预计5- 10个工作日到账 手续费: {{tax}}% + 预计5- 10个工作日到账 手续费: {{tax === '0'?'免手续费':tax+'%'}} @@ -74,6 +74,7 @@ this.cost = res.cost this.bank_accounts = res.bank_accounts.length this.withdraw_input = Number(res.balance) + this.total = Number(res.balance) * Number(res.cost) uni.setStorageSync('refresh', false) }).catch(err => { uni.showToast({ @@ -148,7 +149,7 @@ } uni.showModal({ title: '温馨提示', - content: '您是否确认提现,将会扣除' + this.tax + '%手续费', + content:this.tax === '0'?'您是否确认提现,交易将免手续费':'您是否确认提现,将会扣除' + this.tax + '%手续费', confirmColor: '#7c52fc', cancelColor: '#cacaca', cancelText: '我再想想', diff --git a/pages/wallet/withdrawList.vue b/pages/wallet/withdrawList.vue index 2cb5c4a..34cecaa 100644 --- a/pages/wallet/withdrawList.vue +++ b/pages/wallet/withdrawList.vue @@ -11,17 +11,19 @@ - 当前能量球 + 当前能量球 + + + + {{date?date:'选择日期'}} + + + + {{account || '0.00'}} - - - - {{date?date:'选择日期'}} - - - + @@ -337,6 +339,12 @@ font-size: 28rpx; color: #fff; padding: 0 0 20rpx 0; + display: flex; + flex-direction: row; + align-items: center; + width: 100%; + justify-content: space-between; + box-sizing: border-box; } .record-money { @@ -381,11 +389,13 @@ font-size: 30rpx; padding-top: 10rpx; color: $text-price; - .left-des{ + + .left-des { color: #999; font-size: 26rpx; margin-left: 20rpx; } + span:nth-child(2) { color: #C0C0C0; font-weight: normal;