测试修改

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧园区",
     "appid" : "__UNI__9ACE566",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
@@ -20,7 +20,8 @@
         "modules" : {
             "Geolocation" : {},
             "VideoPlayer" : {},
-            "Maps" : {}
+            "Maps" : {},
+            "Camera" : {}
         },
         "distribute" : {
             "android" : {

pages/order/info.vue

@@ -35,13 +35,17 @@
 		phonenumber:'',
 		code:'',
 		user:{},
-		equipmentName:"",//设备id
+		equipmentName:"",//设备id,
       }
     },
     onReady() {
     },
 	onLoad:function(e){
-		this.equipmentName=e.adr;
+		var type=e.adr;
+		if(type==1){
+			this.equipmentName='后门抓拍一体机1';
+		}
+		// this.equipmentName=e.adr;
 	},
     methods: {
 		submit() {

work/pages/clock/clock.vue

@@ -576,7 +576,7 @@ export default {
 				this.timetext = '外勤打卡';
 				this.kaRadfalg = false;
 			}
-			console.log(this.kaRadfalg)
+			// console.log(this.kaRadfalg)
 		},
 		getCity(latitude, longitude) {
 			var that = this;
@@ -598,7 +598,6 @@ export default {
 			});
 		},
 		getPunchFnchi() {
-			console.log(this.daKainfo)
 			if (this.daKainfo.isPicture == 'Y' && !this.imgurl) {
 				this.$toast('请拍照上传');
 				return;

work/pages/clock/kaorules.vue

@@ -7,7 +7,7 @@
 					<view class="boxtopbb" :style="role?'':'color:#AAAAAA;'">{{role||'选择部门'}}</view>
 					<image :src="upimg" class="boxtopbc"></image>
 				</view> -->
-				<view class="boxflex" @click="getAddFn">
+				<view class="boxflex" @click="getAddFn" v-if="checkPermi(['system:schedule:add'])">
 					<image :src="rulesimg" class="boxtopbd"></image>
 					<view class="boxtopbe">添加考勤设置</view>
 				</view>
@@ -70,6 +70,7 @@
 		selectDictLabel
 	} from '@/utils/common.js'
 	import cardList from "@/work/components/clock/cardlist.vue"
+	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
 	export default {
 		data() {
 			return {
@@ -135,6 +136,7 @@
 			}
 		},
 		methods: {
+			checkPermi,checkRole,
 			getClose() {
 				this.uplatflag = false;
 			},

work/pages/clock/setswork.vue

@@ -78,6 +78,7 @@
 </template>
 
 <script>
+	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
 	import dataTimePicke from "@/components/timepick/dataTimePicke.vue"
 	import selectMorePicker from "@/components/selectMorePicker.vue"
 	import {getMapconfig,getBaoconfig,getXiuconfig,getdeptTreeNow} from "@/api/work/check.js"
@@ -110,7 +111,7 @@
 					titflag: true,
 					data: []
 				},
-				indexs:1,
+				indexs:0,
 				isPicture:'是',
 				surelist:[{
 					"label": '是',
@@ -160,6 +161,7 @@
 			// this.getdeptTreeNow();
 		},
 		methods:{
+			checkPermi,checkRole,
 			//是否拍照
 			showNucleic(){
 				this.$refs.nucleinselet.show();
@@ -291,9 +293,11 @@ this.$tab.navigateTo("/work/pages/clock/setwoek?address="+this.formData.location
 						this.formData=res.data
 						var isPicture=res.data.isPicture
 						if(isPicture=='Y'){
-							this.isPicture='是'
+							this.isPicture='是';
+							this.indexs=0;
 						}else{
-							this.isPicture='否'
+							this.isPicture='否';
+							this.indexs=1;
 						}	
 					}else{
 						 this.$toast(res.msg)

work/pages/yyorder/menu.vue

@@ -115,11 +115,11 @@ import { selectDictLabel } from '@/utils/common.js';
 		},
 		getDataFn() {
 			var params = {
-				pageSize: this.pageSize,
-				pageNum: this.pageNum,
+				// pageSize: this.pageSize,
+				// pageNum: this.pageNum,
 				isUse:'Y'
 			}
-			getMenuRecordList(params).then(res => {
+			getMenuList(params).then(res => {
 				if (res.code == 200) {
 					// if (res.rows.length < this.pageSize) {
 					// 	this.reachflag = false