Skip to content

C
CFFP-HB
Commit cf54edf2 by sunchao
Options

Merge branch 'apply' into dev

parents 141b1cd2 ab9acf4c
Showing with 542 additions and 30 deletions
components/eSignature/eSignature.vue
......@@ -9,7 +9,7 @@
</u-button> -->
<!-- <u-button @click="clear" type="warning" :plain="true" :ripple="true" ripple-bg-color="#909399">清除
</u-button> -->
<view class="imgBox">
<view class="imgBox" style="margin-top: 20rpx;">
<image src="../../static/clear.png" @click="clear" mode="widthFix"></image>
</view>
<!-- <u-button @click="close" type="error" :plain="true" :ripple="true" ripple-bg-color="#909399">关闭
......@@ -178,7 +178,7 @@
.mycanvas {
width: 100%;
// height: calc(100vh - 200upx);
height: calc(100vh - 400rpx);
height: calc(100vh - 600rpx);
background-color: #f9f9f9;
border-radius: 10px 10px 0 0;
}
......
components/search/search.vue
<template>
<view class="search">
<form action="" style="width: 98%;" @submit="searchBtn()">
<input class="searchInput" type="text" name="" id="" v-model="queryName" />
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
</form>
<input class="searchInput" type="text" name="" id="" v-model="queryName" @confirm="searchBtn()"/>
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
<text class="iconfont icon-xiaoxi"></text>
<text class="system_msg" @click="jumpToSystemMsg()">{{messageUnreadCount}}</text>
</view>
......@@ -76,11 +74,9 @@
display: flex;
margin: 30rpx auto;
align-items: center;
form{
width: 95%;
margin-right: 20rpx;
}
.searchInput{
margin-right: 20rpx;
width: 95%;
border-radius: 60rpx;
background: linear-gradient(to right,#E6F5FC,#FDE9F2);
padding: 15rpx;
......
pages/application-process/applyCommon.scss
.container {
font-size: 36rpx;
// background: #fff;
min-height: 100%;
// min-height: 100%;
overflow: auto;
padding-bottom: 80rpx;
// padding-bottom: 80rpx;
.wrapper{
background: #fff;
}
......
pages/application-process/bank-card.vue
......@@ -36,7 +36,7 @@
auto-blur=true @blur="checkInput(applyParam.bankAccountId)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view>
<view class="contentItem">
<text>再次输入银行卡号以确认</text>
<text>确认卡号</text>
<input class="form-control" placeholder="请输入" type="number" v-model="sureBankAccountId" maxlength="19"
auto-blur=true @blur="checkInput(sureBankAccountId)" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view>
......
pages/application-process/basic-info.vue
......@@ -261,6 +261,7 @@
for(let j=0;j<this.cffpAreaQuerys.length;j++){
if(this.applyParam.areaId == this.cffpAreaQuerys[j].areaId){
this.areaIdIdx = j;
console.log(j)
}
}
}
......
pages/application-process/signature.vue
<template>
<view class="container">
<template class="sign">
<view class="container" style="margin-bottom: 0;">
<view class="page">
<text class="num actived pass">1</text>
<text class="line line_pass"></text>
......@@ -124,14 +124,19 @@
<style lang="scss">
@import 'applyCommon.scss';
uni-page-wrapper{
overflow: hidden!important;
}
.signatureContent{
margin: 0 13px 20px 13px;
padding: 0 36rpx 20rpx 26rpx;
background: #fff;
margin-top: 20rpx;
height: 100%;
}
.signature_action{
display: flex;
justify-content: space-evenly;
margin-top: 20px;
uni-image{max-width: 60px;max-height: 60px;}
margin-top: 20rpx;
uni-image{max-width: 120rpx;max-height: 120rpx;}
}
</style>
\ No newline at end of file
pages/certifyDetail/certifyDetail.vue
......@@ -69,7 +69,7 @@
</view>
<!-- 报名按钮区域 -->
<view class="signBtnContent">
<view class="consultBtn">咨询客服</view>
<view class="consultBtn" @click="tokefu()">咨询客服</view>
<view class="signBtn" @click="getDetail()">
<text v-if="status == '1'">上传个人信息</text>
<text v-else-if="status == '3'">查看</text>
......@@ -147,6 +147,13 @@
},
dateFormat(val){
return dataHandling.dateFormat(val,'yyyy-MM-dd')
},
tokefu(){
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
uni.navigateTo({
url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转
})
}
}
}
......
pages/index/index.vue
<template>
<movable-area style="width: 100vw; height: 100vh; pointer-events:none; z-index: 9999;position:fixed;top:0;left:0;"
@tap="tokefu()">
<movable-view direction="all" style="width: 100rpx; pointer-events:auto; height: 80rpx;top: 50%;left: 85%;text-align: center;">
<image :src="kefu" mode="widthFix"></image>
<text style="font-size:20rpx;color: #1954fe;">在线客服</text>
</movable-view>
</movable-area>
<view class="container">
<view class="top">
<view class="compony">
......@@ -39,10 +46,6 @@
<courselist :tagIds="[1111]" :onlyShowList="0"></courselist>
</view>
<tabBar :currentPage="currentPage"></tabBar>
<view style="position: fixed;right: 0;top: 50%;" @click="tokefu()">
<image :src="kefu" mode="widthFix"></image>
在线客服
</view>
</view>
<uni-popup ref="popup" type="top" background-color="#fff">
<view class="description">
......@@ -60,6 +63,12 @@
export default {
data() {
return {
x: 0,
y: 0,
old: {
x: 0,
y: 0
},
featureLists:[
{ key: '00', name: '销售课程', icon: 'salesCourse', link: '/pages/saleCourseLists/saleCourseLists', isOpen: true },
{ key: '01', name: '我的积分', icon: 'integral', link: '/pages/myPoints/myPoints', isOpen: true },
......@@ -118,7 +127,6 @@
icon: 'none'
})
}
},
queryAreaCenterInfo(){
api.queryAreaCenterInfo({userId:this.userId}).then((res)=>{
......@@ -160,6 +168,11 @@
url:'../../pages/courselist/courselist'
})
},
onChange: function(e) {
console.log(e)
this.old.x = e.detail.x
this.old.y = e.detail.y
}
},
onShow() {
if(!uni.getStorageSync('isLogin')){
......@@ -179,6 +192,8 @@
.compony{
display: flex;
align-items:center;
max-height: 90rpx;
overflow: hidden;
.name{
font-size: 36rpx;
}
......
pages/myPoints/pointsDetail.vue
......@@ -148,7 +148,7 @@
// 查看订单详情
viewDetail(id){
uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${id}`
url:`/pages/orderDetail/orderDetail?id=${id}&commissionType=${this.commissionType}`
})
}
}
......@@ -164,6 +164,12 @@
align-items: center;
margin: 0 auto 20rpx auto;
background: #fff;
.icon-youjiantou{
transform: rotate(90deg);
width: 16px;
height: 16px;
display: inline-block;
}
}
.total_wrapper{
display: flex;
......@@ -205,7 +211,6 @@
border-bottom: 2rpx #F2F2F2 solid;
padding-bottom: 20rpx;
}
}
}
......
pages/orderConfirm/orderConfirm.vue
......@@ -202,6 +202,16 @@
}else{
this.paymentBtnDisabled = false;
uni.showModal({
content: res['message'],
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
})
......
pages/orderDetail/orderDetail.vue
......@@ -46,14 +46,16 @@
{id:13,name:'观看截至',value:'/',type:'string',alias:'effectiveEndDate',pageArea:2}
],
type:'',
orderDetail:{}
orderDetail:{},
commissionType:null
};
},
methods:{
userCourseInfo(){
const param = {
userId:this.userId,
orderId:this.orderId
orderId:this.orderId,
commissionType:this.commissionType
}
api.userCourseInfo(param).then(res=>{
if(res['success']){
......@@ -79,8 +81,9 @@
this.userCourseInfo();
},
onLoad(option) {
this.orderId = option.id
this.type = option.type
this.orderId = option.id;
this.type = option.type;
this.commissionType = option.commissionType;
}
}
......
pages/withdrawal/withdrawal.vue
......@@ -110,6 +110,16 @@
this.partnerTradeNo = null;
this.taxAmount = 0;
this.noTaxAmount = 0;
uni.showModal({
content: res['message'],
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
})
},
......@@ -184,8 +194,11 @@
amount:this.exchangeAmount,
userId:uni.getStorageSync('cffp_userId'),
}
console.log(this.aliWithdrawalResVO)
api.isAuth(this.aliWithdrawalResVO).then((res)=>{
console.log(res)
if(res['success']){
this.aliWithdrawalResVO.aliUserId = res['data']['aliUserId'];
if(res['data']['isAuth'] == 1){
if(this.paymentMethod == 1){
this.wxWithdrawal();
......
uni_modules/uni-search-bar/changelog.md 0 → 100644
## 1.2.3（2022-05-24）
- 新增 readonly 属性，组件只读
## 1.2.2（2022-05-06）
- 修复 vue3 input 事件不生效的bug
## 1.2.1（2022-05-06）
- 修复 多余代码导致的bug
## 1.2.0（2021-11-19）
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
## 1.1.2（2021-08-30）
- 修复 value 属性与 modelValue 属性不兼容的Bug
## 1.1.1（2021-08-24）
- 新增 支持国际化
## 1.1.0（2021-07-30）
- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.0.9（2021-05-12）
- 新增 项目示例地址
## 1.0.8（2021-04-21）
- 优化 添加依赖 uni-icons, 导入后自动下载依赖
## 1.0.7（2021-04-15）
- uni-ui 新增 uni-search-bar 的 focus 事件
## 1.0.6（2021-02-05）
- 优化 组件引用关系，通过uni_modules引用组件
## 1.0.5（2021-02-05）
- 调整为uni_modules目录规范
- 新增 支持双向绑定
- 更改 input 事件的返回值，e={value:Number} --> e=value
- 新增 支持图标插槽
- 新增 支持 clear、blur 事件
- 新增 支持 focus 属性
- 去掉组件背景色
uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json 0 → 100644
{
"uni-search-bar.cancel": "cancel",
"uni-search-bar.placeholder": "Search enter content"
}
\ No newline at end of file
uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js 0 → 100644
import en from './en.json'
import zhHans from './zh-Hans.json'
import zhHant from './zh-Hant.json'
export default {
en,
'zh-Hans': zhHans,
'zh-Hant': zhHant
}
uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json 0 → 100644
{
"uni-search-bar.cancel": "cancel",
"uni-search-bar.placeholder": "请输入搜索内容"
}
uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json 0 → 100644
{
"uni-search-bar.cancel": "cancel",
"uni-search-bar.placeholder": "請輸入搜索內容"
}
uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue 0 → 100644
<template>
<view class="uni-searchbar">
<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
@click="searchClick">
<view class="uni-searchbar__box-icon-search">
<slot name="searchIcon">
<uni-icons color="#c0c4cc" size="18" type="search" />
</slot>
</view>
<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal"
@confirm="confirm" @blur="blur" @focus="emitFocus" />
<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
class="uni-searchbar__box-icon-clear" @click="clear">
<slot name="clearIcon">
<uni-icons color="#c0c4cc" size="20" type="clear" />
</slot>
</view>
</view>
<text @click="cancel" class="uni-searchbar__cancel"
v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
</view>
</template>
<script>
import {
initVueI18n
} from '@dcloudio/uni-i18n'
import messages from './i18n/index.js'
const {
t
} = initVueI18n(messages)
/**
* SearchBar 搜索栏
* @description 搜索栏组件，通常用于搜索商品、文章等
* @tutorial https://ext.dcloud.net.cn/plugin?id=866
* @property {Number} radius 搜索栏圆角
* @property {Number} maxlength 输入最大长度
* @property {String} placeholder 搜索栏Placeholder
* @property {String} clearButton = [always|auto|none] 是否显示清除按钮
* @value always 一直显示
* @value auto 输入框不为空时显示
* @value none 一直不显示
* @property {String} cancelButton = [always|auto|none] 是否显示取消按钮
* @value always 一直显示
* @value auto 输入框不为空时显示
* @value none 一直不显示
* @property {String} cancelText 取消按钮的文字
* @property {String} bgColor 输入框背景颜色
* @property {Boolean} focus 是否自动聚焦
* @property {Boolean} readonly 组件只读，不能有任何操作，只做展示
* @event {Function} confirm uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value，e={value:Number}
* @event {Function} input uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value，e=value
* @event {Function} cancel 点击取消按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
* @event {Function} clear 点击清除按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
* @event {Function} blur input失去焦点时触发事件，返回参数为uniSearchBar的value，e={value:Number}
*/
export default {
name: "UniSearchBar",
emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
props: {
placeholder: {
type: String,
default: ""
},
radius: {
type: [Number, String],
default: 5
},
clearButton: {
type: String,
default: "auto"
},
cancelButton: {
type: String,
default: "auto"
},
cancelText: {
type: String,
default: '取消'
},
bgColor: {
type: String,
default: "#F8F8F8"
},
maxlength: {
type: [Number, String],
default: 100
},
value: {
type: [Number, String],
default: ""
},
modelValue: {
type: [Number, String],
default: ""
},
focus: {
type: Boolean,
default: false
},
readonly: {
type: Boolean,
default: false
}
},
data() {
return {
show: false,
showSync: false,
searchVal: ''
}
},
computed: {
cancelTextI18n() {
return this.cancelText || t("uni-search-bar.cancel")
},
placeholderText() {
return this.placeholder || t("uni-search-bar.placeholder")
}
},
watch: {
// #ifndef VUE3
value: {
immediate: true,
handler(newVal) {
this.searchVal = newVal
if (newVal) {
this.show = true
}
}
},
// #endif
// #ifdef VUE3
modelValue: {
immediate: true,
handler(newVal) {
this.searchVal = newVal
if (newVal) {
this.show = true
}
}
},
// #endif
focus: {
immediate: true,
handler(newVal) {
if (newVal) {
if(this.readonly) return
this.show = true;
this.$nextTick(() => {
this.showSync = true
})
}
}
},
searchVal(newVal, oldVal) {
this.$emit("input", newVal)
// #ifdef VUE3
this.$emit("update:modelValue", newVal)
// #endif
}
},
methods: {
searchClick() {
if(this.readonly) return
if (this.show) {
return
}
this.show = true;
this.$nextTick(() => {
this.showSync = true
})
},
clear() {
this.$emit("clear", {
value: this.searchVal
})
this.searchVal = ""
},
cancel() {
if(this.readonly) return
this.$emit("cancel", {
value: this.searchVal
});
this.searchVal = ""
this.show = false
this.showSync = false
// #ifndef APP-PLUS
uni.hideKeyboard()
// #endif
// #ifdef APP-PLUS
plus.key.hideSoftKeybord()
// #endif
},
confirm() {
// #ifndef APP-PLUS
uni.hideKeyboard();
// #endif
// #ifdef APP-PLUS
plus.key.hideSoftKeybord()
// #endif
this.$emit("confirm", {
value: this.searchVal
})
},
blur() {
// #ifndef APP-PLUS
uni.hideKeyboard();
// #endif
// #ifdef APP-PLUS
plus.key.hideSoftKeybord()
// #endif
this.$emit("blur", {
value: this.searchVal
})
},
emitFocus(e) {
this.$emit("focus", e.detail)
}
}
};
</script>
<style lang="scss">
$uni-searchbar-height: 36px;
.uni-searchbar {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
position: relative;
padding: 10px;
// background-color: #fff;
}
.uni-searchbar__box {
/* #ifndef APP-NVUE */
display: flex;
box-sizing: border-box;
/* #endif */
overflow: hidden;
position: relative;
flex: 1;
justify-content: center;
flex-direction: row;
align-items: center;
height: $uni-searchbar-height;
padding: 5px 8px 5px 0px;
}
.uni-searchbar__box-icon-search {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: row;
// width: 32px;
padding: 0 8px;
justify-content: center;
align-items: center;
color: #B3B3B3;
}
.uni-searchbar__box-search-input {
flex: 1;
font-size: 14px;
color: #333;
}
.uni-searchbar__box-icon-clear {
align-items: center;
line-height: 24px;
padding-left: 8px;
/* #ifdef H5 */
cursor: pointer;
/* #endif */
}
.uni-searchbar__text-placeholder {
font-size: 14px;
color: #B3B3B3;
margin-left: 5px;
}
.uni-searchbar__cancel {
padding-left: 10px;
line-height: $uni-searchbar-height;
font-size: 14px;
color: #333333;
/* #ifdef H5 */
cursor: pointer;
/* #endif */
}
</style>
uni_modules/uni-search-bar/package.json 0 → 100644
{
"id": "uni-search-bar",
"displayName": "uni-search-bar 搜索栏",
"version": "1.2.3",
"description": "搜索栏组件，通常用于搜索商品、文章等",
"keywords": [
"uni-ui",
"uniui",
"搜索框",
"搜索栏"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
},
"uni_modules": {
"dependencies": [
"uni-scss",
"uni-icons"
],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}
\ No newline at end of file
uni_modules/uni-search-bar/readme.md 0 → 100644
## SearchBar 搜索栏
> **组件名：uni-search-bar**
> 代码块： `uSearchBar`
搜索栏组件
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
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