999

commit/product.js

@@ -286,7 +286,7 @@ export function shippingListApi(data) {
 /**
  * 添加商品
  */
-export function addProduct(data) {
+export function addProduct(id,data) {
     return myRequestPhp({
         url: `${pre}mer/store/product/create`,
         method: 'POST',
@@ -390,4 +390,29 @@ export function getMerchantProfitApi(data) {
         data,
         apiType
     })
-}
+}
+
+
+//产品详情
+export function getProductDetail(id,data){
+	
+	return myRequestPhp({
+	    url: `${pre}mer/store/product/detail/${id}`,
+	    method: 'GET',
+	    data,
+	    apiType
+	})
+}
+
+//产品gengx
+export function updateProduct(id,data){
+	
+	return myRequestPhp({
+	    url: `${pre}mer/store/product/update/${id}`,
+	    method: 'POST',
+	    data,
+	    apiType
+	})
+}
+
+

components/editor.vue

@@ -201,7 +201,24 @@ export default {
       formats: {},
     };
   },
-
+  watch: {
+    value:{
+      handler(val){
+         this.richText = val
+         console.log(val)
+         if(val){
+          this.$nextTick(()=>{
+            this.onEditorReady()
+          })
+         }
+      },
+      deep:true,
+    },
+  },
+  mounted(){
+     this.richText = this.value;
+     this.onEditorReady()
+  },
   methods: {
     readOnlyChange() {
       this.readOnly = !this.readOnly;

shop/productManagementModule/addProduct.vue

@@ -13,11 +13,13 @@
       <uploadVue
         formItemTitle="商品封面"
         :maxLimit="1"
+        :fileList="fengMianImage"
         @changeFiles="changeFilesfengmian"
       ></uploadVue>
       <!-- 商品轮播图 -->
       <uploadVue
         formItemTitle="商品轮播图"
+        :fileList="lunBoTuImage"
         @changeFiles="changeFileslunbotu"
       ></uploadVue>
 
@@ -366,6 +368,8 @@ import {
   addProduct,
   productConfigApi,
   getMerchantProfitApi,
+  getProductDetail,
+  updateProduct,
 } from "@/commit/product.js";
 import { getBaseInfo } from "@/commit/user.js";
 import { accMul, accDiv, accAdd, accSub } from "@/utils/acc.js";
@@ -460,21 +464,112 @@ export default {
         volume: "", //商品体积(m³)
       },
       costInputValue: "",
+      clickType: "create",
+      product_id: "",
+      fengMianImage: [], //封面
+      lunBoTuImage: [], //轮播图
     };
   },
-  async onLoad() {
-    await this.initData();
+  async onLoad(e) {
+    this.product_id = e.product_id || "";
+    this.clickType = e.clickType;
+     await this.getGoodsClassCategoryData();
+      await this.getMerchantProfit();
+    if (this.clickType == "updated" && this.product_id) {
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      await this.getProductDetailData(this.product_id);
+    }
+     await this.initData();
   },
   onShow() {},
   methods: {
+    async getProductDetailData(id) {
+      try {
+        const res = await getProductDetail(id);
+        if (res.data.status == 200) {
+          let data = res.data.data || {};
+          let attrValue = (data.attrValue && data.attrValue[0]) || {};
+          this.formData.store_name = data.store_name;
+          this.formData.unit_name = data.unit_name;
+          this.formData.brand_id = data.brand_id;
+          this.formData.temp_id = data.temp_id;
+          this.formData.type = String(data.type);
+          this.formData.spec_type = String(data.spec_type);
+          this.formData.extension_type = String(data.extension_type);
+          this.formData.cate_id = data.cate_id;
+          this.formData.store_info = data.store_info;
+          this.formData.content = data.content;
+          this.attrValueForm.extension_one = attrValue.extension_one;
+          this.attrValueForm.cost = attrValue.cost;
+          this.priceDefault = attrValue.price;
+          this.attrValueForm.ot_price = attrValue.ot_price;
+          this.attrValueForm.stock = attrValue.stock;
+          this.attrValueForm.bar_code = attrValue.bar_code;
+          this.attrValueForm.weight = attrValue.weight;
+          this.attrValueForm.volume = attrValue.volume;
+          console.log(this.fengMianImage, "this.fengMianImage999");
+          console.log(this.pingtaiData, "this.fengMianImage999his.pingtaiData");
+          let dataArr = this.convertToFlatArray(this.pingtaiData);
+          console.log(this.fengMianImage, "this.fengMianImage99945454545");
+          const findObj =
+            dataArr.find((item) => item.value == data.cate_id) || {};
+          this.pingtaifeilei.name = findObj.label || "";
+          this.pingtaifeilei.id = findObj.value || data.cate_id || "";
+          console.log(this.base_commission,"this.base_commission")
+          this.getCalcAfterPrice({
+            extension_one:attrValue.extension_one,
+            cost:this.attrValueForm.cost
+          })
+          if (data.image) {
+            this.fengMianImage = [];
+            let fenMian = {
+              //封面
+              path: data.image,
+              Files: [],
+            };
+            this.fengMianImage.push(fenMian);
+          }
+          console.log(this.fengMianImage, "this.fengMianImage");
+          if (data.slider_image && data.slider_image.length > 0) {
+            this.lunBoTuImage = [];
+            data.slider_image.forEach((item) => {
+              let lunBoTu = {
+                //轮播图
+                path: item,
+                Files: [],
+              };
+              this.lunBoTuImage.push(lunBoTu);
+            });
+          }
+        }
+        uni.hideLoading();
+      } catch (error) {
+        uni.hideLoading();
+      }
+    },
     async initData() {
       await this.getBrandSelectData();
       await this.getShippingListData();
       await this.getGoodsClassData();
-      await this.getGoodsClassCategoryData();
+    
       await this.productCon();
       await this.getMerInfo();
-      await this.getMerchantProfit();
+     
+    },
+    convertToFlatArray(data) {
+     return Array.isArray(data)
+        ? data.flatMap((node) => {
+            const { value, label, children = [] } = node;
+            if (typeof value !== "number" || typeof label !== "string")
+              return [];
+            return Array.isArray(children)
+              ? [{ value, label }, ...convertToFlatArray(children)]
+              : [{ value, label }];
+          })
+        : [];
     },
     productCon() {
       productConfigApi()
@@ -566,7 +661,7 @@ export default {
       const { data } = e;
       const lastItem = data[data.length - 1];
       this.selectData = data || [];
-      console.log(lastItem, "pickerCallback回調");
+      console.log(lastItem, "pickerCallcate_idcate_idcate_idback回調");
       this.formData.mer_cate_id.push(lastItem.id);
       this.classification = lastItem || {};
     },
@@ -589,7 +684,7 @@ export default {
       const { data } = e;
       const lastItem = data[data.length - 1];
       this.selectData = data || [];
-      console.log(lastItem, "pickerCallbackpintai");
+      console.log(lastItem, "pickerCallback99999pintai");
       this.pingtaifeilei = lastItem || {};
     },
     bindTextAreaBlur(e) {
@@ -673,14 +768,18 @@ export default {
         });
         return;
       }
-      if(this.attrValueForm.extension_one <5 || this.attrValueForm.extension_one > 100 || this.attrValueForm.extension_one == ""){
+      if (
+        this.attrValueForm.extension_one < 5 ||
+        this.attrValueForm.extension_one > 100 ||
+        this.attrValueForm.extension_one == ""
+      ) {
         uni.showToast({
           title: "请填写正确的分润比例",
-          icon: "none", 
-        })
+          icon: "none",
+        });
         return;
       }
-       
+
       if (this.formData.store_info == "") {
         uni.showToast({
           title: "请填写商品简介",
@@ -688,19 +787,20 @@ export default {
         });
         return;
       }
-      this.attrValueForm.image =  this.formData.image 
-
-
-
+      this.attrValueForm.image = this.formData.image;
+      this.formData.cate_id = this.pingtaifeilei.id; //平台商品分类
       // 转换为包含合并后对象的数组
-      const result = [{  ...this.attrValueForm }];
+      const result = [{ ...this.attrValueForm }];
       const newParams = { ...this.formData, attrValue: result };
       console.log(newParams, "newParams");
       uni.showLoading({
         title: "数据提交中...",
       });
+      let req = this.clickType === "updated" ? updateProduct : addProduct
+      let product_id = this.clickType === "updated"? this.product_id : ""
+
       try {
-        const res = await addProduct(newParams);
+        const res = await req(product_id,newParams);
         if (res.data.status == 200) {
           uni.showToast({
             title: "数据提交成功",
@@ -772,19 +872,18 @@ export default {
           title: "分润比例不能小于5%",
           icon: "none",
         });
-        this.$nextTick(()=>{
-        this.attrValueForm.extension_one = '5';
-        })
+        this.$nextTick(() => {
+          this.attrValueForm.extension_one = "5";
+        });
       }
       if (value > 100) {
         uni.showToast({
           title: "分润比例不能大于100%",
           icon: "none",
         });
-        this.$nextTick(()=>{
-        this.attrValueForm.extension_one = this.base_commission;
-        })
-
+        this.$nextTick(() => {
+          this.attrValueForm.extension_one = this.base_commission;
+        });
       }
 
       let data = {
@@ -844,10 +943,9 @@ export default {
       }
 
       const formatted = this.limitPriceFormat(value);
-        this.$nextTick(()=>{
+      this.$nextTick(() => {
         _this.attrValueForm.ot_price = formatted;
-        })
-     
+      });
     },
 
     limitPriceFormat(value) {

shop/productManagementModule/components/upload.vue

@@ -69,6 +69,20 @@ export default {
       type: Number,
       default: 0,
     },
+    fileList: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  watch: {
+    fileList: {
+      handler(newVal) {
+        console.log(newVal, "newVal");
+        this.fileListData = newVal;
+        this.emitChangeFiles(newVal);
+      },
+      deep: true,
+    },
   },
   data() {
     return {
@@ -76,6 +90,10 @@ export default {
       paths: "",
     };
   },
+  mounted() {
+    this.fileListData = this.fileList;
+    this.emitChangeFiles(this.fileListData);
+  },
   methods: {
     emitChangeFiles(data) {
       this.$emit("changeFiles", {
@@ -94,10 +112,9 @@ export default {
         // sizeType: ["compressed"], // original 原图，compressed 压缩图，默认二者都有
         sourceType: ["album", "camera"], // album 从相册选图，camera 使用相机，默认二者都有
         success: async function (res) {
-            const tempFiles = res.tempFiles;
-            const tempFilePaths = res.tempFilePaths;
+          const tempFiles = res.tempFiles;
+          const tempFilePaths = res.tempFilePaths;
           if (that.fileListData.length === 0) {
-          
             const data = await that.uploadFileData(tempFiles[0]);
             if (!data) {
               that.fileListData = [];
@@ -167,14 +184,14 @@ export default {
             }
             resolve(this.paths);
             console.log("上传成功", JSON.parse(res.data));
-             uni.hideLoading();
+            uni.hideLoading();
             uni.hideToast();
           },
           fail: (err) => {
             console.error("上传失败", err);
             this.paths = "";
             resolve(this.paths);
-             uni.hideLoading();
+            uni.hideLoading();
             uni.hideToast();
           },
           complete: () => {

shop/productManagementModule/index.vue

@@ -30,6 +30,8 @@
        class="mb-t1" 
       :fullSreen="true"
         fullSreenTitle="在线选品列表"  @custom-handle-click="onHandleXuanPin"></listCardInfo> -->
+		
+		 <listCardInfo headerTitle="添加商品" class="mb-t1" :fullSreen="true" fullSreenTitle="添加单规格商品" @custom-handle-click="addProductRuKou"></listCardInfo>
     </view>
   </view>
 </template>
@@ -201,6 +203,11 @@ export default {
     }
   },
   methods: {
+	  addProductRuKou(){
+		  uni.redirectTo({
+		  	url:`./addProduct?clickType=create`
+		  })
+	  },
     async getGoodsTabNum() {
       try {
         const res = await getGoodsTab();

shop/productManagementModule/productManagement.vue

@@ -74,9 +74,17 @@
               <button
                 class="list-card-bottom-btn-list--item set-activity active"
                 @click="huodong(item, index)"
+                v-if="type != 1 && type != 2"
               >
                 活动
               </button>
+              <button
+                class="list-card-bottom-btn-list--item edit-activity active"
+                @click="editProduct(item, index)"
+                v-if="type == 1 || type == 2"
+              >
+                编辑
+              </button>
               <!-- v-if="tableFrom.type === '5'" -->
               <button
                 v-if="type == 5"
@@ -203,6 +211,7 @@ import {
   productDeleteApi,
   productRestoreApi,
   Addseckill, //活动
+  getProductDetail,
 } from "@/commit/product.js";
 //商品列表
 export default {
@@ -289,15 +298,15 @@ export default {
     await this.getGoodsTabData();
     await this.getProductListData();
   },
-  async onPullDownRefresh() {
+  onPullDownRefresh() {
     uni.showLoading({
       title: "加载中",
     });
     this.page = 1;
     this.is_panudn = true;
     this.list = [];
-    await this.getProductListData();
-     uni.hideLoading();
+    this.getProductListData();
+    uni.hideLoading();
   },
   onReachBottom() {
     console.log("onReachBottom");
@@ -348,13 +357,13 @@ export default {
         is_gift_bag: this.is_gift_bag,
         p_type: this.p_type,
       };
-
+      uni.showLoading({
+        title: "加载中",
+      });
       try {
-        uni.showLoading({
-          title: "加载中",
-        });
         const res = await getProductList(params);
-         uni.hideLoading();
+        uni.hideLoading();
+        uni.stopPullDownRefresh();
         if (res.data.status == 200) {
           this.tihsi = res.data.data.list.length;
           if (res.data.data.count > 0) {
@@ -392,7 +401,7 @@ export default {
     async onHandleShow(item, type) {
       const id = item.product_id;
       const data = {
-        status: item.is_show==1?0:1,
+        status: item.is_show == 1 ? 0 : 1,
       };
       const titleTips = item.is_show == 1 ? "商品下架中" : "商品上架中";
       const titleMsg = item.is_show == 1 ? "商品下架成功" : "商品上架成功";
@@ -406,12 +415,12 @@ export default {
             title: titleMsg,
             icon: "none",
           });
-          await this.getGoodsTabData()
+          await this.getGoodsTabData();
           await this.getProductListData();
-           uni.hideLoading();
+          uni.hideLoading();
         }
       } catch (error) {
-         uni.hideLoading();
+        uni.hideLoading();
       } finally {
         uni.hideLoading();
         uni.hideToast();
@@ -494,7 +503,7 @@ export default {
     huodong(item) {
       this.dataObj = item;
       const _this = this;
-      if (item.seckill == 1 && this.type !=2) {
+      if (item.seckill == 1 && this.type != 2) {
         uni.showModal({
           title: "温馨提示",
           content: "此商品正在处于秒杀状态,请勿操作",
@@ -503,7 +512,7 @@ export default {
         });
         return;
       }
-       _this.showPopup()
+      _this.showPopup();
       // Addseckill({}).then(data=>{
       //   console.log(data)
       // }).catch((res) => {
@@ -597,6 +606,42 @@ export default {
         this.isEmpty = false;
       }
     },
+    async editProduct(item, index) {
+      const isU = await this.getProductType(item.product_id);
+      if (isU == "single") {
+        uni.redirectTo({
+          url: `./addProduct?clickType=updated&product_id=${item.product_id}`,
+        });
+      } else if (isU == "multi") {
+        uni.showModal({
+          content: "非单规格产品，不支持移动端编辑，请前往PC端编辑",
+          showCancel: false,
+        });
+      } else {
+        uni.showModal({
+          content: "网络错误",
+          showCancel: false,
+        });
+      }
+      console.log(item, index, isU);
+    },
+    async getProductType(id) {
+      uni.showLoading({
+        title: "正在跳转",
+      });
+      try {
+        const res = await getProductDetail(id);
+        if (res.data.status == 200) {
+          return res.data.data.spec_type == 0 ? "single" : "multi";
+        } else {
+          return false;
+        }
+      } catch (err) {
+        return false;
+      } finally {
+        uni.hideLoading();
+      }
+    },
   },
 };
 </script>
@@ -766,6 +811,10 @@ page {
               background: #e9ca1d;
               color: white;
             }
+            &.edit-activity {
+              background: #e9ca1d;
+              color: white;
+            }
 
             &:active {
               opacity: 0.8;