修复优化

data/json.js

@@ -1,7 +1,8 @@
 // 本地模拟json数据
 // 首页九宫格
 let cuIconList=[{
-						imgUrl: '../../static/square1.png',
+						// imgUrl: '../../static/square1.png',
+						imgUrl:'../../static/square1.png',
 						badge: 120,
 						name: '综合报警',
 						redirectUrl: '/pages/siteList/siteList?type=1'
@@ -224,7 +225,8 @@ let deviceType = [{
 		"id": "3",
 		"title": "电气火灾",
 		"num": "4",
-		"imgUrl": "../../static/dt-dqIcon.png",
+		// "imgUrl": "../../static/dt-dqIcon.png",  
+		"imgUrl": "https://s.yxin.tech/static/dt-dqIcon.png",
 		"dwtype":7
 	},
 	{

main.js

@@ -13,10 +13,6 @@ Vue.component('cu-custom', cuCustom)
 //配置公共方法
 import common from './common/common.js'
 Vue.prototype.$noMultipleClicks = common.noMultipleClicks; // (禁止重复点击)
-// Vue.prototype.$websiteUrl = common.websiteUrl;
-// Vue.prototype.$BASE_URL = common.BASE_URL;
-// Vue.prototype.$websiteUrl = 'https://qhome.usky.cn';
-// Vue.prototype.$BASE_URL = 'https://qhome.usky.cn/USKYZHAF/USKYZHAF.php/Home/';
 
 
 import JsonExcel from 'vue-json-excel'

manifest.json

@@ -118,7 +118,7 @@
         "enable" : false
     },
     "h5" : {
-        "publicPath" : "./",
+		 "publicPath" : "./",
         "title" : "智慧消防",
         "router" : {
             "mode" : "hash",

pages/deviceManage/component/exportModal.vue

@@ -3,7 +3,7 @@
 	<view class="cu-modal export-modal" :class="modalName=='DialogModal'?'show':''">
 		<view class="cu-dialog">
 			<view class="cu-bar bg-white justify-end">
-				<view class="action" @tap="hideModal2">
+				<view class="action" @tap="cCancel">
 					<text class="cuIcon-close"></text>
 				</view>
 			</view>

pages/index/components/chart2/chart2.vue

@@ -38,7 +38,7 @@
 						text: '{val|' + (parseInt(this.bindData.alarm_count) + parseInt(this.bindData
 								.event_count) + parseInt(this.bindData.hidden_danger_count)) + '}\n{name|' +
 							title + '}',
-						top: '45%',
+						top: '30%',
 						left: 'center',
 						textStyle: {
 							rich: {
@@ -56,8 +56,8 @@
 						}
 					}],
 					legend: { //aa图例
-					    y:' bottom',
-						orient: 'horizontal',
+					    bottom: '30',
+					           // right: 50,
 						icon: 'circle',
 						itemWidth: 12,
 						itemHeight: 12,
@@ -82,7 +82,7 @@
 						name: '访问来源',
 						type: 'pie',
 						radius: ['40%', '60%'],
-						center: ['50%', '55%'],
+						center: ['50%', '35%'],
 						itemStyle: {
 							normal: {
 								shadowBlur: 20,

pages/index/index.vue

@@ -124,11 +124,11 @@
 				alert("你点击了扫一扫");
 				this.scanQRCode();
 			} else {
-				alert("你点击了获取位置");
-				this.getLocation()
+				// alert("你点击了获取位置");
+				// this.getLocation()
 
 
-				// this.showTag()
+				this.showTag()
 			}
 		},
 
@@ -165,15 +165,8 @@
 				let that = this;
 				// 微信公众号获取位置
 				jwx.configWeiXin(jweixin => {
-					alert(11)
-					console.log('wx')
-					console.log(wx)
-					console.log('wx.scanQRCode')
-					console.log(wx.scanQRCode)
-					
-					console.log('wx.getLocation')
-					console.log(wx.getLocation)
-					wx.scanQRCode({
+
+					jweixin.scanQRCode({
 						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
 						scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
 						success: function(res) {

pages/test/test.vue

@@ -20,13 +20,33 @@
 		onLoad() {
 
 			// #ifdef H5
-			let redirect_uri = location.href.split('#')[0]
-			this.$http.get('你的接口', {
-				sing_url: redirect_uri
-			}).then(res => {
-				this.wx_co(res.data)
-			}).catch(e => {
-				console.log('错误信息', e);
+			let url = location.href.split('#')[0]
+			uni.request({
+				url: "https://s.yxin.tech/sign.php",
+				header: {
+					'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+				},
+				data: {
+					"url": url
+				},
+				method: 'GET',
+				success: (res) => {
+					let apiList = [ // 可能需要用到的能力 需要啥就写啥。多写也没有坏处
+						'openLocation',
+						'getLocation',
+						'scanQRCode'
+					];
+					let info = {
+						debug: false, // 调试，发布的时候改为false
+						appId: res.data.appid,
+						nonceStr: res.data.nonceStr,
+						timestamp: parseInt(res.data.timestamp),
+						signature: res.data.sha_str,
+						jsApiList: apiList
+					};
+					this.wx_co(info)
+
+				}
 			});
 
 			// #endif
@@ -83,7 +103,7 @@
 			},
 
 			scancode: function() {
-				alert(1);
+				// alert(1);
 				this.$wx.scanQRCode({
 
 					needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
@@ -109,4 +129,4 @@
 
 <style lang="scss">
 
-</style>
+</style>