gxd-uni-library-editx 1.0.8-beta99 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.8-beta99",
+  "version": "1.0.9",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",
@@ -33,6 +33,7 @@
     "@dcloudio/uni-quickapp-webview": "^2.0.1-33920220208001",
     "@dcloudio/uni-stat": "^2.0.1-33920220208001",
     "@vue/shared": "^3.0.0",
+    "alife-logger": "^1.8.30",
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "dompurify": "^2.3.4",

package/src/components/XdBaiduMap/XdBaiduMap.vue

@@ -51,6 +51,7 @@
   import BmGeolocation from 'vue-baidu-map/components/controls/Geolocation';
   import BmNavigation from 'vue-baidu-map/components/controls/Navigation';
   import BmLabel from 'vue-baidu-map/components/overlays/Label';
+  import storage from "@/common/storage";
 
   export default {
     name: "XdBaiduMap",
@@ -95,6 +96,7 @@
         BMap: null, //百度SDK对象
         BMapLoaded: false, //地图加载完成状态
         map: null, //百度SDK对象实例化对象
+        threeLocationContentSave: 'xd-three-Location-content',
       }
     },
     watch:{
@@ -110,6 +112,12 @@
       }
     },
     created() {
+      //缓存中获取
+      if (storage.get(this.threeLocationContentSave)) {
+        this.$emit('onLocationSuccess', storage.get(this.threeLocationContentSave));
+        return
+      }
+      
       if(!this.ak) throw new Error('请传入百度AK值');
       else{
         let page = this.$xdUniHelper.parseURL();
@@ -138,11 +146,19 @@
         this.uiLevel = 15;
         this.uiCenter = point;
         this.location = location;
+        storage.set(this.threeLocationContentSave, location, 1/60)
         this.$emit('onLocationSuccess',location);
       },
 
       reLoad(){
         if(this.count > 10) {
+          let date = new Date();
+          this.$xdLog.setARMSCustomError('baidu_Location_fail', {
+            time: date.getTime(),
+            dataTime: date.toLocaleString(),
+            count: this.count
+          });
+          this.$emit('onLocationSuccess', null);
           return;
         }
         this.initStatus = false;
@@ -162,30 +178,18 @@
         geolocation['enableSDKLocation']();
         geolocation.getCurrentPosition(
           (location) => {
-            console.log('handleInitDone',location)
             let point = this.$xdUniHelper.cloneDeep(location.point);
             delete point['of']
             this.uiGeolocation = point;
             this.uiLevel = 15;
             this.uiCenter = point;
             this.location = location;
+            storage.set(this.threeLocationContentSave, location, 1/60)
             this.LocationContent = `我的坐标:{lat:${location.latitude}, lng:${location.longitude}}`
             this.$emit('onLocationSuccess',location);
           },
           (error) => {
             this.reLoad();
-            //百度定位失败
-            if (typeof getApp()['saveLogs'] === 'function') {
-              getApp()['saveLogs']({
-                location: this.location,
-                status: 'fail',
-                baiduStatus: geolocation.getStatus(),
-                result: res,
-                locationType: 'baidu.com',
-                pos: 'XdCityLocation'
-              }, 'info');
-            }
-            this.$emit('onLocationSuccess',this.location);
           }
         )
       },

package/src/components/XdButton/XdButton.vue

@@ -121,8 +121,13 @@
         //135deg  左上到右下（角度）
         //45deg 左下到右上（角度）
         default: 'to bottom',
-      }
+      },
       /**仅支持线性渐变******/
+  
+      isBoxShadow:{
+        type: Boolean,
+        default: false,
+      }
     },
     data(){
       return {
@@ -194,6 +199,7 @@
       },
 
       getBoxShadow(){
+        if(!this.isBoxShadow) return `0 0 0 rgba(0,0,0,0)`
         if(this.uiType === 'default' || this.uiType === 'text'|| this.boxShadow === null) return `0 0 0 rgba(0,0,0,0)`
         let color = this.$color(this.getColor(this.uiType)).alpha(0.4).toString();
         if(this.boxShadow) return this.boxShadow;

package/src/components/XdCardPay/XdCardPay.vue

@@ -85,7 +85,7 @@
                   :isOld="false"
                   :font-size="24"
                   :icon-size="0.3"
-                  :unit="ticket.unit"
+                  :unit="ticket.unit || ''"
                 ></xd-unit>
               </view>
               <view
@@ -97,7 +97,7 @@
                   :isOld="false"
                   :font-size="24"
                   :icon-size="0.3"
-                  :unit="ticket.unit"
+                  :unit="ticket.unit || ''"
                 ></xd-unit>
               </view>
             </view>
@@ -107,9 +107,7 @@
         <view
           v-if="xdDownDrawer"
           class="bottom_btn"
-          :style="{
-            bottom: layoutInfo.bottom+'rpx'
-          }"
+          :style="alert_bottom"
         >
           <xd-button
             width="360rpx"
@@ -332,6 +330,9 @@ export default {
     submitCardList(){
       return this.selectedCardList.filter(item => item.card_use_point > 0);
     },
+    alert_bottom(){
+      return this.fixedStyle({paddingBottom: 24, zIndex: 110})
+    },
   },
   created(){
     
@@ -339,6 +340,28 @@ export default {
     
   },
   methods: {
+    fixedStyle(options = {}, type = 'bottom') {
+      let paddingBottom = options.paddingBottom || options.height || 0;
+      if (options.paddingBottom) delete options.paddingBottom;
+      if (options.height) delete options.height;
+      let obj = Object.assign({}, {
+        top: 0, left: 0, right: 0, bottom: 0, zIndex: 100,
+      }, options);
+      let style = 'position: fixed';
+      style = `${style};left:${obj.left}rpx`;
+      style = `${style};right:${obj.right}rpx`;
+      style = `${style};z-index:${obj.zIndex}`;
+      if (type === 'bottom') {
+        let padding = (this.layoutInfo.bottomHeight + this.layoutInfo.footerHeight + paddingBottom) * this.$rpxNum;
+        style = `${style}; padding-bottom:calc(${padding}px + constant(safe-area-inset-bottom));`;
+        style = `${style}; padding-bottom:calc(${padding}px + env(safe-area-inset-bottom));`;
+        style = `${style};bottom:0;`;
+      }
+      if (type === 'top') {
+        style = `${style};top:${obj.top}rpx`;
+      }
+      return style;
+    },
     getTimeFormat(time){
       let date = null;
       if(time == +time){
@@ -351,6 +374,7 @@ export default {
     getList(){
       //获取卡券列表
       this.getSettleListCards((cardList) => {
+        this.$xdLog.setARMSInfo(this.filterMGinfo(cardList), 'init_binded_list');
         this.cardList = cardList;
       })
     },
@@ -367,7 +391,11 @@ export default {
               resolve(2);
             } else if (res.cancel) {
               // reject("取消支付");
-              resolve(3);
+              if(data.pop_type == 'confirm'){
+                resolve();
+              }else{
+                resolve(3);
+              }
             }
           },
           fail: function (res) {
@@ -376,9 +404,9 @@ export default {
         });
       })
     },
+    
     //选择卡券
     handlerTicketSelect(flat, ticket, options){
-      console.log("handlerTicketSelect", ticket)
       if(flat){ //选择卡券，重新调用接口获取 selectedCardList, neePayPrice
         const {submitCardList, total_price} = this;
         let callThis = this;
@@ -392,11 +420,26 @@ export default {
           selected_card_list_json: JSON.stringify(submitCardList),
           ...options
         }, (res) => {
+          let resOptions = JSON.parse(JSON.stringify(res));
+          if(resOptions['selected_card_list1']) delete resOptions['selected_card_list1'];
+          if (resOptions['selected_card_list']){
+            resOptions['selected_card_list'] = this.filterMGinfo(resOptions['selected_card_list']);
+          }
+          this.$xdLog.setARMSInfo({
+            card_number: ticket.card_number,
+            selected_card_list_json: this.filterMGinfo(submitCardList),
+            ...options,
+            res: resOptions
+          },'select_binded_card');
           this.$xdHideLoading();
           const {selected_card_list, need_pay_price, is_need_pop} = res;
           if(is_need_pop){
             this.useCardPop(res).then((select_content) => {
-              this.handlerTicketSelect(true, ticket, {select_content})
+              if(select_content){
+                this.handlerTicketSelect(true, ticket, {select_content})
+              }else{
+                this.handlerTicketSelect(false, ticket);
+              }
             }).catch(() => {})
           }else{
             this.selectedCardList = selected_card_list;
@@ -408,10 +451,15 @@ export default {
           this.renderChecked = Date.now();
         })
       }else{
+        this.$xdLog.setARMSInfo({
+          ticket: this.filterMGinfo(ticket),
+          ...options,
+        },'cancel_card');
         //不走接口， selectedCardList不是真实选中的
         this.selectedCardList = this.selectedCardList.map(item => {
           if(item.card_number == ticket.card_number){
-            this.needPayPrice = +this.needPayPrice + item['card_use_point']
+            this.needPayPrice = +this.needPayPrice + item['card_use_price']
+            item['card_use_price'] = 0;
             item['card_use_point'] = 0;
           }
           return item;
@@ -424,14 +472,37 @@ export default {
       }
 
     },
+    
+    filterMGinfo(list){
+      //深拷贝
+      if(this.$xdUniHelper.checkVarType(list) === 'object'
+        || this.$xdUniHelper.checkVarType(list) === 'array'
+      ) {
+        list = JSON.parse(JSON.stringify(list));
+      }
+      //object
+      if(this.$xdUniHelper.checkVarType(list) === 'object') {
+        if (list.card_use_certificate) list.card_use_certificate = list.card_use_certificate.substr(0, 2) + '********' + list.card_use_certificate.substr(-3);
+        if (list.card_cert) list.card_cert = list.card_cert.substr(0, 2) + '********' + list.card_cert.substr(-3);
+        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);
+        if(item.card_cert) item.card_cert = item.card_cert.substr(0, 2) + '********' + item.card_cert.substr(-3);
+        if(item.card_password) item.card_password = item.card_password.substr(0, 2) + '********' + item.card_password.substr(-4);
+        return item
+      });
+    },
+    
     //添加新卡券
     addNewCard(options={}){
       const { cardForm, total_price, submitCardList } = this;
       let err_tip = "";
       if(!cardForm.card_qrcode){
-        if(!cardForm.card_number) err_tip = "票券号码不能为空";
-        else if(!cardForm.card_password) err_tip = "票券密码不能为空";
-        else if(!cardForm.valid_code) err_tip = "验证码不能为空";
+        if(!cardForm.card_number && !cardForm.card_password) err_tip = "票券和密码不能为空";
       }
       if(err_tip) {
         return uni.showToast({
@@ -450,19 +521,56 @@ export default {
         total_price,
         ...options
       }, (res) => {
+        let resOptions = JSON.parse(JSON.stringify(res));
+        resOptions.selected_card_list = this.filterMGinfo(resOptions.selected_card_list)
+        this.$xdLog.setARMSInfo({
+          ...options,
+          total_price,
+          cardForm: {
+            ...cardForm,
+            card_password: cardForm.card_password ? cardForm.card_password.substr(0, 2) + '********' + cardForm.card_password.substr(-3) : '',
+          },
+          selected_card_list_json: this.filterMGinfo(submitCardList),
+          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) => {
-            this.addNewCard({select_content});
+            if(select_content) this.addNewCard({select_content});
             // this.handlerTicketSelect(true, cardForm.card_number, {select_content})
           }).catch((e) => {
             console.error(e)
           })
           return;
         }else{
-          selected_card_list = selected_card_list.map(item => {
+          // filterCard 去重后的卡券
+          let r_cards = this.cardList.map(item => item.card_number);
+          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){
+            let repeatCard = repeatCardList[0];
+            //重复的以前的卡数据
+            let oldCard = this.cardList.find(item => item.card_number == repeatCard.card_number);
+            //自动选中当前重合的卡券
+            if(this.selectedCardList.findIndex(item => item.card_number == repeatCard.card_number) == -1){
+              this.selectedCardList.push({...oldCard, ...repeatCard});
+            }else{
+              this.selectedCardList = this.selectedCardList.map(item => {
+                if(item.card_number == repeatCard.card_number){
+                  item = {...oldCard, ...repeatCard};
+                }
+                return item;
+              })
+            }
+          }
+
+          selected_card_list = filterCard.map(item => {
             item['is_new'] = true;
             return item;
           })
@@ -484,6 +592,7 @@ export default {
         this.switchValidToken();
       })
     },
+    
     handleConfirmAllWxPay(){
       return new Promise((resolve, reject) => {
         uni.showModal({
@@ -516,6 +625,12 @@ export default {
       callThis = this.$parent;
       // #endif
       callThis.createSettleOrder(postData, (order) => {
+        this.$xdLog.setARMSInfo({
+          total_price,
+          selected_card_list_json: this.filterMGinfo(submitCardList),
+          need_pay_price: needPayPrice,
+          res: order
+        }, 'create_order');
         this.$emit("onCreateOrder", {need_pay_price: needPayPrice, ...order});  //支付完成，触发
       })
     },
@@ -687,6 +802,8 @@ export default {
         background: #FFFFFF;
         box-shadow: 0 0 0px 1px rgba(0, 0, 0, 0.1);
         transition: 500ms all;
+        padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+        padding-bottom: calc(24rpx + constant(safe-area-inset-bottom));
       }
     }
   }

package/src/components/XdCardV2/XdCardV2.vue

@@ -0,0 +1,167 @@
+<template>
+  <view class="layout2-card-item" @click="handleBindLogin">
+    <view v-if="showLeft" class="item-left" @click.stop="toDetail">
+      <xd-font-icon
+        class="xd-font-icon"
+        size="34"
+        :color="mainColor"
+        icon="iconchakan1"
+      ></xd-font-icon>
+      <view class="cha_kan">查看</view>
+    </view>
+    <view class="item-right">
+      <view class="item_info">
+        <view class="_title">
+          <xd-font-icon
+            icon="iconkaquan"
+            size="38"
+            style="margin-right: 18rpx"
+            :color="mainColor"
+          ></xd-font-icon>
+          <view>{{ cardInfo.card_type_name }}</view>
+        </view>
+        <view class="identify">
+          <view class="_id">ID：{{ cardInfo.card_number }}</view>
+          <view>有效期至：{{ cardInfo.end_time }}</view>
+        </view>
+        <view class="remain">
+          剩余{{ cardInfo.unit }}数：{{ cardInfo.card_point }}{{ cardInfo.unit }}
+        </view>
+        <view v-if="cardInfo.other_card_point && cardInfo.card_point_type !== 1" class="other">
+          购买其他物品可抵：{{ cardInfo.other_card_point }}
+        </view>
+      </view>
+      <view class="btn" :style="{ background: mainColor }">
+        <view >{{ tabIndex === 1 ? "登录" : "转换" }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+export default {
+  components: {
+    XdFontIcon
+  },
+  props: {
+    cardInfo: {
+      type: Object,
+      default: () => ({})
+    },
+    tabIndex: {
+      type: Number,
+      default: 1
+    },
+    mainColor: {
+      type: String,
+      default: "#FF6A00"
+    },
+    showLeft: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data(){
+    return {
+
+    }
+  },
+  methods: {
+    handleBindLogin(){
+      this.$emit('bindLogin', this.cardInfo)
+    },
+    toDetail(){
+      this.$emit('toDetail', this.cardInfo)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.layout2-card-item {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  border: unit(2, rpx) solid #eeeeee;
+  border-radius: unit(20, rpx);
+  margin-bottom: unit(30, rpx);
+  background: #fff;
+  .item-left {
+    width: unit(140, rpx);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    font-size: unit(24, rpx);
+    .xd-font-icon {
+      margin-bottom: 10rpx;
+    }
+    .cha_kan{
+      font-size: 22rpx;
+      color: #666666;
+    }
+  }
+  .item-right {
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 24rpx;
+    padding: 24rpx;
+    border-left: 1px solid #eeeeee;
+    .item_info {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      flex: 1;
+      width: 100rpx;
+
+      ._title{
+        display: flex;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 32rpx;
+      }
+      .identify{
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        font-size: 22rpx;
+        color: #999999;
+        font-weight: 400;
+        margin-top: 24rpx;
+        & > view{
+          word-break: break-all;
+        }
+
+        ._id{
+          margin-right: 20rpx;
+        }
+      }
+      .remain{
+        font-size: 24rpx;
+        color: #333333;
+        margin-top: 24rpx;
+        line-height: 28rpx;
+      }
+      .other{
+        font-size: 22rpx;
+        color: #999999;
+        margin-top: 8rpx;
+      }
+    }
+    .btn{
+      width: 104rpx;
+      height: 104rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+      font-size: 28rpx;
+    }
+  }
+}
+</style>

package/src/components/XdCityApi/XdCityApi.vue

@@ -211,6 +211,7 @@
       this.$nextTick(() => {
         this.loaded = true;
       })
+      this.init();
     },
 
     mounted(){
@@ -232,7 +233,7 @@
       handleDone(location){
         console.log('location', location);
         this.threeLocation = location;
-        this.init();
+        this.getLocationCityName();
       },
 
       init(){
@@ -261,7 +262,7 @@
         this.cityLetter = this.listInfo.classify_nav;
 
         console.log('toList', this.allCityList, this.hotCityList, this.cityList, this.cityLetter);
-        this.getLocationCityName();
+        // this.getLocationCityName();
         this.setAppLettersList();
       },
 
@@ -458,7 +459,7 @@
   .xd-city {
     &__header {
       position: fixed;
-      background: #eee;
+      background: #fff;
       left: 0;
       top: 0;
       right: 0;
@@ -485,8 +486,8 @@
         height: unit(70, rpx);
         max-height: unit(60, rpx);
         border-radius: unit(30, rpx);
-        background-color: @xd-bg-color;
-        padding-left: unit(20, rpx);
+        background-color: #eee;
+        padding-left: unit(40, rpx);
         padding-right: unit(20, rpx);
         box-sizing: border-box;
       }