Skip to content

dev / home-with-kids-mp

Go to a project
Toggle navigation
Toggle navigation pinning
423786fb by simon
Options

默认提交

1 parent 92629e08
Inline Side-by-side
Showing 7 changed files with 257 additions and 92 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');
6 let router = require('./router/index'); 6 let router = require('./router/index');
7 let store = require('./utils/stroage'); 7 let store = require('./utils/stroage');
8 8
9 import {
10 getUuid
11 } from '/utils/util';
12
9 require('./http/mock-data'); 13 require('./http/mock-data');
10 14
11 App({ 15 App({
...@@ -44,6 +48,29 @@ App({ ...@@ -44,6 +48,29 @@ App({
44 this.globalData.statusBarHeight = wx.getSystemInfoSync().statusBarHeight; 48 this.globalData.statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
45 this.globalData.barHeight = height; 49 this.globalData.barHeight = height;
46 this.share(); 50 this.share();
51
52 // let uuid = store.getItem("aldstat_uuid");
53 // console.log("uuid222:", uuid);
54 // store.setItem("uuid", uuid);
55 // console.log("uuid:", uuid);
56 // wx.aldstat.sendOpenid(uuid);
57
58 // 阿拉丁
59 // wx.login({
60 // success: function (res) {
61 // wx.request({
62 // url: "",
63 // data: {
64 // jscode: res.code
65 // },
66 // success: function (res) {
67 // //.....
68 // //调用上传OpenID
69 // wx.aldstat.sendOpenid(uuid);
70 // }
71 // })
72 // }
73 // })
47 }, 74 },
48 globalData: { 75 globalData: {
49 share: false, 76 share: false,
......
...@@ -153,6 +153,23 @@ button { ...@@ -153,6 +153,23 @@ button {
153 } 153 }
154 } 154 }
155 155
156 @keyframes ani-scal-key-2 {
157 0% {
158 transform: scale(1);
159 }
160
161 25% {
162 transform: scale(1.04);
163 }
164
165 50% {
166 transform: scale(1);
167 }
168
169 75% {
170 transform: scale(1.04);
171 }
172 }
156 173
157 // web font icon 174 // web font icon
158 175
......
...@@ -32,6 +32,7 @@ Page({ ...@@ -32,6 +32,7 @@ Page({
32 // type: 0, // 0单人 1组队 32 // type: 0, // 0单人 1组队
33 // 个人信息修改 33 // 个人信息修改
34 updateUserInfoDialogVisible: false, 34 updateUserInfoDialogVisible: false,
35 joinRoomDialogVisibleUnAuth: false,
35 updateUserInfo: {}, // 需要更新的用户数据 36 updateUserInfo: {}, // 需要更新的用户数据
36 files: [], // 上传文件列表 37 files: [], // 上传文件列表
37 38
...@@ -41,7 +42,7 @@ Page({ ...@@ -41,7 +42,7 @@ Page({
41 42
42 // 加入房间 43 // 加入房间
43 joinRoomDialogVisible: false, 44 joinRoomDialogVisible: false,
44 // joinRoomDialogVisibleUnAuth: false, 45 joinRoomDialogVisibleUnAuth: false,
45 isJoin: false, // 是否能加入状态 46 isJoin: false, // 是否能加入状态
46 joined: false, // 是否已加入 47 joined: false, // 是否已加入
47 48
...@@ -82,6 +83,11 @@ Page({ ...@@ -82,6 +83,11 @@ Page({
82 if (shareType) { 83 if (shareType) {
83 title = `${ownerMember.memberName}邀请您组队发祝福！体验今年最火爆的拜年方式` 84 title = `${ownerMember.memberName}邀请您组队发祝福！体验今年最火爆的拜年方式`
84 } else {} 85 } else {}
86
87 let act = res.target.dataset.act || "";
88 if (act == "made") {
89 this.onShareBlessMakeHandler();
90 }
85 } else {} 91 } else {}
86 92
87 // 权重 参数memberCode(房主memberCode) => 本人memberCode 93 // 权重 参数memberCode(房主memberCode) => 本人memberCode
...@@ -158,6 +164,11 @@ Page({ ...@@ -158,6 +164,11 @@ Page({
158 this.pauseBgm(); 164 this.pauseBgm();
159 }, 165 },
160 onLoad(options) { 166 onLoad(options) {
167 wx.login({
168 success(res) {
169 app.store.setItem('wxcode2', res.code);
170 }
171 });
161 172
162 let date = new Date(); 173 let date = new Date();
163 let lunar = calendar.calendar.solar2lunar(date.getFullYear(), date.getMonth() + 1, date.getDate()); 174 let lunar = calendar.calendar.solar2lunar(date.getFullYear(), date.getMonth() + 1, date.getDate());
...@@ -205,23 +216,21 @@ Page({ ...@@ -205,23 +216,21 @@ Page({
205 }) 216 })
206 if (detailData.customMade == 1 && detailData.type == 1 && ownerMember.mySelf == 0 && options.t == "join" && !joined) { 217 if (detailData.customMade == 1 && detailData.type == 1 && ownerMember.mySelf == 0 && options.t == "join" && !joined) {
207 this.setData({ 218 this.setData({
208 joinRoomDialogVisible: true, 219 // joinRoomDialogVisible: true,
209 isJoin: true, 220 isJoin: true,
210 }); 221 });
211 // if (detailData.isAuth == 1) { 222 if (detailData.isAuth == 1) {
212 // this.setData({ 223 this.setData({
213 // joinRoomDialogVisible: true, 224 joinRoomDialogVisible: true,
214 // }) 225 })
215 // } else { 226 } else {
216 // this.setData({ 227 this.setData({
217 // joinRoomDialogVisibleUnAuth: true, 228 joinRoomDialogVisibleUnAuth: true,
218 // }) 229 })
219 // } 230 }
220 } 231 }
221 }); 232 });
222 console.log("memberCode:", app.store.getItem("memberCode")); 233 console.log("memberCode:", app.store.getItem("memberCode"));
223
224
225 }, 234 },
226 235
227 /** 236 /**
...@@ -280,11 +289,18 @@ Page({ ...@@ -280,11 +289,18 @@ Page({
280 }, 289 },
281 290
282 291
283 showTips(evt) { 292 showTips(tips) {
293 wx.showToast({
294 title: tips + "",
295 icon: "none"
296 })
297 },
298
299 showTipsByWxml(evt) {
284 let tips = getBindtapData(evt); 300 let tips = getBindtapData(evt);
285 wx.showModal({ 301 wx.showToast({
286 content: tips, 302 title: tips + "",
287 success(res) {} 303 icon: "none"
288 }) 304 })
289 }, 305 },
290 306
...@@ -421,10 +437,20 @@ Page({ ...@@ -421,10 +437,20 @@ Page({
421 this.onCreatePoster(posterData); 437 this.onCreatePoster(posterData);
422 }); 438 });
423 } else { 439 } else {
424 wx.showModal({ 440 // this.showTips("请先定制祝福")
425 content: "请先定制祝福", 441 app.post({
426 success(res) {} 442 url: app.api.blessMade,
427 }) 443 data: {
444 blessCode: detailData.blessCode,
445 }
446 }).then((result) => {
447 this.queryBlessDetail().then((result) => {
448 this.getWxCode().then((result) => {
449 let posterData = this.getPosterConfig();
450 this.onCreatePoster(posterData);
451 });
452 });
453 }).catch((err) => {});
428 } 454 }
429 }, 455 },
430 456
...@@ -621,12 +647,8 @@ Page({ ...@@ -621,12 +647,8 @@ Page({
621 }) 647 })
622 }); 648 });
623 } else { 649 } else {
624 wx.showModal({ 650 this.showTips("请先定制祝福");
625 content: "请先定制祝福",
626 success(res) {}
627 })
628 } 651 }
629
630 }, 652 },
631 653
632 // 房主名字 654 // 房主名字
...@@ -651,10 +673,7 @@ Page({ ...@@ -651,10 +673,7 @@ Page({
651 }) 673 })
652 }); 674 });
653 } else { 675 } else {
654 wx.showModal({ 676 this.showTips("请先定制祝福");
655 content: "请先定制祝福",
656 success(res) {}
657 })
658 } 677 }
659 }, 678 },
660 679
...@@ -881,6 +900,14 @@ Page({ ...@@ -881,6 +900,14 @@ Page({
881 } = this.data; 900 } = this.data;
882 console.log("isAuth:", isAuth); 901 console.log("isAuth:", isAuth);
883 if (isAuth) { 902 if (isAuth) {
903
904 // 把房间变成自己
905 this.setData({
906 isJoin: false,
907 joined: false,
908 "options.m": app.store.getItem("memberCode")
909 })
910 this.queryBlessDetail().then((result) => {
884 // 已授权 911 // 已授权
885 app.post({ 912 app.post({
886 url: app.api.blessMade, 913 url: app.api.blessMade,
...@@ -889,23 +916,38 @@ Page({ ...@@ -889,23 +916,38 @@ Page({
889 } 916 }
890 }).then((result) => { 917 }).then((result) => {
891 this.queryBlessDetail().then((result) => { 918 this.queryBlessDetail().then((result) => {
892 wx.showModal({ 919 this.showTips("定制祝福成功！");
893 title: '定制祝福成功！',
894 content: '马上为亲朋好友送上祝福吧~',
895 success(res) {}
896 })
897 }); 920 });
898 }).catch((err) => {}); 921 }).catch((err) => {});
922 })
899 } else { 923 } else {
900 // 未授权 924 // 未授权
901 } 925 }
902 }, 926 },
903 927
904 /** 928 /**
929 * 未定制时但已授权时，戳起分享作为定制
930 */
931 onShareBlessMakeHandler() {
932 let {
933 detailData,
934 isAuth
935 } = this.data;
936 app.post({
937 url: app.api.blessMade,
938 data: {
939 blessCode: detailData.blessCode,
940 }
941 }).then((result) => {
942 this.queryBlessDetail().then((result) => {});
943 }).catch((err) => {});
944 },
945
946 /**
905 * 加入房间 947 * 加入房间
906 */ 948 */
907 onBlessJoinHandler(e) { 949 onBlessJoinHandler(e) {
908 this.checkAuthShowComp("join").then((result) => { 950 // this.checkAuthShowComp("join").then((result) => {
909 let { 951 let {
910 options, 952 options,
911 detailData 953 detailData
...@@ -921,30 +963,16 @@ Page({ ...@@ -921,30 +963,16 @@ Page({
921 isJoin: false 963 isJoin: false
922 }) 964 })
923 this.queryBlessDetail().then((result) => { 965 this.queryBlessDetail().then((result) => {
924 wx.showModal({ 966 this.showTips("加入成功");
925 showCancel: false,
926 content: '加入成功',
927 success(res) {}
928 })
929 });
930 }).catch((err) => {
931
932 });
933 }).catch((err) => {
934
935 }); 967 });
968 }).catch((err) => {});
936 }, 969 },
937 970
938 // 点击确认授权按钮 971 // 点击确认授权按钮
939 bindGetUserInfo(e) { 972 bindGetUserInfo(e) {
940 let _this = this; 973 let _this = this;
941 wx.showLoading(); 974 wx.showLoading();
942 wx.login({
943 success(res) {
944 app.store.setItem('wxcode', res.code);
945 _this.getUserInfo(e.detail); 975 _this.getUserInfo(e.detail);
946 }
947 });
948 }, 976 },
949 977
950 // 授权操作 978 // 授权操作
...@@ -962,7 +990,7 @@ Page({ ...@@ -962,7 +990,7 @@ Page({
962 blessCode: detailData.blessCode, 990 blessCode: detailData.blessCode,
963 encryptedData: e.encryptedData, 991 encryptedData: e.encryptedData,
964 iv: e.iv, 992 iv: e.iv,
965 code: app.store.getItem("wxcode"), 993 code: app.store.getItem("wxcode2"),
966 tlMemberCode: app.globalData.tlMemberCode 994 tlMemberCode: app.globalData.tlMemberCode
967 } 995 }
968 }).then((res2) => { 996 }).then((res2) => {
...@@ -971,10 +999,7 @@ Page({ ...@@ -971,10 +999,7 @@ Page({
971 app.store.setItem('sessionId', res2.sessionId); 999 app.store.setItem('sessionId', res2.sessionId);
972 app.store.setItem('memberCode', res2.memberCode); 1000 app.store.setItem('memberCode', res2.memberCode);
973 } 1001 }
974 wx.showModal({ 1002 this.showTips("授权成功");
975 content: '授权成功',
976 success(res) {}
977 })
978 1003
979 this.queryBlessDetail().then((result) => { 1004 this.queryBlessDetail().then((result) => {
980 this.checkAuth().then((result) => {}).catch((err) => {}); 1005 this.checkAuth().then((result) => {}).catch((err) => {});
...@@ -991,6 +1016,74 @@ Page({ ...@@ -991,6 +1016,74 @@ Page({
991 } 1016 }
992 }, 1017 },
993 1018
1019 // 授权后加入组队
1020 getUserInfo2(evt) {
1021 let {
1022 detailData
1023 } = this.data;
1024 let e = evt.detail;
1025 if (e.encryptedData && e.iv) {
1026 wx.showLoading();
1027 // 同意授权
1028 app.post({
1029 url: app.api.register,
1030 sid: false,
1031 data: {
1032 // blessCode: detailData.blessCode,
1033 encryptedData: e.encryptedData,
1034 iv: e.iv,
1035 code: app.store.getItem("wxcode2"),
1036 tlMemberCode: app.globalData.tlMemberCode
1037 }
1038 }).then((res2) => {
1039 wx.hideLoading();
1040 if (res2 && res2.sessionId) {
1041 app.store.setItem('sessionId', res2.sessionId);
1042 app.store.setItem('memberCode', res2.memberCode);
1043 }
1044 this.onBlessJoinHandler();
1045 }).catch((err) => {
1046 wx.hideLoading();
1047 })
1048 } else {}
1049 },
1050
1051 // 授权后定制祝福
1052 getUserInfo3(evt) {
1053 console.log("getUserInfo3 33333");
1054 let {
1055 detailData
1056 } = this.data;
1057 let e = evt.detail;
1058 if (e.encryptedData && e.iv) {
1059 wx.showLoading();
1060 // 同意授权
1061 app.post({
1062 url: app.api.register,
1063 sid: false,
1064 data: {
1065 // blessCode: detailData.blessCode,
1066 encryptedData: e.encryptedData,
1067 iv: e.iv,
1068 code: app.store.getItem("wxcode2"),
1069 tlMemberCode: app.globalData.tlMemberCode
1070 }
1071 }).then((res2) => {
1072 wx.hideLoading();
1073 if (res2 && res2.sessionId) {
1074 app.store.setItem('sessionId', res2.sessionId);
1075 app.store.setItem('memberCode', res2.memberCode);
1076 }
1077 console.log("1111");
1078 this.queryBlessDetail().then((result) => {
1079 this.onBlessMakeHandler();
1080 });
1081 }).catch((err) => {
1082 wx.hideLoading();
1083 })
1084 } else {}
1085 },
1086
994 /** 1087 /**
995 * 隐藏蒙层 1088 * 隐藏蒙层
996 */ 1089 */
......
...@@ -437,6 +437,8 @@ $blessContentLabelWidth: 650px; ...@@ -437,6 +437,8 @@ $blessContentLabelWidth: 650px;
437 color: #940023; 437 color: #940023;
438 box-shadow: 5.9px 5.5px 18px 0 rgba(26, 36, 91, 0.73); 438 box-shadow: 5.9px 5.5px 18px 0 rgba(26, 36, 91, 0.73);
439 background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5); 439 background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
440
441 animation: ani-scal-key-2 2s infinite;
440 } 442 }
441 } 443 }
442 } 444 }
......
...@@ -41,27 +41,11 @@ ...@@ -41,27 +41,11 @@
41 </view> 41 </view>
42 <!-- 邀请 房主或组队模式显示 --> 42 <!-- 邀请 房主或组队模式显示 -->
43 <view class="group-item" wx:if="{{options.t || ownerMember.mySelf == 1}}"> 43 <view class="group-item" wx:if="{{options.t || ownerMember.mySelf == 1}}">
44 <block wx:if="{{isAuth}}"> 44 <block wx:if="{{detailData.customMade == 1}}">
45 <!-- 已授权 -->
46 <!-- 未定制 -->
47 <block wx:if="{{detailData.customMade == 0}}">
48 <button bindtap="showTips" data-data="请定制祝福后再邀请" class="group-item-inv">
49 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" />
50 </button>
51 </block>
52 <!-- 已定制 -->
53 <block wx:else>
54 <button data-data="join" open-type="share" class="group-item-inv"> 45 <button data-data="join" open-type="share" class="group-item-inv">
55 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" /> 46 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" />
56 </button> 47 </button>
57 </block> 48 </block>
58 </block>
59 <block wx:else>
60 <!-- 未授权 -->
61 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="group-item-inv">
62 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" />
63 </button>
64 </block>
65 </view> 49 </view>
66 </view> 50 </view>
67 <!-- 更多 --> 51 <!-- 更多 -->
...@@ -127,8 +111,11 @@ ...@@ -127,8 +111,11 @@
127 <block wx:if="{{ownerMember.mySelf == 1}}"> 111 <block wx:if="{{ownerMember.mySelf == 1}}">
128 <!-- 未定制 --> 112 <!-- 未定制 -->
129 <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap"> 113 <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
130 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button> 114 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1">
131 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2"> 115 分享图片祝福
116 </button>
117 <button wx:else bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
118 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo3" class="btn btn2">
132 定制我的祝福 119 定制我的祝福
133 </button> 120 </button>
134 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view> 121 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
...@@ -141,7 +128,10 @@ ...@@ -141,7 +128,10 @@
141 </block> 128 </block>
142 <block wx:else> 129 <block wx:else>
143 <view class="btn-wrap"> 130 <view class="btn-wrap">
144 <view bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</view> 131 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo3" class="btn btn1">
132 定制我的祝福
133 </button>
134 <view wx:else bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</view>
145 <button open-type="share" class="btn btn2">送祝福给亲友</button> 135 <button open-type="share" class="btn btn2">送祝福给亲友</button>
146 </view> 136 </view>
147 </block> 137 </block>
...@@ -155,14 +145,22 @@ ...@@ -155,14 +145,22 @@
155 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1"> 145 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1">
156 邀亲友组团拜年 146 邀亲友组团拜年
157 </button> 147 </button>
158 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2"> 148 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo3" class="btn btn2">
159 定制我的祝福 149 定制我的祝福
160 </button> 150 </button>
151 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
161 </block> 152 </block>
162 <!-- 已授权 --> 153 <!-- 已授权 -->
163 <block wx:else> 154 <block wx:else>
164 <button bindtap="showTips" data-data="请定制祝福后再邀请" class="btn btn1">邀亲友组团拜年</button> 155 <!-- 11111 -->
165 <button bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</button> 156 <button data-data="join" data-act="made" open-type="share" class="btn btn1">
157 邀亲友组团拜年
158 </button>
159 <!-- <button bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</button> -->
160 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo3" class="btn btn2">
161 定制我的祝福
162 </button>
163 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
166 </block> 164 </block>
167 </view> 165 </view>
168 <!-- 已经定制 --> 166 <!-- 已经定制 -->
...@@ -175,17 +173,29 @@ ...@@ -175,17 +173,29 @@
175 <block wx:else> 173 <block wx:else>
176 <!-- 能加入状态 --> 174 <!-- 能加入状态 -->
177 <block wx:if="{{isJoin}}"> 175 <block wx:if="{{isJoin}}">
178 <button bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</button> 176 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo3" class="btn btn1">
179 <button bindtap="onBlessJoinHandler" class="btn btn2">加入组队祝福</button> 177 定制我的祝福
178 </button>
179 <view wx:else bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</view>
180 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo2" class="btn btn2">
181 加入组队祝福
182 </button>
183 <button wx:else bindtap="onBlessJoinHandler" class="btn btn2">加入组队祝福</button>
180 </block> 184 </block>
181 <!-- 不能加入状态 --> 185 <!-- 不能加入状态 -->
182 <block wx:else> 186 <block wx:else>
183 <!-- 自己房间 --> 187 <!-- 自己房间 -->
184 <button wx:if="{{ownerMember.mySelf == 1}}" data-data="join" open-type="share" class="btn btn1"> 188 <block wx:if="{{ownerMember.mySelf == 1}}">
185 邀亲友组团拜年 189 <button data-data="join" open-type="share" class="btn btn1">邀亲友组团拜年</button>
186 </button> 190 </block>
187 <!-- 非自己房间 --> 191 <!-- 非自己房间 -->
188 <button wx:else bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</button> 192 <block wx:else>
193 <!-- <button bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</button> -->
194 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo3" class="btn btn1">
195 定制我的祝福
196 </button>
197 <view wx:else bindtap="onBlessMakeHandler" class="btn btn1">定制我的祝福</view>
198 </block>
189 <button open-type="share" class="btn btn2">送祝福给亲友</button> 199 <button open-type="share" class="btn btn2">送祝福给亲友</button>
190 </block> 200 </block>
191 </block> 201 </block>
...@@ -235,7 +245,7 @@ ...@@ -235,7 +245,7 @@
235 <view class="t1">邀请你一起加入组队送祝福!</view> 245 <view class="t1">邀请你一起加入组队送祝福!</view>
236 </view> 246 </view>
237 </van-dialog> 247 </van-dialog>
238 <!-- <van-dialog close-on-click-overlay use-slot confirm-button-text="点击加入" show="{{ joinRoomDialogVisibleUnAuth }}" confirm-button-open-type="getUserInfo" bind:getuserinfo="getUserInfo"> 248 <van-dialog close-on-click-overlay use-slot confirm-button-text="点击加入" show="{{ joinRoomDialogVisibleUnAuth }}" confirm-button-open-type="getUserInfo" bind:getuserinfo="getUserInfo2">
239 <view class="dialog dialog2"> 249 <view class="dialog dialog2">
240 <view class="portrait"> 250 <view class="portrait">
241 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" /> 251 <image class="portrait-inner" mode="scaleToFill" src="{{ownerMember.memberHead}}" />
...@@ -243,7 +253,7 @@ ...@@ -243,7 +253,7 @@
243 <view class="nickname">{{ownerMember.memberName}}</view> 253 <view class="nickname">{{ownerMember.memberName}}</view>
244 <view class="t1">邀请你一起加入组队送祝福!</view> 254 <view class="t1">邀请你一起加入组队送祝福!</view>
245 </view> 255 </view>
246 </van-dialog> --> 256 </van-dialog>
247 <van-popup class="poster-popup" show="{{ authorizeVisible }}"> 257 <van-popup class="poster-popup" show="{{ authorizeVisible }}">
248 <authorize-comp evttype="{{evttype}}" bind:evtcomp="evtcomp"></authorize-comp> 258 <authorize-comp evttype="{{evttype}}" bind:evtcomp="evtcomp"></authorize-comp>
249 </van-popup> 259 </van-popup>
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
98 // background-color: wheat; 98 // background-color: wheat;
99 font-size: 40px; 99 font-size: 40px;
100 @include ellipsis(2); 100 @include ellipsis(2);
101 color: #fc464a; 101 color: #333333;
102 // word-break : normal; 102 // word-break : normal;
103 } 103 }
104 104
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 font-size: 32px; 107 font-size: 32px;
108 bottom: 12px; 108 bottom: 12px;
109 left: 14px; 109 left: 14px;
110 color: #333333; 110 color: #888888;
111 @include ellipsis(1); 111 @include ellipsis(1);
112 } 112 }
113 113
......
...@@ -247,6 +247,21 @@ function checkAuthUtils(name, url) { ...@@ -247,6 +247,21 @@ function checkAuthUtils(name, url) {
247 }); 247 });
248 } 248 }
249 249
250 //普通生成uuid
251 function getUuid() {
252 var s = [];
253 var hexDigits = "0123456789abcdef";
254 for (var i = 0; i < 36; i++) {
255 s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
256 }
257 s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
258 s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
259 s[8] = s[13] = s[18] = s[23] = "-";
260
261 var uuid = s.join("");
262 return uuid;
263 }
264
250 module.exports = { 265 module.exports = {
251 formatTime: formatTime, 266 formatTime: formatTime,
252 checkMobile: checkMobile, 267 checkMobile: checkMobile,
...@@ -260,5 +275,6 @@ module.exports = { ...@@ -260,5 +275,6 @@ module.exports = {
260 wxacodeGet: wxacodeGet, 275 wxacodeGet: wxacodeGet,
261 getObjByListKeyValue: getObjByListKeyValue, 276 getObjByListKeyValue: getObjByListKeyValue,
262 getQueryByUrl: getQueryByUrl, 277 getQueryByUrl: getQueryByUrl,
263 checkAuthUtils: checkAuthUtils 278 checkAuthUtils: checkAuthUtils,
279 getUuid: getUuid,
264 } 280 }
......