xujing 5 years ago
parent
commit
a6f06aa8c9

+ 4
- 4
config/dev.js View File

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
9
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
-    HOST: '"https://lt.pawoma.cn"',
11
-    WSS_HOST: '"wss://lt.pawoma.cn"',
8
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
9
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
+    // HOST: '"https://lt.pawoma.cn"',
11
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     // HOST: '"http://192.168.2.51:8080"',
12
     // HOST: '"http://192.168.2.51:8080"',
13
     // WSS_HOST: '"ws://192.168.2.51:8080"',
13
     // WSS_HOST: '"ws://192.168.2.51:8080"',
14
     Version: 'V3.5.5'
14
     Version: 'V3.5.5'

+ 4
- 4
config/prod.js View File

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://192.168.2.54:8080"',
6
     // HOST: '"http://192.168.2.54:8080"',
7
     // WSS_HOST: '"ws://192.168.2.54:8080"',
7
     // WSS_HOST: '"ws://192.168.2.54:8080"',
8
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
9
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
-    HOST: '"https://lt.pawoma.cn"',
11
-    WSS_HOST: '"wss://lt.pawoma.cn"',
8
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
9
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
+    // HOST: '"https://lt.pawoma.cn"',
11
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     Version:'V3.5.5_2019-12-30'
12
     Version:'V3.5.5_2019-12-30'
13
   },
13
   },
14
   weapp: {},
14
   weapp: {},

+ 2
- 2
project.config.json View File

1
 {
1
 {
2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
-	"description": "知与行互动",
5
-	"appid": "wxd6f47a9bb3052175",
4
+	"description": "知与行联调",
5
+	"appid": "wxd9ee3a9480a4e544",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 2
- 2
src/components/achieveAvatar/index.js View File

74
         <View className="avatar-page">
74
         <View className="avatar-page">
75
           <View className="content">
75
           <View className="content">
76
             <View className="title">请允许获取昵称、头像、地区及性别</View>
76
             <View className="title">请允许获取昵称、头像、地区及性别</View>
77
-            <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
78
-            <View className="name">用户昵称</View>
77
+            <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
78
+              <View className="name"><open-data type="userNickName"></open-data></View>
79
             <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
79
             <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
80
           </View>
80
           </View>
81
         </View>
81
         </View>

+ 7
- 6
src/components/achieveAvatar/index.scss View File

29
       color: #333;
29
       color: #333;
30
     }
30
     }
31
     .touxiang{
31
     .touxiang{
32
-      width: 110px;
33
-      height: 110px;
32
+      overflow: hidden;
33
+      display: block;
34
+      width: 108px;
35
+      height: 108px;
36
+      margin: 24px auto 10px ;
34
       border-radius: 50%;
37
       border-radius: 50%;
35
-      margin: 20px 0 10px 0;
36
     }
38
     }
37
     .name{
39
     .name{
38
-      font-size: 26px;
39
-      color: #333;
40
+      font-size: 28px;
41
+      color: #353535;
40
     }
42
     }
41
   
43
   
42
-  
43
     .btn{
44
     .btn{
44
       width:290px;
45
       width:290px;
45
       height:90px;
46
       height:90px;