优惠

.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/dialogs/internal.js

@@ -31,7 +31,7 @@
                     }
                 }, 0)
             };
-        window.nowEditor = {editor: editor, dialog: dialog};
+        window.nowEditor = { editor: editor, dialog: dialog };
         utils.loadFile(document, {
             href: editor.options.themePath + editor.options.theme + '/dialogbase.css?cache=' + Math.random(),
             tag: 'link',
@@ -70,7 +70,7 @@
                                 p != 'options' && dom.setAttribute(p, content[p]);
                             }
                             break;
-                        default :
+                        default:
                             domUtils.setAttributes(dom, content);
                     }
                 }

public/UEditor/ueditor.config.js

@@ -34,16 +34,16 @@
 
         // 工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
         toolbars: [[
-          'previewmobile', 'source', '|', 'undo', 'redo', '|',
+            'previewmobile', 'source', '|', 'undo', 'redo', '|',
             '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提示,留空支持自动多语言配置，否则以配置值为准
-         labelMap:{
+        labelMap: {
-           'previewmobile':'手机预览'
+            'previewmobile': '手机预览'
         },
 
         // 语言配置项,默认是zh-cn。有需要的话也可以使用如下这样的方式来自动多语言切换，当然，前提条件是lang文件夹下存在对应的语言文件：
@@ -422,17 +422,17 @@
         }
     };
 
-    function getUEBasePath (docUrl, confUrl) {
+    function getUEBasePath(docUrl, confUrl) {
         return getBasePath(docUrl || self.document.URL || self.location.href, confUrl || getConfigFilePath());
     }
 
-    function getConfigFilePath () {
+    function getConfigFilePath() {
         var configPath = document.getElementsByTagName('script');
 
-        return configPath[ configPath.length - 1 ].src;
+        return configPath[configPath.length - 1].src;
     }
 
-    function getBasePath (docUrl, confUrl) {
+    function getBasePath(docUrl, confUrl) {
         var basePath = confUrl;
 
         if (/^(\/|\\\\)/.test(confUrl)) {
@@ -446,8 +446,8 @@
         return optimizationPath(basePath);
     }
 
-    function optimizationPath (path) {
+    function optimizationPath(path) {
-        let protocol = /^[a-z]+:\/\//.exec(path)[ 0 ],
+        let protocol = /^[a-z]+:\/\//.exec(path)[0],
             tmp = null,
             res = [];
 
@@ -455,7 +455,7 @@
 
         path = path.replace(/\\/g, '/').split(/\//);
 
-        path[ path.length - 1 ] = '';
+        path[path.length - 1] = '';
 
         while (path.length) {
             if ((tmp = path.shift()) === '..') {

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>