登录修改

manifest.json

@@ -12,7 +12,8 @@
         /* 5+App特有相关 */
         "modules" : {
             "Payment" : {},
-            "OAuth" : {}
+            "OAuth" : {},
+            "VideoPlayer" : {}
         },
         "softinput" : {
             "mode" : "adjustResize"
@@ -29,45 +30,45 @@
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios" : {
-                "privacyDescription" : {
-                    "NSCameraUsageDescription" : "直播需要使用摄像头",
-                    "NSMicrophoneUsageDescription" : "直播需要使用麦克风"
-                },
-                "idfa" : false
-            },
+            "ios" : {},
             /* ios打包配置 */
             "sdkConfigs" : {
                 "ad" : {},
                 "payment" : {
                     "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
+                        "__platform__" : [ "android" ],
                         "appid" : "wx53db61c69b2e1ed1",
-                        "UniversalLinks" : "https://www.qianjiadi.com/merchant/"
+                        "UniversalLinks" : ""
                     }
                 },
                 "oauth" : {
                     "weixin" : {
                         "appid" : "wx53db61c69b2e1ed1",
                         "appsecret" : "944e2b205734646479c0b76be6cdbd90",
-                        "UniversalLinks" : "https://www.qianjiadi.com/merchant/"
+                        "UniversalLinks" : ""
                     }
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "common",
+                "androidStyle" : "default",
                 "iosStyle" : "common"
             },
             "icons" : {
@@ -104,17 +105,17 @@
             }
         },
         "nativePlugins" : {
-            "JH-JhliveApp" : {
+            "JhliveApp" : {
                 "__plugin_info__" : {
-                    "name" : "吉亨直播插件",
-                    "description" : "腾讯ios、安卓直播插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3810",
-                    "android_package_name" : "uni.D204FA0",
-                    "ios_bundle_id" : "com.qianjiadi.merchant",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "3810",
+                    "name" : "JhliveApp",
+                    "description" : "示例插件",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
                     "parameters" : {}
                 }
             }
@@ -140,7 +141,7 @@
             "mode" : "history",
             "base" : "./"
         },
-        "title" : "merchant",
+        "title" : "cereshop",
         "domain" : "39.100.102.234",
         "devServer" : {
             "port" : 8081

pages.json

@@ -198,5 +198,15 @@
 			"selectedIconPath": "static/images/icon-mine-active.png",
 			"text": "个人"
 		}]
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
 }

pages/index/index.vue

@@ -14,7 +14,7 @@
 			</button>
 			<view class="authorize-info">{{wxPhoneData? '****************' : ''}}</view> -->
 			<!-- <view class="authorize-login" @click="getUserInfo">登录</view> -->
-			<text class="authorize-tip">提示：仅限入驻商家内部使用
+			<text class="authorize-tip">说明：仅限入驻商家内部使用
 			</text>
 			<!-- <text class="underline authorize-tip">https://qianjiadi.com/merchant-web/</text> -->
 			<!-- #ifdef MP-WEIXIN -->
@@ -22,7 +22,7 @@
 				class="authorize-login" 
 				open-type="getUserInfo" 
 				@getuserinfo="getUserinfoWechat" withCredentials="true" >
-				微信一键登录/注册
+				微信一键登录
 			</button>
 			<!-- #endif -->
 
@@ -30,7 +30,7 @@
 			<button
 				class="authorize-login" 
 				@click="getUserinfoApp">
-				微信一键登录/注册
+				微信一键登录
 			</button>
 			<!-- #endif -->
 			<view @click="showAgreement = true" class="agreement">点击登录视为同意<text class="underline">商家入驻协议</text></view>