二维码问题处理

components/ApproveList.vue

@@ -234,7 +234,8 @@
 				margin-bottom: 4rpx;
 
 				.img {
-					width: 100%;
+					width: 100%;
+					min-width: 30px;
 					height: 100%;
 					overflow: hidden;
 					position: relative;

config/.env.dev.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
 	ProjectName :"荆力设备管理",
-	BASE_URL: 'http://192.168.77.162:8086/equipment-manage-server/',
+	//BASE_URL: 'http://192.168.77.162:8086/equipment-manage-server/',
 	BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",
 	//IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',

main.js

@@ -12,6 +12,8 @@ import getOpenId from './apis/utils/init.js'
 // } else {
 	
 // }
+
+
 getOpenId.init()
 
 import mixin from './apis/utils/mixin.js'

pages/otherFunctions/equipmentRetrieval/equipmentInfo.vue

@@ -287,10 +287,12 @@
 		},
 		methods: {
 			onLoad(op){
-				this.id=op.id
-				if(op.jpdeviceid){
-					this.getCode(op.jpdeviceid)
+			
+				console.log(op)
+				if(op.q){					
+					this.getCode(takeCodeJp(decodeURIComponent(op.q)))
 				}else{
+					this.id=op.id
 					this.getInfo()
 				}
 				

pages/otherFunctions/homePage.vue

@@ -15,7 +15,7 @@
 						</view>
 					</view>
 					<view class="options" v-if="show==true" >
-						<view v-if="role('3')" @click="changeShow4()">订阅</view>
+						<view  v-if="false" @click="changeShow4()">订阅</view>
 						
 						<view v-if="false" @click="changeShow2()">修改openId</view> 
 						<view @click="logout()">退出账号</view>
@@ -190,6 +190,27 @@
 			//this.getUserDepartmentList()
 			this.getInfo()
 		},
+		onReady() {
+			console.log("onReady")
+			// #ifdef MP-WEIXIN
+			wx.getSetting({
+			  success: res => {
+				  	console.log("onReady2")
+			    if (!res.authSetting['scope.camera']) {
+			      wx.authorize({
+			        scope: 'scope.camera',
+			        success () {
+			          // 用户已经同意小程序使用摄像头
+			        },
+			        fail () {
+			          // 用户拒绝了小程序使用摄像头
+			        }
+			      })
+			    }
+			  }
+			})
+			// #endif
+		},
 		onShow(){
 			if(this.role("3")){
 				
@@ -211,6 +232,9 @@
 			
 		},
 		methods: {
+			error(e) {
+			           console.log(e);
+			},
 			role(val){
 				if(this.userInfo.type!=null&&this.userInfo.type!=undefined){
 					var index=this.userInfo.type.split(',').indexOf(val)

pages/projectDepartment/exportReturn/deliveryFrom.vue

@@ -341,7 +341,7 @@
 				})
 			},
 			error(e) {
-			           console.log(e.detail);
+			           console.log(e);
 			},
 			gotoscan(val) {
 				// #ifdef H5

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -509,7 +509,7 @@
 				})
 			},
 			 error(e) {
-			            console.log(e.detail);
+			            console.log(e);
 			 },
 			 gotoscan(val){
 				// if(this.deviceposition=='back'){

pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -447,8 +447,8 @@
 							// 只上传偶数索引的文件
 							if(index % 2 == 0) return true;
 							else return false;
-						}, error(e) {
-			            console.log(e.detail);
+			}, error(e) {
+			            console.log(e);
 			 },
 			 gotoscan(val){
 				// if(this.deviceposition=='back'){

pages/storeManagement/equipmentInspection/planDetail.vue

@@ -246,6 +246,9 @@
 			}
 		},
 		methods: {
+			error(e) {
+			           console.log(e);
+			},
 			delOutListMethod(c) {
 			
 				if (c > -1) {