gxd-uni-library-editx 1.0.82 → 1.0.83-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.82",
+  "version": "1.0.83-beta2",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdCardPay/XdCardPay.vue

@@ -146,6 +146,7 @@
             <view
               class="scan_icon"
               @click="doScanCode"
+
             >
               <xd-font-icon icon="iconsaoma"></xd-font-icon>
             </view>
@@ -216,9 +217,10 @@ import XdForm from "@/components/XdForm/XdForm"
 import XdFormItem from "@/components/XdFormItem/XdFormItem"
 import XdFormInput from "@/components/XdFormInput/XdFormInput"
 import {
-    getParentsStyle, //获取页面风格单个键值值
-    getParentsStyles //获取页面风格列表
-  } from '@/utils/xd.base';
+  getParentsStyle, //获取页面风格单个键值值
+  getParentsStyles, //获取页面风格列表
+  isQrCode
+} from '@/utils/xd.base';
 
 export default {
   name: "XdCardPay",
@@ -322,7 +324,8 @@ export default {
       renderChecked: "renderChecked",
 
       total_price: "",
-      style: {}
+      style: {},
+      isQrCode: false,
     }
   },
   computed: {
@@ -352,7 +355,7 @@ export default {
     },
   },
   async created(){
-    
+    this.isQrCode = isQrCode(this);
     this.switchValidToken();
     this.style = await getParentsStyles(this.$parent);
     console.log(this.style,'this.style');
@@ -425,7 +428,7 @@ export default {
         });
       })
     },
-    
+
     //选择卡券
     handlerTicketSelect(flat, ticket, options){
       if(flat){ //选择卡券，重新调用接口获取 selectedCardList, neePayPrice
@@ -493,7 +496,7 @@ export default {
       }
 
     },
-    
+
     filterMGinfo(list){
       //深拷贝
       if(this.$xdUniHelper.checkVarType(list) === 'object'
@@ -508,7 +511,7 @@ export default {
         if (list.card_password) list.card_password = list.card_password.substr(0, 2) + '********' + list.card_password.substr(-3);
         return list;
       }
-      
+
       //array
       return list.map(item => {
         if(item.card_use_certificate) item.card_use_certificate = item.card_use_certificate.substr(0, 2) + '********' + item.card_use_certificate.substr(-3);
@@ -517,7 +520,7 @@ export default {
         return item
       });
     },
-    
+
     //添加新卡券
     addNewCard(options={}){
       const { cardForm, total_price, submitCardList } = this;
@@ -556,10 +559,10 @@ export default {
           res: resOptions
         },'add_card');
         this.$xdHideLoading();
-        
+
         //成功回调
         let {selected_card_list=[], need_pay_price, is_need_pop} = res;
-        
+
         if(is_need_pop){
           this.useCardPop(res).then((select_content) => {
             if(select_content) this.addNewCard({select_content});
@@ -574,7 +577,7 @@ export default {
           let filterCard = selected_card_list.filter(item => !r_cards.includes(item.card_number));
           //重合的卡券列表
           let repeatCardList = selected_card_list.filter(item => r_cards.includes(item.card_number));
-          
+
           if(repeatCardList.length > 0){
             for(let i = 0; i < repeatCardList.length; i++){
               let repeatCard = repeatCardList[i];
@@ -616,7 +619,7 @@ export default {
         this.switchValidToken();
       })
     },
-    
+
     handleConfirmAllWxPay(){
       if(!this.payThird){
         this.$xdAlert({content: "请选择兑换方式"});
@@ -824,7 +827,7 @@ export default {
           box-sizing: border-box;
           margin: 30rpx auto;
           font-size: 28rpx;
-          
+
           .icon{
             width: 64rpx;
             height: 64rpx;

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -137,6 +137,7 @@
               v-model="cardForm.card_number"
             />
             <view
+              v-if="isQrCode"
               class="scan_icon"
               @click="doScanCode"
             >
@@ -207,9 +208,10 @@ import XdForm from "@/components/XdForm/XdForm"
 import XdFormItem from "@/components/XdFormItem/XdFormItem"
 import XdFormInput from "@/components/XdFormInput/XdFormInput"
 import {
-    getParentsStyle, //获取页面风格单个键值值
-    getParentsStyles //获取页面风格列表
-  } from '@/utils/xd.base';
+  getParentsStyle, //获取页面风格单个键值值
+  getParentsStyles, //获取页面风格列表
+  isQrCode
+} from '@/utils/xd.base';
 
 export default {
   name: "XdCardPayChose",
@@ -318,7 +320,8 @@ export default {
       renderChecked: "renderChecked",
 
       total_price: "",
-      style: {}
+      style: {},
+      isQrCode: false,
     }
   },
   computed: {
@@ -349,6 +352,7 @@ export default {
 
   },
   async created(){
+    this.isQrCode = isQrCode(this);
     this.switchValidToken();
     this.style = await getParentsStyles(this.$parent);
     console.log(this.style,'this.style');

package/src/utils/xd.base.js

@@ -729,6 +729,44 @@ export function parsePackName(appName, flag = true) {
   else return arr;
 }
 
+/**
+ * 判断是否为第三方登录方式
+ * @return {{isThird: boolean, isICB: boolean}}
+ */
+export function isThirdLogin(){
+  const ua = navigator.userAgent
+  return {
+    isThird: /^.+(fullversion|elife).+$/i.test(ua),
+    isICB:/^.+(fullversion|elife).+$/i.test(ua)
+  }
+}
+
+/**
+ * @description 是否支持扫一扫功能
+ * @param $vm {VUE}
+ * @param isOpen {Boolean} 默认值：true
+ */
+export function isQrCode($vm,isOpen=true){
+  //关闭显示扫一扫功能
+  if(isOpen === false) return false;
+
+  //预览模式显示扫一扫功能
+  if($vm.$configProject.isPreview === true) return true;
+
+  //是否为工商银行
+  if(isThirdLogin().isICB) return true;
+
+  //微信环境｜企业微信环境|微信开发者工具
+  if(isWechat() || isWechatWork()||isWechatTools()) return true;
+
+  //微信小程序
+  if (settings.platform === 'mp-weixin') {
+    return
+  }
+
+  return false
+}
+
 
 
 

package/src/utils/xdh5log.js

@@ -104,7 +104,9 @@ window['__bl'] = window['__bl'] || {};
 function aliInit(){
   let isAddressDebug = window.location.href.indexOf('closeLog=1') !==-1;
   let xTestClose=   window.location.href.indexOf('x-test=jfb-close-ali') !==-1;
-  if(settings['aliDisabled'] === true || settings.isDebug || isAddressDebug || xTestClose) {
+  let debugHostArray = ['sandbox-website-01.jufubao.cn']
+  let siteDebug = debugHostArray.includes(window.location.host);
+  if(settings['aliDisabled'] === true || settings.isDebug || isAddressDebug || xTestClose || siteDebug) {
     window['__addBehaviorArray'] = [];
     window['__addBehaviorArrayTimer'] = null;
 
@@ -136,7 +138,6 @@ function aliInit(){
     }
     return
   }
-
   window['__bl'] = BrowserLogger['singleton'](config);
 }