1

src/views/app/shop/mernage.vue

@@ -7,12 +7,17 @@
 
 				<Form ref="form" :model="form" :rules="formValidate" label-position="top">
 					<Row :gutter="32">
-						<Col span="12">
+						<Col span="8">
 						<FormItem label="拼团平台抽佣(%)" prop="commissionRateMore">
 							<Input v-model="form.commissionRateMore" autocomplete="off" :maxlength="16" />
 						</FormItem>
 						</Col>
-						<Col span="12">
+						<Col span="8">
+						<FormItem label="虚拟成团抽佣(%)" prop="virtualGroupCommissionRate">
+							<Input v-model="form.virtualGroupCommissionRate" autocomplete="off" :maxlength="16" />
+						</FormItem>
+						</Col>
+						<Col span="8">
 						<FormItem label="单独购买抽佣(%)" prop="commissionRateOne">
 							<Input v-model="form.commissionRateOne" autocomplete="off" :maxlength="16" />
 						</FormItem>

src/views/sys/order-manage/logisticsAddress.vue

@@ -6,6 +6,7 @@
 				<div>订单编号：{{orderData.numberCode}}</div>
 				<div>支付订单编号：{{'ORDER'+orderData.id}}</div>
 				<div>订单类型：{{getOrderTypeText(orderData.orderType)}}</div>
+				<div v-if="isVirtualGroupOrder(orderData)">成团方式：<span class="blue-color">虚拟成团</span></div>
 				<div>订单状态：{{getOrderStatusText(orderData)}}</div>
 				<div>创建时间：{{orderData.createTime | formatDateTime}}</div>
 				<div v-if="orderData.payTime">支付时间：{{orderData.payTime | formatDateTime}}</div>
@@ -57,7 +58,7 @@
 					<div style="flex:1;color:#ff6f2c;font-weight:700;">锦鲤免单</div>
 					<div class="price" style="color:#ff6f2c;font-weight:700;">¥{{orderData.freeAmount}}</div>
 				</div>
-				<div class="box" v-if="orderData.userCoupon.length > 0">
+				<div class="box" v-if="orderData.userCoupon && orderData.userCoupon.length > 0">
 					<div style="flex:1;color:#ff6f2c;font-weight:700;">优惠券</div>
 					<div class="price" style="color:#ff6f2c;font-weight:700;">¥{{orderData.userCoupon[0].discountAmount}}</div>
 				</div>
@@ -66,8 +67,8 @@
 					<div class="price">-¥{{orderData.userCouponNum}}</div>
 				</div> -->
 				<div class="zong">{{orderData.status == 0 ? '待支付' : '实付'}}：<span style="color:#11cd6e;">¥{{orderData.totalAmount}}</span></div>
-				<div v-if="orderData.chouyong" class="zong">平台服务费：<span class="blue-color">¥{{(orderData.chouyong).toFixed(2)}}</span> </div>
+				<div v-if="orderData.chouyong != null" class="zong">平台服务费：<span class="blue-color">¥{{formatMoney(orderData.chouyong)}}</span> <span class="blue-color">（{{getCommissionRateLabel(orderData)}} {{formatMoney(orderData.appliedCommissionRate)}}%）</span></div>
-				<div v-if="orderData.yujishouru" class="zong">商家预计收入：<span class="blue-color">¥{{(orderData.yujishouru).toFixed(2)}}</span> </div>
+				<div v-if="orderData.yujishouru != null" class="zong">商家预计收入：<span class="blue-color">¥{{formatMoney(orderData.yujishouru)}}</span> </div>
 			</div>
 			<div class="waiceng" style="width: 29%;background: #eee;padding: 0;">
 				<div style="background: #fff;padding: 10px;margin-bottom: 10px;border-radius: 10px;">
@@ -179,7 +180,8 @@
 				orderData: {
 					deliveryInfo: {},
 					goodsList: [],
-					mallRefundRecord: []
+					mallRefundRecord: [],
+					userCoupon: []
 				},
 				returnFormData:{},
 				refundReason: "",
@@ -231,14 +233,11 @@
 							this.orderData.mallRefundRecord = [sourceData];
 						}
 						//商家预计收入的计算
-						let price = (this.orderData.goodsAmount || 0) + (this.orderData.packageFee || 0)
+						let price = this.toAmount(this.orderData.goodsAmount) + this.toAmount(this.orderData.packageFee)
-						if(this.orderData.orderType == 1){
+						let commissionRate = this.getCommissionRate(this.orderData, shopTakeaway)
-							this.orderData.chouyong = price/100 * (shopTakeaway.commissionRateOne || 0)
+						this.orderData.appliedCommissionRate = commissionRate
-							this.orderData.yujishouru = price - this.orderData.chouyong
+						this.orderData.chouyong = price / 100 * commissionRate
-						}else{
+						this.orderData.yujishouru = price - this.orderData.chouyong
-							this.orderData.chouyong = price/100 * (shopTakeaway.commissionRateMore || 0)
-							this.orderData.yujishouru = price - this.orderData.chouyong
-						}
 					}
 				});
 			
@@ -247,11 +246,13 @@
 				return Object.assign({
 					deliveryInfo: {},
 					goodsList: [],
-					mallRefundRecord: []
+					mallRefundRecord: [],
+					userCoupon: []
 				}, data || {}, {
 					deliveryInfo: (data && data.deliveryInfo) || {},
 					goodsList: (data && data.goodsList) || [],
-					mallRefundRecord: (data && data.mallRefundRecord) || []
+					mallRefundRecord: (data && data.mallRefundRecord) || [],
+					userCoupon: (data && data.userCoupon) || []
 				});
 			},
 			getCurrentRefundRecord() {
@@ -351,6 +352,34 @@
 			canAdminRefundOrder() {
 				return this.orderData.status != 0 && this.orderData.status != 6 && this.orderData.status != 8 && this.orderData.status != 12;
 			},
+			toAmount(value) {
+				const num = Number(value);
+				return isNaN(num) ? 0 : num;
+			},
+			formatMoney(value) {
+				return this.toAmount(value).toFixed(2);
+			},
+			isVirtualGroupOrder(item) {
+				return !!item && item.isVirtualGroup == 1;
+			},
+			getCommissionRate(order, shopTakeaway) {
+				const takeaway = shopTakeaway || {};
+				if (order && order.orderType == 1) {
+					return this.toAmount(takeaway.commissionRateOne);
+				}
+				if (this.isVirtualGroupOrder(order)) {
+					const virtualRate = takeaway.virtualGroupCommissionRate;
+					return virtualRate !== undefined && virtualRate !== null && virtualRate !== ""
+						? this.toAmount(virtualRate)
+						: this.toAmount(takeaway.commissionRateMore);
+				}
+				return this.toAmount(takeaway.commissionRateMore);
+			},
+			getCommissionRateLabel(order) {
+				if (order && order.orderType == 1) return "单独购买抽佣比例";
+				if (this.isVirtualGroupOrder(order)) return "虚拟成团抽佣比例";
+				return "拼团抽佣比例";
+			},
 			formatSpecs(data) {
 				if (data == null || data === "") return "";
 				let str = typeof data === "object" ? JSON.stringify(data) : String(data);

src/views/sys/setting-manage/settingManage.vue

@@ -119,6 +119,16 @@
                     关闭后，仅保留学生证认证，便于上架审核通过后降低用户进入门槛。
                   </div>
                 </FormItem>
+                <FormItem label="i/e上架审核">
+                  <i-switch v-model="audit.ieListingAuditEnabled">
+                    <span slot="open">开</span>
+                    <span slot="close">关</span>
+                  </i-switch>
+                  <div style="color: #999; margin-top: 8px; line-height: 22px;">
+                    开启后，小程序首页点击 i/e 星球会进入我的个人空间审核页；
+                    关闭后保持原 i/e 星球首页入口。
+                  </div>
+                </FormItem>
                 <FormItem>
                   <Button
                     type="primary"
@@ -320,6 +330,7 @@ export default {
       },
       audit: {
         realNameAuditEnabled: true,
+        ieListingAuditEnabled: false,
       },
       emailValidate: {
         // 表单验证规则
@@ -393,6 +404,7 @@ export default {
         this.loading = false;
         if (res.result) {
           this.audit.realNameAuditEnabled = res.result.realNameAuditEnabled !== false;
+          this.audit.ieListingAuditEnabled = res.result.ieListingAuditEnabled === true;
         }
       });
     },
@@ -457,6 +469,7 @@ export default {
       this.saveLoading = true;
       saveIeAuditSetting({
         realNameAuditEnabled: this.audit.realNameAuditEnabled,
+        ieListingAuditEnabled: this.audit.ieListingAuditEnabled,
       }).then((res) => {
         this.saveLoading = false;
         if (res.success) {