jufubao-base 1.0.368 → 1.0.370

package/package.json

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

package/src/components/JfbBaseOrderDetail/Api.js

@@ -74,4 +74,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    title: "再来一单",
+    path: "/cart/v1/cart/reorder",
+    mapFnName: "reCartOrder",
+    isRule: false,
+    data: {
+      main_order_id: ['订单ID', 'String', true],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -183,7 +183,7 @@
               v-for="(Sitem, Sindex) in item.products"
               :key="Sindex"
             >
-              <view class="jfb-base-order-detail__body-delivery-content">
+              <view class="jfb-base-order-detail__body-delivery-content" @click="handleToProduct(Sitem)">
                 <xd-jfb-image
                   width="200"
                   height="200"
@@ -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">
@@ -1037,6 +1051,17 @@ export default {
       dialogCode: null,
 
       showApplyAfter: "",
+      actionBtns: [
+        'view_logistics', //包裹列表
+        'cancel_unpaid',  //取消订单
+        'delete', //删除订单
+        'service_process_list', //服务进度
+        'pay',  //支付
+        'apply_refund', //申请退款
+        'invoice',  //发票申请
+        'viewInvoice',  //查看发票
+        'reorder' //重新下单
+      ],
 
       //基础
       radius: 0,
@@ -1086,7 +1111,10 @@ export default {
       invoicePath: '',
       isShowInvoice: false,
       invoiceStatus: '',
-      viewInvoicePath: ''
+      viewInvoicePath: '',
+      showReorderDialog: false,
+      reorderTips: [],
+      reorderBtnItem: null,
     };
   },
   watch: {
@@ -1392,6 +1420,9 @@ export default {
             res.buttons = del.concat(res.buttons || [])
           }
 
+          //需要判断按钮是否存在
+          res.buttons = (res.buttons||[]).filter(btn => this.actionBtns.includes(btn.action))
+
           if (res.product) {
             try {
               jfbRootExec("getBaseProductDetail", {
@@ -1661,20 +1692,87 @@ export default {
         }).catch(err => {
           this.$xdHideLoading();
         })
-      }if (item.action === "invoice") {
+      }else if (item.action === "invoice") {
         this.$xdUniHelper.navigateTo({
           url: `${this.invoicePath}?main_order_id=${this.main_order_id}&pay_order_id=${this.info.pay_info.pay_order_id}`,
         });
-      }if (item.action === "viewInvoice") {
+      }else if (item.action === "viewInvoice") {
         this.$xdUniHelper.navigateTo({
           url: `${this.viewInvoicePath}?main_order_id=${this.main_order_id}&pay_order_id=${this.info.pay_info.pay_order_id}`,
         });
+      }else if(item.action === 'reorder'){
+        //再来一单
+        this.$xdShowLoading({});
+        jfbRootExec("reCartOrder", {
+          vm: this,
+          data: {
+            main_order_id: this.main_order_id
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          if(res.tips && res.tips.length){
+            this.reorderTips = res.tips;
+            this.reorderBtnItem = item;
+            this.showReorderDialog = true;
+          }else{
+            this.reorderNavigate(item);
+          }
+        }).catch(err => {
+          this.$xdHideLoading();
+        })
       }
       else {
         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 = {};
+        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){
+        try{
+          let urlObj = JSON.parse(item.product_detail_url);
+          if(this.$xdUniHelper.checkVarType(urlObj) === 'object'){
+            productPath = {
+              url: urlObj['page_value'] + "?product_id=" + item.product_id,
+              'jfb-platform': urlObj
+            }
+          }else{
+            throw new Error('不合法的product_detail_url');
+          }
+        }catch(err){
+          productPath = {
+            url: item.product_detail_url
+          }
+        }
+        this.$xdUniHelper.navigateTo(productPath);
+      }
+    },
     handleDeleteOrder(){
       jfbRootExec("deleteBaseOrder", {
         vm: this,

package/src/components/JfbBaseOrderList/Api.js

@@ -45,5 +45,16 @@ module.exports = [
     },
     isConsole: true,
     disabled: true,
+  },
+  {
+    title: "再来一单",
+    path: "/cart/v1/cart/reorder",
+    mapFnName: "reCartOrder",
+    isRule: false,
+    data: {
+      main_order_id: ['订单ID', 'String', true],
+    },
+    isConsole: true,
+    disabled: true,
   }
 ];

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,6 +303,10 @@ export default {
       refundFastPath: "",
 
       noticeBgc:'',
+      actionBtns: ['cancel_unpaid', 'pay', 'apply_refund', 'reorder'],
+      showReorderDialog: false,
+      reorderTips: [],
+      reorderItem: null,
     };
   },
 
@@ -471,8 +491,55 @@ export default {
         }).catch(err => {
           this.$xdHideLoading();
         })
+      }else if(action === 'reorder'){
+        //重新下单
+        this.$xdShowLoading({});
+        jfbRootExec("reCartOrder", {
+          vm: this,
+          data: {
+            main_order_id: item.main_order_id
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          if(res.tips && res.tips.length){
+            this.reorderTips = res.tips;
+            this.reorderItem = item;
+            this.showReorderDialog = true;
+          }else{
+            this.reorderNavigate(item);
+          }
 
-        
+        }).catch(err => {
+          this.$xdHideLoading();
+        })
+      }
+    },
+    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){
+        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);
       }
     },
 
@@ -502,6 +569,7 @@ export default {
                 : "";
               return prod;
             });
+            item.buttons = item.buttons.filter(btn => this.actionBtns.includes(btn.action));
             item.buttons = item.buttons.map((btn, i) => {
               btn["key"] = btn.action + i;
               return btn;