Skip to content

G
gxpt_wechat
Commit f89eb868 by zhangzhen
Options

第6代完成更新节点

parent a461b406
Showing with 72 additions and 70 deletions
api/recharge.js
...@@ -35,6 +35,6 @@ export const balanceLog=(data)=>{ ...@@ -35,6 +35,6 @@ export const balanceLog=(data)=>{
} }
export const equityFundLog=(data)=>{ export const equityFundLog=(data)=>{
let url=`/equityFundLog/listUid` let url=`/equityFundLog/list`
return http.get(url,data) return http.get(url,data)
} }
config/index.config.js
...@@ -2,12 +2,12 @@ const CONFIG = { ...@@ -2,12 +2,12 @@ const CONFIG = {
// 开发环境配置 // 开发环境配置
development: { development: {
assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径 assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径 // assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径
assetsPath: 'http://10.24.5.63:8211/static', // 静态资源路径 // assetsPath: 'http://10.24.5.63:8211/static', // 静态资源路径
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址 baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址 // baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
// hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址) // hostUrl: 'http://coujiao.pseer.com:8888/prod-api', // H5地址(前端运行地址)
hostUrl: 'https://coujiao.pseer.com/prod-api', // H5地址(前端运行地址) hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址 websocketUrl: '', // websocket服务端地址
weixinAppId: '' ,// 微信公众号appid weixinAppId: '' ,// 微信公众号appid
codeHeadUrl:"", codeHeadUrl:"",
...@@ -15,12 +15,12 @@ const CONFIG = { ...@@ -15,12 +15,12 @@ const CONFIG = {
}, },
// 生产环境配置 // 生产环境配置
production: { production: {
assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径 // assetsPath: 'http://coujiao.pseer.com:8888/wechat_static', // 静态资源路径
// assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径 assetsPath: 'https://www.coujio.com/wechat_static', // 静态资源路径
baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址 // baseUrl: 'https://coujiao.pseer.com/front-api', // 后台接口请求地址
// baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址 baseUrl: 'https://www.coujio.com/front-api', // 后台接口请求地址
hostUrl: 'https://coujiao.pseer.com/prod-api', // H5地址(前端运行地址) // hostUrl: 'https://coujiao.pseer.com/prod-api', // H5地址(前端运行地址)
// hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址) hostUrl: 'https://www.coujio.com/prod-api', // H5地址(前端运行地址)
websocketUrl: '', // websocket服务端地址 websocketUrl: '', // websocket服务端地址
weixinAppId: '', // 微信公众号appid weixinAppId: '', // 微信公众号appid
codeHeadUrl:"", codeHeadUrl:"",
......
pages/my/myInfo.vue
...@@ -47,21 +47,21 @@ ...@@ -47,21 +47,21 @@
<text class="text-gray">修改资料</text> <text class="text-gray">修改资料</text>
</view> </view>
<view v-if="loginStatus" class="nav-right nav-right-2" @tap.stop="onNavToShare"> <!-- <view v-if="loginStatus" class="nav-right nav-right-2" @tap.stop="onNavToShare">
<text class="text-gray">邀请有礼</text> <text class="text-gray">邀请有礼</text>
</view> </view> -->
</view> </view>
<view class="remeber-info-box"> <view class="remeber-info-box">
<view class="relative flex-7" @tap="onNavByPath('levelDetail')" > <view class="relative flex-7" @tap="onNavByPath('levelDetail')" >
<image v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="level-bg" :src="assetsPath+'/user/tj_bg_1.png'" mode="scaleToFill"></image> <!-- <image v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="level-bg" :src="assetsPath+'/user/tj_bg_1.png'" mode="scaleToFill"></image> -->
<image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===2" class="level-bg" :src="assetsPath+'/user/tongj_bg_1.png'" mode="scaleToFill"></image> <image v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="level-bg" :src="assetsPath+'/user/tongj_bg_1.png'" mode="scaleToFill"></image>
<image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===3" class="level-bg" :src="assetsPath+'/user/yj_bg_1.png'" mode="scaleToFill"></image> <image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===2" class="level-bg" :src="assetsPath+'/user/yj_bg_1.png'" mode="scaleToFill"></image>
<image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===4" class="level-bg" :src="assetsPath+'/user/jj_bg_1.png'" mode="scaleToFill"></image> <image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===3" class="level-bg" :src="assetsPath+'/user/jj_bg_1.png'" mode="scaleToFill"></image>
<view v-else class="level-bg level-bg-0"></view> <view v-else class="level-bg level-bg-0"></view>
<view class="absolute level-content"> <view class="absolute level-content">
<view class="part-left"> <view class="part-left">
<view v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===4" class="level level-4"> <view v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===3" class="level level-4">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text> <text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<!-- <text class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - userInfo.consumerMember.remainingIntegral}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text> --> <!-- <text class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - userInfo.consumerMember.remainingIntegral}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text> -->
<view class="flex-row"> <view class="flex-row">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<text class="text-4">{{userInfo.consumerMember? parseInt(userInfo.consumerMember.membershipProgress):0}}</text> <text class="text-4">{{userInfo.consumerMember? parseInt(userInfo.consumerMember.membershipProgress):0}}</text>
</view> </view>
</view> </view>
<view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===3" class="level level-3"> <view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===2" class="level level-3">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text> <text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<text class="text-2">还差{{userInfo.memberConfig.nextDifference || 0}}积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text> <text class="text-2">还差{{userInfo.memberConfig.nextDifference || 0}}积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row"> <view class="flex-row">
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</view> </view>
</view> </view>
<view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===2" class="level level-2"> <view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="level level-2">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text> <text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<text class="text-2">还差 {{userInfo.memberConfig.nextDifference || 0}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text> <text class="text-2">还差 {{userInfo.memberConfig.nextDifference || 0}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row"> <view class="flex-row">
...@@ -87,14 +87,14 @@ ...@@ -87,14 +87,14 @@
</view> </view>
</view> </view>
<view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="level level-1"> <!-- <view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="level level-1">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text> <text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<text class="text-2">还差 {{userInfo.memberConfig.nextDifference || 0}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text> <text class="text-2">还差 {{userInfo.memberConfig.nextDifference || 0}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row"> <view class="flex-row">
<text class="text-3">当前积分</text> <text class="text-3">当前积分</text>
<text class="text-4">{{userInfo.consumerMember.membershipProgress || 0}}</text> <text class="text-4">{{userInfo.consumerMember.membershipProgress || 0}}</text>
</view> </view>
</view> </view> -->
<view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel === 0" class="level level-0"> <view v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel === 0" class="level level-0">
<text class="text-1">LV 0</text> <text class="text-1">LV 0</text>
<!-- <text class="text-2">您还没有会员等级！</text> --> <!-- <text class="text-2">您还没有会员等级！</text> -->
...@@ -111,10 +111,10 @@ ...@@ -111,10 +111,10 @@
</view> </view>
<view class="part-right"> <view class="part-right">
<image v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===4" class="tag-icon" :src="assetsPath+'/user/tag_icon_4.png'" mode="widthFix"></image> <image v-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===3" class="tag-icon" :src="assetsPath+'/user/tag_icon_4.png'" mode="widthFix"></image>
<image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===3" class="tag-icon" :src="assetsPath+'/user/tag_icon_3.png'" mode="widthFix"></image> <image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===2" class="tag-icon" :src="assetsPath+'/user/tag_icon_3.png'" mode="widthFix"></image>
<image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===2" class="tag-icon" :src="assetsPath+'/user/tag_icon_2.png'" mode="widthFix"></image> <image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="tag-icon" :src="assetsPath+'/user/tag_icon_2.png'" mode="widthFix"></image>
<image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="tag-icon" :src="assetsPath+'/user/tag_icon_1.png'" mode="widthFix"></image> <!-- <image v-else-if="userInfo.memberConfig && userInfo.memberConfig.membershipLevel ===1" class="tag-icon" :src="assetsPath+'/user/tag_icon_1.png'" mode="widthFix"></image> -->
<image v-else class="tag-icon" :src="assetsPath+'/user/tag_icon_0.png'" mode="widthFix"></image> <image v-else class="tag-icon" :src="assetsPath+'/user/tag_icon_0.png'" mode="widthFix"></image>
</view> </view>
</view> </view>
...@@ -235,14 +235,15 @@ ...@@ -235,14 +235,15 @@
<text class="text-gray">购买记录</text> <text class="text-gray">购买记录</text>
</view> </view>
</view> </view>
<view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="item-box" @tap="onNavByPath('equityFundLog')">
<!-- <view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="item-box" @tap="onNavByPath('equityFundLog')">
<view class="icon-img"> <view class="icon-img">
<image :src="assetsPath+'/user/tool_4.png'" mode="scaleToFill"></image> <image :src="assetsPath+'/user/tool_4.png'" mode="scaleToFill"></image>
</view> </view>
<view class="text-box"> <view class="text-box">
<text class="text-gray">收益明细</text> <text class="text-gray">收益明细</text>
</view> </view>
</view> </view> -->
<view class="item-box" @tap="onNavByPath('payRecord')"> <view class="item-box" @tap="onNavByPath('payRecord')">
...@@ -293,14 +294,14 @@ ...@@ -293,14 +294,14 @@
<text class="text-gray">联系我们</text> <text class="text-gray">联系我们</text>
</view> </view>
</view> </view>
<view v-if="loginStatus" class="item-box" @tap="onShareByQrcode"> <!-- <view v-if="loginStatus" class="item-box" @tap="onShareByQrcode">
<view class="icon-img"> <view class="icon-img">
<image :src="assetsPath+'/user/tool_7.png'" mode="scaleToFill"></image> <image :src="assetsPath+'/user/tool_7.png'" mode="scaleToFill"></image>
</view> </view>
<view class="text-box"> <view class="text-box">
<text class="text-gray">二维码分享</text> <text class="text-gray">二维码分享</text>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
......
pages/vipCreate/vipCreate.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<view class="part part-right" @tap="onTabChange(2)"> <view class="part part-right" @tap="onTabChange(2)">
<image v-if="tabIndex ==2" :src="assetsPath+'/vip/btn_1_a.png'" class="active" <image v-if="tabIndex ==2" :src="assetsPath+'/vip/btn_1_a.png'" class="active"
mode="widthFix"></image> mode="widthFix"></image>
<image v-else :src="assetsPath+'/vip/btn_1.png'" class="unactive" mode="widthFix"> <image v-else :src="assetsPath+'/vip/btn_1_v1.png'" class="unactive" mode="widthFix">
</image> </image>
</view> </view>
</view> </view>
...@@ -520,12 +520,12 @@ ...@@ -520,12 +520,12 @@
this.onGetRechargeConf(); this.onGetRechargeConf();
this.onLoading(); this.onLoading();
}, },
onShareAppMessage() { // onShareAppMessage() {
return { // return {
title: "邀新注册并购买得返利", // title: "邀新注册并购买得返利",
path: `/pages/vipCreate/vipCreate?uid=${this.userInfo.id}` // path: `/pages/vipCreate/vipCreate?uid=${this.userInfo.id}`
} // }
}, // },
methods: { methods: {
onConfirmPay() { onConfirmPay() {
if (this.tabIndex == 1) { if (this.tabIndex == 1) {
...@@ -616,6 +616,7 @@ ...@@ -616,6 +616,7 @@
}) })
}, },
onTabChange(val) { onTabChange(val) {
return
if (this.tabIndex == val) return; if (this.tabIndex == val) return;
this.tabIndex = val; this.tabIndex = val;
this.checked = false; this.checked = false;
......
setting/equityFundLog/index.vue
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 100, pageSize: 100,
uid: uni.getStorageSync("userInfo").id id: uni.getStorageSync("userInfo").id
}, },
orderStatusEnum: {}, orderStatusEnum: {},
payTypeEnum: { payTypeEnum: {
......
setting/levelDetail/index.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<view class="remeber-info-box"> <view class="remeber-info-box">
<view v-for="(item,k) in list" :key="k" class="relative flex-7"> <view v-for="(item,k) in list" :key="k" class="relative flex-7">
<image v-if="item.membershipLevel" class="level-bg" :src="levelPath[item.membershipLevel]" mode="scaleToFill"></image> <image v-if="item.membershipLevel" class="level-bg" :src="levelPath[item.membershipLevel+1]" mode="scaleToFill"></image>
<view v-else class="level-bg level-bg-0"></view> <view v-else class="level-bg level-bg-0"></view>
<view class="absolute level-content"> <view class="absolute level-content">
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</view> </view>
</view> </view>
<view class="part-right"> <view class="part-right">
<image v-if="item.membershipLevel ===4" class="tag-icon" :src="assetsPath+'/user/tag_icon_4.png'" mode="widthFix"></image> <image v-if="item.membershipLevel ===3" class="tag-icon" :src="assetsPath+'/user/tag_icon_4.png'" mode="widthFix"></image>
<image v-else-if="item.membershipLevel ===3" class="tag-icon" :src="assetsPath+'/user/tag_icon_3.png'" mode="widthFix"></image> <image v-else-if="item.membershipLevel ===2" class="tag-icon" :src="assetsPath+'/user/tag_icon_3.png'" mode="widthFix"></image>
<image v-else-if="item.membershipLevel ===2" class="tag-icon" :src="assetsPath+'/user/tag_icon_2.png'" mode="widthFix"></image> <image v-else-if="item.membershipLevel ===1" class="tag-icon" :src="assetsPath+'/user/tag_icon_2.png'" mode="widthFix"></image>
<image v-else-if="item.membershipLevel ===1" class="tag-icon" :src="assetsPath+'/user/tag_icon_1.png'" mode="widthFix"></image> <!-- <image v-else-if="item.membershipLevel ===1" class="tag-icon" :src="assetsPath+'/user/tag_icon_1.png'" mode="widthFix"></image> -->
<image v-else class="tag-icon" :src="assetsPath+'/user/tag_icon_0.png'" mode="widthFix"></image> <image v-else class="tag-icon" :src="assetsPath+'/user/tag_icon_0.png'" mode="widthFix"></image>
</view> </view>
</view> </view>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
} }
} }
} }
.level-4{ .level-3{
.text-1{ .text-1{
color: #9D680D; color: #9D680D;
} }
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
} }
} }
} }
.level-3{ .level-2{
.text-1{ .text-1{
color: #898E9D; color: #898E9D;
} }
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
} }
} }
} }
.level-2{ .level-1{
.text-1{ .text-1{
color: #FEEDE3; color: #FEEDE3;
} }
...@@ -349,29 +349,29 @@ ...@@ -349,29 +349,29 @@
} }
} }
} }
.level-1{ // .level-1{
.text-1{ // .text-1{
background: linear-gradient(47deg, #E9EEEE 0%, #FBFFFC 100%); // background: linear-gradient(47deg, #E9EEEE 0%, #FBFFFC 100%);
-webkit-background-clip: text; // -webkit-background-clip: text;
-webkit-text-fill-color: transparent; // -webkit-text-fill-color: transparent;
} // }
.text-2{ // .text-2{
color: #F1F6F4; // color: #F1F6F4;
} // }
.flex-row{ // .flex-row{
display: flex; // display: flex;
flex-direction: row; // flex-direction: row;
align-items: center; // align-items: center;
background: #F5E0ED; // background: #F5E0ED;
border: 1px solid #F46DB9; // border: 1px solid #F46DB9;
.text-3{ // .text-3{
color: #E40583; // color: #E40583;
} // }
.text-4{ // .text-4{
color: #C72380; // color: #C72380;
} // }
} // }
} // }
.level-0{ .level-0{
.text-1{ .text-1{
color: #969696; color: #969696;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment