经纬切换界面调整完成，逻辑有待完善

pages/loop/loop.js

@@ -93,7 +93,8 @@ Page({
 		choice: [],
 		lightlist: [], //新设备回路开启条件,
 		popup: false, //开启条件弹窗
-    newChange: 0, //新设备回路固定经纬模式切换
+    openModal:'手动',
+    shutModal:'手动',
     beginTime:'',
     closeTimes:''
 	},
@@ -1678,37 +1679,18 @@ Page({
 		}
 	},
 	//新设备模式切换
-	newChange: function(e) {
+  openModal(){
     var that = this
-    var beginTime = that.data.beginTime
-    var closeTimes = that.data.closeTimes
-		if (that.data.newChange == 0) {
-			wx.showModal({
-				title: '切换为经纬模式',
-				content: '经纬时间：开启时间：' + beginTime + '，关闭时间：' + closeTimes,
-				success(res) {
-					if (res.confirm) {
-						that.setData({
-							newChange: 1
-            })
-					}
-				}
-			})
-		} else {
-			wx.showModal({
-				title: '切换为手动模式',
-				content: '经纬时间：开启时间：' + beginTime + '，关闭时间：' + closeTimes,
-				success(res) {
-					if (res.confirm) {
-						that.setData({
-							newChange: 0
-						})
-					}
-				}
-			})
-		}
-
-	},
+    var openModal = that.data.openModal
+    openModal = openModal == '手动' ? '经纬' : '手动'
+    that.setData({openModal:openModal})
+  },
+  shutModal(){
+    var that = this
+    var shutModal = that.data.shutModal
+    shutModal = shutModal == '手动' ? '经纬' : '手动'
+    that.setData({shutModal:shutModal})
+  },
 	//时间调控
 	//时控开关选择器(1-4旧设备，5-6新设备)
 	Controltime1: function() {
@@ -1787,29 +1769,6 @@ Page({
 			})
 		}
 	},
-	Controltime5: function() {
-		let newSwitch = this.data.newSwitch
-		let newcolor = this.data.newcolor
-		let newfont = this.data.newfont
-		let newSwitchstate = this.data.newSwitchstate
-		newSwitch[0] = !newSwitch[0]
-		if (newSwitch[0] == true) {
-			newcolor[0] = "blue"
-			newfont[0] = "white"
-			newSwitchstate[0] = "time"
-		} else {
-			newcolor[0] = "#888888"
-			newfont[0] = "#cccccc"
-			newSwitchstate[0] = ""
-		}
-		this.setData({
-			newSwitch: newSwitch,
-			newcolor: newcolor,
-			newfont,
-			newfont,
-			newSwitchstate: newSwitchstate
-		})
-	},
 	Controltime6: function() {
 		let newSwitch = this.data.newSwitch
 		let newcolor = this.data.newcolor

pages/loop/loop.wxml

@@ -22,9 +22,6 @@
       {{crr[indexes]}}
     </view>
   </picker>
-  <view wx:if="{{play == 1}}" class="newChange">
-    <button bindtap = "newChange">{{newChange == 0 ? '手动' : '经纬'}}</button>
-  </view>
 </view>
 <!-- 旧设备 -->
 <view class="subject" wx:if="{{play == 0 ? true : false}}">
@@ -130,19 +127,20 @@
     <text style="left: 2%;top: 8%;">时</text>
     <text style="left: 2%;top: 32%;">控</text>
     <text style="left: 2%;top: 57%;">一</text>
-    <switch bindchange="Controltime5" checked="{{newSwitch[0]}}"></switch>
-    <text style="left: 40%;">开启时间</text>
-    <text style="left: 75%;">关闭时间</text>
+    <text style="left: 15%; top: 15%;">开启时间</text>
+    <text style="left: 15%;top:60%">关闭时间</text>
     <picker start="00:00" end="23:59" value="{{timeValue[0]}}" bindchange="bindTimeChange5" 
-    mode="{{newSwitchstate[0]}}">
-        <view class="startTime" style="background-color: {{newcolor[0]}};color:{{newfont[0]}}">
+    mode="time">
+        <view class="startTime" style="background-color: blue;color:white;top:10%;left: 45%;">
         {{timeValue[0]}}</view>
     </picker>
     <picker start="00:00" end="23:59" value="{{timeValue[1]}}" bindchange="bindTimeChange6" 
-    mode="{{newSwitchstate[0]}}">
-        <view class="endTime" style="background-color: {{newcolor[0]}};color: {{newfont[0]}};">
+    mode="time">
+        <view class="endTime" style="background-color: blue;color: white;top:55%;left: 45%;">
         {{timeValue[1]}}</view>
     </picker>
+    <button class="control_model" style="top: 10%;" bindtap="openModal">{{openModal}}</button>
+    <button class="control_model" style="top: 55%;" bindtap="shutModal">{{shutModal}}</button>
   </view>
   <!-- 时控2 -->
   <view class="newtime2">

pages/loop/loop.wxss

@@ -396,3 +396,18 @@ page{
   color: #ffffff;
 }
 
+.control_model{
+  position: absolute;
+  left: 75%;
+  background-color: blue;
+  color: #ffffff;
+  width: 20%;
+
+  
+  height: 30%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(100vw * 16/375);
+}
+

project.private.config.json

@@ -1,5 +1,5 @@
 {
-  "projectname": "Wechat",
+  "projectname": "weixin",
   "setting": {
     "compileHotReLoad": true,
     "bigPackageSizeSupport": true,