Merge branch '测试' into 楚楚/2.6.0

packageA/activity/bindingProduct/index.js

@@ -35,11 +35,12 @@ Page({
         params.content.pageNumber = 1;
         params.content.pageTotal = 1;
       }
+      console.log(params)
       _Http.basic({
-        "classname": "sysmanage.develop.optiontype.optiontype",
-        "method": "optiontypeselect",
-        "content": {
-          "typename": "package"
+        id: 2024080614131103,
+        content: {
+          sa_promotionid: params.content.sa_promotionid,
+          packagetype: params.content.packagetype
         }
       }).then(res => {
         console.log('套餐分类', res)
@@ -50,7 +51,6 @@ Page({
         let packageList = []
         try {
           let packagetypemxrows = [];
-
           if (options.packagetypemxrows) {
             this.data.packagetypemxrows = JSON.parse(options.packagetypemxrows);
             packagetypemxrows = this.data.packagetypemxrows.map(v => v.packagetypemx);

packageA/activity/selectProduct/index.js

@@ -84,7 +84,6 @@ Page({
         "content": {
           sa_promotionid: this.data.params.content.sa_promotionid,
           items: this.data.resultList.map(v => {
-            console.log(v)
             return {
               "sa_brandid": this.data.params.content.sa_brandid,
               "sa_promotionid": this.data.params.content.sa_promotionid,

packageA/market/detail.js

@@ -2,10 +2,6 @@ const _Http = getApp().globalData.http;
 let sa_brandid = null,
 	sys_enterpriseid = null;
 
-import {
-	getLabelList
-} from "../../utils/customItemType";
-
 import {
 	fileList
 } from "../../utils/FormatTheAttachment";
@@ -15,7 +11,6 @@ Page({
 	data: {
 		itemCount: 0,
 		selectCount: 0,
-		labelList: getLabelList(),
 		hidePrice: wx.getStorageSync('hidePrice'),
 		badge: getApp().globalData.collectCount,
 		favoriteCount: getApp().globalData.favoriteCount,
@@ -27,11 +22,13 @@ Page({
 			material: "", //材质
 			cheek: "" //边框
 		},
+		itmes: [],
 		detail: {
 			spec: ""
 		},
 		privacyFieldC: [],
-		isShowFavorites: false
+		isShowFavorites: false,
+		UniqueLine: false
 	},
 	onLoad(options) {
 		let data = JSON.parse(options.params);
@@ -56,6 +53,7 @@ Page({
 	getDetail(init = false, getCustom = true) {
 		let content = this.data.content;
 		if (sys_enterpriseid) content.sys_enterpriseid = sys_enterpriseid;
+		if (this.data.UniqueLine)['spec', 'cheek', 'material', 'color'].forEach(key => content[key] = '')
 		_Http.basic({
 			"id": "20221223165503",
 			content
@@ -80,7 +78,7 @@ Page({
 			item.gradeprice = CNY(item.gradeprice);
 			item.marketprice = CNY(item.marketprice);
 			item.qty = item.orderaddqty;
-			let ros = {
+			let row = {
 				specRows: res.data.specRows.reverse(),
 				cheekRows: res.data.cheekRows,
 				materialRows: res.data.materialRows,
@@ -88,25 +86,32 @@ Page({
 			};
 
 			let obj = {},
-				auto = true;
-			['spec', 'cheek', 'material', 'color'].forEach(key => obj[key] = ros[key + 'Rows'].filter(v => v.flag))
-
+				auto = true,
+				UniqueLine = true;
+			res.data.customschemeItems.map(v => v.value).forEach(key => obj[key] = row[key + 'Rows'].filter(v => v.flag))
 			for (const key in obj) {
-				if (obj[key].length > 1) auto = false;
+				if (obj[key].length > 1) {
+					auto = false
+					UniqueLine = false;
+				}
 			}
 			if (auto) {
 				for (const key in obj) {
 					if (obj[key].length) content[key] = obj[key][0].parm;
 				}
 			}
+
 			this.setData({
 				content,
 				detail: item,
-				...ros,
+				row,
+				customschemeItems: res.data.customschemeItems,
 				loading: false,
 				itemCount: ['specRows', 'cheekRows', 'materialRows', 'colorRows'].filter(v => res.data[v].length).length,
-				selectCount: ['cheek', 'color', 'material', 'spec'].filter(v => content[v].length).length
+				selectCount: ['cheek', 'color', 'material', 'spec'].filter(v => content[v].length).length,
+				UniqueLine
 			});
+			console.log("itmes", this.data.itmes)
 			//是否定制
 			if (getCustom && item.iscustomsize == 1) this.selectComponent("#customMade").init(item);
 		})
@@ -170,6 +175,7 @@ Page({
 			title: '加载中...',
 			mask: true
 		})
+		// UniqueLine
 		content[valuename] = (content[valuename] == value.parm) ? "" : value.parm;
 		this.setData({
 			selectCount: ['cheek', 'color', 'material', 'spec'].filter(v => content[v].length).length
@@ -320,7 +326,7 @@ Page({
 			}
 		//是否为定制项
 		if (detail.iscustomsize == 1) custom = this.selectComponent("#customMade").getResult(true);
-		console.log("custom",custom)
+		console.log("custom", custom)
 		if (typeof custom == "boolean") return;
 		content.items = [Object.assign({
 			sa_orderitemsid: 0,

packageA/market/detail.wxml

@@ -34,42 +34,18 @@
         <text>包装数量:{{detail.packageqty||' --'}}</text>
     </view>
 </view>
-<!-- 选择规格 -->
 <view class="model">
-    <block wx:if="{{materialRows.length}}">
-        <view class="label">
-            {{labelList.material}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.material===item.parm?'active':''}} {{item.flag?'':'disabled'}}" wx:for="{{materialRows}}" wx:key="index" bindtap="changeItemno" data-valuename="material" data-value="{{item}}">{{item.parm}}</navigator>
-        </view>
-    </block>
-
-    <block wx:if="{{colorRows.length}}">
-        <view class="label">
-            {{labelList.color}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.color===item.parm?'active':''}} {{item.flag?'':'disabled'}}" wx:for="{{colorRows}}" wx:key="index" bindtap="changeItemno" data-valuename="color" data-value="{{item}}">{{item.parm}}</navigator>
-        </view>
-    </block>
-
-    <block wx:if="{{cheekRows.length}}">
-        <view class="label">
-            {{labelList.cheek}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.cheek===item.parm?'active':''}}  {{item.flag?'':'disabled'}}" wx:for="{{cheekRows}}" wx:key="index" bindtap="changeItemno" data-valuename="cheek" data-value="{{item}}">{{item.parm}}</navigator>
-        </view>
-    </block>
-
-    <block wx:if="{{specRows.length}}">
-        <view class="label">
-            {{labelList.spec}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.spec===item.parm?'active':''}} {{item.flag?'':'disabled'}}" wx:for="{{specRows}}" wx:key="index" bindtap="changeItemno" data-valuename="spec" data-value="{{item}}">{{item.parm=='custom'?'自定义':item.parm}}</navigator>
-        </view>
+    <block wx:for="{{customschemeItems}}" wx:key="value" wx:for-item="it">
+        <block wx:if="{{row[it.value+'Rows'].length}}">
+            <view class="label">
+                {{it.description}}
+            </view>
+            <view class="product-box">
+                <block wx:for="{{row[it.value+'Rows']}}" wx:key="index">
+                    <navigator v-if="{{it.isonlydisplay == 0 && item.parm}}" url="#" class="product {{content[it.value] === item.parm ? 'active' :''}} {{item.flag ? '' : 'disabled'}}" bindtap="changeItemno" data-valuename="{{it.value}}" data-value="{{item}}">{{item.parm=='custom'?'自定义':item.parm}}</navigator>
+                </block>
+            </view>
+        </block>
     </block>
     <!-- 定制项 -->
     <view wx:if="{{detail.iscustomsize==1}}" style="padding-bottom: 20rpx;">
@@ -79,13 +55,13 @@
             </view>
         </customMade>
     </view>
+    
     <view class="label">
         数量 <text style="font-size: 24rpx;font-weight: 400;">(起订量:{{detail.orderminqty}}，增减量:{{detail.orderaddqty}}，包装量:{{detail.packageqty}})</text>
     </view>
     <view class="product-box" style="margin-top: 20rpx;">
         <van-stepper value="{{ detail.qty }}" min="{{detail.orderminqty}}" step="{{detail.orderaddqty||1}}" input-class='input-class' data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
     </view>
-
     <block wx:if="{{detail.canuseactivity.length}}">
         <view class="label" style="border: none;">
             此商品正在促销

packageA/orderForm/detail.wxml

@@ -65,7 +65,7 @@
 </view>
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-    <Product slot='产品明细' privacyFieldC='{{privacyFieldC}}' packagetypemxrows="{{detail.packagetypemxrows}}" id='Product' disabled="{{detail.status!='新建'}}" packagetype='{{detail.packagetype}}' sa_order_v='{{detail.sa_order_v}}' bind:returnProductCount='getProductCount' />
+    <Product slot='产品明细' privacyFieldC='{{privacyFieldC}}' sa_promotionid="{{detail.sa_promotionid}}" packagetypemxrows="{{detail.packagetypemxrows}}" id='Product' disabled="{{detail.status!='新建'}}" packagetype='{{detail.packagetype}}' sa_order_v='{{detail.sa_order_v}}' bind:returnProductCount='getProductCount' />
     <Yl_Attachment slot='附件' id='Yl_Attachment' ownertable="sa_order" ownerid="{{detail.sa_orderid}}" disabled="{{detail.status!='新建'}}" />
     <Progress slot='订单进度' id='Progress' hidePrice='{{hidePrice.hidePrice("订单进度",privacyFieldC)}}' />
     <Consignment slot='出库单' id='Consignment' />

packageA/orderForm/modules/product/index.js

@@ -29,6 +29,9 @@ Component({
         packagetypemxrows: {
             type: Array,
             value: []
+        },
+        sa_promotionid:{
+            type: String
         }
     },
     data: {
@@ -176,6 +179,7 @@ Component({
                             nocache: true,
                             sa_orderid, //订单ID
                             packagetype: this.data.packagetype,
+                            sa_promotionid: this.data.sa_promotionid,
                             "where": {
                                 "condition": "",
                                 packagetypemx: "",

packageA/target/index.js

@@ -163,21 +163,22 @@ Page({
 					label: "月度",
 					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`]), //差额
+					distance: Math.abs(data[`m${obj.month-0}a`] - data[`m${obj.month-0}l`]).toFixed(2), //差额
 					achievingRate: data[`m${obj.month-0}pl`] + "%", //达成
 					color: "#FF9900"
 				}, {
 					label: "季度",
 					...ar[obj.quarter - 1],
-					distance: Math.abs(ar[obj.quarter - 1].fulfill - ar[obj.quarter - 1].target), //差额
+					distance: Math.abs(ar[obj.quarter - 1].fulfill - ar[obj.quarter - 1].target).toFixed(2), //差额
 					color: "#2AB4A3"
 				}, {
 					...table[0],
 					label: "年度",
-					distance: Math.abs(data.y1a - data.y1l), //差额
+					distance: Math.abs(data.y1a - data.y1l).toFixed(2), //差额
 					color: "#FF001F"
 				}].map(v => {
 					v.achievingRate = v.achievingRate.split("%")[0] - 0
+					console.log("v.distance",v.distance)
 					return v
 				})