merge clash err

README.md

@@ -82,3 +82,5 @@ npm run build:mp-weixin
     /brand/message/edit     n
 
 ```
+#### 版本记录
+2022-01-23 v1.1.17 

src/manifest.json

@@ -1,24 +1,27 @@
 {
-	"name": "",
-	"appid": "",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": { /* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
+    "name" : "",
+    "appid" : "",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-		"modules": { /* 模块配置 */
-
-		},
-		"distribute": { /* 应用发布信息 */
-			"android": { /* android打包配置 */
-				"permissions": ["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -42,23 +45,21 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-			"ios": { /* ios打包配置 */
-
-			},
-			"sdkConfigs": { /* SDK配置 */
-
-			}
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
         }
     },
-	"quickapp": { /* 快应用特有相关 */
-
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 微信小程序特有相关 */
+        "appid" : "wxf1294b279ad1b845",
+        "setting" : {
+            "urlCheck" : false
         },
-	"mp-weixin": { /* 微信小程序特有相关 */
-		"appid": "wxf1294b279ad1b845",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
+        "usingComponents" : true
     },
     "mp-alipay" : {
         "usingComponents" : true

src/pages/employee/review_list/review_list.vue

@@ -4,13 +4,13 @@
           <view>审核 {{reviewInfo.total || 0}} 人</view>
           <view @click="selectAll">
               <text>全选</text>
-              <image :class="[isAllSelected?'img-active':'']" mode="aspectFit" :src="isAllSelected?'/static/images/icon/selected_987.png':''"></image>
+              <image :class="[isAllSelected?'img-active':'']" mode="aspectFit" :src="isAllSelected?'/static/images/icon/choose.png':''"></image>
           </view>
       </view>
       <view class="rl-users">
           <view class="ru-item" v-for="(e,i) in reviewInfo.list" :key="i">
               <view>
-                  <image  @click="userSelect(i)" :class="['ri-icon',e.isSelected?'active':'']" mode="aspectFit" :src="e.isSelected?'/static/images/icon/selected_987.png':''"></image>
+                  <image  @click="userSelect(i)" :class="['ri-icon',e.isSelected?'active':'']" mode="aspectFit" :src="e.isSelected?'/static/images/icon/choose.png':''"></image>
                   <image class="ri-avatar" mode="apsectFill" :src="e.avatar_url || ''"  @click="toSingleReview(e)"></image>
                   <view @click="toSingleReview(e)">{{e.actual_name || '-'}}</view>
               </view>

src/pages/site/confirm/confirm.vue

@@ -50,12 +50,11 @@
                 </view>
             </view>
         </view>
-        <view class="sc-fixed-bot">
-            <view hover-class="hover-active" @click="confirmOccupy">确定</view>
-        </view>
+        <cover-view class="sc-fixed-bot">
+            <cover-view class="sfb-view" hover-class="hover-active" @click="confirmOccupy">确定</cover-view>
+        </cover-view>
     </view>
 </template>
-
 <script>
 import { mapState } from 'vuex';
 import { API } from '../../../js/api';
@@ -91,7 +90,7 @@ export default {
         confirmOccupy: util.debounce(function(){
             let { storeInfo, dateInfo, venueList, typeInfo } = this.occupyInfo;
             let { ocPrice, ocReaon, light_up } = this;
-            
+            util.showLoad();
             servers.post({
                 url: API.venue.venueTakeUp,
                 data: {
@@ -113,6 +112,7 @@ export default {
                 isDefaultGet: false
             })
             .then(res=>{
+                util.hideLoad();
                 if(res.data.code == 0){
                     
                     util.showNone(res.data.message || '操作成功！');
@@ -130,6 +130,7 @@ export default {
                     util.showNone(res.data.message || '操作失败！');
                 }
             })
+            .catch(util.hideLoad)
 
         }, 300, true),
     },
@@ -299,7 +300,7 @@ export default {
             padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
             padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
             background-color: #fff;
-            >view{
+            .sfb-view{
                 margin: 0 auto;
                 width: 702upx;
                 height: 88upx;

src/pages/site/occupy_success/occupy_success.vue

@@ -37,10 +37,10 @@ export default {
         },
         backBtn(){
             util.routeTo();
-            util.previousPageFunction({ // 刷新占用列表
-                fnName: 'refreshList',
-                query: null
-            })
+            // util.previousPageFunction({ // 刷新占用列表
+            //     fnName: 'refreshList',
+            //     query: null
+            // })
         },
         getPageInfo({
             brand_id,

src/pages/write_off/mall/list/list.vue

@@ -47,6 +47,7 @@ import { API } from '../../../../js/api';
 import { servers } from '../../../../js/server';
 import util from '../../../../utils/util';
 import { mapState } from 'vuex';
+import { WRITE_OFF_STORE_NAME } from '../../../../js/once_name';
 export default {
     computed: {
         ...mapState([ 'brandInfo' ]),
@@ -71,7 +72,16 @@ export default {
         })
     },  
     onLoad(){
-        this.refreshPage();
+        // 默认显示1个月内的日期
+        let _startDate = util.formatDate({ 
+            date: new Date().getTime() - 30*24*60*60*1000
+        }).substr(0, 10);
+        let _endDate = util.formatDate({ }).substr(0, 10);
+        this.startTime = _startDate;
+        this.endTime = _endDate;
+        // 默认显示1个月内的日期
+        
+        this.$nextTick(_=> this.refreshPage());
     },
     methods: {
         refreshPage(){
@@ -99,6 +109,7 @@ export default {
             this.$nextTick(_=>this.refreshPage());
         },
         toOperate(){
+            util.$_emit(WRITE_OFF_STORE_NAME, null);
             util.routeTo(`/pages/write_off/operate/operate?type=mall`, 'nT');
         },
         getList({ brand_id,  page = 1, page_size = 15, stime = '', etime = '' }){

src/pages/write_off/menu/menu.vue

@@ -40,7 +40,7 @@
 
 <script>
 import util from '../../../utils/util';
-import { WRITE_OFF_STORE_NAME, WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
+import { WRITE_OFF_STORE_NAME } from '../../../js/once_name';
 import { API } from '../../../js/api';
 import { servers } from '../../../js/server';
 export default {

src/subpackage/device/pages/timing/timing_list.vue

@@ -188,10 +188,28 @@
 						timeText += ` 当天<strong>${row.times_on_day[0].substring(0, 5)}</strong>`
 					}
 					if (!row.expand_value.main) rs('历史错误结构数据');
-					let _status = row.expand_value.main.value.status||row.expand_value.main.data.value.status;//兼容旧数据中的一种情况
+					// let _status = row.expand_value.main.value.status||row.expand_value.main.data.value.status;//兼容旧数据中的一种情况
+					let _status = getStatus(row)
 					rs(` ${timeText} 执行 ${_status === 'high' ? '<strong style="color:gray;">[关闭]</strong>' : '<strong  style="color:#009874;">[开启]</strong>'} 操作`)
 				})
-				
+				//2022-01-22 与后端同步添加新的tcp状态解析
+				function getStatus(row) {
+				    if (row["expand_value"] && row["expand_value"]["main"]) {
+				        let name = row["expand_value"]["main"]["name"]
+				        if (!row["expand_value"]["main"]["value"]) return "unknown"
+				        switch (name) {
+				            case "zzio404d-gpio-tcp":
+				                return row["expand_value"]["main"]["value"]["o"]
+				            case "zzio404d-gpio":
+				                return row["expand_value"]["main"]["value"]["o"]
+				            case "set-rpio":
+				                return row["expand_value"]["main"]["value"]["status"]
+				            case "set-rpio-lock":
+				                return row["expand_value"]["main"]["value"]["status"]
+				        }
+				    }
+				    return "unknown"
+				}
 			},
 			goBack() {
 				uni.navigateBack({

src/subpackage/device/pages/timing/timing_setting.vue

@@ -304,6 +304,7 @@
 			tapSwitch(){ //开关切换
 				this.on = !this.on
 				this.switchData.data.value.status = this.on? "low":"high";
+				this.switchData.data.value.o = this.on? "low":"high";
 			},
 			clickWeekTab(index) {
 				if(this.weekArrSelect[index]) {