Damon 9 mesi fa
parent
commit
b86ee1863d
4 ha cambiato i file con 33 aggiunte e 21 eliminazioni
  1. 4 4
      src/pages.json
  2. 22 13
      src/pages/public/remote.vue
  3. 6 3
      src/pages/public/uuid.vue
  4. 1 1
      src/pages/public/uuidt.vue

+ 4 - 4
src/pages.json

@@ -232,10 +232,10 @@
     },
 
     {
-      // 猫王音响-绑定UUID
+      // 猫王音响-绑定MAC地址
       "path": "pages/public/uuid",
       "style": {
-        "navigationBarTitleText": "猫王音响-绑定UUID",
+        "navigationBarTitleText": "猫王音响-绑定MAC地址",
         "navigationStyle": "custom"
       }
     },
@@ -249,10 +249,10 @@
     },
 
     {
-      // 猫王音响-绑定UUID 腾讯使用
+      // 猫王音响-绑定MAC地址 腾讯使用
       "path": "pages/public/uuidt",
       "style": {
-        "navigationBarTitleText": "猫王音响-绑定UUID",
+        "navigationBarTitleText": "猫王音响-绑定MAC地址",
         "navigationStyle": "custom"
       }
     }

+ 22 - 13
src/pages/public/remote.vue

@@ -4,7 +4,7 @@
     <view class="search_container">
       <input
         type="text"
-        v-model="流量充值"
+        v-model="inputValue1"
         class="search_public"
         confirm-type="done"
         disabled="true"
@@ -12,14 +12,14 @@
       <button class="search_btn" type="submit" @click="getSubmit1">前往</button>
     </view>
 
-    <view class="search_container">
+    <view class="search_container marTop20">
       <input
         type="text"
-        v-model="远程配网"
+        v-model="inputValue2"
         class="search_public"
         disabled="true"
       />
-      <button class="search_btn" type="submit" @click="getSubmit2">绑定</button>
+      <button class="search_btn" type="submit" @click="getSubmit2">前往</button>
     </view>
   </view>
 </template>
@@ -33,6 +33,8 @@ export default {
       openId: "",
       flowUrl: "",
       wifiUrl: "",
+      inputValue1: "流量充值",
+      inputValue2: "远程配网",
     };
   },
   onLoad(e) {
@@ -55,13 +57,11 @@ export default {
     },
 
     getSubmit1() {
-      window.location.href =
-        `http://ptt.radio1964.com/v1/device/get-wifi?UUId=` + this.flowUrl;
+      window.location.href = this.flowUrl;
     },
 
     getSubmit2() {
-      window.location.href =
-        `http://ptt.radio1964.com/v1/device/get-wifi?UUId=` + this.wifiUrl;
+      window.location.href = this.wifiUrl;
     },
   },
 };
@@ -83,9 +83,11 @@ export default {
 
 .search_public {
   background: #ededed;
-  margin-left: 20rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  margin-left: 40rpx;
   margin-right: 20rpx;
-  border-radius: 50rpx;
+  border-radius: 20rpx;
   align-items: center;
   justify-content: center;
   text-align: center;
@@ -93,13 +95,20 @@ export default {
 }
 
 .search_btn {
+  height: 80rpx;
+  line-height: 80rpx;
+  margin-top: 20rpx;
   width: 200rpx;
   align-items: center;
   justify-content: center;
   text-align: center;
-  font-size: 28rpx;
-  border-radius: 50rpx;
-  margin-right: 20rpx;
+  font-size: 35rpx;
+  border-radius: 20rpx;
+  margin-right: 40rpx;
+}
+
+.marTop20 {
+  margin-top: 50rpx;
 }
 
 .explain {

+ 6 - 3
src/pages/public/uuid.vue

@@ -115,7 +115,8 @@ export default {
 
 .search_public {
   background: #ededed;
-  // height: 80rpx;
+  height: 80rpx;
+  line-height: 80rpx;
   margin-left: 20rpx;
   margin-right: 20rpx;
   border-radius: 50rpx;
@@ -126,12 +127,14 @@ export default {
 }
 
 .search_btn {
-  // height: 80rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  margin-top: 20rpx;
   width: 200rpx;
   align-items: center;
   justify-content: center;
   text-align: center;
-  font-size: 28rpx;
+  font-size: 30rpx;
   border-radius: 50rpx;
   margin-right: 20rpx;
 }

+ 1 - 1
src/pages/public/uuidt.vue

@@ -116,7 +116,7 @@ export default {
 
 .search_public {
   background: #ededed;
-  // height: 80rpx;
+  height: 80rpx;
   margin-left: 20rpx;
   margin-right: 20rpx;
   border-radius: 50rpx;