修改

packageA/account/index.js

@@ -33,9 +33,12 @@ Page({
                 }
             }
         }).then(res => {
+            console.log("账户列表", res)
             this.setData({
                 accountList: res.data.map(v => {
                     v.creditquota = CNY(v.creditquota);
+                    v.freezamount = CNY(v.freezamount);
+                    v.discountamount = CNY(v.discountamount);
                     v.usable = CNY(currency(v.creditquota).add(v.balance));
                     v.balance = CNY(v.balance)
                     return v
@@ -90,6 +93,7 @@ Page({
                 }
                 res.data = res.data.map(v => {
                     v.amount = CNY(v.amount)
+                    v.discountamount = CNY(v.discountamount)
                     v.showBalance = CNY(v.balance)
                     return v
                 })

packageA/account/index.wxml

@@ -25,15 +25,15 @@
         </view>
         <view class="lower">
             <view class="item">
-                <view class="name">信用额度(元)</view>
+                <view class="name">冻结金额(元)</view>
                 <view class="price">
-                    {{item.creditquota}}
+                    {{item.freezamount}}
                 </view>
             </view>
             <view class="item">
-                <view class="name">可用额度(元)</view>
+                <view class="name">优惠余额(元)</view>
                 <view class="price">
-                    {{item.usable}}
+                    {{item.discountamount}}
                 </view>
             </view>
         </view>
@@ -51,8 +51,8 @@
     <view class="content">
         <view class="title">{{item.type==0?'支出':'收入'}}{{item.source?'-'+item.source:""}}</view>
         <view class="exp">{{item.accountname}}：{{item.showBalance}}</view>
+        <view class="exp">优惠金额：{{item.discountamount}}</view>
         <view class="exp">分类：{{item.class || ' --'}}</view>
-        <view class="exp">分类明细：{{item.subclass || ' --'}}</view>
         <view class="exp">交易备注：{{item.remarks || ' --'}}</view>
         <view class="exp">{{item.createdate}}</view>
     </view>

packageA/activity/bindingProduct/index.wxml

@@ -29,9 +29,9 @@
 					<van-icon name="arrow-down" />
 				</view>
 				<view class="exp">特征码：{{item.signaturecode ||" --"}}</view>
-				<view class="exp">
+				<!-- <view class="exp">
 					包装数量：{{item.packageqty}} ({{item.unitname || item.unit}})
-				</view>
+				</view> -->
 				<view class="exp">可购数量：{{item.groupqty==0?'不限购':(item.groupqty-item.saledqty)<=0?'已售罄':item.maxQty}} </view>
 				</view>
 			</view>

packageA/activity/detail.skeleton.wxml

@@ -57,7 +57,7 @@
               铜本色等径直通
             </view>
             <view class="subfield line-1 sk-transparent sk-text-14-7059-396 sk-text">
-              产品编号:BM8270 0150000
+              品号:BM8270 0150000
             </view>
             <view class="subfield line-1">
               <text style="margin-right: 7px;" class="sk-transparent sk-text-14-7059-91 sk-text">型号:BM8270</text>
@@ -85,7 +85,7 @@
               铜本色等径直通
             </view>
             <view class="subfield line-1 sk-transparent sk-text-14-7059-887 sk-text">
-              产品编号:BM8270 0150000
+              品号:BM8270 0150000
             </view>
             <view class="subfield line-1">
               <text style="margin-right: 7px;" class="sk-transparent sk-text-14-7059-309 sk-text">型号:BM8270</text>
@@ -113,7 +113,7 @@
               暖通复合管
             </view>
             <view class="subfield line-1 sk-transparent sk-text-14-7059-312 sk-text">
-              产品编号:NBNTO-28571530003
+              品号:NBNTO-28571530003
             </view>
             <view class="subfield line-1">
               <text style="margin-right: 7px;" class="sk-transparent sk-text-14-7059-887 sk-text">型号:DN20</text>

packageA/activity/detail.wxml

@@ -58,9 +58,9 @@
 				</view>
 				<view class="subfield line-1">
 					限购数量：{{item.groupqty==0?'不限购':(item.groupqty-item.saledqty)<=0?'已售罄':item.groupqty}} </view>
-						<view class="subfield">
+					<!-- 	<view class="subfield">
 							包装数量：{{item.packageqty}} ({{item.unitname}})
-						</view>
+						</view> -->
 				</view>
 			</view>
 	</navigator>

packageA/activity/selectProduct/cart/index.wxml

@@ -27,7 +27,7 @@
 			</view>
 			<view class="bottom">
 				<view class="check label-class">
-					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装数量:{{item.packageqty}}
+					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}<!-- ，包装数量:{{item.packageqty}} -->
 				</view>
 				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>

packageA/activity/selectProduct/index.wxml

@@ -23,9 +23,9 @@
 					<van-icon name="arrow-down" />
 				</view>
 				<view class="exp">特征码：{{item.signaturecode ||" --"}}</view>
-				<view class="exp">
+				<!-- <view class="exp">
 					包装数量：{{item.packageqty}} ({{item.unit || item.unitname}})
-				</view>
+				</view> -->
 				<view class="exp">可购数量：{{item.groupqty==0?'不限购':(item.groupqty-item.saledqty)<=0?'已售罄':item.maxQty}} </view>
 				</view>
 			</view>

packageA/dispatchBill/modules/item/index.wxml

@@ -3,7 +3,7 @@
 		产品编码：{{item.itemno||" --"}}
 	</view>
 	<view>
-		产品名称：{{item.itemname||" --"}}
+		品名：{{item.itemname||" --"}}
 	</view>
 	<view>
 		数量：{{item.qty||"0"}}({{item.unitname}})
@@ -17,9 +17,9 @@
 			总金额：{{handleHide.verify(item.amount,'列表金额',privacyFieldC)}}
 		</block>
 	</view>
-	<view>
+	<!-- <view>
 		包装数量：{{item.packageqty}}
-	</view>
+	</view> -->
 	<view>
 		来源单号：{{item.sonum}}
 	</view>

packageA/dispatchBill/rows.wxml

@@ -15,7 +15,7 @@
 			出库日期：{{item.closedate||" --"}}
 		</view>
 		<view>
-			产品名称：{{item.itemname||" --"}}
+			品名：{{item.itemname||" --"}}
 		</view>
 		<view>
 			产品编码：{{item.itemno||" --"}}

packageA/favorites/index.wxml

@@ -27,7 +27,7 @@
 			</view>
 			<view class="bottom">
 				<view class="check label-class">
-					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装数量:{{item.packageqty}}
+					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}<!-- ，包装数量:{{item.packageqty}} -->
 				</view>
 				<van-stepper value="{{ item.favoritesqty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>

packageA/market/detail.js

@@ -140,6 +140,8 @@ Page({
 			},
 			list = fileList(arr);
 		list.forEach(v => {
+			v.cover = _Http.getImageUrl(v.cover)
+			v.url = _Http.getImageUrl(v.url)
 			switch (v.fileType) {
 				case "video":
 					files.videos.push(v)
@@ -153,7 +155,7 @@ Page({
 					files.images.push(v)
 					files.viewImages.push({
 						url: v.url,
-						type: "image"
+						type: "image",
 					})
 					break;
 				default:

packageA/market/detail.skeleton.wxml

@@ -89,7 +89,7 @@
               <view class=" van-tab__pane tab-index--van-tab__pane van-tab__pane--active tab-index--van-tab__pane--active" style="true">
                 <view class="tab-box">
                   <view class="row sk-transparent sk-text-15-0000-737 sk-text">
-                    商品编号：CMCULP 0220001
+                    品号：CMCULP 0220001
                   </view>
                   <view class="row sk-transparent sk-text-15-0000-573 sk-text">
                     规格：22x1.2mmx2.5

packageA/market/detail.wxml

@@ -32,7 +32,7 @@
     <view class="else">
         <text>起订量：{{detail.orderminqty||' --'}}</text>
         <text>增量：{{detail.orderaddqty||' --'}}</text>
-        <text>包装数量:{{detail.packageqty||' --'}}</text>
+        <!-- <text>包装数量:{{detail.packageqty||' --'}}</text> -->
     </view>
 </view>
 <view class="model">
@@ -73,7 +73,7 @@
     </view>
 
     <view class="label">
-        数量 <text style="font-size: 24rpx;font-weight: 400;">(起订量:{{detail.orderminqty}}，增减量:{{detail.orderaddqty}}，包装量:{{detail.packageqty}})</text>
+        数量 <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' />

packageA/orderForm/detail.js

@@ -14,10 +14,6 @@ Page({
 			label: "出库单",
 			icon: "icon-tabrenwu",
 			model: "#Consignment"
-		}, {
-			label: "物流单",
-			icon: "icon-shouhuo",
-			model: "#Shipments"
 		}],
 		specialProductQuantity: 0
 	},
@@ -93,6 +89,7 @@ Page({
 		_Http.basic({
 			id: 20221008145903,
 			"content": {
+				nocache: true,
 				"pageNumber": 1,
 				"pageSize": 20,
 				"where": {
@@ -109,6 +106,7 @@ Page({
 				precision: 2
 			}).format();
 			let item = Object.assign(this.data.detail.sa_accountclassinfos, res.data[0]);
+			item.balance = item.balance - 0 + item.discountamount - item.freezamount;
 			['amount', 'freezamount', 'discountamount', 'creditguota', 'balance'].forEach(v => item[v] = CNY(item[v]))
 			this.setData({
 				"detail.sa_accountclassinfos": item
@@ -537,7 +535,7 @@ Page({
 					"id": 20221108153402,
 					"content": {
 						sa_orderid: that.data.sa_orderid,
-						sa_order_v: that.data.detail.sa_order_v,
+						// sa_order_v: that.data.detail.sa_order_v,
 					},
 				}).then(s => {
 					console.log("提交订单", s)

packageA/orderForm/index.js

@@ -18,6 +18,7 @@ Page({
       "pageTotal": 1,
       "where": {
         "condition": "",
+        type: '标准订单',
         tablefilter: {}
       }
     };

packageA/orderForm/modules/item/index.wxml

@@ -3,7 +3,7 @@
 		产品编码：{{item.itemno||" --"}}
 	</view>
 	<view>
-		产品名称：{{item.itemname||" --"}}
+		品名：{{item.itemname||" --"}}
 	</view>
 	<view>
 		数量：{{item.qty ||"0"}}({{item.unit}})

packageA/orderForm/modules/product/index.js

@@ -67,11 +67,15 @@ Component({
                     icon: "none"
                 })
                 res.data = res.data.map(v => {
-                    if (v.attinfos.length != 0) {
-                        v.attinfos = file.fileList(v.attinfos)
-                        let image = v.attinfos.find(v => v.fileType == "image");
-                        v.cover = image ? image.cover : "";
-                    };
+                    if (v.cover) {
+                        v.cover = _Http.getImageUrl(v.cover)
+                    } else {
+                        if (v.attinfos.length != 0) {
+                            v.attinfos = file.fileList(v.attinfos)
+                            let image = v.attinfos.find(v => v.fileType == "image");
+                            v.cover = image ? _Http.getSpecifiedImage(image) : "";
+                        }
+                    }
                     v.showPrice = CNY(v.price)
                     // v.marketprice = CNY(v.marketprice)
                     v.showAmount = CNY(v.amount)

packageA/orderForm/modules/product/list/index.wxml

@@ -21,9 +21,9 @@
                 <view wx:if="{{item.iscustomsize}}" class="subfield" style="margin-top: 8rpx;">
                     定制属性：{{item.customproperties}}
                 </view>
-                <view class="subfield">
+                <!-- <view class="subfield">
                     包装数量：{{item.packageqty}} ({{item.unit}})
-                </view>
+                </view> -->
                 <view class="subfield" style="margin-top: 8rpx;">
                     <text class="price" style="margin-right: 6rpx;"> {{handleHide.verify(item.showPrice,"产品明细",privacyFieldC)}}</text>
                     <text style="font-weight: 600;color: #666;">库存：{{item.invbalqty-item.undeliqtysum-item.unsoldqty>0?'有货':'缺货'}}</text>

pages/index/collect/index.js

@@ -92,6 +92,7 @@ Component({
 					allBrandList = [];
 				list = res.data.map(v => {
 					v.showPrice = CNY(v.gradeprice)
+					v.cover = (v.attinfos.length) ? _Http.getSpecifiedImage(v.attinfos[0]) : ""
 					let obj = allBrandList.find(s => s.sa_brandid == v.sa_brandid);
 					if (obj) {
 						obj.results.push(v.sa_shoppingcartid)

pages/index/collect/index.wxml

@@ -5,7 +5,7 @@
 		<view url="#" class="item-box">
 			<view class="top" catch:tap="changeResults" data-item="{{item}}">
 				<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-image width="100%" height="100%" fit="cover" src="{{item.cover}}" use-loading-slot use-error-slot lazy-load>
 						<van-loading slot="loading" type="spinner" size="20" vertical />
 						<text slot="error">加载失败</text>
 					</van-image>
@@ -26,7 +26,7 @@
 			</view>
 			<view class="bottom">
 				<view class="check label-class">
-					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装数量:{{item.packageqty}}
+					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}<!-- ，包装数量:{{item.packageqty}} -->
 				</view>
 				<van-stepper button-size='{{32}}' value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>

pages/index/market/index.js

@@ -46,6 +46,8 @@ Component({
         })
         res.data = res.data.map(v => {
           v.itemclass = v.itemclass.map(s => s.itemclassname)
+          v.cover = _Http.getImageUrl(v.cover)
+          v.attinfos = v.attinfos.map(v => _Http.getSpecifiedImage(v))
           return v
         })
         this.selectComponent('#ListBox').RefreshToComplete();

pages/index/market/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator class="product" bindtap="toDetail" data-item="{{item}}" url="#" wx:for="{{list}}" wx:key="index">
 	<view class="image-box">
-		<van-image width="100%" wx:if="{{item.attinfos[0]||item.cover}}" 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-image width="100%" wx:if="{{item.cover}}" height="100%" fit="cover" src="{{item.cover}}" use-loading-slot use-error-slot lazy-load>
 			<van-loading slot="loading" type="spinner" size="20" vertical />
 			<text slot="error">加载失败</text>
 		</van-image>

pages/index/userCenter/index.wxml

@@ -48,7 +48,7 @@
 			</view>
 		</navigator>
 
-		<navigator class="item" url="#" bindtap="bindingWechat">
+		<!-- <navigator class="item" url="#" bindtap="bindingWechat">
 			<view class="con">
 				<view class="label">
 					<text class="iconfont icon-a-wodebangdingweixin" style="color: var(--success);" />
@@ -63,7 +63,7 @@
 					<van-icon size='30rpx' name="arrow" />
 				</view>
 			</view>
-		</navigator>
+		</navigator> -->
 
 	<!-- 	<navigator wx:if="{{userMsg.iswechatbinding}}" class="item" url="/pages/notifications/webview">
 			<view class="con">

select/product/index.js

@@ -65,10 +65,14 @@ Page({
 
 			let newPrice = this.data.newPrice;
 			res.data = res.data.map(value => {
-				if (value.attinfos.length != 0) {
-					value.attinfos = file.fileList(value.attinfos)
-					let image = value.attinfos.find(v => v.fileType == "image");
-					value.cover = image ? image.cover : "";
+				if (value.cover) {
+					value.cover = _Http.getImageUrl(value.cover)
+				} else {
+					if (value.attinfos.length != 0) {
+						value.attinfos = file.fileList(value.attinfos)
+						let image = value.attinfos.find(v => v.fileType == "image");
+						value.cover = image ? _Http.getSpecifiedImage(image) : "";
+					}
 				}
 				if (newPrice) value.newPrice = CNY(value[newPrice] || 0);
 				value.brandName = value.brand.map(name => name.brandname)

select/product/index.wxml

@@ -31,9 +31,9 @@
                 <view class="subfield line-1">
                     规格:{{item.standards||' --'}}
                 </view>
-                <view class="subfield line-1">
+                <!-- <view class="subfield line-1">
                     包装数量：{{item.packageqty}} ({{item.unit}})
-                </view>
+                </view> -->
                 <view wx:if="{{item.iscustomsize}}" class="subfield line-1" data-item="{{item}}" catch:tap="customization" style="color:#085CDF;">
                     {{item.customText}}
                     <van-icon name="arrow-down" />
@@ -46,7 +46,7 @@
         <view class="bottom">
             <view class="check" bindtap="changeResults" data-item="{{item}}">
                 <view class="label-class">
-                    起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装量:{{item.packageqty}}
+                    起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}<!-- ，包装量:{{item.packageqty}} -->
                 </view>
             </view>
             <van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />

utils/FormatTheAttachment.js

@@ -37,12 +37,30 @@ function fileList(list) {
 
 //得到缩略图或者压缩图  getType默认得到缩略图传true得到压缩图
 function getSpecifiedImage(obj, getType = false) {
-    let type = getType ? 'compressed' : 'thumbnail';
-    let imgObj = obj.subfiles.find(v => v.type == type);
-    return imgObj.url;
+    obj.url = getImageUrl(obj.url)
+    try {
+        let type = getType ? 'compressed' : 'thumbnail';
+        let imgObj = obj.subfiles.find(v => v.type == type);
+        return getImageUrl(imgObj.url || obj.url);
+    } catch (error) {
+        return getImageUrl(obj.url);
+    }
+}
+
+
+// 判断图片是本地还是云存储
+function getImageUrl(url) {
+    const _Http = getApp().globalData.http;
+    if (!url) return '';
+    //判断url中是否存在http,没有的话要拼接 this.baseUrl
+    if (!/^https?:\/\//.test(url)) {
+        url = _Http.baseUrl + url;
+    }
+    return url;
 }
 
 module.exports = {
     fileList,
-    getSpecifiedImage
+    getSpecifiedImage,
+    getImageUrl
 }

utils/Http.js

@@ -17,9 +17,30 @@ class HTTP {
 			// this.baseUrl = "http://61.164.207.46:8300";
 			this.baseUrl = "https://crm.meida.com:16691";
 		}
-		console.log("接口地址:", this.baseUrl)
 
 
+		//得到缩略图或者压缩图  getType默认得到缩略图传true得到压缩图
+		this.getSpecifiedImage = (obj, getType = false) => {
+			obj.url = this.getImageUrl(obj.url)
+			try {
+				let type = getType ? 'compressed' : 'thumbnail';
+				let imgObj = obj.subfiles.find(v => v.type == type);
+				return this.getImageUrl(imgObj.url || obj.url);
+			} catch (error) {
+				return this.getImageUrl(obj.url);
+			}
+		}
+
+		// 判断图片是本地还是云存储
+		this.getImageUrl = (url) => {
+			if (!url) return '';
+			//判断url中是否存在http,没有的话要拼接 this.baseUrl
+			if (!/^https?:\/\//.test(url)) {
+				url = this.baseUrl + url;
+			}
+			return url;
+		}
+
 		// 从本地存储加载JSESSIONID
 		this.jsessionid = wx.getStorageSync('JSESSIONID') || '';
 		console.log("接口地址", this.baseUrl);