jufubao-base 1.0.366-beta3 → 1.0.367

package/get.package.path.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @description 第三方库
+ * @param threePackagePath {String} 第三方库所在项目路径存放路径路
+ * @param packname {String} 包名字
+ * @returns {string|*}
+ */
+const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
+  if(packname === 'gxd-commands-bussiness') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library-editx') {
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/package.json

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

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -17,48 +17,50 @@
       class="jfb-base-chose-company__body"
       :style="{ minHeight: layoutInfo.bodyMinHeightRpx + 'rpx' }"
     >
-      <view :style="[contentPaddingCompStyle]">
-        <view class="jfb-base-chose-company__body-title"
-          >企业信息（{{ companyList.length }}家）</view
-        >
-        <view class="jfb-base-chose-company__body-notice">{{ title }}</view>
-        <view :style="{ '--main-color': mainColor }">
-          <view
-            v-for="(item, index) in companyList"
-            :key="index"
-            @click="handleChoseCompany(item)"
-            :style="[listPaddingCompStyle]"
-            :class="[
-              'jfb-base-chose-company__body-company',
-              item.is_select ? 'active' : '',
-            ]"
+      <template v-if="isLoading">
+        <view :style="[contentPaddingCompStyle]">
+          <view class="jfb-base-chose-company__body-title"
+            >企业信息（{{ companyList.length }}家）</view
           >
+          <view class="jfb-base-chose-company__body-notice">{{ title }}</view>
+          <view :style="{ '--main-color': mainColor }">
             <view
-              v-if="item.is_select"
-              class="jfb-base-chose-company__body-company-active"
-              :style="{
-                background: mainColor,
-                borderRadius: `0 ${listRadius}rpx 0 30rpx`,
-              }"
+              v-for="(item, index) in companyList"
+              :key="index"
+              @click="handleChoseCompany(item)"
+              :style="[listPaddingCompStyle]"
+              :class="[
+                'jfb-base-chose-company__body-company',
+                item.is_select ? 'active' : '',
+              ]"
             >
-              <XdFontIcon
-                size="20"
-                icon="iconduigou-xian"
-                color="#fff"
-              ></XdFontIcon>
-            </view>
-            {{ item.company_name }}
-          </view></view
-        >
-      </view>
-      <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
-        >{{ addTitle
-        }}<view v-if="addCompanyPath" @click="handleToAdd" :style="{color:mainColor}"
-          >去添加<XdFontIcon
-            size="28"
-            icon="iconxiangyou_xian"
-          ></XdFontIcon></view
-      ></view>
+              <view
+                v-if="item.is_select"
+                class="jfb-base-chose-company__body-company-active"
+                :style="{
+                  background: mainColor,
+                  borderRadius: `0 ${listRadius}rpx 0 30rpx`,
+                }"
+              >
+                <XdFontIcon
+                  size="20"
+                  icon="iconduigou-xian"
+                  color="#fff"
+                ></XdFontIcon>
+              </view>
+              {{ item.company_name }}
+            </view></view
+          >
+        </view>
+        <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
+          >{{ addTitle
+          }}<view v-if="addCompanyPath" @click="handleToAdd" :style="{color:mainColor}"
+            >去添加<XdFontIcon
+              size="28"
+              icon="iconxiangyou_xian"
+            ></XdFontIcon></view
+        ></view>
+      </template>
     </view>
   </view>
 </template>
@@ -93,6 +95,8 @@ export default {
       addCompanyPath: "",
       companyList: [],
       redirect_url: "",
+
+      isLoading: false,//页面加载完成
     };
   },
   watch: {
@@ -127,25 +131,12 @@ export default {
   },
   created() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {
       if (options.redirect_url) {
         this.redirect_url = Base64.decode(options.redirect_url);
       }
-      jfbRootExec("getChoseCompanyList", {
-        vm: this,
-        data: {},
-      }).then((res) => {
-        console.log(res, "resgetChoseCompanyList");
-        //如果只有一个企业，直接选择该企业
-        if(res.list.length === 1) {
-          this.handleChoseCompany(res.list[0]);
-        }
-        this.companyList = res.list;
-      });
 
       //判断应用是否开启了强制选择企业功能
       let isCustomer = false;
@@ -155,7 +146,6 @@ export default {
 
       //预览模式不显示强制选择企业功能提示
       if (this.$configProject['isPreview']) isCustomer = true;
-
       if(!isCustomer) {
         this.$xdAlert({
           title:'配置错误',
@@ -164,7 +154,26 @@ export default {
           contentColor: '#333',
           background: '#fff',
         });
+        return
       }
+
+      jfbRootExec("getChoseCompanyList", {
+        vm: this,
+        data: {},
+      }).then((res) => {
+        //如果只有一个企业，直接选择该企业(非预览模式)
+        if(res.list.length === 1) {
+          if(!this.$configProject["isPreview"]){
+            this.handleChoseCompany(res.list[0]);
+            return
+          }
+        }
+
+        //多个企业或者预览模式时候处理
+        this.isLoading = true;
+        this.companyList = res.list;
+      });
+
     },
     /**
      * @description 监听事件变化
@@ -267,8 +276,9 @@ export default {
     },
     handleChoseCompany(item) {
       if(this.$configProject["isPreview"]){
-        return; 
+        return;
       }
+
       jfbRootExec("switchChoseCompany", {
         vm: this,
         data: {
@@ -277,7 +287,6 @@ export default {
           company_source_from: item.company_source_from,
         },
       }).then((res) => {
-
         //#ifdef MP-WEIXIN
         if (this.jfbAuthorize !== null) {
           this.jfbAuthorize.setAllToken(res);//只返回用户登陆信息，无卡登陆信息
@@ -290,10 +299,12 @@ export default {
           real_index_url = jsonData['app']['frontPath'];
         } catch (error) {
           real_index_url = item.index_url;
-        } 
+        }
         this.$xdUniHelper.redirectTo({
           url: this.redirect_url || real_index_url || this.settings.index,
         });
+      }).catch(err=>{
+        console.error(err);
       });
     },
     handleToAdd() {
@@ -301,27 +312,6 @@ export default {
         url: this.addCompanyPath,
       });
     },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
-    },
-    onJfbReachBottom(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
-    onJfbShow(options) {
-      console.log("event.onJfbShow", options);
-    },
-    onJfbHide(options) {
-      console.log("event.onJfbHide", options);
-    },
-    onJfbBack(options) {
-      console.log("event.onJfbBack", options);
-    },
-    onJfbUpdate(...data) {
-      console.log("event.onJfbUpdate", data);
-    },
-    onJfbCustomEvent(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
   },
 };
 </script>

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -75,7 +75,7 @@
             @click="toSearch"
             :placeholder-style="'color:' + inputTextColor"
           />
-          <view v-else class="search_placeholder">{{placeholder}}</view>
+          <view v-else class="search_placeholder">{{keyword || placeholder}}</view>
           <xd-font-icon v-if="searchIconPosition==='right'" :icon="icon" :color="iconColor" size="32"/>
           <view v-if="showSearchBtn==='Y' && searchBtnPosition==='in'"
             class="search_btn_in"

package/src/components/JfbBaseHeaderColumn/JfbBaseHeaderColumn.vue

@@ -79,7 +79,7 @@
               @click="toSearch"
               :placeholder-style="'color:' + inputTextColor"
             />
-            <view v-else class="search_placeholder">{{placeholder}}</view>
+            <view v-else class="search_placeholder">{{keyword || placeholder}}</view>
             <xd-font-icon v-if="searchIconPosition==='right'" :icon="icon" :color="iconColor" size="32"/>
             <view v-if="showSearchBtn==='Y' && searchBtnPosition==='in'"
               class="search_btn_in"

package/src/components/JfbBaseOrderDetail/Api.js

@@ -74,15 +74,4 @@ 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" @click="handleToProduct(Sitem)">
+              <view class="jfb-base-order-detail__body-delivery-content">
                 <xd-jfb-image
                   width="200"
                   height="200"
@@ -1037,17 +1037,6 @@ export default {
       dialogCode: null,
 
       showApplyAfter: "",
-      actionBtns: [
-        'view_logistics', //包裹列表
-        'cancel_unpaid',  //取消订单
-        'delete', //删除订单
-        'service_process_list', //服务进度
-        'pay',  //支付
-        'apply_refund', //申请退款
-        'invoice',  //发票申请
-        'viewInvoice',  //查看发票
-        'reorder' //重新下单
-      ],
 
       //基础
       radius: 0,
@@ -1402,7 +1391,6 @@ export default {
             if(pay.length === 1) del = []
             res.buttons = del.concat(res.buttons || [])
           }
-          res.buttons = res.buttons.filter(btn => this.actionBtns.includes(btn.action))
 
           if (res.product) {
             try {
@@ -1673,73 +1661,20 @@ export default {
         }).catch(err => {
           this.$xdHideLoading();
         })
-      }else if (item.action === "invoice") {
+      }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}`,
         });
-      }else if (item.action === "viewInvoice") {
+      }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(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);
-          }
-        }).catch(err => {
-          this.$xdHideLoading();
-        })
       }
       else {
         console.error(`item.action=${item.action}, 此action不可用`)
       }
     },
-    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,16 +45,5 @@ 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

@@ -287,7 +287,6 @@ export default {
       refundFastPath: "",
 
       noticeBgc:'',
-      actionBtns: ['cancel_unpaid', 'pay', 'apply_refund', 'reorder']
     };
   },
 
@@ -472,41 +471,8 @@ 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();
-          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);
-          }
 
-        }).catch(err => {
-          this.$xdHideLoading();
-        })
+        
       }
     },
 
@@ -536,7 +502,6 @@ 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;