更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/report/ReportServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -544,8 +545,9 @@ public class ReportServiceImpl implements ReportService {
                 payDetailDO.setAdminId(adminId);
                 payDetailMapper.insert(payDetailDO);
             }
+            DecimalFormat   decimalFormat   =   new DecimalFormat("##0.00");
             Map<String, Object> map = new HashMap<>();
-            map.put("value", reportDTO.getPayMoney());
+            map.put("value", decimalFormat.format(reportDTO.getPayMoney()));
             map.put("valueOne", sdf.format(new Date()));
             map.put("url", reportDTO.getPayImg());
             map.put("templateId", "3NM7ujI5vuJSdYlHJAPcYiacrg2YvuyT1Y7BZf9qeNc");
@@ -631,8 +633,8 @@ public class ReportServiceImpl implements ReportService {
                 payDetailMapper.insert(payDetailDO);
             }
             Map<String, Object> map = new HashMap<>();
-            map = new HashMap<>();
-            map.put("value", reportDTO.getPayMoney());
+            DecimalFormat   decimalFormat   =   new DecimalFormat("##0.00");
+            map.put("value", decimalFormat.format(reportDTO.getPayMoney()));
             map.put("valueOne", sdf.format(new Date()));
             map.put("url", reportDTO.getPayImg());
             map.put("templateId", "3NM7ujI5vuJSdYlHJAPcYiacrg2YvuyT1Y7BZf9qeNc");

unimall-app/pageA/pages/deliver_goods.vue

@@ -44,7 +44,7 @@
 			当前合同暂无车辆
 		</view>
 		<drag-button 
-			v-if="contractType =='销售合同'"
+			v-if="contractType =='销售合同'&& tradeStatus!="4""
 			:isDock="true"
 			:existTabBar="true"
 			text="发货"
@@ -53,15 +53,15 @@
 			boxshadow="0 0 6rpx rgba(36, 90, 141, 0.5)"
 			@btnClick="deliver"
 			/>
-			<block v-if='tradeStatus!="3"'>
-				<drag-button
-			:isDock="true"
-			:existTabBar="true"
-			text="点价"
-			location="40"
-			background='rgba(36, 90, 141, 0.5)'
-			boxshadow='0 0 6rpx rgba(36, 90, 141, 0.5)'
-			@btnClick="price"
+			<block v-if='tradeStatus!="3" && tradeStatus!="4"'>
+			<drag-button
+				:isDock="true"
+				:existTabBar="true"
+				text="点价"
+				location="40"
+				background='rgba(36, 90, 141, 0.5)'
+				boxshadow='0 0 6rpx rgba(36, 90, 141, 0.5)'
+				@btnClick="price"
 			/>
 			</block>