Skip to content

dev / home-with-kids-mp

Go to a project
Toggle navigation
Toggle navigation pinning
58869fb9 by simon
Options

默认提交

1 parent 1c3f7cc2
Expand all
Inline Side-by-side
Showing 9 changed files with 149 additions and 31 deletions
//app.js
const ald = require('./utils/ald-stat.js')
// const ald = require('./utils/ald-stat.js')
let fetchApi = require('./http/fetch-api.js');
let api = require('./http/api');
let config = require('./config');
......
......@@ -24,6 +24,9 @@
"van-popup": "../../ui/vant-weapp/popup/index",
"van-dialog": "../../ui/vant-weapp/dialog/index",
"van-sticky": "../../ui/vant-weapp/sticky/index",
"van-cell": "../../ui/vant-weapp/cell/index",
"van-cell-group": "../../ui/vant-weapp/cell-group/index",
"van-field": "../../ui/vant-weapp/field/index",
"van-tab": "../../ui/vant-weapp/tab/index",
"van-tabs": "../../ui/vant-weapp/tabs/index"
}
......
......@@ -12,7 +12,6 @@ module.exports = {
},
Prod: {
baseApi: 'https://api.qi.kdao.xin/kd_jyes_api/minipro',
// baseApi: 'https://api.k.wxpai.cn/bizproxy/xxx',
commonApi: 'https://api.k.wxpai.cn/bizproxy'
}
}
......
......@@ -15,11 +15,19 @@ module.exports = {
wxPay: '/wx/pay', // 帐号详情
stat: '/dot', // 打点
blessDetail: "/bless/detail", //
// 拜年相关
blessDetail: "/bless/detail", // 获取祝福语详情
blessMade: "/bless/made", // 标记定制
blessUpdateUserInfo: "/bless/update/name", // 修改名称
blessUpdateRoom: "/bless/update/info", // 修改房间信息
blessJoin: "/bless/join", // 加入房间
/**
* 通用接口
* 请求时 "mode"传"custom"
*/
areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
uploadFile: '/kdapi/file/upload' //上传图片通用接口
}
......
// @import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
.van-button__text {
font-size: 36rpx;
}
// 用户头像
.portrait {
position: relative;
......@@ -22,6 +26,45 @@
}
}
// 修改对话框
.dialog {
position: relative;
@extend .bb;
padding: 36px 24px;
font-size: 38px;
&-item {
margin-bottom: 48px;
position: relative;
.label {
margin-bottom: 12px;
}
}
.upload {
position: relative;
display: flex;
.image {
width: 240px;
height: 152px;
}
}
.nickname {
margin-top: 12px;
}
.t1 {
margin-top: 12px;
}
}
.dialog2 {
text-align: center;
}
.page {
padding-bottom: 200px;
......@@ -140,6 +183,11 @@
display: flex;
justify-content: center;
align-items: flex-end;
.t1 {
max-width: 145px;
@include ellipsis(1);
}
}
}
}
......
......@@ -13,20 +13,18 @@
<view class="user">
<!-- 用户头像 -->
<view class="portrait">
<!-- <image class="portrait-inner" mode="widthFix" src="../../image/blessing/portrait.png" /> -->
<!-- <image class="portrait-border" mode="widthFix" src="../../image/blessing/portrait-border.png" /> -->
<image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
<image class="portrait-border" mode="scaleToFill" src="{{detailData.headFrame}}" />
</view>
<!-- 用户名称 -->
<view class="name">
<view class="tt">{{detailData.familyName}}</view>
<image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
<view class="tt">{{ownerMember.memberName}}</view>
<image wx:if="{{ownerMember.mySelf == 1}}" bindtap="showUpdateUserInfoDialog" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
</view>
<!-- 编辑 -->
<view class="edit">
<view class="tt t1">{{detailData.sentence}}</view>
<image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
<!-- 编辑房间信息 组队时候才显示 -->
<view wx:if="{{detailData.type == 1}}" class="edit">
<view class="tt t1">{{detailData.familyName}}</view>
<image wx:if="{{ownerMember.mySelf == 1}}" bindtap="showUpdateRoomDialog" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
<view class="tt t2">{{detailData.count}}人</view>
</view>
<!-- 用户组 -->
......@@ -34,8 +32,8 @@
<view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item">
<view class="group-item-portrait"></view>
<view class="group-item-name">
<view class="t1">李四</view>
<image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
<view class="t1">{{item.memberName}}</view>
<image wx:if="{{item.mySelf == 1}}" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
</view>
</view>
</view>
......@@ -48,11 +46,9 @@
<view class="sentence">{{detailData.sentence}}</view>
</view>
<!-- 尾部内容 -->
<view class="tail">
<view class="tail" wx:if="{{1>10}}">
<!-- 尾部头像 -->
<view class="portrait">
<!-- <image class="portrait-inner" mode="widthFix" src="../../image/blessing/portrait.png" />
<image class="portrait-border" mode="widthFix" src="../../image/blessing/portrait-border.png" /> -->
<image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
<image class="portrait-border" mode="scaleToFill" src="{{detailData.headFrame}}" />
</view>
......@@ -63,7 +59,6 @@
<!-- 按钮组 -->
<view class="tail-btn-wrap">
<!-- 分享团队图片 -->
<!-- <view class="share"></view> -->
<image wx:if="{{detailData.type == 1}}" mode="widthFix" class="tail-btn-wrap-item blessing-share-group-btn" src="../../image/blessing/blessing-share-group-btn.png" />
<view wx:if="{{detailData.type == 0}}" bindtap="toReward" class="tail-btn-wrap-item more-template">
<span class="t1">赞赏祝福</span>
......@@ -83,25 +78,90 @@
<!-- 分情况显示btn-wrap -->
<!-- 单人 -->
<block wx:if="{{detailData.type == 0}}">
<view class="btn-wrap">
<view class="btn btn1">分享图片祝福</view>
<view class="btn btn2">祝福送朋友</view>
<!-- <view wx:if="{{detailData.customMade == 0}}" class="btn btn2">祝福送朋友</view>
<view wx:if="{{detailData.customMade == 1}}" class="btn btn2">祝福送朋友</view> -->
<!-- 未定制 -->
<view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
<button class="btn btn1">分享图片祝福</button>
<button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
定制我的祝福
</button>
<view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
</view>
<!-- 已定制 -->
<view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
<button class="btn btn1">分享图片祝福</button>
<button open-type="share" class="btn btn2">送出我的祝福</button>
</view>
</block>
<!-- 组队 -->
<block wx:if="{{detailData.type == 1}}">
<view class="btn-wrap">
<view class="btn btn1">定制我的祝福</view>
<view class="btn btn2">祝福送朋友</view>
<!-- 未定制 -->
<view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
<!-- 未授权 -->
<block wx:if="{{!isAuth}}">
<button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1">
邀请家人加入
</button>
<button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
定制我的祝福
</button>
</block>
<!-- 已授权 -->
<block wx:else>
<button bindtap="showTips" data-data="请定制祝福后再邀请" class="btn btn1">邀请家人加入</button>
<button bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</button>
</block>
</view>
<!-- 已经定制 -->
<view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
<!-- 能加入状态 -->
<block wx:if="{{isJoin}}">
<button bindtap="onBlessJoinHandler" class="btn btn1">加入组队祝福</button>
</block>
<!-- 不能加入状态 -->
<block wx:else>
<button data-data="join" open-type="share" class="btn btn1">邀请家人加入</button>
</block>
<button open-type="share" class="btn btn2">送出我的祝福</button>
</view>
</block>
<!-- <view class="btn-wrap">
<view class="btn btn1">定制我的祝福</view>
<view class="btn btn2">祝福送朋友</view>
</view> -->
</view>
</view>
</view>
<van-dialog id="van-dialog" />
<!-- 修改用户信息 -->
<van-dialog close-on-click-overlay use-slot title="修改信息" confirm-button-text="确认修改" show="{{ updateUserInfoDialogVisible }}" show-cancel-button bind:confirm="onUpdateUserInfoHander">
<view class="dialog">
<view class="dialog-item">
<view class="label">名称</view>
<input value="{{ updateUserInfo.memberName }}" placeholder="请输入用户名" bindinput="onUpdateUserInfoBindInput" />
</view>
<view class="dialog-item">
<view class="label">头像</view>
<view class="upload">
<image class="image" bindtap="onUploadHandler" mode="aspectFit" src="{{files[0] && files[0].path?files[0].path:'../../image/icon/icon-plus.png'}}" />
</view>
</view>
</view>
</van-dialog>
<!-- 修改房间信息 -->
<van-dialog close-on-click-overlay use-slot title="修改信息" confirm-button-text="确认修改" show="{{ updateRoomDialogVisible }}" show-cancel-button bind:confirm="onUpdateRoomHander">
<view class="dialog">
<view class="dialog-item">
<view class="label">家庭名称</view>
<input value="{{ updateRoomInfo.familyName }}" placeholder="请输入家庭名称" bindinput="onUpdateFamilyNameBindInput" />
</view>
<view class="dialog-item">
<view class="label">祝福语</view>
<input value="{{ updateRoomInfo.sentence }}" placeholder="请输入祝福语" bindinput="onUpdateSentenceBindInput" />
</view>
</view>
</van-dialog>
<!-- 加入房间 -->
<van-dialog close-on-click-overlay use-slot confirm-button-text="点击加入" show="{{ joinRoomDialogVisible }}" bind:confirm="onBlessJoinHandler">
<view class="dialog dialog2">
<view class="portrait">
<image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
</view>
<view class="nickname">{{ownerMember.memberName}}</view>
<view class="t1">邀请你一起加入组队送祝福!</view>
</view>
</van-dialog>
......
......@@ -154,7 +154,7 @@ function getObjByListKeyValue(value, key, list) {
* @param {*} path
*/
function wxacodeGet(path) {
return " https://api.k.wxpai.cn/bizproxy/mzcfsapi/qrcode/create?path=" + encodeURIComponent(path);
return "https://api.k.wxpai.cn/bizproxy/mzcfsapi/qrcode/create?path=" + encodeURIComponent(path);
}
/**
......