gxd-uni-library-editx 1.0.71 → 1.0.73

package/package.json

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

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -35,7 +35,7 @@
               ></xd-unit>
             </view>
           </view>
-          
+
         </view>
         <view
           class="ticket_list"
@@ -212,7 +212,7 @@ import {
   } from '@/utils/xd.base';
 
 export default {
-  name: "XdCardPay",
+  name: "XdCardPayChose",
   components: {
     XdDownDrawer,
     XdButton,
@@ -278,7 +278,7 @@ export default {
       }
       this.$emit('update:show', n);
       this.$emit("onAlert");
-      
+
     },
     orderTotalPrice: {
       handler(n){
@@ -346,7 +346,7 @@ export default {
     alert_bottom(){
       return this.fixedStyle({paddingBottom: 24, zIndex: 110})
     },
-    
+
   },
   async created(){
     this.switchValidToken();
@@ -442,7 +442,7 @@ export default {
         });
       })
     },
-    
+
     //选择卡券
     handlerTicketSelect(flat, ticket, options){
       if(flat){ //选择卡券，重新调用接口获取 selectedCardList, neePayPrice
@@ -513,7 +513,7 @@ export default {
       }
 
     },
-    
+
     filterMGinfo(list){
       //深拷贝
       if(this.$xdUniHelper.checkVarType(list) === 'object'
@@ -528,7 +528,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);
@@ -537,7 +537,7 @@ export default {
         return item
       });
     },
-    
+
     //添加新卡券
     addNewCard(options={}){
       const { cardForm, total_price, submitCardList } = this;
@@ -576,10 +576,10 @@ export default {
           res: resOptions
         },'add_card');
         this.$xdHideLoading();
-        
+
         //成功回调
         let {selected_card_list=[], need_pay_price, is_need_pop, card_total_use_price} = res;
-        
+
         if(is_need_pop){
           this.useCardPop(res).then((select_content) => {
             if(select_content) this.addNewCard({select_content});
@@ -594,7 +594,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];
@@ -833,7 +833,7 @@ export default {
           box-sizing: border-box;
           margin: 30rpx auto;
           font-size: 28rpx;
-          
+
           .icon{
             width: 64rpx;
             height: 64rpx;
@@ -858,4 +858,4 @@ export default {
       }
     }
   }
-</style>
+</style>

package/src/components/XdCardV2/XdCardV2.vue

@@ -7,10 +7,7 @@
         :color="mainColor"
         icon="iconchakan1"
       ></xd-font-icon>
-      <view class="cha_kan" :style="{
-        backgroundColor: '#FFFFFF',
-        ...lookStyle
-      }">查看</view>
+      <view class="cha_kan" :style="lookStyleUI">查看</view>
     </view>
     <view class="item-right">
       <view class="item_info">
@@ -34,10 +31,7 @@
           购买其他物品可抵：{{ cardInfo.other_card_point }}
         </view>
       </view>
-      <view class="btn" :style="{
-        backgroundColor: mainColor,
-        ...loginStyle
-      }">
+      <view class="btn" :style="loginStyleUI">
         <view >{{ tabIndex === 1 ? loginName : "转换" }}</view>
       </view>
     </view>
@@ -58,7 +52,9 @@ export default {
     },
     cardInfo: {
       type: Object,
-      default: () => ({})
+      default(){
+        return {}
+      }
     },
     tabIndex: {
       type: Number,
@@ -74,11 +70,29 @@ export default {
     },
     loginStyle: {
       type: Object,
-      default: () => ({})
+      default(){
+        return {}
+      }
     },
     lookStyle: {
       type: Object,
-      default: () => ({})
+      default(){
+        return {}
+      }
+    }
+  },
+  computed:{
+    lookStyleUI(){
+      return {
+        backgroundColor:'#FFFFFF',
+        ...this.lookStyle,
+      }
+    },
+    loginStyleUI(){
+      return {
+        backgroundColor:this.mainColor,
+        ...this.loginStyle
+      }
     }
   },
   data(){

package/src/components/{XdCardV2 → XdCardV2Skeleton}/XdCardV2Skeleton.vue

@@ -14,6 +14,12 @@
   </view>
 </template>
 
+<script>
+export default {
+  name:'XdCardV2Skeleton'
+}
+</script>
+
 <style lang="less" scoped>
 .skeleton-card-item {
   display: flex;

package/src/components/XdConfirm/XdConfirm.vue

@@ -169,10 +169,7 @@
           this.show = false;
           this.confirm = {}
         } else {
-          this.$currentStyle = value.styles
-            || (this.styleCommon && this.styleCommon.styles)
-            || this.currentStyle ||
-            (value.$vm && value.$vm.styles) || {};
+          this.$currentStyle = value.styles || this.styleCommon || this.currentStyle || (value.$vm && value.$vm.styles) || {};
           this.confirm = Object.assign({},
             this.$xdUniHelper.cloneDeep(this.defaultConfirm),
             value,

package/src/components/XdFormCheckbox/XdFormCheckbox.vue

@@ -28,7 +28,12 @@
         </view>
         <view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
           <text class="checklist-text" :style="item.styleIconText">
+            <!-- #ifdef h5 -->
             <slot :name="'a' +item.value" :text="item.text">{{item}}{{item[map.text]}}</slot>
+            <!--  #endif  -->
+            <!-- #ifdef MP-WEIXIN -->
+            <slot name="a1" :text="item.text">{{item}}{{item[map.text]}}</slot>
+            <!--  #endif  -->
           </text>
           <view
             v-if="mode === 'list' && icon === 'right'"
@@ -97,7 +102,7 @@
 	 * @value right 右侧显示
 	 * @event {Function} change  选中发生变化触发
 	 */
-  
+
   import {
     getParentsStyle,
   } from '@/utils/xd.base';
@@ -217,7 +222,7 @@
 				isLocal:true,
 				styles: null,
 				isTop:0,
-        
+
         styleMainColor: '', //选中颜色
 			};
 		},

package/src/components/XdLayout/XdLayout.vue

@@ -114,7 +114,7 @@
       <!--tabbar-->
       <view class="xd-Layout__footer-height" :style="{height: (bottomHeight + (isFooterSolt ? footerHeight: 110)) + 'rpx' }"></view>
     </view>
-    <view v-if="websiteStatus === false" class="website-disable">
+    <view v-if="websiteStatus === false && this.mpSiteLoading" class="website-disable">
       <image src="//img.jufubao.cn/component/disabel_phone.png" mode="widthFix"></image>
     </view>
     <xd-confirm v-if="getLayoutInfo" :get-layout-info="getLayoutInfo"></xd-confirm>
@@ -267,7 +267,8 @@
         default(){
           return {}
         },
-      }
+      },
+
     },
     data() {
       return {
@@ -276,6 +277,7 @@
         layoutLoading: false,
         startTime: new Date().getTime(),
         websiteStatus: null,
+        mpSiteLoading: true,
 
         startAnimation : false, //开始动画效果
         doneAnimation: false, //完成动画效果
@@ -510,9 +512,13 @@
     },
 
     created() {
+
       this.wiewType = this.$configProject.isPreview;
       this.systemInfoSyn = uni.getSystemInfoSync();
       this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;
+      // #ifdef MP-WEIXIN
+      this.mpSiteLoading = false;
+      // #endif
 
       //判断是否禁用
       if(this.wiewType) {
@@ -525,6 +531,7 @@
       if(!uni.getStorageSync('xd-max-window-height')) {
         uni.setStorageSync('xd-max-window-height', uni.getSystemInfoSync().windowHeight);
       }
+
       this.isConsole = !!this.$xdUniHelper.getParmater('is-console')
       uni.onWindowResize(()=>{
         this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;

package/src/utils/xdWxLog.js

@@ -58,6 +58,10 @@ class Logs {
     console.error(error)
   }
 
+  setARMSCustomError(name, errorObj){
+    console.error(JSON.stringify({name,errorObj}))
+  }
+
 
   checkApiHost() {
     if (typeof getApp !== 'function') return false;