Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

# Conflicts:
#	package1/ieBrowser/profileSetup.vue

package1/ieBrowser/mode.vue

@@ -9,7 +9,7 @@
 		<view class="head">
 			<view class="eyebrow">Today Mode</view>
 			<view class="title">今天想以哪种方式被陪伴？</view>
-			<view class="sub">这不是人格测试，只是此刻的社交能量。</view>
+			<view class="sub">不是人格测试，只是此刻的社交能量。</view>
 		</view>
 
 		<view class="mode-card i" :class="{ active: activeMode === 'i' }" @tap="activeMode = 'i'">