暂存

packageA/market/detail.js

@@ -260,7 +260,7 @@ Page({
 			itemid: detail.itemid, //货品id
 			qty: detail.qty, //数量
 			itemno: detail.itemno, //货品编号
-			tradefield: detail.tradefield[index].tradefield,
+			tradefield: '默认',
 		}, custom);
 
 		_Http.basic({
@@ -278,16 +278,40 @@ Page({
 		})
 	},
 	/* 立即下单 */
-	placeAnOrder(index) {
+	async placeAnOrder(index) {
 		let detail = this.data.detail,
 			content = {
 				"type": "标准订单",
-				tradefield: detail.tradefield[index].tradefield
+				tradefield: '默认',
+				sa_accountclassid: 0
 			},
 			custom = {
 				length: 0,
 				width: 0
-			}
+			};
+
+		let accs = await _Http.basic({
+			"id": 20221008134803,
+			"version": 1,
+			"content": {
+				"pageNumber": 1,
+				"pageTotal": 1,
+				"pageSize": 9999,
+				"where": {
+					"condition": "",
+					"isused": 1,
+					"isnotspecialfund": 0
+				}
+			},
+		})
+
+		try {
+			content.sa_accountclassid = accs.data[0].sa_accountclassid
+		} catch (error) {
+
+		}
+
+		console.log("accs", accs)
 		//是否为定制项
 		if (detail.iscustomsize == 1) custom = this.selectComponent("#customMade").getResult(true);
 		console.log("custom", custom)

packageA/orderForm/index.js

@@ -18,8 +18,8 @@ Page({
       "pageTotal": 1,
       "where": {
         "condition": "",
-      },
-      tablefilter: {}
+        tablefilter: {}
+      }
     };
     this.getList()
 
@@ -108,7 +108,7 @@ Page({
         status = e.detail.title
         break;
     }
-    content.tablefilter.status = status;
+    content.where.tablefilter.status = status;
     this.getList(true);
   },
   /* 搜索 */

pages/index/collect/index.js

@@ -119,11 +119,7 @@ Component({
 			})
 		},
 		clickBut(e) {
-			this.data.classList.length >= 2 ? wx.showToast({
-				title: '请选择订单领域(订单只允许同品牌/同领域的商品)',
-				icon: "none",
-				duration: 3000
-			}) : this.handleSubmit(0);
+			this.handleSubmit(0);
 		},
 		/* 提交 */
 		submit(e) {
@@ -131,7 +127,7 @@ Component({
 		},
 		handleSubmit(index) {
 			let data = this.data.classList[index];
-			let tradefield = this.data.domainrelatedaccounts.find(v => v.value == data.type);
+			let tradefield = '默认';
 			_Http.basic({
 				"id": 20221008134803,
 				"version": 1,
@@ -147,7 +143,7 @@ Component({
 				}
 			}).then(acc => {
 				console.log("账户列表", acc)
-				let list = acc.data.filter(v => tradefield.subvalues.some(s => s == v.sa_accountclassid))
+				let list = acc.data
 				_Http.basic({
 					"id": 20221128183202,
 					"content": {

pages/index/market/index.js

@@ -1,4 +1,5 @@
 const content = {
+    ismodule: 0,
     pageNumber: 1,
     pageTotal: 1
   },
@@ -20,76 +21,11 @@ Component({
     init() {
       content.where = {
         condition: "",
-        itemclassid: "",
         tradefield: ""
       }
-      // this.getBrand();
-      // this.getTradefie();
       this.getList(true);
       return true;
     },
-    /* 获取分类 */
-    getTypeList() {
-      _Http.basic({
-        "id": "20220922110403",
-        pageSize: 1000,
-        content: {
-          nocache: true,
-          sa_brandid: sa_brandid,
-          where: {
-            istool: 0,
-            ishide: 0
-          }
-        }
-      }).then(res => {
-        console.log("营销类别", res)
-        if (res.data.length) {
-          res.data[0].ttemclass.unshift({
-            itemclassid: "",
-            itemclassfullname: "全部",
-            itemclassname: "全部",
-            subdep: []
-          })
-          this.setData({
-            itemClasss: [res.data[0].ttemclass]
-          });
-          try {
-            this.selectAllComponents('#class0').filter(v => {
-              v.setData({
-                active: 0
-              })
-            })
-          } catch {}
-        }
-      })
-    },
-    itemClasssChange(e) {
-      let detail = e.detail;
-      content.where.itemclassid = detail.item.itemclassid;
-      let itemClasss = this.data.itemClasss,
-        subdep = detail.item.subdep;
-      itemClasss = itemClasss.slice(0, detail.rowIndex + 1);
-      /* if (subdep.length) {
-        subdep.unshift({
-          itemclassid: detail.item.itemclassid,
-          itemclassfullname: "全部",
-          itemclassname: "全部",
-          subdep: []
-        })
-        itemClasss.push(subdep)
-        this.selectAllComponents('#class' + (detail.rowIndex - 0 + 1)).filter(v => v.setData({
-          active: 0
-        }))
-      } */
-      this.setData({
-        itemClasss
-      })
-      itemClasss.push(subdep)
-      this.setData({
-        itemClasss
-      })
-      this.getList(true);
-    },
     /* 获取产品 */
     getList(init = false) {
       wx.hideLoading()
@@ -97,7 +33,7 @@ Component({
       if (init) content.pageNumber = 1;
       if (content.pageNumber > content.pageTotal) return;
       content.brandids = [];
-      content.ismodule = 0;
+      content.nocache = false
       _Http.basic({
         "id": 20220926142203,
         content
@@ -141,33 +77,6 @@ Component({
         'condition': detail
       })
     },
-    /* 获取领域 */
-    getTradefie() {
-      _Http.basic({
-        "id": 20221223141802,
-        content: {
-          nocache: true,
-          pageNumber: 1,
-          pageSize: 9999,
-          where: {
-            condition: ""
-          }
-        }
-      }, false).then(res => {
-        console.log("获取领域", res)
-        if (res.msg == '成功' && res.data.length > 1) {
-          res.data.unshift({
-            rowindex: 0,
-            subvalues: [],
-            sys_enterprise_tradefieldid: 0,
-            tradefield: "全部"
-          })
-          this.setData({
-            tradefieList: res.data
-          });
-        }
-      })
-    },
     /* 设置页面高度 */
     setListHeight() {
       this.selectComponent("#ListBox").setHeight(".division", this);

pages/index/market/index.wxml

@@ -1,20 +1,8 @@
 <van-search use-action-slot placeholder='请输入搜索关键词' shape='round' bind:change='onChange' bind:search="onSearch" bind:clear="onSearch">
-	<!-- <view style="padding: 0 10rpx;" slot="action" bind:tap="openPopup">筛选</view> -->
 	<view wx:if="{{condition}}" style="padding: 0 10rpx;" slot="action" bind:tap="getList">搜索</view>
 </van-search>
-<Tabs active='0' id="tradefieList" list="{{tradefieList}}" wx:if="{{tradefieList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='tradefield' bind:onChange="tradefieChange" />
-<Tabs wx:for="{{itemClasss}}" id='class{{index}}' rowIndex='{{index}}' wx:key="{{item.rowindex}}" list="{{item}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='itemclassname' bind:onChange="itemClasssChange" />
 <view class="division" style="height: 10rpx;" />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
 	<List list="{{list}}" />
 	<view style="height: 200rpx;" />
-</Yl_ListBox>
-
-<van-popup show="{{ popupShow }}" z-index='999999' round closeable position='bottom' bind:click-overlay='onClose' bind:close="onClose">
-	<view class="title">条件筛选窗口</view>
-	<Tabs id="tradefieList" list="{{tradefieList}}" wx:if="{{tradefieList.length>1}}" box-class='brand-box1' tab-class='brand-tab-class1' active-class='brand-active-class1' name='tradefield' bind:onChange="tradefieChange" />
-	<Tabs wx:for="{{itemClasss}}" id='class{{index}}' rowIndex='{{index}}' wx:key="{{item.rowindex}}" list="{{item}}" box-class='brand-box1' tab-class='brand-tab-class1' active-class='brand-active-class1' name='itemclassname' bind:onChange="itemClasssChange" />
-	<view class="but-box">
-		<van-button custom-class='but' bind:tap="onClose" round>关闭筛选窗口</van-button>
-	</view>
-</van-popup>
+</Yl_ListBox>

project.config.json

@@ -58,7 +58,7 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wxaae80a5bab4652f8",
+  "appid": "wxe89d8c8225f75d79",
   "projectname": "E_WeChat",
   "libVersion": "3.6.6",
   "simulatorPluginLibVersion": {}

project.private.config.json

@@ -21,5 +21,17 @@
     "useIsolateContext": true
   },
   "libVersion": "3.9.2",
-  "condition": {}
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        }
+      ]
+    }
+  }
 }