Merge branch 'dev'

src/js/api.js

@@ -3,6 +3,7 @@ export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
+
 export const API = {
   wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`,  //  小程序授权获取token，为空就登录
   WechatMiniApplogin: `${ORIGIN}/assistant/WechatMiniApplogin`,  //  小程序登录获取token

src/pages/order_search/order_search.vue

@@ -31,6 +31,8 @@
                     <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>
+                <ym-card v-if="orderType == 20"  :order-info="e"></ym-card>
                 </view>
             </view>
         </view>
@@ -54,6 +56,8 @@ import rent_and_sale from '../../components/order_list/rent_and_sale/rent_and_sa
 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 ym_card from '../../components/order_list/ym_card/ym_card.vue';  // 年月卡
 
 import { API } from '../../js/api';
 import { servers } from '../../js/server';
@@ -78,6 +82,8 @@ export default {
         'mall': mall,
         'device': device,
         'competition': competition,
+        'retail': retail,
+        'ym-card': ym_card,
     },
     computed: {
         ...mapState(['brandInfo']),
@@ -137,6 +143,8 @@ export default {
             if(type in deviceTypeObj())return API.hardwareOrderList; // 硬件管理
             if(type == 14)return API.appointmentOrderList; // 高光时刻
             if(type == 2)return API.shop2OrderList; // 商城订单
+            if(type == 19)return API.retailOrderList; // 零售订单
+            if(type == 20)return API.userMonthlyCardLs; // 列表用户年月卡-后台
         },
         // 是否为设备，统一接口
         isDevice(){