Skip to content

C
Compass
Commit f7fb5fd2 by biao
Options

1111

parent 3c324616
Showing with 425 additions and 126 deletions
doc/DB/compass_db_schema.txt
......@@ -154,6 +154,7 @@ CREATE TABLE IF NOT EXISTS circle_dat(
member_count int8 NOT NULL DEFAULT '0',
need_check tinyint(1) NOT NULL DEFAULT '0',
front_image text,
images text,
comment text,
longitude text NOT NULL,
latitude text NOT NULL,
......@@ -548,6 +549,24 @@ CREATE TABLE IF NOT EXISTS course_mst(
Create INDEX course_mst_id_idx ON course_mst(id);
Create INDEX course_mst_title_idx ON course_mst(title);
##----user_buy_member_dat create
DROP TABLE IF EXISTS user_buy_member_dat;
CREATE TABLE IF NOT EXISTS user_buy_member_dat(
id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
user_id int8 NOT NULL,
money float(5,2) NOT NULL DEFAULT '0',
order_no varchar(128),
mchid_order_no varchar(255),
status varchar(64),
delete_flg tinyint(1) NOT NULL DEFAULT '0'
) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
Create INDEX user_buy_member_dat_user_id_idx ON user_buy_member_dat(user_id);
Create INDEX user_buy_member_dat_order_no_idx ON user_buy_member_dat(order_no);
##----user_media_dat create
......
src/cn/compass/entity/CircleDat.inc
......@@ -12,6 +12,7 @@ class CircleDat extends CompassDynamicData
var $member_count;
var $need_check;
var $front_image;
var $images;
var $comment;
var $longitude;
var $latitude;
......@@ -35,6 +36,7 @@ class CircleDat extends CompassDynamicData
$this->member_count = $record["member_count"];
$this->need_check = $record["need_check"];
$this->front_image = $record["front_image"];
$this->images = $record["images"];
$this->comment = $record["comment"];
$this->longitude = $record["longitude"];
$this->latitude = $record["latitude"];
......@@ -110,6 +112,7 @@ class CircleDat extends CompassDynamicData
ParamUtil::copyObj2Array($v_param, $this, "member_count");
ParamUtil::copyObj2Array($v_param, $this, "need_check");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "front_image");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "images");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "comment");
ParamUtil::copyObj2Array($v_param, $this, "longitude");
ParamUtil::copyObj2Array($v_param, $this, "latitude");
......
src/cn/compass/entity/UserBuyMemberDat.inc 0 → 100644
<?php
/**
* UserBuyMemberDat Entity
* $Id: UserBuyMemberDat.inc,v 1.1 2020/2/27 14:40:01 Exp $
* @author zb
* @package jp.compass.entity
* @access public
*/
class UserBuyMemberDat extends CompassDynamicData
{
var $user_id;
var $money;
var $order_no;
var $mchid_order_no;
var $status;
var $delete_flg;
//用户是否已经购买本视频
var $haveBuy;
/**
* 构造实现。user_buy_member_dat创建实例。
*
* @access public
* @param mixed user_buy_member_dat
*/
function constructor($record)
{
parent::constructor($record);
$this->user_id = $record["user_id"];
$this->money = $record["money"];
$this->order_no = $record["order_no"];
$this->mchid_order_no = $record["mchid_order_no"];
$this->status = $record["status"];
$this->delete_flg = $record["delete_flg"];
}
/**
* 根据条件,获取数据列表。
* 条件与DBManager的doSelect相同。
* @access public
* @static
* @param array 检索条件
* @return array Entity的队列
*/
public static function getList($w_param = null, $orderkey = null, $direction = "ASC", $offset = null, $limit = null)
{
if ($w_param == null) {
$w_param = array();
$w_param["delete_flg"] = "false";
}
return CompassDBHandler::getList("UserBuyMemberDat", "user_buy_member_dat", $w_param, $orderkey, $direction, $offset, $limit);
}
/**
* 根据条件，获取数据列表的件数。
* 条件与DBManager的doSelect相同。
* @access public
* @static
* @param array 检索条件
* @return array Entity的队列
*/
public static function getListCount($w_param = null)
{
if ($w_param == null) {
$w_param = array();
$w_param["delete_flg"] = "false";
}
$db = CompassDBManager::getInstance();
$result = $db->doSelect("user_buy_member_dat", $w_param, null, null, null, null, "count(*) as count");
return $result[0]["count"];
}
/**
* 获得此类指定ID的实例。
*/
public static function getById($id)
{
// delete_flg
$param = array();
$param["delete_flg"] = false;
return CompassDBHandler::getById("UserBuyMemberDat", "user_buy_member_dat", $id, $param);
}
// -- 这里开始Dynamic ---
/**
* 将此实例写入DB。
* DynamicData共用的保存方法。
* @access public
* @return int 写入实例的ID
*/
public function save()
{
$v_param = array();
ParamUtil::copyObj2Array($v_param, $this, "user_id");
ParamUtil::copyObj2Array($v_param, $this, "money");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "order_no");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "mchid_order_no");
ParamUtil::copyObj2Array($v_param, $this, "status");
ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
// 保存
parent::_save("user_buy_member_dat", $v_param);
}
}
\ No newline at end of file
src/settings/compass_include.inc
......@@ -48,6 +48,7 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/FamilyEventDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/FamilyEventMemberDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/DonationsEventDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserDonationDat.inc");
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserBuyMemberDat.inc");
// definition
require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/ImageType.inc");
......
src/user/api/api_wx_pay_notify.php
......@@ -40,7 +40,7 @@ class PayNotifyCallBack extends WxPayNotify
switch($type){
// 购买视频支付后处理
case 'M':
case 'C':
$param = array();
$param["delete_flg"] = false;
$param["status"] = "NEW";
......@@ -52,16 +52,19 @@ class PayNotifyCallBack extends WxPayNotify
return false;
}
$userMediaDat = $userMediaDatList[0];
//找到对应的用户
$user_mst = UserMst::getById($donation_dat->user_id);
if ($user_mst == null) {
ErrorLogger::doOutput("Compass...api_wx_pay_notify...user is null.");
return false;
}
//更新支付状态
$userMediaDat->status="SUCCESS";
$userMediaDat->save();
//添加用户支付记录汇总
$userMst = UserMst::getById($userMediaDat->user_id);
$userPayLog = new UserPayLog();
$userPayLog->user_id = $userMst->id;
$userPayLog->user_name = $userMst->name;
$userPayLog->action_type = "MEDIA";
$userPayLog->money = $userMediaDat->price;
$userPayLog->save();
break;
......@@ -78,31 +81,46 @@ class PayNotifyCallBack extends WxPayNotify
return false;
}
$userDonation = $userDonationList[0];
//更新支付状态
//更新用户账户
$userDonation->status = "SUCCESS";
$userDonation->save();
//添加用户支付记录汇总
$userMst = UserMst::getById($userMediaDat->user_id);
$userPayLog = new UserPayLog();
$userPayLog->user_id = $userMst->id;
$userPayLog->user_name = $userMst->name;
$userPayLog->action_type = "DONATION";
$userPayLog->money = $userDonation->money;
$userPayLog->save();
break;
// 会员购买支付后处理
case 'B':
case 'M':
$param = array();
$param["delete_flg"] = false;
$param["status"] = "NEW";
$param["order_no"] = $data["out_trade_no"];
$userDonationList = UserDonationDat::getList($param);
$userBuyMemberList = UserBuyMemberDat::getList($param);
// 找到订单
if (count($userDonationList) < 1) {
ErrorLogger::doOutput("Compass...api_wx_pay_notify...userDonation is null.");
if (count($userBuyMemberList) < 1) {
ErrorLogger::doOutput("Compass...api_wx_pay_notify...userBuyMember is null.");
return false;
}
$userDonation = $userDonationList[0];
$userBuyMemberDat = $userBuyMemberList[0];
//更新支付状态
$userBuyMemberDat->status = "SUCCESS";
$userBuyMemberDat->save();
//更新用户账户
$userDonation->status = "SUCCESS";
$userDonation->save();
//添加用户支付记录汇总
$userMst = UserMst::getById($userMediaDat->user_id);
$userPayLog = new UserPayLog();
$userPayLog->user_id = $userMst->id;
$userPayLog->user_name = $userMst->name;
$userPayLog->action_type = "MEMBER";
$userPayLog->money = $userBuyMemberDat->money;
$userPayLog->save();
break;
default:
......
src/user/if/ajax_buy_course_media.php 0 → 100644
<?php
// 更新用户会员状态
require_once ("../user_include.inc");
$unionId = ParamUtil::getRequestString("unionId", 0);
$openId = ParamUtil::getRequestString("openId", 0);
$mediaId = ParamUtil::getRequestString("mediaId", 0);
ErrorLogger::doOutput("Compass...ajax_buy_course_media.php....Start.", 0);
ErrorLogger::doOutput("Compass...ajax_buy_course_media.php....unionId=" . $unionId, 0);
//参数验证
if(empty($unionId) || empty($openId)) {
responseNG("参数错误！");
}
//检索用户是否存在
$param['unionid'] = $unionId;
$param['openId'] = $openId;
$param['delete_flg'] = false;
$tmpUserMstList = UserMst::getList($param,'id','desc', 0, 1);
if(empty($tmpUserMstList)) {
responseNG("参数错误！");
}
$userMst = $tmpUserMstList[0];
//媒体是否存在
$courseMediaDat = CourseMediaDat::getById($mediaId);
if(empty($courseMediaDat)) {
$result["message"] = "视频不存在！";
responseNG($result);
}
//调用支付
//生成临时订单
$orderNo = "C" . date("YmdHis") . "_" . $userMst->id;
$userMediaDat = new UserMediaDat();
$userMediaDat->user_id = $userMst->id;
$userMediaDat->course_id = $courseMediaDat->course_id;
$userMediaDat->media_id = $courseMediaDat->id;
$userMediaDat->is_free = $courseMediaDat->is_free;
$userMediaDat->money = $courseMediaDat->price;
$userMediaDat->order_no = $orderNo;
$userMediaDat->status = "NEW";
$userMediaDat->save();
//调用微信支付接口
$tools = new JsApiPay();
$input = new WxPayUnifiedOrder();
$input->SetBody("购买" . $courseMediaDat->title);
$input->SetAttach("购买" . $courseMediaDat->title);
$input->SetOut_trade_no($orderNo);
$input->SetTotal_fee($courseMediaDat->price * 100);//折算到分
$input->SetTime_start(date("YmdHis"));
$input->SetTime_expire(date("YmdHis", time() + 800));
$input->SetGoods_tag("购买" . $courseMediaDat->title);
$input->SetNotify_url("https://" . SSL_PATH . "/api/api_wx_pay_notify.php");
$input->SetTrade_type("JSAPI");
$input->SetOpenid($userMst->openid);
$order = WxPayApi::unifiedOrder($input);
$jsApiParameters = $tools->GetJsApiParameters($order);
ErrorLogger::doOutput($jsApiParameters);
ErrorLogger::doOutput("Compass...ajax_buy_course_media.php....End.", 0);
responseOK($jsApiParameters);
function responseNG($message) {
$result = array("status"=>"NG", "message"=>$message);
print json_encode($result);
exit;
}
function responseOK($result) {
$result = array("status"=>"OK", "result"=>$result);
print json_encode($result);
exit;
}
?>
\ No newline at end of file
src/user/if/ajax_buy_user_member.php
......@@ -27,7 +27,7 @@ $userMst = $tmpUserMstList[0];
//调用支付
//生成临时订单
$orderNo = "B" . date("YmdHis") . "_" . $userMst->id;
$orderNo = "M" . date("YmdHis") . "_" . $userMst->id;
//调用微信支付接口
$tools = new JsApiPay();
......
src/user/if/ajax_circle_new1.php
......@@ -42,11 +42,26 @@ $param = array();
$param['owner_id'] = $userMst->id;
$param['delete_flg'] = false;
$circleCount = CircleDat::getListCount($param);
if($circleCount > 0) {
if($circleCount > 0 && !DEBUG_MODE) {
$result["message"] = "只能创建一个圈子！";
responseNG($result);
}
if(DEBUG_MODE) {
$param = array();
$param['owner_id'] = $userMst->id;
$param['delete_flg'] = false;
$circleList = CircleDat::getList($param, "id", "desc", 0, 1);
if(!empty($circleList)) {
$circleDat = $circleList[0];
//返回数据
$result["message"] = "重复建圈子！";
$result["circleDat"] = $circleDat;
responseOK($result);
}
}
//建立圈子
$circleDat = new CircleDat();
$circleDat->title = $title;
......
src/user/if/ajax_circle_new2.php
......@@ -10,18 +10,17 @@ $circleId = ParamUtil::getRequestNumber("circleId", 0);
$comment = ParamUtil::getRequestString("comment");
//参数验证
if(empty($unionId) || empty($circleId) || empty($comment)) {
if(empty($unionId) || empty($circleId)) {
$result["message"] = "参数错误！";
responseNG($result);
}
//判断用户是否已经存在
$param = array();
$param['openid'] = $openId;
$param['unionid'] = $unionId;
$param['delete_flg'] = false;
$userList = UserMst::getList($param,'id','desc', 0, 1);
if(!empty($userList)) {
if(empty($userList)) {
$result["message"] = "用户不存在！";
responseOK($result);
}
......@@ -41,18 +40,44 @@ if(empty($circleDatList)) {
$circleDat = $circleDatList[0];
//处理上传图片
$aliHandler = new AliUploadHandler();
//带有comment的时候
if(!empty($comment)) {
$circleDat->comment = $comment;
$circleDat->save();
}
//处理图片
//处理上传图片【封面】
if(!empty($_FILES['frontImage']['tmp_name'])){
$upload_file = FileUploadUtil::getScalarFile(@$_FILES['frontImage']);
$tmp_file_name = date("Ymd") . "_" . trim(basename($upload_file->name));//保存的名字自定义，这里如果图片的名字原来的是aa.jp，保存成20200220_aa.jpg
$url = $aliHandler->uploadImg($tmp_file_name, $upload_file->tmp_name);
//这里的url就是http://compass-dev.oss-cn-beijing.aliyuncs.com/20200220_aa.jpg
$circleDat->front_image = $url;
$aliHandler = new AliUploadHandler();
$upload_file = FileUploadUtil::getScalarFile(@$_FILES['frontImage']);
$tmp_file_name = date("Ymd") . "_" . trim(basename($upload_file->name));//保存的名字自定义，这里如果图片的名字原来的是aa.jp，保存成20200220_aa.jpg
$url = $aliHandler->uploadImg($tmp_file_name, $upload_file->tmp_name);
ErrorLogger::doOutput("Compass...ajax_circle_new2.php....url1=" . $url, 0);
//这里的url就是http://compass-dev.oss-cn-beijing.aliyuncs.com/20200220_aa.jpg
$circleDat->front_image = $url;
$circleDat->save();
}
$circleDat->comment = $comment;
$circleDat->save();
//处理上传图片【图片】
if(!empty($_FILES['image']['tmp_name'])){
$aliHandler = new AliUploadHandler();
$upload_file = FileUploadUtil::getScalarFile(@$_FILES['image']);
$tmp_file_name = date("Ymd") . "_" . trim(basename($upload_file->name));//保存的名字自定义，这里如果图片的名字原来的是aa.jp，保存成20200220_aa.jpg
$url = $aliHandler->uploadImg($tmp_file_name, $upload_file->tmp_name);
ErrorLogger::doOutput("Compass...ajax_circle_new2.php....url2=" . $url, 0);
//这里的url就是http://compass-dev.oss-cn-beijing.aliyuncs.com/20200220_aa.jpg
if(empty($circleDat->images)) {
$circleDat->images = $url;
} else {
$circleDat->images = $circleDat->images . "|" . $url;
}
$circleDat->save();
}
ErrorLogger::doOutput("Compass...ajax_circle_new2.php....End.", 0);
......
src/user/if/ajax_set_user_donation_dat.php
......@@ -31,12 +31,21 @@ if(empty($userList)) {
}
$userMst = $userList[0];
//判断圈子是否存在
$circleDat = CircleDat::getById($circleId);
if(empty($circleDat)) {
$result["message"] = "圈子不存在！";
responseNG($result);
}
//募捐项目是否存在
//调用支付
//生成临时订单
$orderNo = "D" . date("YmdHis") . "_" . $userMst->id;
$userMediaDat = new UserMediaDat();
$userMediaDat->user_id = $userMst->id;
$userMediaDat->course_id = $courseMediaDat->course_id;
$userMediaDat->media_id = $courseMediaDat->id;
$userMediaDat->is_free = $courseMediaDat->is_free;
$userMediaDat->money = $courseMediaDat->price;
$userMediaDat->order_no = $orderNo;
$userMediaDat->status = "NEW";
$userMediaDat->save();
//判断是否为圈主
if($circleDat->owner_id != $userMst->id) {
......
src/wx/img/1.png
src/wx/img/1.png

23.8 KB | W: | H:

src/wx/img/1.png

8.76 KB | W: | H:

src/wx/img/1.png
src/wx/img/1.png
src/wx/img/1.png
src/wx/img/1.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/2.png
src/wx/img/2.png

20.6 KB | W: | H:

src/wx/img/2.png

11.8 KB | W: | H:

src/wx/img/2.png
src/wx/img/2.png
src/wx/img/2.png
src/wx/img/2.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/3.png
src/wx/img/3.png

25.2 KB | W: | H:

src/wx/img/3.png

9.08 KB | W: | H:

src/wx/img/3.png
src/wx/img/3.png
src/wx/img/3.png
src/wx/img/3.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/4.png
src/wx/img/4.png

23.3 KB | W: | H:

src/wx/img/4.png

7.01 KB | W: | H:

src/wx/img/4.png
src/wx/img/4.png
src/wx/img/4.png
src/wx/img/4.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/pages/circle/circle.wxml
<!--pages/log/log.wxml-->
<view class='quanzi'>
<view class='topQuanzi'>
<image src='../../img/search.png'></image>
<input class="input" name="keyword" placeholder="请输入圈子名称" bindinput ="keywordInput"/>
<view bindtap='searchCircle'>搜索</view>
<view style='padding:15px 0;background:#fff'>
<view class='topQuanzi'>
<image src='../../img/search.png'></image>
<input class="input" name="keyword" placeholder="请输入圈子名称" bindinput ="keywordInput"/>
<view bindtap='searchCircle'>搜索</view>
</view>
</view>
<view class='newQuanzi'>
<view class='btn_newQuanzi' bindtap='creatCircle'>
新建圈子<image src='../../img/jia.png'></image>
</view>
<view class='myQuanzi'>
<text>我的圈子</text>
<view style='color:#000'><text></text>我的圈子<view class='xinjian' bindtap='creatCircle'><image src='../../img/jia.png'></image>新建圈子</view></view>
<view class='myQuanzilist'>
<view class='listNull' wx:if="{{userCircleList==''}}">
<image src='../../img/null.png'></image>
<view>还没有加入或创建任何圈子</view>
</view>
<view wx:for="{{userCircleList}}" wx:key="{{index}}">
<view>
<image src='{{item.front_image}}'></image>
<text>{{item.circle_title}}</text>
</view>
<van-button type="default" size='small' bind:click="circleDetails">进入</van-button>
<text bindtap="circleDetails" style='display:block;width:50px;height:30px;border:1px solid #ccc;text-align:center;line-height:30px;border-radius:8px'>进入</text>
</view>
</view>
</view>
......@@ -30,6 +33,10 @@
<view class='con_quanziSearch' bindtap='searchCircleNearby'>搜索</view>
</view>
<view class='con_conQuanzi' wx:if="{{showNearCircles==1}}">
<view class='listNull' wx:if="{{circleList==''}}">
<image src='../../img/null.png'></image>
<view style='width:180px'>附近还没有圈子，快新建一个吧！</view>
</view>
<view class='quanziList' wx:for="{{circleList}}" wx:key="{{index}}">
<view>
<image src='{{item.front_image}}'></image>{{item.circle_title}}
......
src/wx/pages/circle/circle.wxss
/* pages/log/log.wxss */
page{
width: 100%;
height: 100%;
background: #f5f5f5;
}
.topQuanzi{
width: 94%;
height: 40px;
......@@ -31,7 +36,8 @@
}
.newQuanzi{
width: 100%;
border-bottom: 1px solid #ccc;
background: #fff;
margin-top: 15px;
}
.btn_newQuanzi{
width: 200px;
......@@ -51,12 +57,33 @@
.myQuanzi{
width: 100%;
}
.myQuanzi>text{
display: block;
.myQuanzi>view{
font-size: 14px;
color: #666;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
flex-wrap: wrap;
}
.xinjian{
margin-left: auto;
margin-right: 5%;
display: flex;
align-items: center;
color: #0D76ED;
}
.xinjian>image{
width: 20px;
height: 20px;
margin-right: 5px;
}
.myQuanzi>view>text{
display: inline-block;
width: 5px;
height: 18px;
background: #f79b9b;
margin-right: 10px;
}
.myQuanzilist{
width: 100%;
......@@ -68,6 +95,7 @@
box-sizing: border-box;
padding: 10px;
font-size: 14px;
width: 100%;
}
.myQuanzilist>view>view{
flex: 1;
......@@ -81,6 +109,30 @@
border-radius: 50%;
margin-right: 5px;
}
.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;
}
.conQuanzi{
width: 100%;
background: #fff;
overflow: hidden;
margin-top: 15px;
}
.top_conQuanzi{
width: 100%;
display: flex;
......@@ -93,23 +145,29 @@
.top_conQuanzi>image{
width: 15px;
height: 15px;
margin-right: 10px;
}
.quanziSearch{
width: 100%;
height: 200px;
position: relative;
}
.con_quanziSearch{
width: 100px;
height: 100px;
line-height: 100px;
position: absolute;
top: 20px;
right: 20px;
width: 40px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 20px;
border: 1px solid #ccc;
font-size: 12px;
border-radius: 50%;
margin: 50px auto;
background: #0D76ED;
color: #fff;
}
.con_conQuanzi{
width: 100%;
height: 32vh;
box-sizing: border-box;
padding: 10px;
}
......
src/wx/pages/index/index.json
......@@ -2,5 +2,5 @@
"usingComponents": {
},
"navigationBarBackgroundColor": "#5c5bf4"
"navigationBarBackgroundColor": "#5296f4"
}
\ No newline at end of file
src/wx/pages/index/index.wxml
......@@ -2,7 +2,9 @@
<view class='indexBox'>
<view class="indexHeader">
<view class='con_indexHeader'>
<image src='../../img/1.jpg'></image>
<view>
<image src='../../img/conHeader.png'></image>
</view>
</view>
<view class='title' bindtap='authorize'><image src='../../img/touxiang.png'></image>{{roleTitle}}欢迎回来</view>
</view>
......@@ -33,7 +35,7 @@
</view>
</view>
<view class='conSwiper'>
<image src='../../img/dongNews.png'></image>购买中国志愿者会员,公益视频免费看!<view bindtap='memberChange'>详情</view>
<image src='../../img/dongNews.png'></image>购买中国志愿者会员,公益视频免费看!<view bindtap='memberChange'>查看</view>
</view>
<view class='volunteers'>
<view class='topTitle'>
......
src/wx/pages/index/index.wxss
......@@ -4,22 +4,22 @@
width: 100%;
height: 150px;
border-radius: 0 0 10px 10px;
background: #7474e4;
background: linear-gradient(to bottom, #5c5bf4, #7474e4);
margin-bottom: 80px
background: #5296f4;
background: linear-gradient(to bottom, #5296f4, #7474e4);
margin-bottom: 70px
}
.con_indexHeader{
position: absolute;
bottom: -70px;
bottom: -60px;
left: 0;
right: 0;
margin: auto;
width: 90%;
width: 95%;
height: 150px;
border-radius: 7px;
background: #fff;
border-radius: 15px;
}
.con_indexHeader>image{
.con_indexHeader>view{
position: absolute;
top: 0;
left: 0;
......@@ -28,11 +28,17 @@
margin: auto;
width: 95%;
height: 134px;
border-radius: 8px;
border-radius: 4px;
background: #fff;
overflow: hidden;
}
.con_indexHeader>view>image{
width: 100%;
height: 134px;
}
.title{
position: absolute;
top: 10px;
top: 0;
left: 7%;
font-size: 13px;
display: flex;
......
src/wx/pages/newCircle1/newCircle1.json deleted 100644 → 0
{
"usingComponents": {},
"navigationBarTitleText": "创建圈子"
}
\ No newline at end of file
src/wx/pages/newCircle1/newCircle1.wxss deleted 100644 → 0
/* pages/newQuanzi/newQuanzi.wxss */
.newQuanzi{
width: 85%;
margin: 0 auto;
}
.top_newQuanzi{
width: 100%;
height: 60px;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 14px;
}
.newQuanziname{
width: 100%;
height: 50px;
display: flex;
align-items: center;
font-size: 14px;
}
.newQuanziname>view{
flex: 1;
border: 1px solid #ccc;
height: 30px;
}
.newQuanziname>view .van-cell{
padding: 0;
height: 30px;
}
.newQuanziname>view input{
height: 30px;
box-sizing: border-box;
padding-left: 10px;
}
.shenghe{
width: 100%;
height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 12px;
color: #666;
}
.newQuanzijianli{
width: 150px;
height: 40px;
font-size: 14px;
line-height: 40px;
text-align: center;
border: 1px solid #ccc;
margin: 200px auto 0;
}
\ No newline at end of file
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