From 5a9818ad8c4428df03e30856f0cd028054002ed7 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 25 Oct 2021 18:00:45 +0800
Subject: [PATCH 01/25] add ym card order

---
 src/components/order_list/ym_card/ym_card.vue      |  45 ++++++
 src/pages.json                                     |   6 +
 src/pages/order_list/order_list.vue                |  10 +-
 .../order/pages/order_manage/order_manage.vue      |   3 +-
 .../order/pages/ym_card/detail/detail.vue          | 165 +++++++++++++++++++++
 .../order/static/images/order_manage/order_18.png  | Bin 0 -> 409 bytes
 6 files changed, 223 insertions(+), 6 deletions(-)
 create mode 100644 src/components/order_list/ym_card/ym_card.vue
 create mode 100644 src/subpackage/order/pages/ym_card/detail/detail.vue
 create mode 100644 src/subpackage/order/static/images/order_manage/order_18.png

diff --git a/src/components/order_list/ym_card/ym_card.vue b/src/components/order_list/ym_card/ym_card.vue
new file mode 100644
index 0000000..95d5552
--- /dev/null
+++ b/src/components/order_list/ym_card/ym_card.vue
@@ -0,0 +1,45 @@
+<template>
+    <view class="ym-card-container" @click="toInfo">
+        <a-header :source="'nnnnaaaaammmmeeee' || '-'" :status="'ssttaattuuss'"></a-header>
+        <view class="ycc-info">
+            <a-line :value="'年卡' || '-'">
+                <block slot="name">卡名称：</block> 
+            </a-line>
+            <a-line :value="'20195171564566' || '-'">
+                <block slot="name">年月卡号：</block> 
+            </a-line>
+            <a-line :value="'18316553478' || '-'">
+                <block slot="name">手机号码：</block> 
+            </a-line>
+            <a-line :value="'至2022.08.28' || '-'">
+                <block slot="name">有效期：</block> 
+            </a-line>
+        </view>
+    </view>
+</template>
+
+<script>
+import util from '../../../utils/util';
+import a_header from '../a_header/a_header.vue';
+import a_line from '../a_line/a_line.vue';
+export default {
+    components: {
+        'a-header': a_header,
+        'a-line': a_line,
+    },
+    methods: {
+        toInfo(){
+            util.routeTo(`/subpackage/order/pages/ym_card/detail/detail`, 'nT');
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .ym-card-container{
+        background-color: #fff;
+        padding: 0 20upx 20upx;
+        border-radius: 10upx;
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 42816ea..f6463f6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -390,6 +390,12 @@
 			"root": "subpackage/order",
 			"pages": [
 				{
+					"path": "pages/ym_card/detail/detail",
+					"style" : {
+						"navigationBarTitleText": "年月卡详情" 
+					}
+				},
+				{
 					"path": "pages/mall/refund_list/refund_list",
 					"style" : {
 						"navigationBarTitleText": "退款" 
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index cc6bf85..18e294c 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -62,13 +62,11 @@
                 <competition :order-info="e" v-if="orderType == 14"></competition>
                 <mall v-if="orderType == 2" :order-info="e"></mall>
                 <rent-and-sale v-if="orderType == 8" :order-info="e"></rent-and-sale>
-            </view>
-            <!-- <view class="ool-item">
-                <mall></mall>
+                
             </view>
             <view class="ool-item">
-                <rent-and-sale></rent-and-sale>
-            </view> -->
+                <ym-card></ym-card>
+            </view>
             
       </view>
       <!-- 分类tab -->
@@ -132,6 +130,7 @@
 	import mall from '../../components/order_list/mall/mall.vue'; 
 	import device from '../../components/order_list/device/device.vue';  // 售货柜/浴室/咖啡
 	import competition from '../../components/order_list/competition/competition.vue';  // 赛事
+	import ym_card from '../../components/order_list/ym_card/ym_card.vue';  // 年月卡
 
     import util from '../../utils/util';
     import { servers } from '../../js/server';
@@ -156,6 +155,7 @@
             'mall': mall,
             'device': device,
             'competition': competition,
+            'ym-card': ym_card,
         },
         computed:{
             isStoreInfo(){
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index 7ddd02a..0a01d65 100644
--- a/src/subpackage/order/pages/order_manage/order_manage.vue
+++ b/src/subpackage/order/pages/order_manage/order_manage.vue
@@ -38,7 +38,7 @@ export default {
             util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT');
         },
         isFinish(key){
-            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12 ];
+            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12, 18 ];
             return _endKeyArr.includes(key);
         }
     }
@@ -59,6 +59,7 @@ function getTabList(){
             { id: 2, name: '次卡订单', key: 2, iconName: 'order_2', orderType: 3 },
             { id: 3, name: '计时订单', key: 3, iconName: 'order_6', orderType: 1 },
             { id: 4, name: '储值卡订单', key: 4, iconName: 'order_1', orderType: 18 },
+            { id: 10, name: '年月卡订单', key: 18, iconName: 'order_18', orderType: 19 },
             { id: 5, name: '课程订单', key: 5, iconName: 'order_8', orderType: 12 },
             { id: 6, name: '赛事订单', key: 6, iconName: 'order_9', orderType: 14 },
             { id: 7, name: '约玩订单', key: 7, iconName: 'order_15', orderType: 10 },
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
new file mode 100644
index 0000000..608e350
--- /dev/null
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -0,0 +1,165 @@
+<template>
+    <view class="ym-card-info">
+        <view class="yci-main">
+            <view class="yci-box ym-card-info">
+                <view class="yci-stadium-name">欧轩智能场馆(羽毛球永泰店)</view>
+                <view class="yci-line">
+                    <view>年月卡名称：年卡</view>
+                    <view>年月卡卡号：124646</view>
+                    <view>有效期：至2022.08.28</view>
+                </view>
+                <view class="yci-btn">
+                    <view>使用记录</view>
+                </view>
+            </view>
+            
+            <view class="yci-box ym-user">
+                <view class="yci-tit">持卡人信息</view>
+                <a-line :value="'18316567789' || '-'">
+                    <block slot="name">手机号码：</block> 
+                </a-line>
+                <a-line :value="'yiming' || '-'">
+                    <block slot="name">用户昵称：</block> 
+                </a-line>
+                <view class="yu-line">照片：<text>更改照片</text></view>
+                <image class="yu-img"></image>
+            </view>
+
+            <view class="yci-box yci-buy-info">
+                <view class="yci-tit">购卡信息</view>
+                <view class="ybi-name">年月卡名称：年卡</view>
+                <s-line :keyname="'金额小计'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
+                <view class="ybi-total"><text>合计支付：</text>￥5</view>
+            </view>
+
+            <view class="yci-pay-info">
+                <view class="yci-tit">支付信息</view>
+                <p-line :keyname="'订单编号：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'支付方式：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'支付时间：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'微信交易号：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'创建途径：'" :value="orderInfo.created_at || '-'" ></p-line>
+            </view>
+
+        </view>
+    </view>
+</template>
+
+<script>
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+export default {
+    components: {
+        'a-line': a_line,
+        's-line': s_line,
+        'p-line': p_line,
+        
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .ym-card-info{
+        
+    }
+    .yci-box{
+        padding: 30upx;
+        margin-bottom: 24upx;
+        border-radius: 10upx;
+        background-color: #fff;
+    }
+    .yci-tit{
+        margin-bottom: 20upx;
+        line-height: 40upx;
+        font-size: 28upx;
+        color: #9C9C9F;
+    }
+    .yci-main{
+        padding: 24upx;
+        .ym-card-info{
+            .yci-stadium-name{
+                margin-bottom: 22upx;
+                padding-bottom: 26upx;
+                line-height: 40upx;
+                font-size: 28upx;
+                font-weight: 500;
+                border-bottom: 2upx solid #D8D8D8;
+                @include textHide(1);
+            }
+            .yci-line{
+                margin-bottom: 32upx;
+                >view{
+                    line-height: 48upx;
+                    font-size: 28upx;
+                    color: #333;
+                    @include textHide(1);
+                }
+            }
+            .yci-btn{
+                @include centerFlex(flex-end);
+                >view{
+                    width: 176upx;
+                    line-height: 80upx;
+                    text-align: center;
+                    border-radius: 10upx;
+                    border: 2upx solid #9A9A9D;
+                    font-size: 32upx;
+                    color: #9A9A9D;
+                }
+            }
+        }
+        .ym-user{
+            .yu-line{
+                margin-bottom: 16upx;
+                font-size: 28upx;
+                line-height: 52upx;
+                color: #9a9a9d;
+                >text{
+                    color: $themeColor;
+                    text-decoration: underline;
+                }
+            }
+            .yu-img{
+                display: block;
+                width: 218upx;
+                height: 218upx;
+                border-radius: 10upx;
+                background-color: skyblue;
+
+            }
+        }
+        .yci-buy-info{
+            .ybi-name{
+                margin-bottom: 22upx;
+                padding-bottom: 30upx;
+                font-size: 28upx;
+                line-height: 40upx;
+                color: #1a1a1a;
+                border-bottom: 2upx solid #D8D8D8;
+
+            }
+            .ybi-total{
+                text-align: right;
+                font-size: 28upx;
+                font-weight: 500;
+                line-height: 40upx;
+                color: #333;
+                @include textHide(1);
+                >text{
+                    color: #9A9A9D;
+                }
+            }
+        }
+    }
+    
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/static/images/order_manage/order_18.png b/src/subpackage/order/static/images/order_manage/order_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4c174c79ccd552fc15168ba849bac0dbce619ab
GIT binary patch
literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbVv;urWT!Hk=nKP$PpFVBcv>7vI
z0NFqi2!J9$0O3N|Vwp2#fvR~+g8YIRIKNh3yesbeYKdyf?o;QoV;LA21wCCHLo80e
zowAYZkONO!b$3%R*CXZ~<*zjOntpIK1#D0_r&r6tUM_y{sCvOS!I&r(*Ux(M_MYaP
z-p0(%{!!hzpa0UG`QD4-r*-W-aPi!>^IPu;+a*j+Ybo#j;Z}byVLtczgu<X_Yc|CN
z?KAvvx<*htE{cz@__4s&!WP!Y9NfnuWxS6?>PWap?2~?Y&Cr*<SWrJ8`w<TV|9qh%
zpX5Zhty|gN-fv<XuI0R#yJAO>0Z*c$W#UQ`FTeA0Qr?%-H8d>u&$#sb%+zDKi8E%t
zQoVlH<+{*%6Jr;B9;qL)iv>lbve+XIJzHESQ5e$x;mYmDQ#;e{9G%$7@K2?Z&pWj#
rpP{n8Wqbdg-AuFfH<<qy`oiK_;wiA&tLiy0)EGQn{an^LB{Ts5JyEGm

literal 0
HcmV?d00001


From a96f4097733ae3c118f02d901f4e67fe794590f8 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 29 Oct 2021 17:42:56 +0800
Subject: [PATCH 02/25] add ym-order

---
 src/pages.json                                     |  6 ++
 .../order/pages/ym_card/detail/detail.vue          | 23 ++++++--
 .../order/pages/ym_card/use_record/use_record.vue  | 69 ++++++++++++++++++++++
 3 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 src/subpackage/order/pages/ym_card/use_record/use_record.vue

diff --git a/src/pages.json b/src/pages.json
index 52678d2..3566756 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -390,6 +390,12 @@
 			"root": "subpackage/order",
 			"pages": [
 				{
+					"path": "pages/ym_card/use_record/use_record",
+					"style" : {
+						"navigationBarTitleText": " 年月卡使用记录" 
+					}
+				},
+				{
 					"path": "pages/ym_card/detail/detail",
 					"style" : {
 						"navigationBarTitleText": "年月卡详情" 
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
index 608e350..063bcc4 100644
--- a/src/subpackage/order/pages/ym_card/detail/detail.vue
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -11,6 +11,7 @@
                 <view class="yci-btn">
                     <view>使用记录</view>
                 </view>
+                <view class="yci-status-tag"></view>
             </view>
             
             <view class="yci-box ym-user">
@@ -35,13 +36,13 @@
                 <view class="ybi-total"><text>合计支付：</text>￥5</view>
             </view>
 
-            <view class="yci-pay-info">
+            <view class="yci-box yci-pay-info">
                 <view class="yci-tit">支付信息</view>
-                <p-line :keyname="'订单编号：'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'支付方式：'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'支付时间：'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'微信交易号：'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'创建途径：'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'订单编号'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'支付方式'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'支付时间'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'微信交易号'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'创建途径'" :value="orderInfo.created_at || '-'" ></p-line>
             </view>
 
         </view>
@@ -87,6 +88,7 @@ export default {
     .yci-main{
         padding: 24upx;
         .ym-card-info{
+            position: relative;
             .yci-stadium-name{
                 margin-bottom: 22upx;
                 padding-bottom: 26upx;
@@ -117,6 +119,15 @@ export default {
                     color: #9A9A9D;
                 }
             }
+            .yci-status-tag{
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 66upx;
+                height: 66upx;
+                background-color: skyblue;
+                border-top-right-radius: 10upx;
+            }   
         }
         .ym-user{
             .yu-line{
diff --git a/src/subpackage/order/pages/ym_card/use_record/use_record.vue b/src/subpackage/order/pages/ym_card/use_record/use_record.vue
new file mode 100644
index 0000000..0d5d4a8
--- /dev/null
+++ b/src/subpackage/order/pages/ym_card/use_record/use_record.vue
@@ -0,0 +1,69 @@
+<template>
+    <view class="use-record">
+        <view class="ur-list">
+            <view class="ul-item" v-for="i in 10" :key="i">
+                <view class="ui-header">
+                    <image class="uh-img"></image>
+                    <view>欧轩智能场馆(永泰店)</view>
+                </view>
+                <view class="uh-lines">
+                    <view><text>验证方式：</text>扫码器验证（欧轩门闸）</view>
+                    <view><text>核销时间：</text>2019-05-17 11:12:58</view>
+                    <view><text>离场时间：</text>2019-05-17 11:12:58</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    @import  '~style/public.scss';
+    .use-record{
+        .ur-list{
+            .ul-item{
+                margin-bottom: 24upx;
+                padding: 30upx;
+                background-color: #fff;
+                .ui-header{
+                    height: 100upx;
+                    border-bottom: 2upx solid #f2f2f7;
+                    @include centerFlex(space-between);
+                    .uh-img{
+                        flex-shrink: 0;
+                        flex-grow: 0;
+                        margin-right: 10upx;
+                        width: 30upx;
+                        height: 30upx;
+                        background-color: skyblue;
+                    }
+                    >view{
+                        flex-grow: 1;
+                        line-height: 44upx;
+                        font-size: 32upx;
+                        color: #333;
+                        @include textHide(1);
+                    }
+                }
+                .uh-lines{
+                    padding: 14upx 16upx 10upx;
+                    >view{
+                        font-size: 28upx;
+                        line-height: 50upx;
+                        color: #333;
+                        @include textHide(1);
+                        >text{
+                            color: #9A9A9D;
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+</style>
\ No newline at end of file

From f5b608affb3f5b9dfd3eb19e8a4ecfaa238cc4f3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 1 Nov 2021 15:19:15 +0800
Subject: [PATCH 03/25] fix order bug

---
 .../pages/mall/check_logistic/check_logistic.vue    | 11 ++++++++++-
 .../pages/mall/refund_operate/refund_operate.vue    | 11 ++++++++++-
 .../order/pages/mall/send_out/send_out.vue          | 21 +++++++++++++++++----
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue b/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue
index 51806b9..b8f1bca 100644
--- a/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue
+++ b/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue
@@ -13,7 +13,7 @@
                         <view>{{ k.product_name || '-' }}</view>
                     </view>
                 </view>
-                <view class="pi-total">共{{ e.logistics_product_lite_list.length || 0 }}件商品</view>
+                <view class="pi-total">共{{ totalGoodsNum || 0 }}件商品</view>
             </view>
         </view>
     </view>
@@ -32,6 +32,15 @@ export default {
             }
             return []
         },
+        totalGoodsNum(){
+            let { orderInfo } = this;
+            if(!orderInfo)return 0;
+            let _ls = orderInfo.product_order_goods || [];
+            return _ls.reduce((total, item)=>{
+                total += +item.product_nums || 0;
+                return total
+            }, 0)
+        }
     },
     onLoad(options){
         this.getInfo(options.order_no);
diff --git a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
index 3b34291..fa78a91 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -17,7 +17,7 @@
             </view>
             
             <view class="rgi-total">
-                <text>共{{ refundLs.length || 0 }}件</text>
+                <text>共{{ totalGoodsNum || 0 }}件</text>
                 <!-- <image v-if="refundLs.length > 1" mode="aspectFit" src="/subpackage/order/static/images/arrow.png"></image> -->
             </view>
         </view>
@@ -69,6 +69,15 @@ export default {
             //     return _selectedArr.includes((ele.product_id + ''));
             // })
         },
+        totalGoodsNum(){
+            let { orderInfo } = this;
+            if(!orderInfo)return 0;
+            let _ls = orderInfo.product_order_goods || [];
+            return _ls.reduce((total, item)=>{
+                total += +item.product_nums || 0;
+                return total
+            }, 0)
+        }
     },
     data(){
         return {
diff --git a/src/subpackage/order/pages/mall/send_out/send_out.vue b/src/subpackage/order/pages/mall/send_out/send_out.vue
index df81259..36f153e 100644
--- a/src/subpackage/order/pages/mall/send_out/send_out.vue
+++ b/src/subpackage/order/pages/mall/send_out/send_out.vue
@@ -47,11 +47,14 @@
                                 <image mode="aspecfFill" :src="e.product_imgs"></image>
                                 <view class="oi-info">
                                     <view class="oi-tit">{{ e.product_name || '-' }}</view>
-                                    <view class="oi-spec" v-if="e.product_spec_multi_info&&e.product_spec_multi_info.spec_info&&e.product_spec_multi_info.spec_info.length">
-                                        <block v-for="(k, j) in e.product_spec_multi_info.spec_info" :key="j">
-                                        {{ k + '；' }}
+                                    <view class="oi-spec">
+                                        <block v-if="e.product_spec_multi_info&&e.product_spec_multi_info.spec_info&&e.product_spec_multi_info.spec_info.length">
+                                            <block v-for="(k, j) in e.product_spec_multi_info.spec_info" :key="j">
+                                            {{ k + '；' }}
+                                            </block>
                                         </block>
                                     </view>
+                                    <view class="oi-amount">×{{ e.product_nums || 0 }}</view>
                                 </view>
                             </view>
                         </view>
@@ -141,7 +144,7 @@
                                 <view>{{ k.product_name || '-' }}</view>
                             </view>
                         </view>
-                        <view class="pi-total">共{{ e.logistics_product_lite_list.length || 0 }}件商品</view>
+                        <view class="pi-total">共{{ e.logistics_product_total || 0 }}件商品</view>
                     </view>
                 </view>
                 
@@ -495,6 +498,7 @@ export default {
                         }
                         .oi-info{
                             align-self: flex-start;
+                            flex-grow: 1;
                             .oi-tit{
                                 margin-bottom: 12upx;
                                 line-height: 40upx;
@@ -503,12 +507,21 @@ export default {
                                 @include textHide(2);
                             }
                             .oi-spec{
+                                height: 34upx;
+                                line-height: 34upx;
+                                font-size: 24upx;
+                                color: #1a1a1a;
+                                @include textHide(1);
+                            }
+                            .oi-amount{ 
                                 line-height: 34upx;
                                 font-size: 24upx;
                                 color: #9a9a9d;
+                                text-align: right;
                                 @include textHide(1);
                             }
                         }
+                        
                     }
                 }
             }

From f2b5ca16c31246d57ceb9d8e840902ee73618f17 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 3 Nov 2021 13:46:34 +0800
Subject: [PATCH 04/25] add ym order sty

---
 src/pages.json                                |   6 ++
 src/pages/write_off/ym_confirm/ym_confirm.vue | 138 ++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 src/pages/write_off/ym_confirm/ym_confirm.vue

diff --git a/src/pages.json b/src/pages.json
index 3566756..b51a972 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -134,6 +134,12 @@
 			}
 		},
 		{
+			"path": "pages/write_off/ym_confirm/ym_confirm",
+			"style": {
+				"navigationBarTitleText": "核销订单"
+			}
+		},
+		{
 			"path": "pages/write_off/confirm/confirm",
 			"style": {
 				"navigationBarTitleText": "确认订单信息"
diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
new file mode 100644
index 0000000..1fbf4ce
--- /dev/null
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -0,0 +1,138 @@
+<template>
+    <view class="ym-confirm">
+        <view class="yc-header">
+            <view class="yh-stadium">欧轩智能羽毛球馆(永泰店)</view>
+            <view class="yh-info">
+                <view>今天剩余可使用：2次</view>
+                <view>进场状态：<text>进场</text></view>
+                <view>进场时间：2021-09-24 15:06:45</view>
+            </view>
+        </view>
+        <view class="yc-user-info">
+            <view class="yui-tit">持卡人信息</view>
+            <view class="yui-line">手机号码：18316567789</view>
+            <view class="yui-line">用户昵称：yiming</view>
+        </view>
+        <view class="yc-photo">
+            <view>照片</view>
+            <image></image>
+        </view>
+        
+        <view class="yc-card-mes">
+            <view class="ycm-tit">年月卡信息</view>
+            <view class="ycm-line">年月卡名称：年卡</view>
+            <view class="ycm-line">年月卡卡号：564566</view>
+            <view class="ycm-line">验证码：12235 51234</view>
+            <view class="ycm-line">生成时间：2021-09-24 15:06:45</view>
+            <view class="ycm-line">失效时间：2021-09-25 00:00:00</view>
+        </view>
+        <view class="yc-btns">
+            <view class="green">确认核销且开门</view>
+            <view>仅核销</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    page{
+        background-color: #fff;
+    }
+    .ym-confirm{
+        padding-bottom: 24upx;
+        padding-bottom: calc( 24upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 24upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        .yc-header{
+            padding: 0 30upx;
+            border-bottom: 2upx solid #f2f2f7;
+            .yh-stadium{
+                padding: 30upx 0;
+                border-bottom: 2upx solid #E5E5E5;
+            }
+            .yh-info{
+                padding: 20upx 0;
+                >view{
+                    margin-bottom: 10upx;
+                    font-size: 28upx;
+                    line-height: 52upx;
+                    color: #333333;
+                    @include textHide(1);
+                    >text{
+                        color: $themeColor;
+                    }
+                }
+            }
+        }
+        .yc-user-info{
+            padding: 30upx;
+            border-bottom: 2upx solid #f2f2f7;
+            .yui-tit{
+                margin-bottom: 20upx;
+                font-size: 28upx;
+                line-height: 52upx;
+                color: #9C9C9F;
+            }
+            .yui-line{
+                font-size: 28upx;
+                line-height: 52upx;
+                color: #333;
+                @include textHide(1);
+            }
+        }
+        .yc-photo{
+            display: flex;
+            padding: 30upx;
+            border-bottom: 2upx solid #f2f2f7;
+            >view{
+                margin-right: 50upx;
+                font-size: 28upx;
+                line-height: 52upx;
+                color: #9c9c9f;
+            }
+            >image{
+                flex-shrink: 0;
+                width: 218upx;
+                height: 218upx;
+                background-color: skyblue;
+                border-radius: 10upx;
+            }
+        }
+        .yc-card-mes{
+            padding: 30upx 30upx 0;
+            .ycm-tit{
+                margin-bottom: 20upx;
+                line-height: 52upx;
+                color: #9c9c9f;
+            }
+            .ycm-line{
+                line-height: 52upx;
+                font-size: 28upx;
+                color: #333;
+                @include textHide(1);
+            }
+        }
+        .yc-btns{
+            padding: 152upx 64upx 24upx;
+            >view{
+                margin-bottom: 24upx;
+                line-height: 108upx;
+                text-align: center;
+                border-radius: 10upx;
+                border: 2upx solid $themeColor;
+                font-size: 32upx;
+                color: $themeColor;
+                &.green{
+                    background-color: $themeColor;
+                    color: #fff;
+                }
+            }
+        }
+        
+    }
+</style>
\ No newline at end of file

From a3d46b9513c47b7550fa3399b7c206b344d42842 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 3 Nov 2021 17:26:59 +0800
Subject: [PATCH 05/25] test merge

---
 src/js/api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/js/api.js b/src/js/api.js
index a4c8921..eec907d 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,3 +1,6 @@
+
+
+
 export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
 // export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 

From 3fd6dfe75c0e4802e7795ac755889a22f46693e3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 4 Nov 2021 11:44:33 +0800
Subject: [PATCH 06/25] fix site manage time

---
 src/pages/site/manage/manage.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue
index 9e008d5..cd08bfc 100644
--- a/src/pages/site/manage/manage.vue
+++ b/src/pages/site/manage/manage.vue
@@ -156,9 +156,15 @@ export default {
     computed: {
         // 场地时间间隔列表
         venueTimeList(){
-            let { venueList } = this;
-            if(!venueList.length || !venueList[0] || !venueList[0].items || !venueList[0].items.length)return [];
+            // return [];
+            let _venueList = this.venueList || []
+            if(!_venueList.length || !_venueList[0] || !_venueList[0].items || !_venueList[0].items.length)return [];
             let _obj = {};
+            let _items = _venueList[0].items, _tempArr;
+            _tempArr = _items.reduce((_arr, val)=>_arr.concat(val.durations.split('-')), []);
+            // 对除去最后一个进行去重， 然后尾部拼接最后一个
+            return [...new Set(_tempArr.splice(0, _tempArr.length-2)), _tempArr[_tempArr.length-1]];
+
             return ([].concat(...venueList[0].items.map(e=>e.durations&&e.durations.split('-')))).filter(e=>{
                 let _bol = !!_obj[e];
                 !_bol?_obj[e] = true:'';

From 2826bf1b75f21a8dac24544bc0318d8e3ecc3426 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 12 Nov 2021 18:00:31 +0800
Subject: [PATCH 07/25] add ymcard

---
 src/components/order_list/ym_card/ym_card.vue      | 30 +++++++++++++++++-----
 src/js/api.js                                      |  3 +++
 src/pages/order_list/order_list.vue                | 10 +++++---
 src/subpackage/order/js/api.js                     |  2 +-
 .../order/pages/ym_card/detail/detail.vue          | 21 +++++++++++++++
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/components/order_list/ym_card/ym_card.vue b/src/components/order_list/ym_card/ym_card.vue
index 95d5552..97a618d 100644
--- a/src/components/order_list/ym_card/ym_card.vue
+++ b/src/components/order_list/ym_card/ym_card.vue
@@ -1,17 +1,17 @@
 <template>
     <view class="ym-card-container" @click="toInfo">
-        <a-header :source="'nnnnaaaaammmmeeee' || '-'" :status="'ssttaattuuss'"></a-header>
+        <a-header :source="orderInfo.extension.name || '-'" :status="statusTxt(orderInfo.status)"></a-header>
         <view class="ycc-info">
-            <a-line :value="'年卡' || '-'">
+            <a-line :value="orderInfo.card_info.name || '-'">
                 <block slot="name">卡名称：</block> 
             </a-line>
-            <a-line :value="'20195171564566' || '-'">
+            <a-line :value="orderInfo.card_no || '-'">
                 <block slot="name">年月卡号：</block> 
             </a-line>
-            <a-line :value="'18316553478' || '-'">
+            <a-line :value="orderInfo.mobile || '-'">
                 <block slot="name">手机号码：</block> 
             </a-line>
-            <a-line :value="'至2022.08.28' || '-'">
+            <a-line :value="'至' + (orderInfo.expired_at || '-')">
                 <block slot="name">有效期：</block> 
             </a-line>
         </view>
@@ -27,9 +27,27 @@ export default {
         'a-header': a_header,
         'a-line': a_line,
     },
+    props: {
+        orderInfo: {
+            default: {
+                card_info: {},
+                extension: {}
+            },
+        }
+    },
     methods: {
         toInfo(){
-            util.routeTo(`/subpackage/order/pages/ym_card/detail/detail`, 'nT');
+            let { orderInfo } = this;
+            util.routeTo(`/subpackage/order/pages/ym_card/detail/detail?id=${orderInfo.id}&card_no=${orderInfo.card_no}`, 'nT');
+        },
+        statusTxt(status){
+            let _obj = {
+                0: '待激活',
+                1: '使用中',
+                2: '已失效',
+                3: '已退卡',
+            }
+            return _obj[status] || '-'
         }
     }
 }
diff --git a/src/js/api.js b/src/js/api.js
index eec907d..ee72a82 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -44,6 +44,9 @@ export const API = {
   appointmentOrderList: `${ORIGIN}/admin/gameAppointment/orderList`,  // 赛事订单列表_copy
   shop2OrderList: `${ORIGIN}/admin/shop2/orderList`,  // 商城订单 - 列表_copy
 
+  // 20211112
+  userMonthlyCardLs: `${ORIGIN}/admin/userMonthlyCard/list`,  // 列表用户年月卡-后台
+
   // 营业额统计
   turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`,  // 营业额记录-品牌
   turnoverStadium: `${ORIGIN}/admin/assistant/turnover/brand/stadium/calc`,  // 营业额记录-门店
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index a00418d..788d47b 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -62,10 +62,7 @@
                 <competition :order-info="e" v-if="orderType == 14"></competition>
                 <mall v-if="orderType == 2" :order-info="e"></mall>
                 <rent-and-sale v-if="orderType == 8" :order-info="e"></rent-and-sale>
-                
-            </view>
-            <view class="ool-item">
-                <ym-card></ym-card>
+                <ym-card v-if="orderType == 19"  :order-info="e"></ym-card>
             </view>
             
       </view>
@@ -419,6 +416,7 @@
 				if(this.isDevice())return API.hardwareOrderList; // 硬件管理
 				if(type == 14)return API.appointmentOrderList; // 高光时刻
 				if(type == 2)return API.shop2OrderList; // 商城订单
+				if(type == 19)return API.userMonthlyCardLs; // 列表用户年月卡-后台
             },
             // 是否为设备，统一接口
             isDevice(){
@@ -539,6 +537,8 @@
                 return '商城订单列表';
             case 8:
                 return '租售柜订单列表';
+            case 19:
+                return '年月卡订单';
             default: 
                 return '订单'
         }
@@ -578,6 +578,8 @@
                 return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 'after_sale', name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
+            case 19:  // 年月卡 筛选的 status   全部 0,1,2,3   待激活 0   使用中 1    已失效 2    已退卡 3
+                return [ {id: '0,1,2,3', name: '全部'}, {id: 0, name: '待激活'}, {id: 1, name: '使用中'}, {id: 2, name: '已失效'},{id: 3, name: '已退卡'}];
             default:  
                 return []
         }
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 6665d7c..635b697 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -23,7 +23,7 @@ export const ORDER_API = {
 	orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`,  // 商城-商品退款_copy
 	rentballOrderEnd:`${ORIGIN}/admin/assistant/rentball/order/end`,  // 租球机-结束计费
 	leaseOrderEnd:`${ORIGIN}/admin/stadium/leaseOrder/endBill`,  // 租售柜-结束计费
-
+	userMonthlyCardInfo:`${ORIGIN}/admin/userMonthlyCard/get`,  // 详情用户年月卡-后台
 }
 
 export default ORDER_API;
\ No newline at end of file
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
index 063bcc4..afc8b27 100644
--- a/src/subpackage/order/pages/ym_card/detail/detail.vue
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -53,6 +53,9 @@
 import a_line from '../../../../../components/order_list/a_line/a_line.vue';
 import s_line from '../../../components/s_line/s_line.vue';
 import p_line from '../../../components/p_line/p_line.vue';
+import util from '../../../../../utils/util';
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
 export default {
     components: {
         'a-line': a_line,
@@ -64,6 +67,24 @@ export default {
         return {
             orderInfo: {}
         }
+    },
+    onLoad(options){
+        this.getCardInfo({
+            id: options.id,
+            card_no: options.card_no
+        })
+    },
+    methods: {
+        getCardInfo({id, card_no}){
+            server.get({
+                url: ORDER_API.userMonthlyCardInfo,
+                data: { id, card_no },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                this.orderInfo = res || {};
+            })
+        }
     }
 }
 </script>

From b7fbd5d5cd773a038efc871fff06550270635218 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 15 Nov 2021 18:00:55 +0800
Subject: [PATCH 08/25] add ym card

---
 src/pages/order_list/order_list.vue                |   2 +-
 src/subpackage/order/js/api.js                     |   4 +
 .../order/pages/ym_card/detail/detail.vue          | 142 ++++++++++++++++-----
 .../order/pages/ym_card/use_record/use_record.vue  |  59 +++++++--
 .../order/static/images/ym_card/status_1.png       | Bin 0 -> 13760 bytes
 .../order/static/images/ym_card/status_2.png       | Bin 0 -> 2062 bytes
 .../order/static/images/ym_card/status_3.png       | Bin 0 -> 2109 bytes
 7 files changed, 168 insertions(+), 39 deletions(-)
 create mode 100644 src/subpackage/order/static/images/ym_card/status_1.png
 create mode 100644 src/subpackage/order/static/images/ym_card/status_2.png
 create mode 100644 src/subpackage/order/static/images/ym_card/status_3.png

diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 788d47b..006d0de 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -579,7 +579,7 @@
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
             case 19:  // 年月卡 筛选的 status   全部 0,1,2,3   待激活 0   使用中 1    已失效 2    已退卡 3
-                return [ {id: '0,1,2,3', name: '全部'}, {id: 0, name: '待激活'}, {id: 1, name: '使用中'}, {id: 2, name: '已失效'},{id: 3, name: '已退卡'}];
+                return [ {id: '', name: '全部'}, {id: 0, name: '待激活'}, {id: 1, name: '使用中'}, {id: 2, name: '已失效'},{id: 3, name: '已退卡'}];
             default:  
                 return []
         }
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 635b697..0e1f796 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -24,6 +24,10 @@ export const ORDER_API = {
 	rentballOrderEnd:`${ORIGIN}/admin/assistant/rentball/order/end`,  // 租球机-结束计费
 	leaseOrderEnd:`${ORIGIN}/admin/stadium/leaseOrder/endBill`,  // 租售柜-结束计费
 	userMonthlyCardInfo:`${ORIGIN}/admin/userMonthlyCard/get`,  // 详情用户年月卡-后台
+	ymCardInfoFace:`${ORIGIN}/upload/file/ym_card_face`,  // 年月卡用户头像上传
+	ymCardInfoFaceSave:`${ORIGIN}/admin/userMonthlyCard/updateFace`,  // 年月卡用户头像保存
+	ymCardUsage:`${ORIGIN}/admin/userMonthlyCard/usages`,  // 用户年月卡使用记录-后台
+
 }
 
 export default ORDER_API;
\ No newline at end of file
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
index afc8b27..86304fd 100644
--- a/src/subpackage/order/pages/ym_card/detail/detail.vue
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -2,47 +2,49 @@
     <view class="ym-card-info">
         <view class="yci-main">
             <view class="yci-box ym-card-info">
-                <view class="yci-stadium-name">欧轩智能场馆(羽毛球永泰店)</view>
+                <view class="yci-stadium-name">{{ orderInfo.extension.name || '-' }}</view>
                 <view class="yci-line">
-                    <view>年月卡名称：年卡</view>
-                    <view>年月卡卡号：124646</view>
-                    <view>有效期：至2022.08.28</view>
+                    <view>年月卡名称：{{ orderInfo.card_info.name || '-' }}</view>
+                    <view>年月卡卡号：{{ orderInfo.card_no || '-' }}</view>
+                    <view>有效期：至{{ orderInfo.expired_at || '-' }}</view>
                 </view>
                 <view class="yci-btn">
-                    <view>使用记录</view>
+                    <view @click="toRecord">使用记录</view>
+                </view>
+                <view class="yci-status-tag">
+                    <image mode="aspectFit" :src="getTagImgPath(orderInfo.status)"></image>
                 </view>
-                <view class="yci-status-tag"></view>
             </view>
             
             <view class="yci-box ym-user">
                 <view class="yci-tit">持卡人信息</view>
-                <a-line :value="'18316567789' || '-'">
+                <a-line :value="orderInfo.mobile || '-'">
                     <block slot="name">手机号码：</block> 
                 </a-line>
-                <a-line :value="'yiming' || '-'">
+                <a-line :value="orderInfo.nickname || '-'">
                     <block slot="name">用户昵称：</block> 
                 </a-line>
-                <view class="yu-line">照片：<text>更改照片</text></view>
-                <image class="yu-img"></image>
+                <view class="yu-line">照片：<text @click="changeFaceImgBtn">更改照片</text></view>
+                <image class="yu-img" mode="aspectFit" :src="orderInfo.user_face"></image>
             </view>
 
-            <view class="yci-box yci-buy-info">
+            <view class="yci-box yci-buy-info"  v-if="orderInfo.status == 1 || orderInfo.status == 2 || orderInfo.status == 3">
                 <view class="yci-tit">购卡信息</view>
-                <view class="ybi-name">年月卡名称：年卡</view>
-                <s-line :keyname="'金额小计'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
-                <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
-                <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
-                <view class="ybi-total"><text>合计支付：</text>￥5</view>
+                <view class="ybi-name">年月卡名称：{{ orderInfo.card_info.name || '-' }}</view>
+                <s-line :keyname="'金额小计'" :value="'￥' + (orderInfo.extension.amount || '0')"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.extension.deduction_amount|| '0')"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.extension.discount_amount || '0')"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.extension.coupons_amount || '0')"></s-line>
+                <view class="ybi-total"><text>合计支付：</text>￥ {{ orderInfo.extension.pay_amount || '0' }}</view>
             </view>
 
-            <view class="yci-box yci-pay-info">
+            <view class="yci-box yci-pay-info" v-if="orderInfo.status == 1 || orderInfo.status == 2 || orderInfo.status == 3">
                 <view class="yci-tit">支付信息</view>
-                <p-line :keyname="'订单编号'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'支付方式'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'支付时间'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'微信交易号'" :value="orderInfo.created_at || '-'" ></p-line>
-                <p-line :keyname="'创建途径'" :value="orderInfo.created_at || '-'" ></p-line>
+                <p-line :keyname="'订单编号'" :value="orderInfo.order_no || '-'" ></p-line>
+                <p-line :keyname="'支付方式'" :value="orderInfo.extension.pay_type_text || '-'" ></p-line>
+                <p-line :keyname="'支付时间'" :value="orderInfo.extension.pay_time || '-'" ></p-line>
+                <p-line :keyname="'微信交易号'" :value="orderInfo.extension.trade_no || '-'" ></p-line>
+                <p-line :keyname="'创建途径'" :value="orderInfo.source || '-'" ></p-line>
             </view>
 
         </view>
@@ -65,26 +67,103 @@ export default {
     },
     data(){
         return {
-            orderInfo: {}
+            orderInfo: {
+                card_info: {},
+                extension: {}
+            },
+            optionsQuery: {},
         }
     },
     onLoad(options){
         this.getCardInfo({
             id: options.id,
             card_no: options.card_no
-        })
+        });
+        this.optionsQuery = options || {};
     },
     methods: {
+        changeFaceImgBtn(){
+            uni.chooseImage({
+                count: 1,
+                success: imgRes =>{
+                    this.upLoadImg(imgRes || {});
+                },
+                failMsg: imgErr => {
+                    console.warn('chooseImage err --->' , imgErr);
+                    util.showNone('选择图片失败！');
+                }
+            })
+        },
+        upLoadImg(imgRes){
+            util.showLoad();
+            server.uploadFile({
+                url: ORDER_API.ymCardInfoFace,
+                filePath: imgRes.tempFilePaths[0] || '',
+            })
+            .then(e=>{
+                    util.hideLoad();
+                    let _res = util.jsonPar(e.data);
+                    if(_res.code == 0){
+                        let _url = _res.data.url || '';
+                        this.saveFaceImg(_url);
+                    }else{
+                        console.error('上传图片失败--->',_res);
+                        util.showNone(_res.message || '上传图片失败，请重试！')
+                    }
+                })
+                .catch(err=>{
+                    util.hideLoad();
+                    console.error('上传图片失败--->',err);
+                    util.showNone('上传图片失败，稍后重试！')
+                })
+        },
+        saveFaceImg(faceUrl){
+            let { optionsQuery } = this;
+            util.showLoad();
+            server.post({
+                url: ORDER_API.ymCardInfoFaceSave,
+                data: {
+                    card_no: optionsQuery.card_no,
+                    face: faceUrl,
+                },
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                    let { optionsQuery } = this;
+                    setTimeout(_=>{
+                        this.getCardInfo({
+                            id: optionsQuery.id,
+                            card_no: optionsQuery.card_no
+                        });
+                    }, 1200);
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+        },
+        getTagImgPath(status){
+            if(!status)return ''
+            return `/subpackage/order/static/images/ym_card/status_${status}.png`
+        },
         getCardInfo({id, card_no}){
+            util.showLoad();
             server.get({
                 url: ORDER_API.userMonthlyCardInfo,
                 data: { id, card_no },
                 failMsg: '加载失败！'
             })
             .then(res=>{
+                util.hideLoad();
                 this.orderInfo = res || {};
             })
-        }
+        },
+        toRecord(){
+            let { optionsQuery } = this;
+            util.routeTo(`/subpackage/order/pages/ym_card/use_record/use_record?card_no=${optionsQuery.card_no}`, 'nT');
+        },
     }
 }
 </script>
@@ -144,10 +223,14 @@ export default {
                 position: absolute;
                 right: 0;
                 top: 0;
-                width: 66upx;
-                height: 66upx;
-                background-color: skyblue;
+                width: 132upx;
+                height: 132upx;
+                overflow: hidden;
                 border-top-right-radius: 10upx;
+                >image{
+                    width: 100%;
+                    height: 100%;
+                }
             }   
         }
         .ym-user{
@@ -166,7 +249,6 @@ export default {
                 width: 218upx;
                 height: 218upx;
                 border-radius: 10upx;
-                background-color: skyblue;
 
             }
         }
diff --git a/src/subpackage/order/pages/ym_card/use_record/use_record.vue b/src/subpackage/order/pages/ym_card/use_record/use_record.vue
index 0d5d4a8..9c60978 100644
--- a/src/subpackage/order/pages/ym_card/use_record/use_record.vue
+++ b/src/subpackage/order/pages/ym_card/use_record/use_record.vue
@@ -1,15 +1,15 @@
 <template>
     <view class="use-record">
         <view class="ur-list">
-            <view class="ul-item" v-for="i in 10" :key="i">
+            <view class="ul-item" v-for="(e, i) in recordLs" :key="i">
                 <view class="ui-header">
-                    <image class="uh-img"></image>
-                    <view>欧轩智能场馆(永泰店)</view>
+                    <image class="uh-img" mode="aspectFit" :src="e.stadium_logo"></image>
+                    <view>{{ e.stadium_name || '-' }}</view>
                 </view>
                 <view class="uh-lines">
-                    <view><text>验证方式：</text>扫码器验证（欧轩门闸）</view>
-                    <view><text>核销时间：</text>2019-05-17 11:12:58</view>
-                    <view><text>离场时间：</text>2019-05-17 11:12:58</view>
+                    <view><text>验证方式：</text>{{ e.verify_type || '-' }}</view>
+                    <view><text>核销时间：</text>{{ e.verify_time || '-' }}</view>
+                    <view><text>离场时间：</text>{{ e.leave_time || '-' }}</view>
                 </view>
             </view>
         </view>
@@ -17,8 +17,52 @@
 </template>
 
 <script>
+import util from '../../../../../utils/util';
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
 export default {
-
+    data(){
+        return {
+            recordLs: [],
+            page: 1,
+            card_no: '',
+        }
+    },
+    onLoad(options){
+        this.card_no = options.card_no || '';
+        this.getRecordLs({
+            card_no: options.card_no,
+        });
+    },  
+    onReachBottom(){
+        let { card_no, page } = this;
+        this.getRecordLs({
+            card_no: card_no,
+            page: ++page,
+        })
+    },
+    methods: {
+        getRecordLs({
+            card_no,
+            page = 1,
+            page_size = 15
+        }){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.ymCardUsage,
+                data: { card_no, page_size, page },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                let _ls = res.list || [];
+                if(page == 1)return this.recordLs = _ls;
+                if(!_ls.length)return util.showNone('没有更多！');
+                this.page = page;
+                this.recordLs = [...this.recordLs, ..._ls];
+            })
+        },
+    }
 }
 </script>
 
@@ -40,7 +84,6 @@ export default {
                         margin-right: 10upx;
                         width: 30upx;
                         height: 30upx;
-                        background-color: skyblue;
                     }
                     >view{
                         flex-grow: 1;
diff --git a/src/subpackage/order/static/images/ym_card/status_1.png b/src/subpackage/order/static/images/ym_card/status_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..df53809406b9e98c0809690b1f1f3a9c869c72c2
GIT binary patch
literal 13760
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

literal 0
HcmV?d00001

diff --git a/src/subpackage/order/static/images/ym_card/status_2.png b/src/subpackage/order/static/images/ym_card/status_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..72cd44bc9e79b037507455eeb435500a141748b1
GIT binary patch
literal 2062
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

literal 0
HcmV?d00001

diff --git a/src/subpackage/order/static/images/ym_card/status_3.png b/src/subpackage/order/static/images/ym_card/status_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..04ad712889892c1304e3e566e6196d37fcdb8515
GIT binary patch
literal 2109
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

literal 0
HcmV?d00001


From 274762d3232e900bb7e713875a10560efbc0ddd4 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 16 Nov 2021 18:01:32 +0800
Subject: [PATCH 09/25] add ym write off

---
 src/js/api.js                                      |  1 +
 src/pages.json                                     |  6 ++
 src/pages/write_off/operate/operate.vue            |  6 +-
 .../write_off/ym_card_gated/ym_card_gated.vue      | 87 ++++++++++++++++++++++
 src/pages/write_off/ym_confirm/ym_confirm.vue      | 73 ++++++++++++++----
 5 files changed, 157 insertions(+), 16 deletions(-)
 create mode 100644 src/pages/write_off/ym_card_gated/ym_card_gated.vue

diff --git a/src/js/api.js b/src/js/api.js
index ee72a82..bfcdd59 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -101,6 +101,7 @@ API['writeOff'] = {
   listVerifyRecord: `${ORIGIN}/admin/stadium/order/listVerifyRecord`,  // 核销记录
   enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`,  // 商家助手-核销查询-输入验证码  
   assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`,  // 商家助手-核销查询-核销
+  userMonthlyCardVerify: `${ORIGIN}/admin/userMonthlyCard/verify`,  // 年月卡核销-后台
 }
 
 export default { ORIGIN, API };
diff --git a/src/pages.json b/src/pages.json
index b51a972..dbc9d29 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -134,6 +134,12 @@
 			}
 		},
 		{
+			"path": "pages/write_off/ym_card_gated/ym_card_gated",
+			"style": {
+				"navigationBarTitleText": "核销订单"
+			}
+		},
+		{
 			"path": "pages/write_off/ym_confirm/ym_confirm",
 			"style": {
 				"navigationBarTitleText": "核销订单"
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
index a78cace..078fa54 100644
--- a/src/pages/write_off/operate/operate.vue
+++ b/src/pages/write_off/operate/operate.vue
@@ -101,7 +101,11 @@ export default {
                 util.hideLoad();
                 if(res.data.code == 0){
                     let _data = res.data.data || {}
-                    util.$_emit(WRITE_OFF_ORDER_INFO, {..._data})
+                    util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
+                    if(_data.extension&&_data.extension.verify_order_type === 'monthly_card'){
+                        util.routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${type}`, 'nT');
+                        return
+                    }
                     util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${type}`, 'nT');
                 }else{
                     util.routeTo(`/pages/write_off/null/null?type=${type}`, 'nT');
diff --git a/src/pages/write_off/ym_card_gated/ym_card_gated.vue b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
new file mode 100644
index 0000000..29c61c0
--- /dev/null
+++ b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
@@ -0,0 +1,87 @@
+<template>
+    <view class="ym-card-gated">
+        <view class="ycg-stadium">场馆</view>
+        <view class="ycg-suc-tip">核销成功</view>
+        <view class="ycg-back-btn">返回继续核销</view>
+        <view class="ycg-open-tip">如需开门，请点击</view>
+        <view class="ycg-btn-ls">
+            <view class="ybl-item">
+                <view class="yi-name">name</view>
+                <view class="yi-btn">开门</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    page{
+        background-color: #fff;
+    }
+    .ym-card-gated{
+        padding: 0 30upx;
+        .ycg-stadium{
+            padding: 30upx 0;
+            font-size: 32upx;
+            color: #1a1a1a;
+            border-bottom: 2upx solid #E5E5E5;
+        }
+        .ycg-suc-tip{
+            padding: 100upx 0 200upx;
+            text-align: center;
+            line-height: 60upx;
+            font-size: 50upx;
+            color: #333;
+        }
+        .ycg-back-btn{
+            margin: 0 auto 50upx;
+            width: 250upx;
+            height: 88upx;
+            line-height: 88upx;
+            text-align: center;
+            font-size: 32upx;
+            color: $themeColor;
+            border: 2upx solid $themeColor;
+            border-radius: 6upx;
+        }
+        .ycg-open-tip{
+            margin-bottom: 50upx;
+            font-size: 24upx;
+            line-height: 32upx;
+            color: #9a9a9d;
+        }
+        .ycg-btn-ls{
+            padding: 0 24upx;
+            .ybl-item{
+                border-bottom: 2upx solid #f2f2f7;
+                padding: 30upx 0;
+                @include centerFlex(space-between);
+                .yi-name{
+                    flex-grow: 1;
+                    font-size: 28upx;
+                    line-height: 32upx;
+                    color: #333;
+                    @include textHide(1);
+                }
+                .yi-btn{
+                    flex-shrink: 0;
+                    margin-left: 20upx;
+                    width: 128upx;
+                    height: 66upx;
+                    line-height: 66upx;
+                    font-size: 32upx;
+                    text-align: center;
+                    border-radius: 10upx;
+                    background-color: $themeColor;
+                    color: #fff;
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index 1fbf4ce..4d6509a 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -1,41 +1,83 @@
 <template>
     <view class="ym-confirm">
         <view class="yc-header">
-            <view class="yh-stadium">欧轩智能羽毛球馆(永泰店)</view>
+            <view class="yh-stadium">{{ orderInfo.extension.stadium_name || '-' }}</view>
             <view class="yh-info">
                 <view>今天剩余可使用：2次</view>
-                <view>进场状态：<text>进场</text></view>
+                <view>进场状态：<text>{{ orderInfo.enter_status == 0?'离场':orderInfo.enter_status == 1?'进场':'' }}</text></view>
                 <view>进场时间：2021-09-24 15:06:45</view>
             </view>
         </view>
         <view class="yc-user-info">
             <view class="yui-tit">持卡人信息</view>
-            <view class="yui-line">手机号码：18316567789</view>
-            <view class="yui-line">用户昵称：yiming</view>
+            <view class="yui-line">手机号码：{{ orderInfo.mobile || '-' }}</view>
+            <view class="yui-line">用户昵称：{{ orderInfo.nickname || '-' }}</view>
         </view>
-        <view class="yc-photo">
+        <view class="yc-photo" v-if="!!orderInfo.user_face">
             <view>照片</view>
-            <image></image>
+            <image mode="aspectFit" :src="orderInfo.user_face"></image>
         </view>
         
         <view class="yc-card-mes">
             <view class="ycm-tit">年月卡信息</view>
-            <view class="ycm-line">年月卡名称：年卡</view>
-            <view class="ycm-line">年月卡卡号：564566</view>
-            <view class="ycm-line">验证码：12235 51234</view>
-            <view class="ycm-line">生成时间：2021-09-24 15:06:45</view>
-            <view class="ycm-line">失效时间：2021-09-25 00:00:00</view>
+            <view class="ycm-line">年月卡名称：{{ orderInfo.card_info.name || '-' }}</view>
+            <view class="ycm-line">年月卡卡号：{{ orderInfo.card_no || '-' }}</view>
+            <view class="ycm-line">验证码：{{ orderInfo.verify_code || '-' }}</view>
+            <view class="ycm-line">生成时间：{{ orderInfo.created_at || '-' }}</view>
+            <view class="ycm-line">失效时间：{{ orderInfo.expired_at || '-' }}</view>
         </view>
         <view class="yc-btns">
-            <view class="green">确认核销且开门</view>
-            <view>仅核销</view>
+            <view class="green" @click="confirmBtn">确认核销</view>
+            <!-- <view>仅核销</view> -->
         </view>
     </view>
 </template>
 
 <script>
+import util from '../../../utils/util';
+import { API } from '../../../js/api';
+import { servers } from '../../../js/server';
+import { WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
 export default {
-
+    data(){
+        return { 
+            type: '', // verify_code -> 5: 验证码核销(商家助手) | decrypt_text -> 6: 扫码核销(商家助手)
+            orderInfo: {
+                extension: {},
+                card_info: {}
+            }
+        }
+    },
+    onLoad(options){
+        if(options.type)this.type = options.type || '';
+        util.$_once(WRITE_OFF_ORDER_INFO, data => {
+            console.warn(data)
+            this.orderInfo = data;
+        })
+    },
+    methods: {
+        confirmBtn: util.debounce(function(){
+            let { orderInfo, type } = this;
+            servers.post({
+                url: API.writeOff.userMonthlyCardVerify,
+                data: {
+                    brand_id: orderInfo.brand_id,
+                    card_no: orderInfo.card_no,
+                    stadium_id: orderInfo.stadium_id,
+                    type: type == 'verify_code'? 5 : 6,
+                },
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                    setTimeout(_=>util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT'), 1200);
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+        }, 300, true)
+    }
 }
 </script>
 
@@ -53,6 +95,8 @@ export default {
             border-bottom: 2upx solid #f2f2f7;
             .yh-stadium{
                 padding: 30upx 0;
+                font-size: 32upx;
+                color: #1a1a1a;
                 border-bottom: 2upx solid #E5E5E5;
             }
             .yh-info{
@@ -99,7 +143,6 @@ export default {
                 flex-shrink: 0;
                 width: 218upx;
                 height: 218upx;
-                background-color: skyblue;
                 border-radius: 10upx;
             }
         }

From 430b419e3dde0de91a8583e4c9c842a5b78deaf5 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 17 Nov 2021 15:04:19 +0800
Subject: [PATCH 10/25] add&fix ymorder

---
 src/js/api.js                                      |  1 +
 src/js/once_name.js                                |  2 +
 .../write_off/ym_card_gated/ym_card_gated.vue      | 54 +++++++++++++++++++---
 src/pages/write_off/ym_confirm/ym_confirm.vue      | 16 +++++--
 4 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index bfcdd59..69858b0 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -102,6 +102,7 @@ API['writeOff'] = {
   enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`,  // 商家助手-核销查询-输入验证码  
   assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`,  // 商家助手-核销查询-核销
   userMonthlyCardVerify: `${ORIGIN}/admin/userMonthlyCard/verify`,  // 年月卡核销-后台
+  userMonthlyCardOpenGate: `${ORIGIN}/admin/userMonthlyCard/openGate`,  // 年月卡开门-后台
 }
 
 export default { ORIGIN, API };
diff --git a/src/js/once_name.js b/src/js/once_name.js
index d32a5a4..4ffcda7 100644
--- a/src/js/once_name.js
+++ b/src/js/once_name.js
@@ -3,8 +3,10 @@
 
 export const WRITE_OFF_STORE_INFO = 'stadium_list'; 
 export const WRITE_OFF_ORDER_INFO = 'order_info'; 
+export const WRITE_OFF_YM_ORDER_INFO = 'ym_order_info';  // 年月卡订单核销
 
 export default {
     WRITE_OFF_STORE_INFO,
     WRITE_OFF_ORDER_INFO,
+    WRITE_OFF_YM_ORDER_INFO
 }
\ No newline at end of file
diff --git a/src/pages/write_off/ym_card_gated/ym_card_gated.vue b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
index 29c61c0..00a4d44 100644
--- a/src/pages/write_off/ym_card_gated/ym_card_gated.vue
+++ b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
@@ -1,21 +1,61 @@
 <template>
     <view class="ym-card-gated">
-        <view class="ycg-stadium">场馆</view>
+        <view class="ycg-stadium">{{ pageInfo.extension.stadium_name || '-' }}</view>
         <view class="ycg-suc-tip">核销成功</view>
-        <view class="ycg-back-btn">返回继续核销</view>
-        <view class="ycg-open-tip">如需开门，请点击</view>
+        <view class="ycg-back-btn" @click="backBtn">返回继续核销</view>
+        <view class="ycg-open-tip" v-if="pageInfo.gates&&pageInfo.gates.length">如需开门，请点击</view>
         <view class="ycg-btn-ls">
-            <view class="ybl-item">
-                <view class="yi-name">name</view>
-                <view class="yi-btn">开门</view>
+            <view class="ybl-item" v-for="(e, i) in pageInfo.gates" :key="i">
+                <view class="yi-name">{{ e.hardware_name || '-' }}</view>
+                <view class="yi-btn" @click="openBtn(e.id)">开门</view>
             </view>
         </view>
     </view>
 </template>
 
 <script>
+import { API } from '../../../js/api';
+import { servers } from '../../../js/server';
+import { WRITE_OFF_YM_ORDER_INFO } from '../../../js/once_name';
+import util from '../../../utils/util';
 export default {
-
+    data(){
+        return {
+            pageInfo: {
+                orderInfo: { extension: {} },
+                gates: [],
+            }
+        }
+    },
+    onLoad(options){
+        util.$_once(WRITE_OFF_YM_ORDER_INFO, data => {
+            console.warn(data)
+            this.pageInfo = data;
+        })
+    },
+    methods: {
+        backBtn(){
+            util.routeTo();
+        },
+        openBtn: util.debounce(function(id){
+            let { pageInfo } = this;
+            util.showLoad();
+            servers.get({
+                url: API.writeOff.userMonthlyCardOpenGate,
+                data: { gate_id: id, card_no: pageInfo.orderInfo.card_no },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+        }, 300, true)
+    }
 }
 </script>
 
diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index 4d6509a..522ef7c 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -3,9 +3,9 @@
         <view class="yc-header">
             <view class="yh-stadium">{{ orderInfo.extension.stadium_name || '-' }}</view>
             <view class="yh-info">
-                <view>今天剩余可使用：2次</view>
+                <view>今天剩余可使用：{{ orderInfo.extension.rest_number  || '0' }}次</view>
                 <view>进场状态：<text>{{ orderInfo.enter_status == 0?'离场':orderInfo.enter_status == 1?'进场':'' }}</text></view>
-                <view>进场时间：2021-09-24 15:06:45</view>
+                <view>进场时间：{{ orderInfo.latest_enter_time  || '-' }}</view>
             </view>
         </view>
         <view class="yc-user-info">
@@ -37,7 +37,7 @@
 import util from '../../../utils/util';
 import { API } from '../../../js/api';
 import { servers } from '../../../js/server';
-import { WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
+import { WRITE_OFF_YM_ORDER_INFO, WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
 export default {
     data(){
         return { 
@@ -71,7 +71,15 @@ export default {
             .then(res=>{
                 if(res.data.code == 0){
                     util.showNone(res.data.message || '操作成功！');
-                    setTimeout(_=>util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT'), 1200);
+                    let { orderInfo } = this;
+                    let _ls = res.data.data&&res.data.data.gates || [];
+                    setTimeout(_=>{
+                        util.$_emit(WRITE_OFF_YM_ORDER_INFO, {
+                            orderInfo,
+                            gates: _ls
+                        });
+                        util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT');
+                    }, 1200);
                 }else{
                     util.showNone(res.data.message || '操作失败！');
                 }

From 5a5b63153f79cb74ddb25d0faafd4c79d89f8d64 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 17 Nov 2021 15:50:22 +0800
Subject: [PATCH 11/25] add site fix name

---
 src/components/site/order_modal/order_modal.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index 7b4b6a9..891972d 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -67,15 +67,21 @@
 				<view class="onl-view">预订信息</view>
 			</view>
 			<view class="om-info-line">
+				<view class="oil-view">固定场名称：</view>
+				<view class="oil-view">
+					<view class="ov-view">{{ orderInfo.fix_name || '-' }}</view>
+				</view>
+			</view>
+			<view class="om-info-line">
 				<view class="oil-view">预订项目：</view>
 				<view class="oil-view">
-					<view class="ov-view">{{ orderInfo.project || ' ' }}</view>
+					<view class="ov-view">{{ orderInfo.project || '-' }}</view>
 				</view>
 			</view>
 			<view class="om-info-line">
 				<view class="oil-view">预订日期：</view>
 				<view class="oil-view">
-					<view class="ov-view">{{ orderInfo.date || ' ' }}</view>
+					<view class="ov-view">{{ orderInfo.date || '-' }}</view>
 				</view>
 			</view>
 			<view class="om-info-line">

From 110bac6be1b649c23bd95744131554e047668aa6 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 17 Nov 2021 18:00:41 +0800
Subject: [PATCH 12/25] add img preview

---
 src/pages/write_off/ym_confirm/ym_confirm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index 522ef7c..3224ea5 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -15,7 +15,7 @@
         </view>
         <view class="yc-photo" v-if="!!orderInfo.user_face">
             <view>照片</view>
-            <image mode="aspectFit" :src="orderInfo.user_face"></image>
+            <image mode="aspectFit" @click="previewImg(orderInfo.user_face)" :src="orderInfo.user_face"></image>
         </view>
         
         <view class="yc-card-mes">
@@ -56,6 +56,9 @@ export default {
         })
     },
     methods: {
+        previewImg(url){
+            uni.previewImage({ urls: [ url ] });
+        },
         confirmBtn: util.debounce(function(){
             let { orderInfo, type } = this;
             servers.post({

From 44dba590beca820fb009cddd2eee2fa8009dc8ae Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 18 Nov 2021 13:35:18 +0800
Subject: [PATCH 13/25] fix gate name

---
 src/pages/write_off/ym_card_gated/ym_card_gated.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/write_off/ym_card_gated/ym_card_gated.vue b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
index 00a4d44..04e8f41 100644
--- a/src/pages/write_off/ym_card_gated/ym_card_gated.vue
+++ b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="ym-card-gated">
-        <view class="ycg-stadium">{{ pageInfo.extension.stadium_name || '-' }}</view>
+        <view class="ycg-stadium">{{ pageInfo.orderInfo.extension.stadium_name || '-' }}</view>
         <view class="ycg-suc-tip">核销成功</view>
         <view class="ycg-back-btn" @click="backBtn">返回继续核销</view>
         <view class="ycg-open-tip" v-if="pageInfo.gates&&pageInfo.gates.length">如需开门，请点击</view>

From 4f22beced75c25f4ee185c6b569736ffad4e0fe3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 18 Nov 2021 15:05:48 +0800
Subject: [PATCH 14/25] add retail order

---
 src/components/order_list/retail/retail.vue        |  87 +++++++++++++
 src/js/api.js                                      |   3 +-
 src/pages.json                                     |   6 +
 src/pages/order_list/order_list.vue                |   8 ++
 src/subpackage/order/js/api.js                     |   1 +
 .../order/pages/order_manage/order_manage.vue      |   3 +-
 .../order/pages/retail/detail/detail.vue           | 140 +++++++++++++++++++++
 .../order/static/images/order_manage/order_18.png  | Bin 0 -> 537 bytes
 8 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 src/components/order_list/retail/retail.vue
 create mode 100644 src/subpackage/order/pages/retail/detail/detail.vue
 create mode 100644 src/subpackage/order/static/images/order_manage/order_18.png

diff --git a/src/components/order_list/retail/retail.vue b/src/components/order_list/retail/retail.vue
new file mode 100644
index 0000000..c007d6f
--- /dev/null
+++ b/src/components/order_list/retail/retail.vue
@@ -0,0 +1,87 @@
+<template>
+    <view class="retail-order" @click="toInfo">
+        <a-header :source="orderInfo.source || '-'" :status="getStatus(orderInfo.pay_status)"></a-header>
+        <!--  商品名称: 操作人： 购买时间: -->
+        <view class="ro-info">
+            <a-line :value="orderInfo.order_no || '-'">
+                <block slot="name">订单编号：</block> 
+            </a-line>
+            <a-line :value="getGoodsName || '-'">
+                <block slot="name">商品名称：</block> 
+            </a-line>
+            <a-line :value="orderInfo.sys_optuname || '-'">
+                <block slot="name">操作人：</block> 
+            </a-line>
+            <a-line :value="orderInfo.pay_time || '-'">
+                <block slot="name">购买时间：</block> 
+            </a-line>
+        </view>
+        <view class="ro-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
+    </view>
+</template>
+
+<script>
+import util from '../../../utils/util';
+import a_header from '../a_header/a_header.vue';
+import a_line from '../a_line/a_line.vue';
+export default {
+    computed: {
+        getGoodsName(){
+            let { orderInfo } = this;
+            let _ls = orderInfo&&orderInfo.retail_order_goods || [];
+            let _str = _ls.map(e=>e.name).join('；');
+            if(_ls.length)_str += '；'
+            return _str
+        }
+    },
+    components: {
+        'a-header': a_header,
+        'a-line': a_line,
+    },
+    props: {
+        orderInfo: {
+            default: {},
+            type: Object
+        }
+    },
+    methods: {
+        getStatus(status){
+            let _obj = {
+                1: '交易成功'
+            }
+            return _obj[status] || '-'
+        },
+        toInfo(){
+            let { orderInfo } = this;
+            util.routeTo(`/subpackage/order/pages/retail/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .retail-order{
+        background-color: #fff;
+        padding: 0 20upx 20upx;
+        border-radius: 10upx;
+    }
+    .ro-info{
+        
+    }
+    .ro-total{
+        line-height: 96upx;
+        font-size: 28upx;
+        color: #1a1a1a;
+        font-weight: 500;
+        text-align: right;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        >text{
+            color: #9a9a9d;
+            font-weight: 400;
+        }
+
+    }
+</style>
\ No newline at end of file
diff --git a/src/js/api.js b/src/js/api.js
index eec907d..b3c3b31 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -42,7 +42,8 @@ export const API = {
   // hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`,  // 硬件管理-订单列表_copy
   hardwareOrderList: `${ORIGIN}/admin/assistant/hardware/order/list`,  // 硬件管理-订单列表_copy
   appointmentOrderList: `${ORIGIN}/admin/gameAppointment/orderList`,  // 赛事订单列表_copy
-  shop2OrderList: `${ORIGIN}/admin/shop2/orderList`,  // 商城订单 - 列表_copy
+  shop2OrderList: `${ORIGIN}/admin/shop2/orderList`,  // 商城订单 - 列表_copy交易成功
+  retailOrderList: `${ORIGIN}/admin/erp/retailOrder/list`,  // 订单管理-零售订单列表
 
   // 营业额统计
   turnoverBrand: `${ORIGIN}/admin/assistant/turnover/brand/calc`,  // 营业额记录-品牌
diff --git a/src/pages.json b/src/pages.json
index 72a67ad..c927fae 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -390,6 +390,12 @@
 			"root": "subpackage/order",
 			"pages": [
 				{
+					"path": "pages/retail/detail/detail",
+					"style" : {
+						"navigationBarTitleText": "零售订单详情" 
+					}
+				},
+				{
 					"path": "pages/mall/refund_list/refund_list",
 					"style" : {
 						"navigationBarTitleText": "退款" 
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 4f20478..8fff80c 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -62,6 +62,7 @@
                 <competition :order-info="e" v-if="orderType == 14"></competition>
                 <mall v-if="orderType == 2" :order-info="e"></mall>
                 <rent-and-sale v-if="orderType == 8" :order-info="e"></rent-and-sale>
+                <retail v-if="orderType == 19" :order-info="e"></retail>
             </view>
             <!-- <view class="ool-item">
                 <mall></mall>
@@ -136,6 +137,7 @@
 	import mall from '../../components/order_list/mall/mall.vue'; 
 	import device from '../../components/order_list/device/device.vue';  // 售货柜/浴室/咖啡
 	import competition from '../../components/order_list/competition/competition.vue';  // 赛事
+	import retail from '../../components/order_list/retail/retail.vue';  // 零售
 
     import util from '../../utils/util';
     import { servers } from '../../js/server';
@@ -160,6 +162,7 @@
             'mall': mall,
             'device': device,
             'competition': competition,
+            'retail': retail,
         },
         computed:{
             isStoreInfo(){
@@ -419,6 +422,7 @@
 				if(this.isDevice())return API.hardwareOrderList; // 硬件管理
 				if(type == 14)return API.appointmentOrderList; // 高光时刻
 				if(type == 2)return API.shop2OrderList; // 商城订单
+				if(type == 19)return API.retailOrderList; // 零售订单
             },
             // 是否为设备，统一接口
             isDevice(){
@@ -539,6 +543,8 @@
                 return '商城订单列表';
             case 8:
                 return '租售柜订单列表';
+            case 19:
+                return '零售订单';
             default: 
                 return '订单'
         }
@@ -578,6 +584,8 @@
                 return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 'after_sale', name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
+            case 19:  // 订单管理 筛选的 status  status = 1  交易成功
+                return [ {id: 1, name: '交易成功'} ];
             default:  
                 return []
         }
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 6665d7c..69dc042 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -23,6 +23,7 @@ export const ORDER_API = {
 	orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`,  // 商城-商品退款_copy
 	rentballOrderEnd:`${ORIGIN}/admin/assistant/rentball/order/end`,  // 租球机-结束计费
 	leaseOrderEnd:`${ORIGIN}/admin/stadium/leaseOrder/endBill`,  // 租售柜-结束计费
+	retailOrderInfo:`${ORIGIN}/admin/erp/retailOrder/info`,  // 订单管理-零售订单详情
 
 }
 
diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue
index 7ddd02a..c82f3a9 100644
--- a/src/subpackage/order/pages/order_manage/order_manage.vue
+++ b/src/subpackage/order/pages/order_manage/order_manage.vue
@@ -38,7 +38,7 @@ export default {
             util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT');
         },
         isFinish(key){
-            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12 ];
+            let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12, 18 ];
             return _endKeyArr.includes(key);
         }
     }
@@ -64,6 +64,7 @@ function getTabList(){
             { id: 7, name: '约玩订单', key: 7, iconName: 'order_15', orderType: 10 },
             { id: 8, name: '商城订单', key: 8, iconName: 'order_4', orderType: 2 },
             { id: 9, name: '积分兑换订单', key: 9, iconName: 'order_5', orderType: 5 },
+            { id: 9, name: '零售订单', key: 18, iconName: 'order_18', orderType: 19 },
         ]
     }
 
diff --git a/src/subpackage/order/pages/retail/detail/detail.vue b/src/subpackage/order/pages/retail/detail/detail.vue
new file mode 100644
index 0000000..76e76f9
--- /dev/null
+++ b/src/subpackage/order/pages/retail/detail/detail.vue
@@ -0,0 +1,140 @@
+<template>
+    <view class="retail-container">
+        <view class="rc-header">
+            <a-header :source="orderInfo.source || '-'" :status="getStatus(orderInfo.pay_status)"></a-header>
+            <view class="rh-name">
+                <a-line :value="orderInfo.sys_optuname || '-'">
+                    <block slot="name">操作人：</block> 
+                </a-line>
+            </view>
+        </view>
+        <view class="rc-goods-info" v-if="orderInfo.retail_order_goods&&orderInfo.retail_order_goods.length">
+            <view class="rgi-tit">商品详情</view>
+            <view class="rgi-goods-ls">
+                <view class="rgl-item" v-for="(e, i) in orderInfo.retail_order_goods" :key="i">
+                    <!-- 商品名称 ：咖啡（小） 数量：1 价格：￥3 -->
+                    <a-line :value="e.name || '-'">
+                        <block slot="name">商品名称：</block> 
+                    </a-line>
+                    <a-line :value="e.nums || '0'">
+                        <block slot="name">数量：</block> 
+                    </a-line>
+                    <a-line :value="'￥' + (e.price || '0')">
+                        <block slot="name">价格：</block> 
+                    </a-line>
+                </view>
+            </view>
+            <view class="rgi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
+        </view>
+        <view class="rc-pay-info">
+            <!-- 订单编号   -->
+            <view class="rpi-tit">支付详情</view>
+            <p-line :keyname="'订单编号'" :value="orderInfo.order_no || '-'" isbtn></p-line>
+            <p-line :keyname="'支付方式'" :value="payTypeTxt(orderInfo.pay_type)"></p-line>
+            <p-line :keyname="'支付时间'" :value="orderInfo.pay_time || '-'"></p-line>
+        </view>
+    </view>
+</template>
+
+<script>
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import util from '../../../../../utils/util';
+import a_header from '../../../../../components/order_list/a_header/a_header.vue';
+import a_line from '../../../../../components/order_list/a_line/a_line.vue';
+import s_line from '../../../components/s_line/s_line.vue';
+import p_line from '../../../components/p_line/p_line.vue';
+export default {
+    components: {
+        'a-line': a_line,
+        'a-header': a_header,
+        's-line': s_line,
+        'p-line': p_line,
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    },
+    onLoad(options){
+        this.getOrderInfo(options.order_no);
+    },
+    methods: {
+        payTypeTxt: util.order_pay_type_txt,
+        getStatus(status){
+            let _obj = {
+                1: '交易成功'
+            }
+            return _obj[status] || '-'
+        },
+        getOrderInfo(order_no){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.retailOrderInfo,
+                data: { order_no },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                this.orderInfo = res || {};
+            })
+        },
+
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .retail-container{
+
+    }
+    .rc-header{
+        margin-bottom: 26upx;
+        padding: 0 24upx;
+        background-color: #fff;
+        .rh-name{
+            padding: 30upx 0;
+        }
+    }
+    .rc-goods-info{
+        margin-bottom: 24upx;
+        padding: 0 24upx;
+        background-color: #fff;
+        .rgi-tit{
+            padding-top: 20upx;
+            font-size: 32upx;
+            color: #1a1a1a;
+        }
+        .rgi-goods-ls{
+            .rgl-item{
+                padding: 30upx 0;
+                border-bottom: 2upx solid #D8D8D8;
+            }
+        }
+        .rgi-total{
+            text-align: right;
+            line-height: 106upx;
+            font-weight: 500;
+            font-size: 28upx;
+            color: #1a1a1a;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            >text{
+                color: #9a9a9d;
+                font-weight: 400;
+            }
+        }
+    }
+    .rc-pay-info{
+        padding: 30upx;
+        background-color: #fff;
+        .rpi-tit{
+            margin-bottom: 16upx;
+            line-height: 44upx;
+            font-size: 32upx;
+            color: #333;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/order/static/images/order_manage/order_18.png b/src/subpackage/order/static/images/order_manage/order_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8bafe4d4be634e9f0ed82eb3c4b0821c8bc87ae
GIT binary patch
literal 537
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2Ju0X`wFKzjQ0=`&``m^pLi?Afz{
z3?P7rK)66QPznejQa~~)+gS^!O|T@$FPP!)!3XjS>=RxKdv_J;Y`#=~dG?2e3=E7d
zo-U3d9>?EKi|#wDz{9{>#`H|E=>KIs4%cN(L5rrAMX&tKI)(9gfcl50^A+Z=nU%P;
z^4YGea~DlY%D1-2or+p3$d(r{bMnFsPnX%u{qo|3@0-|THv1TTQWc_a9q!fLJLw?*
z{HW;*9xjzReJyW7mh|#XCEFaYu<M*y_vVmNobaJ8o*T<`o-VBQ{3cYsTTb`ny7Svl
z9hl@35qvwquOa?q(TZyEvOW5zJEAA^&%E{I!u|V^MIBfC?05W~|NHoEj|+!Z&T-K3
zHJTkN$>X|QCV2OUzU#3$9Ho8Nw&_OB-ghfQ>8S0MeZu~q4A|F~*2eR0E1UOS$g$|t
z<Q<Qd(!RcwXz*LZdj82d%~kgv&Xh@->``>=V(6vPLm^K#YO`Ck&HP#$Sy4UHC}yX&
zdkFu6=;^<2x0yeAYi=alk)dt+hTn44{>e{kO%HE-KXspw>bxC}d~21XG-oOIOyX~l
zi|<ZrVSLlKtm_<?U|B?{;pC)+S7n%u{j38^TP#KRWM-Xwzkw;3{qXeuXYA)Qc|JPu
Svz-7&7K5j&pUXO@geCyyB=u?l

literal 0
HcmV?d00001


From 20faac0841cdc838742ddca7466a0afc82ad2a19 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 18 Nov 2021 17:59:07 +0800
Subject: [PATCH 15/25] fix ymorder confirm

---
 src/pages/write_off/ym_confirm/ym_confirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index 3224ea5..ffc8fbb 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -5,7 +5,7 @@
             <view class="yh-info">
                 <view>今天剩余可使用：{{ orderInfo.extension.rest_number  || '0' }}次</view>
                 <view>进场状态：<text>{{ orderInfo.enter_status == 0?'离场':orderInfo.enter_status == 1?'进场':'' }}</text></view>
-                <view>进场时间：{{ orderInfo.latest_enter_time  || '-' }}</view>
+                <view v-if="orderInfo.enter_status == 1">进场时间：{{ orderInfo.latest_enter_time  || '-' }}</view>
             </view>
         </view>
         <view class="yc-user-info">

From 9c974fb9ef63c1d832783b799513fcf858c3fe53 Mon Sep 17 00:00:00 2001
From: zmt <mate163@163.com>
Date: Mon, 22 Nov 2021 13:27:21 +0800
Subject: [PATCH 16/25] add xiaohuixiong

---
 .hbuilderx/launch.json                                      | 11 -----------
 src/subpackage/device/pages/switch_manage/switch_manage.vue |  3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 .hbuilderx/launch.json

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
deleted file mode 100644
index 501e01c..0000000
--- a/.hbuilderx/launch.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
-    ]
-}
diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index 3dc43b9..5dda6b5 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -486,7 +486,8 @@ export default {
             let _obj = {
                 'acmelec': 'acmelec',
                 'zhongnan': 'zhongnan',
-                'jianda': 'ray-air-rs'
+                'jianda': 'ray-air-rs',
+				"xiaohuixiong":"xhx-lora-air-tcp"
             };
             return _obj[this.changeLowerCase(hardware_model)] || '';
         },

From 38c05dd4757cf8bf0c8830610e735e4782e520c2 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 22 Nov 2021 18:15:03 +0800
Subject: [PATCH 17/25] add air contral

---
 src/manifest.json                                  |   2 +-
 src/pages.json                                     |   6 +
 .../device/pages/air_conditioner/detail/detail.vue | 459 +++++++++++++++++++++
 .../device/pages/switch_manage/switch_manage.vue   | 191 +++++----
 .../device/static/images/air_conditioner/close.png | Bin 0 -> 4318 bytes
 .../static/images/air_conditioner/heating.png      | Bin 0 -> 1847 bytes
 .../images/air_conditioner/in_under_heating.png    | Bin 0 -> 2111 bytes
 .../device/static/images/air_conditioner/lock.png  | Bin 0 -> 1154 bytes
 .../static/images/air_conditioner/normal.png       | Bin 0 -> 2414 bytes
 .../device/static/images/air_conditioner/open.png  | Bin 0 -> 3170 bytes
 .../images/air_conditioner/refrigeration.png       | Bin 0 -> 1391 bytes
 .../static/images/air_conditioner/switch.png       | Bin 0 -> 1128 bytes
 .../static/images/air_conditioner/temp_add.png     | Bin 0 -> 291 bytes
 .../static/images/air_conditioner/temp_reduce.png  | Bin 0 -> 193 bytes
 .../images/air_conditioner/under_heating.png       | Bin 0 -> 920 bytes
 .../static/images/air_conditioner/ventilate.png    | Bin 0 -> 940 bytes
 .../static/images/air_conditioner/wind_0.png       | Bin 0 -> 719 bytes
 .../static/images/air_conditioner/wind_1.png       | Bin 0 -> 656 bytes
 .../static/images/air_conditioner/wind_2.png       | Bin 0 -> 795 bytes
 .../static/images/air_conditioner/wind_3.png       | Bin 0 -> 691 bytes
 20 files changed, 577 insertions(+), 81 deletions(-)
 create mode 100644 src/subpackage/device/pages/air_conditioner/detail/detail.vue
 create mode 100644 src/subpackage/device/static/images/air_conditioner/close.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/heating.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/in_under_heating.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/lock.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/normal.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/open.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/refrigeration.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/switch.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/temp_add.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/temp_reduce.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/under_heating.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/ventilate.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/wind_0.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/wind_1.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/wind_2.png
 create mode 100644 src/subpackage/device/static/images/air_conditioner/wind_3.png

diff --git a/src/manifest.json b/src/manifest.json
index 25d192e..32b6894 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -54,7 +54,7 @@
 
 	},
 	"mp-weixin": { /* 微信小程序特有相关 */
-		"appid": "wxf1294b279ad1b845",
+		"appid": "wx7106e84614cf0060",
 		"setting": {
 			"urlCheck": false
 		},
diff --git a/src/pages.json b/src/pages.json
index 72a67ad..5669244 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -226,6 +226,12 @@
 		{
 			"root": "subpackage/device",
 			"pages": [
+				{
+					"path": "pages/air_conditioner/detail/detail",
+					"style" : {
+						"navigationBarTitleText": "空调管理"
+					}
+				},
 			  	{
 					"path": "pages/index/index",
 					"style" : {
diff --git a/src/subpackage/device/pages/air_conditioner/detail/detail.vue b/src/subpackage/device/pages/air_conditioner/detail/detail.vue
new file mode 100644
index 0000000..57ccce3
--- /dev/null
+++ b/src/subpackage/device/pages/air_conditioner/detail/detail.vue
@@ -0,0 +1,459 @@
+<template>
+    <view class="air-conditioner-detail">
+        <view class="acd-tit">{{ airName || '-' }}</view>
+        <view class="acd-panel">
+            <view class="ap-top-info">
+                <view class="ati-box ati-temp">
+                    <view class="ab-tit">温度</view>
+                    <view class="at-info">
+                        <view class="ai-btn">
+                            <image mode="aspectFit" :src="getIconPath('temp_add')" @click="tempBtn('add')"></image>
+                        </view>
+                        <view class="ai-temp">
+                            <view class="at-num">{{ pageInfo.temperature || 0 }}</view>
+                            <view class="at-unit">℃</view>
+                        </view>
+                        <view class="ai-btn">
+                            <image mode="aspectFit" :src="getIconPath('temp_reduce')" @click="tempBtn('reduce')"></image>
+                        </view>
+                    </view>
+                </view>
+                <view class="ati-box ati-wind">
+                    <view class="ab-tit">风速</view>
+                    <!-- 1: 低速， 2：中，3：高，4：自动 -->
+                    <view class="aw-txt">{{ getSpeedName(pageInfo.speed || 0) }}</view>
+                </view>
+            </view>
+            <view class="ap-btns">
+                <view class="ab-item"  @click="operateBtn({ op: 'on' })">
+                    <image mode="aspectFit" :src="getIconPath('open')"></image>
+                    <view>开</view>
+                </view>
+                <view class="ab-item" @click="operateBtn({ op: 'off' })">
+                    <image mode="aspectFit" :src="getIconPath('close')"></image>
+                    <view>关</view>
+                </view>
+            </view>
+        </view>
+        <view class="acd-btn-ls">
+            <view class="abl-tit">模式</view>
+            <view class="abl-ls">
+                <view class="al-item" v-for="(e, i) in modelLs" :key="i" @click="operateBtn({ op: 'mode', ext: e.mode })">
+                    <view class="ai-icon">
+                        <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
+                    </view>
+                    <view class="ai-txt">{{ e.name || '-' }}</view>
+                </view>
+            </view>
+        </view>
+        <view class="acd-btn-ls">
+            <view class="abl-tit">风速</view>
+            <view class="abl-ls">
+                <view class="al-item" v-for="(e, i) in airSpeedLs" :key="i" @click="operateBtn({ op: 'speed', ext: e.speed })">
+                    <view class="ai-icon">
+                        <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
+                    </view>
+                    <view class="ai-txt">{{ e.name || '-' }}</view>
+                </view>
+            </view>
+        </view>
+        <!-- 后台：水阀的不管 隐藏掉 -->
+        <!-- <view class="acd-btn-ls">
+            <view class="abl-tit">水阀</view>
+            <view class="abl-ls">
+                <view class="al-item" v-for="(e, i) in hydrovalveLs" :key="i">
+                    <view class="ai-icon">
+                        <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
+                    </view>
+                    <view class="ai-txt">{{ e.name || '-' }}</view>
+                </view>
+            </view>
+        </view> -->
+        <view class="acd-btn-ls">
+            <view class="abl-tit">允许使用按钮</view>
+            <view class="abl-ls">
+                <view class="al-item" v-for="(e, i) in allowLs" :key="i" @click="operateBtn({ op: e.op })">
+                    <view class="ai-icon">
+                        <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
+                    </view>
+                    <view class="ai-txt">{{ e.name || '-' }}</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import deviceServer from '../../../js/device_server';
+import deviceApi from '../../../js/device_api';
+import util from '../../../../../utils/util';
+
+/*
+    + info  获取信息状态
+    + st  设置温度(value:{op:"st",ext:"24"})  10 - 50 
+    + mode  模式设置(value:{op:"mode",ext:"1"})   // 0：内机制热， 1：内机地暖同时制热(默认)， 2：地暖制热，3：制冷模式，9：通风模式
+    + speed  风速设置(value:{op:"speed",ext:"1"})   // 1: 低速， 2：中，3：高，4：自动
+    + lock  锁
+    + unlock  解锁
+    + on  开
+    + off  关
+*/ 
+export default {
+    computed: {
+        modelLs(){
+            return ([
+                {
+                    id: 1,
+                    name: '内机制热',
+                    icon: 'heating',
+                    mode: 0,
+                },
+                {
+                    id: 2,
+                    name: '内机地暖 制热',
+                    icon: 'in_under_heating',
+                    mode: 1,
+                },
+                {
+                    id: 3,
+                    name: '地暖制热',
+                    icon: 'under_heating',
+                    mode: 2,
+                },
+                {
+                    id: 4,
+                    name: '制冷',
+                    icon: 'refrigeration',
+                    mode: 3,
+                },
+                {
+                    id: 5,
+                    name: '通风',
+                    icon: 'ventilate',
+                    mode: 9,
+                },
+            ])
+        },
+        airSpeedLs(){
+            return ([
+                {
+                    id: 1,
+                    name: '高',
+                    icon: 'wind_3',
+                    speed: 3,
+                },
+                {
+                    id: 2,
+                    name: '中',
+                    icon: 'wind_2',
+                    speed: 2,
+                },
+                {
+                    id: 3,
+                    name: '低',
+                    icon: 'wind_1',
+                    speed: 1,
+                },
+                {
+                    id: 4,
+                    name: '自动',
+                    icon: 'wind_0',
+                    speed: 4,
+                },
+            ])
+        },
+        hydrovalveLs(){
+            return ([
+                {
+                    id: 1,
+                    name: '开',
+                    icon: 'open'
+                },
+                {
+                    id: 2,
+                    name: '关',
+                    icon: 'close'
+                },
+            ])
+        },
+        allowLs(){
+            return ([
+                
+                {
+                    id: 2,
+                    name: '开机',
+                    icon: 'switch',
+                    op: 'on',
+                },
+                {
+                    id: 3,
+                    name: '关机',
+                    icon: 'close',
+                    op: 'off',
+                },
+                {
+                    id: 1,
+                    name: '解锁',
+                    icon: 'normal',
+                    op: 'unlock',
+                },
+                {
+                    id: 4,
+                    name: '全锁',
+                    icon: 'lock',
+                    op: 'lock',
+                },
+            ])
+        },
+    },
+    data(){
+        return {
+            subpackInfo: {},
+            pageInfo: {},
+            airName: ''
+        }
+    },
+    onLoad(options){
+        console.warn('qrstr', options.qrstr);
+        if(options.name)this.airName = options.name;
+        let _qyObj = null;
+        try{
+            _qyObj = util.jsonPar(options.qrstr);
+        }catch(err){
+            console.warn('json ERR', err);
+        }
+        if(!_qyObj)return;
+        console.warn('_qyObj', _qyObj);
+        _qyObj = this.setExt({ query: _qyObj, value: '', });
+        this.subpackInfo = _qyObj; 
+        this.operateReq({ data: _qyObj, isTip: false });
+    },
+    methods: {  
+        tempBtn: util.debounce(function(type){
+            let { pageInfo } = this;
+            let _num = pageInfo.temperature || 0;
+            _num = type == 'add' ? _num++ : type == 'reduce' ? _num-- : _num;
+            this.operateReq({ data: this.getOperateData({ op: 'st', ext: _num }), isTip: false });
+
+        }, 300, true),
+
+        operateBtn: util.debounce(function({ op='', ext='' }){
+            let { subpackInfo } = this;
+            this.operateReq({
+                data: this.getOperateData({ op, ext })
+            })
+            .then(res=>{
+                if(res == 'success'){
+                    setTimeout(_=>{
+                        this.operateReq({ data: this.getOperateData({ op: 'st',  }), isTip: false });
+                    }, 1200)
+                }
+            })
+        }, 300, true),  
+        getOperateData({ op='', ext='' }){
+            let { subpackInfo } = this;
+            let _obj = null;
+            _obj = this.setOp({ query: subpackInfo, value: op, });
+            _obj = this.setExt({ query: subpackInfo, value: ext, });
+            return _obj;
+        },
+        getSpeedName(speed){
+            switch(+speed){
+                case 1:
+                    return '低速'
+                case 2:
+                    return '中速'
+                case 3:
+                    return '高速'
+                case 4:
+                    return '自动'
+                default:
+                    return '-'
+            }
+        },
+        setExt({query, value}){
+            if(query.data.toString() !== '[object Object]')query.data = {};
+            if(query.data.value.toString() !== '[object Object]')query.data.value = {};
+            query.data&&query.data.value&&(query.data.value.ext = value);
+            return query;
+        },
+        setOp({query, value}){
+            if(query.data.toString() !== '[object Object]')query.data = {};
+            if(query.data.value.toString() !== '[object Object]')query.data.value = {};
+            query.data&&query.data.value&&(query.data.value.op = value);
+            return query;
+        },
+        getIconPath(iconName){
+            if(!iconName)return '';
+            return `/subpackage/device/static/images/air_conditioner/${iconName}.png`
+        },
+        // 操作接口请求
+        operateReq({data, isTip=true, isLoad=true}){
+            if(isLoad)util.showLoad();
+            return deviceServer.post({
+                url: deviceApi.ouxuanac,
+                data: data,
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                if(isLoad)util.hideLoad();
+                if(res.data.code == 0){
+                    if(isTip)util.showNone(res.data.message || '操作成功！');
+                    if(data.data&&data.data.value&&data.data.value.op === 'info')this.pageInfo = res.data.data || {};
+                    return 'success'
+                }else{
+                    if(isTip)util.showNone(res.data.message || '操作失败！');
+                    return 'fail';
+                }
+            })
+            .catch(err=>{if(isLoad)util.hideLoad()})
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .air-conditioner-detail{
+        padding: 40upx;
+        .acd-tit{
+            margin-bottom: 40upx;
+            font-size: 44upx;
+            font-weight: 500;
+            color: #333;
+        }
+        .acd-panel{
+            margin-bottom: 60upx;
+            padding: 24upx 14upx 50upx;
+            border-radius: 10upx;
+            background-color: #fff;
+            .ap-top-info{
+                margin-bottom: 64upx;
+                flex-wrap: nowrap;
+                @include centerFlex(center);
+                .ati-box{
+                    flex-shrink: 0;
+                    max-width: 50%;
+                    margin: 0 10upx;
+                    padding: 12upx 20upx;
+                    flex-grow: 1;
+                    height: 178upx;
+                    border-radius: 4upx;
+                    background-color: #f2f2f7;
+                    .ab-tit{
+                        font-size: 28upx;
+                        line-height: 40upx;
+                        color: #9c9c9f;
+                    }
+                }
+                .ati-temp{
+                    .at-info{
+                        @include centerFlex(space-between);
+                        .ai-btn{
+                            flex-shrink: 0;
+                            width: 24upx;
+                            height: 24upx;
+                            >image{
+                                width: 100%;
+                                height: 100%;
+                            }
+                        }
+                        .ai-temp{
+                            display: flex;
+                            justify-content: center;
+                            align-items: center;
+                            .at-num{
+                                line-height: 112upx;
+                                font-weight: 500;
+                                font-size: 80upx;
+                                color: $themeColor;
+                                @include textHide(1);
+                            }
+                            .at-unit{
+                                flex-shrink: 0;
+                                padding-top: 10upx;
+                                align-self: flex-start;
+                                font-size: 28upx;
+                                line-height: 40upx;
+                                color: $themeColor;
+                            }
+                        }
+                    }
+                }
+                .ati-wind{
+                    .aw-txt{
+                        line-height: 90upx;
+                        text-align: center;
+                        font-weight: 500;
+                        font-size: 64upx;
+                        color: $themeColor;
+                        
+                    }
+                }
+            }
+            
+            .ap-btns{
+                @include centerFlex(center);
+                .ab-item{
+                    margin: 0 60upx;
+                    >image{
+                        margin: 0 auto 20upx;
+                        display: block;
+                        width: 100upx;
+                        height: 100upx;
+                    }
+                    >view{
+                        margin: 0 auto;
+                        text-align: center;
+                        font-size: 24upx;
+                        line-height: 34upx;
+                        color: #9a9a9d;
+                    }
+                }
+            }
+        }
+        .acd-btn-ls{
+            width: 100%;
+            margin-bottom: 50upx;
+            .abl-tit{
+                margin-bottom: 28upx;
+                line-height: 40upx;
+                font-size: 28upx;
+                color: #9c9c9f;
+            }
+            .abl-ls{
+                display: flex;
+                flex-wrap: wrap;
+                .al-item{
+                    margin-bottom: 24upx;
+                    width: 116upx;
+                    flex-shrink: 0;
+                    flex-grow: 0;
+                    &:not(:nth-child(5n)){
+                        margin-right: 20upx;
+                    }
+                    .ai-icon{
+                        margin: 0 auto 14upx;
+                        width: 116upx;
+                        height: 116upx;
+                        border-radius: 10upx;
+                        background-color: #fff;
+                        @include centerFlex(center);
+                        >image{
+                            width: 60upx;
+                            height: 60upx;
+                        }
+                    }
+                    .ai-txt{
+                        text-align: center;
+                        text-align: center;
+                        line-height: 40upx;
+                        font-size: 28upx;
+                        color: #1a1a1a;
+                        @include textHide(2);
+                    }
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index 5dda6b5..2d35389 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -46,6 +46,10 @@
 					    <view >{{pageInfo.detailName || '-'}}</view>
 					</view>
                 </view>
+                <view class="si-detail-btn" v-if="pageInfo.isDetailBtn" @click="toDeviceDetail(e)">
+                    <text>详情</text>
+                    <image mode="aspectFit" src="/subpackage/device/static/images/arrow_b2.png"></image>
+                </view>
             </view>
         </view>
     </view>
@@ -58,84 +62,7 @@
 import store_name from '../../components/store_name/store_name';
 import deviceServer from '../../js/device_server';
 import deviceApi from '../../js/device_api';
-const showArr = {
-    's1': {
-        id: 1, name: '照明管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true,
-        openIcon: '/subpackage/device/static/images/open.png',closeIcon: '/subpackage/device/static/images/close.png',
-        longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-        openName: '开', closeName: '关', longOpenName: '长开', timingName: '定时', hardware_type: 'Light',iconNum:4
-    },
-    's2': {
-        id: 2, name: '空调管理', isOpen: true, isClose: true,
-        openIcon: '/subpackage/device/static/images/open.png',
-        closeIcon: '/subpackage/device/static/images/close.png',
-        openName: '开', closeName: '关', hardware_type: 'Air',iconNum:2
-    },
-    's3': {
-        id: 3, name: '风扇管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true,
-        openIcon: '/subpackage/device/static/images/open.png',
-        closeIcon: '/subpackage/device/static/images/close.png',
-		 longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-        openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长开', timingName: '定时',iconNum:4,
-    },
-    's4': {
-        id: 4, name: '门禁管理', isOpen: true, isClose: false,
-        openIcon: '/subpackage/device/static/images/open.png',
-        closeIcon: '/subpackage/device/static/images/close.png',
-        openName: '开', closeName: '关', hardware_type: 'AccessControl',iconNum:2
-    },
-    's5': {
-        id: 5, name: '门闸管理', isOpen: true, isClose: true,
-        openIcon: '/subpackage/device/static/images/in.png',
-        closeIcon: '/subpackage/device/static/images/out.png',
-        openName: '进', closeName: '出', hardware_type: 'GateControl',iconNum:2
-    },
-    's6': {//TODO 等待接口
-        id: 6, name: '平板管理', isOpen: false, isClose: false,
-        openIcon: '/subpackage/device/static/images/open.png',
-        closeIcon: '/subpackage/device/static/images/close.png',
-        openName: '开', closeName: '关', hardware_type: 'Router4G',iconNum:2
-    },
-    's11': {
-        id: 11, name: '水阀管理', isOpen: true, isClose: true,isLongOpen:true, isTiming:true,
-        openIcon: '/subpackage/device/static/images/open.png',
-        closeIcon: '/subpackage/device/static/images/close.png',
-       longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-       openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长开', timingName: '定时',iconNum:4,
-    },
-    's12': {
-        id: 12, name: '互动设备管理', isOpen: true, isClose: true,
-        openIcon: '/subpackage/device/static/images/open.png',
-        closeIcon: '/subpackage/device/static/images/close.png',
-        openName: '开', closeName: '关', hardware_type: '',iconNum:2
-    },
-	's13': {//TODO 等待接口
-	    id: 13, name: '监控管理', isOpen: false, isClose: false, isDetail:true,
-	    openIcon: '/subpackage/device/static/images/open.png',
-	    closeIcon: '/subpackage/device/static/images/close.png',
-	    openName: '开', closeName: '关',detailName:"详情", hardware_type: 'IotSim',iconNum:2
-	},
-	's17': {//TODO 等待接口
-	    id: 17, name: '窗帘管理', isOpen: false, isClose: false, isDetail:true,
-	    openIcon: '/subpackage/device/static/images/open.png',
-	    closeIcon: '/subpackage/device/static/images/close.png',
-	    openName: '开', closeName: '关',detailName:"详情", hardware_type: 'Router4G',iconNum:2
-	},
-	's18': {
-	    id: 18, name: '路由器管理', isOpen: false, isClose: false, isDetail:true,
-	    openIcon: '/subpackage/device/static/images/open.png',
-	    closeIcon: '/subpackage/device/static/images/close.png',
-	    openName: '开', closeName: '关',detailName:"详情", hardware_type: 'Router4G',iconNum:2
-	},
-	's19': {
-	    id: 19, name: '物联卡管理', isOpen: false, isClose: false, isDetail:true,
-	    openIcon: '/subpackage/device/static/images/open.png',
-	    closeIcon: '/subpackage/device/static/images/close.png',
-	    openName: '开', closeName: '关',detailName:"详情", hardware_type: 'IotSim',iconNum:2
-	},
 
-    
-}
 import { mapState } from 'vuex';
 import util from '../../../../utils/util';
 
@@ -180,7 +107,7 @@ export default {
         }
     },
     onLoad(options){
-        let _pageInfo = showArr[`s${options.sid}`] || {};
+        let _pageInfo = getShowArr(`s${options.sid}`) || {};
         this.pageInfo = _pageInfo;
         uni.setNavigationBarTitle({ title: _pageInfo.name });
         
@@ -190,7 +117,15 @@ export default {
         })
     },
     methods: {
-        
+        toDeviceDetail(e){
+            console.warn(e);
+            console.warn(this.getSwitchStatusQuery(e));
+            let _queryObj = this.getSwitchStatusQuery(e) || {};
+            if(!_queryObj.data || !_queryObj.data.name || !_queryObj.data.value)return;
+            _queryObj.data.value&&_queryObj.data.value.op&&(_queryObj.data.value.op = 'info');
+            let _qrStr = util.jsonStr(_queryObj);
+            if(e.hardware_type == "Air")return util.routeTo(`/subpackage/device/pages/air_conditioner/detail/detail?qrstr=${_qrStr}&name=${e.hardware_name || '-'}`, 'nT');
+        },
         getDeviceList({
             stadium_id,
             hardware_type,
@@ -405,7 +340,7 @@ export default {
         // status -> 开关状态 0 -> 关（右）， 1 -> 开（左）
         // 数据结构参考 src\subpackage\device\js\ouxuanac.md
         // 空调开关数据结构独立判断处理 hardware_type === 'Air'
-        getSwitchQuery({ switchInfo, status }){
+        getSwitchQuery({ switchInfo, status = '' }){
             let { 
                     hardware_connect_method,  
                     hardware_type, 
@@ -498,6 +433,88 @@ export default {
         }
     }
 }
+
+function getShowArr(key){
+     let _obj = {
+        's1': {
+            id: 1, name: '照明管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true,
+            openIcon: '/subpackage/device/static/images/open.png',closeIcon: '/subpackage/device/static/images/close.png',
+            longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
+            openName: '开', closeName: '关', longOpenName: '长开', timingName: '定时', hardware_type: 'Light',iconNum:4
+        },
+        's2': {
+            id: 2, name: '空调管理', isOpen: true, isClose: true, isDetailBtn: true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关', hardware_type: 'Air',iconNum:2
+        },
+        's3': {
+            id: 3, name: '风扇管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
+            openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长开', timingName: '定时',iconNum:4,
+        },
+        's4': {
+            id: 4, name: '门禁管理', isOpen: true, isClose: false,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关', hardware_type: 'AccessControl',iconNum:2
+        },
+        's5': {
+            id: 5, name: '门闸管理', isOpen: true, isClose: true,
+            openIcon: '/subpackage/device/static/images/in.png',
+            closeIcon: '/subpackage/device/static/images/out.png',
+            openName: '进', closeName: '出', hardware_type: 'GateControl',iconNum:2
+        },
+        's6': {//TODO 等待接口
+            id: 6, name: '平板管理', isOpen: false, isClose: false,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关', hardware_type: 'Router4G',iconNum:2
+        },
+        's11': {
+            id: 11, name: '水阀管理', isOpen: true, isClose: true,isLongOpen:true, isTiming:true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+        longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
+        openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长开', timingName: '定时',iconNum:4,
+        },
+        's12': {
+            id: 12, name: '互动设备管理', isOpen: true, isClose: true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关', hardware_type: '',iconNum:2
+        },
+        's13': {//TODO 等待接口
+            id: 13, name: '监控管理', isOpen: false, isClose: false, isDetail:true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关',detailName:"详情", hardware_type: 'IotSim',iconNum:2
+        },
+        's17': {//TODO 等待接口
+            id: 17, name: '窗帘管理', isOpen: false, isClose: false, isDetail:true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关',detailName:"详情", hardware_type: 'Router4G',iconNum:2
+        },
+        's18': {
+            id: 18, name: '路由器管理', isOpen: false, isClose: false, isDetail:true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关',detailName:"详情", hardware_type: 'Router4G',iconNum:2
+        },
+        's19': {
+            id: 19, name: '物联卡管理', isOpen: false, isClose: false, isDetail:true,
+            openIcon: '/subpackage/device/static/images/open.png',
+            closeIcon: '/subpackage/device/static/images/close.png',
+            openName: '开', closeName: '关',detailName:"详情", hardware_type: 'IotSim',iconNum:2
+        },
+
+        
+    }
+    return _obj[key] || {}
+}
 </script>
 
 <style lang="scss">
@@ -631,6 +648,20 @@ export default {
 
 				}
             }
+            .si-detail-btn{
+                height: 82upx;
+                line-height: 82upx;
+                text-align: center;
+                font-size: 28upx;   
+                color: #333;
+                border-top: 2upx solid #F2F2F7;
+                >image{
+                    margin-left: 10upx;
+                    width: 24upx;
+                    height: 24upx;
+                    vertical-align: middle;
+                }
+            }
         }
     }
 </style>
\ No newline at end of file
diff --git a/src/subpackage/device/static/images/air_conditioner/close.png b/src/subpackage/device/static/images/air_conditioner/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..f325981b58691c53d886c11c474211b8587d3456
GIT binary patch
literal 4318
zcmX|_cQhMZAIB51ir9Ov)~MY+v;-km>>4e#S5c`wN{t8&irQimd(|qcHnoD-TdSxV
zwOh0`;`P4oInVE$d%vIG_?~;t{p+3^W2mnQreLQ4003aPmYUIx4*hqLgKqXLv~~53
zJTufaQNK|P29uMMla-Z~k&%&^nR%1mz)k!MH+)mSiGPd#Z{1k_b^X`yzp;Pe|E-(!
zW;j>y5AfzBK3^k!W56Fu#v_g${DX+^EwQHR6<-1eY6R{+v&v4Fn)T9ED(ob;8H54=
zw4`t~6_b}sqvkQmg;KP5_z-xAk5~Tk+Tfu4p{KK(Ciu;`$Vk1^4(4FKR-`)%+6|<c
zR@vXze_TyVtjbUE7?=B{>eKzz{?mNY4F}cu9qLO}J247A8P!#iNJmx1{+HNKG`X%5
zr)2qk1FzM{rYpG^JPAyOb-B;+(8;nA(lrgAod?hap5s>!WRrJE!^mTFSj~Q$YFGx-
z092DrI|eN7+&<82N*0LGJW$HDQT8PKJiLn&PAlc`Q8`&Sb12Vx7<x{_S@gZc;VbtJ
z8nQi;Fkf`-+_Dijy7qHiS;U&*pECv$4ge6UqhW9P;q`6Ns^RA86kJr+RL~H<xUJcw
znZCZo{V(m~sQ~7T<-1!ANWMHXv%OJhb~~08+ZBqIdf{C(9&A?qsYQz~kU%Y(L^@^x
zS3SYz$^?p@BEvGiCoCKljHH~TgJ9u!wdRMR94sb088phWQ<LeWgR5a&L;%?mE{Ex}
z7`v!*JrS%EaBY7x@i?b2>bGX}W=@Yq2h=RJHYH?+^q`nr!Da=AnR@8=1Ol<0vaFI^
zpYx`qTwG(pu*iGUF$FQn$!%vIOA?6L+}YaKjE*i#AfB&8BGs8rNK0I&eRe#4_@S%&
zSDi8hBjsAfI2xbUWG9RF6Jc|ZpN4;y&pzbBRz^cOCtICfB|6pv9V<y)Lb(5Ow}RS4
zbGE9$L3Y?28^1#%>fgH;0$B^a4{fp5Gkg`I%=9^nk&mtODQk~M;2kw(1#X)i+axxp
zeQ|jE-k3e>=Vpy5g3Mme@Ig_<cfYQ8U2B|Ltd)*DikITHEP1j-?Pq>M&5z$TQ(NSK
z7nV7Gk%v&n{-X}>v4HB(#bY=p<Yn?h+%W7BazM8oMJH?6&n9}ihxR;=G+T|tZha6{
zo#nlyM*~B@?p=M?t=+d+<pCw~=3qa!+!69lT9JqdS%icSN*p2Qc#r&f9qeoyM)KcH
zZDy05K+wc~g2GO9(rBw+mgIgDWH|<m2;v|LmF~_^_uy=2k1dJ_JQCwIA=EG&^DBYP
zn@W~=)ANk9d-7YT#N|Ur&Tzf(mzxfB2|<t_(TB{D9@o5RhOdga2p`NCD$J8umTbMp
zKnBc>{7Z3ecwd_Iw>HRBMaX6o7`QmmX22K>pe-m{6=GKAlgJ(et$7sqD%U5-<-`Bn
zUji2Qo>U8)c|b);cSo#r1N6;iZ^wT1NQ2jqkJW4qO&tpB#@+35lUXF&#L0~`p$K-=
zCVoG_Z>ZB6x}3#Hti<WlEEk;(s1v+iHY}O6OdAD|M~b(?_~R^gTe)@S;CrQrbMY{<
zAc53DN6-!~nS3YZYD2g~TAOMjqzGQBB3h@TrFDz6Vq!73XgKNP7*sn4Vc*hn+o+hK
z=eAdFEZ1SCD{m@eF$2y$#_>VOd9gP-U=;bHp7zc;gx_Tn`sPeI=HgR(+6y^~Plk3d
zT_pN80_3=M9p+8#@RxO>IL(E-@J!^PY^#fnx1Tj1=#Op;!13*1Rp{SsnR<!`Hs8ic
z=xv-woQx`2Xlf`iZ2?Cgp#?r{A&<HYt8symousD~P{x^#U)3puuF;%bar-}xF;L3~
zESF&#%incI>u0uz9%cB5UyGM}#0kGkP*SDX5U!EG8WYL2$_rBJ?yMmTQR5FPZ=$9B
zo`xQcz!kp1H0@S*=!Ab>-kWqbuHL{EP3LX<QDyd-!`vpg{GSr31#BPa-5rZ6#ncPR
zM1T7H8pR!yUzsnUl(@a;oN~oGv)QI1cxP$eSOTs4)LUQ-^*Pkf>}Pl?R#_--eH+)G
z%)!QIOXXU;)VgF$zUlmlWXfdMM}>Vvx3j)JGLHSA$SRNe6^S<g`j+?eez($>P!s<p
zPO7{BbFm#*+ni#}xCj+`z4aVbQdVa23%NZL7E#i4G&w-hA762;!uwFG9QR03_Ivd?
zTl7+T&%$1!tKVBFL2cJ)VU!GIHxm_^opd)Ti4%OW4K>Wc&o`UV1+=PQTzK5v^DKGC
z7n44u7{v;anh^)R25-Di9P<*9^LL8R%{kn-mtyObe)LbFWJ)8_eO8ym-oEA{9;~SN
zL=NsoE-<j&(j0#uL4DV5ew=~&ZYK1yjtLIAsKfgsF8K_YC?c1o2S3LV;RHprHITLk
zeJd8KNhZ`GKE0kil-8OmAIZ<-L01(j^C!TLB3fbfIM>+<uVFM#9Nk57mQ;N-tE6B(
zs*hEzq5OUz+dpA{WC{VDviw;QIg~KIGw^H29+Yf7E?KMPBhg1A#69q46P!wCW$V;f
zhN|#v4K6)E(WmbjEl@Z8U6QMsM=@r(*hy>e+hnl9cILJ6wkvm^ey`DIB|VAk19+u+
z?uNK22$}qLg|XX^?z{c(@ep1QIl7-c%&u)d=B%m0(rB#BH$qLJQ`H}b+@$+D9OUYi
zFRv<nB@<SIJt6M^V;c=7zgSh6Y?f5x_4c*^@3px5ccD=gjR-qrI&F40+xz#7BW<Sw
zR;uZsNb|!0hT#51g97t9&luhvfbGpqxz;ZNuoZZkE?BXDW7l|JuXva3Q%ga1T^u#q
z!ZcA%%tgSiwsNn)tgz@QqA@^1*My8Wsr2_+=?N+Md&5&~5t-q3?}CTjPyn=&H5BgE
z1WKks>~~LKZClQ_hYH6=^H`6gIB4b^<=s27S0P?Vi{}@x(cjuvp;NuJ6?$5h_9H)e
zE_T3o92jbInl`KJz!4`kJ+8rDD%_|c?pdGjv_C^38leqZiC=lW+H<=vc;P=gh2KL5
zsLp$dL{3#c?X7}mxO{nA8=-Hwy(tA9pFPjm2;}T1nK>LpVTh9c2&QIsp_#R)UHQ$Z
z9xs=I2$8G5BbDP8WcgBUC*|R5F;Lc8WNIzva`LvkNGux#3Yuq_yNBa27O5o!I=V;-
zwpOo7cFNRtEc%pD=(@1A0^T$8b)W)hcb-YP(YGx4V8e;RJ-<W-JgxS*<enXS;X3)T
z4k=jIKid5g)Mm|;_lgo+Cg2t^oJ&bhPN#)W)v5<gwL6O!EdoU{Doq6vX^DvGrC;>D
zvKe@&q^`hwi$N<Ait5_80;gn2(cb3Z=K(U((W)d~UkfP|+png-HCLT&^LLhaIMnr(
zTogpCbZ*rRvY-yP$RV6N@5<&}vn%|1jYqJ0;#_-UQ6vfzC@aaXqYjMCFuGhq+NOc8
zQpa=(t))<i1Z_t*=$$Id-%z8#n@hGR4Y<O9LM>!Kq1XYk-$TJ!7L1QDy?F<{s+&q^
z?OSKgW%}H`P8j*IY{cV-!;u}!CDS02X;4|g8Kn`rdrmvN_ojCW;HWXg-Tqsx11m|S
zLffOA@%j_*v@+*9nx(@LEI&k(l$x^gWO4=T=k-D3N-_KIa%<#c6gwURhMQ2bb6z8(
zu(At*w7iJU#|73WE-xp2e?J$G{aN~|8g21NGU#NMgT(qi8D&oO4_oH~Aov5nRfoAH
zn*K<D*fO@?$z{D_E^>E=*~%c_C)Qz(&C1}z!296K0~|{?^7!5@*e>BYWjY`aT?z!*
z@N%MK_STVhEN&kXOFF3-7L3UU<qg3Y*2A_2qI*4mY;ZdT>>UdH5GJNg-(T}o(P0AJ
zIf<?r3`BY1c1VBXZdSVPIW`GSB+{9k!le_2VWk*~&O@qd*bCe4Jn$9fC30rpnig$F
zz7QId2m@M-i~fqsCv~=O5n~maNndUF5UCOMo*2`?njnlGnF5X$z->zhW<;q<cO~3w
zhb(MKkZiEwcs<7<x_)d>&<~1osVAv3<slkc5_){!SvP3>d9U;Q>QzSb?IR^hP?x~)
z%Xy4dIi47F)t0Vo{$fcVc$xH(*@@-swbVlI*q{{j3e-jUh@ncA^<qj8qO2ji>$B!I
z%RZqLZj+<=>_uF7v#?%+FmuG(Y8=<cFq~ET09?Yh(llAfE2|>suhCt<NRknIX_HP(
zQG&Ycn<tKs7!n$|ycnDq0;xDH8k!`&7O|N8@J|`EMriAN#}=VDGn7}JGMYTawDd~d
z2|IE;9t;buMZD9o^qQ3JFTk6$sl%SaVr3i0pNgJROUMs6t=@0*t^RO-&Z?ZPIOro4
z=d;&;p(VBcubSsFu_ZdUmq<-Ay1=GHk{x;Pyw(5trR}bgW(%_phY_+wNIfenQce6#
zL(CGNAmBp$D9{(WCT&uCm^_{Ck*aJ<4$~>{#e>hkUK7lXQJAt+1?ZLrT}h#)90l{h
z%t4zZiDC@#y<x7Gs;EZM`Sh|yU<{g%BP?)eDi~~z_n|Ll6Hoh*uO!<4!daHT%>t_t
zfjCM{r;z2N_!b)EIKm%%uDO?S9_&z9w_mZ`!b4_`@8mQ-x!x6v4(XKkTRw9PI$Fla
zEa=oyTgjTvQ@R-(L`-cl>+0L8m6q**Ux^^pUDb_BP5n8DUCE@EEFPCQ@$WV211CA?
z$%VwJ0DnFKx&v>m36=t`p!Z4v>c!P_?JLhMr3ODJitMH&<V|mcX5d}DdyX6z+a}4R
z28!;b|Gi~pLL<6kK#{_h=6kz*W5t6-z)a^LerHa3fcA@gJm6X&`jQSv_>d;(Stkgz
z5?mL6^zhU9F1|eht#jf0s~L>~+whSl1U=X6j|+z9@%`w~x0lo7bQ|8C+QsIYZ#vYL
zo~!rvFr2{){f-hw$O)WwgB3G(jE%A-jhEVWUdRYGxk`pEb*Wr7hDGNSFh#kP#P2Jh
zN0f}HCaBajQO_AOPZL7EN+76s;&%3F>sOv{`$2R3OIIUmjjytzWv%Agug4lTJ?OIz
z<yf-FwnC<^R}uTeB0n>z&sWm)D6>P=mbC(Y0!L%@!(7cj4&(ONNtN&)IFcZzrSs)+
zxT;_CaWp}+#?I8HM9uf8&|z@Dj57sc&C6LBaU(^o0`;{N;llRh^=7;~5xnlVZvyPl
z4q3K8AU&?brc?^J;QIY&kMfFn9h}RfDcXCeSXq=N_LnksRlU-==gaL)l1{*RH1Y`4
zgc_BHwEuvTm2J{t*gMP)rz6KVM?X*0zDz!F3z&<2s**Lm%gxkcGemae7#GSM)S&Z?
zQu9zV^jIgye~Qxd6WrybMl4uA%jE3Bffu&luShUG(sZR03YB=!J)ha9ejwzPqyh6x
z*!LB}QUzZu6o3qj3_wKBR!+nq2SugA-`r%@LsQ%=ne`f#(FlS&Sop~3_)eyq*SqJY
z=XF%}{$$Hv^sb!Q+N)d3t9Chl5qOshE4PrD$FmLiuhO06RfSBe?RY3yhZDCn8}|8_
zsW~$t;fcF=(E`y@eTgKb=B)xoT7F>W3s)5%_Biy`pElt5H|RlWi&(Qs>wS*2T&ne)
zuxPS#k6Y{B;)SD>dbGY+jC%hm|LVT+51NaAHsFiITOoH6PS<GB3Qa~8Ob8Zq6f7il
zk-&N1DLH`<mdvr;JtR4=GN>=wm_CwGMQh<5_BN|(<*(f7Dhr=*BIz5kK#QC20{~oI
KU#&*f7WE&Tq&eRJ

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/heating.png b/src/subpackage/device/static/images/air_conditioner/heating.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e3db478e816580e5ec74225385cd9a258ca5bec
GIT binary patch
literal 1847
zcmX|?c{Cf^7RDneG0#e=A!b3`7^=O*?CB+?VyvlEw^gsSxMnd0@o=Mth?-}q)KIf3
ziqfK}wn<uUMOD-l<1@q%UV5$9z1G>^w|{5vv(8%QkCX0zu;J&C<^ccz{I>tHyw1|d
zAB&rvl?8f6s4U5LutQq0wBY|yR8&+^QGvx`i;Ig{4F6A@85Tb)S^12xnhOgHS)P@D
zcCrS~U}<UT&(8e(d=@<8Kj9f+l`Mn9;eMW=R-X8lbtj#$>j)<RW93K!1mxNgc$;i5
zTxHnXj@P}t=KB84D}`U@Wz82UQZ^n9Wm#dWknHP`jdv}!L0|yjoT{y*8S?HIIzBz5
z(o`t*hHvyGP7bzUD>6~HDC)FxHi*L==a9}u{QQJzp*Xq|yXPr|sz+l0sWAd;?Syl<
z?vA0>z&s%r_Q3lk0om)cS`$4t!{z6C_{%p|gY~>Xr}rx~y|PrE#BR}e?`Et2rQ~!u
z021OJg>#tEcO4vgH!{&N=@Dumzp-Mj_nvV@{RAdu<-c?_pp|>w_5#eSsWh|pLV_M_
zojJbdDQJ41V+%>R@tl6=5z^DEkasi-H!|R1-Pj7<5YiI18f+lqt&cAZpO_7D=WxLV
zkm>JQ#pRj3&V~~NL8ZJ~zP21WaQz03d2ZfW&N5g8EzuI~h*o=9q+5u6B>|8zSsW*D
zfyawnAa%V|u;;@xtQv<~3R)vKEP0l2F&X_xS%DPXHjolJhV&SSGd=IleNve~*x_4P
zH>fNbf(>vj8$63ppoAV4*LNSONhq%@$VVWcH8cbI1dwPo|J!*vh-?5SWiF90KQL}H
zifiK=8szfxjbdL_Q4>k#7s4v{Fdwbg&5njh_(Ji!#!z68MXBTh4pGL9^JU`eL9$M~
z-<)1rUo{J(XVoRH@;vD}rN+x-VnpQFodCCdptzl;<QBdaPV0ejeS{(#!x@@{$zeoS
zOnXcDpbD=FZreP*EEwirsvY->byu;<F*Zi-y;UgNr}=?^P&TuK$ZKr(%x}}#`a}w<
zXWWwhtzGy*q!-ryc;CPHi=qnoqA$n>HG+=Yz5@qS{~neqbD?x;<ro*x%E7NMQdgPE
zekA~dh|E?<%x*=Lp?iY{^)q{>UI*Uu`vz(x1UyZjKbnm{zkB!I%$Q4bH)v|R$K8<!
zVv;i4bMP0Dfs?t}6g}w|)#eOxso;9{q8LdQ$#ih`U#p_)V~y~yiL^exlw~QUDN)MY
zwH6F-LLB+t1E;YHU;)YvF`4(md-j{cQcb+_f~xD7l~X~>i<dL);#a^LR}$ot^7~Ue
zTxbUG=$rbT+*(v$O%3Zc`j|I0+VPTh*MmbuoqT0Md9fd#y7hxi5fEypZ@DK4T(Bxg
z(<wWhX@iW^%8~Y(zQxoA)M=&d0LeLDevis-mm@9tycr5ve6tWPPgzL&gW*cynnRh1
zQnrUYPQ-aMFv<RNEPUu{kp$lxGTCfO<pMLb;KU`Lg9LDbj|a+aygyn>CKC`e{bRzJ
z3Zza`L)X&&IC5Ps_05at=53bjU^aKei$^CsWw0K$1WF74XFL2)PsXg&Z{rk*VfE5T
zvl1C1^K@^hhpG8iSpLRVSyEuUUk~Z3xJeoy@G^nf9CZ30Ss+_>+2bvSQP-ZK#>xVZ
zaIfh{lv`(f4N%Yo!*wj?d2}H^?_dZBt<MOA6Nmc0A`GZikq6>Xv$3=#SmT6SgYAor
zzc-t{yM=yg6F*gIX4*IJK97UZ?S(KeH<c&DrTGhaMgX}+l7DKQoc0?Eprv)tR~|d)
ziipBLk^vE9li<McN*bcDWNhDMcI*3I2<P%_e5}B+w{`+GM6zk%p%G{Q_@XYsWZa%8
zb_h{LYV>7n_#lvy?POrAp^zr(I}S9VCE6>Hez3a@S0XahWiqh2++B4hQ@Ql0>P``m
z@pj66?3)_2nJM~?+UEyPGd|SV*>@ghIo5s-WPthhjrPQ8|NWKM!ecyEtffKXdd^gg
zgJmf)<KC#1@UUti<Jm@{&dQf+k748PLB|=Y${MC92LrZ?o#Aa3-v7pJ@wTkVb7v-5
zjLiQ~Kei}C?3z2TqhML5kaz{N)|@(R{((N+dai@U-@&L}k`vv(eajEHM6<zM3qKqk
zHa;jXCMJH$WZdqIx0}li=1(|;;nLn^Io#}z&*Z7{m)+{S)eY?#)Bb%Y_BqopdeYz2
zoe+@P?05poB7a?Md*v@HEbUd=S?@aEFgW#9b4-Z;y`KK6*5J@cP4<d3S?8wF%~|+G
z=g1a?(@3Qs))s#WbTGO;=##a%Y5faTKZif4gx!19Q;`HwBVAM{32Bgknxq{~5)DG4
zXpzRWNxeFHjq--&3a}hSI2yJ`d30R<@pY9y7HX#oHDL%k`t_O(9K+AEej9+T6~eO7
H+&Afe9`lsB

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/in_under_heating.png b/src/subpackage/device/static/images/air_conditioner/in_under_heating.png
new file mode 100644
index 0000000000000000000000000000000000000000..0471160c04cb5627b5ccf153c7ec12214ff177d6
GIT binary patch
literal 2111
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
L#h@yUaisqMg}@*s

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/lock.png b/src/subpackage/device/static/images/air_conditioner/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..93deb16633f6d6c2dc5ddbc9c703d41e4dd391a9
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(zq5^zET!Hl5xpSw3!R*<y=ggS{
zWX^yAID6*InQ%5l5-0)z5OE+IA`amK$;gMlUjt2-EeY}qW?=vELY)7EMclqm?(cN(
zr(K*|U8JUPYh(Yi;AySD*UY}ez`(rA)5S3)<KEj@-DQgv1lm*$I=a5^zWBZV>|B#3
z)7eYBIA`bnExvVm9!GpyTjH?=<u5KociuTsyr^2HJjcOMWI;@Ty~Gl^Q|q2aI%iJ)
zxJ|o#)}B+ZT2HlY<Tuh%*Y(`IK%V`Z*0)r@4%g$(t~Lv=+*f?>!t*)x+EJGI|E9GS
zAKVkp;i9m7`J_gM*B4b6`G=*=OI!QKugdX_+b%sR+r3G5ORIvfnCY%NXWnBlWzwQ0
zJcl#a7Q5!?rVFu}AIv!(;!+rUe4@wkZ)#s0Tby$W6raxDJ9F-3jWma6+Z&GtR-Fqw
zZOtm3;vqe!<m7cn){nuJE811}f4szY^1gV{*1aa*_47hpj(-2}^m)kao)qqnPrca`
zr`hZgxv2hDa^0gGo^{hor%n;w$?z`u<8rO(A^cjbW{<C>=ekZ4@~u6fmbq+i@w)x4
zdTOe2wYGvE7pXFGed?`JkviMEowv($r{J@#TvbnZzS$J9P4}43(Piw9Mc4BB1^uaC
zJpGc(?4DqW#+h*!RTXb*N3IMvGiF+Ru;^P!-_DK7%%5*w51JwQhP}99<^KE?{?85A
z_qp>NaLSFetw;$EeR-8l&8Oz9)l|=a=Pn)zx4b&DB(YhpH~8(D`oA;To6jc4u+6T2
zA-Mb&_q$N-;P>p;SB1X%-n4hA&QiIX@7ITjue`hant`~K)XWBD%jsJh-<;z3uwcpL
zQ?3futXcdsGB_=2l)ujEp1a2^(&CasKwPxJ&4V@%&CHZTt;@?@S#!28(0X=n{n~;}
zYaf2?o~FKQ{SvoJw&{m%AG$B{LgRVKCaqJSGY;D-&i8J<bkf7Td}GW3@jD?}%WUU<
zPz|n#oA~65(#hphwYbbIZd`bIaI?kpZ-4jvu&zII)N0k_6SEF^UjN$8858hSOwic7
ztCdS$SD;Xw=k4<7?Chw#*U=R$&#ou5OmDj}%SP$Y>q`&&59rMF6F2C!oh?>vxcA)b
z4ekk6%`-zk7`<n-JHY;fVZGn{x`{_w8VnhZCw#idrq203<op{ppFLG)4snWpT2z$$
z@sq52T-8rk_ktI%g0}yONb~-(O?ktKW&T-7<_R_W@n6>_a`wgW9^94s?qZ7ig9<in
z)_uww&R<XX=YK$*MP3X9|CdXj*sJ?FU7YiIYGGidVd+(l9r?9SIPCY|+?|_W@9bQE
zXN&9u=9-3j+aFKkr|iFdv7!6$gmSBYg#{13*16Z{+g+(So*YwJkQ=F9TCn%&ihI+(
z1peJ^H^;!fZ=&jzNt1l+`!+K2omo_7Q<NMZeRJAVS*s^O^$g0flF#aA^G*Y1cLq;a
KKbLh*2~7ZBFf5M%

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/normal.png b/src/subpackage/device/static/images/air_conditioner/normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb849b9feca0eb29e017939e9d971d74f546104d
GIT binary patch
literal 2414
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
F`!8_|y>|cr

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/open.png b/src/subpackage/device/static/images/air_conditioner/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..659a3115206b48b8c547d0c1032f236e7b6855a1
GIT binary patch
literal 3170
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
E09YFW1ONa4

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/refrigeration.png b/src/subpackage/device/static/images/air_conditioner/refrigeration.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaa84187f1d9d59539c05ff0875e6b3ffe19e452
GIT binary patch
literal 1391
zcmX|BdpOg39G<mvT&gL`w2<7jToy5x9P2QbmV-zWHnCA0<uX)O4vNs_iDqm|={R*T
z%q6MJWt(!poHUM5(OlQmTxN^T?>wHT_jx|=`+h#}`#j(OzBjzR+_tO0RX`xnb`N(K
zUqF-pAEhk-L!Y<52ZZd6^>YQZprC-sWYXz$zyK&JDx%S7fGI32%*)FI81TRa01z=4
zjLmhku$gZ9&CZW95CIn|l?w0=52OIbABK>Chm8_^y-t8+KPj%xz{GF;cc9Bcp80H>
zZ0pw|Nk(y4_YQV`dYpN4hE2geY)s}S5D1d);ez&y9ABV`?$UL4Ia|Qee%^bHry0gc
z8kKL{9*#v4z+NLHQJvM1=0xkbJCo6Ai^bm^^>U7)A^yA6gz4wIxF3eWy1CA&E6J$*
z)6m+~RDZ8rAI`@xD=>a!ayPh5z(uoeAdMo~Q>w<)t!lZ*=cdv&I>w@MyYd{a0<^w1
zly(VH_;1b^SA-0Waz~I{UYND4ze#lCRh$B^o=oZJA+pAf%!qq3(}E&KlTdF{1fMZv
zGkhR9_$AXkz;-$6tf6&+j_mI4f`A5ZLDwv+-y*9Irytpr^jnnA%Flw4WsxfN+GW{l
zl-lvcjk;dd>b3rN(GF3h6{x)TX;rWSsc8lGjDjUvVWpBYluq~R>orL&@}TU)WAvD(
zqdn{A17R~xOZR=a5Tfz==`+wdIwh-CMFAsJFoNiJy{{+S8+rAO4&I=jA@PqnkoxUr
zqWH%UB)k#SLC&eoPVYreH1a|tCX!;<Vn@p*CVs)eN{=MpKqA2jg}WoPLA@3$(^F}@
zSKp(RwKhVLdP$LYs<I6uKRbUzh)*FhGi1^t>8W%-=uOL>jiujt1O2+f;++ySR*2FO
z)fI2R9j6Nk`jI=tJOANl$<f&8jMrZ!Zv^23_#G|o3`0VhCi=c>3Zo*`WVvxa28osL
zi5-Py-=N292hYk3jClD~AWPR=P&vbh_tDQy5Eu+UH>@5$Qh{2;=h!U{3C%B+JQSAb
zc9M^)FYVQbN)bq~xFNv0Rc60d{?(|)Edwt)K>Qog+}rBiFpFoJOq743eeQuUe~qoH
zx;U?My==U+w*8Yns?6r`gLqx2+;{xI6iSbnCq&!Q=CxpQ&Xv2Gxy)O5rwKdr6$*t4
zQ&!x@{{T6G?!AcOOVz%5cXJJ9i%<jTV%|W9VOkm0zEP5gYO12vw`H=+>BwIyLA1BH
z+kAVL1vu!cW_<a}u;J;N8t0Zjdr=x;zIez%PtxiT6sM+MVr!gu(tCn`_z92G6rhAD
zO~^Ba@~(?WfzycxW4N4H3tZR33;Wm~L$^=|FA7Y<_!#nwd=3}Wmpv9sHu&(A;lb?c
zqHK*fJt32^SPve>WsaRIP5i698XW=m6wTW!I5lfv#S0$dy)SPiSac3LTppCmVDYWx
zc)=cLi4r{dMb7txvHFxb_yx*3BH}zWgnGP(gK#y`Ai{!67faunxYfl!4$lvq%TeYF
zONeHVo|uo@ju#ShOtBiL=en^Wci52=)e@}?O0mQA$!?x?>zhGy!dky=<+w_bGFw!C
zwLlsnC&fW5mAEZ|gIDv`j2#KlT?p0umJ6>3J=sGQ+|uV>xr#1p;fI`*mm7u+AhOci
zK?~%L(JSaGolse(%@>-dX19c;6d^I}i_wEe^Qn4$E@llk&te)4;O{f`mq|0#lRfmD
z0-xZtC)LvDw;Fd(J1@TO*>|WY*Pn&1>6m%vbZ{oit^E&gV~CBSjNHbUBsA!E>ZGq~
t&#M$)USH6#Ci(e#9Yg7#b4$Wi!ZZ_<7p4x_)c_wD$ivmkrSd2t?LP)Vwl)9&

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/switch.png b/src/subpackage/device/static/images/air_conditioner/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..e60bf9f63adce5ac32772ef1a33af17645864fcd
GIT binary patch
literal 1128
zcmV-u1eg1XP)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR0000{P)t-s0001&
zmzSKJoR^oEo12@OnwpuJnV6WEmzS59mzSHHo0yoGn3$NDn3$KBmzS59nVFfGn3$QF
znV6WEn3$NDn3$KBmztWImzS5BnVFZDmvv$HjsO4v8gx=lQvmn|=oT~%y2RKcqD-0W
z8gy$x-+ax3V~kf<MXVD500XQ^L_t(&-tC(WbF&}}$03UNZq;g6zyAk)G88$z3cY0%
z*QaT>TZ8}o3`I;lV5<Qz7MEXg==t=^#`{5jm9b*%4LwOW7BY)!{`+8FN0}_fE<w;9
z3*wsEiFAH?6|hGq_W_%{k~#hi_hcJzGe*-(EE*dIrk_O>>2SFxTgjC$y&YEy>)#Zm
zigm!r7#S`OKo3@PgO0{z4jJx-%hRzGdHl<ki*ii4A>Tm-EYeAvyom;w2ZKi3<cdiJ
z1AJZ9aa9O)kOyOEqTu>_zA*H3I$&NU2xXoOfF%{zA$RB*r^SkddA6j`tWkZK&qH>*
z*$mM3QbN1xUAc5N23hLw{Dv)_4cJYO;*x!3W~6P8O5!-#x~T2u3d+8ij8yD=Y<9w~
z$g-l_xajT8h$sX`k`1*2*X8cyI?2&5yN#RN4rQ&t^}u>QgEu`5IOg!w@LeRvPj3e%
zW-#v=pTSYSJs{4|iSH~netJ8wJet9r>G?C>f$@O7pW1HxXdm$Z3vRTq`5D;gKM@~;
z0T{$BpM|`Q0X<KFEqVu7%gQRvrp2<fDwWg?w(H#y=a-akOP)*qRK!-jJ7Q7bXQNbq
z7vh<St$I87yPMMKfu$w5N4-mL1&dY3m90wQ2HW)(FuwAFKdPe8S>y~HV5j~#VwK#R
zDqcMuFiE&8VyFHXT&C+8%2wpLXyqC~TDrh4y#-t;FaGMU0u(`9d+n=SV3+<FoXf@A
zUqC11$)#Tok+}ox)E|Hu-1K~N{nqKHGFLqZ-GIR{7@pBT1e>Bt3RIXYM4F<`3U=#{
zz;YQFEfS0{X_o;a?O?b52pkU+f0Sd3diD>o9qiU0fwPG}%CYkWlG(v-{rSM&yZUT{
z>jjt7xh9auQzj6m%)S16HwoXj#q%WszEhv`C3~LJ+cPHgwi3i$4O;XsEZX#N)_Ovj
z>W<jxn^w2Cjk`=G{9{^SPU=d^qX@#_@f$JWa-)F>6ATSZm{MtA!cBw*Cfqh@U_zom
z0~1ms8kkT&Q@}t;f8AhO!cG8_N)!s1R+JIIq%!pVz|O9Ix54$y<@8Py$P@MN``sj5
zx5f8M1YD`l`z3onN^k#mLT@Qye1Zw}GYxF5pFM#s)!@4<PWVLp0slF0qrt%zk_B5j
z7i_U$u;r1#7K8>{0vl}6Z?I*~!4`H0Tgo16@qVD~3PCq$pv9H)yudh8s(7~vXL{i#
uoIu--Uc1qXFB`4Svb8M0X1YMz2mb-MUi{cPKoX_^0000<MNUMnLSTZHxg#I|

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/temp_add.png b/src/subpackage/device/static/images/air_conditioner/temp_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c895cfa988cc290258302639ce470df422cf93a
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ#Q>iWS0Fum_U!3kFar!`&YTHh
zKm-K~5*7g!ag_x51v7~Lc)8^2Mt5r+qZNsFfuhSjT^vI!PA5Ase0vh=kPvpDfp?2U
zqsmm<4JQq))-o}RGU^od1V$<BboFN4a5BnKMV$Gm$E1`N?>;H-u8loBObRV)f*F+D
zJeDhn6dY1fKj0!EVG+~2FhNx0zz;=U9@W(aOyzA)T)hGqgquHZJtNUm@H!+dqLrOT
z-Ls~#!TiSuHk*4IhsAHEs2Hpe@a&vbP}Xp=PpaEls6Mf0yM(yHDy9R`r3?&nv^H(_
Swc!UjnZeW5&t;ucLK6Ty9A|O>

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/temp_reduce.png b/src/subpackage/device/static/images/air_conditioner/temp_reduce.png
new file mode 100644
index 0000000000000000000000000000000000000000..72889be06e640a0cd1e6e9f79975e5d982118dc9
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I<N|y`T!HkwdGn@EpFVr`>=|G%
zbLLDS7eXdh2h0bm;4BI93ufSWDYoS5Mt2+K3x`hv1wB1o978NlCrhwiVQ7kAw39t_
zETTb?nYn$nkeI-w0|7?D+6Czzhx8U6ThJMsBy`wECSir=gHH<Q6b?#uSTxIqyG)!Y
e;l?P+z;Mjw#{6SWFMWW9GI+ZBxvX<aXaWF*Lqe$l

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/under_heating.png b/src/subpackage/device/static/images/air_conditioner/under_heating.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3971ca35571c55804670b06c77269b6a1dbbab3
GIT binary patch
literal 920
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(z!UKFlT!HlT>C<P=o;_#I93W%H
zj2Sa$&IFPWHjn`XKoMjqh~TVQvmgw(EKm*55TGEC;Uv0f8_;N(k|4iehVNp0FRy9X
z&fR<}F|=WK=3?ItlhuXp508|~^;iEe6JcOry5i~L7?N@C?ac0Viws0uZEdG8eG(9<
z`S}07<+W)Q>bE&(F1cMHEcQ%o`Wo4+h0C|RGXsK4i*wiw|5|)&d#mtM;j@nOxl)1h
zNk1Fs$Xq`7`{MR{-*a=T>zf`a+=|~LqclCvlP@TGy&h+Du}q51`T9aRPQFFH+f0fx
zbFO7%u^aaO`SN)2#TiHVioPB@q+R6uTA}o-UBFdO*(HLV=T3jCU*h@hLF;^XpCk3@
znL*a?cSq@ka)gLC>Ulj-_*J8k^5WFbo3}PeA7NiN>zd=4eHz_+XWlA^_7eA3DW7oX
zsdxBK2aAcf9KV$I*E}jwv3UKtg+D+x=gqygX>v6Vk$j)Ho`|H|20ZDU^Y+l~*8R^8
zO?kK_Zf8xy6NP}}nS4fDPp@$*6$n3cTJo^tC+CcnCL!z>A1eO#Um3!F^LWGBsV^1I
zdA(RX`Q4NUYt}AIv3nlEUKq*YvD}9J;@oYC4;7zIe5r72?&GTE%dJkVt!4SM{IQjX
zAoF+WtB%KXrtB_TWbvBSPI@I@(z}hXL}J)qE;tt?lXB{iz@8@|?3Qtd*qYv+<nvp$
z@W5@qnS5c^#x2v*nvG;#c3Ui!Em`iuKJ(F;OIlYQ`wRnS&JCLLmEo%6Cy5Pd%T3rX
z$}_HNzO!H{OZw988GMf(WTsejTq~^JAF``i^tgPhknEGtWa(5ZkGiJF)`tq0Eqxwr
zTW0ZE`<U5si`Ut=nXfv=NQZw8U)5}~=?}x{5`o}jOWg~VtvdRiOT1XYw{KzS#qE7B
z6n0G)n6O&Ws$;Y9n^*yv2VpMpT&dO;EHw*?T-Xb*$_SS)YqmCJpP9IO`U8ez$J)|t
z&pVp1rA!N)$+xKegK~BCW2+ABTJO`H?-CYm*j7-(9++%0^Rx8@mvi|)_eo3hOsTH9
z`y<HN{eR#UW23@L2Qqv5rtr;M<&>5v99JrOf8vb?b<^u!9NKaC`@wbp`r2O?AAUKT
k>%{*JX9cCD^M5ekF#P*P_-fq_U_M~*boFyt=akR{0FJJ@4gdfE

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/ventilate.png b/src/subpackage/device/static/images/air_conditioner/ventilate.png
new file mode 100644
index 0000000000000000000000000000000000000000..a97ffcfd59e203d2e7ceda311295265ef392c4d9
GIT binary patch
literal 940
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(ziUNE>T!HlT>C@-WpARHw&z=n=
z`}_N6&YTGsoB;+95uhND0b#?%fm{e1NWv8W1?SD12Q&~O1s4Z0p7ST{2imGy666=m
z@PgyJ_-|IeFT!uO9&=mTV&VJn?CwSOS7-K?rGy(BC^p<aFk{usOAF%}7?_TDx;Tbp
z+<QCwWzcH_9=EASi>9gNPSTqq`|j)S{f~~C>n>fqF!-jjqm`w>pC{70x0Ot~RUjH0
zyOY_~{>pDXb_bTsg4=2{trNOd-CukA`dZcry>1)od##UKY~E4tmAW|i#Qm7Ed9Mq*
z-MLvh6O3M^%=G5{X>wJ~I`Pk$-}Wcxs~^1Sc3_#=yB@<|&AVk>GR<~BnY_v%KJ9jw
zp23!%6Q@7V+o>_fQq6wZ0@i1%+qd$|ZolePcH-s4jR|Ybjw;@~%iJW^5peHk%KzW@
z8nvDtTmI{XZAPDDLiFy!Gh11G1?0|1*qCr|WGSo>JN9$_ldDWkN<WKYZbq(_>4`O6
zx4v|xRL_T)op1iP$2f6SDeO^6E|~v6;DfYsMDi-bzf4O1?mTjO_|_#lGj7_oMGlOf
zjQXdX?Q4D%1T!gcP4`*l9cgss_p#kOVkR$W%HX^7!7s*Umu}V$3(>{^@#9ktvVIjT
zFVw0|)a%=JMlxV8Z|TR}-QE@#>V=*?@_j9FA(Q)G#jATWdl+Li8uj8t`xx&^IYt*;
zWKf?W*8E`6W|n&)mp_R|q(z^OjM?&l-F#Z<@f&_ij=FBSba!5$gGX@xg!X-H4hDYH
zS2bQ#>DbZAy-2$%ph0V+F>B1DX-!v`&(hOVeNh(FBqpGmaWbUIj8irv`buNhffX7~
zf7-532>Ip_og(n^Q5?&Wg?jI<y34(K<npa$fu7ups~h#!3Hij@WUW$;jY%&I6z{*`
zw^2_o&S6FO>*gnxVT>*<pv3yJd9r@znT#z<vu-DMG@S9?zDzV=wzolw|Fff6p&Tz(
z`x%IqeO%f1D{f^btK6xk?ZJPNS7b2Gd?Tqp=hNw_KYOm%9D5!8%sB3|<oc8IKUx(k
zcX#id`{aB@VBUh1PqU7Ex&0_qslfU8?e&xPu8dDih`lxAkEtlj?M-~le*d(D{vUXL
jW&Lc<*bTuugMRSelh?7*n;X&&%m56Yu6{1-oD!M<sVB&E

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/wind_0.png b/src/subpackage/device/static/images/air_conditioner/wind_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d3f5df04a3755ab5e24d80c65bd1b77804f755
GIT binary patch
literal 719
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(zYyx~jT!HlL*|VolpAI2s%$NaW
zV*;Q!L<&Me6x7sR<^}2(E(!7rX5jlQwk-0+-CdJTDWrKh&TXzR_#;?;fPsNY-_yl0
zB;(%OS!dThR^V~VZ9mfTr~P~Vb;q+AU99DSnO{l^Yd3LDT50K)rD9;&_t*l6&i!xv
zZ<lamk3ymx7tguVM}E%<xxB}D_1P_RJc}GJ?Nl(<-#lfF|Eo$xndMK+#T6^QnLq8?
zA;_WEy6%F5z>Kyjug@%ENxBfD>?F|jF{CFu;QuDojZYtMJ=|NVv7q;K)A0qXKJJ=W
z9b@v{IsRgB%uI>2Gu1j1KSga?*JGqN+3Q~Vv?*t#4NuGnUm0GlBayt!dY0raA;TjT
z#@<tH7WW*_u?#q-y79`fhtbCl_SUa8wCBGyV}FK?h(w;xchOMO9%jRHGdi#Tuz0y~
zy5X4_;eWrM?6Y3nGt+FX-OY_5(kXjnN*mVj80s~L`nv4tG(5KX>O|hunv~NWMto*U
z{Th!S9LsxiEZ+Rtb4Ka?%@P?o=O%7E_Dx1I?amzK$31T?jSBkLXQ`;?^>2^hzr6W8
z$KwTG1Jc|iSI=PXGg;7cw6D}ba`wb0oN04(Crj_%h=D$e_qz6MEbH|>;mF&5@uk#i
zPC>=3!9m%3Jk8Fm{g|VilHEJG_rkXiOJ`m-TVS$9JWeccHtX%j%lf19eudXei>rPT
z>ThYEVf5=k&}FlhY13b4`qqk9{am<qm6l1l^Qxrdepjt3XH3&xC1MiCUATW@j^E^z
znI=7V_#Ya+&{jFSxBGS6JflqRsAGx7_F1d<9`jV0YyS5{t=dG*b$6|TCqL(3bim{c
U%jQOXV9H|fboFyt=akR{0351O$^ZZW

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/wind_1.png b/src/subpackage/device/static/images/air_conditioner/wind_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82bba13c7d61312953b214c508f3af13d69ed98
GIT binary patch
literal 656
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(z>;rs4T!Hl5xpQaCm@yp(07^js
zTpq{;vLU2J!!Z${5h5i)e!&dvlD6+I|9Elm{^`j}T>YDJBFdGVn=jciFfhLHba4#H
zxcBz<-Mm8vJgf=U-okU{PjkHYKk|6f7M__W!>wnv^|LGuda?Y@(M+EW28H>PCT%&l
zT{>dMp`|IBu0=apmdL#7c)REQb1`?`meUirmCq}#zkjSX;bru^cT<vIvTzDtznB-k
zuRbb|g)>;=<Dbf<KTE|F9n^F-t^d7Og(>AwVRiKP{N;}Rk2f6Vvwj04>W?P2{}(x9
ztZ$P1tbp5CEbUQTx5vu4orMO$7TW|}AKmD4=$T!(Li2w1{W)0;XCkied)aVc*SE9L
z?Lbm?YA54{Rkg{S96)g;fe8DOZiuPYZ$8vFS3YY^+mod%vL;)ZWlz@PNyl_op1H+g
z_Bh*j{;NN$!VevEmx}jf=X;l0<NZ=%MrZaPzT>Bk2v|&+IBm8Yr$&TaV&lP|g6F^n
zazC3XKI>zY|HFi>^O_F&gm0a9=#0gRuOb}#dZv~<cu*JgT9fCF%i84z8;&fz7A#<~
zlszKh!;DD&(i@5GvSl!$KG`upf6*=WfRg66$U`@7ANw{@+Scue#;rHKpGr?;{0nRE
znb&{vZRX6Z{ZbqHLvQA~?=sjP-*$uj<QuouJ4FpQZ&M0cm(_FCEUj;*Z=QOmrmN-O
zD^HdkztLOtO+xM7``lV<`~UrN$=lgxCEGD%IQMo)IWa#0rV9p7S3j3^P6<r_ZM``V

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/wind_2.png b/src/subpackage/device/static/images/air_conditioner/wind_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7be0ca18360a71d2ebc60eacdc06253191cfcf4
GIT binary patch
literal 795
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(z(gJ)!T!Hl5xpSw3!K6u(fb{Iy
zvmsnKIb+5QAR9u$89*)&%$YL>q72A}tH)#{aUSjg+N4+#<QL4q{==5#h4?$^%LkW5
z-V;6fb&8_vJYK(Dr<*En=cI)98a&+N_?Ur#$=TDzF(l*O+uOI--7*khy^w2su%OBF
z(H;GmKmYA-s;qSi+W9GX`PGX#oGd{zmR254md;TOh>TpD8!E(+qZresBe^@zXVXI_
z)@?fu%`VBBrD?ja=z;h8_2;+xf8Fzo(MIt?rcWN%mYOj0$x{<J7wXk;3H+^D>d87y
z<BqX0<K~_Fd>6BNi=4Y=Hvhfv@`FOH-8<*m-S>}|JIJB4;Q$jikcegx`%&N2c|}Gk
zuY$RA@8e%~%hTS?a7djPIa^e<@kc__>&<u0pWJ+}@rPB}`qrye3*-4}3g-XTtvt^n
zyyDFty;x5Lu^oD6<jh>pGOo{#UvIze+fCUn_HFJriVi-1!l9nt$SM|*03?1yA6zo+
z!v5DYb|h}q>lG<J-tt>{@2!op_vRR!<qvxtWs)h+)wMR+YOA;7-jMD6vsNb`sx14u
ze$l;Y3d{OlpM1j|-nTsY(C)9ld-xk79vpiU`!+u2!)5u0UEKSACf^MKSy9ovJ<{0R
zNBR&?ecIVI9}2IXVPAb<&CKP=;WBAwYd$>qzB$cqM<(;;G(L;1jgiLeIlcU6W=TGX
zkxw|ycD`S(UIiK^;DBNJ-)jG5p<>n-2CpwoZUvme^3v}8cU;ylVG+;$=vet>Lf{u6
zzl@nu_oX`IS9ir(bLpLVJX`T&bIQl=uyr?XU2Nsf|6h}vI@!JVzR()M{ZY#vv|W>0
z+nd|Yt+D4}Xo}~%(jwn{F0BtoR0EXDX7)MwrhdK?#@qOB%Te>Koo2EB-4q(7KE7_Y
ZXV_Si(x)sP+5${_44$rjF6*2UngAU}cGCa=

literal 0
HcmV?d00001

diff --git a/src/subpackage/device/static/images/air_conditioner/wind_3.png b/src/subpackage/device/static/images/air_conditioner/wind_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f0d17c252d12738853e7d8d2cdeab3ffd52c4f0
GIT binary patch
literal 691
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9eV(z>;rs4T!HlT>C<P=o(&{{U<MdK
z*bpv+4N(A;gbPC0Jk@V&fJTUv1o;Isd>4DMEb`vYvy;7)Q~4?!=QbPcd+`7HT?Pgw
zeoq(2kc@k8XP;iT+JMKkaFP|j(4p7=_kX>#LhFf}=nD5+wy!?Qg~+z(JTz5IC_lk+
z*d@oQ-Pb;1nQl(|KIUcLx7az!dCoI?CmUPW&NuB1*Eh#)2Io&+7Cf_z+4Ze?%!NCR
zi*~RDvv*x$-ShmY6(e`V0Vc5x4Xl598d!B6oNt;Or1kLN=Y*MaJGprJ!tV3C9!Yj<
z3VvceHRJbINe;dmi$77U%-@q0?M{dYbIJVNp{{Gp_2zY~=7Ix{3$MR@&&z5ypLzZM
z2YuJ~2WA!i`MXr?`2Bb&!=7n7yK>FSP?Nr!e8v)U-1X-7Zs`p;e$$TMO-A_K#!c<b
zg6t71gO^PG=6hU@b>4KYGlEYo0`{(Tx7@e3RMFjIWp+X5!N%7?(mjv2U3nJV*J~km
z{Lv3{E59u7L)Luv46Wr4^!+{=xbuLo?WMw(n-}RWJ<s)`BI3Kc)~tfQX4`GnJ9&z8
zesHMG59ph@DtnHT<ua)=Tu*=Ox5{EIy3=IX7j1B&kQ-=ZgiLpGp-$h?jX?9`pZs{m
z{CD2RxolI)92VOinzP@`E`O(`yk{nV?)yC&{V}EHx}Sdv_!axqKELd6JFGPIO@>9y
z%LOm@_ABNpN6zm2Ci=P{_ldUt`Rp%s=B1%uice0`@0k`WQ*`=XrqZQzcjET(8uzQ(
z#mg_VmVX_5F-yt(?E2|vCg0v+wkrE^^M3}>_x2xkrs#(NlMaKYtDnm{r-UW|Kt4ak

literal 0
HcmV?d00001


From 736f74e9212931e696e921b045246e0892e7deaa Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 23 Nov 2021 18:00:47 +0800
Subject: [PATCH 18/25] add air style

---
 .../device/pages/air_conditioner/detail/detail.vue | 30 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/subpackage/device/pages/air_conditioner/detail/detail.vue b/src/subpackage/device/pages/air_conditioner/detail/detail.vue
index 57ccce3..a9d0c9d 100644
--- a/src/subpackage/device/pages/air_conditioner/detail/detail.vue
+++ b/src/subpackage/device/pages/air_conditioner/detail/detail.vue
@@ -38,8 +38,8 @@
         <view class="acd-btn-ls">
             <view class="abl-tit">模式</view>
             <view class="abl-ls">
-                <view class="al-item" v-for="(e, i) in modelLs" :key="i" @click="operateBtn({ op: 'mode', ext: e.mode })">
-                    <view class="ai-icon">
+                <view class="al-item" hover-class="acd-hover-active" v-for="(e, i) in modelLs" :key="i" @click="operateBtn({ op: 'mode', ext: e.mode })">
+                    <view class="ai-icon" :class="[e.mode == pageInfo.mode? 'active': '']">
                         <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
                     </view>
                     <view class="ai-txt">{{ e.name || '-' }}</view>
@@ -49,8 +49,8 @@
         <view class="acd-btn-ls">
             <view class="abl-tit">风速</view>
             <view class="abl-ls">
-                <view class="al-item" v-for="(e, i) in airSpeedLs" :key="i" @click="operateBtn({ op: 'speed', ext: e.speed })">
-                    <view class="ai-icon">
+                <view class="al-item" hover-class="acd-hover-active" v-for="(e, i) in airSpeedLs" :key="i" @click="operateBtn({ op: 'speed', ext: e.speed })">
+                    <view class="ai-icon" :class="[e.speed == pageInfo.speed? 'active': '']">
                         <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
                     </view>
                     <view class="ai-txt">{{ e.name || '-' }}</view>
@@ -72,7 +72,7 @@
         <view class="acd-btn-ls">
             <view class="abl-tit">允许使用按钮</view>
             <view class="abl-ls">
-                <view class="al-item" v-for="(e, i) in allowLs" :key="i" @click="operateBtn({ op: e.op })">
+                <view class="al-item" hover-class="acd-hover-active" v-for="(e, i) in allowLs" :key="i" @click="operateBtn({ op: e.op })">
                     <view class="ai-icon">
                         <image mode="aspectFit" :src="getIconPath(e.icon)"></image>
                     </view>
@@ -232,7 +232,7 @@ export default {
         tempBtn: util.debounce(function(type){
             let { pageInfo } = this;
             let _num = pageInfo.temperature || 0;
-            _num = type == 'add' ? _num++ : type == 'reduce' ? _num-- : _num;
+            _num = type == 'add' ? ++_num : type == 'reduce' ? --_num : _num;
             this.operateReq({ data: this.getOperateData({ op: 'st', ext: _num }), isTip: false });
 
         }, 300, true),
@@ -432,17 +432,35 @@ export default {
                     &:not(:nth-child(5n)){
                         margin-right: 20upx;
                     }
+                    &.acd-hover-active{
+                        .ai-icon{
+                            &::after{
+                                position: absolute;
+                                content: '';
+                                left: 0;
+                                top: 0;
+                                right: 0;
+                                bottom: 0;
+                                background-color: rgba($color: #000000, $alpha: .3);
+                            }
+                        }
+                    }
                     .ai-icon{
+                        position: relative;
                         margin: 0 auto 14upx;
                         width: 116upx;
                         height: 116upx;
                         border-radius: 10upx;
                         background-color: #fff;
+                        overflow: hidden;
                         @include centerFlex(center);
                         >image{
                             width: 60upx;
                             height: 60upx;
                         }
+                        &.active{
+                            border: 2upx solid $themeColor;
+                        }
                     }
                     .ai-txt{
                         text-align: center;

From 10896c6dec70fa66754be30fd92787a46a7f767c Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 26 Nov 2021 14:24:47 +0800
Subject: [PATCH 19/25] add air detail verdict

---
 src/subpackage/device/pages/switch_manage/switch_manage.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index 2d35389..5c0e8e2 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -46,7 +46,7 @@
 					    <view >{{pageInfo.detailName || '-'}}</view>
 					</view>
                 </view>
-                <view class="si-detail-btn" v-if="pageInfo.isDetailBtn" @click="toDeviceDetail(e)">
+                <view class="si-detail-btn" v-if="isDetailBtn(e)" @click="toDeviceDetail(e)">
                     <text>详情</text>
                     <image mode="aspectFit" src="/subpackage/device/static/images/arrow_b2.png"></image>
                 </view>
@@ -117,6 +117,12 @@ export default {
         })
     },
     methods: {
+        isDetailBtn(e){
+            if(e&&e.toString() === "[object Object]"){
+                return e.hardware_model == 'XiaoHuiXiong'
+            }
+            return false;
+        },
         toDeviceDetail(e){
             console.warn(e);
             console.warn(this.getSwitchStatusQuery(e));
@@ -443,7 +449,7 @@ function getShowArr(key){
             openName: '开', closeName: '关', longOpenName: '长开', timingName: '定时', hardware_type: 'Light',iconNum:4
         },
         's2': {
-            id: 2, name: '空调管理', isOpen: true, isClose: true, isDetailBtn: true,
+            id: 2, name: '空调管理', isOpen: true, isClose: true, 
             openIcon: '/subpackage/device/static/images/open.png',
             closeIcon: '/subpackage/device/static/images/close.png',
             openName: '开', closeName: '关', hardware_type: 'Air',iconNum:2

From e874125352737a553fb98d2092e0140334110410 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 26 Nov 2021 14:39:49 +0800
Subject: [PATCH 20/25] vtest 1.1.12

---
 src/pages/order_list/order_list.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 87154f4..75353e2 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -163,6 +163,7 @@
         },
         computed:{
             isStoreInfo(){
+                
                 let { orderType } = this;
                 return (
                     orderType == 3  || orderType == 4  || 

From 9bf7660b9e04c2b583e8272d6403dfc75c6fb0a8 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 29 Nov 2021 16:40:49 +0800
Subject: [PATCH 21/25] fix ymcar

---
 src/pages/write_off/ym_confirm/ym_confirm.vue        |  2 +-
 src/subpackage/order/pages/ym_card/detail/detail.vue | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index ffc8fbb..b94add8 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -81,7 +81,7 @@ export default {
                             orderInfo,
                             gates: _ls
                         });
-                        util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT');
+                        util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'rT');
                     }, 1200);
                 }else{
                     util.showNone(res.data.message || '操作失败！');
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
index 86304fd..0a3ad27 100644
--- a/src/subpackage/order/pages/ym_card/detail/detail.vue
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -24,8 +24,8 @@
                 <a-line :value="orderInfo.nickname || '-'">
                     <block slot="name">用户昵称：</block> 
                 </a-line>
-                <view class="yu-line">照片：<text @click="changeFaceImgBtn">更改照片</text></view>
-                <image class="yu-img" mode="aspectFit" :src="orderInfo.user_face"></image>
+                <view class="yu-line">照片：<text @click="changeFaceImgBtn" v-if="orderInfo.status ==1">更改照片</text></view>
+                <image class="yu-img" mode="aspectFit" :src="orderInfo.user_face"  @click="previewImg(orderInfo.user_face)"></image>
             </view>
 
             <view class="yci-box yci-buy-info"  v-if="orderInfo.status == 1 || orderInfo.status == 2 || orderInfo.status == 3">
@@ -52,6 +52,12 @@
 </template>
 
 <script>
+/*
+    InactiveCardStatus CardStatusType = iota // 待激活 0
+    ActiveCardStatus                         // 使用中 1
+    InvalidCardStatus                        // 已失效 2
+    ReturnCardStatus                         // 已退卡 3
+*/ 
 import a_line from '../../../../../components/order_list/a_line/a_line.vue';
 import s_line from '../../../components/s_line/s_line.vue';
 import p_line from '../../../components/p_line/p_line.vue';
@@ -82,6 +88,9 @@ export default {
         this.optionsQuery = options || {};
     },
     methods: {
+        previewImg(url){
+            uni.previewImage({ urls: [ url ] });
+        },
         changeFaceImgBtn(){
             uni.chooseImage({
                 count: 1,

From 6b67eb52996c04a0439a5d867e1a1c149fabc146 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 29 Nov 2021 17:01:20 +0800
Subject: [PATCH 22/25] fix img preview

---
 src/pages/write_off/ym_confirm/ym_confirm.vue        | 1 +
 src/subpackage/order/pages/ym_card/detail/detail.vue | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index b94add8..de43645 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -57,6 +57,7 @@ export default {
     },
     methods: {
         previewImg(url){
+            if(!url)return
             uni.previewImage({ urls: [ url ] });
         },
         confirmBtn: util.debounce(function(){
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
index 0a3ad27..aea6fd7 100644
--- a/src/subpackage/order/pages/ym_card/detail/detail.vue
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -25,7 +25,13 @@
                     <block slot="name">用户昵称：</block> 
                 </a-line>
                 <view class="yu-line">照片：<text @click="changeFaceImgBtn" v-if="orderInfo.status ==1">更改照片</text></view>
-                <image class="yu-img" mode="aspectFit" :src="orderInfo.user_face"  @click="previewImg(orderInfo.user_face)"></image>
+                <image 
+                    class="yu-img" 
+                    mode="aspectFit" 
+                    v-if="orderInfo.user_face"
+                    :src="orderInfo.user_face"  
+                    @click="previewImg(orderInfo.user_face)"
+                ></image>
             </view>
 
             <view class="yci-box yci-buy-info"  v-if="orderInfo.status == 1 || orderInfo.status == 2 || orderInfo.status == 3">
@@ -89,6 +95,7 @@ export default {
     },
     methods: {
         previewImg(url){
+            if(!url)return
             uni.previewImage({ urls: [ url ] });
         },
         changeFaceImgBtn(){

From 135eba72d5a65b31c73c309d4c13b93fae170a7e Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 29 Nov 2021 17:49:18 +0800
Subject: [PATCH 23/25] change ym record

---
 src/subpackage/order/pages/ym_card/use_record/use_record.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/subpackage/order/pages/ym_card/use_record/use_record.vue b/src/subpackage/order/pages/ym_card/use_record/use_record.vue
index 9c60978..7cfd56f 100644
--- a/src/subpackage/order/pages/ym_card/use_record/use_record.vue
+++ b/src/subpackage/order/pages/ym_card/use_record/use_record.vue
@@ -7,8 +7,8 @@
                     <view>{{ e.stadium_name || '-' }}</view>
                 </view>
                 <view class="uh-lines">
-                    <view><text>验证方式：</text>{{ e.verify_type || '-' }}</view>
-                    <view><text>核销时间：</text>{{ e.verify_time || '-' }}</view>
+                    <view><text>验证方式：</text>{{ e.enter_desc || '-' }}</view>
+                    <view><text>核销时间：</text>{{ e.enter_time || '-' }}</view>
                     <view><text>离场时间：</text>{{ e.leave_time || '-' }}</view>
                 </view>
             </view>

From d58321adfab01100da1730467586546884619f8e Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 30 Nov 2021 15:29:18 +0800
Subject: [PATCH 24/25] vtest 1.1.13

---
 src/js/server.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/server.js b/src/js/server.js
index e5cebad..9abf488 100644
--- a/src/js/server.js
+++ b/src/js/server.js
@@ -2,6 +2,7 @@ import util from '../utils/util';
 // import { app as vm } from '../main';
 const islog = true;
 
+
 export class Server {
   request(url,data,method,header,isDefaultGet,failMsg){
     return new Promise(async (rs,rj)=>{

From e583eab868678cdf9a4676dc8909889d9836025b Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 30 Nov 2021 17:41:02 +0800
Subject: [PATCH 25/25] v1.1.13 formal

---
 src/js/api.js     | 4 ++--
 src/manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index 35148a7..06ae59b 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,8 +1,8 @@
 
 
 
-export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
-// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
+// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
diff --git a/src/manifest.json b/src/manifest.json
index 32b6894..25d192e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -54,7 +54,7 @@
 
 	},
 	"mp-weixin": { /* 微信小程序特有相关 */
-		"appid": "wx7106e84614cf0060",
+		"appid": "wxf1294b279ad1b845",
 		"setting": {
 			"urlCheck": false
 		},