修改bug，更改字体图标

seller/package.json

@@ -29,6 +29,7 @@
     "sockjs-client": "^1.4.0",
     "stompjs": "^2.3.3",
     "swiper": "^6.3.5",
+    "vue-qr": "^2.3.0",
     "view-design": "^4.2.0",
     "vue": "^2.6.10",
     "vue-awesome": "^4.0.2",

seller/src/main.js

@@ -54,6 +54,12 @@ Vue.prototype.setStore = setStore;
 Vue.prototype.getStore = getStore;
 Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
+Vue.prototype.linkTo = function (goodsId, skuId, link='https://pc-b2b2c.pickmall.cn') {  // 跳转买家端商品
+  window.open(`${link}/goodsDetail?goodsId=${goodsId}&skuId=${skuId}`, '_blank')
+};
+Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码
+  return `https://m-b2b2c.pickmall.cn/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
+};
 
 Array.prototype.remove = function(from, to) {
   var rest = this.slice((to || from) + 1 || this.length);

seller/src/views/distribution/distributionGoods.vue

@@ -31,7 +31,7 @@
 
                   <div style="margin-left: 13px;">
                     <div class="div-zoom" >
-                      <a>{{scope.row.goodsName}}</a>
+                      <a @click="linkTo(scope.row.id,scope.row.skuId)">{{scope.row.goodsName}}</a>
                     </div>
                   </div>
                 </div>

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -1839,18 +1839,19 @@ export default {
             this.$Message.error("请上传商品图片");
             return;
           }
-          if (
-            !this.baseInfoForm.storeCategoryPath ||
-            !this.baseInfoForm.storeCategoryPath.length
-          ) {
-            this.submitLoading = false;
-            this.$Message.error("请选择店内分类");
-            return;
-          }
+          // if (
+          //   !this.baseInfoForm.storeCategoryPath ||
+          //   !this.baseInfoForm.storeCategoryPath.length
+          // ) {
+          //   this.submitLoading = false;
+          //   this.$Message.error("请选择店内分类");
+          //   return;
+          // }
           //如果选择的是买家承担运费 则运费模板重置为0
           if (this.baseInfoForm.freightPayer == "BUYER") {
             this.baseInfoForm.templateId = 0;
           }
+          
           this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
             delete sku._index;
             delete sku._rowKey;

seller/src/views/promotion/coupon/coupon.vue

@@ -51,8 +51,8 @@
         </Form>
       </Row>
       <Row class="operator padding-row">
-        <Button @click="add" type="primary">添加</Button>&nbsp;
-        <Button @click="delAll">批量下架</Button>&nbsp;
+        <Button @click="add" type="primary">添加</Button>
+        <Button @click="delAll" class="ml_10">批量下架</Button>
         <!-- <Button @click="upAll">批量上架</Button> -->
       </Row>
       <Row class="padding-row">
@@ -106,7 +106,6 @@
 <script>
 import {
   getShopCouponList,
-  deleteShopCoupon,
   updateCouponStatus,
 } from "@/api/promotion";
 

seller/src/views/promotion/coupon/couponPublish.vue

@@ -545,11 +545,12 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
+      console.log(item);
       // 回显已选商品
       let ids = [];
       let list = [];
       this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
       });
       item.forEach((e) => {
         if (!ids.includes(e.id)) {

seller/src/views/promotion/fullCut/newFullCut.vue

@@ -501,7 +501,7 @@ export default {
       let ids = [];
       let list = [];
       this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
       });
       item.forEach((e) => {
         if (!ids.includes(e.id)) {

seller/src/views/promotion/pintuan/pintuanGoods.vue

@@ -276,7 +276,7 @@ export default {
       let ids = [];
       let list = [];
       this.goodsData.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
       });
       item.forEach((e) => {
         if (!ids.includes(e.id)) {

seller/src/views/promotion/seckill/seckillGoods.vue

@@ -364,7 +364,7 @@ export default {
       let list = [];
 
       this.goodsList[this.tabIndex].list.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
       });
       item.forEach((e) => {
         if (!ids.includes(e.id)) {