970319330@qq.com 3 недель назад
Родитель
Сommit
8a7d44b494

+ 1 - 1
packageA/activity/selectProduct/index.js

@@ -220,7 +220,7 @@ Page({
       let isAdd = result.some(v => v == id);
       if (!isAdd) {
         if (item.iscustomsize == 1) {
-          if ((item.widthschemeid && !item.width) || (item.lengthschemeid && !item.length)) {
+          if ((item.widthschemeid && !item.width) || (item.lengthschemeid && !item.length) || (item.heightschemeid && !item.height)) {
             item.pitchOn = true;
             this.bindChangeFun();
             if (item) this.selectComponent("#Custom").onClick(item)

+ 1 - 0
packageA/favorites/index.js

@@ -247,6 +247,7 @@ Page({
               "sa_brandid": v.brand.length ? v.brand[0].sa_brandid : this.data.sa_brandid || 0,
               width: v.favoriteswidth || 0,
               length: v.favoriteslength || 0,
+              height: v.favoritesheight || 0,
             }
           })
         }

+ 5 - 2
packageA/market/detail.js

@@ -252,7 +252,8 @@ Page({
 		let detail = this.data.detail,
 			custom = {
 				length: 0,
-				width: 0
+				width: 0,
+				height: 0
 			};
 		//是否为定制项
 		if (detail.iscustomsize == 1) custom = this.selectComponent("#customMade").getResult(true);
@@ -286,6 +287,7 @@ Page({
 			custom = {
 				width: 0,
 				length: 0,
+				height: 0
 			},
 			favorites = {};
 		//是否为定制项
@@ -330,7 +332,8 @@ Page({
 			},
 			custom = {
 				length: 0,
-				width: 0
+				width: 0,
+				height: 0
 			}
 		//是否为定制项
 		if (detail.iscustomsize == 1) custom = this.selectComponent("#customMade").getResult(true);

+ 1 - 0
packageA/orderForm/modules/product/index.js

@@ -311,6 +311,7 @@ Component({
                                 qty: v.qty, //数量
                                 width: v.width || 0,
                                 length: v.length || 0,
+                                height: v.height || 0,
                                 cheek: v.cheek,
                                 color: v.color,
                                 material: v.material,

+ 1 - 0
pages/index/collect/index.js

@@ -163,6 +163,7 @@ Component({
 								"qty": v.qty,
 								width: v.width || 0,
 								length: v.length || 0,
+								height: v.height || 0,
 								sa_shoppingcartid: v.sa_shoppingcartid || 0
 							}
 						})

+ 2 - 1
pages/index/collect/modules/custom.js

@@ -39,7 +39,8 @@ Component({
         if (action === 'confirm') {
           let custom = {
             length: 0,
-            width: 0
+            width: 0,
+            height: 0
           };
           //是否为定制项
           custom = this.selectComponent("#customMade").getResult(true);

+ 2 - 2
project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "cucu-e",
+  "projectname": "E_WeChat",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
@@ -20,6 +20,6 @@
     "bigPackageSizeSupport": false,
     "useIsolateContext": true
   },
-  "libVersion": "3.14.2",
+  "libVersion": "3.15.2",
   "condition": {}
 }

+ 1 - 1
select/product/index.js

@@ -124,7 +124,7 @@ Page({
 			let isAdd = result.some(v => v == id);
 			if (!isAdd) {
 				if (item.iscustomsize == 1) {
-					if ((item.widthschemeid && item.width == 0) || (item.lengthschemeid && item.length == 0)) {
+					if ((item.widthschemeid && item.width == 0) || (item.lengthschemeid && item.length == 0) || (item.heightschemeid && item.height == 0)) {
 						item.pitchOn = true;
 						this.bindChangeFun()
 						if (item) this.selectComponent("#Custom").onClick(item)

+ 3 - 2
utils/Http.js

@@ -3,7 +3,7 @@ class HTTP {
 		this.ENV = wx.getAccountInfoSync().miniProgram.envVersion;
 		this.urls = [ {
 			name: "楚楚",
-			url: "https://cucu.cnyunl.com:8079"
+      url: "https://cucu.cnyunl.com:8079"
 		}, {
 			name: "楚楚2",
 			url: "https://124.70.185.114:8079"
@@ -11,7 +11,8 @@ class HTTP {
 			name: "开发环境",
 			url: "http://61.164.207.46:8200"
 		}]
-		if (this.ENV === 'release') { // 正式版
+    if (this.ENV === 'release') { // 正式版
+      // this.baseUrl = "http://61.164.207.46:8200";
 			this.baseUrl = "https://cucu.cnyunl.com:8079"
 		} else {
 			// this.baseUrl = "http://61.164.207.46:8200";

+ 2 - 0
utils/customItemType.js

@@ -3,6 +3,7 @@ function getLabelList() {
 		"default": {
 			length: "长",
 			width: "宽",
+			height: "厚度",
 			cheek: "边框",
 			color: "颜色",
 			material: "基材",
@@ -12,6 +13,7 @@ function getLabelList() {
 		"DLB": {
 			length: "长",
 			width: "宽",
+			height: "厚度",
 			cheek: "工艺",
 			color: "颜色",
 			material: "选项",