bug修改

manager/src/views/promotion/coupon/coupon.vue

@@ -225,7 +225,6 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
           fixed: "right",
           render: (h, params) => {
             let text = "未知",

manager/src/views/promotion/fullCut/fullCutDetail.vue

@@ -156,13 +156,16 @@
                 :data="form.promotionGoodsList"
                 @on-selection-change="changeSelect"
               >
-                <template slot-scope="{ row }" slot="QRCode">
-                  <img
-                    :src="row.QRCode || '../../../assets/lili.png'"
-                    width="50px"
-                    height="50px"
-                    alt=""
-                  />
+                <template slot-scope="{ row }" slot="goodsName">
+                  <div>
+                    <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                      <div slot="content">
+                        <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                      </div>
+                      <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
+                    </Poptip>
+                  </div>
                 </template>
               </Table>
             </FormItem>
@@ -201,7 +204,7 @@ export default {
         },
         {
           title: "商品名称",
-          key: "goodsName",
+          slot: "goodsName",
           minWidth: 120,
         },
         {
@@ -215,20 +218,11 @@ export default {
             );
           },
         },
-        {
-          title: "图片",
-          key: "quantity",
-          minWidth: 40,
-        },
         {
           title: "库存",
           key: "quantity",
           minWidth: 40,
-        },
-        // {
-        //   title: "商品二维码",
-        //   slot: "QRCode",
-        // },
+        }
       ],
       options: {
         disabledDate(date) {

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

@@ -22,17 +22,17 @@
           @on-selection-change="changeSelect"
         >
           <template slot-scope="{ row }" slot="goodsName">
-            <span>{{ row.goodsName }}</span>
-          </template>
-          <template slot-scope="{ row }" slot="QRCode">
-            <Button @click="toBuyerGoods(row)" type="info">商品链接地址</Button>
-            <Button
-              v-if="row.QRCode != null"
-              type="success"
-              @click="viewImg(row.QRCode)"
-              >查看二维码</Button
-            >
+            <div>
+              <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
           </template>
+        
         </Table>
       </Row>
       <Row type="flex" justify="end" class="page operation">

manager/src/views/promotion/pointsGoods/pointsGoods.vue

@@ -70,8 +70,14 @@
           ref="table"
         >
           <template slot-scope="{ row }" slot="goodsName">
-            <div class="div-zoom" >
-              <a>{{ row.goodsSku.goodsName }}</a>
+            <div>
+              <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
             </div>
           </template>
           <template slot-scope="{ row }" slot="price">
@@ -83,6 +89,11 @@
           <template slot-scope="{ row }" slot="quantity">
             <div>{{ row.goodsSku.quantity }}</div>
           </template>
+          <template slot-scope="{ row }" slot="startTime">
+            <div>{{ row.startTime }}</div>
+            <div>{{ row.endTime }}</div>
+          </template>
+          
           <template slot-scope="{ row }" slot="action">
             <Button
               v-if="row.promotionStatus == 'NEW'"
@@ -166,52 +177,39 @@ export default {
         {
           title: "市场价",
           slot: "price",
-          minWidth: 60,
         },
         {
           title: "结算价",
           slot: "settlementPrice",
-          minWidth: 60,
         },
         {
           title: "分类",
           key: "pointsGoodsCategoryName",
-          minWidth: 60,
         },
         {
           title: "库存数量",
           slot: "quantity",
-          minWidth: 60,
         },
         {
           title: "活动剩余库存",
           key: "activeStock",
-          minWidth:90,
         },
         {
           title: "兑换积分",
           key: "points",
-          minWidth: 60,
         },
         {
           title: "所属店铺",
           key: "storeName",
-          minWidth: 60,
         },
         {
           title: "活动开始时间",
-          key: "startTime",
-          minWidth: 140,
-        },
-        {
-          title: "活动结束时间",
-          key: "endTime",
-          minWidth: 140,
+          slot: "startTime",
+          minWidth:100
         },
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 60,
           render: (h, params) => {
             let text = "未知",
               color = "";