隐私金额优化，商城配件不能下订单

packageA/market/detail.js

@@ -74,7 +74,9 @@ Page({
 			}).format();
 			item.gradeprice = CNY(item.gradeprice);
 			item.marketprice = CNY(item.marketprice);
-			item.qty = item.orderaddqty;
+			if (item.orderaddqty == null) item.orderaddqty = 1;
+			if (item.orderminqty == null) item.orderminqty = 1;
+			item.qty = item.orderminqty;
 			let row = {
 				specRows: res.data.specRows.reverse(),
 				cheekRows: res.data.cheekRows,

packageA/market/detail.wxml

@@ -128,7 +128,4 @@
     <van-button custom-class="bg-orange submit {{isShowFavorites?'w240':'w610'}}" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">加入购物车</van-button>
     <van-button custom-class="bg-blue submit {{isShowFavorites?'w240':'w610'}}" id='placeAnOrder' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">立即下单</van-button>
 </view>
-<view class="footer" wx:else>
-    <van-button custom-class='but' id='placeAnOrder' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">立即下单</van-button>
-</view>
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />

packageA/orderForm/detail.js

@@ -254,6 +254,7 @@ Page({
 		this.setData({
 			specialProductQuantity: detail
 		})
+		console.log("specialProductQuantity",this.data.specialProductQuantity)
 	},
 	/* 免运费信息 */
 	setLogisticsMsg() {

packageA/orderForm/detail.wxml

@@ -81,7 +81,7 @@
     <view class="but-box">
         <van-button custom-class='but delete' wx:if="{{detail.status=='新建'&& enable.query(options,'delete')}}" bind:click="deleteItem">删除订单</van-button>
         <van-button custom-class='but delete' wx:if="{{detail.status=='提交'&& enable.query(options,'submit')}}" bind:click="revocation">撤回提交</van-button>
-        <van-button custom-class='but' wx:if="{{detail.status=='新建' && enable.query(options,'submit')}}" disabled="{{detail.amount<=0}}" bind:click="submit">提交订单</van-button>
+        <van-button custom-class='but' wx:if="{{detail.status=='新建' && enable.query(options,'submit')}}" disabled="{{!specialProductQuantity}}" bind:click="submit">提交订单</van-button>
     </view>
 </view>
 

pages/index/message/detail.js

@@ -4,6 +4,15 @@ Page({
     detailsData: []
   },
   onLoad(options) {
+    try {
+      let privacyFieldC = wx.getStorageSync('auth').worderform.forms.detail.formcols.map(v => v.title);
+      this.setData({
+        privacyFieldC
+      })
+      console.log("privacyFieldC", privacyFieldC)
+    } catch (error) {
+      console.error(error)
+    }
     _Http.basic({
       "classname": "system.message.Message",
       "method": "readMessage",
@@ -15,10 +24,15 @@ Page({
         title: res.msg,
         icon: "none"
       })
+      if (!this.data.privacyFieldC.find(v => v == '列表金额')) {
+        if (res.data.message.includes('】元')) res.data.message = res.data.message.replace(/【(.*?)】/g, '【****】')
+      }
       this.setData({
         detailsData: res.data
       });
       getApp().globalData.socketCallback()
     })
+
+
   },
 })

pages/index/message/detail.wxml

@@ -1,8 +1,6 @@
 <view class="msg-mian">
-    <view class="title multi-line">{{detailsData.title}}</view>
-    <view class="time">{{detailsData.readdate}}</view>
-    <view class="content multi-line">{{detailsData.message}}</view>
-  <!--   <view class="content" wx:if="{{detailsData.type=='应用'}}" bindtap="toDetails">请前往 <text>{{type.query(detailsData.objectname)}} >
-        </text></view> -->
+  <view class="title multi-line">{{detailsData.title}}</view>
+  <view class="time">{{detailsData.readdate}}</view>
+  <view class="content multi-line" >{{detailsData.message}}</view>
 </view>
 <wxs module="type" src='./modules/determineType.wxs' />

pages/index/message/index.js

@@ -26,6 +26,15 @@ Component({
         tabshow: true
       })
       this.getlist(true);
+      try {
+        let privacyFieldC = wx.getStorageSync('auth').worderform.forms.detail.formcols.map(v => v.title);
+        this.setData({
+          privacyFieldC
+        })
+        console.log("privacyFieldC", privacyFieldC)
+      } catch (error) {
+        console.error(error)
+      }
       return true;
     },
     getlist(init = false) {
@@ -46,6 +55,10 @@ Component({
           title: res.msg,
           icon: "none"
         })
+        if (!this.data.privacyFieldC.find(v => v == '列表金额')) res.data = res.data.map(v => {
+          if (v.message.includes('】元')) v.message = v.message.replace(/【(.*?)】/g, '【****】')
+          return v
+        })
         this.setData({
           total: res.total,
           list: (res.pageNumber == 1) ? res.data : this.data.list.concat(res.data),