ddd

shop/productManagementModule/addProduct.vue

@@ -153,7 +153,7 @@
           </view>
         </view>
       </view>
-      <view
+      <!-- <view
         class="form-box mr-t"
         v-for="(item, index) in attrValue"
         :key="index"
@@ -190,6 +190,123 @@
             </view>
           </template>
         </view>
+      </view> -->
+      <view class="form-box mr-t">
+        <!-- 分润比例 extension_one-->
+        <view class="form-item-box" v-if="formData.extension_type == 1">
+          <view class="form-box-txt" :class="['mustBox']">分润比例(%)</view>
+          <!-- <input
+            type="digit"
+            v-model="attrValueForm.extension_one"
+            :adjust-position="false"
+            placeholder="请输入分润比例"
+            class="placeholder-class"
+            @input="changeInputHandleExtensionOne"
+          /> -->
+          <uni-easyinput
+            type="digit"
+            v-model="attrValueForm.extension_one"
+            :adjust-position="false"
+            placeholder="请输入分润比例"
+            class="placeholder-class"
+            @input="changeInputHandleExtensionOne"
+            :clearable="false"
+          ></uni-easyinput>
+          <view class="view-unit-input">%</view>
+        </view>
+        <!-- 商品成本价 cost-->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['mustBox']">商品成本价</view>
+
+          <uni-easyinput
+            type="digit"
+            v-model="attrValueForm.cost"
+            :adjust-position="false"
+            placeholder="请输入商品成本价"
+            class="placeholder-class"
+            :clearable="false"
+            @input="changeInputHandleCost"
+          ></uni-easyinput>
+        </view>
+        <!-- 商品售价 price-->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['mustBox']">商品售价</view>
+          <view class="form-box--arae">
+            <view class="price-box">
+              <view class="flex-price">{{ priceDefault }}</view>
+              <view class="price-box_tips" v-if="formData.extension_type == 1"
+                >商品成本价×分润比例</view
+              >
+            </view>
+          </view>
+        </view>
+        <!-- 商品原价 ot_price-->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['mustBox']">商品原价</view>
+
+          <uni-easyinput
+            type="digit"
+            v-model="attrValueForm.ot_price"
+            :adjust-position="false"
+            placeholder="请输入商品原价"
+            class="placeholder-class"
+            :clearable="false"
+            @input="changeInputHandleOTPrice"
+          ></uni-easyinput>
+          <!--          
+          <input
+            type="digit"
+            v-model="attrValueForm.ot_price"
+            :adjust-position="false"
+            placeholder="请输入商品原价"
+            class="placeholder-class"
+            @input="changeInputHandleOTPrice"
+          /> -->
+        </view>
+        <!-- 商品库存 -->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['mustBox']">商品库存</view>
+          <input
+            type="number"
+            v-model="attrValueForm.stock"
+            :adjust-position="false"
+            placeholder="请输入商品库存"
+            class="placeholder-class"
+          />
+        </view>
+        <!-- 商品编号 -->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['']">商品编号</view>
+          <input
+            type="text"
+            v-model="attrValueForm.bar_code"
+            :adjust-position="false"
+            placeholder="请输入商品编号"
+            class="placeholder-class"
+          />
+        </view>
+        <!-- 重量（KG） -->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['']">重量（KG）</view>
+          <input
+            type="text"
+            v-model="attrValueForm.weight"
+            :adjust-position="false"
+            placeholder="请输入商重量（KG）"
+            class="placeholder-class"
+          />
+        </view>
+        <!-- 商品体积(m³) -->
+        <view class="form-item-box">
+          <view class="form-box-txt" :class="['']">商品体积(m³)</view>
+          <input
+            type="text"
+            v-model="attrValueForm.volume"
+            :adjust-position="false"
+            placeholder="请输入商品体积(m³)"
+            class="placeholder-class"
+          />
+        </view>
       </view>
       <!-- 商品简介 -->
       <view class="business-box pb15">
@@ -251,6 +368,7 @@ import {
   getMerchantProfitApi,
 } from "@/commit/product.js";
 import { getBaseInfo } from "@/commit/user.js";
+import { accMul, accDiv, accAdd, accSub } from "@/utils/acc.js";
 export default {
   components: {
     headersVue,
@@ -331,7 +449,17 @@ export default {
         gong_market_price: "",
         plate_mer_profit: "",
         extension_two: null,
+        image: "", //商品图片
+        extension_one: this.base_commission, //分润比例(%)
+        cost: "", //成本价
+        price: "", //商品售价
+        ot_price: "", //商品原价
+        stock: "", //商品库存
+        bar_code: "", //商品编号
+        weight: "", //重量（KG）
+        volume: "", //商品体积(m³)
       },
+      costInputValue: "",
     };
   },
   async onLoad() {
@@ -422,6 +550,7 @@ export default {
       getMerchantProfitApi()
         .then((res) => {
           this.base_commission = res.data.message;
+          this.attrValueForm.extension_one = this.base_commission;
         })
         .catch((err) => {
           console.log(err);
@@ -502,27 +631,56 @@ export default {
         });
         return;
       }
-      const dataList = (this.attrValue[0] && this.attrValue[0].modules) || [];
-      const dataNew = dataList.map((item, index) => {
-        return {
-          tips: dataList[index].title,
-          props: dataList[index].props,
-          isEmpty:
-            dataList[index].ismust &&
-            (dataList[index].value == "" ||
-              dataList[index].value == undefined ||
-              dataList[index].value == null),
-          value: dataList[index].value || "",
-        };
-      });
-      const data = dataNew.some((item) => item.isEmpty);
-      if (data) {
+      if (
+        this.attrValueForm.extension_one == "" ||
+        this.attrValueForm.extension_one == null
+      ) {
+        uni.showToast({
+          title: "请填写分润比例",
+          icon: "none",
+        });
+        return;
+      }
+      if (this.attrValueForm.cost == "" || this.attrValueForm.cost == null) {
+        uni.showToast({
+          title: "请填写商品成本价",
+          icon: "none",
+        });
+        return;
+      }
+      if (this.attrValueForm.price == "" || this.attrValueForm.price == null) {
+        uni.showToast({
+          title: "请填写商品售价",
+          icon: "none",
+        });
+        return;
+      }
+      if (
+        this.attrValueForm.ot_price == "" ||
+        this.attrValueForm.ot_price == null ||
+        this.attrValueForm.ot_price == 0
+      ) {
         uni.showToast({
-          title: "请填写完所有必填项",
+          title: "请填写商品原价",
           icon: "none",
         });
         return;
       }
+      if (this.attrValueForm.stock == "" || this.attrValueForm.stock == null) {
+        uni.showToast({
+          title: "请填写商品库存",
+          icon: "none",
+        });
+        return;
+      }
+      if(this.attrValueForm.extension_one <5 || this.attrValueForm.extension_one > 100 || this.attrValueForm.extension_one == ""){
+        uni.showToast({
+          title: "请填写正确的分润比例",
+          icon: "none", 
+        })
+        return;
+      }
+       
       if (this.formData.store_info == "") {
         uni.showToast({
           title: "请填写商品简介",
@@ -530,23 +688,14 @@ export default {
         });
         return;
       }
-      let attrValueData = dataNew.map((item, index) => {
-        let parmas = {};
-        if ([item.props] == "image") {
-          Object.assign(parmas, { image: this.formData.image });
-        } else {
-          Object.assign(parmas, { [item.props]: item.value });
-        }
-        return parmas;
-      });
-      // 使用 reduce 方法合并数组中的对象
-      const mergedObject = attrValueData.reduce((acc, current) => {
-        return { ...acc, ...current };
-      }, {});
+      this.attrValueForm.image =  this.formData.image 
+
+
 
       // 转换为包含合并后对象的数组
-      const result = [{ mergedObject, ...this.attrValueForm }];
+      const result = [{  ...this.attrValueForm }];
       const newParams = { ...this.formData, attrValue: result };
+      console.log(newParams, "newParams");
       uni.showLoading({
         title: "数据提交中...",
       });
@@ -591,16 +740,8 @@ export default {
     },
     /**分润设置选择 */
     changeFengrun(val) {
-      this.formData.extension_type = val;
-      const _this = this;
-      this.attrValue[0].modules.forEach((item) => {
-        if (item.props === "extension_one") {
-          _this.$set(item, "value", _this.base_commission);
-        } else {
-          _this.$set(item, "value", item.value);
-        }
-      });
-      this.priceDefault = "0.00"
+      console.log(val, "分润设置选择");
+      this.attrValueForm.extension_one = this.base_commission;
     },
     changeInputHandle(ev, its, item, idx) {
       if (its.props == "cost" || its.props == "extension_one") {
@@ -623,6 +764,129 @@ export default {
       }
       console.log(this.attrValueForm, "attrValueForm", its);
     },
+    /**分润比例输入框 */
+    changeInputHandleExtensionOne(e) {
+      let value = e;
+      if (value < 5) {
+        uni.showToast({
+          title: "分润比例不能小于5%",
+          icon: "none",
+        });
+        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;
+        })
+
+      }
+
+      let data = {
+        extension_one: this.attrValueForm.extension_one,
+        cost: this.attrValueForm.cost,
+      };
+      this.getCalcAfterPrice(data);
+    },
+    getCalcAfterPrice(data) {
+      let bili = accMul(data.extension_one, 100); //比例
+      console.log(bili, "比例");
+      let gong_mer_profit = accMul(data.cost, bili); //利润
+      console.log(gong_mer_profit, "利润");
+      let gong_market_price = accAdd(data.cost, gong_mer_profit); //加入利润后的价格
+      let plate_mer_profit = gong_mer_profit;
+      console.log(gong_market_price, "加入利润后的价格", plate_mer_profit);
+      this.attrValueForm.price = gong_market_price;
+      this.priceDefault = gong_market_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, "计算的内容:");
+    },
+    /**
+     * 商品成本价
+     */
+    changeInputHandleCost(e) {
+      console.log("商品成本价", e);
+      let value = e;
+      const _this = this;
+      if (value == "" || value == null || value == undefined || value == "0") {
+        uni.showToast({
+          title: "请输入正确的金额",
+          icon: "none",
+        });
+      }
+
+      const formatted = this.limitPriceFormat(value);
+      _this.attrValueForm.cost = formatted;
+      let data = {
+        extension_one: this.attrValueForm.extension_one,
+        cost: this.attrValueForm.cost || "0",
+      };
+      this.getCalcAfterPrice(data);
+    },
+    /**
+     * 商品原价
+     */
+    changeInputHandleOTPrice(e) {
+      let value = e;
+      const _this = this;
+      if (value == "" || value == null || value == undefined || value == "0") {
+        uni.showToast({
+          title: "请输入正确的金额",
+          icon: "none",
+        });
+      }
+
+      const formatted = this.limitPriceFormat(value);
+        this.$nextTick(()=>{
+        _this.attrValueForm.ot_price = formatted;
+        })
+     
+    },
+
+    limitPriceFormat(value) {
+      // 移除不符合金额格式的字符
+      value = value.replace(/[^\d.]/g, "");
+
+      // 处理多个连续的 0 开头的情况
+      while (
+        value.startsWith("0") &&
+        value.length > 1 &&
+        !value.startsWith("0.")
+      ) {
+        value = value.slice(1);
+      }
+
+      // 处理多个小数点的情况
+      const parts = value.split(".");
+      if (parts.length > 2) {
+        value = parts[0] + "." + parts.slice(1).join("");
+      }
+
+      // 处理小数点后超过两位的情况
+      const decimalIndex = value.indexOf(".");
+      if (decimalIndex !== -1) {
+        value = value.slice(0, decimalIndex + 3);
+      }
+
+      // 若结果为纯 0 字符串，只保留一个 0
+      if (/^0+\.?0*$/.test(value)) {
+        value = "0";
+      }
+
+      return value;
+    },
+    isValidAmount(input) {
+      // 正则表达式，用于匹配金额格式
+      const regex = /^\d+(\.\d{1,2})?$/;
+      return regex.test(input);
+    },
   },
   computed: {
     shangpingleixing() {
@@ -979,12 +1243,21 @@ page {
   font-size: 30rpx;
   color: #333333;
   text-align: right;
-  padding: 0rpx 0rpx 0rpx 15rpx;
+  padding: 0rpx 5rpx 0rpx 15rpx;
   outline: none;
   border: none;
   background: none;
   /deep/.uni-input-placeholder {
     color: #999;
+    font-size: 28rpx;
+  }
+  /deep/.uni-easyinput__content {
+    outline: none;
+    border: none;
+    background: none;
+  }
+  /deep/.uni-input-input {
+    font-size: 28rpx;
   }
 }
 .mr-t {

shop/productManagementModule/index.vue

@@ -10,12 +10,12 @@
         :cardData="dataBuss"
         @custom-handle-click="businessHandleClick"
       ></listCardInfo>
-      <listCardInfo
+      <!-- <listCardInfo
         headerTitle="供应链"
         class="mb-t1"
         :cardData="onlineData"
         @custom-handle-click="onGongyingliang"
-      ></listCardInfo>
+      ></listCardInfo> -->
       <!-- <listCardInfo headerTitle="商品分类" class="mb-t1" :fullSreen="true" fullSreenTitle="商品分类列表" ></listCardInfo> -->
       <!-- <listCardInfo headerTitle="商品规格" class="mb-t1" :fullSreen="true" fullSreenTitle="商品规格列表"></listCardInfo> -->
       <listCardInfo
@@ -25,11 +25,11 @@
         fullSreenTitle="商品评价列表"
         @custom-handle-click="onHandlePingJia"
       ></listCardInfo>
-      <listCardInfo
+      <!-- <listCardInfo
        headerTitle="在线选品"
        class="mb-t1" 
       :fullSreen="true"
-        fullSreenTitle="在线选品列表"  @custom-handle-click="onHandleXuanPin"></listCardInfo>
+        fullSreenTitle="在线选品列表"  @custom-handle-click="onHandleXuanPin"></listCardInfo> -->
     </view>
   </view>
 </template>

utils/acc.js

@@ -0,0 +1,100 @@
+/**
+ * 数学运算
+ */
+
+/**
+ * 两个浮点数求和
+ * @author lsy
+ * @param num1
+ * @param num2
+ * @return {number}
+ */
+export function accAdd(num1, num2) {
+  // eslint-disable-next-line one-var
+  let r1 = 0, r2 = 0
+  try {
+    r1 = (num1.toString().split('.')[1] || []).length
+  } catch (e) {
+    return num1 + num2
+  }
+  try {
+    r2 = (num2.toString().split('.')[1] || []).length
+  } catch (e) {
+    return num1 + num2
+  }
+  const m = Math.pow(10, Math.max(r1, r2))
+  return Math.round(accMul(num1, m) + accMul(num2, m)) / m
+}
+
+/**
+ * 两个浮点数相减
+ * @author lsy
+ * @param num1
+ * @param num2
+ * @return {number}
+ */
+export function accSub(num1, num2) {
+  let r1, r2
+  try {
+    r1 = (num1.toString().split('.')[1] || []).length
+  } catch (e) {
+    return num1 - num2
+  }
+  try {
+    r2 = (num2.toString().split('.')[1] || []).length
+  } catch (e) {
+    return num1 - num2
+  }
+  const m = Math.pow(10, Math.max(r1, r2))
+  return Math.round(accMul(num1, m) - accMul(num2, m)) / m
+}
+
+/**
+ * 两个浮点数相乘
+ * @author lsy
+ * @param num1
+ * @param num2
+ * @return {number}
+ */
+export function accMul(num1, num2) {
+  let m = 0
+  const s1 = num1.toString()
+  const s2 = num2.toString()
+  try {
+    m += (s1.split('.')[1] || []).length
+  } catch (e) {
+    return num1 * num2
+  }
+  try {
+    m += (s2.split('.')[1] || []).length
+  } catch (e) {
+    return num1 * num2
+  }
+  return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
+}
+
+/**
+ * 两个浮点数相除
+ * @author lsy
+ * @param num1
+ * @param num2
+ * @return {number}
+ */
+export function accDiv(num1, num2) {
+  let m = 0
+  const s1 = num1.toString()
+  const s2 = num2.toString()
+  try {
+    m += (s1.split('.')[1] || []).length
+  } catch (e) {
+    return num1 / num2
+  }
+  try {
+    m += (s2.split('.')[1] || []).length
+  } catch (e) {
+    return num1 / num2
+  }
+  const n1 = accMul(num1, Math.pow(10, m))
+  const n2 = accMul(num2, Math.pow(10, m))
+  return Number(n1) / Number(n2)
+}