Merge branch 'develop' into dongjian
This commit is contained in:
@@ -52,7 +52,7 @@ export default {
|
||||
{ text: '合同编号', value: '' },
|
||||
{ text: '发起方', value: '信任桥（深圳）网络科技有限公司' },
|
||||
{ text: '发起时间', value: '' },
|
||||
{ text: '完成结束时间', value: '' },
|
||||
{ text: '完成时间', value: '' },
|
||||
],
|
||||
bottomList: [
|
||||
{ text: '签约人', value: '信任桥会员 章三' },
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
<view class="bottom-shop-view">
|
||||
<text class="text-28 text-zu text-overflow1">{{obj.title}}</text>
|
||||
<text class="text-28" style="color:#FF4242">
|
||||
￥{{obj.adPrice}}
|
||||
￥{{obj.price}}
|
||||
<text class="text-24 text-fu text-d" style="margin-left:12rpx">
|
||||
￥{{obj.price}}
|
||||
￥{{obj.adPrice}}
|
||||
</text>
|
||||
</text>
|
||||
</view>
|
||||
|
||||
@@ -85,33 +85,45 @@ export default {
|
||||
myChart:null,
|
||||
myChartTwo:null,
|
||||
data: [
|
||||
{ value: '51', name: '股东' },
|
||||
{ value: '29', name: '推广' },
|
||||
{ value: '10', name: '团队' },
|
||||
{ value: '51', name: '用户股东' },
|
||||
{ value: '10', name: '推广奖励' },
|
||||
{ value: '10', name: '运营团队' },
|
||||
{ value: '10', name: '活动激励' },
|
||||
{ value: '9', name: '投资机构' },
|
||||
{ value: '10', name: '基金会' },
|
||||
|
||||
],
|
||||
dataSeries:{
|
||||
series:[
|
||||
{
|
||||
"name": "股东",
|
||||
"name": "用户股东",
|
||||
"data": 51,
|
||||
"color":"#FC5E05"
|
||||
},
|
||||
{
|
||||
"name": "推广",
|
||||
"data": 29,
|
||||
"name": "推广奖励",
|
||||
"data": 10,
|
||||
"color":"#BC52FD"
|
||||
},
|
||||
{
|
||||
"name": "团队",
|
||||
"name": "运营团队",
|
||||
"data": 10,
|
||||
"color":"#FCC139"
|
||||
},
|
||||
{
|
||||
"name": "基金会",
|
||||
"name": "投资机构",
|
||||
"data": 10,
|
||||
"color":"#0474E0"
|
||||
},
|
||||
{
|
||||
"name": "活动激励",
|
||||
"data": 9,
|
||||
"color":"#1890ff"
|
||||
},
|
||||
{
|
||||
"name": "基金会",
|
||||
"data": 10,
|
||||
"color":"#91cb74"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -164,17 +176,17 @@ export default {
|
||||
}
|
||||
]
|
||||
},
|
||||
dataColor:['#FC5E05', '#BC52FD', '#FCC139', '#0474E0'],
|
||||
dataColor:['#FC5E05', '#BC52FD', '#FCC139', '#0474E0','#1890ff','#91cb74'],
|
||||
dataTwo:[
|
||||
{ value: '25', name: '成本' },
|
||||
{ value: '15', name: '分红' },
|
||||
{ value: '15', name: '消费贡献共享计划' },
|
||||
{ value: '13', name: '销售增值税' },
|
||||
{ value: '12', name: '市场激励' },
|
||||
{ value: '10.5', name: '次年发展资金' },
|
||||
{ value: '10', name: 'RWA市值管理' },
|
||||
{ value: '5', name: '股标护盘' },
|
||||
{ value: '5', name: '交易激励' },
|
||||
{ value: '4.5', name: '年终分红' },
|
||||
{ value: '4.5', name: '年终共享' },
|
||||
],
|
||||
dataTwoColor:['#FF8400','#6136FF', '#19CEB3', '#F1B900', '#AE9BF5'
|
||||
,'#94F7A1','#006EFF','#FF2440','#00A776'],
|
||||
|
||||
@@ -101,7 +101,11 @@ export default {
|
||||
this.getQuichens()
|
||||
},
|
||||
getQuichens() {
|
||||
quickens().then(res => {
|
||||
let params ={
|
||||
page:1,
|
||||
pageSize:1000
|
||||
}
|
||||
quickens(params).then(res => {
|
||||
if (res.bizcode == 100) {
|
||||
// this.type = res.data;
|
||||
this.tList[0].text = res.data.vcoinsLock;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<view style="margin-top: 20rpx;" @click="leftJump">
|
||||
<up-image src="/static/common/left_b.png" width="18" height="20" bgColor="#f1f6ff00" />
|
||||
</view>
|
||||
<view class="title_">RWA交易</view>
|
||||
<view class="title_">数字积分兑换</view>
|
||||
<view></view>
|
||||
</view>
|
||||
<view class="amount_">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="rwa_withdrawal">
|
||||
<Header leftTitle="行权" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" rightTitle="记录"
|
||||
<Header leftTitle="共享计划终止" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" rightTitle="记录"
|
||||
rightPath="/pages/rwa_package/rwa_withdrawal_log/rwa_withdrawal_log?back=withdrawal" rightPathType="navigateTo" />
|
||||
<view class="rwa_withdrawal_content">
|
||||
<view class="_content">
|
||||
@@ -24,7 +24,7 @@
|
||||
</view>
|
||||
<view class="_content_item">
|
||||
<view class="_content_item_title">交易密码<text class="_content_item_setting_pwd"
|
||||
@click="jumpSettingPwd">《股权交割同意书》</text></view>
|
||||
@click="jumpSettingPwd">《共享计划终止协议》</text></view>
|
||||
<up-input placeholder="请输入交易密码" border="surround" v-model="form.password" :customStyle="inputCss"></up-input>
|
||||
</view>
|
||||
<view class="_content_item">
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<TopSafe></TopSafe>
|
||||
<Header title="积分兑换专区" >
|
||||
<Header title="兑换券专区" >
|
||||
<!-- #ifndef MP-WEIXIN -->
|
||||
<template v-slot:right>
|
||||
<u-icon name="share-fill" @click="onShare" color="#333" size="24"></u-icon>
|
||||
@@ -17,7 +17,7 @@
|
||||
</view>
|
||||
<view class="mid-panel">
|
||||
<up-image src="/static/common/jingxuan_left.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
|
||||
<view style="margin:0 12rpx">信任桥积分</view>
|
||||
<view style="margin:0 12rpx">信任桥兑换</view>
|
||||
<up-image src="/static/common/jingxuan_right.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
|
||||
</view>
|
||||
<view class="setting-view">
|
||||
|
||||
@@ -19,9 +19,8 @@
|
||||
import Header from '@/components/common/header.vue';
|
||||
import TopSafe from '@/components/common/top-safe.nvue'
|
||||
import MyBtn from '@/components/common/my-btn.vue'
|
||||
import YouItem from '@/components/shop/fen-item.vue'
|
||||
import YouItem from '@/components/shop/you-item.vue'
|
||||
import { searchList } from '@/api/product.js';
|
||||
import func from '@/utils/func.js';
|
||||
|
||||
export default {
|
||||
components: { Header, TopSafe,MyBtn,YouItem },
|
||||
|
||||
Reference in New Issue
Block a user