Merge branch 'master' of http://local.gunshiiot.com:10000/lishenfeng/xffxkh-app

manifest.json

@@ -17,7 +17,9 @@
             "delay" : 0
         },
         "modules" : {
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "Contacts" : {},
+            "Messaging" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -39,7 +41,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
                 ]
             },
             "ios" : {

pages/addressBook/follow.vue

@@ -90,6 +90,11 @@
 				  uni.$showMsg()
 				}
 				
+			},
+			callNum(num) {
+				uni.makePhoneCall({
+					phoneNumber: num //仅为示例
+				});
 			}
 		},
 		created() {

pages/addressBook/myDept.vue

@@ -90,7 +90,12 @@
 				  uni.$showMsg()
 				}
 				
-			}
+			},
+			callNum(num) {
+				uni.makePhoneCall({
+					phoneNumber: num //仅为示例
+				});
+			},
 		},
 		created() {
 			this.getData()

pages/forewarning/forewarning.vue

@@ -24,7 +24,9 @@
 			itemStyle="height: 44px"
 		>
 		</u-tabs>
-		<component :is="tabsVal"></component>
+		<uniSh v-if="tabsVal==='uniSh'"></uniSh>
+		<uniSk v-if="tabsVal==='uniSk'"></uniSk>
+		<uniHd v-if="tabsVal==='uniHd'"></uniHd>
 	</view>
 </template>
 
@@ -41,18 +43,18 @@
 				tabsOptions:[
 					{
 						name:'水库预警',
-						components:uniSk
+						components:'uniSk'
 					},
 					{
 						name:'河道预警',
-						components:uniHd
+						components:'uniHd'
 					},
 					{
 						name:'山洪预警',
-						components:uniSh
+						components:'uniSh'
 					},
 				],
-				tabsVal:uniSk
+				tabsVal:'uniSk'
 			};
 		},
 		methods: {

pages/orderFeedback/orderInformation.vue

@@ -2,7 +2,7 @@
 	<view :style="{height:'100vh',overflow:'hidden',background:'#f7f7f7'}">
 		<u-status-bar></u-status-bar>
 		<u-navbar
-			title="2024年调度令05号" 
+			:title="record.year+'年度调令第'+record.serial+'号'" 
 			:autoBack="true" 
 			:titleStyle="{
 				fontSize:'18px'
@@ -25,7 +25,8 @@
 		>
 		</u-tabs>
 		<div class="mybody">
-			<component :is="tabsVal" :record="record"></component>
+			<uniZl v-if="tabsVal==='uniZl'" :record="record"></uniZl>
+			<uniFk v-if="tabsVal==='uniFk'" :record="record"></uniFk>
 		</div>
 	</view>
 </template>
@@ -37,11 +38,11 @@
 	const tabsOptions = [
 					{
 						name:'调度指令',
-						components:uniZl
+						components:'uniZl'
 					},
 					{
 						name:'执行反馈',
-						components:uniFk
+						components:'uniFk'
 					},
 				]
 
@@ -50,7 +51,7 @@
 		data() {
 			return {
 				tabsOptions:tabsOptions,
-				tabsVal:uniZl,
+				tabsVal:'uniZl',
 				record:{}
 			};
 		},