diff --git a/main.js b/main.js
index ce5fa7e..9ae0e69 100644
--- a/main.js
+++ b/main.js
@@ -13,8 +13,8 @@ import * as filters from '@/utils/formatFilter'
 uni.$http = $http
 Vue.prototype.$api = api
 
-// $http.baseUrl = 'http://146.56.223.227:9527'
-$http.baseUrl = 'http://localhost:9527'
+$http.baseUrl = 'http://146.56.223.227:9527'
+// $http.baseUrl = 'http://localhost:85'
 
 $http.beforeRequest = function(options) {
 	uni.showLoading({
diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue
index 4add765..49d0632 100644
--- a/pages/knowledge/knowledge.vue
+++ b/pages/knowledge/knowledge.vue
@@ -1,8 +1,9 @@
 <template>
 	<view>
-		知识库页面
-		
-		<tabbar :page="page"></tabbar>
+		知识库
+		<view class="footbox">
+		  <tabbar :page="page"></tabbar>
+		</view>
 	</view>
 </template>
 
@@ -16,11 +17,55 @@
 		},
 		onShow() {
 			this.page= "know"
+		},
+		methods: {
+		
 		},
 		components: {tabbar}
 	}
 </script>
 
 <style lang="scss">
+.scanBox {
+    position: fixed;
+    top: 0;
+    width: 100%;
+    height: 100vh;
+    background-color: #000000;
+}
+
+
+.camera {
+    position: relative;
+    width: 70vw;
+    height: 70vw;
+    margin: 20vh auto 0;
+}
+.coverImg{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+}
+.scanTip {
+    padding: 20rpx 0 0 0;
+    font-size: 32rpx;
+    text-align: center;
+    color: #fff;
+}
+
 
+/* 开关手电筒 */
+.scancodePic{
+    background: transparent !important;
+    width: 100rpx;
+    height: 100rpx;
+    padding: 0 !important;
+}
+.scancodePic>image{
+    width: 100%;
+    height: 100%;
+}
 </style>
diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue
index 5dcd23f..7b062a0 100644
--- a/pages/scan/scan.vue
+++ b/pages/scan/scan.vue
@@ -1,48 +1,119 @@
 <template>
-	<view class="wrap">
-	  <view class="footbox">
-		<tabbar :page="page"></tabbar>
-	  </view>
+	<view>
+		<!-- 扫描框 -->
+		<view class="scanBox" v-if="canScan">
+		    <camera class="camera" mode="scanCode" @scancode="scancode" :flash='flashBtn'>
+		        <image class="coverImg" src="/static/images/border.png"></image>
+		    </camera>
+		
+		    <view style="text-align: center;margin: 80rpx 0 40rpx 0;">
+		        <button class="cu-btn scancodePic" @click="changeflashBtn()">
+		            <image :src="flashBtn=='on'?scancodeOpen:scancodeClose"></image>
+		        </button>
+		    </view>
+		    <view class="scanTip">请扫描二维码</view>
+		    <!-- 关闭扫码页面 -->
+			<view class="footbox">
+			  <tabbar :page="page"></tabbar>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-    import tabbar from "@/components/tabbar/tabbar.vue";
+	import tabbar from "@/components/tabbar/tabbar.vue";
 	export default {
-
 		data() {
 			return {
-				page: ""
+				page: "",
+				sceneName:"",
+				canScan: true, // 是否显示自定义扫码界面
+				flashBtn: 'off', // off关闭   on  打开手电筒
+				scanResult: '' ,// 扫描结果
+				scancodeOpen:"/static/images/turn_on.png",
+				scancodeClose:"/static/images/turn_off.png",
 			};
 		},
-		onLoad() {
-			 this.QR();
-			// setInterval(() => {
-			//    this.QR(); // 定时刷新数据
-			// }, 3000); // 每隔3秒刷新一次
-		},
 		onShow() {
-		  this.page= "scan"
+			this.page= "scan"
 		},
 		methods: {
-			QR() {
-				uni.scanCode({
-					success: (res) => {
-						console.log('扫描二维码成功,结果:' + res.result);
-					},
-					fail: (res) => {
-						console.log('扫描二维码出现错误')
-					}
+			async scancode(event) {
+			    if (this.isTf) return;
+			    this.isTf = true;
+			    setTimeout(() => {
+			      // 3秒扫描一次
+			      this.isTf = false;
+			      return;
+			    }, 3000); 
+			    uni.vibrateShort(); // 触发手机振动
+			    const { result } = event.detail; // 获取校验扫描结果
+				const { data: res } = await uni.$http.post('/small/scene/manage/listApp',{guid:result})
+						  
+				 if (res.rows.length==0) {
+					return uni.showToast({title: '未找到相关演练场景'})
+				}
+				res.rows.forEach(item=>{
+				   this.sceneName = item.name
 				})
+				uni.navigateTo({
+				    url: '/subpkg/role/role?guid=' + result+'&name='+this.sceneName
+				})
+			},
+			// 打开关闭手电筒
+			changeflashBtn(){
+				if(this.flashBtn=="off"){
+					this.flashBtn="on"
+				}else if(this.flashBtn=="on"){
+					this.flashBtn="off"
+				}
 			},
 		},
-		components: {
-			tabbar
-		}
+		components: {tabbar}
 	}
 </script>
 
 <style lang="scss">
-	@import url("@/static/base_css.css");
+.scanBox {
+    position: fixed;
+    top: 0;
+    width: 100%;
+    height: 100vh;
+    background-color: #000000;
+}
+
+
+.camera {
+    position: relative;
+    width: 70vw;
+    height: 70vw;
+    margin: 20vh auto 0;
+}
+.coverImg{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+}
+.scanTip {
+    padding: 20rpx 0 0 0;
+    font-size: 32rpx;
+    text-align: center;
+    color: #fff;
+}
+
 
-</style>
\ No newline at end of file
+/* 开关手电筒 */
+.scancodePic{
+    background: transparent !important;
+    width: 100rpx;
+    height: 100rpx;
+    padding: 0 !important;
+}
+.scancodePic>image{
+    width: 100%;
+    height: 100%;
+}
+</style>
diff --git a/utils/config.js b/utils/config.js
index cca2440..7765cc0 100755
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,3 +1,3 @@
-// let url_config = 'http://146.56.223.227:9527/'
-let url_config = 'http://localhost:9527/'
+let url_config = 'http://146.56.223.227:9527/'
+// let url_config = 'http://localhost:85/'
 export default url_config
\ No newline at end of file