aspectFit

components/editor.vue

@@ -5,7 +5,6 @@
         <view
           class="toolbar"
           @tap="format"
-          style="height: 120px; overflow-y: auto"
         >
           <view
             :class="formats.bold ? 'ql-active' : ''"
@@ -19,6 +18,7 @@
             data-name="italic"
           >
           </view>
+           <view class="iconfont icon-charutupian" @tap="insertImage"></view>
           <view
             :class="formats.underline ? 'ql-active' : ''"
             class="iconfont icon-zitixiahuaxian"
@@ -134,7 +134,7 @@
             data-value="+1"
           ></view>
           <view class="iconfont icon-fengexian" @tap="insertDivider"></view>
-          <view class="iconfont icon-charutupian" @tap="insertImage"></view>
+         
           <view
             :class="formats.header === 1 ? 'ql-active' : ''"
             class="iconfont icon-format-header-1"
@@ -187,7 +187,7 @@ export default {
     },
 	placeholder:{
 		type:String,
-		default:"开始输入..."
+		default:"请输入商品详情信息..."
 	},
 	readOnly:{
 		type:Boolean,
@@ -208,7 +208,7 @@ export default {
          console.log(val)
          if(val){
           this.$nextTick(()=>{
-            this.onEditorReady()
+            // this.onEditorReady()
           })
          }
       },
@@ -217,7 +217,7 @@ export default {
   },
   mounted(){
      this.richText = this.value;
-     this.onEditorReady()
+    //  this.onEditorReady()
   },
   methods: {
     readOnlyChange() {
@@ -361,7 +361,7 @@ export default {
 @import "./editor-icon.css";
 
 .page-body {
-  height: calc(100vh - var(--window-top) - var(--status-bar-height));
+  height: calc(100% - var(--window-top) - var(--status-bar-height));
 }
 
 .wrapper {
@@ -375,11 +375,11 @@ export default {
 
 .iconfont {
   display: inline-block;
-  padding: 8px 8px;
-  width: 24px;
-  height: 24px;
+  padding: 16rpx;
+  width: 34rpx;
+  height: 34rpx;
   cursor: pointer;
-  font-size: 20px;
+  font-size: 40rpx;
 }
 
 .toolbar {
@@ -390,12 +390,12 @@ export default {
 
 .ql-container {
   box-sizing: border-box;
-  padding: 12px 15px;
+  padding: 24rpx 30rpx;
   width: 100%;
   min-height: 30vh;
   height: 100%;
-  margin-top: 20px;
-  font-size: 16px;
+  margin-top: 20rpx;
+  font-size: 32rpx;
   line-height: 1.5;
 }
 

pages/cashier/index.vue

@@ -9,7 +9,7 @@
         <view class="cashier-tablin-nie">
           <view class="cashier-tablin-nie-left">
             <view class="cashier-tablin-nie-left-icon">
-              <image :src="merchantCashierShow.logo" mode="widthFix"> </image>
+              <image :src="merchantCashierShow.logo" mode="aspectFit"> </image>
             </view>
             <view class="cashier-tablin-nie-left-text">
               <view class="cashier-tablin-nie-left-text-top">
@@ -689,14 +689,13 @@ page {
             image {
               width: 100%;
               height: 100%;
-              height: auto;
               border-radius: 20rpx;
             }
           }
 
           .cashier-tablin-nie-left-text {
             width: 280rpx;
-            height: 100%;
+            height: 100%;
 		    margin-left: 15rpx;
             display: flex;
             flex-direction: column;

shop/productManagementModule/addProduct.vue

@@ -211,7 +211,7 @@
             :adjust-position="false"
             placeholder="请输入分润比例"
             class="placeholder-class"
-            @input="changeInputHandleExtensionOne"
+            @change="changeInputHandleExtensionOne"
             :clearable="false"
           ></uni-easyinput>
           <view class="view-unit-input">%</view>
@@ -227,7 +227,7 @@
             placeholder="请输入商品成本价"
             class="placeholder-class"
             :clearable="false"
-            @input="changeInputHandleCost"
+            @change="changeInputHandleCost"
           ></uni-easyinput>
         </view>
         <!-- 商品售价 price-->
@@ -473,8 +473,8 @@ export default {
   async onLoad(e) {
     this.product_id = e.product_id || "";
     this.clickType = e.clickType;
-     await this.getGoodsClassCategoryData();
-      await this.getMerchantProfit();
+    await this.getGoodsClassCategoryData();
+    await this.getMerchantProfit();
     if (this.clickType == "updated" && this.product_id) {
       uni.showLoading({
         title: "加载中",
@@ -482,7 +482,7 @@ export default {
       });
       await this.getProductDetailData(this.product_id);
     }
-     await this.initData();
+    await this.initData();
   },
   onShow() {},
   methods: {
@@ -518,11 +518,11 @@ export default {
             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")
+          console.log(this.base_commission, "this.base_commission");
           this.getCalcAfterPrice({
-            extension_one:attrValue.extension_one,
-            cost:this.attrValueForm.cost
-          })
+            extension_one: attrValue.extension_one,
+            cost: this.attrValueForm.cost,
+          });
           if (data.image) {
             this.fengMianImage = [];
             let fenMian = {
@@ -554,13 +554,12 @@ export default {
       await this.getBrandSelectData();
       await this.getShippingListData();
       await this.getGoodsClassData();
-    
+
       await this.productCon();
       await this.getMerInfo();
-     
     },
     convertToFlatArray(data) {
-     return Array.isArray(data)
+      return Array.isArray(data)
         ? data.flatMap((node) => {
             const { value, label, children = [] } = node;
             if (typeof value !== "number" || typeof label !== "string")
@@ -796,11 +795,11 @@ export default {
       uni.showLoading({
         title: "数据提交中...",
       });
-      let req = this.clickType === "updated" ? updateProduct : addProduct
-      let product_id = this.clickType === "updated"? this.product_id : ""
+      let req = this.clickType === "updated" ? updateProduct : addProduct;
+      let product_id = this.clickType === "updated" ? this.product_id : "";
 
       try {
-        const res = await req(product_id,newParams);
+        const res = await req(product_id, newParams);
         if (res.data.status == 200) {
           uni.showToast({
             title: "数据提交成功",
@@ -885,11 +884,13 @@ export default {
           this.attrValueForm.extension_one = this.base_commission;
         });
       }
-
+      this.attrValueForm.extension_one =
+        value < 5 ? "5" : value > 100 ? this.base_commission : value;
       let data = {
         extension_one: this.attrValueForm.extension_one,
         cost: this.attrValueForm.cost,
       };
+      console.log("changeInputHandleExtensionOne==>>>", data);
       this.getCalcAfterPrice(data);
     },
     getCalcAfterPrice(data) {
@@ -899,7 +900,12 @@ export default {
       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);
+      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;