jufubao-base 1.0.376 → 1.0.377-beta2

package/package.json

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

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -314,6 +314,21 @@ export default {
           { label: '隐藏', value: 'N' },
         ]
       },
+      {
+        label: "影院电话",
+        ele: 'xd-radio',
+        valueKey: "isSHowPhone",
+        value: data['isSHowPhone'] || 'N',
+        groupKey: 'content',
+        placeholder: '请选择是否显示影院电话',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '显示', value: 'Y' },
+          { label: '隐藏', value: 'N' },
+        ]
+      },
+
       {
         label: '外填充:',
         ele: 'xd-margin-padding',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -536,10 +536,18 @@
               <view :class="{top: ['top'].includes(code_location)}" class="jfb-base-order-detail__body-shop-name">{{ info.shop.shop_name }}</view>
               <view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
             </view>
-            <view
-              @click="handleLocation(info.shop)"
-              v-if="['top'].includes(code_location)"
-            ><xd-font-icon icon="iconfabu" :color="mainColor" size="30"></xd-font-icon></view>
+            <view>
+              <view
+                @click="handleLocation(info.shop)"
+                v-if="['top'].includes(code_location)"
+              ><xd-font-icon icon="iconfabu" :color="mainColor" size="30"></xd-font-icon></view>
+              <view
+                class="show-phone"
+                @click="handleCallTo(info.shop['shop_phone'])"
+                v-if="isSHowPhone === 'Y' && info.shop['shop_phone'] && isPhoneReg.test(info.shop['shop_phone'])"
+              ><xd-font-icon icon="icondianhua" color="#333" size="30"></xd-font-icon></view>
+            </view>
+
           </view>
 
         </view>
@@ -866,7 +874,7 @@
               </view>
               <view>
                 <xd-button
-                  @click="handleToPay"
+                  @click="handleToPay(item)"
                   size="small"
                   type="primary"
                   :style="{
@@ -1116,6 +1124,10 @@ export default {
       showReorderDialog: false,
       reorderTips: [],
       reorderBtnItem: null,
+
+      //是否显示电话
+      isSHowPhone:'N', //是否显示手机号码
+      isPhoneReg: /^[\d-]+$/
     };
   },
   watch: {
@@ -1177,6 +1189,11 @@ export default {
     isPlusSite(){
       return this.projectAttr.headers['X-Site-Group']==="vip";
     },
+    // #ifdef H5
+    isMpInH5Comp(){
+      return navigator.userAgent.match(/miniprogram/i)
+    },
+    //#endif
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -1201,6 +1218,12 @@ export default {
       },()=>{})
     },
 
+    handleCallTo(phone){
+      if(this.isPhoneReg.test(phone)) {
+        uni.makePhoneCall({phoneNumber:phone.replace(/[-]/g,'')})
+      }
+    },
+
     getAmount(price) {
       return this.$xdUniHelper.divisionFloatNumber(price,100)
     },
@@ -1470,7 +1493,7 @@ export default {
      */
     init(container) {
       this.showApplyAfter = getContainerPropsValue(container, "content.showApplyAfter", "N");
-
+      this.isSHowPhone = getContainerPropsValue(container, "content.isSHowPhone", "N");
       this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
       this.brandPath = getContainerPropsValue(container, "content.brandPath", {value: "",}).value;
       this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
@@ -1601,12 +1624,9 @@ export default {
         });
       }
     },
-    handleToPay() {
+    handleToPay(item) {
+      //餐饮固定逻辑
       if (this.$configProject.type === "food") {
-        console.log(
-          getApp().globalData.$xd.brandInfo,
-          "getApp().globalData.$xd.brandInfo"
-        );
         let callbackUrl = `${window.location.protocol}//${window.location.host}/system/pay/success?order_id=${this.info.pay_info.pay_order_id}`;
         this.$xdUniHelper.navigateTo({
           url: `${getApp().globalData.$xd.brandInfo.pay_url}?order_id=${
@@ -1615,6 +1635,26 @@ export default {
         });
         return;
       }
+
+      // #ifdef H5
+      //判断是否为微信小程序宿主
+      if(item['extras']) {
+        try {
+          const { pay_jump_type, pay_url } = JSON.parse(item['extras']);
+          if(pay_url) {
+            let url = pay_url
+            if(this.isMpInH5Comp && pay_jump_type === 'wx_mini') {
+              url = `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(url)}&isThird=1`
+            }
+            this.$xdUniHelper.redirectTo({ url }, false, true);
+            return;
+          }
+        }catch (e) {
+          console.error('支付跳转解析失败:', e);
+        }
+      }
+      //#endif
+
       this.$xdUniHelper.navigateTo({
         url: `${this.payPath}?order_id=${this.info.pay_info.pay_order_id}&main_order_id=${this.main_order_id}`,
       });
@@ -1693,15 +1733,18 @@ export default {
         }).catch(err => {
           this.$xdHideLoading();
         })
-      }else 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}`,
         });
-      }else 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'){
+      }
+      else if(item.action === 'reorder'){
         //再来一单
         this.$xdShowLoading({});
         jfbRootExec("reCartOrder", {
@@ -1917,15 +1960,26 @@ export default {
         &:nth-child(1) {
           flex: 1;
         }
+
+
         &:nth-child(2) {
           flex-shrink: 0;
-          width: 80rpx;
-          height: 80rpx;
           display: flex;
           justify-content: flex-end;
           align-items: center;
+          & > view {
+            width: 80rpx;
+            height: 80rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
         }
       }
+
+      .show-phone {
+        transform: rotate(180deg);
+      }
     }
 
 

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -160,14 +160,14 @@
                       v-if="showApplyAfter === 'Y'"
                       type="default"
                       size="mini"
-                      @click="handleBtnEvent(btn.action, item)"
+                      @click="handleBtnEvent(btn.action, item,btn)"
                     >{{ btn.text }}</xd-button>
                   </template>
                   <xd-button
                     v-else
                     :type="getBtnType(btn.action)"
                     size="mini"
-                    @click="handleBtnEvent(btn.action, item)"
+                    @click="handleBtnEvent(btn.action, item , btn)"
                   >{{ btn.text }}</xd-button>
                 </view>
               </view>
@@ -193,7 +193,7 @@
                 :brandTextColor="brandTextColor"
                 :showApplyAfter="showApplyAfter"
                 :item="item"
-                @handleBtnEvent="action => handleBtnEvent(action, item)"
+                @handleBtnEvent="({action, btn}) => handleBtnEvent(action, item , btn)"
               ></xd-tfk-order-item>
             </view>
           </template>
@@ -331,6 +331,11 @@ export default {
       // else return "0";
       return this.sectionBorder;
     },
+    // #ifdef H5
+    isMpInH5Comp(){
+      return navigator.userAgent.match(/miniprogram/i)
+    },
+    //#endif
   },
   watch: {
     container(value,oldValue) {
@@ -446,11 +451,32 @@ export default {
       if(this.showApplyAfter === 'Y') return buttons.length > 0;
       else return buttons.filter(item => item.action !== 'apply_refund').length > 0;
     },
-    handleBtnEvent(action, item) {
+    handleBtnEvent(action, item, btn) {
       if (action === "cancel_unpaid") {
         //取消订单
         this.cancelUnPayOrder(item.main_order_id);
-      } else if (action === "pay") {
+      }
+      else if (action === "pay") {
+        //throw new Error(JSON.stringify({item,btn}))
+        // #ifdef H5
+        //判断是否为微信小程序宿主
+        if(btn['extras']) {
+          try {
+            const { pay_jump_type, pay_url } = JSON.parse(btn['extras']);
+            if(pay_url) {
+              let url = pay_url
+              if(this.isMpInH5Comp && pay_jump_type === 'wx_mini') {
+                url = `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(url)}&isThird=1`
+              }
+              this.$xdUniHelper.redirectTo({ url }, false, true);
+              return;
+            }
+          }catch (e) {
+            console.error('支付跳转解析失败:', e);
+          }
+        }
+        //#endif
+
         //去支付
         if (this.$configProject.type === "food") {
           console.log(
@@ -465,10 +491,13 @@ export default {
           });
           return;
         }
+
         this.$xdUniHelper.navigateTo({
           url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.main_order_id}`,
         });
-      } else if( action === 'apply_refund'){
+      }
+
+      else if( action === 'apply_refund'){
 
         this.$xdShowLoading({});
         jfbRootExec("getSupportQuickRefund", {
@@ -492,7 +521,8 @@ export default {
         }).catch(err => {
           this.$xdHideLoading();
         })
-      }else if(action === 'reorder'){
+      }
+      else if(action === 'reorder'){
         //重新下单
         this.$xdShowLoading({});
         jfbRootExec("reCartOrder", {

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -78,7 +78,7 @@
             :color="mainColor"
             :fontSize="28"></xd-unit>
         </template>
-        
+
       </view>
     </view>
     <view v-if="item.buttons.length" class="prod_footer">
@@ -88,16 +88,16 @@
           <view class="btn"
             v-if="showApplyAfter === 'Y'"
             :key="btn.key"
-            @click="handleBtnEvent(btn.action, item)"
+            @click="handleBtnEvent(btn.action, item, btn )"
           >{{btn.text}}</view>
         </template>
         <view class="btn"
           v-else
           :key="btn.key"
-          @click="handleBtnEvent(btn.action, item)"
+          @click="handleBtnEvent(btn.action, item, btn)"
         >{{btn.text}}</view>
       </template>
-     
+
     </view>
   </view>
 </template>
@@ -125,8 +125,8 @@
       }
     },
     methods:{
-      handleBtnEvent(action){
-        this.$emit('handleBtnEvent', action)
+      handleBtnEvent(action, btn){
+        this.$emit('handleBtnEvent', {action,btn})
       },
     }
   }
@@ -276,4 +276,4 @@
       }
     }
   }
-</style>
+</style>