Merge branch 'master' into app

.hbuilderx/launch.json

@@ -1,20 +1,27 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-ios"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "sugarpark-mini-program",
-    "appid" : "__UNI__1ED9DE5",
+    "appid" : "__UNI__261BFE1",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -41,9 +41,13 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* 快应用特有相关 */
@@ -101,5 +105,6 @@
                 "enable" : true
             }
         }
-    }
+    },
+    "fallbackLocale" : "zh-Hans"
 }

pages/friends/friends.vue

@@ -501,7 +501,7 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options)
+			console.log('options',options)
 			if(options.invite){
 				uni.setStorageSync('invited',options.invite);
 			}
@@ -510,10 +510,13 @@
 				title:'加载中'
 			})
 			this.$api.public.aliossCdn({}).then(cdnRes=>{
+				console.log('cdnRes',cdnRes)
 				this.$store.commit('setImageCdn',cdnRes.data.pictureCdn);
 				this.$store.commit('setVideoCdn',cdnRes.data.videoCdn);
 				uni.setStorageSync('imageCdn',cdnRes.data.pictureCdn);
 				uni.setStorageSync('videoCdn',cdnRes.data.videoCdn);
+			}).catch((error)=>{
+				console.log('error---aliossCdn',error)
 			});
 			this.login();
 			this.computedScollviewHeight();
@@ -554,6 +557,7 @@
 			login(){
 				const that=this;
 				if(uni.getStorageSync('isLogin')==='yes'){
+					console.log('uni.getStorageSync(isLogin)',uni.getStorageSync('isLogin'))
 					this.getMineData();
 					this.computedLocation();
 					return;
@@ -566,6 +570,7 @@
 								jsCode:res.code
 							}
 						}).then(result=>{
+							console.log('result',result)
 							if(result.status==='Succ'){
 								uni.setStorageSync('openId',result.data.wxLoginInfo.openId);
 								uni.setStorageSync('unionId',result.data.wxLoginInfo.unionId);
@@ -584,10 +589,12 @@
 							}
 							
 							
+						}).catch((error)=>{
+							console.log('uni.login',error)
 						})
 					},
 					fail: (err) => {
-						console.log(err)
+						console.log('免密登录',err)
 					}
 				});
 			},
@@ -629,6 +636,8 @@
 						userID:String(user.id),
 						userSig:this.$store.state.IMloadSig
 					})
+				}).catch((err)=>{
+					console.log('IM.loadSig',err)
 				})
 			},
 			onTIMError(error) {

pagesSub/chatting/chatting.vue

@@ -25,8 +25,8 @@
 			<view class="input-box flex-between">
 				<!-- <van-field v-model="inputText"  label="文本"  placeholder="请输入消息…" /> -->
 				<!-- <input type="text" class="input" confirm-type="send" placeholder="请输入消息…" :adjust-position="true" v-model="inputText" placeholder-style="color:#7D7DA4 ;font-size:24rpx" @confirm="sendTextMessage"> -->
-				<input class="TUI-message-input-area" :adjust-position="false" cursor-spacing="20" v-model="inputText"
-					@confirm="sendTextMessage" maxlength="140" type="text" placeholder-class="input-placeholder" placeholder-style="color:#7D7DA4 ;font-size:24rpx"
+				<input class="TUI-message-input-area input" :adjust-position="false" cursor-spacing="20" v-model="inputText"
+					@confirm="sendTextMessage" maxlength="140" type="text" placeholder-style="color:#7D7DA4 ;font-size:24rpx"
 					placeholder="请输入消息…" @focus="inputBindFocus" @blur="inputBindBlur" />
 				<view class="input-btn font22 fw400" @click="sendTextMessage">
 					发送
@@ -187,7 +187,8 @@ export default {
 		inputBindBlur() {
 			// input 失去焦点，键盘隐藏，设置 input 所在盒子的 bottom 值为0
 			// this.$emit('changeBottomVal', 0)
-			this.scrollHeight = 0
+			// this.scrollHeight = 0
+			this.computedScollviewHeight()
 			this.bottomVal = 0
 
 		},