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
1 //app.js 1 //app.js
2 const ald = require('./utils/ald-stat.js') 2 // const ald = require('./utils/ald-stat.js')
3 let fetchApi = require('./http/fetch-api.js'); 3 let fetchApi = require('./http/fetch-api.js');
4 let api = require('./http/api'); 4 let api = require('./http/api');
5 let config = require('./config'); 5 let config = require('./config');
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
24 "van-popup": "../../ui/vant-weapp/popup/index", 24 "van-popup": "../../ui/vant-weapp/popup/index",
25 "van-dialog": "../../ui/vant-weapp/dialog/index", 25 "van-dialog": "../../ui/vant-weapp/dialog/index",
26 "van-sticky": "../../ui/vant-weapp/sticky/index", 26 "van-sticky": "../../ui/vant-weapp/sticky/index",
27 "van-cell": "../../ui/vant-weapp/cell/index",
28 "van-cell-group": "../../ui/vant-weapp/cell-group/index",
29 "van-field": "../../ui/vant-weapp/field/index",
27 "van-tab": "../../ui/vant-weapp/tab/index", 30 "van-tab": "../../ui/vant-weapp/tab/index",
28 "van-tabs": "../../ui/vant-weapp/tabs/index" 31 "van-tabs": "../../ui/vant-weapp/tabs/index"
29 } 32 }
......
...@@ -12,7 +12,6 @@ module.exports = { ...@@ -12,7 +12,6 @@ module.exports = {
12 }, 12 },
13 Prod: { 13 Prod: {
14 baseApi: 'https://api.qi.kdao.xin/kd_jyes_api/minipro', 14 baseApi: 'https://api.qi.kdao.xin/kd_jyes_api/minipro',
15 // baseApi: 'https://api.k.wxpai.cn/bizproxy/xxx',
16 commonApi: 'https://api.k.wxpai.cn/bizproxy' 15 commonApi: 'https://api.k.wxpai.cn/bizproxy'
17 } 16 }
18 } 17 }
......
...@@ -15,11 +15,19 @@ module.exports = { ...@@ -15,11 +15,19 @@ module.exports = {
15 wxPay: '/wx/pay', // 帐号详情 15 wxPay: '/wx/pay', // 帐号详情
16 stat: '/dot', // 打点 16 stat: '/dot', // 打点
17 17
18 blessDetail: "/bless/detail", // 18 // 拜年相关
19 blessDetail: "/bless/detail", // 获取祝福语详情
20 blessMade: "/bless/made", // 标记定制
21 blessUpdateUserInfo: "/bless/update/name", // 修改名称
22 blessUpdateRoom: "/bless/update/info", // 修改房间信息
23 blessJoin: "/bless/join", // 加入房间
19 24
20 /** 25 /**
21 * 通用接口 26 * 通用接口
22 * 请求时 "mode"传"custom" 27 * 请求时 "mode"传"custom"
23 */ 28 */
24 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询 29 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
30
31 uploadFile: '/kdapi/file/upload' //上传图片通用接口
32
25 } 33 }
......
1 // @import '../../assets/scss/mixins'; 1 // @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils'; 2 @import '../../assets/scss/utils';
3 3
4 .van-button__text {
5 font-size: 36rpx;
6 }
7
4 // 用户头像 8 // 用户头像
5 .portrait { 9 .portrait {
6 position: relative; 10 position: relative;
...@@ -22,6 +26,45 @@ ...@@ -22,6 +26,45 @@
22 } 26 }
23 } 27 }
24 28
29 // 修改对话框
30 .dialog {
31 position: relative;
32 @extend .bb;
33 padding: 36px 24px;
34 font-size: 38px;
35
36 &-item {
37 margin-bottom: 48px;
38 position: relative;
39
40 .label {
41 margin-bottom: 12px;
42 }
43 }
44
45 .upload {
46 position: relative;
47 display: flex;
48
49 .image {
50 width: 240px;
51 height: 152px;
52 }
53 }
54
55 .nickname {
56 margin-top: 12px;
57 }
58
59 .t1 {
60 margin-top: 12px;
61 }
62 }
63
64 .dialog2 {
65 text-align: center;
66 }
67
25 .page { 68 .page {
26 padding-bottom: 200px; 69 padding-bottom: 200px;
27 70
...@@ -140,6 +183,11 @@ ...@@ -140,6 +183,11 @@
140 display: flex; 183 display: flex;
141 justify-content: center; 184 justify-content: center;
142 align-items: flex-end; 185 align-items: flex-end;
186
187 .t1 {
188 max-width: 145px;
189 @include ellipsis(1);
190 }
143 } 191 }
144 } 192 }
145 } 193 }
......
...@@ -13,20 +13,18 @@ ...@@ -13,20 +13,18 @@
13 <view class="user"> 13 <view class="user">
14 <!-- 用户头像 --> 14 <!-- 用户头像 -->
15 <view class="portrait"> 15 <view class="portrait">
16 <!-- <image class="portrait-inner" mode="widthFix" src="../../image/blessing/portrait.png" /> -->
17 <!-- <image class="portrait-border" mode="widthFix" src="../../image/blessing/portrait-border.png" /> -->
18 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" /> 16 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
19 <image class="portrait-border" mode="scaleToFill" src="{{detailData.headFrame}}" /> 17 <image class="portrait-border" mode="scaleToFill" src="{{detailData.headFrame}}" />
20 </view> 18 </view>
21 <!-- 用户名称 --> 19 <!-- 用户名称 -->
22 <view class="name"> 20 <view class="name">
23 <view class="tt">{{detailData.familyName}}</view> 21 <view class="tt">{{ownerMember.memberName}}</view>
24 <image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" /> 22 <image wx:if="{{ownerMember.mySelf == 1}}" bindtap="showUpdateUserInfoDialog" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
25 </view> 23 </view>
26 <!-- 编辑 --> 24 <!-- 编辑房间信息 组队时候才显示 -->
27 <view class="edit"> 25 <view wx:if="{{detailData.type == 1}}" class="edit">
28 <view class="tt t1">{{detailData.sentence}}</view> 26 <view class="tt t1">{{detailData.familyName}}</view>
29 <image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" /> 27 <image wx:if="{{ownerMember.mySelf == 1}}" bindtap="showUpdateRoomDialog" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
30 <view class="tt t2">{{detailData.count}}人</view> 28 <view class="tt t2">{{detailData.count}}人</view>
31 </view> 29 </view>
32 <!-- 用户组 --> 30 <!-- 用户组 -->
...@@ -34,8 +32,8 @@ ...@@ -34,8 +32,8 @@
34 <view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item"> 32 <view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item">
35 <view class="group-item-portrait"></view> 33 <view class="group-item-portrait"></view>
36 <view class="group-item-name"> 34 <view class="group-item-name">
37 <view class="t1">李四</view> 35 <view class="t1">{{item.memberName}}</view>
38 <image class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" /> 36 <image wx:if="{{item.mySelf == 1}}" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
39 </view> 37 </view>
40 </view> 38 </view>
41 </view> 39 </view>
...@@ -48,11 +46,9 @@ ...@@ -48,11 +46,9 @@
48 <view class="sentence">{{detailData.sentence}}</view> 46 <view class="sentence">{{detailData.sentence}}</view>
49 </view> 47 </view>
50 <!-- 尾部内容 --> 48 <!-- 尾部内容 -->
51 <view class="tail"> 49 <view class="tail" wx:if="{{1>10}}">
52 <!-- 尾部头像 --> 50 <!-- 尾部头像 -->
53 <view class="portrait"> 51 <view class="portrait">
54 <!-- <image class="portrait-inner" mode="widthFix" src="../../image/blessing/portrait.png" />
55 <image class="portrait-border" mode="widthFix" src="../../image/blessing/portrait-border.png" /> -->
56 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" /> 52 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
57 <image class="portrait-border" mode="scaleToFill" src="{{detailData.headFrame}}" /> 53 <image class="portrait-border" mode="scaleToFill" src="{{detailData.headFrame}}" />
58 </view> 54 </view>
...@@ -63,7 +59,6 @@ ...@@ -63,7 +59,6 @@
63 <!-- 按钮组 --> 59 <!-- 按钮组 -->
64 <view class="tail-btn-wrap"> 60 <view class="tail-btn-wrap">
65 <!-- 分享团队图片 --> 61 <!-- 分享团队图片 -->
66 <!-- <view class="share"></view> -->
67 <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" /> 62 <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" />
68 <view wx:if="{{detailData.type == 0}}" bindtap="toReward" class="tail-btn-wrap-item more-template"> 63 <view wx:if="{{detailData.type == 0}}" bindtap="toReward" class="tail-btn-wrap-item more-template">
69 <span class="t1">赞赏祝福</span> 64 <span class="t1">赞赏祝福</span>
...@@ -83,25 +78,90 @@ ...@@ -83,25 +78,90 @@
83 <!-- 分情况显示btn-wrap --> 78 <!-- 分情况显示btn-wrap -->
84 <!-- 单人 --> 79 <!-- 单人 -->
85 <block wx:if="{{detailData.type == 0}}"> 80 <block wx:if="{{detailData.type == 0}}">
86 <view class="btn-wrap"> 81 <!-- 未定制 -->
87 <view class="btn btn1">分享图片祝福</view> 82 <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
88 <view class="btn btn2">祝福送朋友</view> 83 <button class="btn btn1">分享图片祝福</button>
89 <!-- <view wx:if="{{detailData.customMade == 0}}" class="btn btn2">祝福送朋友</view> 84 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
90 <view wx:if="{{detailData.customMade == 1}}" class="btn btn2">祝福送朋友</view> --> 85 定制我的祝福
86 </button>
87 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
88 </view>
89 <!-- 已定制 -->
90 <view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
91 <button class="btn btn1">分享图片祝福</button>
92 <button open-type="share" class="btn btn2">送出我的祝福</button>
91 </view> 93 </view>
92 </block> 94 </block>
93 <!-- 组队 --> 95 <!-- 组队 -->
94 <block wx:if="{{detailData.type == 1}}"> 96 <block wx:if="{{detailData.type == 1}}">
95 <view class="btn-wrap"> 97 <!-- 未定制 -->
96 <view class="btn btn1">定制我的祝福</view> 98 <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
97 <view class="btn btn2">祝福送朋友</view> 99 <!-- 未授权 -->
100 <block wx:if="{{!isAuth}}">
101 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1">
102 邀请家人加入
103 </button>
104 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
105 定制我的祝福
106 </button>
107 </block>
108 <!-- 已授权 -->
109 <block wx:else>
110 <button bindtap="showTips" data-data="请定制祝福后再邀请" class="btn btn1">邀请家人加入</button>
111 <button bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</button>
112 </block>
113 </view>
114 <!-- 已经定制 -->
115 <view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
116 <!-- 能加入状态 -->
117 <block wx:if="{{isJoin}}">
118 <button bindtap="onBlessJoinHandler" class="btn btn1">加入组队祝福</button>
119 </block>
120 <!-- 不能加入状态 -->
121 <block wx:else>
122 <button data-data="join" open-type="share" class="btn btn1">邀请家人加入</button>
123 </block>
124 <button open-type="share" class="btn btn2">送出我的祝福</button>
98 </view> 125 </view>
99 </block> 126 </block>
100 <!-- <view class="btn-wrap">
101 <view class="btn btn1">定制我的祝福</view>
102 <view class="btn btn2">祝福送朋友</view>
103 </view> -->
104 </view> 127 </view>
105 </view> 128 </view>
106 </view> 129 </view>
107 <van-dialog id="van-dialog" /> 130 <!-- 修改用户信息 -->
131 <van-dialog close-on-click-overlay use-slot title="修改信息" confirm-button-text="确认修改" show="{{ updateUserInfoDialogVisible }}" show-cancel-button bind:confirm="onUpdateUserInfoHander">
132 <view class="dialog">
133 <view class="dialog-item">
134 <view class="label">名称</view>
135 <input value="{{ updateUserInfo.memberName }}" placeholder="请输入用户名" bindinput="onUpdateUserInfoBindInput" />
136 </view>
137 <view class="dialog-item">
138 <view class="label">头像</view>
139 <view class="upload">
140 <image class="image" bindtap="onUploadHandler" mode="aspectFit" src="{{files[0] && files[0].path?files[0].path:'../../image/icon/icon-plus.png'}}" />
141 </view>
142 </view>
143 </view>
144 </van-dialog>
145 <!-- 修改房间信息 -->
146 <van-dialog close-on-click-overlay use-slot title="修改信息" confirm-button-text="确认修改" show="{{ updateRoomDialogVisible }}" show-cancel-button bind:confirm="onUpdateRoomHander">
147 <view class="dialog">
148 <view class="dialog-item">
149 <view class="label">家庭名称</view>
150 <input value="{{ updateRoomInfo.familyName }}" placeholder="请输入家庭名称" bindinput="onUpdateFamilyNameBindInput" />
151 </view>
152 <view class="dialog-item">
153 <view class="label">祝福语</view>
154 <input value="{{ updateRoomInfo.sentence }}" placeholder="请输入祝福语" bindinput="onUpdateSentenceBindInput" />
155 </view>
156 </view>
157 </van-dialog>
158 <!-- 加入房间 -->
159 <van-dialog close-on-click-overlay use-slot confirm-button-text="点击加入" show="{{ joinRoomDialogVisible }}" bind:confirm="onBlessJoinHandler">
160 <view class="dialog dialog2">
161 <view class="portrait">
162 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
163 </view>
164 <view class="nickname">{{ownerMember.memberName}}</view>
165 <view class="t1">邀请你一起加入组队送祝福!</view>
166 </view>
167 </van-dialog>
......
...@@ -154,7 +154,7 @@ function getObjByListKeyValue(value, key, list) { ...@@ -154,7 +154,7 @@ function getObjByListKeyValue(value, key, list) {
154 * @param {*} path 154 * @param {*} path
155 */ 155 */
156 function wxacodeGet(path) { 156 function wxacodeGet(path) {
157 return " https://api.k.wxpai.cn/bizproxy/mzcfsapi/qrcode/create?path=" + encodeURIComponent(path); 157 return "https://api.k.wxpai.cn/bizproxy/mzcfsapi/qrcode/create?path=" + encodeURIComponent(path);
158 } 158 }
159 159
160 /** 160 /**
......