保存

packageA/activity/selectProduct/calculatePrice.js

@@ -0,0 +1,15 @@
+import currency from "../../../utils/currency";
+let CNY = value => currency(value, {
+	symbol: "￥",
+	precision: 2
+}).format();
+
+function getPrice(price, w, l, divide) {
+	return CNY(CNY(currency(price).multiply(w).multiply(l).divide(divide)))
+}
+module.exports = {
+	getItem: (item, showname = 'showPrice', pname = 'price', divide = 1000000) => {
+		item[showname] = getPrice(item[pname], item.width, item.length, divide)
+		return item
+	}
+}

packageA/activity/selectProduct/index.js

@@ -1,6 +1,9 @@
 import currency from "../../../utils/currency";
 const _Http = getApp().globalData.http,
-  file = require("../../../utils/FormatTheAttachment");
+  file = require("../../../utils/FormatTheAttachment"),
+  {
+    getItem
+  } = require("./calculatePrice")
 Page({
   data: {
     loading: true,
@@ -37,6 +40,8 @@ Page({
     if (item) this.selectComponent("#Custom").onClick(item)
   },
   customizedProduct(item) {
+    item = getItem(item);
+    item = getItem(item, 'newOldPrice', 'oldprice');
     return new Promise((resolve) => {
       let index = this.data.list.findIndex(v => v[this.data.idname] == item[this.data.idname]);
       if (index != -1) this.data.list[index] = item;

packageA/activity/selectProduct/index.wxml

@@ -1,8 +1,8 @@
 <van-search class="search" value="{{ params.content.where.condition }}" shape="round" placeholder="请输入搜索关键词" bind:search='startSearch' bind:clear='onClear' />
-<custom id="Custom" />
+<custom id="Custom" isOldPrice='{{true}}' />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
-	<navigator url="#" wx:for="{{list}}" wx:key="itemid" class="item-box" data-id="{{item[idname]}}" data-item="{{item}}">
-		<view class="top" bindtap="changeResults" data-item="{{item}}" bindtap="{{item.groupqty!=0 && item.maxQty<=0?'':'changeResult'}}">
+	<navigator url="#" wx:for="{{list}}" wx:key="itemid" class="item-box">
+		<view class="top" bindtap="changeResults" data-id="{{item[idname]}}" data-item="{{item}}" bindtap="{{item.groupqty!=0 && item.maxQty<=0?'':'changeResult'}}">
 			<view class="image">
 				<van-image width="100%" height="100%" fit="cover" src="{{item.attinfos[0].subfiles[0].url||item.attinfos[0].url||item.cover}}" use-loading-slot use-error-slot lazy-load>
 					<van-loading slot="loading" type="spinner" size="20" vertical />
@@ -17,7 +17,7 @@
 				<view class="exp">编号：{{item.itemno}}</view>
 				<view class="exp">规格：{{item.spec ||" --"}}</view>
 				<view class="exp">型号：{{item.model ||" --"}}</view>
-				<view class="exp"><text style="font-size: 24rpx;font-weight: 600;color: #FF3B30;">{{item.newPrice}}</text><text style="font-size: 20rpx; text-decoration:line-through; margin-left: 6rpx;">￥{{item.oldprice}}</text></view>
+				<view class="exp"><text style="font-size: 24rpx;font-weight: 600;color: #FF3B30;">{{item.showPrice||item.newPrice}}</text><text style="font-size: 20rpx; text-decoration:line-through; margin-left: 6rpx;">{{item.newOldPrice||item.oldPrice}}</text></view>
 
 				<view wx:if="{{item.iscustomsize}}" class="subfield line-1" data-item="{{item}}" catch:tap="customization" style="color:#085CDF;">
 					长：{{item.length||0}} / 宽：{{item.width||0}}

packageA/dispatchBill/detail.js

@@ -113,7 +113,7 @@ Page({
           pageNumber,
           pageTotal
         } = Component.data.content,
-        id = this.data.detail.sa_dispatchid;
+        id = sa_dispatchid;
       if (total == null || init) {
         Component.getList(id, init);
       } else if (pageNumber <= pageTotal) {
@@ -125,7 +125,7 @@ Page({
     this.partialRenewal();
   },
   onUnload() {
-    console.log("更新列表数据")
+    /* console.log("更新列表数据")
     let page = getCurrentPages().find(v => v.__route__ == 'packageA/dispatchBill/index');
     let content = JSON.parse(JSON.stringify(page.data.content));
     content.pageNumber = 1;
@@ -138,6 +138,6 @@ Page({
       if (res.msg == '成功') page.setData({
         list: res.data
       })
-    })
+    }) */
   },
 })

packageA/dispatchBill/modules/item/index.js

@@ -0,0 +1,13 @@
+Component({
+  properties: {
+    item: {
+      type: Object
+    },
+    borderTop: {
+      type: Boolean
+    },
+    userrole: {
+      type: String
+    }
+  }
+})

packageA/dispatchBill/modules/item/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

packageA/dispatchBill/modules/item/index.scss

@@ -0,0 +1,6 @@
+.box {
+	view {
+		font-size: 24rpx;
+		margin-top: 6rpx;
+	}
+}

packageA/dispatchBill/modules/item/index.wxml

@@ -0,0 +1,30 @@
+<view class="box" style="border-top: {{borderTop?1:0}}px dashed #ddd;margin-top: {{borderTop?'8rpx':''}};">
+	<view>
+		产品编码：{{item.itemno||" --"}}
+	</view>
+	<view>
+		产品名称：{{item.itemname||" --"}}
+	</view>
+	<view>
+		数量：{{item.qty||"0"}}({{item.unitname}})
+	</view>
+
+	<view wx:if="{{userrole=='经销商'}}">
+		<block wx:if="{{item.qty!='0'}}">
+			单价/总金额：{{handleHide.query((item.price+'/'+item.amount),hidePrice)}}
+		</block>
+		<block wx:else>
+			总金额：{{handleHide.query(item.amount,hidePrice)}}
+		</block>
+	</view>
+	<view>
+		包装数量：{{item.packageqty}}
+	</view>
+	<view>
+		来源单号：{{item.sonum}}
+	</view>
+	<view>
+		备注：{{item.remarks||" --"}}
+	</view>
+</view>
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

packageA/dispatchBill/modules/rows/index.wxml

@@ -24,4 +24,6 @@
 	<view class="exp">
 		备注：{{item.remarks|| ' --'}}
 	</view>
-</view>
+</view>
+
+<Yl_Empty wx:if="{{!list.length}}" />

packageA/dispatchBill/sentandback.js

@@ -27,10 +27,12 @@ Page({
       userrole: wx.getStorageSync('userrole')
     })
   },
+  //sa_dispatchid
   toDetail(e) {
     const {
       item
     } = e.currentTarget.dataset;
+    console.log(item.id)
     wx.navigateTo({
       url: (item.type == "发货" ? "/packageA/dispatchBill/detail" : "/packageA/returnOne/detail") + '?id=' + item.id
     })
@@ -46,20 +48,25 @@ Page({
     if (init) content.pageNumber = 1;
     if (content.pageNumber > content.pageTotal) return;
     this.setListHeight();
-    console.log(content)
     _Http.basic({
       "id": "20230626104003",
       "version": 1,
       content
     }).then(res => {
-      console.log("发货列表", res)
       this.selectComponent('#ListBox').RefreshToComplete();
       content.pageNumber = res.pageNumber + 1
       content.pageTotal = res.pageTotal
-      res.data.map(v => {
+      let list = [];
+      res.data.forEach(v => {
+        let index = list.findIndex(item => item.billno == v.billno);
         v.amount = CNY(currency(v.price).multiply(v.qty));
         v.price = CNY(v.price);
-        return v
+        if (index != -1) {
+          list[index].productList.push(v)
+        } else {
+          v.productList = []
+          list[list.length] = v;
+        }
       })
       this.setData({
         list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),

packageA/dispatchBill/sentandback.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "Item": "./modules/item/index"
+  }
 }

packageA/dispatchBill/sentandback.scss

@@ -21,8 +21,10 @@
 		margin-bottom: 10rpx;
 	}
 
-	view {
-		font-size: 24rpx;
-		margin-top: 6rpx;
+	.product {
+		padding: 4rpx 16rpx;
+		box-sizing: border-box;
+		border: 1px solid #ddd;
+		border-radius: 8rpx;
 	}
 }

packageA/dispatchBill/sentandback.wxml

@@ -14,28 +14,11 @@
 	<Yl_Empty wx:if="{{list.length==0}}" />
 	<navigator url='#' data-item="{{item}}" bindtap="toDetail" class="item" wx:for="{{list}}" wx:key="sa_dispatchid">
 		<view class="title">
-			{{item.type}}/{{item.sonum}}
+			{{item.type}} / {{item.billno}} / {{item.date}}
 		</view>
-		<view>
-			日期：{{item.date}}
-		</view>
-		<view>
-			产品名称：{{item.itemname||" --"}}
-		</view>
-		<view>
-			产品编码：{{item.itemno||" --"}}
-		</view>
-		<view>
-			数量：{{item.qty||"0"}}({{item.unitname}})
-		</view>
-		<view wx:if="{{userrole=='经销商'}}">
-			单价/总金额：{{handleHide.query((item.price+'/'+item.amount),hidePrice)}}
-		</view>
-		<view>
-			包装数量：{{item.packageqty}}
-		</view>
-		<view>
-			备注：{{item.remarks||" --"}}
+		<view class="product">
+			<Item userrole='{{userrole}}' item="{{item}}" />
+			<Item userrole='{{userrole}}' borderTop wx:for="{{item.productList}}" wx:for-item="it" item="{{it}}" />
 		</view>
 	</navigator>
 	<view style="height:150rpx;" />

packageA/market/detail.js

@@ -66,7 +66,7 @@ Page({
 			this.setData({
 				content,
 				detail: item,
-				specRows: res.data.specRows,
+				specRows: res.data.specRows.reverse(),
 				cheekRows: res.data.cheekRows,
 				materialRows: res.data.materialRows,
 				colorRows: res.data.colorRows,
@@ -81,13 +81,15 @@ Page({
 						"id": "20230707091603",
 						"version": 1,
 						"content": {
-							"sa_sizecustomizedschemeid": item.lengthschemeid
+							"sa_sizecustomizedschemeid": item.lengthschemeid,
+							date: Date.now() + 1
 						}
 					}, {
 						"id": "20230707091603",
 						"version": 1,
 						"content": {
-							"sa_sizecustomizedschemeid": item.widthschemeid
+							"sa_sizecustomizedschemeid": item.widthschemeid,
+							date: Date.now() + 2
 						}
 					}].map(v => _Http.basic(v))).then(s => {
 						if (s.some(c => c.msg != '成功')) return wx.showToast({

packageA/market/detail.wxml

@@ -120,6 +120,9 @@
 			<view class="row">
 				规格：{{detail.standards || ' --'}}
 			</view>
+			<view class="row">
+				特殊说明：{{detail.specalnote || ' --'}}
+			</view>
 		</view>
 	</van-tab>
 	<van-tab title="产品资料">

packageA/orderForm/modules/item/index.js

@@ -0,0 +1,13 @@
+Component({
+  properties: {
+    item: {
+      type: Object
+    },
+    borderTop: {
+      type: Boolean
+    },
+    userrole: {
+      type: String
+    }
+  }
+})

packageA/orderForm/modules/item/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

packageA/orderForm/modules/item/index.scss

@@ -0,0 +1,6 @@
+.box {
+	view {
+		font-size: 24rpx;
+		margin-top: 6rpx;
+	}
+}

packageA/orderForm/modules/item/index.wxml

@@ -0,0 +1,26 @@
+<view class="box" style="border-top: {{borderTop?1:0}}px dashed #ddd;margin-top: {{borderTop?'8rpx':''}};">
+	<view>
+		产品编码：{{item.itemno||" --"}}
+	</view>
+	<view>
+		产品名称：{{item.itemname||" --"}}
+	</view>
+	<view>
+		数量：{{item.qty ||"0"}}({{item.unit}})
+	</view>
+	<view wx:if="{{userrole=='经销商'}}">
+		<block wx:if="{{item.qty!='0'}}">
+			单价/总金额：{{handleHide.query((item.price+'/'+item.amount),hidePrice)}}
+		</block>
+		<block wx:else>
+			总金额：{{handleHide.query(item.amount,hidePrice)}}
+		</block>
+	</view>
+	<view>
+		未发货数量：{{item.unsoldqty||"0"}}({{item.unit}})
+	</view>
+	<view>
+		备注：{{item.remarks||" --"}}
+	</view>
+</view>
+<wxs src="/utils/hidePrice.wxs" module="handleHide" />

packageA/orderForm/rows.js

@@ -1,4 +1,9 @@
 const _Http = getApp().globalData.http;
+import currency from "../../utils/currency";
+const CNY = value => currency(value, {
+  symbol: "￥",
+  precision: 2
+}).format();
 Page({
   data: {
     content: {
@@ -7,6 +12,7 @@ Page({
       pageSize: 20,
       where: {
         condition: "",
+        convenient: "",
         begindate: "",
         enddate: ""
       }
@@ -14,22 +20,14 @@ Page({
   },
   onLoad(options) {
     this.getList()
+    this.setData({
+      userrole: wx.getStorageSync('userrole')
+    })
   },
   tabsChange({
     detail
   }) {
-    let where = this.data.content.where;
-    if (detail.index == 0) {
-      delete(where.isuncheckout);
-      where.datetype = ""
-    } else if (detail.index == 1) {
-      where.isuncheckout = 1;
-      where.datetype = ""
-    } else {
-      where.isuncheckout = 1;
-      where.datetype = detail.name;
-    }
-    this.data.content.where = where;
+    this.data.content.where.convenient = detail.name
     this.getList(true)
   },
   /* 获取产品 */
@@ -44,11 +42,28 @@ Page({
       content
     }).then(res => {
       console.log("订单列表", res)
+      if (res.msg != '成功') return wx.showToast({
+        title: res.msg,
+        icon: "none"
+      })
       this.selectComponent('#ListBox').RefreshToComplete();
       content.pageNumber = res.pageNumber + 1
       content.pageTotal = res.pageTotal
+
+      let list = [];
+      res.data.forEach(v => {
+        let index = list.findIndex(item => item.sonum == v.sonum);
+        v.amount = CNY(currency(v.price).multiply(v.qty));
+        v.price = CNY(v.price);
+        if (index != -1) {
+          list[index].productList.push(v)
+        } else {
+          v.productList = []
+          list[list.length] = v;
+        }
+      })
       this.setData({
-        list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+        list: res.pageNumber == 1 ? list : this.data.list.concat(list),
         content
       })
     })
@@ -56,7 +71,6 @@ Page({
   /* 修改查看日期 */
   changeDate(e) {
     this.data.content.where[e.currentTarget.dataset.name] = e.detail.value;
-
     this.getList(true)
   },
   initialize() {

packageA/orderForm/rows.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "Item": "./modules/item/index"
+  }
 }

packageA/orderForm/rows.scss

@@ -3,13 +3,14 @@
     display: flex;
     line-height: 60rpx;
     justify-content: center;
-    text{
+
+    text {
         margin: 0 20rpx;
     }
 }
 
 .item {
-    padding: 20rpx 30rpx;
+    padding: 10rpx 30rpx;
     width: 100vw;
     background-color: #fff;
     border-bottom: 1px solid #ddd;
@@ -20,8 +21,10 @@
         margin-bottom: 10rpx;
     }
 
-    view {
-        font-size: 24rpx;
-        margin-top: 6rpx;
+    .product {
+        padding: 4rpx 16rpx;
+        box-sizing: border-box;
+        border: 1px solid #ddd;
+        border-radius: 8rpx;
     }
 }

packageA/orderForm/rows.wxml

@@ -5,40 +5,35 @@
     <picker mode="date" value="{{content.where.enddate}}" data-name="enddate" bindchange='changeDate'>{{content.where.enddate||'结束日期'}}</picker>
     <text wx:if="{{content.where.begindate||content.where.enddate}}" style="color:var( --assist);" bindtap="initialize">重置</text>
 </view> -->
-<van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
+<!-- <van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
     <van-tab title="全部" name='' />
     <van-tab title="全部未发" name='' />
     <van-tab title="7日未发" name='7' />
     <van-tab title="30日未发" name='30' />
     <van-tab title="90日未发" name='90' />
+</van-tabs> -->
+
+<van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
+    <van-tab title="全部" name='' />
+    <van-tab title="待确认" name='待确认' />
+    <van-tab title="待审核" name='待审核' />
+    <van-tab title="待发货" name='待发货' />
+    <van-tab title="已发货" name='已发货' />
+    <van-tab title="已取消" name='已取消' />
 </van-tabs>
 <view class="top" style="height: 5px;" />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <Yl_Empty wx:if="{{list.length==0}}" />
     <view class="item" wx:for="{{list}}" wx:key="sa_orderitemsid">
         <view class="title">
-            {{item.type+' '+item.sonum}}
-        </view>
-        <view>
-            单据日期：{{item.billdate}}
-        </view>
-        <view>
-            产品名称：{{item.itemname||" --"}}
-        </view>
-        <view>
-            产品编码：{{item.itemno||" --"}}
-        </view>
-        <view>
-            行号：{{item.rowno}}
-        </view>
-        <view>
-            数量：{{item.qty ||"0"}}({{item.unit}})
-        </view>
-        <view>
-            未发货数量：{{item.undeliqty||"0"}}({{item.unit}})
-        </view>
-        <view>
-            备注：{{item.remarks||" --"}}
+            {{item.type+' '+item.sonum}} / {{item.billdate}}
+        </view>
+        <!--  <view>
+            单据日期：
+        </view> -->
+        <view class="product">
+            <Item userrole='{{userrole}}' item="{{item}}" />
+            <Item userrole='{{userrole}}' borderTop wx:for="{{item.productList}}" wx:for-item="it" item="{{it}}" />
         </view>
     </view>
     <view style="height:150rpx;" />

pages/index/collect/index.js

@@ -5,7 +5,6 @@ const _Http = getApp().globalData.http,
 		precision: 2
 	}).format();
 let downCount = {};
-
 Component({
 	options: {
 		addGlobalClass: true,
@@ -30,14 +29,13 @@ Component({
 		},
 		customizedProduct(item) {
 			return new Promise((resolve) => {
-				console.log(item)
 				_Http.basic({
 					"id": 20220924104302,
 					"content": {
 						"sa_shoppingcartid": item.sa_shoppingcartid,
 						"qty": item.qty,
-						"width": item.width,
-						"length": item.length
+						"width": item.width || 0,
+						"length": item.length || 0
 					},
 				}).then(res => {
 					console.log("修改定制", res)
@@ -74,7 +72,7 @@ Component({
 				let list = [],
 					allBrandList = [];
 				list = res.data.map(v => {
-					v.showPrice = CNY(v.oldprice)
+					v.showPrice = CNY(v.gradeprice)
 					let obj = allBrandList.find(s => s.sa_brandid == v.sa_brandid);
 					if (obj) {
 						obj.results.push(v.sa_shoppingcartid)
@@ -127,6 +125,7 @@ Component({
 							"qty": v.qty,
 							width: v.width || 0,
 							length: v.length || 0,
+							sa_shoppingcartid: v.sa_shoppingcartid || 0
 						}
 					})
 				}
@@ -217,7 +216,7 @@ Component({
 			if (results.length) results = results.filter(v => {
 				let item = this.data.list.find(va => va.sa_shoppingcartid == v);
 				if (item) {
-					sum = currency(sum).add(currency(item.qty).multiply(item.oldprice)).value;
+					sum = currency(sum).add(currency(item.qty).multiply(item.gradeprice)).value;
 					/* 领域分类 */
 					let index = classList.findIndex(value => value.type == item.tradefield_shoppingcart);
 					if (index == -1) {
@@ -318,7 +317,9 @@ Component({
 					"id": 20220924104302,
 					"content": {
 						"sa_shoppingcartid": item.sa_shoppingcartid,
-						"qty": item.qty
+						"qty": item.qty,
+						"width": item.width || 0,
+						"length": item.length || 0
 					},
 				}, false).then(res => {
 					console.log("修改数量", res)
@@ -346,7 +347,9 @@ Component({
 					"id": 20220924104302,
 					"content": {
 						"sa_shoppingcartid": item.sa_shoppingcartid,
-						"qty": item.qty
+						"qty": item.qty,
+						"width": item.width || 0,
+						"length": item.length || 0
 					},
 				}, false).then(res => {
 					console.log("修改数量", res)

pages/index/collect/modules/custom.js

@@ -1,30 +1,36 @@
 const _Http = getApp().globalData.http;
 Component({
-  properties: {},
+  properties: {
+    isOldPrice: {
+      type: Boolean
+    }
+  },
   data: {
     item: null,
     show: false
   },
   methods: {
     onClick(item) {
+      console.log(item)
       if (this.data.product != null && item.itemid == this.data.product.itemid) return this.setData({
         show: true
       })
       wx.showLoading({
         title: '获取定制方案中..',
       })
-      let arr = [];
       Promise.all([{
         "id": "20230707091603",
         "version": 1,
         "content": {
-          "sa_sizecustomizedschemeid": item.lengthschemeid
+          "sa_sizecustomizedschemeid": item.lengthschemeid,
+          date: Date.now()
         }
       }, {
         "id": "20230707091603",
         "version": 1,
         "content": {
-          "sa_sizecustomizedschemeid": item.widthschemeid
+          "sa_sizecustomizedschemeid": item.widthschemeid,
+          date: Date.now() + 2
         }
       }].map(v => _Http.basic(v))).then(s => {
         console.log("获取定制方案", s)
@@ -33,26 +39,22 @@ Component({
           title: '定制方案获取失败',
           icon: "none"
         })
-        if (item.lengthschemeid) {
-          let data = s[0].data;
-          if (!item.length || item.length == 0) item.length = data.type == '可选' ? data.rowsdetail[0].num : data.min - 0;
-          arr.push(data)
-        }
-        if (item.widthschemeid) {
-          let data = s[1].data;
-          if (!item.width || item.width == 0) item.width = data.type == '可选' ? data.rowsdetail[0].num : data.min - 0;
-          arr.push(data)
-        }
+        s[0].data.name = '长度'
+        if (!item.length) item.length = s[0].data.type == '可选' ? s[0].data.rowsdetail[0].num : s[0].data.min - 0;
+        console.log("长度id", item.lengthschemeid, '长:' + item.length, '结果：', s[0].data.sa_sizecustomizedschemeid)
+        s[1].data.name = '宽度'
+        if (!item.width) item.width = s[1].data.type == '可选' ? s[1].data.rowsdetail[0].num : s[1].data.min - 0;
+        console.log("宽度id", item.widthschemeid, '宽:' + item.width, '结果：', s[1].data.sa_sizecustomizedschemeid)
         this.setData({
           show: true,
-          arr,
+          arr: [s[0].data, s[1].data],
           product: item
         });
-        console.log("arr", arr, item)
       });
 
       this.selectComponent("#Dialog").data.beforeClose = (action) => new Promise((resolve) => {
         if (action === 'confirm') {
+          //getItem(this.data.product, this.data.isOldPrice ? "oldprice" : "")
           getApp().globalData.customizedProduct(this.data.product).then(res => {
             resolve(true);
           })
@@ -93,6 +95,6 @@ Component({
       this.setData({
         product
       })
-    },
+    }
   }
 })

pages/index/collect/modules/custom.wxml

@@ -2,16 +2,15 @@
 	<view class="box">
 		<view class="item" wx:for="{{arr}}" wx:key="name">
 			<view class="label">
-				{{item.schemename}}：
+				{{item.name}}：
 			</view>
 			<view class="selectable" wx:if="{{item.type=='可选'}}">
-				<view class="num {{product[item.schemename=='宽'?'width':'length']==it.num?'active':''}}" wx:for="{{item.rowsdetail}}" wx:for-item='it' wx:key="rowno" data-name="{{item.schemename=='宽'?'width':'length'}}" data-num="{{it.num}}" catch:tap='selected'>
+				<view class="num {{product[item.name=='宽度'?'width':'length']==it.num?'active':''}}" wx:for="{{item.rowsdetail}}" wx:for-item='it' wx:for-index='i' wx:key="rowno" data-name="{{item.name=='宽度'?'width':'length'}}" data-num="{{it.num}}" catch:tap='selected'>
 					{{it.num}}
 				</view>
 			</view>
-
 			<view class="stepper" wx:else>
-				<van-stepper value="{{ product[item.schemename=='宽'?'width':'length'] }}" input-width="60px" min="{{item.min}}" max="{{item.max}}" decimal-length="{{ item.decimalplaces }}" data-item="{{item}}" data-name="{{ item.schemename=='宽'?'width':'length' }}" bind:plus='cahngeStepper' bind:blur='cahngeStepper' bind:minus='cahngeStepper' />
+				<van-stepper value="{{ product[ item.name=='宽度'?'width':'length'] }}" input-width="60px" min="{{item.min}}" max="{{item.max}}" decimal-length="{{ item.decimalplaces }}" data-item="{{item}}" data-name="{{ item.name=='宽度'?'width':'length' }}" bind:plus='cahngeStepper' bind:blur='cahngeStepper' bind:minus='cahngeStepper' />
 				<view class="explain">{{item.min+' ~ '+ item.max}},<text wx:if="{{item.decimalplaces}}">保留{{item.decimalplaces}}位小数</text><text wx:else>不保留小数</text></view>
 			</view>
 		</view>

project.private.config.json

@@ -5,7 +5,7 @@
     "compileHotReLoad": true,
     "urlCheck": false
   },
-  "libVersion": "2.25.3",
+  "libVersion": "2.24.7",
   "condition": {
     "miniprogram": {
       "list": [
@@ -43,6 +43,27 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "3434",
+          "pathName": "packageA/orderForm/detail",
+          "query": "id=257773",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "订单明细",
+          "pathName": "packageA/orderForm/rows",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "cxhd",
+          "pathName": "packageA/activity/detail",
+          "query": "id=1803",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

utils/Http.js

@@ -4,8 +4,8 @@ class HTTP {
 		if (ENV === 'release') { // 正式版
 			this.baseUrl = "https://lsa.cnyunl.com";
 		} else {
-			// this.baseUrl = "https://lsa.cnyunl.com";
-			this.baseUrl = "http://61.164.207.46:8300";
+			this.baseUrl = "https://lsa.cnyunl.com";
+			// this.baseUrl = "http://61.164.207.46:8300";
 		}
 		console.log("接口地址:", this.baseUrl)
 	}