ios位置授权描述和微信授权登录开关

components/BaseLogin/index.vue

@@ -67,7 +67,7 @@
 				</view>
 			</view>
     </view>
-		<view class="other-login-box">
+		<view v-if="showWeixinLogin" class="other-login-box">
 			<view class="other-login">
 				<view class="line"> </view>
 				<view> 其他方式登陆 </view>
@@ -113,6 +113,9 @@ export default {
     pwdPlaceholder() {
 			return "请填写密码";
     },
+		showWeixinLogin() {
+			return Number(uni.getStorageSync('showWeixinLogin')) === 1
+		},
   },
 	watch: {
 		type() {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "梦航教育宝",
     "appid" : "__UNI__640EC10",
     "description" : "1.1",
-    "versionName" : "1.0.3",
+    "versionName" : "1.0.4",
-    "versionCode" : 103,
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -61,7 +61,8 @@
                 "urltypes" : "zsff.xinbadaweb.cn",
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你编辑用户信息",
-                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你编辑用户信息"
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你编辑用户信息",
+										"NSLocationWhenInUseUsageDescription": "该应用需要获取你的地理位置，以便为你推荐附近的线下课程"
                 }
             },
             /* SDK配置 */

pages/index/index.vue

@@ -669,8 +669,10 @@ export default {
 		  try {
 		    const { data } = await getCopyrightInfo();
 		    uni.setStorageSync('openMember', data.is_open_member);
+		    uni.setStorageSync('showWeixinLogin', data.is_show_weixin_login);
 		  } catch (err) {
 		    uni.setStorageSync('openMember', 0);
+		    uni.setStorageSync('showWeixinLogin', 0);
 		  }
 		},
 		getPositionAddress(longitude, latitude,) {

pages/learningCenter/reciteDetail.vue

@@ -31,7 +31,6 @@
 				</view> -->
 			</view>
 			<mp-html
-				v-if="!!content"
 				class="swiper-conter"
 				container-style="padding: 30rpx;background: #ffffff;"
 				:content="content"

pages/merchant/teacher_detail.vue

@@ -74,7 +74,7 @@
           </view>
         </view>
 				<view style="background: #fff;">
-					<mp-html v-if="navActive === 1" class="panel1" container-style="padding: 0 30rpx;background: #ffffff;"
+					<mp-html v-if="navActive === 1" class="panel1" container-style="padding: 0 30rpx 30rpx;background: #ffffff;"
 						:content="lecturer.introduction"></mp-html>
 				</view>
         <view v-if="navActive === 2 && list.length" class="panel2">