Merge branch 'master' of http://gogs.sxdirectpurchase.com:3000/18790411793/farming-business-shop-web

src/views/manage/order.vue

@@ -295,14 +295,12 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="实付金额(元)"
+        label="交易金额(元)"
         align="center"
         prop="paymentAmount"
         width="100"
       >
-        <template slot-scope="scope">
-          {{ scope.row.paymentAmount.toFixed(2) }}元
-        </template>
+        <template slot-scope="scope"> {{ scope.row.goodsAmount.toFixed(2) }}元 </template>
       </el-table-column>
 
       <el-table-column
@@ -560,14 +558,14 @@
         <el-descriptions-item label="付款时间">
           {{ parseTime(detailInfo.paymentTime) }}
         </el-descriptions-item>
-        <el-descriptions-item label="担保服务费">
+        <!-- <el-descriptions-item label="担保服务费">
           {{ detailInfo ? detailInfo.serviceFee : "" }}
-        </el-descriptions-item>
+        </el-descriptions-item> -->
         <el-descriptions-item label="运费(元)">
           {{ detailInfo ? detailInfo.freightFee : "" }}</el-descriptions-item
         >
-        <el-descriptions-item label="实付款(元)">
-          {{ detailInfo ? detailInfo.paymentAmount : "" }}
+        <el-descriptions-item label="交易金额(元)">
+          {{ detailInfo ? detailInfo.goodsAmount : "" }}
         </el-descriptions-item>
       </el-descriptions>
       <el-descriptions title="物流信息" column="3">

src/views/marketing/components/user-dialog.vue

@@ -108,7 +108,7 @@
             }}
           </template>
         </el-table-column>
-        <!-- <el-table-column label="距离" align="center" width="120" /> -->
+        <el-table-column label="距离" align="center" width="120" prop="distance" />
         <el-table-column label="下单记录" align="center" prop="orderRecord">
           <template slot-scope="scope">
             {{

src/views/marketing/index.vue

@@ -113,7 +113,7 @@
 
             <el-table-column label="用户昵称" align="center" prop="nick" />
             <el-table-column label="浏览记录" align="center" prop="browseRecord" />
-            <!-- <el-table-column label="距离" align="center" width="120" /> -->
+            <el-table-column label="距离" align="center" width="120" prop="distance" />
             <el-table-column label="下单记录" align="center" prop="orderRecord" />
             <el-table-column label="近期推送记录" align="center" prop="topicName" />
             <el-table-column