Merge branch 'writeoff' into all

src/js/api.js

@@ -102,6 +102,15 @@ API['writeOff'] = {
   assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`,  // 商家助手-核销查询-核销
   userMonthlyCardVerify: `${ORIGIN}/admin/userMonthlyCard/verify`,  // 年月卡核销-后台
   userMonthlyCardOpenGate: `${ORIGIN}/admin/userMonthlyCard/openGate`,  // 年月卡开门-后台
+
+  // 20211228 新增商城核销
+  shop2WriteoffList: `${ORIGIN}/admin/assistant/shop2/writeoffList`,  // 商城订单核销 - 列表
+  shop2WriteoffGet: `${ORIGIN}/admin/assistant/shop2/writeoffGet`,  // 商城订单核销 - 获取订单信息
+  shop2WriteoffSet: `${ORIGIN}/admin/assistant/shop2/writeoffSet`,  // 商城订单核销 - 确认核销
+  timingNumber: `${ORIGIN}/stadium/person/timing/number`,  // 现场人数
+  setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`,  // 商家助手散客人数校正
+
+  
 }
 
 export default { ORIGIN, API };

src/js/once_name.js

@@ -4,9 +4,15 @@
 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 const WRITE_OFF_MALL_ORDER_INFO = 'mall_order_info';  // 商城订单核销
+export const WRITE_OFF_MALL_ORDER_SUCCESS = 'mall_order_success';  // 商城订单核销成功！
+
+
 
 export default {
     WRITE_OFF_STORE_INFO,
     WRITE_OFF_ORDER_INFO,
-    WRITE_OFF_YM_ORDER_INFO
+    WRITE_OFF_YM_ORDER_INFO,
+    WRITE_OFF_MALL_ORDER_INFO,
+    WRITE_OFF_MALL_ORDER_SUCCESS
 }

src/pages.json

@@ -134,6 +134,36 @@
 			}
 		},
 		{
+			"path": "pages/write_off/mall/success/success",
+			"style": {
+				"navigationBarTitleText": "核销订单"
+			}
+		},
+		{
+			"path": "pages/write_off/mall/confirm/confirm",
+			"style": {
+				"navigationBarTitleText": "核销订单"
+			}
+		},
+		{
+			"path": "pages/write_off/mall/list/list",
+			"style": {
+				"navigationBarTitleText": "商城订单核销"
+			}
+		},
+		{
+			"path": "pages/write_off/number_of_people/number_of_people",
+			"style": {
+				"navigationBarTitleText": "查询"
+			}
+		},
+		{
+			"path": "pages/write_off/menu/menu",
+			"style": {
+				"navigationBarTitleText": "核销订单"
+			}
+		},
+		{
 			"path": "pages/write_off/ym_card_gated/ym_card_gated",
 			"style": {
 				"navigationBarTitleText": "核销订单"

src/pages/index/index.vue

@@ -104,7 +104,7 @@
 		{
 			id: 4,
 			name: '核销查询',
-			path: '/pages/write_off/search_result/search_result',
+			path: '/pages/write_off/menu/menu',
 			serverKey: 1008  // 后端对应权限编号
 		},
 		{

src/pages/write_off/mall/confirm/confirm.vue

@@ -0,0 +1,284 @@
+<template>
+    <view class="mall-ls-confirm">
+        <!-- 20211228 pm 说写死 -->
+        <view class="mlc-status">{{ '待发货' }}</view>
+        <view class="mlc-main">
+            <view class="mm-top mm-box">
+                <view class="mt-line">
+                    <view>下单时间</view>
+                    <view>{{ orderInfo.success_time || '-' }}</view>
+                </view>
+                <view class="mt-line">
+                    <view>订单编号</view>
+                    <view>{{ orderInfo.order_no || '-' }}</view>
+                    <view @click="copyBtn(orderInfo.order_no || '-')">复制</view>
+                </view>
+            </view>
+            <view class="mm-user-info mm-box">
+                <view class="mm-tit">收货人信息</view>
+                <view class="mui-info">
+                    <view class="mi-line">配送方式：{{ sendMethod }}</view>
+                    <view class="mi-line">{{ pickupInfo.name || '-' }} {{ pickupInfo.phone || '-' }}</view>
+                    <view class="mi-line">{{ pickupInfo.store_name || '-' }}</view>
+                    <view class="mi-addr">{{ pickupInfo.store_addr || '-' }}</view>
+                </view>
+                <view class="mui-code">取货码：{{ pickupInfo.gcode || '-' }}</view>
+            </view>
+            <view class="mm-goods" v-if="goodsLs.length">
+                <view class="mm-tit">商品信息</view>
+                <view class="mg-ls">
+                    <view class="ml-item" v-for="(e, i) in goodsLs" :key="i">
+                        <image mode="aspectFill" :src="e.product_imgs || ''"></image>
+                        <view class="mi-info">
+                            <view class="mi-name">{{ e.product_name || '-' }}</view>
+                            <view class="mi-spec">
+                                <view>{{ getSpecTxt(e) }}</view>
+                                <view>×{{ e.product_nums || 0 }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="mlc-fixd-btn" @click="confirmBtn">确认核销</view>
+    </view>
+</template>
+
+<script>
+import util from '../../../../utils/util';
+import { API } from '../../../../js/api';
+import { servers } from '../../../../js/server';
+import {  WRITE_OFF_MALL_ORDER_INFO, WRITE_OFF_MALL_ORDER_SUCCESS } from '../../../../js/once_name';
+import { mapState } from 'vuex';
+export default {
+    computed: {
+        goodsLs(){
+            let { orderInfo } = this;
+            if(!orderInfo || !orderInfo.product_order_goods || !orderInfo.product_order_goods.length)return [];
+            return orderInfo.product_order_goods || [];
+        },
+        setStatusTxt() {
+            let { orderInfo } = this;
+            if(!orderInfo || orderInfo.pay_status == undefined)return '-';
+			// 0待付款  1待发货  2待收货  3待评价  4交易完成  5订单关闭  6退款中  7退款完成  8退款失败
+			let statusArr = ['待付款', '待发货', '待收货', '交易完成', '交易完成', '订单关闭', '退款中', '退款完成', '退款关闭'];
+			return statusArr[orderInfo.pay_status] || '-';
+		},
+        sendMethod(){
+            let { orderInfo } = this;
+            if(!orderInfo)return '-';
+            if(orderInfo.product_order_self_pickup == 1)return '自提';
+            if(orderInfo.product_order_self_pickup == 0)return '快递';
+            return '-'
+        },
+        pickupInfo(){
+            let { orderInfo } = this;
+            if(!orderInfo || !orderInfo.product_order_self_pickup_info)return {};
+            return orderInfo.product_order_self_pickup_info
+        },
+    },
+    data(){
+        return {
+            orderInfo: {
+                product_order_self_pickup_info: {}
+            }
+        }
+    },
+    onLoad(options){
+        console.warn(options)
+        util.$_once(WRITE_OFF_MALL_ORDER_INFO, data => {
+            console.warn(data)
+            this.orderInfo = data || { };
+        })
+    },
+    methods: {
+        confirmBtn: util.debounce(function(){
+            let { orderInfo, pickupInfo } = this;
+            util.showLoad();
+            servers.post({
+                url: API.writeOff.shop2WriteoffSet,
+                data: {
+                    vcode: pickupInfo.gcode,
+                    brand_id: orderInfo.brand_id,
+                },
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){ 
+                    let _ls = res.data.data || [];
+                    util.$_emit(WRITE_OFF_MALL_ORDER_SUCCESS, _ls);
+                    util.routeTo(`/pages/write_off/mall/success/success`, 'rT')
+                }else{
+                    util.showNone(res.data.message || '操作失败！')
+                }
+            })
+            .catch(util.hideLoad)
+        }, 200, true),
+        copyBtn(data){
+            uni.setClipboardData({ data });
+        },
+        getSpecTxt(e){
+			if(
+                e.product_spec_multi == 1&&
+                e.product_spec_multi_info&&
+                e.product_spec_multi_info.spec_info&&
+                e.product_spec_multi_info.spec_info.length){
+                    let specStr = (e.product_spec_multi_info.spec_info).join("；")
+                    return specStr;
+			}
+			return '-';
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .mall-ls-confirm{
+        padding-bottom: 132upx;
+        padding-bottom: calc( 132upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 132upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+    }
+    .mlc-status{
+        padding: 0 44upx;
+        height: 106upx;
+        line-height: 106upx;
+        font-size: 36upx;
+        color: #fff;
+        font-weight: 500;
+        background-color: $themeColor;
+    }
+    .mlc-main{
+        padding: 24upx;
+        .mm-box{
+            margin-bottom: 24upx;
+            padding: 30upx 28upx;
+            background-color: #fff;
+            border-radius: 10upx;
+        }
+        .mm-tit{
+            padding-bottom: 20upx;
+            line-height: 44upx;
+            font-weight: 500;
+            font-size: 28upx;
+            color: #333;
+            border-bottom: 2upx solid #F2F2F7;
+        }
+        .mm-top{
+            .mt-line{
+                @include centerFlex(flex-start);
+                >view{
+                    font-size: 28upx;
+                    line-height: 60upx;
+                    color: #333;
+                    &:first-child{
+                        margin-right: 60upx;
+                        flex-shrink: 0;
+                        flex-grow: 0;
+                        color: #9A9A9D;
+                    }
+                    &:nth-child(2){
+                        @include textHide(1);
+                    }
+                    &:nth-child(3){
+                        margin-left: 30upx;
+                        flex-shrink: 0;
+                        color: $themeColor;
+                    }
+                }
+            }
+        }
+        .mm-user-info{
+            .mui-info{
+                padding: 20upx 0;
+                border-bottom: 2upx solid #F2F2F7;
+                .mi-line{
+                    margin-bottom: 14upx;
+                    font-size: 28upx;
+                    line-height: 40upx;
+                    color: #333;
+                    @include textHide(1);
+                }
+                .mi-addr{
+                    font-size: 28upx;
+                    line-height: 40upx;
+                    color: #9C9C9F;
+                }
+            }
+            .mui-code{
+                padding-top: 30upx;
+                font-weight: 500;
+                font-size: 32upx;
+                color: #333;
+            }
+        }
+        .mm-goods{
+            padding: 22upx 28upx 0;
+            border-radius: 10upx;
+            background-color: #fff;
+            .mg-ls{
+                .ml-item{
+                    padding: 30upx 0upx;
+                    @include centerFlex(space-between);
+                    &:not(:last-child){
+                        border-bottom: 2upx solid #F2F2F7;
+                    }
+                    >image{
+                        flex-shrink: 0;
+                        margin-right: 20upx;
+                        width: 180upx;
+                        height: 180upx;
+                        border-radius: 10upx;
+                    }
+                    .mi-info{
+                        flex-grow: 1;
+                        .mi-name{
+                            width: 330upx;
+                            margin-bottom: 12upx;
+                            font-size: 28upx;
+                            line-height: 40upx;
+                            min-height: 80upx;
+                            color: #333;
+                            @include textHide(2);
+                        }
+                        .mi-spec{
+                            width: 100%;
+                            @include centerFlex(space-between);
+                            >view{
+                                font-size: 24upx;
+                                line-height: 34upx;
+                                color: #9A9A9D;
+                                @include textHide(1);
+                                &:first-child{
+                                    flex-grow: 1;
+                                }   
+                                &+view{
+                                    flex-shrink: 0;
+                                    margin-left: 20upx;
+                                    max-width: 30%;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .mlc-fixd-btn{
+        position: fixed;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 10upx;
+        bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        width: 622upx;
+        height: 112upx;
+        line-height: 112upx;
+        text-align: center;
+        font-size: 32upx;
+        border-radius: 10upx;
+        color: #fff;
+        background-color: $themeColor;
+    }
+</style>

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

@@ -0,0 +1,156 @@
+<template>
+    <view class="mall-order-ls">
+        <view class="mol-date">
+            <view class="md-txt">核销日期</view>
+            <view class="md-picker">
+                <picker>
+                    <view>
+                        <input :value="'2019-05-17'" />
+                        <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
+                    </view>
+                </picker>
+            </view>
+            <view class="md-txt">至</view>
+            <view class="md-picker">
+                <picker>
+                    <view>
+                        <input :value="'2019-05-17'" />
+                        <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
+                    </view>
+                </picker>
+            </view>
+        </view>
+        <view class="mol-list">
+            <view class="ml-item" v-for="i in 5" :key="i">
+                <view class="mi-order-no">
+                    <view class="mon-num">订单编号：20195171564566</view>
+                    <view class="mon-btn">复制</view>
+                </view>
+                <view class="mi-info">
+                    <view class="mi-line">取货码：200801108978</view>
+                    <view class="mi-line">取货人：梁小姐 18316553857</view>
+                    <view class="mi-line">商品：运动服（M)x1 ；运动服（M)x2</view>
+                    <view class="mi-line">核验人：李小雨</view>
+                    <view class="mi-line">取货时间：2019-05-17 11:12:58</view>
+                </view>
+            </view>
+        </view>
+        
+        <view class="mol-fixed">
+            <view @click="toOperate">核销订单</view>
+        </view>
+    </view>
+</template>
+
+<script>
+import util from '../../../../utils/util';
+export default {
+    methods: {
+        toOperate(){
+            util.routeTo(`/pages/write_off/operate/operate`, 'nT');
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .mall-order-ls{
+        padding-bottom: 122upx;
+        padding-bottom: calc( 122upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 122upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+    }
+    .mol-date{
+        padding: 0 28upx;
+        height: 148upx;
+        background-color: #fff;
+        @include centerFlex(flex-start);
+        .md-txt{
+            font-size: 32upx;
+            line-height: 44upx;
+            color: #1a1a1a;
+        }
+        .md-picker{
+            margin: 0 20upx;
+            width: 226upx;
+            border: 2upx solid #D8D8D8;
+            border-radius: 10upx;
+            overflow: hidden;
+            view{
+                padding: 0 10upx;
+                height: 88upx;
+                background-color: #f2f2f7;
+                @include centerFlex(space-between);
+                >input{
+                    flex-grow: 1;
+                    height: 100%;
+                    font-size: 28upx;
+                    color: #1a1a1a;
+                }
+                >image{
+                    margin-left: 10upx;
+                    flex-shrink: 0;
+                    width: 22upx;
+                    height: 22upx;
+                }
+            }
+        }
+    }
+
+    .mol-list{
+        padding: 24upx;
+        .ml-item{
+            margin-bottom: 24upx;
+            padding: 0 24upx;
+            background-color: #fff;
+            .mi-order-no{
+                padding: 30upx 4upx;
+                border-bottom: 2upx solid #f2f2f7;
+                @include centerFlex(space-between);
+                .mon-num{
+                    font-size: 28upx;
+                    font-weight: 500;
+                    line-height: 40upx;
+                    color: #1a1a1a;
+                }
+                .mon-btn{
+                    flex-shrink: 0;
+                    margin-left: 20upx;
+                    font-size: 28upx;
+                    line-height: 40upx;
+                    color: $themeColor;
+
+                }
+            }
+            .mi-info{
+                padding: 30upx 4upx;
+                .mi-line{
+                    font-size: 28upx;
+                    line-height: 52upx;
+                    color: #9C9C9F;
+                    @include textHide(1);
+                }
+            }
+        }
+    }
+
+    .mol-fixed{
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        background-color: #fff;
+        padding: 10upx 40upx;
+        padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        >view{
+            height: 112upx;
+            line-height: 112upx;
+            text-align: center;
+            font-size: 32upx;
+            color: #fff;
+            background-color: $themeColor;
+            border-radius: 10upx;
+        }
+    }
+</style>

src/pages/write_off/mall/success/success.vue

@@ -0,0 +1,150 @@
+<template>
+    <view class="confirm-success">
+        <view class="cs-tip">
+            <image mode="aspectFit" src="/static/images/icon/success_tip.png"></image>
+            <view>核销成功</view>
+        </view>
+        <view class="cs-goods">
+            <view class="cg-tit">请将以下商品取给客户</view>
+            <view class="mm-goods">
+                <view class="mm-tit">商品信息</view>
+                <view class="mg-ls">
+                    <view class="ml-item" v-for="(e, i) in orderList" :key="i">
+                        <image mode="aspectFill" :src="e.imgs || ''"></image>
+                        <view class="mi-info">
+                            <view class="mi-name">{{ e.name || '-' }}</view>
+                            <view class="mi-spec">
+                                <view>{{ e.spec || '-' }}</view>
+                                <view>×{{ e.nums || 0 }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="mlc-fixd-btn" @click="backBtn">返回继续核销</view>
+    </view>
+</template>
+
+<script>
+import { WRITE_OFF_MALL_ORDER_SUCCESS } from '../../../../js/once_name'
+import util from '../../../../utils/util'
+export default {
+    data(){
+        return {
+            orderList: []
+        }
+    },
+    onLoad(options){
+        util.$_once(WRITE_OFF_MALL_ORDER_SUCCESS, list=>{
+            this.orderList = list || [];
+        })
+    },
+    methods: {
+        backBtn(){
+            util.routeTo();
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .confirm-success{
+        padding-bottom: 132upx;
+        padding-bottom: calc( 132upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 132upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+    }
+    .cs-tip{
+        padding: 84upx 0upx 104upx;
+        >image{
+            display: block;
+            margin: 0 auto 46upx;
+            width: 100upx;
+            height: 100upx;
+        }
+        >view{
+            text-align: center;
+            line-height: 66upx;
+            font-size: 48upx;
+            font-weight: 500;
+            color: #333;
+        }
+    }
+    .cs-goods{
+        padding: 0 24upx;
+        .cg-tit{
+            margin-bottom: 20upx;
+            font-weight: 500;
+            font-size: 32upx;
+            line-height: 44upx;
+            color: #1a1a1a;
+        }
+        .mm-goods{
+            padding: 22upx 28upx 0;
+            border-radius: 10upx;
+            background-color: #fff;
+            .mg-ls{
+                .ml-item{
+                    padding: 30upx 0upx;
+                    @include centerFlex(space-between);
+                    &:not(:last-child){
+                        border-bottom: 2upx solid #F2F2F7;
+                    }
+                    >image{
+                        flex-shrink: 0;
+                        margin-right: 20upx;
+                        width: 180upx;
+                        height: 180upx;
+                        border-radius: 10upx;
+                    }
+                    .mi-info{
+                        flex-grow: 1;
+                        .mi-name{
+                            width: 330upx;
+                            margin-bottom: 12upx;
+                            font-size: 28upx;
+                            line-height: 40upx;
+                            color: #333;
+                            @include textHide(2);
+                        }
+                        .mi-spec{
+                            width: 100%;
+                            @include centerFlex(space-between);
+                            >view{
+                                font-size: 24upx;
+                                line-height: 34upx;
+                                color: #9A9A9D;
+                                @include textHide(1);
+                                &:first-child{
+                                    flex-grow: 1;
+                                }   
+                                &+view{
+                                    flex-shrink: 0;
+                                    margin-left: 20upx;
+                                    max-width: 30%;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .mlc-fixd-btn{
+        position: fixed;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 10upx;
+        bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        width: 622upx;
+        height: 112upx;
+        line-height: 112upx;
+        text-align: center;
+        font-size: 32upx;
+        border-radius: 10upx;
+        color: #fff;
+        background-color: $themeColor;
+    }
+</style>

src/pages/write_off/menu/menu.vue

@@ -0,0 +1,108 @@
+<template>
+    <view class="write-off-menu">
+        <view class="wom-section">
+            <view class="ws-tit">场地订单核销</view>
+            <view class="ws-ls">
+                <view class="wl-item" @click="toOperate('site')">
+                    <image mode="aspectFit" src="/static/images/write_off/site.png"></image>
+                    <view>场地订单核销</view>
+                </view>
+                <view class="wl-item" @click="toSiteList">
+                    <image mode="aspectFit" src="/static/images/write_off/order.png"></image>
+                    <view>场地订单核销记录</view>
+                </view>
+            </view>
+        </view>
+        <view class="wom-section">
+            <view class="ws-tit">商城订单核销</view>
+            <view class="ws-ls">
+                <view class="wl-item" @click="toOperate('mall')">
+                    <image mode="aspectFit" src="/static/images/write_off/mall.png"></image>
+                    <view>商城订单核销</view>
+                </view>
+                <view class="wl-item" @click="toMallLs">
+                    <image mode="aspectFit" src="/static/images/write_off/order.png"></image>
+                    <view>商城订单核销记录</view>
+                </view>
+            </view>
+        </view>
+        <view class="wom-section">
+            <view class="ws-tit">现场散客人数</view>
+            <view class="ws-ls">
+                <view class="wl-item" @click="toPeopleNum">
+                    <image mode="aspectFit" src="/static/images/write_off/people.png"></image>
+                    <view>现场散客人数查询</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import util from '../../../utils/util';
+import { WRITE_OFF_STORE_NAME, WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
+import { API } from '../../../js/api';
+import { servers } from '../../../js/server';
+export default {
+    methods: {
+        toPeopleNum(){
+            util.routeTo(`/pages/write_off/number_of_people/number_of_people`, 'nT');
+        },
+        toOperate(type){
+            util.$_emit(WRITE_OFF_STORE_NAME, null);
+            util.routeTo(`/pages/write_off/operate/operate?type=${type}`, 'nT');
+        },
+        toSiteList(){
+            util.routeTo(`/pages/write_off/search_result/search_result`, 'nT');
+        },
+        toMallLs(){
+            util.routeTo(`/pages/write_off/mall/list/list`, 'nT');
+        },
+        
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    .write-off-menu{
+        padding: 60upx 68upx 0upx;
+        .wom-section{
+            margin-bottom: 30upx;
+            .ws-tit{
+                margin-bottom: 20upx;
+                font-size: 32upx;
+                font-weight: 500;
+                line-height: 44upx;
+                color: #1a1a1a;
+            }
+            .ws-ls{
+                @include centerFlex(space-between);
+                flex-wrap: wrap;
+                .wl-item{
+                    padding-top: 58upx;
+                    margin-bottom: 32upx;
+                    width: 288upx;
+                    height: 220upx;
+                    border-radius: 10upx;
+                    background-color: #fff;
+                    >image{
+                        margin: 0 auto 22upx;
+                        display: block;
+                        width: 60upx;
+                        height: 60upx;
+                    }
+                    >view{
+                        text-align: center;
+                        line-height: 40upx;
+                        font-size: 28upx;
+                        color: #9c9c9f;
+                        @include textHide(1);
+                    }
+
+                }
+            }
+
+        }
+    }
+</style>

src/pages/write_off/number_of_people/number_of_people.vue

@@ -0,0 +1,362 @@
+<template>
+    <view class="number-of-people">
+        <view class="nop-store-name">
+            <picker :range="stadiumList" range-key="name" @change="stadiumChange">
+                <view class="nsn-frame">
+                    <input placeholder="请选择店铺" :value="curStadium.name" disabled />
+                    <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
+                </view>
+            </picker>
+        </view>
+        <view class="nop-main">
+            <view class="nm-date">日期：{{ dateStr || '-' }}</view>
+            <view class="nm-tit">现场散客人数</view>
+            <view class="nm-num">
+                <image mode="aspectFit" src="/static/images/countdown_bg.png"></image>
+                <view class="nn-txt-num">{{peopleInfo.present_person_number || 0}}</view>
+            </view>
+            <view class="nm-btn" @click="isChangeNum = true">修改人数</view>
+            <view class="nm-tip">
+                <text>温馨提示：\n\r修改现场人数可能会影    响现场灯光开关，请谨慎操作！ 如后台有开启散客开关灯功能的，则散客人数达到阶梯最低X人时，对应灯光会自动开灯;少于X人的已开启的灯会自动关闭。</text>
+            </view>
+        </view>
+        <view class="ox-dark-mask" v-if="isChangeNum">
+            <view class="nop-modifies-modal">
+                <image class="nmm-close" @click="isChangeNum = false" src="/static/images/icon/x_close.png"></image>
+                <view class="nmm-tit">修改现场散客人数</view>
+                <view class="nmm-info">
+                    <view class="ni-num">当前现场散客人数为：{{peopleInfo.present_person_number || 0}}</view>
+                    <view class="ni-ipt">
+                        <input placeholder="请输入散客人数" v-model="changeNum" type="number" />
+                    </view>
+                    <view class="ni-tip">修改现场人数可能会影响现场灯光开关，请谨慎操作！</view>
+                </view>
+                <view class="nmm-btns">
+                    <view @click="isChangeNum = false">取消</view>
+                    <view @click="confirmChange">确认</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { API } from '../../../js/api'
+import { servers } from '../../../js/server'
+import { mapState } from 'vuex';
+import util from '../../../utils/util';
+let timer = null;
+export default {
+    computed: {
+        ...mapState([ 'brandInfo' ]),
+    },
+    data(){
+        return {
+            isChangeNum: false,
+            stadiumList: [],
+            curStadium: {
+                name: ''
+            },
+            peopleInfo: {},
+            dateStr: '-',
+            changeNum: '',
+        }
+    },
+    onLoad(options){
+        this.initStore();
+        this.dateStr = util.formatDate({ partition: 'zh' }) || '-';
+    },
+    
+    onUnload(){
+        this.clearTime();
+    },
+    methods: {
+        confirmChange: util.debounce(function(){
+            let { changeNum } = this;
+            if(isNaN(changeNum))return util.showNone('请输入正确人数！');
+            this.isChangeNum = false;
+            this.setStadiumPresentNumber(changeNum);
+        }, 200, true),
+        setStadiumPresentNumber(num){
+            let { curStadium } = this;
+            util.showLoad();
+            servers.get({
+                url: API.writeOff.setStadiumPresentNumber,
+                data: {
+                    brand_id: curStadium.curStadium,
+                    stadium_id: curStadium.id,
+                    number: +num,
+                },
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                    setTimeout(_=>{
+                        this.getUserNum({
+                            stadium_id: curStadium.id,
+                            brand_id: curStadium.brand_id
+                        })
+                        this.initInertval();
+                    }, 1200)
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+        },
+        initInertval(){
+            this.clearTime();
+            let { curStadium } = this;
+            if(!curStadium.id || !curStadium.brand_id)return;
+            timer = setInterval(_=>{
+                if(!curStadium.id || !curStadium.brand_id)return this.clearTime();
+                this.getUserNum({
+                    stadium_id: curStadium.id,
+                    brand_id: curStadium.brand_id
+                })
+            }, 3000);
+        },
+        clearTime(){
+            clearInterval(timer);
+            timer = null;
+        },
+
+        stadiumChange(e){
+            let { stadiumList } = this;
+            let _curStadium = stadiumList[e.detail.value] || {};
+            if(!_curStadium.id || !_curStadium.brand_id)return;
+            this.curStadium = _curStadium;
+            this.getUserNum({
+                stadium_id: _curStadium.id,
+                brand_id: _curStadium.brand_id
+            })
+            this.initInertval();
+        },
+        async initStore(){
+            let { brandInfo } = this;
+            try{
+                util.showLoad();
+                let _storeList = await this.getStoreList({ brand_id: brandInfo.brand.id || '' });
+                if(!_storeList || !_storeList.length)return util.showNone('没有店铺信息');
+                this.stadiumList = _storeList || [];
+                let _curStadium = _storeList[0] || {};
+                this.curStadium = _curStadium;
+                this.initInertval();
+                this.getUserNum({
+                    stadium_id: _curStadium.id,
+                    brand_id: _curStadium.brand_id
+                })
+                util.hideLoad();
+            }catch(err){
+                util.hideLoad();
+                util.showNone('初始化店铺数据失败！');
+                console.warn('加载数据失败！', err);
+            }
+        },
+        // 获取店铺列表
+        getStoreList({
+            page=1,
+            page_size=9999,
+            brand_id='',
+        }){
+            return servers.get({
+                url: API.stadiumList,
+                data: {
+                    page,
+                    page_size,
+                    brand_id,
+                },
+                failMsg: '获取列表失败！'
+            })
+            .then(res=>{
+                let _list = res.list || [];
+                return _list
+            })
+        },
+        getUserNum({
+            stadium_id,
+            brand_id,
+        }){
+            servers.get({
+                url: API.writeOff.timingNumber,
+                data: { stadium_id, brand_id },
+                failMsg: '加载现场人数失败！'
+            })
+            .then(res=>{
+                this.peopleInfo = res
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    page{
+        background-color: #fff;
+    }
+    .number-of-people{
+        .nop-store-name{
+            height: 144upx;
+            @include centerFlex(center);
+            .nsn-frame{
+                padding: 0 20upx;
+                width: 702upx;
+                height: 92upx;
+                border-radius: 10upx;
+                background-color: #F2F2F7;
+                @include centerFlex(space-between);
+                >input{
+                    flex-grow: 1;
+                    line-height: 40upx;
+                    font-size: 28upx;
+                    color: #1A1A1A;
+                }
+                >image{
+                    flex-shrink: 0;
+                    margin-left: 20upx;
+                    width: 28upx;
+                    height: 28upx;
+                }
+            }
+        }
+        .nop-main{
+            padding: 8upx 30upx 0;
+            .nm-date{
+                margin-bottom: 86upx;
+                line-height: 44upx;
+                font-size: 32upx;
+                color: #1a1a1a;
+            }
+            .nm-tit{
+                margin-bottom: 48upx;
+                text-align: center;
+                font-size: 32upx;
+                font-weight: 500;
+            }
+            .nm-num{
+                position: relative;
+                margin: 0 auto 100upx;
+                display: block;
+                width: 400upx;
+                height: 400upx;
+                .nn-txt-num{
+                    line-height: 400upx;
+                    text-align: center;
+                    font-size: 96upx;
+                    font-weight: 500;
+                    color: $themeColor;
+                }
+                >image {
+                    position: absolute;
+                    left: 50%;
+                    top: 50%;
+                    z-index: -1;
+                    margin-left: -250upx;
+                    margin-top: -250upx;
+                    display: block;
+                    width: 500upx;
+                    height: 500upx;
+                    animation: Rotate 6s linear infinite
+                }
+                @keyframes Rotate{
+                    0% {transform: rotate(360deg);}
+                    50% {transform: rotate(180deg);}
+                    100% {transform: rotate(0deg);}
+                }
+            }
+            .nm-btn{
+                margin: 0 auto 106upx;
+                width: 618upx;
+                line-height: 112upx;
+                height: 112upx;
+                text-align: center;
+                border-radius: 10upx;
+                font-size: 38upx;
+                color: #fff;
+                background-color: $themeColor;
+            }
+            .nm-tip{
+                margin-bottom: 30upx;
+                font-size: 28upx;
+                line-height: 52upx;
+                color: #9C9C9F;
+            }
+
+        }
+        .nop-modifies-modal{
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+            padding-top: 78upx;
+            width: 620upx;
+            height: 706upx;
+            background-color: #fff;
+            border-radius: 10upx;
+            .nmm-close{
+                position: absolute;
+                right: 30upx;
+                top: 30upx;
+                width: 34upx;
+                height: 34upx;
+            }
+            .nmm-tit{
+                line-height: 44upx;
+                text-align: center;
+                font-weight: 500;
+                font-size: 32upx;
+                color: #1A1A1A;
+            }
+            .nmm-info{
+                padding: 54upx 80upx 80upx;
+                .ni-num{
+                    margin-bottom: 30upx;
+                    font-size: 28upx;
+                    line-height: 48upx;
+                    color: #1A1A1A;
+                    @include textHide(1);
+                }
+                .ni-ipt{
+                    margin-bottom: 26upx;
+                    padding: 0 20upx;
+                    height: 88upx;
+                    border-radius: 10upx;
+                    border: 2upx solid #D8D8D8;
+                    >input{
+                        flex-grow: 1;
+                        height: 100%;
+                        font-size: 28upx;
+                        color: #1A1A1A;
+                    }
+                }
+                .ni-tip{
+                    font-size: 24upx;
+                    line-height: 34upx;
+                    color: #EA5061;
+                }
+            }
+            .nmm-btns{
+                @include centerFlex(center);
+                >view{
+                    margin: 0 10upx;
+                    width: 240upx;
+                    height: 88upx;
+                    line-height: 84upx;
+                    text-align: center;
+                    font-size: 32upx;
+                    border-radius: 10upx;
+                    border: 2upx solid $themeColor;
+                    color: $themeColor;
+                    &+view{
+                        color: #fff;
+                        background-color: $themeColor;
+                    }
+                }
+            }
+
+        }
+    }
+</style>

src/pages/write_off/operate/operate.vue

@@ -23,7 +23,7 @@
 import util from '../../../utils/util';
 import { API } from '../../../js/api';
 import { servers } from '../../../js/server';
-import { WRITE_OFF_STORE_NAME, WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
+import { WRITE_OFF_STORE_NAME, WRITE_OFF_ORDER_INFO, WRITE_OFF_MALL_ORDER_INFO } from '../../../js/once_name';
 import { mapState } from 'vuex';
 export default {
     data(){
@@ -31,20 +31,62 @@ export default {
             iptCode: '',
             stadiumList: [],
             curStadium: {},
+            
+            writeOffType: '', // 新增核销类型  site(场地订单)/ mall(商城订单)
+
         }
     },
     computed: {
         ...mapState([ 'brandInfo' ]),
     },
-    onLoad(){
+    onLoad(options){
+        this.writeOffType = options.type || '';
         util.$_once(WRITE_OFF_STORE_NAME, data => {
+            console.warn(data);
+            if(!data)return this.initStore();
             this.curStadium = data.curStadium;
             this.stadiumList = data.stadiumList;
         })
-        console.warn(this.brandInfo)
+        // console.warn(this.brandInfo)
 
     },
     methods: {
+        async initStore(){
+            let { brandInfo } = this;
+            try{
+                util.showLoad();
+                let _storeList = await this.getStoreList({ brand_id: brandInfo.brand.id || '' });
+                if(!_storeList || !_storeList.length)return util.showNone('没有店铺信息');
+                this.stadiumList = _storeList || [];
+                if(_storeList.length) this.curStadium = _storeList[0];
+                util.hideLoad();
+            }catch(err){
+                util.hideLoad();
+                util.showNone('初始化店铺数据失败！');
+                console.warn('加载数据失败！', err);
+            }
+        },
+        // 获取店铺列表
+        getStoreList({
+            page=1,
+            page_size=9999,
+            brand_id='',
+        }){
+            return servers.get({
+                url: API.stadiumList,
+                data: {
+                    page,
+                    page_size,
+                    brand_id,
+                },
+                failMsg: '获取列表失败！'
+            })
+            .then(res=>{
+                let _list = res.list || [];
+                return _list
+            })
+        },
+        
         scanCodeBtn: util.debounce(function(){
             uni.scanCode({
                 onlyFromCamera: true,
@@ -66,6 +108,8 @@ export default {
             this.curStadium = stadiumList[e.detail.value];
         },
         confirmBtn: util.debounce(function(){
+            let { iptCode } = this;
+            if(!iptCode)return util.showNone('请输入核销码！');
             this.analysisOrder({ verify_code: this.iptCode });
             return 
             let _timeSta = new Date().getTime();
@@ -74,41 +118,78 @@ export default {
             return util.routeTo(`/pages/write_off/confirm_order/confirm_order`, 'nT');
         }, 300, true),
 
+
+        // 核销请求
         analysisOrder({ verify_code, decrypt_text }){
-            let { curStadium, brandInfo } = this;
-            if(!verify_code&!decrypt_text)return;
+            let { curStadium, brandInfo, writeOffType } = this;
+            if(!verify_code&&!decrypt_text)return;
+
             let _query = {
                 brand_id: brandInfo.brand.id,
                 stadium_id: curStadium.id,
             }
-            let type = '';
+            let _vType = '';
             if(!!verify_code){
-                _query['verify_code'] = verify_code;
-                type = 'verify_code';
+                _vType = 'verify_code';
+                writeOffType == 'site'&&(_query['verify_code'] = verify_code);
+                writeOffType == 'mall'&&(_query['vcode'] = verify_code);
             }
             if(!!decrypt_text){
-                type = 'decrypt_text';
-                _query['decrypt_text'] = decrypt_text;
+                _vType = 'decrypt_text';
+                writeOffType == 'site'&&(_query['decrypt_text'] = decrypt_text);
+                writeOffType == 'mall'&&(_query['vcode'] = decrypt_text);
             }
-            
+            if(writeOffType == 'site')return this.siteGet({ query: _query, vType: _vType, });
+            if(writeOffType == 'mall')return this.mallGet({ query: _query, vType: _vType, });
+        },
+        // 商城订单
+        mallGet({ query = {}, vType = '', }){
+            util.showLoad();
+            servers.get({
+                url: API.writeOff.shop2WriteoffGet,
+                data: query,
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    let _data = res.data.data || {};
+                    if(_data.has_order){
+                        util.$_emit(WRITE_OFF_MALL_ORDER_INFO, {..._data.order || {}});
+                        util.routeTo(`/pages/write_off/mall/confirm/confirm?type=${vType}`, 'nT');
+                    }else{
+                        util.routeTo(`/pages/write_off/null/null?type=${vType}`, 'nT');
+                    }
+                }else{
+                    util.showNone(res.data.message || '操作失败！')
+                    // util.routeTo(`/pages/write_off/null/null?type=${vType}`, 'nT');
+                }
+                
+            })
+            .catch(util.hideLoad)
+        },
+        // 场地/ 年月卡 
+        siteGet({ query = {}, vType = '', }){
             util.showLoad();
             servers.get({
                 url: API.writeOff.enterVerifyOrder,
-                data: _query,
+                data: query,
                 isDefaultGet: false
             })
             .then(res=>{
                 util.hideLoad();
                 if(res.data.code == 0){
                     let _data = res.data.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');
+                        util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
+                        util.routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${vType}`, 'nT');
                         return
                     }
-                    util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${type}`, 'nT');
+                    util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
+                    util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${vType}`, 'nT');
                 }else{
-                    util.routeTo(`/pages/write_off/null/null?type=${type}`, 'nT');
+                    util.routeTo(`/pages/write_off/null/null?type=${vType}`, 'nT');
                 }
                 console.log('订单查询---->', res);
             })