Browse Source

no message

linwenxin 5 months ago
parent
commit
b37142c599

+ 4 - 13
src/components/zhifutanchuan.vue

@@ -9,14 +9,14 @@
         <text class="iconfont icon-chenggong true" style="font-size: 100rpx; color: greenyellow"></text>
       </view>
       <view class="textclass"> 支付成功 </view>
-      <view class="textclass" style="margin-top: 20rpx"> ¥{{ 133 }} </view>
+      <view class="textclass" style="margin-top: 20rpx"> ¥{{ detail.totalAmount }} </view>
     </view>
     <view class="zhuangtaitubiao" v-if="[3].includes(type)">
       <view class="icon">
         <text class="iconfont icon-shibai false" style="font-size: 100rpx; color: red"></text>
       </view>
       <view class="textclass"> 支付失败 </view>
-      <view class="textclass" style="margin-top: 20rpx"> ¥{{ 133 }} </view>
+      <view class="textclass" style="margin-top: 20rpx"> ¥{{ detail.totalAmount }} </view>
     </view>
 
     <view class="zhuangtaitubiao" style="justify-content: flex-start !important" v-if="[2].includes(type)">
@@ -39,7 +39,7 @@
       </view>
       <view class="row">
         <view class="label">支付方式:</view>
-        <view class="value">{{ detail.payType | payTypeFilter }}</view>
+        <view class="value">微信支付</view>
       </view>
     </view>
 
@@ -74,15 +74,6 @@ export default {
       default: 3
     }
   },
-  filters: {
-    payTypeFilter(val) {
-      const MAP = {
-        WECHAT: '微信支付',
-        LINE: '线下支付'
-      }
-      return MAP[val]
-    }
-  },
   data() {
     return {
       type: this.state,
@@ -108,7 +99,7 @@ export default {
           this.timeId = setTimeout(() => {
             this.miao--
           }, 1000)
-        } else {
+        } else if (this.state != 2) {
           this.type = 3
         }
       },

+ 5 - 2
src/packageMaterial/pages/newSale/pay.vue

@@ -111,7 +111,7 @@ export default {
         'reLaunch'
       )
     },
-    getDetail() {
+    getDetail(cb) {
       let url = '/pay/getOrder'
       let params = {}
       params.orderId = this.orderId
@@ -120,6 +120,7 @@ export default {
         .then(res => {
           this.detail = res.data
           this.loadStatus = 0
+          cb?.()
         })
         .catch(res => {
           this.errorText = res.message
@@ -175,7 +176,9 @@ export default {
           }
           // 返回true,则支付成功
           if (res.data) {
-            this.state = 2
+            this.getDetail(() => {
+              this.state = 2
+            })
           }
           // 返回false,轮询3次
           else {

+ 5 - 2
src/packageMaterial/pages/sale/pay.vue

@@ -112,7 +112,7 @@ export default {
         'reLaunch'
       )
     },
-    getDetail() {
+    getDetail(cb) {
       let url = '',
         params = {}
       if (this.wbId) {
@@ -127,6 +127,7 @@ export default {
         .then(res => {
           this.detail = res.data
           this.loadStatus = 0
+          cb?.()
         })
         .catch(res => {
           this.errorText = res.message
@@ -187,7 +188,9 @@ export default {
           }
           // 返回true,则支付成功
           if (res.data) {
-            this.state = 2
+            this.getDetail(() => {
+              this.state = 2
+            })
           }
           // 返回false,轮询3次
           else {

+ 24 - 19
src/packageWorkorder/pages/orderList.vue

@@ -157,6 +157,7 @@
               </block>
               <!-- 服务中 -->
               <block v-if="orderStatus_v(item.orderStatus) == 'FWZ' || orderStatus_v(item.orderStatus) == 'YCD'">
+                <u-button plain type="primary" text="变更小工" @tap="biangengxiaogong(item.id)"></u-button>
                 <u-button
                   plain
                   type="primary"
@@ -575,26 +576,10 @@ export default {
       }
     },
 
-    // 去配件申请
-    toPartsApply(id) {
-      this.$navToPage({
-        url: `/packageMaterial/pages/partsApply/form?id=${id}`
-      })
-    },
-
-    // 去过程反馈
-    toFeedback(id) {
-      this.$navToPage({
-        url: `/packageWorkorder/pages/processFeedback?id=${id}`
-      })
-    },
-
-    toDetail(id) {
-      this.$navToPage({
-        url: `/packageWorkorder/pages/orderDetail?id=${id}`
-      })
-    },
+    // 变更小工
+    biangengxiaogong() {},
 
+    // 抢单
     qdOrder(item) {
       this.$modal({
         title: '抢单确认',
@@ -612,6 +597,26 @@ export default {
             })
         })
         .catch(() => {})
+    },
+
+    // 去配件申请
+    toPartsApply(id) {
+      this.$navToPage({
+        url: `/packageMaterial/pages/partsApply/form?id=${id}`
+      })
+    },
+
+    // 去过程反馈
+    toFeedback(id) {
+      this.$navToPage({
+        url: `/packageWorkorder/pages/processFeedback?id=${id}`
+      })
+    },
+
+    toDetail(id) {
+      this.$navToPage({
+        url: `/packageWorkorder/pages/orderDetail?id=${id}`
+      })
     }
   }
 }