Prechádzať zdrojové kódy

提交新增设备修改

wangming 3 týždňov pred
rodič
commit
f6ac0657e4

+ 26 - 8
src/pagesA/adDevice/adDevice.vue

@@ -80,6 +80,24 @@
                         @click="showPicker"
                     ></image>
                 </view>
+                <view class="wifItem" style="margin-top: 30rpx">
+                    <text>安装方式</text>
+                    <picker
+                        @change="bindPickerChangeThree"
+                        :value="mountPlainIndex"
+                        :range="mountPlainArray"
+                        style="margin-left: auto"
+                    >
+                        <view class="uni-input">{{
+                            mountPlainArray[mountPlainIndex]
+                        }}</view>
+                    </picker>
+                    <image
+                        src="../../static/rightArrow.png"
+                        alt=""
+                        @click="showPicker"
+                    ></image>
+                </view>
             </view>
             <view class="bottom">
                 <view class="nextTip" @click="goNextTip">下一步</view>
@@ -184,7 +202,7 @@
                             </picker>
                         </view>
                     </view>
-                    <view class="wifItem" style="margin-top: 30rpx">
+                    <!-- <view class="wifItem" style="margin-top: 30rpx">
                         <text>安装方式</text>
                         <view class="inputBox">
                             <picker
@@ -198,7 +216,7 @@
                                 }}</view>
                             </picker>
                         </view>
-                    </view>
+                    </view> -->
                     <!-- <view class="wifItem" style="margin-top: 30rpx">
                         <text>指示灯开关</text>
                         <view class="inputBox">
@@ -763,7 +781,7 @@ export default {
 
     .clientInfo {
         width: 700rpx;
-        height: 140px;
+        height: 180px;
         margin: 20rpx auto 0 auto;
         background: #ffffff;
         border-radius: 38rpx;
@@ -825,7 +843,7 @@ export default {
     background: #f4f4f4;
     .header_two {
         width: 750rpx;
-        height: 620rpx;
+        height: 560rpx;
         border-bottom-left-radius: 35rpx;
         border-bottom-right-radius: 35rpx;
         background: linear-gradient(180deg, #faede2 0%, #ffffff 100%);
@@ -864,8 +882,8 @@ export default {
         .airCantInfo {
             margin: 40rpx auto 0 auto;
             opacity: 20%;
-            width: 200rpx;
-            height: 200rpx;
+            width: 300rpx;
+            height: 300rpx;
             border: 18rpx solid;
             border-color: #333333;
             display: flex;
@@ -878,9 +896,9 @@ export default {
             }
         }
         .airbody {
-            margin: 100rpx auto 0 auto;
+            margin: 110rpx auto 0 auto;
             width: 700rpx;
-            height: 750rpx;
+            height: 650rpx;
             background: #ffffff;
             border-radius: 38rpx;
             padding: 38rpx 38rpx;

+ 0 - 18
src/pagesA/adNewDevice/adNewDevice.vue

@@ -42,24 +42,6 @@
                         @click="showPicker"
                     ></image>
                 </view>
-                <view class="wifItem" style="margin-top: 30rpx">
-                    <text>安装方式</text>
-                    <picker
-                        @change="bindPickerChangeThree"
-                        :value="mountPlainIndex"
-                        :range="mountPlainArray"
-                        style="margin-left: auto"
-                    >
-                        <view class="uni-input">{{
-                            mountPlainArray[mountPlainIndex]
-                        }}</view>
-                    </picker>
-                    <image
-                        src="../../static/rightArrow.png"
-                        alt=""
-                        @click="showPicker"
-                    ></image>
-                </view>
             </view>
             <view class="bottom">
                 <view class="nextTip" @click="goNextTip">完成</view>

+ 1 - 1
src/pagesA/deviceDetail/deviceDetail.vue

@@ -1075,7 +1075,7 @@ export default {
                 }
             }
         );
-        if (this.unsubscribeFn) {
+        if (this.fallingEventChange) {
             console.log(`✅ 已成功订阅主题: ${topicTwo}`);
         }
     },

+ 0 - 1
src/pagesA/deviceSetting/deviceSetting.vue

@@ -150,7 +150,6 @@ export default {
             } else if (val == "Bedroom") {
                 this.position = " 卧室";
             }
-            console.log(this.position, 9999);
             return this.installPosition;
         },
         unbindDevice() {