Merge branch 'jianxiang' into 'debug'

未开启相机权限弹框提示更改

See merge request iot-project-js/doorlock!41

dev/src/view/addDevice/v_scanCodeAdd.js

@@ -72,11 +72,11 @@ function resolve(self){
         }, function (err) {
             console.log('error', err);
             plus.nativeUI.confirm(Vue.t("addDevice.openCameraTip"), (e)=>{
-                if(e.index == 0){
+                if(e.index == 1){
                 	iot.native.toAppSetting();
                 }
                 backTap(self);
-            },{"title": "","buttons": [Vue.t("addDevice.openCamera"),Vue.t("btn.cancel")]});
+            },{"title": "","buttons": [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]});
         });
     }else{
     	let isFistOpenCamera = iot.storage.getMap('isFistOpenCamera');
@@ -88,11 +88,11 @@ function resolve(self){
             }, function (err) {
                 console.log('error', err);
                 plus.nativeUI.confirm(Vue.t("addDevice.openCameraTip"), (e)=>{
-	                if(e.index == 0){
+	                if(e.index == 1){
 	                	iot.native.toAppSetting();
 	                }
 	                backTap(self);
-	            },{"title": "","buttons": [Vue.t("addDevice.openCamera"),Vue.t("btn.cancel")]});
+	            },{"title": "","buttons": [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]});
             });
     	}else{
     		openScanCode(self);