Skip to content

C
CFFP-HB
Commit e11b0bde by sunerhu
Options

1.修改团队页面不刷新问题。 

2.修改0元直接跳转付款成功页面
3.修改课程列表样式。
4.修改了一些Bug
parent d6515bc0
Showing with 1232 additions and 111 deletions
components/courseItem/courseItem.vue
...@@ -103,10 +103,11 @@ ...@@ -103,10 +103,11 @@
<style lang="scss"> <style lang="scss">
.itemContent { .itemContent {
display: flex; display: flex;
height: auto; height: 100%;
.thumbnailBox { .thumbnailBox {
width: 300rpx; width: 300rpx;
margin-right: 26rpx; margin-right: 26rpx;
align-items: center;
image { image {
max-width: 100%; max-width: 100%;
...@@ -117,12 +118,16 @@ ...@@ -117,12 +118,16 @@
.courseDetailBox { .courseDetailBox {
width: 100%; width: 100%;
color: #333; color: #333;
height: auto;
display: flex;
flex-direction: column;
justify-content: space-between;
.title { .title {
display: flex; display: flex;
max-width: 260rpx; max-width: 260rpx;
justify-content: space-between; // justify-content: space-between;
align-items: center; // align-items: center;
font-size: 32rpx; font-size: 32rpx;
.detailBtn { .detailBtn {
...@@ -137,7 +142,7 @@ ...@@ -137,7 +142,7 @@
.summaryBox { .summaryBox {
font-size: 24rpx; font-size: 24rpx;
margin: 10rpx 0; // margin: 10rpx 0;
text { text {
margin-right: 20rpx; margin-right: 20rpx;
...@@ -148,7 +153,7 @@ ...@@ -148,7 +153,7 @@
strong { strong {
color: #F15A1F; color: #F15A1F;
font-size: 30rpx; font-size: 30rpx;
margin: 10rpx 20rpx 10rpx 0; // margin: 10rpx 20rpx 10rpx 0;
} }
text { text {
...@@ -159,7 +164,7 @@ ...@@ -159,7 +164,7 @@
.tagListBox { .tagListBox {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 20rpx; // margin-top: 20rpx;
.tagItem { .tagItem {
color: #20279B; color: #20279B;
......
components/echarts/echarts-el.vue 0 → 100644
<template>
<view>
<view class="echarts" :prop="option" :change:prop="echarts.delay"></view>
</view>
</template>
<script>
export default {
name: 'EchartsEl',
props: {
option: {
type: Object,
required: true
}
}
}
</script>
<script module="echarts" lang="renderjs">
export default {
data() {
return {
timeoutId: null,
chart: null
}
},
mounted() {
if (typeof window.echarts === 'object') {
this.init()
} else {
// 动态引入类库
const script = document.createElement('script')
script.src = './static/echarts.min.js'
script.onload = this.init
document.head.appendChild(script)
}
},
methods: {
/**
* 初始化echarts
*/
init() {
// 根据id初始化图表
this.chart = echarts.init(this.$el)
this.update(this.option)
},
/**
* 防抖函数，500毫秒内只运行最后一次的方法
* @param {Object} option
*/
delay(option) {
if (this.timeoutId) {
clearTimeout(this.timeoutId)
this.timeoutId = null
}
this.timeoutId = setTimeout(() => {
this.update(option)
}, 500)
},
/**
* 监测数据更新
* @param {Object} option
*/
update(option) {
if (this.chart) {
// 因App端，回调函数无法从renderjs外传递，故在此自定义设置相关回调函数
if (option) {
// tooltip
if (option.tooltip) {
// 判断是否设置tooltip的位置
if (option.tooltip.positionStatus) {
option.tooltip.position = this.tooltipPosition()
}
// 判断是否格式化tooltip
if (option.tooltip.formatterStatus) {
option.tooltip.formatter = this.tooltipFormatter(option.tooltip.formatterUnit, option.tooltip.formatFloat2, option.tooltip.formatThousands)
}
}
// 颜色渐变
if (option.series) {
for (let i in option.series) {
let linearGradient = option.series[i].linearGradient
if (linearGradient) {
option.series[i].color = new echarts.graphic.LinearGradient(linearGradient[0],linearGradient[1],linearGradient[2],linearGradient[3],linearGradient[4])
}
}
}
}
// 设置新的option
this.chart.setOption(option, option.notMerge)
}
},
/**
* 设置tooltip的位置，防止超出画布
*/
tooltipPosition() {
return (point, params, dom, rect, size) => {
// 其中point为当前鼠标的位置，size中有两个属性：viewSize和contentSize，分别为外层div和tooltip提示框的大小
let x = point[0]
let y = point[1]
let viewWidth = size.viewSize[0]
let viewHeight = size.viewSize[1]
let boxWidth = size.contentSize[0]
let boxHeight = size.contentSize[1]
let posX = 0 // x坐标位置
let posY = 0 // y坐标位置
if (x >= boxWidth) { // 左边放的下
posX = x - boxWidth - 1
}
if (y >= boxHeight) { // 上边放的下
posY = y - boxHeight - 1
}
return [posX, posY]
}
},
/**
* tooltip格式化
* @param {Object} unit 数值后的单位
* @param {Object} formatFloat2 是否保留两位小数
* @param {Object} formatThousands 是否添加千分位
*/
tooltipFormatter(unit, formatFloat2, formatThousands) {
return params => {
let result = ''
unit = unit ? unit : ''
for (let i in params) {
if (i == 0) {
result += params[i].axisValueLabel
}
let value = '--'
if (params[i].data !== null) {
value = params[i].data
// 保留两位小数
if (formatFloat2) {
value = this.formatFloat2(value)
}
// 添加千分位
if (formatThousands) {
value = this.formatThousands(value)
}
}
// #ifdef H5
result += '\n' + params[i].seriesName + '：' + value + ' ' + unit
// #endif
// #ifdef APP-PLUS
result += '<br/>' + params[i].marker + params[i].seriesName + '：' + value + ' ' + unit
// #endif
}
return result
}
},
/**
* 保留两位小数
* @param {Object} value
*/
formatFloat2(value) {
let temp = Math.round(parseFloat(value) * 100) / 100
let xsd = temp.toString().split('.')
if (xsd.length === 1) {
temp = (isNaN(temp) ? '0' : temp.toString()) + '.00'
return temp
}
if (xsd.length > 1) {
if (xsd[1].length < 2) {
temp = temp.toString() + '0'
}
return temp
}
},
/**
* 添加千分位
* @param {Object} value
*/
formatThousands(value) {
if (value === undefined || value === null) {
value = ''
}
if (!isNaN(value)) {
value = value + ''
}
let re = /\d{1,3}(?=(\d{3})+$)/g
let n1 = value.replace(/^(\d+)((\.\d+)?)$/, function(s, s1, s2) {
return s1.replace(re, '$&,') + s2
})
return n1
}
}
}
</script>
<style lang="scss" scoped>
.echarts {
width: 100%;
height: 100%;
}
</style>
\ No newline at end of file
components/echarts/echarts.vue 0 → 100644
<template>
<view>
<view class="echarts" :id="option.id" :prop="option" :change:prop="echarts.update" @click="echarts.onClick"></view>
</view>
</template>
<script>
export default {
name: 'Echarts',
props: {
option: {
type: Object,
required: true
}
},
created() {
// 设置随机数id
let t = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
let len = t.length
let id = ''
for (let i = 0; i < 32; i++) {
id += t.charAt(Math.floor(Math.random() * len))
}
this.option.id = id
},
methods: {
/**
* renderjs内的点击事件，回调到父组件
* @param {Object} params
*/
onViewClick(params) {
this.$emit('click', params)
}
}
}
</script>
<script module="echarts" lang="renderjs">
export default {
data() {
return {
chart: null,
clickData: null // echarts点击事件的值
}
},
mounted() {
if (typeof window.echarts === 'object') {
this.init()
} else {
// 动态引入类库
const script = document.createElement('script')
script.src = '../../static/echarts.min.js'
script.onload = this.init
document.head.appendChild(script)
}
},
methods: {
/**
* 初始化echarts
*/
init() {
// 根据id初始化图表
this.chart = echarts.init(document.getElementById(this.option.id))
this.update(this.option)
// echarts的点击事件
this.chart.on('click', params => {
// 把点击事件的数据缓存下来
this.clickData = params
})
},
/**
* 点击事件，可传递到外部
* @param {Object} event
* @param {Object} instance
*/
onClick(event, instance) {
if (this.clickData) {
// 把echarts点击事件相关的值传递到renderjs外
instance.callMethod('onViewClick', {
value: this.clickData.data,
name: this.clickData.name,
seriesName: this.clickData.seriesName
})
// 上次点击数据置空
this.clickData = null
}
},
/**
* 监测数据更新
* @param {Object} option
*/
update(option) {
if (this.chart) {
// 因App端，回调函数无法从renderjs外传递，故在此自定义设置相关回调函数
if (option) {
// tooltip
if (option.tooltip) {
// 判断是否设置tooltip的位置
if (option.tooltip.positionStatus) {
option.tooltip.position = this.tooltipPosition()
}
// 判断是否格式化tooltip
if (option.tooltip.formatterStatus) {
option.tooltip.formatter = this.tooltipFormatter(option.tooltip.formatterUnit, option.tooltip.formatFloat2, option.tooltip.formatThousands)
}
}
// 颜色渐变
if (option.series) {
for (let i in option.series) {
let linearGradient = option.series[i].linearGradient
if (linearGradient) {
option.series[i].color = new echarts.graphic.LinearGradient(linearGradient[0],linearGradient[1],linearGradient[2],linearGradient[3],linearGradient[4])
}
}
}
}
// 设置新的option
this.chart.setOption(option, option.notMerge)
}
},
/**
* 设置tooltip的位置，防止超出画布
*/
tooltipPosition() {
return (point, params, dom, rect, size) => {
// 其中point为当前鼠标的位置，size中有两个属性：viewSize和contentSize，分别为外层div和tooltip提示框的大小
let x = point[0]
let y = point[1]
let viewWidth = size.viewSize[0]
let viewHeight = size.viewSize[1]
let boxWidth = size.contentSize[0]
let boxHeight = size.contentSize[1]
let posX = 0 // x坐标位置
let posY = 0 // y坐标位置
if (x >= boxWidth) { // 左边放的下
posX = x - boxWidth - 1
}
if (y >= boxHeight) { // 上边放的下
posY = y - boxHeight - 1
}
return [posX, posY]
}
},
/**
* tooltip格式化
* @param {Object} unit 数值后的单位
* @param {Object} formatFloat2 是否保留两位小数
* @param {Object} formatThousands 是否添加千分位
*/
tooltipFormatter(unit, formatFloat2, formatThousands) {
return params => {
let result = ''
unit = unit ? unit : ''
for (let i in params) {
if (i == 0) {
result += params[i].axisValueLabel
}
let value = '--'
if (params[i].data !== null) {
value = params[i].data
// 保留两位小数
if (formatFloat2) {
value = this.formatFloat2(value)
}
// 添加千分位
if (formatThousands) {
value = this.formatThousands(value)
}
}
// #ifdef H5
result += '\n' + params[i].seriesName + '：' + value + ' ' + unit
// #endif
// #ifdef APP-PLUS
result += '<br/>' + params[i].marker + params[i].seriesName + '：' + value + ' ' + unit
// #endif
}
return result
}
},
/**
* 保留两位小数
* @param {Object} value
*/
formatFloat2(value) {
let temp = Math.round(parseFloat(value) * 100) / 100
let xsd = temp.toString().split('.')
if (xsd.length === 1) {
temp = (isNaN(temp) ? '0' : temp.toString()) + '.00'
return temp
}
if (xsd.length > 1) {
if (xsd[1].length < 2) {
temp = temp.toString() + '0'
}
return temp
}
},
/**
* 添加千分位
* @param {Object} value
*/
formatThousands(value) {
if (value === undefined || value === null) {
value = ''
}
if (!isNaN(value)) {
value = value + ''
}
let re = /\d{1,3}(?=(\d{3})+$)/g
let n1 = value.replace(/^(\d+)((\.\d+)?)$/, function(s, s1, s2) {
return s1.replace(re, '$&,') + s2
})
return n1
}
}
}
</script>
<style lang="scss" scoped>
.echarts {
width: 100%;
height: 100%;
}
</style>
\ No newline at end of file
components/myteam/myteam-table.vue
...@@ -7,13 +7,17 @@ ...@@ -7,13 +7,17 @@
</view> </view>
<!-- // 一级循环 --> <!-- // 一级循环 -->
<view class="content-sam-box"> <view class="content-sam-box">
<view class="" v-for="(pointItem,index) in dataList" :key="index"> <view class="" v-for="(pointItem,index) in list">
<view class="content-sa" style=" " v-if="felTyle == 'achievement'"> <view class="content-sa" style=" " v-if="felTyle == 'achievement'">
<view class="content-box-title" style="display: flex;align-items: center;margin-left: 6rpx;flex: 1;"> <view class="content-box-title"
<view style="" style="display: flex;align-items: center;margin-left: 6rpx;flex: 1;">
:class="index == 0 ?'cornermarker': index == 1 ? 'cornermarkertwo' : index == 2 ? 'cornermarkerthree' : 'cornermarkerother'"> <view
<text style="font-size: 20rpx;line-height: 20rpx;">{{index + 1}}</text> :class="index == '0' ?'cornermarker': index == '1' ? 'cornermarkertwo' : index == '2' ? 'cornermarkerthree' : 'cornermarkerother'">
<span style="font-size: 20rpx;line-height: 20rpx;">{{index + 1}}</span>
</view> </view>
<!-- <view class="cornermarkerthree">
<span>{{index + 1}}</span>
</view> -->
<view style="margin-left: 8rpx;text-overflow: ellipsis; <view style="margin-left: 8rpx;text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap;">{{pointItem.name }}</view> white-space: nowrap;">{{pointItem.name }}</view>
...@@ -81,10 +85,16 @@ ...@@ -81,10 +85,16 @@
tablesix: false, // 第六层收起 tablesix: false, // 第六层收起
sixindex: '', sixindex: '',
sixList: [], sixList: [],
list:[],
}; };
}, },
mounted() { mounted() {
// this.alist = this.dataList
this.list = JSON.parse(JSON.stringify(this.dataList))
// this.$nextTick(() => {
// })
// console.log(this.dataList, 555555)
}, },
methods: { methods: {
subordinate(index, val, type, expand) { subordinate(index, val, type, expand) {
......
package-lock.json
{ {
"name": "日期区间picker", "name": "日期区间picker",
"version": "1.0.7", "version": "1.0.7",
"lockfileVersion": 1, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": {
"": {
"name": "日期区间picker",
"version": "1.0.7",
"dependencies": {
"echarts": "^5.4.1",
"nanoid": "^4.0.0",
"vue-signature-pad": "^3.0.2"
}
},
"node_modules/@babel/parser": {
"version": "7.20.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
"integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
"peer": true,
"bin": {
"parser": "bin/babel-parser.js"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@vue/compiler-core": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
"integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
"peer": true,
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4",
"@vue/shared": "3.2.45",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"node_modules/@vue/compiler-dom": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
"integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
"peer": true,
"dependencies": {
"@vue/compiler-core": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"node_modules/@vue/compiler-sfc": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
"integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
"peer": true,
"dependencies": {
"@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.45",
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-ssr": "3.2.45",
"@vue/reactivity-transform": "3.2.45",
"@vue/shared": "3.2.45",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
"source-map": "^0.6.1"
}
},
"node_modules/@vue/compiler-ssr": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
"integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
"peer": true,
"dependencies": {
"@vue/compiler-dom": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"node_modules/@vue/reactivity": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",
"integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",
"peer": true,
"dependencies": {
"@vue/shared": "3.2.45"
}
},
"node_modules/@vue/reactivity-transform": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
"integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
"peer": true,
"dependencies": {
"@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.45",
"@vue/shared": "3.2.45",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
}
},
"node_modules/@vue/runtime-core": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",
"integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",
"peer": true,
"dependencies": {
"@vue/reactivity": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"node_modules/@vue/runtime-dom": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",
"integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",
"peer": true,
"dependencies": {
"@vue/runtime-core": "3.2.45",
"@vue/shared": "3.2.45",
"csstype": "^2.6.8"
}
},
"node_modules/@vue/server-renderer": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",
"integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",
"peer": true,
"dependencies": {
"@vue/compiler-ssr": "3.2.45",
"@vue/shared": "3.2.45"
},
"peerDependencies": {
"vue": "3.2.45"
}
},
"node_modules/@vue/shared": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
"integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==",
"peer": true
},
"node_modules/csstype": {
"version": "2.6.21",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
"integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
"peer": true
},
"node_modules/echarts": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.1.tgz",
"integrity": "sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==",
"dependencies": {
"tslib": "2.3.0",
"zrender": "5.4.1"
}
},
"node_modules/estree-walker": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
"peer": true
},
"node_modules/magic-string": {
"version": "0.25.9",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
"integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
"peer": true,
"dependencies": {
"sourcemap-codec": "^1.4.8"
}
},
"node_modules/merge-images": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/merge-images/-/merge-images-1.2.0.tgz",
"integrity": "sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw=="
},
"node_modules/nanoid": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz",
"integrity": "sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg==",
"bin": {
"nanoid": "bin/nanoid.js"
},
"engines": {
"node": "^14 || ^16 || >=18"
}
},
"node_modules/picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"peer": true
},
"node_modules/postcss": {
"version": "8.4.20",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
"integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
"funding": [
{
"type": "opencollective",
"url": "https://opencollective.com/postcss/"
},
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
}
],
"peer": true,
"dependencies": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
"engines": {
"node": "^10 || ^12 || >=14"
}
},
"node_modules/postcss/node_modules/nanoid": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
"peer": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
},
"engines": {
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
}
},
"node_modules/signature_pad": {
"version": "3.0.0-beta.4",
"resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
"integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
},
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/sourcemap-codec": {
"version": "1.4.8",
"resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
"integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
"deprecated": "Please use @jridgewell/sourcemap-codec instead",
"peer": true
},
"node_modules/tslib": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
"node_modules/vue": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",
"integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",
"peer": true,
"dependencies": {
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-sfc": "3.2.45",
"@vue/runtime-dom": "3.2.45",
"@vue/server-renderer": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"node_modules/vue-signature-pad": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/vue-signature-pad/-/vue-signature-pad-3.0.2.tgz",
"integrity": "sha512-o25o+lROfCmzASS2+fU8ZV801kV+D4/02zkZ+ez3NKeiUmbxW7kwlUf5oKQkvA+l7Ou9xGsGLsirBLch3jyX8A==",
"dependencies": {
"merge-images": "^1.1.0",
"signature_pad": "^3.0.0-beta.3"
},
"engines": {
"node": ">=12"
},
"peerDependencies": {
"vue": "^3.2.0"
}
},
"node_modules/zrender": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.1.tgz",
"integrity": "sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==",
"dependencies": {
"tslib": "2.3.0"
}
}
},
"dependencies": {
"@babel/parser": {
"version": "7.20.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
"integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
"peer": true
},
"@vue/compiler-core": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
"integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
"peer": true,
"requires": {
"@babel/parser": "^7.16.4",
"@vue/shared": "3.2.45",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/compiler-dom": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
"integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
"peer": true,
"requires": {
"@vue/compiler-core": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"@vue/compiler-sfc": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
"integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
"peer": true,
"requires": {
"@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.45",
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-ssr": "3.2.45",
"@vue/reactivity-transform": "3.2.45",
"@vue/shared": "3.2.45",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
"source-map": "^0.6.1"
}
},
"@vue/compiler-ssr": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
"integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
"peer": true,
"requires": {
"@vue/compiler-dom": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"@vue/reactivity": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",
"integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",
"peer": true,
"requires": {
"@vue/shared": "3.2.45"
}
},
"@vue/reactivity-transform": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
"integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
"peer": true,
"requires": {
"@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.45",
"@vue/shared": "3.2.45",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
}
},
"@vue/runtime-core": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",
"integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",
"peer": true,
"requires": {
"@vue/reactivity": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"@vue/runtime-dom": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",
"integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",
"peer": true,
"requires": {
"@vue/runtime-core": "3.2.45",
"@vue/shared": "3.2.45",
"csstype": "^2.6.8"
}
},
"@vue/server-renderer": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",
"integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",
"peer": true,
"requires": {
"@vue/compiler-ssr": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"@vue/shared": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
"integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==",
"peer": true
},
"csstype": {
"version": "2.6.21",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
"integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
"peer": true
},
"echarts": { "echarts": {
"version": "5.4.1", "version": "5.4.1",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.1.tgz", "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.1.tgz",
...@@ -13,16 +428,106 @@ ...@@ -13,16 +428,106 @@
"zrender": "5.4.1" "zrender": "5.4.1"
} }
}, },
"estree-walker": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
"peer": true
},
"magic-string": {
"version": "0.25.9",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
"integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
"peer": true,
"requires": {
"sourcemap-codec": "^1.4.8"
}
},
"merge-images": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/merge-images/-/merge-images-1.2.0.tgz",
"integrity": "sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw=="
},
"nanoid": { "nanoid": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.0.tgz",
"integrity": "sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg==" "integrity": "sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg=="
}, },
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"peer": true
},
"postcss": {
"version": "8.4.20",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
"integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
"peer": true,
"requires": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
"dependencies": {
"nanoid": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
"peer": true
}
}
},
"signature_pad": {
"version": "3.0.0-beta.4",
"resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
"integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"peer": true
},
"source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"peer": true
},
"sourcemap-codec": {
"version": "1.4.8",
"resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
"integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
"peer": true
},
"tslib": { "tslib": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
}, },
"vue": {
"version": "3.2.45",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",
"integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",
"peer": true,
"requires": {
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-sfc": "3.2.45",
"@vue/runtime-dom": "3.2.45",
"@vue/server-renderer": "3.2.45",
"@vue/shared": "3.2.45"
}
},
"vue-signature-pad": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/vue-signature-pad/-/vue-signature-pad-3.0.2.tgz",
"integrity": "sha512-o25o+lROfCmzASS2+fU8ZV801kV+D4/02zkZ+ez3NKeiUmbxW7kwlUf5oKQkvA+l7Ou9xGsGLsirBLch3jyX8A==",
"requires": {
"merge-images": "^1.1.0",
"signature_pad": "^3.0.0-beta.3"
}
},
"zrender": { "zrender": {
"version": "5.4.1", "version": "5.4.1",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.1.tgz", "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.1.tgz",
......
pages/applyDropClass/applyDropClass.vue
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
//提交按钮置灰 //提交按钮置灰
this.readonlyFlag = true; this.readonlyFlag = true;
const param = { const param = {
breachCommission:this.dropInfo.breachCommission?this.dropInfo.breachCommission: 0,
orderNo:this.dropInfo.orderNo, orderNo:this.dropInfo.orderNo,
paymentMethod:this.dropInfo.paymentMethod, paymentMethod:this.dropInfo.paymentMethod,
userId:this.userId, userId:this.userId,
......
pages/authentication-query/authentication-query.vue
<template> <template>
<view class="wrapper"> <view class="wrapper">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
<view class="" style="margin-top: 20rpx;"> <view class="" style="margin-top: 40rpx;">
查询类型 查询类型
</view> </view>
<view class="content"> <view class="content">
......
pages/courseDetail/courseDetail.vue
...@@ -259,7 +259,8 @@ ...@@ -259,7 +259,8 @@
// }, 500); // }, 500);
} else if (platform == 'android') { } else if (platform == 'android') {
window.open('cffpapp://'); window.location.href = "cffpapp://";
// window.open('cffpapp://');
// var loadDateTime = new Date(); // var loadDateTime = new Date();
// window.setTimeout(function() { //如果没有安装app,便会执行setTimeout跳转下载页 // window.setTimeout(function() { //如果没有安装app,便会执行setTimeout跳转下载页
// var timeOutDateTime = new Date(); // var timeOutDateTime = new Date();
......
pages/index/index.vue
...@@ -144,7 +144,8 @@ ...@@ -144,7 +144,8 @@
carouselList: [], carouselList: [],
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
shareId: null, shareId: null,
kefu: '../../static/kefu.png' kefu: '../../static/kefu.png',
loginornot: true
} }
}, },
components: { components: {
...@@ -163,6 +164,12 @@ ...@@ -163,6 +164,12 @@
}) })
} }
}, },
onShow() {
let loginType = uni.getStorageSync('loginType')
if(loginType == "visitor" ){
this.loginornot = false
};
},
methods: { methods: {
tokefu() { tokefu() {
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数 let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
...@@ -172,7 +179,17 @@ ...@@ -172,7 +179,17 @@
}) })
}, },
featureSelect(featureItem) { featureSelect(featureItem) {
console.log(this.cffpUserInfo, 1544) if(this.loginornot == false && featureItem.name != "学习认证" && featureItem.name != "更多功能"){
uni.showToast({
title: "请登陆个人账户使用该功能",
duration: 2000,
icon: 'none'
});
uni.reLaunch({
url:'/components/login/login'
})
return false
}
if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') { if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') {
uni.showToast({ uni.showToast({
title: "您本人尚未加盟，您加盟后可邀请加盟", title: "您本人尚未加盟，您加盟后可邀请加盟",
......
pages/invitationRegister/invitationlogin.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<view class="login-code"> <view class="login-code">
<!-- <view class="text" style="display: flex;justify-content: space-between;"> --> <!-- <view class="text" style="display: flex;justify-content: space-between;"> -->
<input name="form.code" placeholder="输入验证码" v-model="form.code" type="number" maxlength="6"/> <input name="form.code" placeholder="输入验证码" v-model="form.code" type="number" maxlength="6"/>
<text @click="sendMessage()" :class="{'grey':disabledSendBtn}">{{sendCodeHtml}}</text> <text @click="sendMessage()" style="width: 180rpx;" :class="{'grey':disabledSendBtn}">{{sendCodeHtml}}</text>
<!-- </view> --> <!-- </view> -->
</view> </view>
...@@ -128,7 +128,6 @@ ...@@ -128,7 +128,6 @@
} }
api.loginVerification(params).then((res)=>{ api.loginVerification(params).then((res)=>{
if(res['success']){ if(res['success']){
console.log(res, 5454)
this.userId = String(res['data']['userId']); this.userId = String(res['data']['userId']);
uni.setStorageSync('isLogin','1') uni.setStorageSync('isLogin','1')
uni.setStorageSync('cffp_userId', this.userId) uni.setStorageSync('cffp_userId', this.userId)
...@@ -199,6 +198,7 @@ ...@@ -199,6 +198,7 @@
border-bottom: 1px solid #CECECE; border-bottom: 1px solid #CECECE;
padding: 20rpx; padding: 20rpx;
.grey{ .grey{
min-width: 100rpx;
font-size: 24rpx; font-size: 24rpx;
color: #CECECE; color: #CECECE;
} }
......
pages/learnCertify/learnCertify.vue
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
<!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'"> <!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'">
认证中 认证中
</view> --> </view> -->
<view :class="certifyItem.isAdopt=='1' ? 'isUnder' : certifyItem.isAdopt=='3' ? 'isAdopt' : ''" > <view :class="certifyItem.isAdopt=='1' ? 'isUnder' : certifyItem.isAdopt=='3' ? 'isAdopt' : ''">
<span v-if="certifyItem.isAdopt=='1'">认证中</span> <span v-if="certifyItem.isAdopt=='1'">认证中</span>
<span v-if="certifyItem.isAdopt=='3'">通过认证</span> <span v-if="certifyItem.isAdopt=='3'">通过认证</span>
</view> </view>
<view class="" > <view class="">
<image :src="certifyItem.cerLogoUrl" mode="widthFix"></image> <image :src="certifyItem.cerLogoUrl" mode="widthFix"></image>
</view> </view>
<view class="" style="flex: 1;text-align: center;"> <view class="" style="flex: 1;text-align: center;">
<text class="certify_name">{{certifyItem.cerName}}</text> <text class="certify_name">{{certifyItem.cerName}}</text>
</view> </view>
<view class="view_btn" @click="switchDetail(certifyItem)" > <view class="view_btn" @click="switchDetail(certifyItem)">
<span>{{certifyItem.isAdopt=='3'?'查看证书':'认证详情'}}</span> <span>{{certifyItem.isAdopt=='3'?'查看证书':'认证详情'}}</span>
</view> </view>
</view> </view>
...@@ -42,10 +42,34 @@ ...@@ -42,10 +42,34 @@
<view class="title"> <view class="title">
精品福利 精品福利
</view> </view>
<view class="welfare_pic"> <view class="" style="display: flex;">
<image src="/static/certifyProcess/welfare1.png" mode="widthFix" @click="showMask(1)"></image> <view class="welfareone" @click="showMask(1)">
<image src="/static/certifyProcess/welfare2.png" mode="widthFix" @click="showMask(2)"></image> <view class="text-one">
<text class="">福利一</text>
</view> </view>
<text class="text-title">精品辅助资料</text>
<view class="text-t-bottom">
</view>
<text class="text-footer-content">高质量辅导资料 限时赠送</text>
<text class="text-footer">微信小助手领取</text>
</view>
<view class="welfareone" @click="showMask(2)">
<view class="text-one">
<text class="" style="color: #FFD06B ;">福利二</text>
</view>
<text class="text-title">精品辅助资料</text>
<view class="text-t-bottom">
</view>
<text class="text-footer-content">同行精英+学习指点+实战经验</text>
<text class="text-footer" style="margin-left: 100rpx;">进入交流群</text>
</view>
</view>
<!-- <view class="welfare_pic">
<image src="/static/certifyProcess/welfare1.png" mode="widthFix" ></image>
<image src="/static/certifyProcess/welfare2.png" mode="widthFix"></image>
</view> -->
</view> </view>
<view class="question_wrppaer"> <view class="question_wrppaer">
<view class="title"> <view class="title">
...@@ -72,67 +96,69 @@ ...@@ -72,67 +96,69 @@
<script> <script>
import api from '../../api/api'; import api from '../../api/api';
export default{ export default {
data(){ data() {
return { return {
certificates:[], certificates: [],
planFaqs:[], planFaqs: [],
boutiqueWelfares:[], boutiqueWelfares: [],
mask_flag:false, mask_flag: false,
qrCode:null, qrCode: null,
userId:uni.getStorageSync('cffp_userId') userId: uni.getStorageSync('cffp_userId')
} }
}, },
components:{}, components: {},
onLoad(){ onLoad() {
this.getLearnCertifyList(); this.getLearnCertifyList();
}, },
methods:{ methods: {
goBack(){ goBack() {
let back = getCurrentPages(); let back = getCurrentPages();
if(back && back.length>1) { if (back && back.length > 1) {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); });
}else{ } else {
history.back(); history.back();
} }
}, },
getLearnCertifyList(){ getLearnCertifyList() {
api.queryCertificateList({userId: this.userId}).then((res)=>{ api.queryCertificateList({
userId: this.userId
}).then((res) => {
console.log(res) console.log(res)
if(res['success']){ if (res['success']) {
this.certificates = res['data']['certificates']; this.certificates = res['data']['certificates'];
this.planFaqs = res['data']['planFaqs']; this.planFaqs = res['data']['planFaqs'];
this.boutiqueWelfares =res['data']['boutiqueWelfares']; this.boutiqueWelfares = res['data']['boutiqueWelfares'];
}else{ } else {
this.certificates = []; this.certificates = [];
this.planFaqs = []; this.planFaqs = [];
this.boutiqueWelfares = []; this.boutiqueWelfares = [];
} }
}) })
}, },
switchDetail(certifyItem){ switchDetail(certifyItem) {
//2通过跳到证书页，1跳到证书详情 //2通过跳到证书页，1跳到证书详情
if(certifyItem.isAdopt == 3){ if (certifyItem.isAdopt == 3) {
uni.navigateTo({ uni.navigateTo({
url:`../authentication-query/authentication-result?queryType=1` url: `../authentication-query/authentication-result?queryType=1`
}) })
}else{ } else {
let certificateId = certifyItem.isAdopt != 1?certifyItem.certificateId: null let certificateId = certifyItem.isAdopt != 1 ? certifyItem.certificateId : null
uni.navigateTo({ uni.navigateTo({
url:`../certifyDetail/certifyDetail?certificateId=${certificateId}&userSignupId=${certifyItem.userSignupId}&status=${certifyItem.isAdopt}` url: `../certifyDetail/certifyDetail?certificateId=${certificateId}&userSignupId=${certifyItem.userSignupId}&status=${certifyItem.isAdopt}`
}) })
} }
}, },
showMask(type){ showMask(type) {
this.mask_flag = true; this.mask_flag = true;
if(type==1){ if (type == 1) {
this.qrCode=this.boutiqueWelfares[0]['wechatCodeUrl']; this.qrCode = this.boutiqueWelfares[0]['wechatCodeUrl'];
this.maskTips = '请添加微信小助手获取 精品辅助资料'; this.maskTips = '请添加微信小助手获取 精品辅助资料';
} }
if(type==2){ if (type == 2) {
this.qrCode=this.boutiqueWelfares[1]['wechatCodeUrl']; this.qrCode = this.boutiqueWelfares[1]['wechatCodeUrl'];
this.maskTips = '请扫码进入微信学习 考证交流群'; this.maskTips = '请扫码进入微信学习 考证交流群';
} }
} }
...@@ -142,14 +168,16 @@ ...@@ -142,14 +168,16 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.certify_content{ .certify_content {
background: #F1F6FF; background: #F1F6FF;
border-radius:24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
padding: 30rpx; padding: 30rpx;
position: relative; position: relative;
top: -30rpx; top: -30rpx;
.list_wrapper{
.list_wrapper {
margin-bottom: 40rpx; margin-bottom: 40rpx;
.list_content { .list_content {
display: flex; display: flex;
background: #fff; background: #fff;
...@@ -159,7 +187,8 @@ ...@@ -159,7 +187,8 @@
align-items: center; align-items: center;
padding-left: 160rpx; padding-left: 160rpx;
justify-content: space-between; justify-content: space-between;
.isAdopt{
.isAdopt {
position: absolute; position: absolute;
border: 2rpx solid #06A632; border: 2rpx solid #06A632;
text-align: center; text-align: center;
...@@ -169,7 +198,8 @@ ...@@ -169,7 +198,8 @@
left: 0; left: 0;
font-size: 28rpx; font-size: 28rpx;
} }
.isUnder{
.isUnder {
position: absolute; position: absolute;
border: 2rpx solid #3671F4; border: 2rpx solid #3671F4;
text-align: center; text-align: center;
...@@ -179,57 +209,120 @@ ...@@ -179,57 +209,120 @@
left: 0; left: 0;
font-size: 28rpx; font-size: 28rpx;
} }
image{
width:80rpx!important; image {
width: 80rpx !important;
} }
.view_btn{
.view_btn {
background: linear-gradient(306deg, #7EA8FF 0%, #4984FF 100%); background: linear-gradient(306deg, #7EA8FF 0%, #4984FF 100%);
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
color: #fff; color: #fff;
padding: 10rpx; padding: 10rpx;
} }
} }
.certify_enter{
.certify_enter {
background: #fff; background: #fff;
text-align: center; text-align: center;
padding: 20rpx; padding: 20rpx;
text-decoration:underline; text-decoration: underline;
color: #3977FA; color: #3977FA;
} }
} }
} }
.title{
.welfareone {
width: 330rpx;
height: 350rpx;
background: url('../../static/Group1760.png') no-repeat;
background-size: 100%;
.text-one {
// position: absolute;
width: 110rpx;
height: 30rpx;
text-align: center; text-align: center;
margin:0 20rpx 20rpx 20rpx; color: #5C9BFE;
font-size:40rpx; transform: rotate(-45deg);
margin-top: 40rpx;
left: 40rpx;
font-size: 24rpx;
}
.text-title {
position: absolute;
margin-left: 80rpx;
color: #5C9BFE;
font-weight: 600;
font-size: 32rpx;
} }
.welfare_wrapper{ .text-t-bottom{
position: absolute;
margin-top: 50rpx;
margin-left: 80rpx;
width: 220rpx;
height: 4rpx;
background: linear-gradient(90deg, #F3B933 0%, #5C9BFE 0%, rgba(127,176,254,0) 100%);
border-radius: 6rpx;
opacity: 1;
}
.text-footer-content{
position: absolute;
margin-left: 80rpx;
font-size: 26rpx;
width: 210rpx;
margin-top: 60rpx;
color: #999999;
}
.text-footer{
position: absolute;
margin-top: 170rpx;
font-size: 30rpx;
color: #FFFFFF;
margin-left: 70rpx;
}
}
.title {
text-align: center;
margin: 0 20rpx 20rpx 20rpx;
font-size: 40rpx;
}
.welfare_wrapper {
background: #fff; background: #fff;
padding: 20rpx; padding: 20rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.welfare_pic{
.welfare_pic {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
image{
width: 46%!important; image {
width: 46% !important;
} }
image:nth-child(2){
image:nth-child(2) {
position: relative; position: relative;
right: 20rpx; right: 20rpx;
} }
} }
} }
.question_wrppaer{
.question_wrppaer {
padding: 30rpx; padding: 30rpx;
.question_content{
.question_content {
margin-bottom: 20rpx; margin-bottom: 20rpx;
.question{
.question {
font-size: 36rpx; font-size: 36rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
} }
} }
.mask{
.mask {
position: fixed; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
...@@ -237,9 +330,10 @@ ...@@ -237,9 +330,10 @@
bottom: 0; bottom: 0;
height: 100%; height: 100%;
z-index: 1; z-index: 1;
background-color: rgba(0,0,0,.4); background-color: rgba(0, 0, 0, .4);
} }
.mask_content{
.mask_content {
width: 90%; width: 90%;
background: #fff; background: #fff;
margin: auto; margin: auto;
...@@ -253,7 +347,8 @@ ...@@ -253,7 +347,8 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
.iconfont{
.iconfont {
display: inline-block; display: inline-block;
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
...@@ -267,10 +362,12 @@ ...@@ -267,10 +362,12 @@
right: 0; right: 0;
margin: 0 auto; margin: 0 auto;
} }
uni-image{
width: 60%!important; uni-image {
width: 60% !important;
} }
.tips{
.tips {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
......
pages/learningStatistics/learningStatistics.vue
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
userStudyCount(){ userStudyCount(){
api.userStudyCount({userId:this.userId}).then(res=>{ api.userStudyCount({userId:this.userId}).then(res=>{
if(res['success']){ if(res['success']){
console.log(res, 101115)
this.userStudyCountList = res['data']; this.userStudyCountList = res['data'];
this.studyInfos = res['data']['studyInfos']; this.studyInfos = res['data']['studyInfos'];
let categories=[]; let categories=[];
......
pages/myPoints/myPoints.vue
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
</view> </view>
</view> </view>
<view class="opt_wrapper"> <view class="opt_wrapper">
<view style="width: 33%;">销售以来</view> <!-- <view style="width: 33%;">销售以来</view> -->
<!-- 年月时间选择 --> <!-- 年月时间选择 -->
<view class="timeSelectContent" v-if="timeFlag=='M'" style="width: 33%;"> <view class="timeSelectContent" v-if="timeFlag !='D'">
<picker mode="date" :value="fortuneDate" :end="maxDate" fields="month" @change="bindDateChange"> <picker mode="date" :value="fortuneDate" :end="maxDate" :fields="fields" @change="bindDateChange">
<view class="uni-input">{{fortuneDate}} <view class="uni-input">{{fortuneDate}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
</view> </view>
...@@ -76,7 +76,8 @@ ...@@ -76,7 +76,8 @@
nowSumCommissionAmount:'', //当前（日月年）积分 nowSumCommissionAmount:'', //当前（日月年）积分
prePercent:'',//比前日、上月，上年多或少的百分比数据 prePercent:'',//比前日、上月，上年多或少的百分比数据
yesExchangeFortune:'',//可兑换金额 yesExchangeFortune:'',//可兑换金额
cffpFortuneDeductionList:[]//对象类型见下方CffpFortuneExchangeVO cffpFortuneDeductionList:[],//对象类型见下方CffpFortuneExchangeVO
fields:''
} }
}, },
...@@ -92,9 +93,11 @@ ...@@ -92,9 +93,11 @@
} }
if(this.timeFlag == 'M'){ if(this.timeFlag == 'M'){
this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}` this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}`
this.fields = 'month'
} }
if(this.timeFlag == 'Y'){ if(this.timeFlag == 'Y'){
this.fortuneDate=`${new Date().getFullYear()}` this.fortuneDate=`${new Date().getFullYear()}`
this.fields = 'year'
} }
this.findByUserIdForFortuneStatistic(); this.findByUserIdForFortuneStatistic();
}, },
...@@ -213,6 +216,7 @@ ...@@ -213,6 +216,7 @@
} }
.opt_wrapper{ .opt_wrapper{
display: flex; display: flex;
justify-content: center;
text-align: center; text-align: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
......
pages/orderConfirm/orderConfirm.vue
...@@ -223,6 +223,12 @@ ...@@ -223,6 +223,12 @@
param.paymentType = 2; param.paymentType = 2;
//deviceType:PC为1,移动端为2,微信为3 //deviceType:PC为1,移动端为2,微信为3
if(this.deviceType == 3){ if(this.deviceType == 3){
if(this.amount == '0'){
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1`
})
return false
}else {
param.isPayOrAuth = 1; param.isPayOrAuth = 1;
api.wxAuthorize(param).then((res)=>{ api.wxAuthorize(param).then((res)=>{
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
...@@ -230,6 +236,8 @@ ...@@ -230,6 +236,8 @@
window.location.href = res['data']['paymentForm']['action']; window.location.href = res['data']['paymentForm']['action'];
} }
}) })
}
}else{ }else{
//微信二维码支付 //微信二维码支付
...@@ -300,6 +308,12 @@ ...@@ -300,6 +308,12 @@
const data = res['data']; const data = res['data'];
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
if(res['success']){ if(res['success']){
if(data.orderStatus != '' && data.orderStatus != null){
uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1`
})
return false
}
this.payForm = res['data']['aliOrderString']; this.payForm = res['data']['aliOrderString'];
this.$nextTick(() => { this.$nextTick(() => {
console.log(document.forms) console.log(document.forms)
......
pages/personalCenter/personalCenter.vue
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
{id:'02',categoryName:'活动管理', {id:'02',categoryName:'活动管理',
children:[ children:[
{title:'我的学习',icon:'myLearning',link:'/pages/myLearning/myLearning',isOpen:true,isShow:true}, {title:'我的学习',icon:'myLearning',link:'/pages/myLearning/myLearning',isOpen:true,isShow:true},
{title:'学习认证',icon:'learningCertify',link:'/pages/learnCertify/learnCertify',isOpen:true,isShow:true}, {title:'学习认证',icon:'learningCertify',link:'/pages/learnCertify/learnCertify',isOpen:true,isShow:true,islogin:true},
{title:'我的分享',icon:'share',link:'/pages/myShare/myShare',isOpen:true,isShow:true} {title:'我的分享',icon:'share',link:'/pages/myShare/myShare',isOpen:true,isShow:true}
], ],
}, },
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
{title:'我的卡包',icon:'card',link:'',isOpen:true,isShow:false}, {title:'我的卡包',icon:'card',link:'',isOpen:true,isShow:false},
{title:'我的认证',icon:'myCertify',link:'/pages/myCertify/myCertify',isOpen:true,isShow:true}, {title:'我的认证',icon:'myCertify',link:'/pages/myCertify/myCertify',isOpen:true,isShow:true},
{title:'申请修改公司周边',icon:'setting',link:'',isOpen:true,isShow:false}, {title:'申请修改公司周边',icon:'setting',link:'',isOpen:true,isShow:false},
{title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true}, {title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true,islogin:true},
{title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true} {title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true}
] ]
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
}, },
// 菜单跳转页面 // 菜单跳转页面
goDetail(item){ goDetail(item){
if(!this.loginornot){ if(!this.loginornot&& !item.islogin){
this.isLogin() this.isLogin()
} }
if(item.isShow && item.isOpen){ if(item.isShow && item.isOpen){
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</view> </view>
</view> </view>
<view class="other" v-if="tabType===3"> <view class="other" v-if="tabType===3">
<other-team v-if="otherList" :otherList="otherList"></other-team> <other-team v-if="otherList.length != 0" :otherList="otherList"></other-team>
<view v-else class="zdata" style=""> <view v-else class="zdata" style="">
<text>暂无数据!</text> <text>暂无数据!</text>
</view> </view>
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
userId: this.userId userId: this.userId
}).then(res =>{ }).then(res =>{
if(res['success']){ if(res['success']){
console.log(res, 11215)
let data = res.data let data = res.data
if(data.orgInfo) { if(data.orgInfo) {
this.levelName =data.orgInfo.areaCenterName; this.levelName =data.orgInfo.areaCenterName;
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</view> --> </view> -->
</view> </view>
<view class="content-btn"> <view class="content-btn">
<view class="" v-for="(item,index) in teamList" :key="index"> <view class="" v-for="(item,index) in teamList">
<view :class="teamtype===index ? 'content-btn_under-Check' : 'content-btn_under'" <view :class="teamtype===index ? 'content-btn_under-Check' : 'content-btn_under'"
@click="ckteam(index)"> @click="ckteam(index)">
<text <text
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<text v-else>按销售额排序</text> <text v-else>按销售额排序</text>
</view> </view>
</view> </view>
<view class=""> <view v-if="listType == true">
<myteam-table :datatitleList="datatitleList" :dataList="dataList" felTyle="achievement"></myteam-table> <myteam-table :datatitleList="datatitleList" :dataList="dataList" felTyle="achievement"></myteam-table>
</view> </view>
</view> </view>
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
totalCoursePrice: '', // 总销售额 totalCoursePrice: '', // 总销售额
totalIncome: '', //总销售收入 totalIncome: '', //总销售收入
teListsort: true, teListsort: true,
listType: false,
multiArray: [{ multiArray: [{
name: '', name: '',
id: 1 id: 1
...@@ -155,12 +156,13 @@ ...@@ -155,12 +156,13 @@
} }
this.CffpOrgInfoReqVO.queryType = this.teamtype + 1 this.CffpOrgInfoReqVO.queryType = this.teamtype + 1
api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => { api.queryTeamAchievement(this.CffpOrgInfoReqVO).then(res => {
if (res) { if (res['success']) {
this.dataList = res.data.list this.listType = true
this.totalOrder = res.data.totalOrder ? res.data.totalOrder : '0' this.dataList = res.data.list || [];
this.totalCoursePrice = res.data.totalCoursePrice ? res.data.totalCoursePrice : '0' this.totalOrder = res.data.totalOrder ? res.data.totalOrder : '0';
this.totalIncome = res.data.totalIncome ? res.data.totalIncome : '0' this.totalCoursePrice = res.data.totalCoursePrice ? res.data.totalCoursePrice : '0';
this.sortswitch() this.totalIncome = res.data.totalIncome ? res.data.totalIncome : '0';
this.sortswitch();
} }
}) })
}, },
...@@ -173,7 +175,6 @@ ...@@ -173,7 +175,6 @@
} else { } else {
return b.coursePrice - a.coursePrice; return b.coursePrice - a.coursePrice;
} }
}) })
}, },
mountdchange(e) { mountdchange(e) {
...@@ -181,6 +182,7 @@ ...@@ -181,6 +182,7 @@
}, },
ckteam(e) { ckteam(e) {
this.teamtype = e this.teamtype = e
this.listType = false
this.getqueryTeamAchievement() this.getqueryTeamAchievement()
}, },
// 这个是时间组件返回的时间值 // 这个是时间组件返回的时间值
...@@ -206,8 +208,7 @@ ...@@ -206,8 +208,7 @@
.header { .header {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 0 40rpx; margin: 40rpx;
.timeSelectContent { .timeSelectContent {
margin: 0 40rpx; margin: 0 40rpx;
} }
......
pages/personalCenter/user-information.vue
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
mode=""></image> mode=""></image>
</view> </view>
</view> </view>
<!-- <view class="linechart">
<echarts ref="echart" :option="option" style="height: 300px;"></echarts>
</view> -->
<view class="band"> <view class="band">
<view class="contentItem"> <view class="contentItem">
<text>真实名称</text> <text>真实名称</text>
...@@ -32,6 +35,8 @@ ...@@ -32,6 +35,8 @@
import { import {
CommonUpload CommonUpload
} from '@/util/uploaderFile' } from '@/util/uploaderFile'
import Echarts from '@/components/charts/charts.vue'
import EchartsEl from '@/components/echarts/echarts-el.vue'
import api from "@/api/api"; import api from "@/api/api";
import common from '../../common/common'; import common from '../../common/common';
export default { export default {
...@@ -45,20 +50,43 @@ ...@@ -45,20 +50,43 @@
targetUseFor: "12", targetUseFor: "12",
targetSeq: "0" targetSeq: "0"
}, },
optionForm: {} optionForm: {},
option :{
xAxis: {
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
},
yAxis: {
type: 'value'
},
series: [
{
data: [120, 200, 150, 80, 70, 110, 130],
type: 'bar',
showBackground: true,
backgroundStyle: {
color: 'rgba(180, 180, 180, 0.2)'
}
} }
]
}
}
},
components: {
Echarts,
EchartsEl
}, },
onLoad(options) { onLoad(options) {
this.optionForm = JSON.parse(options.customerBasicInfo) this.optionForm = JSON.parse(options.customerBasicInfo)
}, },
methods: { methods: {
goBack(){ goBack() {
let back = getCurrentPages(); let back = getCurrentPages();
if(back && back.length>1) { if (back && back.length > 1) {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); });
}else{ } else {
history.back(); history.back();
} }
}, },
......
sfp/housePurchase/housePurchase.vue
...@@ -159,8 +159,15 @@ ...@@ -159,8 +159,15 @@
</label> </label>
</radio-group> </radio-group>
</view> </view>
<view id="myEcharts" style="height: 450rpx;"></view> <view style="height: 450rpx;width: 500rpx;border: 1rpx solid #c3c1c1;">
<view style="text-align: center;color: #c3c1c1;font-size: 22rpx;" v-if="isNeedDis"> <div id="myEcharts">
</div>
</view>
<!-- <view class="linechart">
<echarts ref="echart" :option="option" style="height: 300px;"></echarts>
</view> -->
<view style="text-align: center;color: #c3c1c1;font-size: 22rpx;" >
差额 = 可实现的 - 你想要的 差额 = 可实现的 - 你想要的
</view> </view>
<view class="resultSummaryContent"> <view class="resultSummaryContent">
......
sfp/index/index.vue
...@@ -94,13 +94,18 @@ ...@@ -94,13 +94,18 @@
v-model="item.withdrawalEnd"/> v-model="item.withdrawalEnd"/>
<input class="uni-input withdrawNumber" type="digit" placeholder="请输入" maxlength="17" <input class="uni-input withdrawNumber" type="digit" placeholder="请输入" maxlength="17"
v-model="item.yearWithdrawalAmount"/> v-model="item.yearWithdrawalAmount"/>
<view v-show="yearWithdrawalInfos.length>1"> <view v-show="yearWithdrawalInfos.length>1" style="position: absolute;right: 0;width: 60rpx;height: 60rpx;">
<text @click="reduce(idx)"><svg t="1662455801913" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3447" width="20" height="20"><path d="M512 0c-285.257143 0-512 226.742857-512 512s226.742857 512 512 512 512-226.742857 512-512-226.742857-512-512-512z m0 950.857143c-241.371429 0-438.857143-197.485714-438.857143-438.857143s197.485714-438.857143 438.857143-438.857143 438.857143 197.485714 438.857143 438.857143-197.485714 438.857143-438.857143 438.857143z" p-id="3448" fill="#CEB07D"></path><path d="M731.428571 475.428571h-438.857142c-21.942857 0-36.571429 14.628571-36.571429 36.571429s14.628571 36.571429 36.571429 36.571429h438.857142c21.942857 0 36.571429-14.628571 36.571429-36.571429s-14.628571-36.571429-36.571429-36.571429z" p-id="3449" fill="#CEB07D"></path></svg></text> <image @click="reduce(idx)" style="width: 60rpx;height: 60rpx;" src="../../static/Vector.png" mode=""></image>
<!-- <text><svg t="1662455801913" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3447" width="20" height="20"><path d="M512 0c-285.257143 0-512 226.742857-512 512s226.742857 512 512 512 512-226.742857 512-512-226.742857-512-512-512z m0 950.857143c-241.371429 0-438.857143-197.485714-438.857143-438.857143s197.485714-438.857143 438.857143-438.857143 438.857143 197.485714 438.857143 438.857143-197.485714 438.857143-438.857143 438.857143z" p-id="3448" fill="#CEB07D"></path><path d="M731.428571 475.428571h-438.857142c-21.942857 0-36.571429 14.628571-36.571429 36.571429s14.628571 36.571429 36.571429 36.571429h438.857142c21.942857 0 36.571429-14.628571 36.571429-36.571429s-14.628571-36.571429-36.571429-36.571429z" p-id="3449" fill="#CEB07D"></path></svg></text> -->
</view> </view>
</view> </view>
<text @click="add()" style="position: absolute;right: 0;"> <view class="" @click="add()" style="position: absolute;right: 0; width: 60rpx;height: 60rpx;">
<image style="width: 60rpx;height: 60rpx;" src="../../static/Vecto4r.png" mode=""></image>
</view>
<!-- <text >
<svg t="1662455996735" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4399" width="20" height="20"><path d="M512 0c-285.257143 0-512 226.742857-512 512s226.742857 512 512 512 512-226.742857 512-512-226.742857-512-512-512z m0 950.857143c-241.371429 0-438.857143-197.485714-438.857143-438.857143s197.485714-438.857143 438.857143-438.857143 438.857143 197.485714 438.857143 438.857143-197.485714 438.857143-438.857143 438.857143z" p-id="4400" fill="#CEB07D"></path><path d="M731.428571 475.428571h-182.857142v-182.857142c0-21.942857-14.628571-36.571429-36.571429-36.571429s-36.571429 14.628571-36.571429 36.571429v182.857142h-182.857142c-21.942857 0-36.571429 14.628571-36.571429 36.571429s14.628571 36.571429 36.571429 36.571429h182.857142v182.857142c0 21.942857 14.628571 36.571429 36.571429 36.571429s36.571429-14.628571 36.571429-36.571429v-182.857142h182.857142c21.942857 0 36.571429-14.628571 36.571429-36.571429s-14.628571-36.571429-36.571429-36.571429z" p-id="4401" fill="#CEB07D"></path></svg> <svg t="1662455996735" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4399" width="20" height="20"><path d="M512 0c-285.257143 0-512 226.742857-512 512s226.742857 512 512 512 512-226.742857 512-512-226.742857-512-512-512z m0 950.857143c-241.371429 0-438.857143-197.485714-438.857143-438.857143s197.485714-438.857143 438.857143-438.857143 438.857143 197.485714 438.857143 438.857143-197.485714 438.857143-438.857143 438.857143z" p-id="4400" fill="#CEB07D"></path><path d="M731.428571 475.428571h-182.857142v-182.857142c0-21.942857-14.628571-36.571429-36.571429-36.571429s-36.571429 14.628571-36.571429 36.571429v182.857142h-182.857142c-21.942857 0-36.571429 14.628571-36.571429 36.571429s14.628571 36.571429 36.571429 36.571429h182.857142v182.857142c0 21.942857 14.628571 36.571429 36.571429 36.571429s36.571429-14.628571 36.571429-36.571429v-182.857142h182.857142c21.942857 0 36.571429-14.628571 36.571429-36.571429s-14.628571-36.571429-36.571429-36.571429z" p-id="4401" fill="#CEB07D"></path></svg>
</text> </text> -->
</view> </view>
</view> </view>
<!-- 现金价值信息 --> <!-- 现金价值信息 -->
......
static/echarts.min.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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