Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app

manifest.json

@@ -10,8 +10,8 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://192.168.1.110:18086/",
-                    "target" : "http://123.249.79.125/api/",
-                    // "target" : "http://192.168.1.251:18086/",
+                    // "target" : "http://123.249.79.125/api/",
+                    "target" : "http://192.168.1.251:18086/",
                     // "target" : "http://192.168.1.251:18086/",
                     // "target" : "http://110.41.182.105/api/",
                     // "target": "http://116.63.185.248:80/api",

pages/home/components/DeviceDetail.vue

@@ -21,7 +21,9 @@
 			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="$refs.internetDetailRef.open(item.id)">
 				<view class="card-header">
 					<view class="card-title">
-                        <text class="device-name">{{ item.name }}</text>
+						 <view class="device-name">{{item.postName}}</view>
+                        <text class="device-name">{{ item.name+ (item.codeNumber ? '-' + item.codeNumber : '') }}</text>
+						
 					    <text v-if="item.status == 2" class="alarm-icon">🚨</text>
                     </view>
 					<u-tag