Merge branch 'statistics' into dev

src/js/api.js

@@ -23,7 +23,9 @@ export const API = {
   // 20220422 收款记录
   consumeCountLs: `${ORIGIN}/admin/stadium/consumeCount/list`,  // 收款记录
   consumeCountDetailLs: `${ORIGIN}/admin/stadium/consumeCountDetail/list`,  // 收款明细列表
-  consumeCountGetScene: `${ORIGIN}/consumeRecordScene/list`,  // 收款明细列表
+  consumeCountGetScene: `${ORIGIN}/consumeRecordScene/list`,  // 场景列表
+  consumeCountStadiumList: `${ORIGIN}/admin/assistant/consume/stadium/list`,  // 店铺列表
+
 
 
   // reservationOrder: `${ORIGIN}/admin/stadium/order/list`,  // 预约订单

src/pages/collection/info/info.vue

@@ -82,7 +82,10 @@ export default {
     },
     data(){
         return {
-            optionsQuery: {},
+            optionsQuery: { 
+                // stadium_id_filter
+                // brand_id
+             },
             stadiumList: [],
             curStadium: {},
             sceneList: [],
@@ -98,8 +101,8 @@ export default {
     onReachBottom(){
         let { curStadium, optionsQuery, curScene, curDate, curType, page } = this;
         let _query = {
-                brand_id: optionsQuery.brand_id,
-                stadium_id: optionsQuery.stadium_id == 0 ? -1 : curStadium.id,
+                brand_id: optionsQuery.brand_id || '',
+                stadium_id: curStadium.val || '',
                 time_str: curDate,
                 scene: curScene.scene,
                 type: curType == 1 ? '退款' : '全部',
@@ -119,8 +122,7 @@ export default {
             this.$nextTick(_=>this.refreshList());
         },
         async initPage(options){
-            let _stadiumLs = [];
-            if(!!options.stadium_id)_stadiumLs = await this.getStoreList(options.stadium_id);
+            let _stadiumLs = await this.getStoreList(options.stadium_id_filter);
             let _sceneLs = await this.getSceneList();
             this.curDate = util.formatDate({});
             this.$nextTick(_=>this.refreshList());
@@ -131,8 +133,8 @@ export default {
             this.recordLs = [];
 
             let _query = {
-                brand_id: optionsQuery.brand_id,
-                stadium_id: optionsQuery.stadium_id == 0 ? -1 : curStadium.id,
+                brand_id: optionsQuery.brand_id || '',
+                stadium_id: curStadium.val || '',
                 time_str: curDate,
                 scene: curScene.scene,
                 type: curType == 1 ? '退款' : '全部'
@@ -171,7 +173,7 @@ export default {
                 url: API.consumeCountDetailLs,
                 data: {
                     brand_id,
-                    stadium_id: stadium_id == 0 ? -1 : stadium_id == -2 ? '' : stadium_id,
+                    stadium_id: stadium_id,
                     time_str,
                     page,
                     page_size,
@@ -193,29 +195,29 @@ export default {
             })
         },
         // 店铺列表
-        getStoreList(stadium_id = ''){
+        getStoreList(stadium_id_filter = ''){
             let { optionsQuery } = this;
             return servers.get({
-                url: API.stadiumList,
+                url: API.consumeCountStadiumList,
                 data: {
-                    brand_id: optionsQuery.brand_id,
+                    brand_id: optionsQuery.brand_id || '',
                 },
                 failMsg: '加载店铺列表失败！',
 
             })
             .then(res=>{
-                let _list = res.list || [];
-                let _all = { name: '全部', id: -2, }
-                _list.unshift(_all);
+                let _list = res || [];
                 let _cur = null;
-                if(!!stadium_id){
-                    let _fiLs = _list.filter(e=>e.id == stadium_id);
+                // 页面传参 undefined => 'undefined'
+                if(stadium_id_filter != undefined&&stadium_id_filter != 'undefined'){
+                    let _fiLs = _list.filter(e=> e.val == stadium_id_filter);
                     if(_fiLs.length)_cur = _fiLs[0];
                 }
-                if(_cur&&_cur.id){
+
+                if(_cur&&_cur.val){
                     this.curStadium = _cur;
                 }else{
-                    this.curStadium = _all;
+                    this.curStadium = _list[0] || {};
                 }
                 return this.stadiumList = _list;
             })
@@ -226,8 +228,8 @@ export default {
             return servers.get({
                 url: API.consumeCountGetScene,
                 data: {
-                    brand_id: optionsQuery.brand_id,
-                    stadium_id: optionsQuery.stadium_id == 0 ? -1 : curStadium.id,
+                    brand_id: optionsQuery.brand_id || '',
+                    stadium_id: curStadium.val || '',
                 },
                 failMsg: '加载场景列表失败！',
 

src/pages/collection/list/list.vue

@@ -20,7 +20,7 @@
                     <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                 </view>
                 <view class="ci-price">
-                    <text>￥</text>{{ e.count_type_actual_income_amount || 0 }}<text>.00</text>
+                    <text>￥</text>{{ e.count_type_actual_income_amount || 0 }}<text></text>
                 </view>
                 <view class="ci-tip">日总收入</view>
                 <view class="ci-preview">
@@ -65,7 +65,8 @@ export default {
     },
     methods: {
         toInfo(e){
-            util.routeTo(`/pages/collection/info/info?stadium_id=${e.stadium_id}&brand_id=${e.brand_id}`, 'nT')
+            let _qyStr = `stadium_id_filter=${e.stadium_id_filter}&brand_id=${e.brand_id}`
+            util.routeTo(`/pages/collection/info/info?${_qyStr}`, 'nT')
         },
         showModal(e){
             util.showModal({

src/pages/turnover/turnover.vue

@@ -79,7 +79,7 @@
                         </view>
                         <view>
                             <text class="margin">收款{{ botData.offline_income_num || '0' }}笔   </text> 
-                            （ ￥{{botData.offline_income_amount || '0.00'}} ）
+                            （ ￥{{botData.offline_income_amount || '0'}} ）
                         </view>
                         <view>
                             <text class="margin">退款{{ botData.offline_refund_num || '0' }}笔  </text> 

src/subpackage/device/pages/switch_manage/switch_manage.vue

@@ -224,7 +224,7 @@ export default {
 			if(switchInfo.hardware_type=="Light"&&status==2)_data.data.name = "set-rpio-lock"
 			
             //针对门禁没有关按钮发两条命令->开&关 20201224 后端： 直接发两条 关的那条这里填5 然后你那边不用管返回
-            if(switchInfo.hardware_type === 'AccessControl'&&status == 0)_data['delay'] = '5';
+            if(switchInfo.hardware_type === 'AccessControl'&&status == 0)_data['delay'] = '3';
 
             // 20220507 门闸 GateControl 要是 hardware_mac_addr 不为空 device_name 替换成 hardware_mac_addr
             // 另外多做一步  传多一个 "hardware_id":id 给我