1

mer_mer_admin/.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://39.105.58.247:20800'
+#VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://47.115.34.96:20700'
 

mer_mer_admin/src/views/finance/statement/index.vue

@@ -54,6 +54,8 @@
           min-width="100"
         />
         <el-table-column prop="handlingFee" label="平台手续费" min-width="100" />
+		<el-table-column prop="packingFee" label="打包费" min-width="100" />
+		<el-table-column prop="freightFee" label="骑手配送费" min-width="100" />
         <el-table-column prop="orderReceivable" label="订单应收金额" min-width="100" />
         <el-table-column prop="payNum" label="订单应收笔数" min-width="100" />
         <el-table-column prop="orderRefundable" label="订单应退金额" min-width="120" />
@@ -209,8 +211,34 @@
                     </el-col>
                   </el-row>
                 </el-card>
+				<el-card
+				  shadow="never"
+				  :bordered="false"
+				  body-style="background-color: #F9F9F9;padding: 20px 15px;"
+				  class="mb10"
+				>
+				  <div slot="header" class="acea-row row-between-wrapper">
+				    <span>打包费</span>
+				    <div class="card_title">
+				      {{ accountDetails.packingFee >= 0 ? '' : '-' }}
+				      ￥{{ Math.abs(accountDetails.packingFee) }}
+				    </div>
+				  </div>
+				  <el-row class="item mb20">
+				    <el-col :span="13" class="name">支付打包费</el-col>
+				    <el-col :span="11" class="cost">
+				      <span class="cost_price">￥{{ accountDetails.packingFee }}</span>
+				    </el-col>
+				  </el-row>
+				 <!-- <el-row class="item">
+				    <el-col :span="13" class="name">退还打包费</el-col>
+				    <el-col :span="11" class="cost">
+				      <span class="cost_price">-￥{{ accountDetails.packingFee }}</span>
+				    </el-col>
+				  </el-row> -->
+				</el-card>
                 <el-card shadow="never" :bordered="false" body-style="background-color: #F9F9F9;padding: 20px 15px;">
-                  <div slot="header" class="acea-row row-between-wrapper">
+                 <!-- <div slot="header" class="acea-row row-between-wrapper">
                     <span>佣金</span>
                     <div class="card_title">
                       {{ accountDetails.brokerage >= 0 ? '' : '-' }}
@@ -228,7 +256,26 @@
                     <el-col :span="11" class="cost">
                       <span class="cost_price">-￥{{ accountDetails.refundBrokeragePrice }}</span>
                     </el-col>
-                  </el-row>
+                  </el-row> -->
+				  <div slot="header" class="acea-row row-between-wrapper">
+				    <span>骑手配送费</span>
+				    <div class="card_title">
+				      {{ accountDetails.freightFee >= 0 ? '' : '-' }}
+				      ￥{{ Math.abs(accountDetails.freightFee) }}
+				    </div>
+				  </div>
+				  <el-row class="item mb20">
+				    <el-col :span="13" class="name">支付配送费</el-col>
+				    <el-col :span="11" class="cost">
+				      <span class="cost_price">￥{{ accountDetails.freightFee }}</span>
+				    </el-col>
+				  </el-row>
+				 <!-- <el-row class="item">
+				    <el-col :span="13" class="name">退还佣金</el-col>
+				    <el-col :span="11" class="cost">
+				      <span class="cost_price">-￥{{ accountDetails.refundBrokeragePrice }}</span>
+				    </el-col>
+				  </el-row> -->
                 </el-card>
               </div>
             </div>

mer_mer_admin/src/views/marketing/seckill/seckillList/index.vue

@@ -57,7 +57,7 @@
       </el-tabs>
       <div class="mt5 mb20">
         <el-button size="small" @click="onEdit(0)" type="primary" v-hasPermi="['merchant:seckill:product:add']"
-          >添加秒杀商品</el-button
+          >添加活动商品</el-button
         >
         <el-button
           v-show="tableFrom.auditStatus === '3'"
@@ -371,7 +371,7 @@ export default {
     },
     //撤回审核
     handleWithdraw(row) {
-      this.$modalSure('撤回审核秒杀商品吗？').then(() => {
+      this.$modalSure('撤回审核活动商品吗？').then(() => {
         seckillProWithdrawApi(row.id).then((res) => {
           this.getList();
         });
@@ -404,7 +404,7 @@ export default {
     },
     batchDel() {
       let ids = this.multipleSelection.map((item) => item.id).toString();
-      this.$modalSure('批量删除秒杀商品吗？').then(() => {
+      this.$modalSure('批量删除活动商品吗？').then(() => {
         seckillProDelApi({ ids: ids }).then(() => {
           this.$message.success('删除成功');
           this.getList();
@@ -413,7 +413,7 @@ export default {
     },
     // 删除
     handleDelete(row) {
-      this.$modalSure('删除该秒杀商品吗？').then(() => {
+      this.$modalSure('删除该活动商品吗？').then(() => {
         seckillProDelApi({ ids: row.id }).then(() => {
           this.$message.success('删除成功');
           handleDeleteTable(this.tableData.data.length, this.tableFrom);
@@ -423,7 +423,7 @@ export default {
     },
     batchDown() {
       let ids = this.multipleSelection.map((item) => item.id).toString();
-      this.$modalSure('批量下架秒杀商品吗？').then(() => {
+      this.$modalSure('批量下架活动商品吗？').then(() => {
         seckillProDownApi({ ids: ids }).then(() => {
           this.$message.success('下架成功');
           this.getList();
@@ -431,7 +431,7 @@ export default {
       });
     },
     handleDown(row, title) {
-      this.$modalSure(`${title}该秒杀商品吗？`).then(() => {
+      this.$modalSure(`${title}该活动商品吗？`).then(() => {
         row.isShow
           ? seckillProDownApi({ ids: row.id }).then(() => {
               this.$message.success(`${title}成功`);

mer_mer_admin/src/views/order/components/orderDetail.vue

@@ -41,7 +41,7 @@
               <ul class="list">
                 <li class="item">
                   <div class="lang">用户名称：</div>
-                  <div class="value">{{ orderDatalist.nikeName }} | {{ orderDatalist.uid }}</div>
+                  <div class="value">{{ orderDatalist.nickname }} | {{ orderDatalist.uid }}</div>
                 </li>
                 <li class="item">
                   <div class="lang">用户电话：</div>
@@ -104,9 +104,13 @@
                   <div class="value">{{ orderDatalist.svipDiscountPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">支付邮费：</div>
+                  <div class="lang">支付配送费：</div>
                   <div class="value">{{ orderDatalist.payPostage }}</div>
                 </li>
+				<li class="item">
+				  <div class="lang">支付打包费：</div>
+				  <div class="value">{{ orderDatalist.packingFee }}</div>
+				</li>
                 <li class="item">
                   <div class="lang">赠送积分：</div>
                   <div class="value">{{ orderDatalist.gainIntegral }}</div>
@@ -250,10 +254,10 @@
                         <span class="ml30">{{ item.createTime }}</span>
                       </template>
 					<template v-else-if="item.deliveryType === 'takeout'">
-					  <span class="font-color">【骑手配送】</span>
-					  <span>{{ item.deliveryCarrier + '：' + item.carrierPhone }}</span>
-					  <span class="ml30">{{ item.createTime }}</span>
-					</template>						
+						<span class="font-color">【骑手配送】</span>
+						<span>{{ item.deliveryCarrier + '：' + item.carrierPhone }}</span>
+						<span class="ml30">{{ item.createTime }}</span>
+					</template>												
                       <template v-else>
                         <span class="font-color"
                           >【{{
@@ -285,6 +289,7 @@
                           @click="handleEditLogistics(item)"
                           style="line-height: 1; height: auto"
                           v-hasPermi="['merchant:order:invoice:update']"
+						  v-if="item.deliveryType === 'express'"
                           >修改配送信息
                         </a>
                         <a

mer_mer_admin/src/views/order/components/refundOrderDetail.vue

@@ -601,9 +601,13 @@
                   <div class="value">￥{{ refundInfo.orderInfoVo.svipDiscountPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">支付邮费：</div>
+                  <div class="lang">支付配送费：</div>
                   <div class="value">￥{{ refundInfo.orderInfoVo.payPostage || '0.0' }}</div>
                 </li>
+				<li class="item">
+				  <div class="lang">支付打包费：</div>
+				  <div class="value">￥{{ refundInfo.orderInfoVo.packingFee || '0.0' }}</div>
+				</li>
                 <li class="item">
                   <div class="lang">积分抵扣金额：</div>
                   <div class="value">￥{{ refundInfo.orderInfoVo.integralPrice || '0.0' }}</div>

mer_mer_admin/src/views/product/creatProduct/default.js

@@ -50,7 +50,7 @@ export const defaultObj = {
   type: 0, // 商品类型
   isAutoSubmitAudit: false, //是否自动提审
   isAutoUp: false, //是否自动上架
-  deliveryMethodList: ['1'],
+  deliveryMethodList: ['4'],//默认骑手配送
   deliveryMethod: '',
   systemFormId: null,
   refundSwitch: true,

mer_mer_admin/src/views/product/creatProduct/index.vue

@@ -415,14 +415,15 @@
           </el-form-item>
           <el-form-item label="配送方式：" v-if="formValidate.type == 0" prop="deliveryMethodList">
             <el-checkbox-group v-model="formValidate.deliveryMethodList" :disabled="isDisabled">
-              <el-checkbox label="1">骑手配送</el-checkbox>
+              <el-checkbox label="4">骑手配送</el-checkbox>
+			  <el-checkbox label="1">商家配送</el-checkbox>
               <el-checkbox label="2">到店自提</el-checkbox>
 			  <!--el-checkbox label="3">外卖配送</el-checkbox-->
             </el-checkbox-group>
             <div class="from-tips mb5">
               请先配置店铺地址之后，再开启到店自提；若店铺统一关闭到店自提功能，商品配送方式选中到店自提，用户购买不支持到店自提！
             </div>
-            <div class="from-tips mb5 colorPrompt">注：店铺统一关闭到店自提功能，该商品必须选中「商家配送」</div>
+            <div class="from-tips mb5 colorPrompt">注：店铺统一关闭到店自提功能，该商品不能选「到店自提」</div>
           </el-form-item>
           <el-form-item label="排序：">
             <el-input-number