merge

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -280,7 +280,7 @@ export default {
         total_amount_order: null,
         business1: ""
       },
-
+      picStr: "",
       picUrlList: [],
       picUploadList: [], // 上传详情图片列表
       isShowPopver: false, // 是否展示图片框
@@ -362,6 +362,7 @@ export default {
 
     // 图片上传成功时
     handleDetailSuccess(res) {
+      this.picStr = res.result.image_id;
       this.picUploadList.push(res.result.image_id);
     },
 
@@ -372,6 +373,7 @@ export default {
           this.picUploadList.splice(i, 1);
         }
       }
+      this.picStr = "";
       this.hideUpload = this.picUploadList.length >= this.limitCount;
     },
 
@@ -404,6 +406,10 @@ export default {
           url: res.result.goods_info.desc_pic_url_list[i]
         });
       }
+      this.picStr = this.getUrlParms(
+        res.result.goods_info.desc_pic_url_list[0],
+        "url"
+      );
     },
 
     getUrlParms(path, name) {
@@ -414,15 +420,9 @@ export default {
 
     // 编辑商品详情
     async editGoodsMet(goodsSkuID) {
-      let pic;
-      if (this.picUrlList.length != 0) {
-        pic = this.getUrlParms(this.picUrlList[0].url, "url");
-      } else {
-        pic = this.picUploadList[0];
-      }
       const res = await editGoods({
         goods_name: this.commodityForm.goods_name,
-        desc_pic_url: pic,
+        desc_pic_url: this.picStr,
         desc: "",
         inventory_add: this.commodityForm.inventory_total,
         original_price: this.commodityForm.original_price,

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -156,9 +156,10 @@
                   size="small"
                   @click="refund(scope.row)"
                   v-show="
-                    scope.row.order_status == '2' ||
+                    (scope.row.order_status == '2' ||
                       scope.row.order_status == '6' ||
-                      (scope.row.order_status == '8' && scope.row.payment !== 0)
+                      scope.row.order_status == '8') &&
+                      scope.row.payment !== 0
                   "
                   >退款</el-button
                 >
@@ -244,9 +245,10 @@
                   size="small"
                   @click="refund(scope.row)"
                   v-show="
-                    scope.row.order_status == '2' ||
+                    (scope.row.order_status == '2' ||
                       scope.row.order_status == '6' ||
-                      scope.row.order_status == '8'
+                      scope.row.order_status == '8') &&
+                      scope.row.payment !== 0
                   "
                   >退款</el-button
                 >