TmOct5/BlockChainH5
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

merge

Browse Source
This commit is contained in:
唐明明
2021-09-30 12:17:51 +08:00
parent 3b1edf89fa 1adf3d7912
commit 6d169876d5
11 changed files with 149 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apis/index.js
View File

@@ -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
}

12
apis/interfaces/setting.js
View File

@@ -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
}

4
components/goods-list/goods-list.vue
View File

@@ -27,7 +27,7 @@
</block>
<block v-else>
<view class="goods--null">
<view>{{toast}}</view>
<no-list name='no-goods' :txt="toast" />
</view>
</block>
</view>
@@ -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;

12
components/no-list-components/index.vue
View File

@@ -1,14 +1,16 @@
<template>
<view class="NOList">
<view class="no-addr">
<image :src="`${webUrl}/storage/imageresource/no-image/${name}.png`" mode="widthFix" />
<image :src="`${webUrl}/no-list/${name}.png`" mode="widthFix" />
{{txt}}
</view>
</view>
</template>
<script>
import {config} from '@/apis/index.js'
import {
config
} from '@/apis/index.js'
export default {
name: "NOList",
/**
@@ -39,13 +41,11 @@
name: String,
txt: String
},
data() {
return {
webUrl:''
webUrl: config.apiUrls
};
},
mounted() {
this.webUrl = config.apiUrls
}
}
</script>

2
pages/company/approve.vue
View File

@@ -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;

6
pages/coupons/add.vue
View File

@@ -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 : '提示',

17
pages/coupons/management.vue
View File

@@ -17,7 +17,7 @@
</view>
<block v-if="coupons.length > 0">
<view class="coupons">
<view class="coupons-flex" v-for="(item, index) in coupons" :key="index" @click="$Router.push({name: 'magDetails', params: {couponId: item.coupon_id}})">
<view class="coupons-flex" v-for="(item, index) in coupons" :key="index" @click="$Router.push({name: 'couponsDetails', params: {couponId: item.coupon_id}})">
<view class="item cover">
<view v-if="item.type.value === 2">
<view class="cover-price">{{item.price || 0}}<text>元</text></view>
@@ -45,7 +45,7 @@
</block>
<block v-else>
<view class="list-null">
<view class="sub-title">暂无相关优惠券</view>
<no-list name='no-counpon' txt="没有任何相关优惠券~" />
</view>
</block>
<view class="basisc-btn">
@@ -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{

3
pages/coupons/selectGoods.vue
View File

@@ -1,5 +1,6 @@
<template>
<view>
<block>
<!-- 商品列表 -->
<view class="lists">
<view class="goods-item" v-for="(item, index) in goods" :key="index">
@@ -30,6 +31,8 @@
</view>
<view class="ios-bottom"></view>
</view>
</block>
<no-list v-if="goods.length === 0" name='no-goods' txt="没有任何可选商品~" />
</view>
</template>

12
pages/setting/setting.vue
View File

@@ -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) {
// 跳转到企业认证页面
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({

5
pages/wallet/extract.vue
View File

@@ -34,7 +34,7 @@
</view>
<view class="total" v-if="total">≈ ￥{{total.toFixed(2)}} </view>
<view class="btn" @click="actions">提现至银行卡</view>
<view class="des">预计5- 10个工作日到账 手续费: {{tax}}%</view>
<view class="des">预计5- 10个工作日到账 手续费: {{tax === '0'?'免手续费':tax+'%'}}</view>
</view>
</template>
@@ -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: '我再想想',

16
pages/wallet/withdrawList.vue
View File

@@ -11,9 +11,7 @@
</view>
<view class="record-mouth-year">
<view class="record-type-right">
<view class="record-title">当前能量球</view>
<view class="record-money">{{account || '0.00'}} </view>
</view>
<view class="record-title">当前能量球
<view class="record-type-left">
<u-picker mode="time" v-model="show" :params="params" @confirm='confirm' title='筛选日期'
start-year='2021' :end-year='currentYear' />
@@ -23,6 +21,10 @@
</view>
</view>
</view>
<view class="record-money">{{account || '0.00'}} </view>
</view>
</view>
<!-- <view class="record-title">碎片个数</view>
<view class="record-money"><span>￥</span>{{account || '0.00'}}</view> -->
</view>
@@ -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 {
color: #999;
font-size: 26rpx;
margin-left: 20rpx;
}
span:nth-child(2) {
color: #C0C0C0;
font-weight: normal;