jufubao-base 1.0.366-beta2 → 1.0.366-beta4

package/package.json

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

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -1691,25 +1691,21 @@ export default {
           }
         }).then(res => {
           this.$xdHideLoading();
-          if(item.extras){
-            let reOrderPath = {};
-            try{
-              let extras = JSON.parse(btnReOrder.extras);
-              let urlObj = JSON.parse(extras.place_order_url);
-              if(this.$xdUniHelper.checkVarType(urlObj) === 'object'){
-                reOrderPath = {
-                  url: urlObj['page_value'],
-                  'jfb-platform': urlObj
-                }
-              }else{
-                throw new Error('不合法的extras');
-              }
-            }catch(err){
-              reOrderPath = {
-                url: item.extras
+          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.$xdUniHelper.navigateTo(reOrderPath);
+            });
+          }else{
+            this.reorderNavigate(item);
           }
         }).catch(err => {
           this.$xdHideLoading();
@@ -1719,6 +1715,28 @@ export default {
         console.error(`item.action=${item.action}, 此action不可用`)
       }
     },
+    reorderNavigate(item){
+      if(item.extras){
+        let reOrderPath = {};
+        try{
+          let extras = JSON.parse(item.extras);
+          let urlObj = JSON.parse(extras.place_order_url);
+          if(this.$xdUniHelper.checkVarType(urlObj) === 'object'){
+            reOrderPath = {
+              url: urlObj['page_value'],
+              'jfb-platform': urlObj
+            }
+          }else{
+            throw new Error('不合法的extras');
+          }
+        }catch(err){
+          reOrderPath = {
+            url: item.extras
+          }
+        }
+        this.$xdUniHelper.navigateTo(reOrderPath);
+      }
+    },
     handleToProduct(item){
       let productPath = {};
       if(item.product_detail_url){

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -482,26 +482,21 @@ export default {
           }
         }).then(res => {
           this.$xdHideLoading();
-          let btnReOrder = item.buttons.find(item => item.action === 'reorder');
-          if(btnReOrder.extras){
-            let reOrderPath = {};
-            try{
-              let extras = JSON.parse(btnReOrder.extras);
-              let urlObj = JSON.parse(extras.place_order_url);
-              if(this.$xdUniHelper.checkVarType(urlObj) === 'object'){
-                reOrderPath = {
-                  url: urlObj['page_value'],
-                  'jfb-platform': urlObj
-                }
-              }else{
-                throw new Error('不合法的extras');
+          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);
               }
-            }catch(err){
-              reOrderPath = {
-                url: btnReOrder.extras
-              }
-            }
-            this.$xdUniHelper.navigateTo(reOrderPath);
+            });
+          }else{
+            this.reorderNavigate(item);
           }
 
         }).catch(err => {
@@ -509,6 +504,29 @@ export default {
         })
       }
     },
+    reorderNavigate(item){
+      let btnReOrder = item.buttons.find(item => item.action === 'reorder');
+      if(btnReOrder.extras){
+        let reOrderPath = {};
+        try{
+          let extras = JSON.parse(btnReOrder.extras);
+          let urlObj = JSON.parse(extras.place_order_url);
+          if(this.$xdUniHelper.checkVarType(urlObj) === 'object'){
+            reOrderPath = {
+              url: urlObj['page_value'],
+              'jfb-platform': urlObj
+            }
+          }else{
+            throw new Error('不合法的extras');
+          }
+        }catch(err){
+          reOrderPath = {
+            url: btnReOrder.extras
+          }
+        }
+        this.$xdUniHelper.navigateTo(reOrderPath);
+      }
+    },
 
     getList(status) {
       this.$xdShowLoading({});