jufubao-base 1.0.366-beta4 → 1.0.366-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.366-beta4",
+  "version": "1.0.366-beta5",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -957,6 +957,20 @@
       <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
       <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
     </xd-dailog>
+    <xd-dailog
+      :show.sync="showReorderDialog"
+      title="提示"
+      :showClose="false"
+      width="85%"
+      @close="showReorderDialog = false"
+    >
+      <view style="padding: 20rpx 0;">
+        <view v-for="(tip, index) in reorderTips" :key="index" style="color: #333; font-size: 28rpx; line-height: 44rpx;">{{ tip }}</view>
+      </view>
+      <view slot="btn">
+        <xd-button type="primary" size="small" @click="handleReorderDlgConfirm">我知道了</xd-button>
+      </view>
+    </xd-dailog>
     <XdDownDrawer :isClose="false" height="auto" :show.sync="showSupplement">
       <view class="supplement">
         <view class="supplement-title">
@@ -1097,7 +1111,10 @@ export default {
       invoicePath: '',
       isShowInvoice: false,
       invoiceStatus: '',
-      viewInvoicePath: ''
+      viewInvoicePath: '',
+      showReorderDialog: false,
+      reorderTips: [],
+      reorderBtnItem: null,
     };
   },
   watch: {
@@ -1692,18 +1709,9 @@ export default {
         }).then(res => {
           this.$xdHideLoading();
           if(res.tips && res.tips.length){
-            this.$xdConfirm({
-              content: res.tips.join('\n'),
-              cancel:false,
-              confirmText: '我知道了',
-              width: '85%',
-              title: '提示',
-              contentColor: this.$mainColor,
-              isTitle: true,
-              success:()=>{
-                this.reorderNavigate(item);
-              }
-            });
+            this.reorderTips = res.tips;
+            this.reorderBtnItem = item;
+            this.showReorderDialog = true;
           }else{
             this.reorderNavigate(item);
           }
@@ -1715,6 +1723,11 @@ export default {
         console.error(`item.action=${item.action}, 此action不可用`)
       }
     },
+    handleReorderDlgConfirm(){
+      this.showReorderDialog = false;
+      this.reorderNavigate(this.reorderBtnItem);
+      this.reorderBtnItem = null;
+    },
     reorderNavigate(item){
       if(item.extras){
         let reOrderPath = {};

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -209,6 +209,20 @@
       </template>
 
     </view>
+    <xd-dialog
+      :show.sync="showReorderDialog"
+      title="提示"
+      :showClose="false"
+      width="85%"
+      @close="showReorderDialog = false"
+    >
+      <view style="padding: 20rpx 0;">
+        <view v-for="(tip, index) in reorderTips" :key="index" style="color: #333; font-size: 28rpx; line-height: 44rpx;">{{ tip }}</view>
+      </view>
+      <view slot="btn">
+        <xd-button type="primary" size="small" @click="handleReorderConfirm">我知道了</xd-button>
+      </view>
+    </xd-dialog>
   </view>
 </template>
 
@@ -217,6 +231,7 @@ import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdTab from "@/components/XdTab/XdTab";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from "@/components/XdButton/XdButton";
+import XdDialog from "@/components/XdDailog/XdDailog";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseOrderListMixin from "./JfbBaseOrderListMixin";
 import componentsMixins from "@/mixins/componentsMixins";
@@ -234,6 +249,7 @@ export default {
     XdUnit,
     XdButton,
     XdTfkOrderItem,
+    XdDialog,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderListMixin],
   data() {
@@ -287,7 +303,10 @@ export default {
       refundFastPath: "",
 
       noticeBgc:'',
-      actionBtns: ['cancel_unpaid', 'pay', 'apply_refund', 'reorder']
+      actionBtns: ['cancel_unpaid', 'pay', 'apply_refund', 'reorder'],
+      showReorderDialog: false,
+      reorderTips: [],
+      reorderItem: null,
     };
   },
 
@@ -483,18 +502,9 @@ export default {
         }).then(res => {
           this.$xdHideLoading();
           if(res.tips && res.tips.length){
-            this.$xdConfirm({
-              content: res.tips.join('\n'),
-              cancel:false,
-              confirmText: '我知道了',
-              width: '85%',
-              title: '提示',
-              contentColor: this.$mainColor,
-              isTitle: true,
-              success:()=>{
-                this.reorderNavigate(item);
-              }
-            });
+            this.reorderTips = res.tips;
+            this.reorderItem = item;
+            this.showReorderDialog = true;
           }else{
             this.reorderNavigate(item);
           }
@@ -504,6 +514,11 @@ export default {
         })
       }
     },
+    handleReorderConfirm(){
+      this.showReorderDialog = false;
+      this.reorderNavigate(this.reorderItem);
+      this.reorderItem = null;
+    },
     reorderNavigate(item){
       let btnReOrder = item.buttons.find(item => item.action === 'reorder');
       if(btnReOrder.extras){