6/16

pages/webview.vue

@@ -17,7 +17,7 @@
 		onLoad(options) {
 			this.device_id = options.device_id
 			this.accessToken = options.accessToken
-			this.url = "http://192.168.1.112:8002/wechat?device_id=" + this.device_id + "&accessToken=" + this.accessToken
+			this.url = "https://wx.hnyfwlw.com/wechat?device_id=" + this.device_id + "&accessToken=" + this.accessToken
 			//设置 webview 界面的状态栏的 title
 			uni.setNavigationBarTitle({
 				title: '监控详情'

style/html/h52.html

@@ -121,7 +121,7 @@
 			if (ctrl == "takephoto") {
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.camera_takephoto",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.camera_takephoto",
 					data: {
 						device_id: device_id,
 					}
@@ -137,7 +137,7 @@
 				//上下左右、放大、缩小
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 					data: {
 						device_id: device_id,
 						ctrl: ctrl,
@@ -153,7 +153,7 @@
 		function stopConfigCamera() {
 			$.ajax({
 				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+				url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 				data: {
 					device_id: device_id,
 					ctrl: "stop",
@@ -163,7 +163,7 @@
 		$(function() {
 			$.ajax({
 				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.addr_camera",
+				url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.addr_camera",
 				data: {
 					device_id: device_id,
 				}

unpackage/dist/dev/mp-weixin/app.json

@@ -101,6 +101,10 @@
       }
     ]
   },
+<<<<<<< HEAD
   "usingComponents": {},
   "sitemapLocation": "sitemap.json"
+=======
+  "usingComponents": {}
+>>>>>>> 689110420c3aa522bf2c78c17edcce1dae754b0c
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -4,6 +4,7 @@
     "ignore": []
   },
   "setting": {
+<<<<<<< HEAD
     "urlCheck": true,
     "es6": true,
     "enhance": false,
@@ -43,17 +44,32 @@
   "libVersion": "",
   "appid": "wxa67985a99191095e",
   "projectname": "云飞智控",
+=======
+    "urlCheck": false,
+    "minified": true,
+    "postcss": false,
+    "es6": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "wx8b73392672bcdac0",
+  "projectname": "大数据平台APP",
+>>>>>>> 689110420c3aa522bf2c78c17edcce1dae754b0c
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": 3,
       "list": [
         {
           "name": "about",

unpackage/dist/dev/mp-weixin/sitemap10.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}