修改

packageA/activity/modules/list/index.wxml

@@ -12,12 +12,6 @@
 			<view wx:if="{{item.type}}" style="background: #FA8C16;">
 				{{item.type}}
 			</view>
-			<view wx:if="{{item.brandname}}" style="background: #FA8C16;">
-				{{item.brandname}}
-			</view>
-			<view wx:if="{{item.tradefield.length}}" style="background: #FA8C16;">
-				{{item.tradefield}}
-			</view>
 		</view>
 		<view class="type line-1">开始时间：{{item.begdate||'--'}}</view>
 		<view class="type line-1">结束时间：{{item.enddate||'--'}}</view>

packageA/activity/selectProduct/cart/index.wxml

@@ -18,8 +18,6 @@
 					<view class="exp">编号：{{item.itemno}}</view>
 					<!-- <view class="exp">规格：{{item.spec ||" --"}}</view> -->
 					<view class="exp">型号：{{item.model ||" --"}}</view>
-					<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}}
 						<van-icon name="arrow-down" />

packageA/favorites/index.wxml

@@ -18,7 +18,6 @@
 					<view class="exp">编号：{{item.itemno}}</view>
 					<view class="exp">型号：{{item.model ||" --"}}</view>
 					<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||'定制信息'}}
 						<van-icon name="arrow-down" />

packageA/orderForm/add/add.js

@@ -163,8 +163,7 @@ Page({
             sa_accountclassid: 0
         })
         if (['标准订单', '特殊订单'].includes(this.data.type || '标准订单')) {
-            let tradefield = this.data.domainrelatedaccounts.find(v => v.value == this.data.tradefield);
-            if (tradefield) _Http.basic({
+            _Http.basic({
                 "id": 20221008134803,
                 "version": 1,
                 "content": {
@@ -179,10 +178,9 @@ Page({
                 }
             }).then(res => {
                 console.log("账户列表", res)
-                let list = res.data.filter(v => tradefield.subvalues.some(s => s == v.sa_accountclassid))
                 if (res.msg == '成功') this.setData({
-                    optionalAccount: list,
-                    sa_accountclassid: list.length ? list[0].sa_accountclassid : 0
+                    optionalAccount: res.data,
+                    sa_accountclassid: res.data[0].sa_accountclassid
                 })
             })
         }

packageA/orderForm/add/add.wxml

@@ -25,22 +25,6 @@
         <van-button wx:for="{{orderList}}" custom-class='but {{type==item?"active":""}}' data-name="{{item}}" bindtap="onSelectType">{{item}}</van-button>
     </view>
 </view>
-<view class="groud" wx:if="{{brandList.length}}">
-    <view class="label">
-        选择品牌
-    </view>
-    <view class="content">
-        <van-button custom-class='but {{item.sa_brandid==sa_brandid?"active":""}}' wx:for="{{brandList}}" wx:key="sa_brandid" data-item="{{item}}" bindtap="onSelectBrand">{{item.brandname}}</van-button>
-    </view>
-</view>
-<view class="groud" wx:if="{{domainList.length}}">
-    <view class="label">
-        选择领域
-    </view>
-    <view class="content">
-        <van-button custom-class='but {{item.tradefield==tradefield?"active":""}}' wx:for="{{domainList}}" wx:key="sys_enterprise_tradefieldid" data-item="{{item}}" bindtap="onSelect">{{item.tradefield}}</van-button>
-    </view>
-</view>
 
 <view class="groud" wx:if="{{optionalAccount.length>1}}">
     <view class="label">

packageA/orderForm/detail.js

@@ -6,11 +6,6 @@ Page({
 		loading: true,
 		sa_orderid: null,
 		tabsActive: 0,
-		/* {
-			label: "附件",
-			icon: "icon-tabfujian1",
-			model: "#Yl_Attachment"
-		},  */
 		tabsList: [{
 			label: "产品明细",
 			icon: "icon-tabchanpin",
@@ -44,7 +39,6 @@ Page({
 			this.setData({
 				privacyFieldC
 			})
-			console.log("privacyFieldC", privacyFieldC)
 		} catch (error) {
 			console.error(error)
 		}

packageA/orderForm/index.js

@@ -1,35 +1,11 @@
 const _Http = getApp().globalData.http;
 import currency from "../../utils/currency";
-let content = null,
-  downCount = null;
+let content = null;
 Page({
   data: {
     isInsert: false,
     CustomBar: getApp().globalData.CustomBar,
-    filtratelist: [{
-      label: "订单类型",
-      index: null,
-      showName: "value", //显示字段
-      valueKey: "type", //返回Key
-      selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
-      value: "", //选中值
-      list: [{
-        value: "标准订单"
-      }, {
-        value: "促销订单"
-      }, {
-        value: "特殊订单"
-      }]
-    }, {
-      label: "领域",
-      index: null,
-      showName: "tradefield", //显示字段
-      valueKey: "tradefield", //返回Key
-      selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
-      value: "", //选中值
-      list: []
-    }],
-    privacyFieldC: []
+    privacyFieldC: [],
   },
   onLoad(options) {
     if (wx.getStorageSync('auth').worderform.options.some(v => v == 'insert')) this.setData({
@@ -40,18 +16,12 @@ Page({
       "isExport": 0,
       "pageNumber": 1,
       "pageTotal": 1,
-      pageSize: 20,
       "where": {
         "condition": "",
-        "status": "",
-        "brandname": "",
-        "tradefield": ""
-      }
+      },
+      tablefilter: {}
     };
     this.getList()
-    this.getBrand()
-    this.getDomain()
-    this.getOrderList()
 
     try {
       let privacyFieldC = wx.getStorageSync('auth').worderform.forms.list.formcols.map(v => v.title);
@@ -138,7 +108,7 @@ Page({
         status = e.detail.title
         break;
     }
-    content.where.status = status;
+    content.tablefilter.status = status;
     this.getList(true);
   },
   /* 搜索 */
@@ -148,56 +118,6 @@ Page({
     content.where.condition = detail;
     this.getList(true)
   },
-  /* 获取品牌 */
-  getBrand() {
-    _Http.basic({
-      "id": 20220924163702,
-      "content": {
-        "pageSize": 9999,
-      }
-    }, false).then(res => {
-      console.log("查询品牌", res)
-      if (res.msg == '成功') this.data.brandList = res.data
-    })
-  },
-  /* 获取orderList */
-  getOrderList() {
-    _Http.basic({
-      "classname": "sysmanage.develop.optiontype.optiontype",
-      "method": "optiontypeselect",
-      "content": {
-        "typename": "ordertype"
-      }
-    }).then(res => {
-      console.log("订单类型", res)
-      let orderList = [];
-      try {
-        orderList = res.data.map(v => v.value);
-      } catch (error) {}
-      if (orderList.length == 0) orderList.push("标准订单")
-      this.setData({
-        orderList
-      })
-    })
-  },
-  /* 获取领域 */
-  getDomain() {
-    _Http.basic({
-      "id": 20221223141802,
-      "content": {
-        "pageNumber": 1,
-        "pageSize": 9999,
-        "where": {
-          "condition": ""
-        }
-      }
-    }, false).then(res => {
-      console.log("获取领域", res)
-      if (res.msg == '成功') this.setData({
-        'filtratelist[1].list': res.data
-      });
-    })
-  },
   /* 设置页面高度 */
   setListHeight() {
     this.selectComponent("#ListBox").setHeight(".tips", this);
@@ -212,56 +132,70 @@ Page({
       modalName: null
     })
   },
-  handleFiltrate({
-    detail
-  }) {
-    content.where.type = detail.type;
-    content.where.tradefield = detail.tradefield;
-    downCount = setTimeout(() => {
-      this.getList(true);
-    }, 300);
-  },
   createOrder() {
-    let orderList = this.data.orderList;
-    if (this.data.brandList.length == 1 && this.data.filtratelist[1].list.length == 1 && orderList.length == 1) {
-      wx.showModal({
-        title: '提示',
-        content: `是否确定创建${orderList[0]}`,
-        complete: ({
-          confirm
-        }) => {
-          if (confirm) _Http.basic({
-            "id": 20221108111402,
-            content: {
-              sa_orderid: 0,
-              rec_contactsid: 0,
-              pay_enterpriseid: 0,
-              sa_contractid: 0,
-              sa_projectid: 0,
-              "sa_brandid": this.data.brandList[0].sa_brandid, //品牌ID
-              "type": orderList[0], //订单类型
-              "tradefield": this.data.filtratelist[1].list[0].tradefield, //必选
-              sys_enterpriseid: 0
-            }
-          }).then(res => {
-            console.log(`创建${orderList[0]}`, res);
-            wx.showToast({
-              title: res.msg != '成功' ? res.msg : '创建成功',
-              icon: "none",
-              mask: true
+    _Http.basic({
+      "id": 20221008134803,
+      "version": 1,
+      "content": {
+        "pageNumber": 1,
+        "pageTotal": 1,
+        "pageSize": 9999,
+        "where": {
+          "condition": "",
+          "isused": 1,
+          "isnotspecialfund": 0,
+        },
+      }
+    }).then(res => {
+      console.log(res)
+      if (res.code != 1) wx.showToast({
+        title: res.msg,
+        icon: "none",
+      });
+      if (res.data.length == 1) {
+        this.handleAdd(res.data[0].sa_accountclassid)
+      } else {
+        wx.navigateTo({
+          url: '/packageA/orderForm/add/add',
+        })
+      }
+    })
+  },
+  handleAdd(sa_accountclassid) {
+    wx.showModal({
+      title: '提示',
+      content: `是否确定创建订单`,
+      complete: ({
+        confirm
+      }) => {
+        if (confirm) _Http.basic({
+          "id": 20221108111402,
+          content: {
+            sa_orderid: 0,
+            rec_contactsid: 0,
+            pay_enterpriseid: 0,
+            sa_contractid: 0,
+            sa_projectid: 0,
+            sa_accountclassid: sa_accountclassid,
+            "sa_brandid": 0, //品牌ID
+            "type": '标准订单', //订单类型
+            "tradefield": '默认', //必选
+            sys_enterpriseid: 0
+          }
+        }).then(res => {
+          console.log(`创建标准订单`, res);
+          wx.showToast({
+            title: res.msg != '成功' ? res.msg : '创建成功',
+            icon: "none",
+            mask: true
+          });
+          if (res.msg == '成功') setTimeout(() => {
+            wx.navigateTo({
+              url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
             });
-            if (res.msg == '成功') setTimeout(() => {
-              wx.navigateTo({
-                url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
-              });
-            }, 500)
-          })
-        }
-      })
-    } else {
-      wx.navigateTo({
-        url: '/packageA/orderForm/add/add?type=标准订单',
-      })
-    }
+          }, 500)
+        })
+      }
+    })
   }
 })

packageA/orderForm/index.scss

@@ -1,5 +1,3 @@
-@import "../../static/filter.scss";
-
 .search-right {
 	padding: 0 10rpx !important;
 }

packageA/orderForm/index.wxml

@@ -1,9 +1,5 @@
 <view class="DrawerPage {{modalName=='viewModal'?'show':''}}">
-    <van-search use-action-slot placeholder='请输入搜索关键词' shape='round' bind:search="onSearch" bind:clear="onSearch">
-        <view slot="action" class="cuIcon-filter search-right" bindtap="showModal" data-target="viewModal">
-            筛选
-        </view>
-    </van-search>
+    <van-search use-action-slot placeholder='请输入搜索关键词' shape='round' bind:search="onSearch" bind:clear="onSearch" />
     <van-tabs color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
         <van-tab title="全部" />
         <van-tab title="新建" />
@@ -21,22 +17,9 @@
         <List list="{{list}}" privacyFieldC='{{privacyFieldC}}' />
         <view style="height:150rpx;" />
     </Yl_ListBox>
-    <!-- <Float wx:if="{{isInsert}}" /> -->
-    <!-- <Yl_FloatingButton wx:if="{{isInsert}}" bindtap="createOrder" /> -->
-
     <view class="footer" wx:if="{{isInsert}}">
         <van-button custom-class='but' bindtap="createOrder">新建订单</van-button>
     </view>
 </view>
 
-<view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap="hideModal">
-    <text class="cuIcon-pullright"></text>
-</view>
-<scroll-view scroll-y class="DrawerWindow  {{modalName=='viewModal'?'show':''}}">
-    <view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg bg-white">
-        <Filtrate list='{{filtratelist}}' bindhandle='handleFiltrate' />
-    </view>
-    <view style="height: 200rpx;" />
-</scroll-view>
-
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />

packageA/orderForm/modules/list/index.wxml

@@ -2,8 +2,6 @@
     <view class="top">
         <view class="tags">
             <text wx:if="{{item.type}}">{{item.type}}</text>
-            <text wx:if="{{item.brandname}}">{{item.brandname}}</text>
-            <text wx:if="{{item.tradefield}}">{{item.tradefield}}</text>
         </view>
         <view class="statu" style="color: {{set.color(item.status)}};">
             {{item.status}}

packageA/toolBill/modules/selectOrder/index.wxml

@@ -11,9 +11,6 @@
 			<view class="title line-1">订单号:{{item.sonum}}</view>
             <view class="subfield line-1">
                 <text>订单类型:{{item.type}}</text>
-            </view>
-            <view class="subfield line-1">
-                领域:{{item.tradefield}}
             </view>
 		</view>
 	</navigator>

pages/index/collect/index.wxml

@@ -17,8 +17,6 @@
 					</view>
 					<view class="exp">编号：{{item.itemno}}</view>
 					<view class="exp">型号：{{item.model ||" --"}}</view>
-					<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}}
 						<van-icon name="arrow-down" />

pages/index/market/index.js

@@ -3,7 +3,7 @@ const content = {
     pageTotal: 1
   },
   _Http = getApp().globalData.http;
-let sa_brandid = null,
+let sa_brandid = 0,
   downCount = null;
 Component({
   options: {
@@ -23,35 +23,11 @@ Component({
         itemclassid: "",
         tradefield: ""
       }
-      this.getBrand();
-      this.getTradefie();
+      // this.getBrand();
+      // this.getTradefie();
+      this.getList(true);
       return true;
     },
-    /* 获取品牌 */
-    getBrand() {
-      _Http.basic({
-        "id": 20220924163702,
-        content: {
-          nocache: true,
-          pageSize: 999,
-        }
-      }).then(res => {
-        console.log("查询品牌", res)
-        if (res.msg != '成功') return wx.showToast({
-          title: res.msg,
-          icon: "none"
-        });
-        if (res.data.length != 0) {
-          sa_brandid = res.data[0].sa_brandid;
-          this.getTypeList();
-        } else {
-          wx.showToast({
-            title: '未查询到授权品牌',
-            icon: "none"
-          })
-        }
-      })
-    },
     /* 获取分类 */
     getTypeList() {
       _Http.basic({
@@ -85,7 +61,6 @@ Component({
             })
           } catch {}
         }
-        this.getList(true);
       })
     },
     itemClasssChange(e) {
@@ -121,7 +96,7 @@ Component({
       if (init.detail != undefined) init = init.detail;
       if (init) content.pageNumber = 1;
       if (content.pageNumber > content.pageTotal) return;
-      content.brandids = [sa_brandid];
+      content.brandids = [];
       content.ismodule = 0;
       _Http.basic({
         "id": 20220926142203,

pages/index/userCenter/index.js

@@ -19,12 +19,6 @@ Component({
 				color: "var(--warning)",
 				path: `/pages/index/userCenter/changePassword/index`
 			}]
-			if (authlist[0].apps.some(v => v.name == "teamManagement")) pathList.unshift({
-				name: "团队管理",
-				icon: "icon-a-wodetuanduiguanli",
-				color: "var(--assist)",
-				path: `/pages/teams/index`
-			});
 			this.setData({
 				pathList
 			})

pages/login/modules/account.scss

@@ -41,6 +41,9 @@
         font-size: 26rpx;
     }
 
+    .input {
+        flex: 1;
+    }
     .image1 {
         width: 160rpx;
     }

pages/login/modules/account.wxml

@@ -1,22 +1,29 @@
 <van-cell>
     <text slot='icon' class="iconfont icon-a-biaoqianlanwodexuanzhong" />
-    <input class="input" type="text" value='{{accountno}}' bindinput="inputChange" data-name="accountno" placeholder="请输入账户名" />
+    <input class="input" type="text" value='{{accountno}}' bindinput="inputChange" data-name="accountno"
+        placeholder="请输入账户名" />
 </van-cell>
 <van-cell>
     <text slot='icon' class="iconfont icon-a-wodemima" />
-    <input class="input" wx:if="{{inputType=='text'}}" focus='{{focus}}' bindinput="inputChange" data-name="password" value="{{password}}" placeholder="请输入密码" />
-    <input class="input" wx:else type="password" focus='{{focus}}' bindinput="inputChange" data-name="password" value="{{password}}" placeholder="请输入密码" />
-    <view slot='right-icon' style="width: 90rpx;height: 22.4px; display: flex; justify-content: flex-end;" catchtap="changePasswordType">
+    <input class="input" wx:if="{{inputType=='text'}}" focus='{{focus}}' bindinput="inputChange" data-name="password"
+        value="{{password}}" placeholder="请输入密码" />
+    <input class="input" wx:else type="password" focus='{{focus}}' bindinput="inputChange" data-name="password"
+        value="{{password}}" placeholder="请输入密码" />
+    <view slot='right-icon' style="width: 90rpx;height: 22.4px; display: flex; justify-content: flex-end;"
+        catchtap="changePasswordType">
         <image class="image" src="{{inputType=='password'?'/static/image/dp-none.svg':'/static/image/dp-show.svg'}}" />
     </view>
 </van-cell>
 <view class="checkCode" wx:if="{{timestamp}}">
-    <view class="label">验证码</view>
-    <input class="input" bindinput="inputChange" data-name="imagecaptcha" value="{{imagecaptcha}}" placeholder="请输入验证码" />
-    <image class="image1" src="http://61.164.207.46:8300/yos/rest/index/imagecaptcha?timestamp={{timestamp}}" bind:tap="changeTimestamp" mode="widthFix" />
+    <view class="iconfont icon-a-biaoqianlanxiaoxixuanzhong"></view>
+    <input class="input" bindinput="inputChange" data-name="imagecaptcha" value="{{imagecaptcha}}"
+        placeholder="请输入验证码" />
+    <image class="image1" src="https://crm.meida.com:16691/yos/rest/index/imagecaptcha?timestamp={{timestamp}}"
+        bind:tap="changeTimestamp" mode="widthFix" />
 </view>
 <view class="box">
-    <van-checkbox custom-class='checkbox' label-class='label' icon-size="28rpx" value="{{ memory }}" shape="square" bind:change="isMemory">
+    <van-checkbox custom-class='checkbox' label-class='label' icon-size="28rpx" value="{{ memory }}" shape="square"
+        bind:change="isMemory">
         记住密码
     </van-checkbox>
     <navigator url="./retrievePassword" class="view">忘记密码?</navigator>

pages/login/phone.wxml

@@ -7,7 +7,8 @@
 <phone id='login' wx:else />
 
 <view style="width: 100vw; text-align: center;margin-top: 60rpx;margin-bottom: 40rpx;">
-    <van-button disabled='{{disabled}}' custom-class='login' bindtap="userLogin" loading='{{loading}}' loading-text="登陆中..." color='linear-gradient(90deg, #3874F6 0%, #095DE0 100%);'>登录</van-button>
+    <van-button disabled='{{disabled}}' custom-class='login' bindtap="userLogin" loading='{{loading}}'
+        loading-text="登陆中..." color='linear-gradient(90deg, #3874F6 0%, #095DE0 100%);'>登录</van-button>
 </view>
 
 <!-- 隐私协议 -->
@@ -18,10 +19,8 @@
     <view style="height: 100rpx;" />
     <van-divider contentPosition="center">其他登录方式</van-divider>
     <view class="funs-box">
-        <text class="iconfont icon-a-wodebangdingweixin" style="font-size: 100rpx; color:#07C160;" bindtap="wechatLogin" />
-        <view class="login-fun" bindtap="changFun">
-            <text class="iconfont {{loginFunc=='account'?'icon-a-biaoqianlanxiaoxixuanzhong':'icon-a-biaoqianlanwodexuanzhong'}} " />
-        </view>
+        <text class="iconfont icon-a-wodebangdingweixin" style="font-size: 100rpx; color:#07C160;"
+            bindtap="wechatLogin" />
     </view>
 </block>
 

project.config.json

@@ -7,14 +7,14 @@
     "scopeDataCheck": false,
     "coverView": true,
     "es6": true,
-    "postcss": true,
+    "postcss": false,
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,
     "preloadBackgroundData": false,
     "minified": true,
     "autoAudits": false,
     "newFeature": false,
-    "uglifyFileName": true,
+    "uglifyFileName": false,
     "uploadWithSourceMap": true,
     "useIsolateContext": true,
     "nodeModules": false,

project.private.config.json

@@ -4,7 +4,7 @@
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
-    "autoAudits": true,
+    "autoAudits": false,
     "coverView": true,
     "lazyloadPlaceholderEnable": false,
     "skylineRenderEnable": false,
@@ -20,6 +20,6 @@
     "bigPackageSizeSupport": false,
     "useIsolateContext": true
   },
-  "libVersion": "3.6.6",
+  "libVersion": "3.9.2",
   "condition": {}
 }

select/account/index.js

@@ -28,7 +28,7 @@ Page({
     }
 
     try {
-      let privacyFieldC = wx.getStorageSync('auth').waccount.forms.selectaccount.formcols.map(v => v.title);
+      let privacyFieldC = wx.getStorageSync('auth').worderform.forms.selectaccount.formcols.map(v => v.title);
       this.setData({
         privacyFieldC
       })
@@ -44,39 +44,7 @@ Page({
     });
     let that = this;
 
-    if (options.tradefield) {
-      let domainrelatedaccounts = wx.getStorageSync('domainrelatedaccounts');
-      if (domainrelatedaccounts.length) {
-        query()
-      } else {
-        _Http.basic({
-          "classname": "sysmanage.develop.optiontype.optiontype",
-          "method": "optiontypeselect",
-          "content": {
-            "pageNumber": 1,
-            "pageSize": 9999,
-            "typename": "domainrelatedaccounts"
-          }
-        }).then(res => {
-          console.log("查询领域对应列表", res)
-          if (res.msg == '成功' && res.data.length) {
-            domainrelatedaccounts = res.data;
-            wx.setStorageSync('domainrelatedaccounts', domainrelatedaccounts)
-            query()
-          }
-        })
-      }
-
-      function query() {
-        let item = domainrelatedaccounts.find(v => v.value == options.tradefield);
-        that.setData({
-          subvalues: item ? item.subvalues : []
-        })
-        that.getList()
-      }
-    } else {
-      that.getList()
-    }
+    that.getList()
 
   },
   getList(init = false) {

select/activity/index.wxml

@@ -20,12 +20,6 @@
 				<view wx:if="{{item.type}}" style="background: #FA8C16;">
 					{{item.type}}
 				</view>
-				<view wx:if="{{item.brandname}}" style="background: #FA8C16;">
-					{{item.brandname}}
-				</view>
-				<view wx:if="{{item.tradefield}}" style="background: #FA8C16;">
-					{{item.tradefield}}
-				</view>
 			</view>
 			<view class="type line-1">开始时间：{{item.begdate||'--'}}</view>
 			<view class="type line-1">结束时间：{{item.enddate||'--'}}</view>

select/product/index.wxml

@@ -25,10 +25,6 @@
                 <view class="subfield line-1">
                     产品编码：{{item.itemno}}
                 </view>
-                <view class="subfield line-1">
-                    <text>品牌:{{item.brandName}}</text>
-                    领域:{{item.tradefields}}
-                </view>
                 <view class="subfield line-1">
                     型号:{{item.model||' --'}}
                 </view>

utils/Http.js

@@ -14,9 +14,15 @@ class HTTP {
 		if (this.ENV === 'release') { // 正式版
 			this.baseUrl = "https://crm.meida.com:16691";
 		} else {
-			this.baseUrl = "http://61.164.207.46:8300";
+			// this.baseUrl = "http://61.164.207.46:8300";
+			this.baseUrl = "https://crm.meida.com:16691";
 		}
 		console.log("接口地址:", this.baseUrl)
+
+
+		// 从本地存储加载JSESSIONID
+		this.jsessionid = wx.getStorageSync('JSESSIONID') || '';
+		console.log("接口地址", this.baseUrl);
 	}
 	request({
 		url,
@@ -24,7 +30,8 @@ class HTTP {
 		method = "POST",
 		header = {
 			'content-type': 'application/json',
-			"accesstoken": data.accesstoken || wx.getStorageSync('userMsg').token || ''
+			"accesstoken": data.accesstoken || wx.getStorageSync('userMsg').token || '',
+			"Cookie": `JSESSIONID=${this.jsessionid}`
 		},
 		showLoading = '加载中...'
 	}) {
@@ -51,12 +58,15 @@ class HTTP {
 			},
 			complete: (res) => {
 				// if (showLoading) wx.hideLoading()
+				this._handleSessionCookies(res);
 				if (res.errMsg != 'request:ok') {
 					wx.showToast({
 						title: '网络异常，请重新进入',
 						icon: "none"
 					})
 				} else if (res.data.msg == '登陆状态已过期，请重新登陆！') {
+					this.jsessionid = '';
+					wx.removeStorageSync('JSESSIONID');
 					wx.redirectTo({
 						url: '/pages/login/phone',
 					});
@@ -68,6 +78,42 @@ class HTTP {
 			}
 		})
 	}
+
+	// 处理会话Cookie
+	_handleSessionCookies(res) {
+		try {
+			const cookies = res.cookies || [];
+			const headers = res.header || {};
+
+			// 检查响应头中的Set-Cookie
+			const setCookie = headers['Set-Cookie'] || headers['set-cookie'];
+			if (setCookie) {
+				// 将字符串转换为数组
+				const cookieArray = Array.isArray(setCookie) ?
+					setCookie : [setCookie];
+
+				cookies.push(...cookieArray);
+			}
+
+			// 查找JSESSIONID
+			for (const cookie of cookies) {
+				const match = cookie.match(/JSESSIONID=([^;]+)/i);
+				if (match && match[1]) {
+					const newSessionId = match[1];
+
+					// 更新JSESSIONID
+					if (newSessionId !== this.jsessionid) {
+						this.jsessionid = newSessionId;
+						wx.removeStorageSync('JSESSIONID');
+						wx.setStorageSync('JSESSIONID', newSessionId);
+					}
+					break;
+				}
+			}
+		} catch (error) {
+			console.error('处理会话Cookie时出错:', error);
+		}
+	}
 }
 export {
 	HTTP