Commit 56a813fa authored by 不吃草的咩's avatar 不吃草的咩

修改介绍

parent e0543f3f
...@@ -140,7 +140,8 @@ ...@@ -140,7 +140,8 @@
"van-search": "/vantPackage/search/index", "van-search": "/vantPackage/search/index",
"van-tab": "/vantPackage/tab/index", "van-tab": "/vantPackage/tab/index",
"van-tabs": "/vantPackage/tabs/index", "van-tabs": "/vantPackage/tabs/index",
"van-empty": "/vantPackage/empty/index" "van-empty": "/vantPackage/empty/index",
"van-image": "/vantPackage/image/index"
}, },
"tabBar": { "tabBar": {
"color": "#aaaaaa", "color": "#aaaaaa",
......
...@@ -12,8 +12,8 @@ export const colorUI = new ColorUI({ ...@@ -12,8 +12,8 @@ export const colorUI = new ColorUI({
tabBar: [ tabBar: [
{ {
title: '首页', title: '首页',
icon: '/static/tab_icon/document.png', icon: '/static/tab_icon/home.png',
curIcon: '/static/tab_icon/document_cur.png', curIcon: '/static/tab_icon/homeCheck.png',
url: '/pages/home/home', url: '/pages/home/home',
type: 'tab' type: 'tab'
}, },
...@@ -55,7 +55,7 @@ export const colorUI = new ColorUI({ ...@@ -55,7 +55,7 @@ export const colorUI = new ColorUI({
{ {
title: '查询', title: '查询',
icon: '/static/tab_icon/order.png', icon: '/static/tab_icon/order.png',
curIcon: '/static/tab_icon/my_cur.png', curIcon: '/static/tab_icon/orderCheck.png',
url: '/pages/order/order', url: '/pages/order/order',
type: 'tab' type: 'tab'
} }
......
...@@ -15,6 +15,7 @@ export const colorUISdk = new ColorUISdk({ ...@@ -15,6 +15,7 @@ export const colorUISdk = new ColorUISdk({
// url: 'http://101.42.222.235:8050/' // url: 'http://101.42.222.235:8050/'
// url:'http://jbzhang.censoft.com.cn/' // url:'http://jbzhang.censoft.com.cn/'
url: 'http://jjliu.censoft.com.cn/' url: 'http://jjliu.censoft.com.cn/'
// url: 'http://192.168.15.249:8010/'
}, },
//本地环境 //本地环境
host: { host: {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<navigator url="{{navurl}}" class="flex radius doc-card-navigator {{'bg-'+colorName+'-gradient'}}"> <navigator url="{{navurl}}" class="flex radius doc-card-navigator {{'bg-'+colorName+'-gradient'}}">
<view class="flex-sub p-4 doc-text"> <view class="flex-sub p-4 doc-text">
<view class="doc-title">{{ data.courseName }}</view> <view class="doc-title">{{ data.courseName }}</view>
<view class="text-lg text-Abc text-lighter doc-name">{{ data.remark }}</view> <view class="text-lg text-Abc text-lighter doc-name">{{ data.content }}</view>
</view> </view>
<view class="mt-2 mr-1 pt-4 pr-4 pl-2 doc-icon"> <view class="mt-2 mr-1 pt-4 pr-4 pl-2 doc-icon">
<text class="icon-xl text-xl {{data.icon}}"/> <text class="icon-xl text-xl {{data.icon}}"/>
......
...@@ -12,7 +12,6 @@ Page({ ...@@ -12,7 +12,6 @@ Page({
name:'', name:'',
note:'', note:'',
price:'', price:'',
showPrice:0,
} }
}, },
onClickLeft(){ onClickLeft(){
...@@ -40,15 +39,16 @@ Page({ ...@@ -40,15 +39,16 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log(options);
let {name,note,price,id} = options; let {name,note,price,id} = options;
let showPrice = (parseInt(price * 100) ) / 10000; //价格处理
if((price.toString()).indexOf('.') == -1){
price = price+=".00";
}
this.setData({ this.setData({
["course.name"]:name == 'null' ? '' : name, ["course.name"]:name == 'null' ? '' : name,
["course.note"]:note == 'null' ? '暂无介绍' : note, ["course.note"]:note == 'null' ? '暂无介绍' : note,
["course.price"]:price == 'null' ? '' : price, ["course.price"]:price == 'null' ? '' : price,
["course.id"]:id, ["course.id"]:id,
["course.showPrice"]:showPrice
}) })
}, },
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<van-cell title="课程名称" value="{{course.name}}" /> <van-cell title="课程名称" value="{{course.name}}" />
<van-cell title="课程简介" value="{{course.note}}" /> <van-cell title="课程简介" value="{{course.note}}" />
<van-cell title="课程价格"> <van-cell title="课程价格">
<view><text>¥</text><text class="price">{{course.showPrice}}元</text></view> <view><text>¥</text><text class="price">{{course.price}}元</text></view>
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
<view class="btn"> <view class="btn">
......
...@@ -5,17 +5,19 @@ Page({ ...@@ -5,17 +5,19 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
jgTitle:'' jgTitle:'',
isShow:""
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log(options.type);
if(options.type == '0'){ if(options.type == '0'){
this.setData({jgTitle:'机构介绍'}) this.setData({jgTitle:'机构介绍',isShow:options.type})
}else{ }else if(options.type == '1'){
this.setData({jgTitle:'报名指南'}) this.setData({jgTitle:'报名指南',isShow:options.type})
} }
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ui-navbar backtext="返回" isCenter> <ui-navbar backtext="返回" isCenter>
<text slot="center">{{jgTitle}}</text> <text slot="center">{{jgTitle}}</text>
</ui-navbar> </ui-navbar>
<view class="box"> <view class="box" wx:if="{{isShow == '0'}}">
<view class="im"> <view class="im">
<image style="width: 200rpx; height: 200rpx;" mode="aspectFit" src="../../../static/logo.jpg"></image> <image style="width: 200rpx; height: 200rpx;" mode="aspectFit" src="../../../static/logo.jpg"></image>
</view> </view>
...@@ -19,5 +19,31 @@ ...@@ -19,5 +19,31 @@
  推动通信企业改善产品质量,提高服务水平,维护消费者的合法权益。根据政府授权,承担通信服务质量有关工作。   推动通信企业改善产品质量,提高服务水平,维护消费者的合法权益。根据政府授权,承担通信服务质量有关工作。
  组织开展通信行业技术、业务、管理、法规等培训工作。   组织开展通信行业技术、业务、管理、法规等培训工作。
</text></view> </text></view>
<ui-title title="无线高级讲师" depth="2" isIcon ui="ml-3"/>
<view class="teacher">
<van-image fit="widthFix" width="280rpx" src="https://img.yzcdn.cn/vant/cat.jpeg"/>
<view class="teacher-right">
<view class="name"><text class="ming">授课讲师:</text> <text class="zi">王老师</text></view>
<view class="teach-title"><text class="ming">授课风格:</text> 讲课风格风趣幽默,思路清晰,不失严谨。15年通信行业从业工作经验,8年培训交付经历,主要面向运营商和行业企业客户,提供LTE网络优化培训、VoLTE网络优化培训、NB-IoT网络优化培训及5G产品与技术培训与咨询服务。拥有多个厂家的中高级认证证书和中级职称,善于引导学员主动思考,积极响应学员的各种提问,受到学员一致好评。</view>
</view>
</view>
<ui-title title="无线高级讲师" depth="2" isIcon ui="ml-3"/>
<view class="teacher">
<van-image fit="widthFix" width="280rpx" src="https://img.yzcdn.cn/vant/cat.jpeg"/>
<view class="teacher-right">
<view class="name"><text class="ming">授课讲师:</text><text class="zi">陆老师</text></view>
<view class="teach-title"><text class="ming">授课风格:</text> 从事多年移动通信现场优化以及厂商培训工作,曾获华为、中兴等厂商网优中级认证证书,以及多个省级移动等运营商中级考试。在网络优化方面工作多年,有丰富的项目经验,致力于通信理论知识以及4/5G网络优化实际操作方面的教学,在培养学员动手能力和处理问题的能力上有着丰富的经验。并且开发了关于4/5G原理、无线网络测试等大量的课程和视频资料。
</view>
</view>
</view>
<ui-title title="招聘企业" depth="2" isIcon ui="ml-3"/>
<view class="zp">
<image fit="aspectFit" class="tu" src="../../../static/huasu.png"></image>
<image fit="aspectFit" class="tu" src="../../../static/nanjing.jpg"></image>
<image fit="aspectFit" class="tu" src="../../../static/zhongyou.png"></image>
</view>
</view>
<view class="box" wx:elif="{{isShow == '1'}}">
2345654323456754345
</view> </view>
</ui-sys> </ui-sys>
...@@ -42,3 +42,33 @@ ...@@ -42,3 +42,33 @@
.ml-3{ .ml-3{
margin:20rpx 0 20rpx !important; margin:20rpx 0 20rpx !important;
} }
.teacher{
width: 100%;
display: flex;
flex-wrap: nowrap;
justify-content: space-between;
}
.teacher-right{
width: 400rpx;
}
.ming{
font-size: 30rpx;
color: darkgray;
}
.teacher-right .name .zi{
font-size: 26rpx;
}
.teach-title{
margin-top: 10rpx;
font-size: 24rpx;
line-height: 1.2;
}
.zp{
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.tu{
width: 100%;
}
...@@ -120,7 +120,7 @@ Page({ ...@@ -120,7 +120,7 @@ Page({
console.log(event.detail); console.log(event.detail);
//根据选中状态,请求下面列表,动态生成列表项 //根据选中状态,请求下面列表,动态生成列表项
app.colorUISdk.request({ app.colorUISdk.request({
url:'dictionary/listByPar3', url:'infocourse/byParentKey',
method: 'GET', method: 'GET',
data: { data: {
parentKey:value.constantKey parentKey:value.constantKey
...@@ -203,9 +203,15 @@ Page({ ...@@ -203,9 +203,15 @@ Page({
// if(options.price == null || options.price == undefined){ // if(options.price == null || options.price == undefined){
// price = // price =
// } // }
let price = '';
app.courseId = options.id; app.courseId = options.id;
if((options.price.toString()).indexOf('.') == -1){
price = options.price+=".00";
}else{
price = options.price;
}
let phone = app.phone == '' ? wx.getStorageSync('phone') : app.phone; let phone = app.phone == '' ? wx.getStorageSync('phone') : app.phone;
let price = (parseInt(options.price) * 100) / 10000; // price = parseInt(price * 100);
let id = app.courseId let id = app.courseId
this.setData({ this.setData({
["fromDate.price"]:price, ["fromDate.price"]:price,
...@@ -215,7 +221,7 @@ Page({ ...@@ -215,7 +221,7 @@ Page({
}); });
//获取课程类型,动态生成列表 //获取课程类型,动态生成列表
app.colorUISdk.request({ app.colorUISdk.request({
url:'dictionary/listByPar2', url:'infocourse/ckByCourseId',
method: 'GET', method: 'GET',
data: { data: {
courseId:id courseId:id
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
.txt{ .txt{
font-size: 22rpx; font-size: 28rpx;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
color: black; color: black;
font-weight: 600; font-weight: 600;
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
} }
} }
.placeholder,.van-field__placeholder,.van-field__control{ .placeholder,.van-field__placeholder,.van-field__control{
font-size: 22rpx !important; font-size: 28rpx !important;
color: #cdced1 !important ; color: #cdced1 !important ;
} }
.price{ .price{
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
text-align: right; text-align: right;
.tit{ .tit{
font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif;
font-size: 22rpx; font-size: 28rpx;
color: black; color: black;
text-align: right; text-align: right;
padding-right: 20rpx; padding-right: 20rpx;
} }
.pri{ .pri{
font-size: 22rpx; font-size: 32rpx;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
color: brown; color: brown;
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
<view class="price"><text class="tit">培训费用</text><text class="pri">¥{{fromDate.price}}元</text></view> <view class="price"><text class="tit">培训费用</text><text class="pri">¥{{fromDate.price}}元</text></view>
<view class="price"><text class="tit">审核后需支付费用</text><text class="pri">¥{{fromDate.price}}元</text></view> <!-- <view class="price"><text class="tit">审核后需支付费用</text><text class="pri">¥{{fromDate.price}}元</text></view> -->
<view class="price"> <view class="price">
<van-button type="default" block color="#1989fa" bind:click="nextCard">下一步,上传资料</van-button> <van-button type="default" block color="#1989fa" bind:click="nextCard">下一步,上传资料</van-button>
</view> </view>
......
...@@ -5,8 +5,8 @@ Page({ ...@@ -5,8 +5,8 @@ Page({
isLogin:false, isLogin:false,
diyige:{icon: 'cicon-avatar', name: '通信企业协会', title: '机构介绍' }, diyige:{icon: 'cicon-avatar', name: '通信企业协会', title: '机构介绍' },
jgDetail:[ jgDetail:[
{icon: 'cicon-avatar', remark: '机构的介绍', courseName: '机构介绍',params:{type:'1',name:'23'}}, {icon: 'cicon-avatar', content: '中国通信企业协会是经民政部核准注册登记,由信息通信行业基础运营、信息服务、设备制造、工程建设、网络运维', courseName: '机构介绍',params:{type:'1',name:'23'}},
{icon: 'cicon-avatar', remark: '你不知道的报名指南', courseName: '报名指南',params:{type:'0',name:'23'}} {icon: 'cicon-avatar', content: '你不知道的报名指南', courseName: '报名指南',params:{type:'0',name:'23'}}
], ],
scrollTop: 0, scrollTop: 0,
swiperList: [ swiperList: [
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<block wx:for="{{courseData}}" wx:for-index="id" wx:key="course_index"> <block wx:for="{{courseData}}" wx:for-index="id" wx:key="course_index">
<view class="ui-item p-3" > <view class="ui-item p-3" >
<app-nav-li data="{{item}}" tabBg="KELB" navurl="/pages/document/coursedetails/coursedetails?price={{item.cost}}&name={{item.courseName}}&note={{item.remark}}&id={{item.id}}"/> <app-nav-li data="{{item}}" tabBg="KELB" navurl="/pages/document/coursedetails/coursedetails?price={{item.cost}}&name={{item.courseName}}&note={{item.content}}&id={{item.id}}"/>
</view> </view>
</block> </block>
</view> </view>
......
...@@ -13,9 +13,12 @@ ...@@ -13,9 +13,12 @@
text{ text{
color:"#969799"; color:"#969799";
height: 18px; height: 18px;
font-size:12px; font-size:28rpx;
line-height: 18px; line-height: 18px;
margin-top:3px; margin-top:3px;
.liClor{
color: #ee0a24;
}
} }
} }
.cell-index--van-cell__title{ .cell-index--van-cell__title{
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<van-cell-group> <van-cell-group>
<van-cell title="{{item.courseName}}" label="订单日期:{{item.successTime}}" center wx:for="{{list}}" wx:key="index"> <van-cell title="{{item.courseName}}" label="订单日期:{{item.successTime}}" center wx:for="{{list}}" wx:key="index">
<view class="gao"> <view class="gao">
<van-button type="primary" size="small" bind:click="orderDetail" data-item="{{item}}">查看详情</van-button> <van-button type="primary" size="mini" bind:click="orderDetail" data-item="{{item}}">查看详情</van-button>
<text>¥{{item.payerTotal}}元</text> <text>¥<text class="liClor">{{item.payerTotal}}</text>元</text>
</view> </view>
</van-cell> </van-cell>
......
...@@ -7,3 +7,6 @@ ...@@ -7,3 +7,6 @@
.scroll-view-item{ .scroll-view-item{
padding: 20rpx; padding: 20rpx;
} }
.ml-3{
margin: 20rpx 0 20rpx !important;
}
\ No newline at end of file
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<ui-navbar isCenter> <ui-navbar isCenter>
<text slot="center">{{isperson}}</text> <text slot="center">{{isperson}}</text>
</ui-navbar> </ui-navbar>
<view class="ui-container"> <view class="ui-container">
<block >
<ui-title title="课程列表" depth="2" isIcon ui="ml-3"/> <ui-title title="课程列表" depth="2" isIcon ui="ml-3"/>
<block >
<view class="ui-grid ui-cols-2"> <view class="ui-grid ui-cols-2">
<block wx:for="{{courseData}}" wx:for-index="id" wx:key="course_index"> <block wx:for="{{courseData}}" wx:for-index="id" wx:key="course_index">
<view class="ui-item p-3"> <view class="ui-item p-3">
......
...@@ -223,6 +223,7 @@ Page({ ...@@ -223,6 +223,7 @@ Page({
message: '订单生成中,请稍候。。。', message: '订单生成中,请稍候。。。',
forbidClick: true, forbidClick: true,
loadingType: 'spinner', loadingType: 'spinner',
duration:0
}); });
app.colorUISdk.request({ app.colorUISdk.request({
url: "infostudent/studentSave", url: "infostudent/studentSave",
...@@ -246,19 +247,24 @@ Page({ ...@@ -246,19 +247,24 @@ Page({
}).then((res) => { }).then((res) => {
console.log(res) console.log(res)
if (res.code == 0) { if (res.code == 0) {
Toast.clear(); toast.message ="订单创建成功,请稍候。。。"
let openid = wx.getStorageSync('openid'); let openid = wx.getStorageSync('openid');
let studentId = res.studentId; let studentId = res.studentId;
app.colorUISdk.request({ app.colorUISdk.request({
url: `wx/pay_one?openid=${openid}&price=${parseInt(app.information.price * 100) }&studentId=${res.studentId}`, url: `wx/pay_one?openid=${openid}&price=${parseInt(app.information.price * 100)}&studentId=${studentId}`,
//&phone=${app.information.phone}&price=${parseInt(app.information.price * 100)}&courseId=${app.information.id} //&phone=${app.information.phone}&price=${parseInt(app.information.price * 100)}&courseId=${app.information.id}
method: 'POST' method: 'POST',
data:{}
}).then(({ }).then(({
prepay_info, prepay_info,
sign_info sign_info,
code
}) => { }) => {
console.log(prepay_info); console.log(prepay_info);
console.log(sign_info); console.log(sign_info);
console.log(code);
if(code == 0){
Toast.clear();
if (prepay_info !== undefined && sign_info !== undefined) { if (prepay_info !== undefined && sign_info !== undefined) {
wx.requestPayment({ wx.requestPayment({
"timeStamp": sign_info.timeStamp, "timeStamp": sign_info.timeStamp,
...@@ -316,6 +322,11 @@ Page({ ...@@ -316,6 +322,11 @@ Page({
}; };
}) })
} }
}else{
Toast.clear();
Toast.fail('服务器异常,请稍候');
}
}).catch(err => { }).catch(err => {
......
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