新增Alink设备

BLEPages/child/F01PRO.vue

@@ -168,8 +168,9 @@
 						if (!device.name && !device.localName) {
 							return
 						}
-						if (device.name.indexOf('AiLink_') != -1 || (device.localName && device.localName
+						if (device.name.indexOf('AiLink_') != -1 || device.name.indexOf('PCF01') != -1 || (device.localName && (device.localName
-								.indexOf('AiLink_') != -1)) {
+								.indexOf('AiLink_') != -1 || device.localName
+								.indexOf('PCF01') != -1))) {
 							clearTimeout(myTime);
 							let buff = device.advertisData.slice(-6)
 							device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址，这是由于iOS不直接返回mac地址

assets/iconfont.css

@@ -9,9 +9,11 @@
 @font-face {
 	font-family: 'iconfont';
 	/* Project id 4209383 */
-	src: url('https://at.alicdn.com/t/c/font_4209383_trk0ap2c0n.woff2?t=1692064993104') format('woff2'),
+	src: url('?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/c/font_4209383_trk0ap2c0n.woff?t=1692064993104') format('woff'),
+	    url('https://at.alicdn.com/t/font_2887906_iss556n2nq8.woff2') format('woff2'),
-		url('https://at.alicdn.com/t/c/font_4209383_trk0ap2c0n.ttf?t=1692064993104') format('truetype');
+	    url('https://at.alicdn.com/t/font_2887906_iss556n2nq8.woff') format('woff'),
+	    url('https://at.alicdn.com/t/font_2887906_iss556n2nq8.ttf') format('truetype'),
+	    url('#iconfont') format('svg');
 }
 
 .iconfont {

manifest.json

@@ -1,10 +1,11 @@
 {
     "name" : "成人",
-    "appid" : "__UNI__1EBB7E8",
+    "appid" : "__UNI__6495D2C",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
+    "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

pageTwo/web/web.vue

@@ -0,0 +1,40 @@
+<template>
+  <web-view :src="url"></web-view>
+</template>
+
+<script>
+  import {
+    mapState
+  } from "vuex";
+  export default {
+    data() {
+      return {
+        content: "",
+        url: null
+      }
+    },
+    computed: {
+      ...mapState(["user", "appTheme"]),
+    },
+    onLoad(option) {
+      // 导航栏颜色
+      uni.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: this.appTheme,
+      })
+      if (option.url) {
+        this.url = option.url
+      } else {
+        this.url = null
+      }
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

pages.json

@@ -146,6 +146,14 @@
 					"navigationBarTitleText": "详情",
 					"navigationBarBackgroundColor": "#F9FAFC"
 				}
+			},
+			{
+			  "path" : "web/web",
+			  "style" : 
+			  {
+			    "navigationBarTitleText": "详情",
+			    "navigationBarBackgroundColor": "#F9FAFC"
+			  }
 			}
 
 		]

pages/index/index.vue

@@ -39,7 +39,7 @@
 				<image src="/static/tool2.png"></image>
 				<view class="text">体质评估</view>
 			</view>
-			<view class="list" @click="clickTool(2)" v-if="configBox.isshowchild">
+			<view class="list" @click="clickTool(2)">
 				<image src="/static/tool3.png"></image>
 				<view class="text">儿童测量</view>
 			</view>
@@ -88,6 +88,14 @@
 				</view>
 			</view>
 		</view>
+    <!-- banner -->
+    <view class="f_banner borderT15" v-if="fimages.length">
+    	<swiper class="swiper" indicator-dots="true" autoplay="true">
+    		<swiper-item v-for="(image, index) in fimages" :key="index" @click="detail(image)">
+    			<image :src="image.headimg" />
+    		</swiper-item>
+    	</swiper>
+    </view>
 		<view class="myinfo myinfoPage borderT15">
 			<view class="h2">
 				<view><text></text>健康分析</view>
@@ -160,14 +168,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- banner -->
-		<view class="f_banner borderT15" v-if="fimages.length">
-			<swiper class="swiper" indicator-dots="true" autoplay="true">
-				<swiper-item v-for="(image, index) in fimages" :key="index" @click="detail(image)">
-					<image :src="image.headimg" />
-				</swiper-item>
-			</swiper>
-		</view>
 		<view class="endtext mt-15" v-if="!lastPage || page >= lastPage">—— 到底了，看看别的吧 ——</view>
 		<!-- denglu -->
 		<userLogin></userLogin>
@@ -207,6 +207,10 @@
 				that.userId = options.userid
 			}
 			await that.login()
+      
+      uni.redirectTo({
+      	url: '/BLEPages/child/B68T'
+      })
 		},
 		onShow() {
 			this.token = uni.getStorageSync('token')
@@ -467,7 +471,7 @@
 				}
 				if (e.type == 2) {
 					uni.navigateTo({
-						url: "/pageTwo/zixun/detail?url=" + e.content
+						url: "/pageTwo/web/web?url=" + e.content
 					})
 					return
 

pages/search/devType.vue

@@ -187,7 +187,7 @@
 							that.handleDevice(device)
 							return;
 						}
-						if (device.name.toLowerCase().indexOf('ailink') != -1 || (device.localName && device.localName.toLowerCase().indexOf('ailink') != -1)) {
+						if (device.name.toLowerCase().indexOf('ailink') != -1 || device.name.toLowerCase().indexOf('pcf01') != -1 || (device.localName && (device.localName.toLowerCase().indexOf('ailink') != -1 || device.localName.toLowerCase().indexOf('pcf01') != -1))) {
 							clearTimeout(myTime);
 							let buff = device.advertisData.slice(-6)
 							device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址，这是由于iOS不直接返回mac地址
@@ -247,7 +247,6 @@
 					weight: 0,
 					imp: 0
 				}).then(res => {
-					console.log("2222", res)
 					if (res.code == 0) {
 						res.data.deviceId = sn
 						that.devList.push(res.data);