fix：添加产品

commit/product.js

@@ -1,4 +1,3 @@
-
 import {
     myRequestPhp
 } from './requestPhp.js'
@@ -12,11 +11,11 @@ const apiType = "php"
 export function getSupplyChainTab(data) {
     return myRequestPhp({
         url: `${pre}mer/store/product/gong_lst_filter`,
-         method: 'GET',
-             data,
-             apiType
+        method: 'GET',
+        data,
+        apiType
     })
-    
+
 }
 /**
  * 获取供应链tab
@@ -61,13 +60,13 @@ export function getSupplyChainList(data) {
  * @param {*} data 
  * @returns 
  */
-export function editSupplyChainPrice(id,data) {
-     return myRequestPhp({
-         url: `${pre}mer/store/product/edit_price/${id}`,
-         method: 'POST',
-         data,
-         apiType
-     })
+export function editSupplyChainPrice(id, data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/edit_price/${id}`,
+        method: 'POST',
+        data,
+        apiType
+    })
 }
 /**
  * @description 供应链商品 -- 修改销售价
@@ -76,12 +75,12 @@ export function editSupplyChainPrice(id,data) {
  * @description 供应链商品 -- 上下架
  */
 export function postchangeshow(data) {
-     return myRequestPhp({
-         url: `${pre}mer/store/product/change_show`,
-         method: 'POST',
-         data,
-         apiType
-     })
+    return myRequestPhp({
+        url: `${pre}mer/store/product/change_show`,
+        method: 'POST',
+        data,
+        apiType
+    })
 }
 
 
@@ -103,7 +102,7 @@ export function getGoodsTab(data) {
 /**商品列表  
  * 
  * page = 1 & limit = 20 & mer_cate_id = & cate_id = & keyword = & type = 1 & is_gift_bag = & p_type =
-  */
+ */
 
 export function getProductList(data) {
     return myRequestPhp({
@@ -160,7 +159,7 @@ export function reviewGoodsEvaluateReply(id) {
 }
 
 //商品评价回复
-export function reviewGoodsReplyApi(id,data) {
+export function reviewGoodsReplyApi(id, data) {
     return myRequestPhp({
         url: `${pre}mer/store/reply/reply/${id}.html`,
         method: 'POST',
@@ -175,58 +174,58 @@ export function reviewGoodsReplyApi(id,data) {
  */
 
 export function changeshowApi(id, data) {
-     return myRequestPhp({
-         url: `${pre}mer/store/product/status/${id}`,
-         method: 'POST',
-         data,
-         apiType
-     })
+    return myRequestPhp({
+        url: `${pre}mer/store/product/status/${id}`,
+        method: 'POST',
+        data,
+        apiType
+    })
 }
 /**
  * @description 商品列表--删除
  */
-export function destoryApi(id,data) {
-     return myRequestPhp({
-         url: `${pre}mer/store/product/destory/${id}`,
-         method: 'DELETE',
-         data,
-         apiType
-     })
+export function destoryApi(id, data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/destory/${id}`,
+        method: 'DELETE',
+        data,
+        apiType
+    })
 }
 
 /**
  * @description 商品列表 -- 删除
  */
-export function productDeleteApi(id,data) {
-     return myRequestPhp({
-         url: `${pre}mer/store/product/delete/${id}`,
-         method: 'DELETE',
-         data,
-         apiType
-     })
+export function productDeleteApi(id, data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/delete/${id}`,
+        method: 'DELETE',
+        data,
+        apiType
+    })
 }
 
 /***
  * @description 商品列表 -- 恢复商品
  */
-export function productRestoreApi(id,data) {
-      return myRequestPhp({
-          url: `${pre}mer/store/product/restore/${id}`,
-          method: 'POST',
-          data,
-          apiType
-      })
+export function productRestoreApi(id, data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/restore/${id}`,
+        method: 'POST',
+        data,
+        apiType
+    })
 }
 
 
 
 export function Addseckill(data) {
-     return myRequestPhp({
-         url: `${pre}mer/store/product/seckill`,
-         method: 'POST',
-         data,
-         apiType
-     })
+    return myRequestPhp({
+        url: `${pre}mer/store/product/seckill`,
+        method: 'POST',
+        data,
+        apiType
+    })
 }
 
 
@@ -234,18 +233,18 @@ export function Addseckill(data) {
 
 /** 
  * 文件上传
-*/
+ */
 
 export function uploadFile(data) {
     const params = new FormData()
     params.append('file', data.file)
-     return myRequestPhp({
-         url: `${pre}mer/upload/image/0/file`,
-         method: 'POST',
-         contentType: "application/x-www-form-urlencoded",
-         data: params,
-         apiType
-     })
+    return myRequestPhp({
+        url: `${pre}mer/upload/image/0/file`,
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded",
+        data: params,
+        apiType
+    })
 }
 
 /**
@@ -311,7 +310,7 @@ export function productDetailApi(data) {
 
 /** 
  * 在线选品 --- filter
-*/
+ */
 
 export function statusFilterApi(data) {
     return myRequestPhp({
@@ -367,13 +366,28 @@ export function joinselectionlibraryApi(data) {
         apiType
     })
 }
-export function Postjoinselectionlibrary(data) {
-    return request.post(``, data)
+
+/**
+ * @description 配置状态
+ */
+export function productConfigApi(data) {
+    return myRequestPhp({
+        url: `${pre}mer/store/product/config`,
+        method: 'GET',
+        data,
+        apiType
+    })
 }
-// /**
-//  * @description 配置状态
-//  */
-// export function productConfigApi() {
-//     return request.get(`store/product/config`)
-// }
 
+/**
+ * @description 获取商户分润比例
+ * @param {Object} param params {Object} 传值参数
+ */
+export function getMerchantProfitApi(data) {
+    return myRequestPhp({
+        url: `${pre}mer/getConfig/base_commission`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}

shop/productManagementModule/addProduct.vue

@@ -3,22 +3,27 @@
     <view class="headers">
       <headersVue headerTitle="添加商品" @headerJump="headerJump"></headersVue>
       <view class="headers-title">
-        <view class="content"> 该功能仅支持单规格商品快速添加，可在PC端编辑 </view>
+        <view class="content">
+          该功能仅支持单规格商品快速添加，可在PC端编辑
+        </view>
       </view>
     </view>
     <view class="content-wrrapper">
+      <!-- 商品封面 -->
       <uploadVue
         formItemTitle="商品封面"
         :maxLimit="1"
         @changeFiles="changeFilesfengmian"
       ></uploadVue>
+      <!-- 商品轮播图 -->
       <uploadVue
         formItemTitle="商品轮播图"
         @changeFiles="changeFileslunbotu"
       ></uploadVue>
 
       <view class="form-box">
-        <view class="form-item-box">
+        <!-- 商户商品分类 -->
+        <!-- <view class="form-item-box">
           <view class="form-box-txt">商户商品分类</view>
           <view
             class="form-box--arae"
@@ -33,7 +38,8 @@
             class="icon-boxx"
             color="#333"
           ></uni-icons>
-        </view>
+        </view> -->
+        <!-- 平台商品分类 -->
         <view class="form-item-box">
           <view class="form-box-txt">平台商品分类</view>
           <view
@@ -50,6 +56,7 @@
             color="#333"
           ></uni-icons>
         </view>
+        <!-- 商品名称 -->
         <view class="form-item-box">
           <view class="form-box-txt mustBox">商品名称</view>
           <view class="form-box--arae">
@@ -62,6 +69,7 @@
             />
           </view>
         </view>
+        <!-- 商品单位 -->
         <view class="form-item-box">
           <view class="form-box-txt mustBox">商品单位</view>
           <view class="form-box--arae">
@@ -74,6 +82,7 @@
             />
           </view>
         </view>
+        <!-- 品牌选择 -->
         <view class="form-item-box">
           <view class="form-box-txt">品牌选择</view>
           <view class="form-box--arae">
@@ -85,6 +94,7 @@
             ></uni-data-select>
           </view>
         </view>
+        <!-- 运费模板 -->
         <view class="form-item-box">
           <view class="form-box-txt mustBox">运费模板</view>
           <view class="form-box--arae">
@@ -96,7 +106,52 @@
             ></uni-data-select>
           </view>
         </view>
-        <view v-if="shippingList.length == 0" class="tips-messge">运费模板为空，请在后台添加运费模板</view>
+        <view v-if="shippingList.length == 0" class="tips-messge"
+          >运费模板为空，请在后台添加运费模板</view
+        >
+      </view>
+      <!-- 商品类型 -->
+      <view class="form-box mr-t">
+        <view class="form-item-box">
+          <view class="form-box-txt mustBox">商品类型</view>
+          <view class="form-box--arae">
+            <uni-data-select
+              v-model="formData.type"
+              placeholder="请选择商品类型"
+              :localdata="shangpingleixing"
+              :clear="false"
+            ></uni-data-select>
+          </view>
+        </view>
+      </view>
+      <!-- 商品规格 -->
+      <view class="form-box mr-t">
+        <view class="form-item-box">
+          <view class="form-box-txt mustBox">商品规格</view>
+          <view class="form-box--arae">
+            <uni-data-select
+              v-model="formData.spec_type"
+              placeholder="请选择商品规格"
+              :localdata="guigelist"
+              :disabled="true"
+            ></uni-data-select>
+          </view>
+        </view>
+      </view>
+      <!-- 分润设置: -->
+      <view class="form-box mr-t">
+        <view class="form-item-box">
+          <view class="form-box-txt mustBox">分润设置</view>
+          <view class="form-box--arae">
+            <uni-data-select
+              v-model="formData.extension_type"
+              placeholder="请选择分润设置"
+              :localdata="fengrunList"
+              :clear="false"
+              @change="changeFengrun"
+            ></uni-data-select>
+          </view>
+        </view>
       </view>
       <view
         class="form-box mr-t"
@@ -114,18 +169,29 @@
               its.title
             }}</view>
             <view class="form-box--arae">
+              <view class="price-box" v-if="its.props == 'price'">
+                <view class="flex-price">{{ priceDefault }}</view>
+                <view class="price-box_tips" v-if="formData.extension_type == 1"
+                  >商品成本价×分润比例</view
+                >
+              </view>
+
               <input
-                v-if="its.form_type == 'input'"
+                v-if="its.form_type == 'input' && its.props != 'price'"
                 :type="its.type"
                 v-model="item.modules[idx].value"
                 :adjust-position="false"
-                :placeholder="`请输入${its.title}`"
+                :placeholder="`${'请输入' + its.title}`"
                 class="placeholder-class"
+                :disabled="its.disabled"
+                @input="changeInputHandle($event, its, item, idx)"
               />
+              <view class="view-unit-input" v-if="its.isUnit">%</view>
             </view>
           </template>
         </view>
       </view>
+      <!-- 商品简介 -->
       <view class="business-box pb15">
         <view class="business-box-txt">商品简介 </view>
         <view class="business-box--arae">
@@ -140,9 +206,10 @@
           />
         </view>
       </view>
+      <!-- 商品详情 -->
       <view class="business-box pb15">
         <view class="business-box-txt">商品详情 </view>
-        <customEditor :value="formData.content" @input="changeTextHandle"/>
+        <customEditor :value="formData.content" @input="changeTextHandle" />
       </view>
     </view>
     <view class="btn-list">
@@ -180,7 +247,10 @@ import {
   getGoodsClassCategory,
   uploadFile,
   addProduct,
+  productConfigApi,
+  getMerchantProfitApi,
 } from "@/commit/product.js";
+import { getBaseInfo } from "@/commit/user.js";
 export default {
   components: {
     headersVue,
@@ -190,8 +260,10 @@ export default {
   },
   data() {
     return {
+      base_commission: "", //商户分润比例
       cascadeData: [], //商户商品分类
       pingtaifeiData: [], //平台商品分类：
+      priceDefault: "0.00",
       cascadePicker: {
         title: "选择商户商品分类",
         layer: null,
@@ -212,6 +284,11 @@ export default {
         name: "",
         id: "",
       },
+      extensionStatus: "0", //是否单独设置：0默认设置 1单独设置
+      specialMerchant: "",
+      merInfo: {
+        mer_type: "0",
+      },
       formData: {
         store_name: "", //商品名称
         mer_cate_id: [], //商户商品分类：
@@ -225,10 +302,10 @@ export default {
         slider_image: [], //商品轮播图：
         couponData: [], //优惠券：
         content: "", //商品详情：
-        sort: 0, //排序：
-        extension_type: "0", //是否单独设置：
-        is_good: 0, //商品推荐：0 1
-        is_gift_bag: 0, //是否包邮：0 1
+        sort: "0", //排序：
+        extension_type: "0", //是否单独设置：0默认设置 1单独设置
+        is_good: "0", //商品推荐：0不推荐 1推荐
+        is_gift_bag: "0", //是否包邮：0 1
         give_coupon_ids: [], //优惠券：
         // checkboxGroup: [], //商品推荐：0单规格 1 多规格
         stock_num: "", //商品库存
@@ -236,96 +313,25 @@ export default {
         share_num: "",
         shares_num: "",
         share_is: "0",
-        spec_type: "0",
-        type: 1,
+        spec_type: "0", //0单规格 1 多规格
+        type: "1", //商品类型：
         unit_name: "",
         attr: [],
         commission: "",
         pension: "",
         pension_is: "0",
         pension_num: "",
+        proCoupon: "", //优惠券
       },
       selectData: [],
       brandData: [],
       shippingList: [], //运费模板
-      attrValue: [
-        {
-          modules: [
-            {
-              title: "商品售价",
-              props: "price",
-              value: "",
-              type: "digit",
-              ismust: true,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "商品成本价",
-              value: "",
-              props: "cost",
-              type: "digit",
-              ismust: true,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "商品原价",
-              value: "",
-              props: "ot_price",
-              type: "digit",
-              ismust: true,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "商品库存",
-              value: "",
-              props: "stock",
-              type: "number",
-              ismust: true,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "商品编号",
-              value: "",
-              props: "bar_code",
-              type: "text",
-              ismust: false,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "重量（KG）",
-              value: "",
-              props: "weight",
-              type: "digit",
-              ismust: false,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "商品体积(m³)",
-              value: "",
-              props: "volume",
-              type: "digit",
-              ismust: false,
-              form_type: "input",
-              isshow: true,
-            },
-            {
-              title: "商品图片",
-              value: "",
-              props: "image",
-              type: "",
-              ismust: false,
-              form_type: "file",
-              isshow: false,
-            },
-          ],
-        },
-      ],
+      attrValueForm: {
+        gong_mer_profit: "",
+        gong_market_price: "",
+        plate_mer_profit: "",
+        extension_two: null,
+      },
     };
   },
   async onLoad() {
@@ -338,6 +344,27 @@ export default {
       await this.getShippingListData();
       await this.getGoodsClassData();
       await this.getGoodsClassCategoryData();
+      await this.productCon();
+      await this.getMerInfo();
+      await this.getMerchantProfit();
+    },
+    productCon() {
+      productConfigApi()
+        .then((res) => {
+          let data = res.data.data || {};
+          this.extensionStatus = data.extension_status;
+          this.specialMerchant = data.special_merchant;
+        })
+        .catch((res) => {});
+    },
+    async getMerInfo() {
+      try {
+        const res = await getBaseInfo();
+        if (res.data.status == 200) {
+          const data = res.data.data || {};
+          this.merInfo = data;
+        }
+      } catch (error) {}
     },
     async getGoodsClassData() {
       try {
@@ -390,7 +417,16 @@ export default {
         }
       } catch (error) {}
     },
-
+    // 获取商户分润比例
+    getMerchantProfit() {
+      getMerchantProfitApi()
+        .then((res) => {
+          this.base_commission = res.data.message;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
     headerJump() {
       uni.redirectTo({
         url: "/shop/productManagementModule/productManagement",
@@ -430,7 +466,7 @@ export default {
     bindTextAreaBlur(e) {
       console.log(e.detail.value);
     },
- async   handleSubmit() {
+    async handleSubmit() {
       if (this.formData.image == "") {
         uni.showToast({
           title: "请上传商品封面图",
@@ -459,13 +495,12 @@ export default {
         });
         return;
       }
-      if(!this.formData.temp_id || this.formData.temp_id == ""){
+      if (!this.formData.temp_id || this.formData.temp_id == "") {
         uni.showToast({
           title: "请选择运费模板",
           icon: "none",
         });
-        return
-
+        return;
       }
       const dataList = (this.attrValue[0] && this.attrValue[0].modules) || [];
       const dataNew = dataList.map((item, index) => {
@@ -510,33 +545,31 @@ export default {
       }, {});
 
       // 转换为包含合并后对象的数组
-      const result = [mergedObject];
+      const result = [{ mergedObject, ...this.attrValueForm }];
       const newParams = { ...this.formData, attrValue: result };
       uni.showLoading({
         title: "数据提交中...",
-      })
+      });
       try {
-         const res = await addProduct(newParams);
-         if(res.data.status == 200){
-            uni.showToast({
-              title:  "数据提交成功",
-              icon: "none",
-            });
-            uni.redirectTo({
-              url:'./productManagement'
-            })
-         }else{
+        const res = await addProduct(newParams);
+        if (res.data.status == 200) {
           uni.showToast({
-              title:  res.data.message,
-              icon: "none",
-            });
-
-         }
-         uni.hideLoading();
-         uni.hideToast()
+            title: "数据提交成功",
+            icon: "none",
+          });
+          uni.redirectTo({
+            url: "./productManagement",
+          });
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: "none",
+          });
+        }
+        uni.hideLoading();
+        uni.hideToast();
       } catch (error) {
-        
-      }finally{
+      } finally {
         uni.hideLoading();
       }
     },
@@ -552,10 +585,209 @@ export default {
         this.formData.slider_image.push(item.path);
       });
     },
-    changeTextHandle(data){
+    changeTextHandle(data) {
       // console.log(data)
       this.formData.content = data;
-    }
+    },
+    /**分润设置选择 */
+    changeFengrun(val) {
+      this.formData.extension_type = val;
+      const _this = this;
+      this.attrValue[0].modules.forEach((item) => {
+        _this.$set(item, "value", _this.base_commission);
+      });
+    },
+    changeInputHandle(ev, its, item, idx) {
+      if (its.props == "cost") {
+        let modulesData = item.modules[0];
+        let extension_one =
+          modulesData.props == "extension_one"
+            ? modulesData.value
+            : this.base_commission;
+        let bili = extension_one / 100; //比例
+        let gong_mer_profit = its.value * bili; //利润
+        let gong_market_price = Number(its.value) + Number(gong_mer_profit); //加入利润后的价格
+        let plate_mer_profit = gong_mer_profit;
+        let price = gong_market_price;
+        this.$set(its, "price", price);
+        this.priceDefault = price;
+        this.attrValueForm.gong_mer_profit = gong_mer_profit;
+        this.attrValueForm.gong_market_price = gong_market_price;
+        this.attrValueForm.plate_mer_profit = plate_mer_profit;
+      }
+      console.log(this.attrValueForm, "attrValueForm", its);
+    },
+  },
+  computed: {
+    shangpingleixing() {
+      let dataList = [
+        {
+          value: "1",
+          text: "普通商品",
+        },
+      ];
+      if (this.specialMerchant == "beishengtang") {
+        dataList.push({
+          value: "7",
+          text: "积分商品",
+        });
+      }
+      if (this.merInfo && this.merInfo.mer_type == "1") {
+        dataList.concat([
+          {
+            value: "8",
+            text: "会员商品",
+          },
+          {
+            value: "10",
+            text: "高级会员商品",
+          },
+          {
+            value: "14",
+            text: "合伙人商品",
+          },
+          {
+            value: "15",
+            text: "股权商品",
+          },
+          {
+            value: "16",
+            text: "合伙人+股权商品",
+          },
+        ]);
+      }
+      if (this.merInfo && this.merInfo.mer_type == "2") {
+        dataList.concat([
+          {
+            value: "17",
+            text: "合伙人商品",
+          },
+        ]);
+      }
+      return dataList;
+    },
+    guigelist() {
+      return [
+        {
+          value: "0",
+          text: "单规格",
+        },
+        {
+          value: "1",
+          text: "多规格",
+        },
+      ];
+    },
+    attrValue() {
+      return [
+        {
+          modules: [
+            {
+              title: "分润比例(%)",
+              value: this.base_commission,
+              props: "extension_one",
+              type: "digit",
+              ismust: false,
+              form_type: "input",
+              isshow: this.formData.extension_type == 1 ? true : false,
+              isUnit: true,
+            },
+
+            {
+              title: "商品成本价",
+              value: "",
+              props: "cost",
+              type: "digit",
+              ismust: true,
+              form_type: "input",
+              disabled: false,
+              isshow: true,
+            },
+            {
+              title: "商品售价",
+              props: "price",
+              value: "",
+              type: "digit",
+              ismust: true,
+              form_type: "input",
+              disabled: true,
+              isshow: true,
+            },
+            {
+              title: "商品原价",
+              value: "",
+              props: "ot_price",
+              type: "digit",
+              ismust: true,
+              form_type: "input",
+              disabled: false,
+              isshow: true,
+            },
+            {
+              title: "商品图片",
+              value: "",
+              props: "image",
+              type: "",
+              ismust: false,
+              form_type: "file",
+              isshow: false,
+            },
+            {
+              title: "商品库存",
+              value: "",
+              props: "stock",
+              type: "number",
+              ismust: true,
+              form_type: "input",
+              disabled: false,
+              isshow: true,
+            },
+            {
+              title: "商品编号",
+              value: "",
+              props: "bar_code",
+              type: "text",
+              ismust: false,
+              form_type: "input",
+              disabled: false,
+              isshow: true,
+            },
+            {
+              title: "重量（KG）",
+              value: "",
+              props: "weight",
+              type: "digit",
+              ismust: false,
+              form_type: "input",
+              disabled: false,
+              isshow: true,
+            },
+            {
+              title: "商品体积(m³)",
+              value: "",
+              props: "volume",
+              type: "digit",
+              ismust: false,
+              form_type: "input",
+              disabled: false,
+              isshow: true,
+            },
+          ],
+        },
+      ];
+    },
+    fengrunList() {
+      return [
+        {
+          value: "1",
+          text: "单独设置",
+        },
+        {
+          value: "0",
+          text: "默认设置",
+        },
+      ];
+    },
   },
 };
 </script>
@@ -660,7 +892,7 @@ page {
   }
 }
 .form-box {
-  min-height: 158rpx;
+  min-height: auto;
   background: #ffffff;
   //   border: 2rpx solid #f00;
   padding: 0 32rpx;
@@ -678,6 +910,13 @@ page {
       right: -26rpx;
       top: 28rpx;
     }
+    .view-unit-input {
+      color: #999;
+      width: 15rpx;
+      text-align: center;
+      flex-shrink: 0;
+      word-break: break-all;
+    }
     .form-box-txt {
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
@@ -698,6 +937,23 @@ page {
       color: #333333;
       flex: 1;
       padding-right: 20rpx;
+      .price-box {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: flex-end;
+        .flex-price {
+          color: #1f7cff;
+          font-size: 26rpx;
+          font-weight: 700;
+        }
+        .price-box_tips {
+          font-size: 20rpx;
+          font-weight: 700;
+          color: #f05107;
+          padding-top: 10rpx;
+        }
+      }
       &.classification {
         color: #999;
       }
@@ -731,7 +987,7 @@ page {
 .pb15 {
   padding-bottom: 25rpx !important;
 }
-.tips-messge{
+.tips-messge {
   padding-bottom: 15rpx;
   color: #ff6010;
 }