pc商品列表样式修改，商家注释添加，订单统计，退订单按钮样式

buyer/src/components/indexDecorate/modelFormItem.vue

@@ -283,4 +283,3 @@ export default {
   }
 }
 </style>
-

buyer/src/components/nav/GoodsClassNav.vue

@@ -189,7 +189,6 @@ export default {
     selectedItem: {
       // 监听已选条件，来调用列表接口
       handler (val) {
-        console.log(val);
         let classification = [];
         this.params.brandId = ''
         this.params.prop = ''
@@ -248,7 +247,7 @@ export default {
         this.$set(this.tabBar, 'second', second)
       }
     },
-    cateClick (item, index) {  // 点选分类
+    cateClick (item, index) { // 点选分类
       switch (index) {
         case 1:
           this.$router.push({
@@ -636,7 +635,8 @@ export default {
   > div:first-child {
     width: 100px;
     background: #eee;
-    padding: 10px 0 0 10px;
+    padding-left: 10px;
+    line-height: 30px;
   }
   > div:last-child {
     width: 1100px;

buyer/src/main.js

@@ -32,7 +32,11 @@ router.afterEach(route => {
 
 Vue.prototype.linkTo = function (url) {
   if (url.substr(0, 1) === '/') { // 非外部链接，没有origin，只有路由地址
-    window.open(location.origin + url, '_blank');
+    if (router.mode === 'hash') {
+      window.open(location.origin + '/#' + url, '_blank');
+    } else {
+      window.open(location.origin + url, '_blank');
+    }
   } else { // 外部链接，完整的url地址
     window.open(url, '_blank')
   }

buyer/src/pages/GoodsList.vue

@@ -69,7 +69,7 @@
                 >人评价
               </div>
               <div class="goods-show-seller">
-                <Tag v-if="item.selfOperated" style="padding:0 4px;" size="small" color="error">自营</Tag><span>{{ item.storeName }}</span>
+                <Tag v-if="item.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.storeName }}</span>
               </div>
             </div>
           </div>

buyer/src/pages/payment/Pay.vue

@@ -412,7 +412,7 @@ export default {
               });
               this.$Modal.warning({
                 title: '以下商品超出配送区域' || title,
-                content: content.toString(),
+                content: content.toString()
               });
             }
             if (res.result.memberAddress) {