修改组件名称

App.vue

@@ -10,7 +10,7 @@
 			console.log('App Launch')
 			initApp();
 			// #ifdef APP-PLUS
-			checkIsAgree();
+			//checkIsAgree(); 暂时先用默认生成的，自定义的等待原生支持后实现。因为启动vue界面时已经，请求了部分权限这并不符合国家的法规
 			// #endif
 
 			//#ifdef APP-NVUE || H5

baseapp.config.js

@@ -35,5 +35,9 @@ module.exports = {
 			}
 		],
 		"download": "https://m3w.cn/uniapp"
+	},
+	"marketId":{//用于打开应用市场评分界面
+		"ios":"id1417078253",
+		"android":"123456"
 	}
 }

common/appInit.js

@@ -7,6 +7,10 @@ export default function() {
 	// 初始化appVersion（仅app生效）
 	initAppVersion();
 	
+	// baseappConfig挂载到getApp().
+	getApp({allowDefault: true}).config = baseappConfig;
+	
+
 	//自定义路由拦截
 	const {
 		"router": {

components/login-short-code/login-short-code.vue → components/send-sms-code/send-sms-code.vue

@@ -20,7 +20,7 @@
 		}
 	}
 	export default {
-		name: "login-short-code",
+		name: "send-sms-code",
 		props: {
 			/**
 			 * 倒计时时长 s
@@ -35,6 +35,15 @@
 			phone: {
 				type: [String, Number],
 				default: ''
+			},
+			/*
+				验证码类型，用于防止不同功能的验证码混用，目前支持的类型login登录、register注册、bind绑定手机、unbind解绑手机
+			*/
+			codeType:{
+				type: String,
+				default(){
+					return 'login'
+				}
 			}
 		},
 		data() {
@@ -69,7 +78,7 @@
 				this.request('user-center/sendSmsCode',
 					{
 						"mobile": this.phone,
-						"type": "login"
+						"type": this.codeType
 					},(data,result)=>{
 						console.log(data,result);
 						uni.showToast({
@@ -79,37 +88,8 @@
 						this.reverseNumber = Number(this.count);
 						this.getCode();
 						this.$emit('getCode');
-					})
-				
-				// uniCloud.callFunction({
-				// 	"name": "user-center",
-				// 	"data": {
-				// 		"action": "sendSmsCode",
-				// 		"params": {
-				// 			"mobile": this.phone,
-				// 			"type": "login"
-				// 		}
-				// 	},
-				// 	success: (e) => {
-				// 		uni.showToast({
-				// 			title: "短信验证码发送成功",
-				// 			icon: 'none'
-				// 		});
-				// 		this.reverseNumber = Number(this.count);
-				// 		this.getCode();
-				// 		this.$emit('getCode');
-				// 	},
-				// 	fail: (err) => {
-				// 		console.log(err);
-				// 		uni.showToast({
-				// 			title: '短信验证码发送失败',
-				// 			icon: 'none'
-				// 		});
-				// 	},
-				// 	complete: () => {
-				// 		uni.hideLoading()
-				// 	}
-				// })
+					}
+				)
 			},
 			getCode() {
 				if (this.reverseNumber == 0) {

js_sdk/request.js

@@ -9,7 +9,6 @@ const debug = true;//开启后，会alert错误信息
 export default function request(name,params,callback=false,{showLoading=false,loadText='',fail=()=>{}}={}){
 	// console.log('request');
 	showLoading||loadText? uni.showLoading({title:loadText}):'';
-	
 	let routers =  name.split('/');
 	var action = false
 	if (routers.length>1){
@@ -23,28 +22,12 @@ export default function request(name,params,callback=false,{showLoading=false,lo
 				console.log(e);
 				const {result:{data,code}} = e
 				console.log(data,code);
-				if (code != 0 ) {
-					if(debug){
-						uni.showModal({
-							content: JSON.stringify(e),
-							showCancel: false,
-							confirmText: '知道了'
-						})
-					}
-				}
 				resolve(e)
 				return callback(data,e.result,e)
 			},
 			fail(err){
 				reject(err)
 				console.log(err);
-				if(debug){
-					uni.showModal({
-						content: JSON.stringify(err),
-						showCancel: false,
-						confirmText: '知道了'
-					})
-				}
 				fail(err)
 			},
 			complete() {

manifest.json

@@ -7,6 +7,15 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        "privacy" : {
+            "prompt" : "template",
+            "template" : {
+                "title" : "服务协议和隐私政策",
+                "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+                "buttonAccept" : "我知道了",
+                "buttonRefuse" : "暂不同意"
+            }
+        },
         "compatible" : {
             "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
         },
@@ -31,14 +40,14 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-                },
-                "permissionPhoneState" : {
-                    "request" : "none",
-                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
-                },
+                // "permissionExternalStorage" : {
+                //     "request" : "none",
+                //     "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                // },
+                // "permissionPhoneState" : {
+                //     "request" : "none",
+                //     "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+                // },
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",

pages.json

@@ -62,7 +62,7 @@
 		}, {
 			"path": "pages/ucenter/edit/bind-mobile/bind-mobile",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "绑定手机号码"
 			}
 		},
 		{
@@ -70,7 +70,7 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "uni_modules/uni-feedback/pages/opendb-feedback/list",
 			"style": {
 				"navigationBarTitleText": "常见问题"
@@ -90,8 +90,7 @@
 			"style": {
 				"navigationBarTitleText": "关于"
 					// #ifdef APP-PLUS
-					,
-				"app-plus": {
+				,"app-plus": {
 					"titleNView": {
 						"buttons": [{
 							"type": "share"
@@ -138,7 +137,9 @@
 			"path": "uni_modules/uni-agree/pages/uni-agree/uni-agree",
 			"style": {
 				"navigationStyle": "custom",
-				"app-plus":{"popGesture": "none"}
+				"app-plus": {
+					"popGesture": "none"
+				}
 			}
 		}, {
 			"path": "pages/ucenter/settings/settings",
@@ -195,8 +196,8 @@
 
 		},
 		{
-			"path":"uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
-			"style":{
+			"path": "uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
+			"style": {
 				"navigationBarTitleText": "阅读记录",
 				"enablePullDownRefresh": false
 			}

pages/grid/grid.vue

@@ -9,7 +9,7 @@
 				disabled />
 		</template>
 		<!-- banner -->
-		<unicloud-db ref="bannerdb" v-slot:default="{data, loading, error, options}" :collection="collection"
+		<unicloud-db ref="bannerdb" v-slot:default="{data, loading, error, options}" collection="opendb-banner"
 			:field="field" @load="load">
 			<uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="data || bannerFormate(data, loading)"
 				:current="current" :mode="mode" :dots-styles="dotsStyles" field="content">
@@ -88,8 +88,6 @@
 						text: 'Grid 9'
 					}
 				],
-
-				collection: 'opendb-banner',
 				// 查询字段，多个字段用 , 分割
 				field: '_id,bannerfile,open_url,title',
 				where: 'category_id==grid',

pages/ucenter/edit/bind-mobile/bind-mobile.vue

 <template>
 	<view class="box">
 		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-easyinput focus type="number" class="phone-input-box" :inputBorder="false" v-model="formData.phone"
+		<uni-easyinput clearable focus type="number" class="input-box" :inputBorder="false" v-model="formData.phone"
 			maxlength="11" placeholder="请输入手机号"></uni-easyinput>
-		<uni-easyinput type="number" class="phone-input-box" :inputBorder="false" v-model="formData.code" maxlength="6"
+		<uni-easyinput clearable type="number" class="input-box" :inputBorder="false" v-model="formData.code" maxlength="6"
 			placeholder="请输入验证码">
 			<template slot="right">
-				<login-short-code ref="shortCode" :phone="formData.phone"></login-short-code>
+				<send-sms-code ref="shortCode" code-type="bind" :phone="formData.phone"></send-sms-code>
 			</template>
 		</uni-easyinput>
 		<button class="send-btn-box" type="primary" @click="submit">提交</button>
@@ -71,16 +71,15 @@
 	.box {
 		align-items: center;
 		justify-content: center;
+		padding: 50rpx;
 		padding-top: 10px;
 	}
 
 	.box /deep/ .uni-easyinput__content {
-		height: 45px;
+		height: 50px;
 	}
 
-	.phone-input-box {
-		width: 650rpx;
-		height: 50px;
+	.input-box {
 		margin-top: 16px;
 		background-color: #f9f9f9;
 		border-radius: 6rpx;

pages/ucenter/edit/edit.vue

@@ -91,8 +91,10 @@
 					},
 					fail: (err) => {
 						console.log(err);
+						if(err.code=='30002'){
 							this.bindMobileBySmsCode()
 						}
+					}
 				})
 			},
 			bindMobileBySmsCode() {

pages/ucenter/login-page/phone-code/phone-code.vue

@@ -14,7 +14,7 @@
 						<uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
 							v-model="formData.code" maxlength="6" placeholder="请输入验证码">
 							<template slot="right">
-								<login-short-code :phone="formData.phone" ref="shortCode"></login-short-code>
+								<send-sms-code :phone="formData.phone" ref="shortCode"></send-sms-code>
 							</template>
 						</uni-easyinput>
 					</uni-forms-item>

pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue

@@ -16,7 +16,7 @@
 						<uni-easyinput :focus="formData.phone.length" type="number" class="phone-input-box" :inputBorder="false"
 							v-model="formData.code" maxlength="6" placeholder="请输入验证码">
 							<template slot="right">
-								<login-short-code ref="shortCode" :phone="formData.phone"></login-short-code>
+								<send-sms-code ref="shortCode" :phone="formData.phone"></send-sms-code>
 							</template>
 						</uni-easyinput>
 					</uni-forms-item>
@@ -93,7 +93,7 @@ import mixin from '../common/loginPage.mixin.js';
 
 <style>
 	@import url("../common/loginPage.css");
-	.phone-input-box{
-		margin-top: 20rpx;
+	.content-top-title{
+		margin-bottom: 6px;
 	}
 </style>

pages/ucenter/ucenter.vue

@@ -112,6 +112,9 @@
 				return getApp().appVersion
 			}
 			// #endif
+			,appConfig(){
+				return getApp().config
+			}
 		},
 		methods: {
 			...mapMutations({
@@ -159,12 +162,12 @@
 				// #ifdef APP-PLUS
 				if (uni.getSystemInfoSync().platform == "ios") {
 					// 这里填写appstore应用id
-					let appstoreid = 'id1417078253';
+					let appstoreid = this.appConfig.marketId.ios;// 'id1417078253';
 					plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8');
 				}
 				if (uni.getSystemInfoSync().platform == "android") {
 					var Uri = plus.android.importClass("android.net.Uri");
-					var uri = Uri.parse("market://details?id=" + plus.runtime.appid);
+					var uri = Uri.parse("market://details?id=" + this.appConfig.marketId.android);
 					var Intent = plus.android.importClass('android.content.Intent');
 					var intent = new Intent(Intent.ACTION_VIEW, uri);
 					var main = plus.android.runtimeMainActivity();

uniCloud-aliyun/cloudfunctions/user-center/index.js

@@ -124,19 +124,20 @@ exports.main = async (event, context) => {
 				mobile: params.mobile,
 				code: params.code
 			});
-			let verifyCode = await uniID.verifyCode({
-				mobile: params.mobile,
-				code: params.code
-			})
-			if (verifyCode.code === 0) {
+			// let verifyCode = await uniID.verifyCode({
+			// 	mobile: params.mobile,
+			// 	code: params.code
+			// })
+			// if (verifyCode.code === 0) {
+			// } else {
+			// 	res = verifyCode
+			// }
 			res = await uniID.bindMobile({
 				uid: params.uid,
-					mobile: params.mobile
+				mobile: params.mobile,
+				code: params.code
 			})
-			} else {
-				res = verifyCode
-			}
-			console.log(res, verifyCode);
+			console.log(res);
 			break;
 		case 'register':
 			let {
@@ -210,10 +211,10 @@ exports.main = async (event, context) => {
 			break;
 		case 'sendSmsCode':
 			
-			//123546
 			return uniID.setVerifyCode({
 				mobile: params.mobile,
-				code:'123456'
+				code:'123456',
+				type: params.type
 			})