Merge branch '测试' into 楚楚/2.3.1

packageA/favorites/index.js

@@ -76,26 +76,35 @@ Page({
         obj[name] = custom[key]
       }
       return new Promise((resolve) => {
-        _Http.basic({
-          "id": 20231121143403,
-          "content": {
-            "itemid": item.itemid,
-            "sa_favoritesid": item.sa_favoritesid,
-            "favoritesqty": item.favoritesqty,
-            "qty": item.favoritesqty,
-            ...obj,
-            ...custom,
-            "iscollection": true
-          },
-        }).then(res => {
-          console.log("修改定制", res)
-          wx.showToast({
-            title: res.msg != '成功' ? res.msg : '修改成功',
-            icon: "none"
-          });
-          this.getList()
-          resolve(true)
+        console.log('定制信息', custom)
+        let index = this.data.list.findIndex(v => v.sa_favoritesid == item.sa_favoritesid);
+        item = Object.assign(item, custom);
+        item.customText = getCustomText(item, 'favorites')
+        this.setData({
+          [`list[${index}]`]: item
         })
+        this.computeSum()
+        resolve(true)
+        /*   _Http.basic({
+            "id": 20231121143403,
+            "content": {
+              "itemid": item.itemid,
+              "sa_favoritesid": item.sa_favoritesid,
+              "favoritesqty": item.favoritesqty,
+              "qty": item.favoritesqty,
+              ...obj,
+              ...custom,
+              "iscollection": true
+            },
+          }).then(res => {
+            console.log("修改定制", res)
+            wx.showToast({
+              title: res.msg != '成功' ? res.msg : '修改成功',
+              icon: "none"
+            });
+            this.getList()
+            resolve(true)
+          }) */
       })
     }
     if (item) this.selectComponent("#Custom").onClick(item)
@@ -124,7 +133,7 @@ Page({
       this.setData({
         list: res.data.map(v => {
           v.showPrice = CNY(v.gradeprice)
-          if (v.iscustomsize) v.customText = getCustomText(v, 'favorites');
+          if (v.iscustomsize) v.customText = ""; //getCustomText(v, 'favorites')
           return v
         })
       });
@@ -195,6 +204,12 @@ Page({
   /* 处理生成订单 */
   handleSubmit(index) {
     let data = this.data.classList[index];
+    let illegals = data.list.filter(v => v.iscustomsize && v.customText == "").map(v => v.erpitemname);
+    if (illegals.length) return wx.showModal({
+      title: '提示',
+      content: `${illegals}定制信息有误，请检查！`,
+      showCancel: false
+    })
     wx.showLoading({
       title: '生成中...',
     })
@@ -260,6 +275,12 @@ Page({
   },
   addToShoppingCart(index) {
     let data = this.data.classList[index];
+    let illegals = data.list.filter(v => v.iscustomsize && v.customText == "").map(v => v.erpitemname);
+    if (illegals.length) return wx.showModal({
+      title: '提示',
+      content: `${illegals}定制信息有误，请检查！`,
+      showCancel: false
+    })
     wx.showLoading({
       title: '处理中...',
     })

packageA/favorites/index.wxml

@@ -20,7 +20,7 @@
 					<view class="exp">品牌：{{item.brandname ||" --"}}</view>
 					<view class="exp">领域：{{item.tradefield_shoppingcart ||" --"}}</view>
 					<view class="exp" wx:if="{{item.iscustomsize}}" data-item="{{item}}" catch:tap="customization" style="color:#085CDF;">
-						{{item.customText}}
+						{{item.customText||'定制信息'}}
 						<van-icon name="arrow-down" />
 					</view>
 					<view class="price" style="bottom: {{item.iscustomsize?'40rpx':'0rpx'}};">{{handleHide.verify(item.showPrice,'收藏夹价格',privacyFieldC)}}/{{item.unitname}}</view>

packageA/target/index.js

@@ -2,7 +2,12 @@ const _Http = getApp().globalData.http,
 	{
 		formatTime
 	} = require("../../utils/getTime");
-let obj = {};
+let obj = {},
+	currency = require("../../utils/currency"),
+	CNY = value => currency(value, {
+		symbol: "￥",
+		precision: 2
+	}).format();
 Page({
 	data: {
 
@@ -58,7 +63,7 @@ Page({
 					fulfill: data.m10a + data.m11a + data.m12a,
 					target: data.m10l + data.m11l + data.m12l,
 				}].map(v => {
-					v.achievingRate = (v.fulfill / v.target) * 100 + '%'
+					v.achievingRate = ((v.fulfill / v.target) * 100).toFixed(2) + '%'
 					return v
 				}),
 				table = [{
@@ -141,10 +146,10 @@ Page({
 				}],
 				statistics = [{
 					label: "月度",
-					fulfill: data[`m${obj.month}a`],
-					target: data[`m${obj.month}l`],
-					distance: Math.abs(data[`m${obj.month}a`] - data[`m${obj.month}l`]), //差额
-					achievingRate: data[`m${obj.month}pl`] + "%", //达成
+					fulfill: data[`m${obj.month-0}a`],
+					target: data[`m${obj.month-0}l`],
+					distance: Math.abs(data[`m${obj.month-0}a`] - data[`m${obj.month-0}l`]), //差额
+					achievingRate: data[`m${obj.month-0}pl`] + "%", //达成
 					color: "#FF9900"
 				}, {
 					label: "季度",
@@ -160,6 +165,7 @@ Page({
 					v.achievingRate = v.achievingRate.split("%")[0] - 0
 					return v
 				})
+
 			this.setData({
 				table,
 				statistics

pages/index/collect/modules/customMade/index.js

@@ -25,6 +25,7 @@ Component({
     init(data, prefix = '') {
       return new Promise((resolve) => {
         getCustomItems(data, prefix).then(list => {
+          console.log("list",list)
           this.setData({
             list
           });

utils/customItemType.js

@@ -1,8 +1,8 @@
 function getLabelList() {
 	let siteCustomLabel = {
 		"default": {
-			width: "宽",
 			length: "长",
+			width: "宽",
 			cheek: "边框",
 			color: "颜色",
 			material: "基材",
@@ -10,8 +10,8 @@ function getLabelList() {
 			custom: "定制"
 		},
 		"DLB": {
-			width: "宽",
 			length: "长",
+			width: "宽",
 			cheek: "工艺",
 			color: "颜色",
 			material: "选项",