no message

src/common/http/index.js

@@ -61,7 +61,7 @@ export const $http = (url, method, data, json, loadingBool = false, isExecute =
           confirmText: '立即绑定',
           success: function (res) {
             if (res.confirm) {
-              uni.navigateTo({
+              this.$navToPage({
                 url: '/packageMine/pages/phone'
               })
             } else if (res.cancel) {
@@ -183,7 +183,7 @@ async function doRequest(response, url) {
       title: '授权失效，请重新登录',
       duration: 1000
     })
-    uni.navigateTo({
+    this.$navToPage({
       url: '/pages/login/auth'
     })
     return false

src/common/utils/common.js

@@ -134,14 +134,14 @@ export const tips = text => {
  */
 export const navPage = (url, isAuth = 0) => {
   if ((isAuth && store.state.token) || !isAuth) {
-    uni.navigateTo({
+    this.$navToPage({
       url,
       fail: err => {
         console.log('页面跳转失败', url, err)
       }
     })
   } else {
-    uni.navigateTo({
+    this.$navToPage({
       url: '/pages/login/index'
     })
   }
@@ -163,7 +163,7 @@ export const redPage = (url, isAuth = 0) => {
       }
     })
   } else {
-    uni.navigateTo({
+    this.$navToPage({
       url: '/pages/login/index'
     })
   }

src/packageEnter/pages/insurance/determineInfo/index.vue

@@ -42,10 +42,9 @@
               <radio :checked="checked" />
               <text>请阅读</text>
             </label>
-            <text v-for="(item, index) in insureAgreeList" :key="index" @click="goDetailsAgreement(item)">{{
-              item.agreementName
-            }}</text>
-            <text v-if="index < insureAgreeList.length - 1">/</text>
+            <text v-for="(item, index) in insureAgreeList" :key="index" @click="goDetailsAgreement(item)"
+              >{{ item.agreementName }}<text v-if="index < insureAgreeList.length - 1">/</text>
+            </text>
           </view>
           <view class="btns">
             <u-button :disabled="loading" type="primary" @click="goback">暂不同意</u-button>
@@ -131,7 +130,7 @@ export default {
     },
     goDetailsAgreement(item) {
       if (item.id) {
-        uni.navigateTo({
+        this.$navToPage({
           url: `/packageEnter/pages/insurance/detailsAgreement/index?id=${item.id}`
         })
       }

src/packageEnter/pages/insurance/insuranceContract/index.vue

@@ -79,13 +79,13 @@ export default {
   methods: {
     goDetailsAgreement(item) {
       if (item.id) {
-        uni.navigateTo({
+        this.$navToPage({
           url: `/packageEnter/pages/insurance/detailsAgreement/index?id=${item.id}&websitId=${this.websitId}`
         })
       }
     },
     gopay() {
-      uni.navigateTo({
+      this.$navToPage({
         url: `/packageEnter/pages/insurance/determineInfo/index?websitId=${this.websitId}&id=${this.id}`
       })
     }

src/packageEnter/pages/insurance/policyParticulars/index.vue

@@ -181,7 +181,7 @@ export default {
     },
     goDetailsAgreement(item) {
       if (item.id) {
-        uni.navigateTo({
+        this.$navToPage({
           url: `/packageEnter/pages/insurance/detailsAgreement/index?id=${item.id}`
         })
       }

src/packageMine/pages/groupbuy/list.vue

@@ -353,7 +353,7 @@ export default {
       if (!id) {
         return false
       }
-      uni.navigateTo({
+      this.$navToPage({
         url: '/packageGoods/pages/detail?id=' + id
       })
     },
@@ -372,7 +372,7 @@ export default {
     // 点击分享
     clickShare() {
       if (!this.isLogin) {
-        return uni.navigateTo({
+        return this.$navToPage({
           url: '/pages/login/index'
         })
       }

src/packageMine/pages/order/detail.vue

@@ -2,23 +2,37 @@
   <view>
     <Loading :type="3" :loadStatus="loadStatus" :showText="errorText" />
 
-    <zj-page-layout v-if="detail" :hasFooter="true" :isScroll="true" :refresherTriggered="refresherTriggered"
-      @refresherrefresh="refresherrefresh">
-
+    <zj-page-layout
+      v-if="detail"
+      :hasFooter="true"
+      :isScroll="true"
+      :refresherTriggered="refresherTriggered"
+      @refresherrefresh="refresherrefresh"
+    >
       <view class="app-container">
-        <view class="status-container" v-if="detail.orderStatus == 'DQR'">订单待确认，请等待服务网点工作人员联系！</view>
+        <view class="status-container" v-if="detail.orderStatus == 'DQR'"
+          >订单待确认，请等待服务网点工作人员联系！</view
+        >
         <view class="status-container" v-if="detail.orderStatus == 'NOPAY'">待付款，30分钟内未付款将会关闭订单</view>
-        <view class="status-container" v-if="detail.orderStatus == 'DFH'">订单已支付，请等待服务网点工作人员联系！</view>
-        <view class="status-container" v-if="detail.orderStatus == 'YFH'">订单已支付，请等待服务网点工作人员联系！</view>
-        <view class="status-container" v-if="detail.orderStatus == 'OVER'">已服务完成，{{ getDay(detail.overTime, 7) }}关闭退款
+        <view class="status-container" v-if="detail.orderStatus == 'DFH'"
+          >订单已支付，请等待服务网点工作人员联系！</view
+        >
+        <view class="status-container" v-if="detail.orderStatus == 'YFH'"
+          >订单已支付，请等待服务网点工作人员联系！</view
+        >
+        <view class="status-container" v-if="detail.orderStatus == 'OVER'"
+          >已服务完成，{{ getDay(detail.overTime, 7) }}关闭退款
         </view>
         <view class="status-container" v-if="detail.orderStatus == 'CLOSE'">订单已关闭</view>
         <view class="status-container" v-if="detail.orderStatus == 'REFUND'">订单售后中</view>
         <view class="status-container" v-if="detail.orderStatus == 'TIMEOUT'">订单超时未支付</view>
 
         <view class="main-container">
-          <view class="logistics-container card" v-if="detail.orderStatus == 'YFH' || detail.orderStatus == 'OVER'"
-            @tap="toLogistics">
+          <view
+            class="logistics-container card"
+            v-if="detail.orderStatus == 'YFH' || detail.orderStatus == 'OVER'"
+            @tap="toLogistics"
+          >
             <view class="icon"><text class="iconfont icon-wuliu"></text></view>
             <view class="main" v-if="hasLogistics">
               <view>{{ logisticsData[0].context }}</view>
@@ -33,16 +47,19 @@
           <view class="address-container card">
             <view class="icon"><text class="iconfont icon-dingwei1"></text></view>
             <view class="right">
-              <view class="name">{{ detail.receUserName }}<text>{{ detail.recePhone }}</text></view>
+              <view class="name"
+                >{{ detail.receUserName }}<text>{{ detail.recePhone }}</text></view
+              >
               <view class="address ellipsis-2">
-                {{ detail.province }}{{ detail.city }}{{ detail.area }}{{ detail.street }}{{ detail.receAddress }}{{ detail.houseNo ?
-                  detail.houseNo : '' }}</view>
+                {{ detail.province }}{{ detail.city }}{{ detail.area }}{{ detail.street }}{{ detail.receAddress
+                }}{{ detail.houseNo ? detail.houseNo : '' }}</view
+              >
             </view>
           </view>
 
           <view class="goods-container card">
             <view class="title">商品信息</view>
-            <block v-for="(item, index) in detail.orderDetails" :key='index'>
+            <block v-for="(item, index) in detail.orderDetails" :key="index">
               <view class="item" @tap="toGoodsDetail(item.goodsId)">
                 <image :src="item.imgUrl" mode="aspectFill"></image>
                 <view class="main">
@@ -62,19 +79,24 @@
             </block>
           </view>
 
-          <view class="card trade-container" v-if="detail.orderOldProductDTOList && detail.orderOldProductDTOList.length > 0">
+          <view
+            class="card trade-container"
+            v-if="detail.orderOldProductDTOList && detail.orderOldProductDTOList.length > 0"
+          >
             <view class="title">旧机信息</view>
             <block v-for="(item, index) in detail.orderOldProductDTOList" :key="index">
               <view class="main">
                 <image :src="item.smallImg"></image>
                 <view class="right">
-                  <view class="name">{{item.smallName}}</view>
-                  <view class="attr">{{item.itemList.map(o => o.dictName).join('、')}}</view>
+                  <view class="name">{{ item.smallName }}</view>
+                  <view class="attr">{{ item.itemList.map(o => o.dictName).join('、') }}</view>
                 </view>
               </view>
               <view class="bottom">
-                <view class="left">旧机费用：<text>¥{{item.payAmount | priceFilter}}</text></view>
-                <view class="right">{{{1: '线上支付抵扣订单货款', 2: '仅线上展示旧机价值'}[item.yjhxDkFlag]}}</view>
+                <view class="left"
+                  >旧机费用：<text>¥{{ item.payAmount | priceFilter }}</text></view
+                >
+                <view class="right">{{ { 1: '线上支付抵扣订单货款', 2: '仅线上展示旧机价值' }[item.yjhxDkFlag] }}</view>
               </view>
             </block>
           </view>
@@ -82,7 +104,8 @@
           <view class="peisong-container card">
             <view class="top" v-if="detail.expectVisitTime">
               <view class="left">期望上门时间</view>
-              <view class="right">{{ detail.expectVisitTime.slice(0, 10) }} {{ detail.expectDayFlag === 1 ? '上午' : '下午' }}
+              <view class="right"
+                >{{ detail.expectVisitTime.slice(0, 10) }} {{ detail.expectDayFlag === 1 ? '上午' : '下午' }}
               </view>
             </view>
             <view class="bottom">
@@ -107,7 +130,8 @@
                     </view>
                   </block>
                 </view>
-                <view class="value" :class="detail.discountAmount > 0 ? 'red' : ''">¥{{ detail.discountAmount | priceFilter }}
+                <view class="value" :class="detail.discountAmount > 0 ? 'red' : ''"
+                  >¥{{ detail.discountAmount | priceFilter }}
                 </view>
               </view>
               <view class="item" v-if="detail.orderOldProductDTOList && detail.orderOldProductDTOList.length > 0">
@@ -115,7 +139,9 @@
                 <view class="value">¥{{ detail.orderOldProductDTOList[0].payAmount | priceFilter }}</view>
               </view>
             </view>
-            <view class="total">订单总额:<text>¥{{ detail.payAmount | priceFilter }}</text></view>
+            <view class="total"
+              >订单总额:<text>¥{{ detail.payAmount | priceFilter }}</text></view
+            >
           </view>
 
           <view class="order-container card">
@@ -156,7 +182,6 @@
               <view class="value">{{ detail.exchangeCode }}</view>
             </view>
           </view>
-
         </view>
       </view>
 
@@ -165,22 +190,37 @@
           <!-- 底部按钮：待付款 -->
           <view class="bottom-container" v-if="detail.orderStatus == 'NOPAY'">
             <!-- <view class="button gray" @tap="cancelOrder">取消订单</view> -->
-            <div class="button white" v-if="!detail.isChangeAddress"
-              @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${detail.orderId}`)">修改地址</div>
+            <div
+              class="button white"
+              v-if="!detail.isChangeAddress"
+              @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${detail.orderId}`)"
+            >
+              修改地址
+            </div>
             <view class="button red" @tap="payOrder">立即付款</view>
           </view>
           <!-- 底部按钮：待发货 -->
           <view class="bottom-container" v-if="detail.orderStatus == 'DFH'">
-            <div class="button white" v-if="!detail.isChangeAddress"
-              @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${detail.orderId}`)">修改地址</div>
+            <div
+              class="button white"
+              v-if="!detail.isChangeAddress"
+              @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${detail.orderId}`)"
+            >
+              修改地址
+            </div>
             <view class="button white" @tap="remindShipment">提醒发货</view>
             <view class="button white" v-if="checkCanReturn()" @tap="toApplyReturn">申请售后</view>
           </view>
           <!-- 底部按钮：待收货 -->
           <view class="bottom-container" v-if="detail.orderStatus == 'YFH'">
             <!-- <view class="button gray" @tap="toLogistics">查看物流</view> -->
-            <div class="button white" v-if="!detail.isChangeAddress"
-              @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${detail.orderId}`)">修改地址</div>
+            <div
+              class="button white"
+              v-if="!detail.isChangeAddress"
+              @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${detail.orderId}`)"
+            >
+              修改地址
+            </div>
             <view class="button red" @tap="confirmOrder">服务完成</view>
             <view class="button white" v-if="checkCanReturn()" @tap="toApplyReturn">申请售后</view>
           </view>
@@ -191,7 +231,12 @@
             <view class="button white" v-else @tap="toInvoiceForm">开发票</view>
             <view class="button gray" @tap="toWorkerOrder">服务详情</view>
             <view class="button white" v-if="checkCanReturn()" @tap="toApplyReturn">申请售后</view>
-            <view class="button red" v-if="!detail.commentService" @tap="navToPage(`/packageMine/pages/order/evaluate?orderId=${detail.orderId}`)">评价</view>
+            <view
+              class="button red"
+              v-if="!detail.commentService"
+              @tap="navToPage(`/packageMine/pages/order/evaluate?orderId=${detail.orderId}`)"
+              >评价</view
+            >
           </view>
           <!-- 底部按钮：售后中 -->
           <view class="bottom-container" v-if="isReturnOrder">
@@ -222,109 +267,120 @@ export default {
       detail: {}, // 订单详情
       logisticsData: [], // 物流信息
       hasLogistics: true, // 是否有物流信息
-      canRemindShipment: true, // 能否点击提醒发货
+      canRemindShipment: true // 能否点击提醒发货
     }
   },
 
-  watch: {
-
-  },
+  watch: {},
 
   onLoad({ orderId, orderRefundId }) {
-    this.orderId = orderId;
+    this.orderId = orderId
     if (orderRefundId && orderRefundId != 'undefined') {
-      this.isReturnOrder = true;
-      this.orderRefundId = orderRefundId;
+      this.isReturnOrder = true
+      this.orderRefundId = orderRefundId
     }
-    this.getOrderDetail();
+    this.getOrderDetail()
 
-    this.crossPage.$on('refreshOrderDetail', (data) => {
-      if (data && (typeof data !== 'boolean')) {
-        this.isReturnOrder = true;
-        this.orderRefundId = data;
+    this.crossPage.$on('refreshOrderDetail', data => {
+      if (data && typeof data !== 'boolean') {
+        this.isReturnOrder = true
+        this.orderRefundId = data
       } else {
-        this.isReturnOrder = false;
-        this.orderRefundId = null;
+        this.isReturnOrder = false
+        this.orderRefundId = null
       }
-      this.getOrderDetail();
+      this.getOrderDetail()
     })
   },
 
   onUnload() {
-    this.crossPage.$off('refreshOrderDetail');
+    this.crossPage.$off('refreshOrderDetail')
   },
 
   methods: {
     getOrderDetail() {
-      let url = '', params = {};
+      let url = '',
+        params = {}
       if (this.isReturnOrder) {
-        url = '/order/refund/detail';
+        url = '/order/refund/detail'
         params = {
           orderRefundId: this.orderRefundId
         }
       } else {
-        url = '/order/detail';
+        url = '/order/detail'
         params = {
           orderId: this.orderId
         }
       }
-      this.$api.get(url, {
-        ...params
-      }).then(res => {
-        this.noData = false;
-        this.isLoading = false;
-        if (res.data.promotionFullPieceRemark) {
-          let str = res.data.promotionFullPieceRemark;
-          let str1 = str.substring(0, str.indexOf('打') + 1);
-          let str2 = str.substring(str.indexOf('折') + 1, str.indexOf('折'));
-          let num = str.substring(str.indexOf('打') + 1, str.indexOf('折'));
-          res.data.promotionFullPieceRemark = str1 + Number(num) + str2;
-        }
-        this.detail = res.data;
-        this.loadStatus = 0;
-        this.getLogisticsData();
-      }).catch(res => {
-        this.errorText = res.message;
-        this.loadStatus = 2;
-      }).finally(res => {
-        this.refresherTriggered = false;
-      })
+      this.$api
+        .get(url, {
+          ...params
+        })
+        .then(res => {
+          this.noData = false
+          this.isLoading = false
+          if (res.data.promotionFullPieceRemark) {
+            let str = res.data.promotionFullPieceRemark
+            let str1 = str.substring(0, str.indexOf('打') + 1)
+            let str2 = str.substring(str.indexOf('折') + 1, str.indexOf('折'))
+            let num = str.substring(str.indexOf('打') + 1, str.indexOf('折'))
+            res.data.promotionFullPieceRemark = str1 + Number(num) + str2
+          }
+          this.detail = res.data
+          this.loadStatus = 0
+          this.getLogisticsData()
+        })
+        .catch(res => {
+          this.errorText = res.message
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     // 触发下拉刷新
     refresherrefresh(e) {
-      this.refresherTriggered = true;
-      this.getOrderDetail();
+      this.refresherTriggered = true
+      this.getOrderDetail()
     },
 
     // 检查是否可以申请售后（根据orderShareStatus, payTypeId）
     checkCanReturn() {
-      const hasRefund = this.detail.orderDetails.some(o => o.refund);
-
-      if (!this.detail.orderShareStatus || this.detail.orderShareStatus === 'OVER' || this.detail.orderShareStatus === 'CANCEL' || this.detail.payTypeId == 'STORE' || hasRefund) {
-        return false;
+      const hasRefund = this.detail.orderDetails.some(o => o.refund)
+
+      if (
+        !this.detail.orderShareStatus ||
+        this.detail.orderShareStatus === 'OVER' ||
+        this.detail.orderShareStatus === 'CANCEL' ||
+        this.detail.payTypeId == 'STORE' ||
+        hasRefund
+      ) {
+        return false
       } else {
-        return true;
+        return true
       }
     },
 
     // 获取物流信息
     getLogisticsData() {
-      this.$api.get('/common/express', {
-        companyCode: this.detail.companyCode ? this.detail.companyCode : 'shunfeng',
-        logisticsNo: this.detail.logisticsNo,
-      }).then(res => {
-        if (res.code == 200 && res.data.length >= 1) {
-          this.logisticsData = res.data;
-        } else if (res.code == 1100 || res.data.length < 1) {
-          this.hasLogistics = false;
-        }
-      })
+      this.$api
+        .get('/common/express', {
+          companyCode: this.detail.companyCode ? this.detail.companyCode : 'shunfeng',
+          logisticsNo: this.detail.logisticsNo
+        })
+        .then(res => {
+          if (res.code == 200 && res.data.length >= 1) {
+            this.logisticsData = res.data
+          } else if (res.code == 1100 || res.data.length < 1) {
+            this.hasLogistics = false
+          }
+        })
     },
 
     // 去商品详情
     toGoodsDetail(id) {
-      uni.navigateTo({
+      this.$navToPage({
         url: '/packageGoods/pages/detail?id=' + id
       })
     },
@@ -333,65 +389,77 @@ export default {
     cancelOrder() {
       this.$modal({
         content: '确定要取消订单吗？'
-      }).then(() => {
-        this.$api.post('/order/cancel', {
-          orderId: this.orderId
-        }).then(res => {
-          this.getOrderDetail();
-          this.$successToast('取消订单成功');
-          this.crossPage.$emit('refreshOrderList');
+      })
+        .then(() => {
+          this.$api
+            .post('/order/cancel', {
+              orderId: this.orderId
+            })
+            .then(res => {
+              this.getOrderDetail()
+              this.$successToast('取消订单成功')
+              this.crossPage.$emit('refreshOrderList')
+            })
         })
-      }).catch(() => { })
+        .catch(() => {})
     },
 
     // 服务完成
     confirmOrder() {
       this.$modal({
         content: '请确认是否已完成服务？'
-      }).then(() => {
-        this.$api.post('/order/ack', {
-          orderId: this.orderId
-        }).then(res => {
-          this.getOrderDetail();
-          this.$successToast();
-          this.crossPage.$emit('refreshOrderList');
+      })
+        .then(() => {
+          this.$api
+            .post('/order/ack', {
+              orderId: this.orderId
+            })
+            .then(res => {
+              this.getOrderDetail()
+              this.$successToast()
+              this.crossPage.$emit('refreshOrderList')
+            })
         })
-      }).catch(() => { })
+        .catch(() => {})
     },
 
     // 立即付款
     payOrder() {
-      mini_env((bool) => {
-        let that = this;
-        this.$api.post('/order/wait/pay', {
-          userId: this.$store.state.user.userId,
-          orderId: this.orderId,
-          ...(() => {
-            if (bool) {
-              return {
-                miniPay: true,
-                openId: this.$store.state.user.miniOpenId
+      mini_env(bool => {
+        let that = this
+        this.$api
+          .post('/order/wait/pay', {
+            userId: this.$store.state.user.userId,
+            orderId: this.orderId,
+            ...(() => {
+              if (bool) {
+                return {
+                  miniPay: true,
+                  openId: this.$store.state.user.miniOpenId
+                }
               }
+              return {}
+            })()
+          })
+          .then(res => {
+            if (bool) {
+              uniWebview.navigateTo({
+                url: `/pages/pay/pay?${Object.entries({
+                  ...res.data,
+                  payPackage: res.data.payPackage.split('=')[0] || '',
+                  payPackageVal: res.data.payPackage.split('=')[1] || ''
+                })
+                  .map(item => item.join('='))
+                  .join('&')}`
+              })
+            } else {
+              weixinPay(res.data, function (res) {
+                that.getOrderDetail()
+                that.$successToast('支付成功')
+                that.crossPage.$emit('refreshOrderList')
+              })
             }
-            return {}
-          })()
-        }).then(res => {
-          if (bool) {
-            uniWebview.navigateTo({
-              url: `/pages/pay/pay?${Object.entries({
-                ...res.data,
-                payPackage: res.data.payPackage.split("=")[0] || "",
-                payPackageVal: res.data.payPackage.split("=")[1] || ""
-              }).map(item => item.join("=")).join("&")}`
-            })
-          } else {
-            weixinPay(res.data, function (res) {
-              that.getOrderDetail();
-              that.$successToast('支付成功');
-              that.crossPage.$emit('refreshOrderList');
-            })
-          }
-        })
+          })
       })
     },
 
@@ -400,72 +468,80 @@ export default {
       uni.setClipboardData({
         data: val,
         success: () => {
-          this.$successToast('复制成功');
+          this.$successToast('复制成功')
         }
-      });
+      })
     },
 
     // 开发票
     toInvoiceForm() {
-      this.navToPage('/packageMine/pages/invoice/form?orderType=ORDER&orderId=' + this.detail.orderId);
+      this.navToPage('/packageMine/pages/invoice/form?orderType=ORDER&orderId=' + this.detail.orderId)
     },
 
     // 发票详情
     toInvoiceDetail() {
-      this.navToPage('/packageMine/pages/invoice/detail?orderTaxId=' + this.detail.orderTaxId);
+      this.navToPage('/packageMine/pages/invoice/detail?orderTaxId=' + this.detail.orderTaxId)
     },
 
     // 申请退款
     toApplyReturn() {
-      this.navToPage('/packageMine/pages/order/return/apply?orderId=' + this.orderId);
+      this.navToPage('/packageMine/pages/order/return/apply?orderId=' + this.orderId)
     },
 
     // 去售后详情
     toReturnDetail() {
-      this.navToPage('/packageMine/pages/order/return/detail?orderRefundId=' + this.orderRefundId);
+      this.navToPage('/packageMine/pages/order/return/detail?orderRefundId=' + this.orderRefundId)
     },
 
     // 去查看物流
     toLogistics() {
-      this.navToPage('/packageMine/pages/order/logistics?companyCode=' + this.detail.companyCode + '&logisticsNo=' + this.detail.logisticsNo);
+      this.navToPage(
+        '/packageMine/pages/order/logistics?companyCode=' +
+          this.detail.companyCode +
+          '&logisticsNo=' +
+          this.detail.logisticsNo
+      )
     },
 
     // 去工单列表
     toWorkerOrder() {
-      this.navToPage('/packageWorkorder/pages/userWorkorderList');
+      this.navToPage('/packageWorkorder/pages/userWorkorderList')
     },
 
     // 提醒发货
     remindShipment() {
       if (!this.canRemindShipment) {
-        return this.$toast('请勿频繁操作');
-      };
-      this.canRemindShipment = false;
-      setTimeout(() => { this.canRemindShipment = true }, 3000)
-
-      this.$api.post('/order/notice', {
-        orderId: this.orderId,
-        userId: this.$store.state.user.userId
-      }).then(res => {
-        this.$successToast('提醒发货成功');
-      })
+        return this.$toast('请勿频繁操作')
+      }
+      this.canRemindShipment = false
+      setTimeout(() => {
+        this.canRemindShipment = true
+      }, 3000)
+
+      this.$api
+        .post('/order/notice', {
+          orderId: this.orderId,
+          userId: this.$store.state.user.userId
+        })
+        .then(res => {
+          this.$successToast('提醒发货成功')
+        })
     },
 
     getDay(date, num) {
-      let dateStr = date.slice(0, 10).replace(/\-/g, '/');
-      let dayStr = date.slice(10, 19);
-      let oneDay = 24 * 60 * 60 * 1000;
-      let result = new Date(new Date(dateStr).getTime() + num * oneDay);
-      result = formatterDate(result, "yyyy-MM-dd");
-      return result + dayStr;
+      let dateStr = date.slice(0, 10).replace(/\-/g, '/')
+      let dayStr = date.slice(10, 19)
+      let oneDay = 24 * 60 * 60 * 1000
+      let result = new Date(new Date(dateStr).getTime() + num * oneDay)
+      result = formatterDate(result, 'yyyy-MM-dd')
+      return result + dayStr
     },
 
     navToPage(url) {
       this.$navToPage({
         url
       })
-    },
-
+    }
   }
 }
 </script>
@@ -476,12 +552,12 @@ export default {
   line-height: 80rpx;
   text-align: center;
   font-size: 30rpx;
-  color: #FFFFFF;
+  color: #ffffff;
 }
 
 .card {
   @include zj-card;
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 20rpx;
   margin-bottom: 20rpx;
 }
@@ -633,8 +709,8 @@ export default {
             line-height: 20rpx;
             padding: 4rpx 6rpx;
             margin-right: 10rpx;
-            border: 1px solid #FE781F;
-            color: #FE781F;
+            border: 1px solid #fe781f;
+            color: #fe781f;
             box-sizing: border-box;
             margin-bottom: 10rpx;
             display: flex;
@@ -714,7 +790,7 @@ export default {
       padding: 10rpx 16rpx;
       font-size: 24rpx;
       color: $theme-color;
-      background: #E6F0FF;
+      background: #e6f0ff;
       border-radius: 5rpx;
     }
   }
@@ -850,7 +926,7 @@ export default {
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  background: #FFFFFF;
+  background: #ffffff;
 
   .button {
     width: 150rpx;
@@ -876,7 +952,7 @@ export default {
     }
 
     &.red {
-      color: #FFFFFF;
+      color: #ffffff;
       border: 1px solid $theme-color;
       background: $theme-color;
     }
@@ -904,7 +980,7 @@ export default {
 
       .item {
         padding: 0 16rpx;
-        border: 1px solid #C0C0C0;
+        border: 1px solid #c0c0c0;
         font-size: 24rpx;
         color: #666666;
         border-radius: 6rpx;
@@ -955,7 +1031,7 @@ export default {
         line-height: 48rpx;
         border-radius: 6rpx;
         text-align: center;
-        border: 1px solid #C0C0C0;
+        border: 1px solid #c0c0c0;
         font-size: 24rpx;
         color: #666666;
         margin-right: 20rpx;
@@ -963,7 +1039,7 @@ export default {
         &.current {
           border: 1px solid $theme-color;
           background: $theme-color;
-          color: #FFFFFF;
+          color: #ffffff;
         }
       }
     }
@@ -990,15 +1066,13 @@ export default {
             position: absolute;
             top: 60rpx;
             left: -20rpx;
-            background: #FFFFFF;
+            background: #ffffff;
             width: 530rpx;
             z-index: 11;
             border: 1px solid #eaeaea;
             max-height: 400rpx;
             overflow-y: scroll;
             box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.2);
-            ;
-
             .item {
               color: #666666;
               padding: 16rpx 20rpx;
@@ -1071,8 +1145,9 @@ export default {
       background: $theme-color;
       text-align: center;
       font-size: 28rpx;
-      color: #FFFFFF;
+      color: #ffffff;
       margin-top: 20rpx;
     }
   }
-}</style>
+}
+</style>

src/packageMine/pages/repairSettle/detailed.vue

@@ -51,9 +51,7 @@
 </template>
 
 <script>
-import {
-  getUserInfo,
-} from '@/common/utils/util'
+import { getUserInfo } from '@/common/utils/util'
 export default {
   data() {
     return {
@@ -93,7 +91,7 @@ export default {
       } else if (this.type == 2) {
         url = '/daily/mywallet/repair/month/detail'
         params = {
-          workerNumber:(await getUserInfo()).workerNumber,
+          workerNumber: (await getUserInfo()).workerNumber,
           salaryNo: this.salaryNo || '',
           summaryBatchNo: this.summaryBatchNo || '',
           q: this.keyword
@@ -108,7 +106,8 @@ export default {
           install: false
         }
       }
-      this.$api.get(url,params)
+      this.$api
+        .get(url, params)
         .then(res => {
           this.dataList = res.data
         })
@@ -122,7 +121,7 @@ export default {
     },
 
     toDetail(id) {
-      uni.navigateTo({
+      this.$navToPage({
         url:
           '/packageMine/pages/repairSettle/detail?salaryNo=' +
           (this.salaryNo || '') +

src/packageMine/pages/repairSettle/list.vue

@@ -145,9 +145,7 @@
 </template>
 
 <script>
-import {
-  getUserInfo,
-} from '@/common/utils/util'
+import { getUserInfo } from '@/common/utils/util'
 export default {
   data() {
     return {
@@ -170,11 +168,12 @@ export default {
   methods: {
     // 获取列表
     async getList() {
-      this.$api.get(this.currentTab === 1 ? '/daily/mywallet/issue/list' : '/daily/mywallet/issue/monthlist',{
-        workerNumber: (await getUserInfo()).workerNumber,
-        date: this.currentDate == '请选择日期' ? '' : this.currentDate,
-        install: false
-      })
+      this.$api
+        .get(this.currentTab === 1 ? '/daily/mywallet/issue/list' : '/daily/mywallet/issue/monthlist', {
+          workerNumber: (await getUserInfo()).workerNumber,
+          date: this.currentDate == '请选择日期' ? '' : this.currentDate,
+          install: false
+        })
         .then(res => {
           this.dataList = res.data
         })
@@ -185,11 +184,11 @@ export default {
 
     toDetailed(type, No) {
       if (type === 1) {
-        uni.navigateTo({
+        this.$navToPage({
           url: '/packageMine/pages/repairSettle/detailed?salaryNo=' + No + '&type=' + type
         })
       } else {
-        uni.navigateTo({
+        this.$navToPage({
           url: '/packageMine/pages/repairSettle/detailed?summaryBatchNo=' + No + '&type=' + type
         })
       }

src/packageMine/pages/wodeanwei.vue

@@ -50,7 +50,7 @@ export default {
           duration: 1500
         })
       }
-      uni.navigateTo({
+      this.$navToPage({
         url
       })
     }

src/pages/login/index.vue

@@ -217,7 +217,7 @@ export default {
     },
 
     toAgreement(type) {
-      uni.navigateTo({
+      this.$navToPage({
         url: '/pages/login/agreement?type=' + type
       })
     }