# 2022-01-22

###  开源社区版（会员专业版同步修改）：
--无修改
### 0.1.1 会员专业版：
【新增】增加微信支付服务商配置，支付微信支付服务商及子商户功能。
【新增】增加根据不同下单类型，控制不同的下单送货模式的功能，如普通商品购买只需要【物流快递，同城配送】，团购秒杀只需要【同城配送，上门自提】，可后台自定义。
【新增】微信直播带货功能新增【上传图片】功能，可直接将本地图片上传至微信侧，获取cdn图片进行处理。
【更新】nuget更新组件。
【修复】修复首页商品组件图片高度被错写array的问题。
【修复】修复生成海报保存路径问题，调整开发版或者预览版小程序获取不到的二维码的报错问题。
【优化】调整订单详情商品tag未设置宽度，导致撑破容易的问题。
【修复】调整订单列表左侧图片大小，防止被遮挡。I4PP1F
【修复】修复微信自定义交易组件申请商品类目失败的问题。#I4QE17

CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js

@@ -103,6 +103,8 @@ const install = (Vue, vm) => {
     let orderList = (params, config = {}) => http.post('/Api/Order/GetOrderList', params, { custom: { methodName: 'order.getorderlist', needToken: true } });
     // 获取订单不同状态的数量
     let getOrderStatusSum = (params, config = {}) => http.post('/Api/Order/GetOrderStatusNum', params, { custom: { methodName: 'order.getorderstatusnum', needToken: true } });
+    // 获取不同类型营销下单支持的配送方式
+    let getOrderDistributionModel = (params, config = {}) => http.post('/Api/Order/GetOrderDistributionModel', params, { custom: { methodName: 'order.getOrderdistributionmodel', needToken: true } });
 
     // 售后单列表
     let afterSalesList = (params, config = {}) => http.post('/Api/Order/AftersalesList', params, { custom: { methodName: 'order.aftersaleslist', needToken: true } });
@@ -439,6 +441,7 @@ const install = (Vue, vm) => {
         orderShip,
         orderList,
         getOrderStatusSum,
+        getOrderDistributionModel,
         afterSalesList,
         afterSalesInfo,
         addAfterSales,

CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue

@@ -12,10 +12,10 @@
         </u-navbar>
         <view class="content">
             <view class="coreshop-margin-left-10 coreshop-margin-right-10 coreshop-margin-top-10">
-                <u-subsection :list="typeItems" mode="subsection" :current="typeCurrent" @change="onTypeItem" bg-color="#ffffff" active-color="#e54d42" v-if="storeSwitch == 1" style="border-radius:0;"></u-subsection>
+                <u-subsection :list="typeItems" mode="subsection" :current="typeCurrent" @change="onTypeItem" bg-color="#ffffff" active-color="#e54d42" v-if="typeItems.length > 0" style="border-radius:0;"></u-subsection>
             </view>
             <view class="content">
-                <view v-show="typeCurrent === 0 || typeCurrent === 1">
+                <view v-show="OrderDistributionModelCurrent === 'isOpenHomeDelivery' || OrderDistributionModelCurrent === 'isOpenMailing'">
                     <!-- 收货地址信息 -->
                     <view class="coreshop-margin-top-10 coreshop-margin-bottom-10 coreshop-common-view-box" v-if="userShip && userShip.id" @click="showAddressList">
                         <view class="coreshop-bg-white coreshop-card address-view">
@@ -50,7 +50,7 @@
                         </view>
                     </view>
                 </view>
-                <view v-show="typeCurrent === 2">
+                <view v-show="OrderDistributionModelCurrent === 'isOpenSelfDelivery'">
                     <!-- 门店信息 -->
                     <view class="coreshop-margin-top-10 coreshop-margin-bottom-10 coreshop-common-view-box" v-if="store && store.id" @click="goStorelist()">
                         <view class="coreshop-bg-white coreshop-card address-view">
@@ -84,7 +84,7 @@
                     </view>
                 </view>
             </view>
-            <view class='coreshop-margin-top-10 coreshop-margin-bottom-10 coreshop-common-view-box' v-if="storeSwitch == 1 && typeCurrent === 2">
+            <view class='coreshop-margin-top-10 coreshop-margin-bottom-10 coreshop-common-view-box' v-if="storeSwitch == 1 && OrderDistributionModelCurrent === 'isOpenSelfDelivery'">
                 <view class="coreshop-form-group">
                     <view class="title">姓名</view>
                     <input class='coreshop-cell-bd-input' placeholder='请输入提货人姓名' v-model="storePick.name" style="width: 100%;"></input>
@@ -253,7 +253,8 @@
 
         data() {
             return {
-                typeItems: ['快递物流', '同城配送', '门店自提'],
+                typeItems: [],
+                //typeItems: ['快递物流', '同城配送', '门店自提'],
                 typeCurrent: 0,
                 cartData: {}, // 购物车商品详情
                 products: [], // 货品信息
@@ -302,6 +303,11 @@
                 objectId: 0,//关联对象序列
                 teamId: 0,//拼团订单分组序列
                 submitStatus: false,
+                isOpenHomeDelivery: true,
+                isOpenMailing: true,
+                isOpenSelfDelivery: true,
+                OrderDistributionModels: [],
+                OrderDistributionModelCurrent: ''
             }
         },
         components: {},
@@ -309,7 +315,7 @@
             console.log(options);
             let cartIds = options.cartIds;
             if (options.orderType) {
-                this.params.orderType = options.orderType;
+                this.orderType = options.orderType;
                 this.params.type = options.orderType;
             }
             if (options.objectId) {
@@ -329,6 +335,8 @@
                     }
                 })
             }
+            // 获取不同类型营销下单支持的配送方式
+            this.getOrderDistributionModel()
             // 获取用户的默认收货地址信息
             this.userDefaultShip()
             // 获取用户的可用优惠券信息
@@ -377,11 +385,13 @@
                     this.typeCurrent = index;
                 }
                 let receiptType = 1;
-                if (this.typeCurrent == 0) {
+
+                this.OrderDistributionModelCurrent = this.OrderDistributionModels[this.typeCurrent];
+                if (this.OrderDistributionModelCurrent == 'isOpenMailing') {
                     receiptType = 1;
-                } else if (this.typeCurrent == 1) {
+                } else if (this.OrderDistributionModelCurrent == 'isOpenHomeDelivery') {
                     receiptType = 2;
-                } else if (this.typeCurrent == 2) {
+                } else if (this.OrderDistributionModelCurrent == 'isOpenSelfDelivery') {
                     receiptType = 3;
                 }
                 this.receiptType = receiptType;
@@ -397,6 +407,39 @@
                 console.log("没有收货地址时跳转");
                 this.$u.route('/pages/member/address/list/list?type=order')
             },
+            // 获取不同类型营销下单支持的配送方式
+            getOrderDistributionModel() {
+                let data = {
+                    id: this.orderType
+                };
+                this.$u.api.getOrderDistributionModel(data).then(res => {
+                    if (res.status) {
+                        //物流快递
+                        this.isOpenMailing = res.data.isOpenMailing;
+                        //同城配送
+                        this.isOpenHomeDelivery = res.data.isOpenHomeDelivery;
+                        //上门自提
+                        this.isOpenSelfDelivery = res.data.isOpenSelfDelivery;
+
+                        let newTypeItems = [];
+                        if (this.isOpenMailing) {
+                            newTypeItems.push('快递物流');
+                            this.OrderDistributionModels.push('isOpenMailing');
+                        }
+                        if (this.isOpenHomeDelivery) {
+                            newTypeItems.push('同城配送');
+                            this.OrderDistributionModels.push('isOpenHomeDelivery');
+                        }
+                        if (this.isOpenSelfDelivery) {
+                            newTypeItems.push('门店自提');
+                            this.OrderDistributionModels.push('isOpenSelfDelivery');
+                        }
+                        this.typeItems = newTypeItems;
+                        this.OrderDistributionModelCurrent = this.OrderDistributionModels[0];
+                    }
+                    console.log(res);
+                })
+            },
             // 获取用户的默认收货地址
             userDefaultShip() {
                 this.$u.api.userDefaultShip().then(res => {
@@ -585,11 +628,11 @@
             toPay() {
                 this.submitStatus = true;
                 let receiptType = 1;
-                if (this.typeCurrent == 0) {
+                if (this.OrderDistributionModelCurrent == 'isOpenMailing') {
                     receiptType = 1;
-                } else if (this.typeCurrent == 1) {
+                } else if (this.OrderDistributionModelCurrent == 'isOpenHomeDelivery') {
                     receiptType = 2;
-                } else if (this.typeCurrent == 2) {
+                } else if (this.OrderDistributionModelCurrent == 'isOpenSelfDelivery') {
                     receiptType = 3;
                 }
                 this.receiptType = receiptType;
@@ -601,7 +644,7 @@
                     receiptType: this.receiptType,
                     objectId: this.objectId,
                     teamId: this.teamId,
-                    orderType: this.params.orderType, //订单类型
+                    orderType: this.orderType, //订单类型
                     scene: this.$store.state.scene //场景值（用于确定小程序是否来源直播和视频号）
                 }