Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality

App.vue

@@ -33,6 +33,8 @@ export default {
   width: 404rpx!important;
   height: 306rpx!important;
 }
-
+.u-transition{
+  z-index: 999!important;
+}
 
 </style>

pages/confirm-order/index.vue

@@ -112,6 +112,7 @@
       </div>
       <div class="wrap2" @click="signContract">付款</div>
     </div>
+    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在生成订单并付款..."></u-loading-page>
   </div>
 </template>
 <script>
@@ -121,6 +122,7 @@ export default {
   name: "confirm-order",
   data(){
     return{
+      loading:false,
       orderingInfo:uni.getStorageSync('orderingInfo'),
       expectedPayment:'',
       distance:'',
@@ -166,6 +168,7 @@ export default {
   },
   methods: {
   async  signContract(){
+    this.loading=true
     const data1={
       artworkName:this.orderingInfo.info.artworkName,
       artworkNum:this.orderingInfo.info.artworkNum,
@@ -179,6 +182,7 @@ export default {
       artworkSquareSize:Number(this.orderingInfo.info.artworkSquareSize),
       contractTransactionId:this.orderingInfo.transactionId
     }
+
     const res1 = await postDataByParams('/api/warehouse/create',data1)
       if (res1.code===200){
         const res2 = await postDataByParams('/api/warehouse/paid',{
@@ -188,6 +192,7 @@ export default {
           uni.navigateTo({
             url: `/pages/paySuccess/paySuccess?ID=${res1.data.ID}`,
           });
+          this.loading=false
         }
       }
     },

pages/consignment-painting/index.vue

@@ -188,6 +188,7 @@
       </div>
       <div class="wrap2" @click="signContract">确认金额并签署合同</div>
     </div>
+    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在进入法大大签署..."></u-loading-page>
   </div>
 </template>
 <script>
@@ -213,6 +214,7 @@ export default {
       days.push(i)
     }
     return {
+      loading:false,
       fileList1:[],
       dayMoney:'',
       expectedPayment:'',
@@ -333,6 +335,7 @@ export default {
          return
        }
      }
+     this.loading=true
      const data={
        cycleId:this.cycleId,
        warehouseID:this.warehouseID,
@@ -355,6 +358,7 @@ export default {
        uni.navigateTo({
          url: `/pages/signwebview/index`,
        });
+       this.loading=false
      }
 
     },

pages/order-goods/order-details.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="order-details" >
-    <title-block class="title-block" title="订单库">
+    <title-block class="title-block" title="订单详情">
       <template #left>
         <div> <image style="width: 112rpx;height: 52rpx" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" @click="back"></image></div>
       </template>
@@ -84,6 +84,7 @@
           </div>
         </div>
         <div class="wrap1_1_4">
+
         </div>
       </div>
       <div class="wrap1_1">
@@ -120,8 +121,7 @@
         <div class="wrap1_1_3">
           <input disabled placeholder-style="color: #FF4848;font-size: 24rpx;" :placeholder="`${info.supplementMoney}元`"/>
         </div>
-        <div class="wrap1_1_4">
-        </div>
+
       </div>
     </div>
     <div class="wrap2"></div>

pages/paySuccess/paySuccess.vue

@@ -24,7 +24,7 @@
         </view>
         <view class="info-right-item">
           <view class="title">画作平尺数</view>
-          <view class="content">{{ info.artworkSize }}</view>
+          <view class="content">{{ info.artworkSquareSize }}</view>
         </view>
       </view>
     </view>