Commit bac032f6 by biao

111

parent 8b51d927
......@@ -17,7 +17,7 @@ define("SERVICE_NAME", "指南针");
// 服务器配置
define("DOMAIN_NAME", "compass.koala-online.cn");
define("HOST_NAME", "compass.koala-online.cn");
define("SSL_PATH", "compass.koala-online.cn/user");
define("SSL_PATH", "www.koala-online.cn/compass");
// 数据库配置
define("COMPASS_DB", "compass_develop_db");
......
......@@ -36,6 +36,9 @@ class PayNotifyCallBack extends WxPayNotify
$msg = "订单查询失败";
return false;
}
ErrorLogger::doOutput("Compass...api_wx_pay_notify.php.....out_trade_no=" . $data["out_trade_no"], 0);
$type = substr($data["out_trade_no"],0,1);
switch($type){
......@@ -63,7 +66,7 @@ class PayNotifyCallBack extends WxPayNotify
$userPayLog->user_id = $userMst->id;
$userPayLog->user_name = $userMst->name;
$userPayLog->action_type = "MEDIA";
$userPayLog->money = $userMediaDat->price;
$userPayLog->money = $userMediaDat->money;
$userPayLog->save();
break;
......@@ -87,7 +90,7 @@ class PayNotifyCallBack extends WxPayNotify
$userDonation->save();
//添加用户支付记录汇总
$userMst = UserMst::getById($userMediaDat->user_id);
$userMst = UserMst::getById($userDonation->user_id);
$userPayLog = new UserPayLog();
$userPayLog->user_id = $userMst->id;
$userPayLog->user_name = $userMst->name;
......@@ -114,7 +117,7 @@ class PayNotifyCallBack extends WxPayNotify
$userBuyMemberDat->save();
//添加用户支付记录汇总
$userMst = UserMst::getById($userMediaDat->user_id);
$userMst = UserMst::getById($userBuyMemberDat->user_id);
$userPayLog = new UserPayLog();
$userPayLog->user_id = $userMst->id;
$userPayLog->user_name = $userMst->name;
......
......@@ -46,6 +46,8 @@ $userMediaDat->order_no = $orderNo;
$userMediaDat->status = "NEW";
$userMediaDat->save();
ErrorLogger::doOutput("Compass...ajax_buy_course_media.php....SetNotify_url=" . "https://" . SSL_PATH . "/api/api_wx_pay_notify.php", 0);
//调用微信支付接口
$tools = new JsApiPay();
$input = new WxPayUnifiedOrder();
......
......@@ -54,6 +54,21 @@ if($courseMediaDat->course_id == 0) {
$teacherProfile = $courseMediaDat->teacher_profile;
$frontImage = $courseMediaDat->front_image;
$courseComment = $courseMediaDat->comment;
//是否购买本视频
$courseMediaDat->haveBuy = false;
if($courseMediaDat->is_free==false) {
//收费课程的情况下,判断用户是否已经购买本课程
$param = array();
$param['user_id'] = $userMst->id;
$param['media_id'] = $courseMediaDat->id;
$param['is_free'] = false;
$param['status'] = 'SUCCESS';
$param['delete_flg'] = false;
$userMstBuyList = UserMediaDat::getList($param, "id", "desc", 0, 1);
if(!empty($userMstBuyList)) {
$courseMediaDat->haveBuy = true;
}
}
} else {
//合集视频
$courseMst = CourseMst::getById($courseMediaDat->course_id);
......@@ -70,7 +85,7 @@ if($courseMediaDat->course_id == 0) {
if(!empty($tmpList)) {
foreach($tmpList as $tmp) {
$tmp->haveBuy = false;
if(!$tmp->is_free==false) {
if($tmp->is_free==false) {
//收费课程的情况下,判断用户是否已经购买本课程
$param = array();
$param['user_id'] = $userMst->id;
......
......@@ -126,6 +126,9 @@ video, live-player, live-pusher, open-data, web-view {
text-align: right;
box-sizing: border-box;
padding-right: 5px;
font-size: 14px;
font-weight: bold;
color: #1e1e1e;
}
.formtable>view>van-cell-group{
flex: 1
......@@ -134,17 +137,20 @@ video, live-player, live-pusher, open-data, web-view {
padding: 0;
}
.formtable input{
text-align: left;
box-sizing: border-box;
padding-left: 8px;
height: 30px;
line-height: 30px;
border: 1px solid #ccc;
border-bottom: 1px solid #ccc;
font-size: 13px;
text-align: center;
color: #f0f0f0;
}
.button button{
padding: 15px 40px;
padding: 20px 90px;
border-radius: 5px;
background: #ffffe2;
background: #0D76ED;
color: #fff;
}
.tr{
......@@ -317,3 +323,21 @@ video, live-player, live-pusher, open-data, web-view {
.lookmore{
color: #599eff!important;
}
.listNull{
width: 100%;
display: block!important;
box-sizing: border-box;
padding-bottom: 20px;
}
.listNull>image{
display: block;
width: 80px;
height: 80px;
margin: 0 auto;
}
.listNull>view{
width: 150px;
margin: 0 auto;
font-size: 12px;
color: #ccc;
}
\ No newline at end of file
......@@ -6,13 +6,17 @@ Page({
* 页面的初始数据
*/
data: {
circleId:0,
isOwner:false,
circleDat:null,
noticeDat:null
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
//获取圈子信息
this.circleinfo()
},
......@@ -31,56 +35,30 @@ Page({
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
//跳转到圈子成员
circleMembers(){
wx.navigateTo({
url: '../circleMembers/circleMembers',
});
wx.setNavigationBarTitle({
title: '成员管理'
})
},
//圈子公告
circleNews(){
wx.navigateTo({
url: '../circleNotice/circleNotice',
})
},
//获取圈子信息
circleinfo() {
var that = this;
var config = wx.getStorageSync('config');
var jingweidu = wx.getStorageSync('jingweidu');
wx: wx.request({
url: app.url + 'ajax_get_circle_info.php',
data: {
......@@ -94,6 +72,9 @@ Page({
success: function (res) {
console.log(res)
if (res.statusCode == 200) {
if (res.data.status == "OK") {
}
if(res.data.result.isOwner==true){
}
......@@ -103,12 +84,16 @@ Page({
complete: function (res) { },
})
},
activefabu(){
//发布活动
newCircleEvent(){
wx.navigateTo({
url: '../newCircleEvent/newCircleEvent',
})
},
activeguanli(){
//活动管理
circleEvents(){
wx.navigateTo({
url: '../circleEvents/circleEvents',
})
......
......@@ -5,7 +5,7 @@
<van-grid>
<van-grid-item icon="photo-o" text="圈子编辑" />
<van-grid-item icon="photo-o" text="成员管理" bind:click="circleMembers" />
<van-grid-item icon="photo-o" text="活动管理" bind:click="activeguanli" />
<van-grid-item icon="photo-o" text="活动管理" bind:click="circleEvents" />
<van-grid-item icon="photo-o" text="消息通知" bind:click="circleNews" />
</van-grid>
</view>
......@@ -27,5 +27,5 @@
<image src='../../img/1.jpg'></image>
</view>
</view>
<view class='activefabu' bindtap='activefabu'>活动发布</view>
<view class='activefabu' bindtap='newCircleEvent'>活动发布</view>
</view>
......@@ -15,12 +15,22 @@
<!--添加底部弹出对话框开始-->
<view class='bot_myCertificate' wx:if="{{inpShow==true}}">
<view class='con_bot_myCertificate'>
<view class='top_myCertificate' style='justify-content: center;border-bottom:none'>请填写详细信息</view>
<view>
<text>收件人</text>
<input placeholder='请输入姓名' value='{{name}}' bindinput='changeName'></input>
</view>
<view>
<text>手机号</text>
<input placeholder='请输入手机号' value='{{mobile}}' bindinput='changeMobile'></input>
</view>
<view>
<text>详细地址</text>
<input placeholder='请输入收件地址' value='{{address}}' bindinput='changeAddress'></input>
</view>
<view class='btnBot'>
<view bindtap='backApplyCertificate'>取消</view>
<view style='background:#00C56B;' bindtap='sureApplyCertificate'>确定</view>
<view bindtap='backApplyCertificate' style='background:#979797;'>取消</view>
<view style='background:#ed4848;' bindtap='sureApplyCertificate'>确定</view>
</view>
</view>
</view>
......
......@@ -42,26 +42,44 @@ page{
height: 100%;
background: rgba(0,0,0,0.5)
}
top_myCertificate{
width: 100%;
text-align: center;
font-size: 13px;
}
.con_bot_myCertificate{
position: absolute;
bottom: 0;
left: 0;
right: 0;
margin: auto;
width: 80%;
height: 150px;
width: 90%;
height: 265px;
background: #fff;
border-radius: 15px 15px 0 0;
}
.con_bot_myCertificate>input{
.con_bot_myCertificate>view{
display: flex;
align-items: center;
width: 80%;
height: 25px;
border: 1px solid #ccc;
height: 50px;
border-bottom: 1px solid #f0f0f0;
font-size: 15px;
margin: 0 auto;
}
.con_bot_myCertificate>view>text{
display: block;
width: 60px;
font-size: 14px;
}
.con_bot_myCertificate>view>input{
flex: 1;
height: 50px;
border-radius: 5px;
margin: 10px auto;
font-size: 12px;
box-sizing: border-box;
padding-left: 15px;
color: #e1e1e1;
font-size: 12px;
}
.btnBot{
position: absolute;
......@@ -75,9 +93,11 @@ page{
justify-content: space-between;
}
.btnBot>view{
flex: 1;
width: 40%;
height: 25px;
text-align: center;
line-height: 25px;
font-size: 12px;
border-radius: 15px;
color: #fff;
}
\ No newline at end of file
<!--pages/joinSocialEvent/joinSocialEvent.wxml-->
<view class='uploadDocuments'>
<view class='uploadDocuments_title'>活动名称:{{eventTitle}}</view>
<view style='width:100%;background:#fff'>
<view class='uploadDocuments_title'>活动名称:<text>{{eventTitle}}</text></view>
<view class='uploadDocuments_ganwu'>
活动感悟:<textarea class='inpGanwu' bindinput="inputComment" value='{{comment}}'></textarea>
活动感悟:
</view>
<view style="width:100%;margin-top:10px;">活动图片(3张即可):</view>
<textarea class='inpGanwu' bindinput="inputComment" value='{{comment}}'></textarea>
<view style="width:90%;margin:10px auto;">活动图片:<text style='font-size:12px;color:red'>(3张即可)</text></view>
<view class='uploadDocuments_img'>
<view>
......@@ -39,6 +41,7 @@
</view>
<text style='font-size:14px;color:#666'></text>
</view>
</view>
<view style='width:100%;display:flex;justify-content: center;'>
<view class="actionBtn" bindtap="upload">确认上传</view>
</view>
......
/* pages/uploadDocuments/uploadDocuments.wxss */
page{
width: 100%;
height: 100%;
background: #f5f5f5;
}
.uploadDocuments{
width: 90%;
width: 100%;
margin: 0 auto;
font-size: 14px;
background: #fff;
}
.uploadDocuments_title{
width: 100%;
height: 40px;
width: 90%;
height: 60px;
line-height: 40px;
font-size: 16px;
font-size: 14px;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #f0f0f0;
margin: 0 auto;
}
.uploadDocuments_title>text{
color: #646464;
}
.uploadDocuments_ganwu{
display: flex;
margin-top: 20px;
width: 90%;
margin: 20px auto 0;
}
.inpGanwu{
flex: 1;
display: block;
width: 90%;
height: 60px;
border: 1px solid #ccc;
border: 1px solid #f0f0f0;
font-size: 12px;
padding: 5px;
margin: 15px auto;
}
.uploadDocuments_img{
width: 90%;
display: flex;
height: 240px;
margin-top: 10px;
height: 126px;
margin: 10px auto;
}
.uploadDocuments_img>view{
width: 100px;
......@@ -31,14 +49,14 @@
}
.actionBtn{
width: 75%;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 14px;
margin: 10px auto;
background: #0D76ED;
margin-bottom: 10px;
color: #fff;
border-radius: 15px;
}
\ No newline at end of file
<!--pages/joinSocialEvent/joinSocialEvent.wxml-->
<view class='uploadDocuments'>
<view class='uploadDocuments_title'>活动名称:{{eventTitle}}</view>
<view style='width:100%;background:#fff'>
<view class='uploadDocuments_title'>活动名称:<text>{{eventTitle}}</text></view>
<view class='uploadDocuments_ganwu'>
活动感悟:<textarea class='inpGanwu' bindinput="inputComment" value='{{comment}}'></textarea>
活动感悟:
</view>
<view style="width:100%;margin-top:10px;">活动图片(3张即可):</view>
<textarea class='inpGanwu' bindinput="inputComment" value='{{comment}}'></textarea>
<view style="width:90%;margin:10px auto;">活动图片:<text style='font-size:12px;color:red'>(3张即可)</text></view>
<view class='uploadDocuments_img'>
<view>
......@@ -39,6 +41,7 @@
</view>
<text style='font-size:14px;color:#666'></text>
</view>
</view>
<view style='width:100%;display:flex;justify-content: center;'>
<view class="actionBtn" bindtap="upload">确认上传</view>
</view>
......
/* pages/uploadDocuments/uploadDocuments.wxss */
page{
width: 100%;
height: 100%;
background: #f5f5f5;
}
.uploadDocuments{
width: 90%;
width: 100%;
margin: 0 auto;
font-size: 14px;
background: #fff;
}
.uploadDocuments_title{
width: 100%;
height: 40px;
width: 90%;
height: 60px;
line-height: 40px;
font-size: 16px;
font-size: 14px;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #f0f0f0;
margin: 0 auto;
}
.uploadDocuments_title>text{
color: #646464;
}
.uploadDocuments_ganwu{
display: flex;
margin-top: 20px;
width: 90%;
margin: 20px auto 0;
}
.inpGanwu{
flex: 1;
display: block;
width: 90%;
height: 60px;
border: 1px solid #ccc;
border: 1px solid #f0f0f0;
font-size: 12px;
padding: 5px;
margin: 15px auto;
}
.uploadDocuments_img{
width: 90%;
display: flex;
height: 240px;
margin-top: 10px;
height: 126px;
margin: 10px auto;
}
.uploadDocuments_img>view{
width: 100px;
......@@ -31,14 +49,14 @@
}
.actionBtn{
width: 75%;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 14px;
margin: 10px auto;
background: #0D76ED;
margin-bottom: 10px;
color: #fff;
border-radius: 15px;
}
\ No newline at end of file
<!--pages/myCertificate/myCertificate.wxml-->
<view class='myCertificate'>
<view style='font-size:12px;color:#666;float:right;padding-right:15px;'>
<van-button type="default" size='normal' bindtap="getCertificate">申领证书</van-button>
<view style='position: fixed;bottom: 0;left: 0;font-size:14px;color:#fff;background: #0D76ED;width: 100%;height: 40px;line-height: 40px;text-align: center;'bindtap="getCertificate">
申领证书
</view>
<view class="certificateItem" wx:for="{{certificateList}}">
<view>
<image src='{{item.front_image}}'></image>
<text>{{item.title}}[{{item.status}}]</text>
</view>
</view>
</view>
......@@ -10,16 +10,28 @@
align-items:center;
text-align: center;
font-size: 14px;
border-bottom: 1px solid #F0F0F0;
}
.certificateItem>view{
position: relative;
width: 100%;
}
.certificateItem>image{
.certificateItem>view>image{
width:100%;
}
.certificateItem>text{
.certificateItem>view>text{
display: block;
position: absolute;
bottom: 3px;
left: 0;
width:100%;
height:35px;
line-height: 35px;
text-align: left;
text-align: right;
background: rgba(0,0,0,0.5);
color: #fff;
font-size: 14px;
box-sizing: border-box;
padding-right: 20px;
}
\ No newline at end of file
......@@ -9,7 +9,7 @@ Page({
data: {
title:'',
needCheck: false,
servicePlace:'',
servicePlace:''
},
/**
......@@ -51,11 +51,10 @@ Page({
})
},
//获取是否需要入圈审核
onChangeNeedCheck( event ) {
console.log(event.detail)
onChangeNeedCheck({ detail }) {
// 需要手动对 checked 状态进行更新
this.setData({
needCheck: event.detail
needCheck: detail
});
},
......@@ -100,7 +99,7 @@ Page({
url: '../newCircle2/newCircle2?circleId=' + circleId,
})
} else {
Notify(res.data.result.message)
Notify(res.data.message)
return
}
}
......
......@@ -2,7 +2,7 @@
<view class='newQuanzi'>
<view class='top_newQuanzi'>
服务区域:{{servicePlace}}
<van-button type="default" size='mini' bindtap='reLocation'>重新定位</van-button>
<view bindtap='reLocation'><image src='../../img/dingwei.png'></image>重新定位</view>
</view>
<view class='newQuanziname'>
圈子名称:
......@@ -21,7 +21,7 @@
开启后成员加入需圈主审核<van-switch checked="{{ needCheck }}" bind:change="onChangeNeedCheck" size="16px" />
</view>
<view class='newQuanzijianli' bindtap='circleNew1'>
建立
确定
</view>
<van-notify id="van-notify" />
</view>
/* pages/newQuanzi/newQuanzi.wxss */
page{
width: 100%;
height: 100%;
background: #f5f5f5;
}
.newQuanzi{
width: 85%;
width: 100%;
margin: 0 auto;
background: #fff;
}
.top_newQuanzi{
width: 100%;
height: 60px;
width: 85%;
height: 50px;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 14px;
border-bottom: 1px solid #f5f5f5;
margin: 0 auto;
}
.top_newQuanzi>view{
font-size: 12px;
color: #0D76ED;
display: flex;
align-items: center;
}
.top_newQuanzi>view>image{
width: 13px;
height: 18px;
margin-right: 5px;
}
.newQuanziname{
width: 100%;
width: 85%;
height: 50px;
display: flex;
align-items: center;
font-size: 14px;
border-bottom: 1px solid #f5f5f5;
margin: 0 auto;
}
.newQuanziname>view{
flex: 1;
border: 1px solid #ccc;
height: 30px;
color: #f0f0f0;
}
.newQuanziname>view .van-cell{
padding: 0;
......@@ -33,20 +54,25 @@
padding-left: 10px;
}
.shenghe{
width: 100%;
height: 40px;
width: 85%;
height: 50px;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 12px;
font-size: 14px;
color: #666;
border-bottom: 1px solid #f5f5f5;
margin: 0 auto;
}
.newQuanzijianli{
width: 150px;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 40px;
font-size: 14px;
line-height: 40px;
text-align: center;
border: 1px solid #ccc;
margin: 200px auto 0;
background: #0D76ED;
color: #fff;
}
\ No newline at end of file
......@@ -5,7 +5,11 @@
<input placeholder='输入圈子名称' focus="true" value='{{keyword}}' bindinput="changeInput"></input>
<view bindtap='searchCircle'>搜索</view>
</view>
<scroll-view scroll-y="true" style='height:750rpx;bottom:10rpx;' bindscrolltolower='loadMore'>
<view class='listNull' wx:if="{{circleList==''}}">
<image src='../../img/null.png'></image>
<view style='width:50px'>暂无内容</view>
</view>
<scroll-view scroll-y="true" style='bottom:10rpx;' bindscrolltolower='loadMore'>
<view class='circleItem' bindtap='cicleDetails' wx:for="{{circleList}}" >
<view class='circleIitle'><image src='{{item.front_image}}'></image>{{item.title}}</view>
<view class='circleMemberCount'>({{item.member_count}}人)</view>
......
/* pages/searchCircle/searchCircle.wxss */
page{
width: 100%;
height: 100%;
background: #f5f5f5;
}
.searchCircle{
width: 100%;
background: #fff;
}
.top_searchCircle{
width: 94%;
height: 40px;
......@@ -6,7 +15,7 @@
align-items: center;
background: #f6f6f6;
border-radius: 30px;
margin: 0 auto;
margin: 0 auto 20px;
}
.top_searchCircle>image{
width: 25px;
......@@ -38,8 +47,9 @@
align-items: center;
width: 94%;
margin-left: 3%;
height: 40px;
height: 60px;
border-bottom: 1rpx solid #F0F0F0;
font-size: 14px;
}
.circleItem .circleIitle{
......@@ -62,10 +72,12 @@
line-height: 30px;
}
.circleItem .circleJoin{
width: 19%;
height: 25px;
line-height: 25px;
width: 50px;
height: 20px;
line-height: 20px;
text-align: center;
border: 1rpx solid #F0F0F0;
border-radius: 8px;
font-size: 12px;
background: #0D76ED;
color: #fff;
}
\ No newline at end of file
......@@ -3,22 +3,22 @@
<image src='../../img/2.jpg'></image>
<view class='formtable'>
<view>
<text>姓名:</text>
<text>用户姓名:</text>
<van-cell-group>
<van-field
value="{{ name }}"
placeholder="请输入姓名"
placeholder="请输入用户姓名"
bind:change="onChangeName"
border="{{false}}"
/>
</van-cell-group>
</view>
<view>
<text>手机:</text>
<text>手机号码:</text>
<van-cell-group>
<van-field
value="{{ mobile }}"
placeholder="请输入手机号"
placeholder="请输入手机号"
bind:change="onChangeMobile"
border="{{false}}"
/>
......@@ -27,7 +27,7 @@
<view style='justify-content: flex-end;font-size:12px;width:280px;padding-right:30px'>
<van-checkbox value="{{ isOrganization }}" shape="square" bind:change="onChangeIsOrganization" icon-size="16px">
</van-checkbox>
<text style='width:60px;color:rgb(101,201,243);'>认证机构</text>
<text style='width:60px;color:#0D76ED;font-size:12px'>认证机构</text>
</view>
<view wx:if="{{isOrganization==true}}">
<text>机构名称:</text>
......@@ -75,7 +75,7 @@
</view>
<view class='button'>
<van-button type="default" style="margin:0 auto" open-type="getUserInfo" bind:getuserinfo="regist">注册</van-button>
<van-button type="default" style="margin:0 auto;" open-type="getUserInfo" bind:getuserinfo="regist">注册</van-button>
</view>
</view>
<view class='surejigou' wx:if="{{showRule==true}}">
......
......@@ -8,11 +8,11 @@
width: 100px;
height: 100px;
border-radius: 50%;
margin: 20px auto;
margin: 20px auto 70px;
}
.formtable>view{
width: 280px;
margin: 20px auto;
margin: 40px auto;
}
.surejigou{
position: absolute;
......
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