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 @@
-
-
-
- {{txt}}
-
-
+
+
+
+ {{txt}}
+
+
diff --git a/pages.json b/pages.json
index 0fad0e7..a8ff17f 100644
--- a/pages.json
+++ b/pages.json
@@ -19,7 +19,7 @@
"name": "User",
"aliasPath": "/user",
"auth": true,
- "style": {
+ "style": {
"navigationBarTitleText": "节点中心"
}
}, {
@@ -336,6 +336,14 @@
"path" : "pages/wxAuth/wxAuth",
"name" : "wxAuth",
"aliasPath": "/wechat-auth"
+ },{
+ "path" : "pages/clearOpen/clearOpen",
+ "style" : {
+ "navigationBarTitleText": "提现记录",
+ "enablePullDownRefresh": false
+ },
+ "name": "clearOpen",
+ "aliasPath": "/inside/clear-open"
}
],
"globalStyle": {
diff --git a/pages/clearOpen/clearOpen.vue b/pages/clearOpen/clearOpen.vue
new file mode 100644
index 0000000..07c034a
--- /dev/null
+++ b/pages/clearOpen/clearOpen.vue
@@ -0,0 +1,42 @@
+
+
+ {{text}}
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
- {{item.title}}
- {{item.description}}
-
- ¥{{item.price}}
- 权证剩余{{item.stock}}
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.description}}
+
+ ¥{{item.price}}
+ 权证剩余{{item.stock}}
+
+
-
-
-
-
diff --git a/pages/found/index.vue b/pages/found/index.vue
index 8c72e49..98e5e68 100644
--- a/pages/found/index.vue
+++ b/pages/found/index.vue
@@ -39,7 +39,7 @@
-
+
签到领取能量碎片
@@ -139,21 +139,17 @@
// 签到
signClick() {
- uni.vibrateShort({
- success: () => {
- operateSign().then(res => {
- this.sign.signSuccess = res.task_crystals
- // 获取水晶签到信息
- this.sign.signShow = true
- this.signInfo();
- }).catch(err => {
- uni.showToast({
- icon: 'none',
- title: err
- })
- })
- }
- })
+ operateSign().then(res => {
+ this.sign.signSuccess = res.task_crystals
+ // 获取水晶签到信息
+ this.sign.signShow = true
+ this.signInfo();
+ }).catch(err => {
+ uni.showToast({
+ icon: 'none',
+ title: err
+ })
+ })
},
// 能量跳转
@@ -323,9 +319,7 @@
box-sizing: border-box;
width: 100%;
text-align: center;
- margin-top: -50rpx;
- position: relative;
- z-index: 2;
+ margin-top: -50rpx;
.signBtn-go {
width: 100%;
height: 100rpx;
diff --git a/pages/goods/addClassify.vue b/pages/goods/addClassify.vue
index 251f9ac..ca32aa8 100644
--- a/pages/goods/addClassify.vue
+++ b/pages/goods/addClassify.vue
@@ -26,9 +26,13 @@
},
created() {
managesCategory().then(res => {
- console.log(res)
this.loding = false
this.category = res
+ }).catch(err => {
+ uni.showToast({
+ title: err.message,
+ icon : 'none'
+ })
})
},
methods:{
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/user/code.vue b/pages/user/code.vue
index 979fcc7..2bbc213 100644
--- a/pages/user/code.vue
+++ b/pages/user/code.vue
@@ -4,6 +4,7 @@
+
@@ -314,6 +315,12 @@
height: 100%;
width: 100%;
padding: 0 $padding/2;
+ .code-lay{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: 10;
+ }
.code-back-image{
width: 100%;
height: 100%;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a277679..0c4da1f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,432 +1,460 @@
-
-
-
-
-
- 扫描上方微信二维码,添加您的专属VIP客服
-
-
-
-
-
-
-
-
-
- {{newList[newPopIndex].title}}
-
-
-
-
-
- 下一条
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{userData.nickname}}
-
-
-
- 邀请码:{{userData.invite}}
-
- 复制
-
-
-
-
-
-
-
- 开通{{userIdentity.right.name}}。
-
-
- 去开通
-
-
- 终身有效
-
-
-
-
-
-
-
-
-
- 查看会员专属权益
- 全部更多
-
-
-
-
-
- {{item.name}}
-
-
-
-
- 敬请期待
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
- 当前能量球价值¥{{userData.account.stone_value || 0}}
-
-
- 去提现
-
-
-
-
- 我的资产
-
-
-
- 能量球钱包
- {{userData.account.stone || 0}}
-
-
- 能量碎片
- {{userData.account.score || 0}}
-
-
-
-
-
-
-
-
- 我的伙伴
-
-
-
- 伙伴总数
- {{userData.relation_count.all || 0}}
-
-
- 直接伙伴
- {{userData.relation_count.one || 0}}
-
-
- 间接伙伴
- {{userData.relation_count.two || 0}}
-
-
-
-
-
-
-
- 企业工具
-
-
-
-
- 商品权证
-
-
-
- 优惠券管理
-
-
-
- 营销推广码
-
-
-
- 基础信息
-
-
-
- 部门门店
-
-
-
- 员工管理
-
-
-
-
-
-
-
-
- 我的服务
-
-
-
-
- 专属客服
-
-
-
- 邀请好友
-
-
-
- 帮助中心
-
-
-
- 服务条款
-
-
-
-
+
+
+
+
+
+ 扫描上方微信二维码,添加您的专属VIP客服
+
+
+
+
+
+
+
+
+
+ {{newList[newPopIndex].title}}
+
+
+
+
+
+ 下一条
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+ 当前能量球价值¥{{userData.account.stone_value || 0}}
+
+
+ 去提现
+
+
+
+
+ 我的资产
+
+
+
+ 能量球钱包
+ {{userData.account.stone || 0}}
+
+
+ 能量碎片
+ {{userData.account.score || 0}}
+
+
+
+
+
+
+
+ 我的伙伴
+
+
+
+ 伙伴总数
+ {{userData.relation_count.all || 0}}
+
+
+ 直接伙伴
+ {{userData.relation_count.one || 0}}
+
+
+ 间接伙伴
+ {{userData.relation_count.two || 0}}
+
+
+
+
+
+
+ 企业工具
+
+
+
+
+ 商品权证
+
+
+
+ 优惠券管理
+
+
+
+ 营销推广码
+
+
+
+ 基础信息
+
+
+
+ 部门门店
+
+
+
+ 员工管理
+
+
+
+
+
+
+
+ 我的服务
+
+
+
+
+ 专属客服
+
+
+
+ 邀请好友
+
+
+
+ 帮助中心
+
+
+
+ 服务条款
+
+
+
+
+
diff --git a/pages/user/new_file.vue b/pages/user/new_file.vue
new file mode 100644
index 0000000..2665353
--- /dev/null
+++ b/pages/user/new_file.vue
@@ -0,0 +1,1100 @@
+
+
+
+
+
+
+
+ 扫描上方微信二维码,添加您的专属VIP客服
+
+
+
+
+
+
+
+
+
+ {{newList[newPopIndex].title}}
+
+
+
+
+
+ 下一条
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{userData.nickname}}
+
+
+
+ 邀请码:{{userData.invite}}
+
+ 复制
+
+
+
+
+
+
+
+ 开通{{userIdentity.right.name}}。
+
+
+ 去开通
+
+
+ 终身有效
+
+
+
+
+
+
+
+
+
+ 查看会员专属权益
+ 全部更多
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ 敬请期待
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ 当前能量球价值¥{{userData.account.stone_value || 0}}
+
+
+ 去提现
+
+
+
+
+ 我的资产
+
+
+
+ 能量球钱包
+ {{userData.account.stone || 0}}
+
+
+ 能量碎片
+ {{userData.account.score || 0}}
+
+
+
+
+
+
+
+
+ 我的伙伴
+
+
+
+ 伙伴总数
+ {{userData.relation_count.all || 0}}
+
+
+ 直接伙伴
+ {{userData.relation_count.one || 0}}
+
+
+ 间接伙伴
+ {{userData.relation_count.two || 0}}
+
+
+
+
+
+
+
+ 企业工具
+
+
+
+
+ 商品权证
+
+
+
+ 优惠券管理
+
+
+
+ 营销推广码
+
+
+
+ 基础信息
+
+
+
+ 部门门店
+
+
+
+ 员工管理
+
+
+
+
+
+
+
+
+ 我的服务
+
+
+
+
+ 专属客服
+
+
+
+ 邀请好友
+
+
+
+ 帮助中心
+
+
+
+ 服务条款
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/partner.vue b/pages/user/partner.vue
index 73d7e5d..996fca5 100644
--- a/pages/user/partner.vue
+++ b/pages/user/partner.vue
@@ -6,23 +6,30 @@
直接
间接
-
-
-
-
-
-
-
- {{item.nickname}}
-
-
-
-
- {{item.username}}
-
-
-
-
+
+
+
+
+
+
+
+ {{item.nickname}}
+
+
+
+
+ {{item.username}}
+
+
+
+
+
+
+
+
+ 暂未数据
+
+
@@ -66,6 +73,34 @@
.content{
padding-top: 90rpx;
}
+
+ // 空提示
+ .list-null{
+ width: 100vw;
+ height: 100vh;
+ padding-bottom: 20vh;
+ box-sizing: border-box;
+ background: white;
+ text-align: center;
+ @extend .vertical;
+ .sub-title{
+ color: $text-gray;
+ font-size: $title-size-m;
+ }
+ .icon{
+ width: 288rpx;
+ }
+ .sub-btn{
+ width: 200rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ text-align: center;
+ background: $mian-color;
+ color: white;
+ display: inline-block;
+ margin-top: $margin*2;
+ }
+ }
// tabs
.tabs{
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 34838d1..8edd33c 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -231,17 +231,20 @@ export default {
},
// 微信支付
- wechatPay(id, wx) {
+ wechatPay(id, wx) {
vipWechatPay(id, {
openid: this.$store.getters.getCode
}).then(payConfig => {
wx.chooseWXPay({...payConfig,
- success: ()=> {
- uni.showToast({
- title: '支付成功',
- icon: "success"
- })
- this.idenInfo();
+ success() {
+ uni.showModal({
+ title : '提示',
+ content : '支付成功,恭喜您成功开通',
+ cancelColor: '#8b64fd',
+ success() {
+ this.$Router.back()
+ }
+ })
},
fail(err) {
uni.showToast({
@@ -250,7 +253,12 @@ export default {
})
}
});
- });
+ }).catch(err => {
+ uni.showToast({
+ title: err.message,
+ icon : 'none'
+ })
+ })
},
// 勾选协议
diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue
index a550daa..80240fc 100644
--- a/pages/wallet/extract.vue
+++ b/pages/wallet/extract.vue
@@ -26,14 +26,15 @@
提现数量
+ placeholder-style="color:#999;font-weight:normal; font-size:34rpx;"
+ placeholder="请输入提现数量" :disabled="balance===0" />
全部提现
≈ ¥{{total.toFixed(2)}}
提现至银行卡
- 预计5- 10个工作日到账 手续费: {{tax}}%
+ 预计5- 10个工作日到账 手续费: {{tax === '0'?'免手续费':tax+'%'}}
@@ -73,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({
@@ -84,16 +86,30 @@
// 输入提现能量球数量
inputNum(e) {
let number = Number(e.detail.value)
- if (number <= this.balance) {
+ console.log(number, this.balance)
+ if (number <= Number(this.balance)) {
this.total = Number(e.detail.value) * this.cost
} else {
- uni.showToast({
- title: '最大值能超过' + this.balance + '',
- icon: 'none',
- duration: 2000
- });
- this.withdraw_input = ''
this.total = 0
+ if (Number(this.balance) === 0) {
+ uni.showToast({
+ title: '当前不能提现',
+ icon: 'none',
+ duration: 2000
+ });
+ this.withdraw_input = 0
+ this.total = 0
+ } else {
+ uni.showToast({
+ title: '最大值能超过' + this.balance + '',
+ icon: 'none',
+ duration: 2000
+ });
+ this.withdraw_input = this.balance
+ this.total = this.balance * this.cost
+ }
+
+
}
},
@@ -108,6 +124,7 @@
icon: 'none',
duration: 2000
})
+ this.withdraw_input = 0
}
},
// 提现
@@ -132,7 +149,7 @@
}
uni.showModal({
title: '温馨提示',
- content: '您是否确认提现,将会扣除' + this.tax + '%手续费',
+ content:this.tax === '0'?'您是否确认提现,交易将免手续费':'您是否确认提现,将会扣除' + this.tax + '%手续费',
confirmColor: '#7c52fc',
cancelColor: '#cacaca',
cancelText: '我再想想',
@@ -321,10 +338,12 @@
color: #666;
margin-right: 20rpx;
}
- .inputTxt{
+
+ .inputTxt {
color: #999;
padding-bottom: 20rpx;
}
+
.input_num {
font-size: 60rpx;
color: #3a3a3a;
diff --git a/pages/wallet/fragment.vue b/pages/wallet/fragment.vue
index 7179401..ee1db06 100644
--- a/pages/wallet/fragment.vue
+++ b/pages/wallet/fragment.vue
@@ -45,7 +45,7 @@
- {{item.remark}}
+ {{item.remark}} {{item.frozen.text}}
{{item.amount}}
{{item.created_at}}
@@ -222,7 +222,11 @@
justify-content: space-between;
box-sizing: border-box;
width: 600rpx;
-
+ .tags{
+ padding-left: 20rpx;
+ color: #ff5500;
+ font-size: 24rpx;
+ }
.title {
font-size: 28rpx;
width: 600rpx;
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;
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 5b7b9ff..a32eb3a 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
链商星球
\ No newline at end of file
+ document.write('')