优惠

.env.development

@@ -3,11 +3,11 @@ ENV = 'development'
 # http://192.168.1.43:8324/admin
 # http://mer.crmeb.net/admin
 # base api
-VUE_APP_BASE_API = 'http://shop.many.lo'
+VUE_APP_BASE_API = 'http://test.tropjoin.com'
 # VUE_APP_BASE_API = 'https://api.tropjoin.com'
 
 # socket 连接地址
-VUE_APP_WS_URL = 'ws://http://shop.many.lo'
+VUE_APP_WS_URL = 'ws://http://test.tropjoin.com'
 # VUE_APP_WS_URL = 'ws://https://api.tropjoin.com'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

public/UEditor/ueditor.config.js

@@ -38,7 +38,7 @@
             'bold', 'italic', 'underline', 'strikethrough', '|', 'superscript', 'subscript', '|', 'forecolor', 'backcolor', '|',
             'removeformat', '|', 'insertorderedlist', 'insertunorderedlist', '|', 'selectall', 'cleardoc', 'paragraph', '|',
             'fontfamily', 'fontsize', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|',
-            '|', 'horizontal', 'print',  'drafts', 'formula'
+            '|', 'horizontal', 'print', 'drafts', 'formula', 'link'
             // 'preview',
         ]],
         // 当鼠标放在工具栏上时显示的tooltip提示,留空支持自动多语言配置，否则以配置值为准

src/views/marketing/platformCoupon/couponRecord/index.vue

@@ -122,6 +122,11 @@
             <span>{{ scope.row.status | statusFilter }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="订单号" min-width="170">
+          <template slot-scope="scope">
+            <span>{{ scope.row.grouporder.group_order_sn }}</span>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination

src/views/order/list/orderDetails.vue

@@ -127,6 +127,10 @@
                     <div v-if="orderDetailList.order_type == 1" class="value">核销</div>
                     <div v-else class="value">{{ orderDetailList.delivery_type | sendWay }}</div>
                   </li>
+                  <li v-if="orderDetailList.platform_coupon_price>0" class="item">
+                    <div>活动抵扣券: </div>
+                    <div v-if="orderDetailList.platform_coupon_price && orderDetailList.platform_coupon_price != 0" class="value">使用了{{ orderDetailList.platform_coupon_price }}个抵扣券，抵扣了{{ orderDetailList.platform_coupon_price }}元</div>
+                  </li>
                   <li class="item">
                     <div>支付运费：</div>
                     <div class="value">{{ orderDetailList.pay_postage }}</div>