gxd-uni-library-editx 1.0.8-beta2 → 1.0.8-beta4

package/package.json

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

package/src/components/XdCardPay/XdCardPay.vue

@@ -101,46 +101,7 @@
           </view>
         </view>
         <view
-          v-if="needPayPrice>0"
-          class="remain_pay"
-        >
-          <view class="remain_header">
-            <view>选择以下支付方式</view>
-            <view class="flex align-center text-primary">
-              <view style="margin-right:8rpx;">继续支付</view>
-              <xd-unit
-                :price="needPayPrice"
-                :is-show-icon="false"
-                unit="元"
-                :isOld="false"
-                :font-size="24"
-                :icon-size="0.3"
-              ></xd-unit>
-            </view>
-          </view>
-          <view class="pay_list">
-            <view
-              v-for="item in payChannels"
-              :key="item.channel_provider_id"
-              class="pay_item"
-            >
-              <view class="icon">
-                <xd-font-icon
-                  v-if="item.channel_code =='wxpay'"
-                  icon="iconwx"
-                  size="64"
-                  color="#25bc46"
-                ></xd-font-icon>
-              </view>
-              <view class="pay_name">{{item.channel_provider_name}}</view>
-              <xd-radio
-                @change="flat => handlerPayCheck(item.channel_provider_id, flat)"
-                :value="channel_provider_id==item.channel_provider_id"
-              ></xd-radio>
-            </view>
-          </view>
-        </view>
-        <view
+          v-if="xdDownDrawer"
           class="bottom_btn"
           :style="{bottom: layoutInfo.bottom+'rpx', opacity: this.show?'1':'0'}"
         >
@@ -157,6 +118,7 @@
       :show.sync="xdDownDrawerNewCard"
       :z-index="3010"
       height="580rpx"
+      @close="switchValidToken"
     >
       <view class="drawer_title">使用新票券</view>
       <xd-form
@@ -228,13 +190,11 @@
  * @property layoutInfo             {Object}          XdLayout返回的布局信息
  * @property validImageAPIUrl       {String}          图片验证码接口API地址
  * @property jwxSDK                 {Object}          JSSDK授权对象
- * @property payChannels            {Array}           三方支付列表
  * @property price                  {Number|String}   订单总额 单位元
  * @property getSettleListCards     {Function(successCallBack(cardList))}               获取支付卡券列表
  * @property setSettleSelectCard    {Function(options, successCallBack, errCallBack)}   选择卡券列表
  * @property addSettleCard          {Function(options, successCallBack)}                添加卡券
  * @property createSettleOrder      {Function(options, successCallBack)}                创建订单
- * @property setThirdPlace          {Function(options, successCallBack)}                获取三方支付签名
  *
  * @event {Function} onCreateOrder 订单创建完成触发函数
  */
@@ -272,12 +232,12 @@ export default {
     jwxSDK: { //JSSDK授权对象
       type: Object,
     },
-    payChannels: {  //三方支付列表
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
+    // payChannels: {  //三方支付列表
+    //   type: Array,
+    //   default: () => {
+    //     return []
+    //   }
+    // },
     getSettleListCards: { //支付卡券列表
       type: Function
     },
@@ -290,9 +250,9 @@ export default {
     createSettleOrder: {  //创建订单
       type: Function
     },
-    setThirdPlace: {  //获取三方支付签名参数
-      type: Function
-    }
+    // setThirdPlace: {  //获取三方支付签名参数
+    //   type: Function
+    // }
   },
   watch: {
     show(n, o){
@@ -333,12 +293,12 @@ export default {
     showCardList(){
       //筛选出不存在于cardList的数据
       let otherCardList = this.selectedCardList.filter(item =>{
-        let cur = this.cardList.find(ii => ii.card_number === item.card_number);
+        let cur = this.cardList.find(ii => ii.card_number == item.card_number);
         return !cur;
       })
       //合并selectedCardList数据到对应的cardList
       let combineList = this.cardList.map(item => {
-        let cur = this.selectedCardList.find(ii => ii.card_number === item.card_number);
+        let cur = this.selectedCardList.find(ii => ii.card_number == item.card_number);
         if(cur) return Object.assign(item, cur);
         return item;
       })
@@ -351,14 +311,11 @@ export default {
     submitCardList(){
       return this.selectedCardList.filter(item => item.card_use_price > 0);
     },
-    curPayChannel(){
-      return this.payChannels.find(item => item.channel_provider_id === this.channel_provider_id);
-    }
   },
   created(){
     this.total_price = this.$xdUniHelper.multiplyFloatNumber(this.price, 100);
     this.needPayPrice = this.total_price;
-
+    this.switchValidToken();
     this.getList();
   },
   methods: {
@@ -387,7 +344,7 @@ export default {
       }else{
         //不走接口， selectedCardList不是真实选中的
         this.selectedCardList = this.selectedCardList.map(item => {
-          if(item.card_number === card_number){
+          if(item.card_number == card_number){
             this.needPayPrice = +this.needPayPrice + item['card_use_price']
             item['card_use_price'] = 0;
           }
@@ -404,90 +361,45 @@ export default {
         ...cardForm,
         selected_card_list_json: JSON.stringify(submitCardList),
         total_price,
-      }, () => {
+      }, (res) => {
         //成功回调
-        this.getList();
+        let {selected_card_list=[], need_pay_price} = res;
+        this.cardList = selected_card_list.concat(this.cardList);
+        this.selectedCardList = selected_card_list.concat(this.selectedCardList);
+        this.needPayPrice = need_pay_price;
+        this.switchValidToken();
+        this.xdDownDrawerNewCard = false;
+        this.renderChecked = Date.now();
+      }, (err) => {
+        this.switchValidToken();
       })
     },
     //确认支付
     doTicketPay(){
       const { total_price, submitCardList, needPayPrice } = this;
-    
-      if(+needPayPrice > 0 && !this.channel_provider_id){
-        uni.showToast({
-          title: "请选择继续支付方式",
-          icon: "none"
-        });
-        return false;
-      }
       let postData = {
         total_price,
         selected_card_list_json: JSON.stringify(submitCardList),
         need_pay_price: needPayPrice
       };
-
       this.createSettleOrder(postData, (order) => {
-        if(+needPayPrice > 0){
-          this.doThirdPay(order);
-        }else{
-          this.$emit("onCreateOrder", order);  //支付完成，触发
-        }
+        this.$emit("onCreateOrder", order);  //支付完成，触发
       })
     },
+    //刷新图片验证码
+    switchValidToken(){
+      let valid_token = this.$xdUniHelper.randomChar(20);
+      this.$set(this.cardForm, "valid_token", valid_token);
+    },
     //扫码
     doScanCode(){
       this.jwxSDK.scanQRCode({
         needResult: 1,
         success: res => {
-          console.log(res);
           this.$set(this.cardForm, 'card_number', res.resultStr)
         }
       })
     },
-    //第三方支付签名获取
-    doThirdPay(order){
-      const { channel_provider_id } = this;
-      this.setThirdPlace({order_id: order.fms_order_id,channel_provider_id}, (res) => {
-        const { channel_data } = res;
-        const paySignData = JSON.parse(Base64.decode(channel_data));
-        this.openTemplatePay(paySignData, ps => {
-          this.$emit("onCreateOrder", order);  //支付完成，触发
-        });
-      })
-    },
-    //唤醒三方平台支付
-    openTemplatePay(paySignData, cb){
-      // #ifdef H5
-      this.jwxSDK.chooseWXPay({
-        ...paySignData,
-        success: (res) => {
-          console.log('pay success', res);
-          uni.showToast({
-            title: "支付成功",
-            icon: "none"
-          })
-          cb(res);
-        },
-        cancel: () => {
-          uni.showToast({
-            title: "取消支付",
-            icon: "none"
-          })
-        },
-        fail: err => {
-          uni.showToast({
-            title: "支付失败",
-            icon: "none"
-          })
-          console.log('pay fail', err);
-        }
-      })
-      // #endif
-
-      // #ifndef H5
-        console.log("未支持唤醒三方支付");
-      // #endif
-    },
   }
 }
 </script>
@@ -632,4 +544,4 @@ export default {
       }
     }
   }
-</style>
+</style>

package/src/components/XdCoins/XdCoins.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="xd-coins" @click="handleClick" :style="getStyle">
-    <view class="xd-coins__bg"></view>
+    <view class="xd-coins__bg" :style="{backgroundImage: 'url('+ icon +')'}"></view>
   </view>
 </template>
 
@@ -14,6 +14,11 @@
    * @event {Function} click|tap    点击元宝事件
    */
 
+  import {
+    getParentsStyle,
+  } from '@/utils/xd.base';
+  import {mapState} from 'vuex';
+
   export default {
     name: "XdCoins",
     props:{
@@ -29,10 +34,12 @@
     data(){
       return {
         height: 92,
-        width: 120
+        width: 120,
+        icon: '',
       }
     },
     computed:{
+      ...mapState(['webUnitIcon']),
       getStyle(){
         let size = this.size;
         if (this.$xdUniHelper.checkVarType(size) === 'string') {
@@ -45,8 +52,25 @@
         if (size < 0.1) size = 0.1;
         if (size > 1.5) size = 1.5;
         return `height:${this.height * size}rpx; width: ${this.width * size}rpx;`;
+      },
+    },
+    created(){
+      //brand中获取
+      let brandIncon = null;
+      if (getApp().globalData.$xd && getApp().globalData.$xd.brandInfo['unit_icon']) {
+        brandIncon = getApp().globalData.$xd.brandInfo['unit_icon'];
+      }
+  
+      //项目配置中获取
+      let projectIcon;
+      if (this.webUnitIcon) {
+        projectIcon = this.webUnitIcon;
       }
+  
+      this.icon = projectIcon || brandIncon;
     },
+    
+    
     methods:{
       handleClick(e){
         this.$emit('click',e);

package/src/components/XdOnlineSeat/XdOnlineSeat.vue

@@ -89,7 +89,12 @@
                 <view><text>{{itemc['show_time_hour']}}</text><text>({{itemc['show_version']}})</text></view>
                 <view>{{itemc['hall_name']}}</view>
                 <view>
-                  <xd-unit font-weight="normal" :price="itemc['price']" :font-size="24"></xd-unit>
+                  <xd-unit
+                    font-weight="normal"
+                    :price="itemc['price']"
+                    :is-old="isOld"
+                    :font-size="24"
+                  ></xd-unit>
                 </view>
               </view>
             </view>
@@ -120,7 +125,15 @@
       <view class="xd-seat__footer-buy">
         <xd-button @click="handleBuy" type="primary" radius="10rpx">
           <view class="xd-seat__footer-buy-box">
-            <xd-unit v-if="getPrice > 0" :price="getPrice" :font-size="36" :iocn-size=".45" font-weight="normal" color="#fff"></xd-unit>
+            <xd-unit
+              v-if="getPrice > 0"
+              :price="getPrice"
+              :font-size="36"
+              :iocn-size=".45"
+              font-weight="normal"
+              color="#fff"
+              :is-old="isOld"
+            ></xd-unit>
             <view>确认选择</view>
           </view>
         </xd-button>
@@ -177,6 +190,10 @@
       XdNoticeBar
     },
     props:{
+      isOld: {
+        type: Boolean,
+        default: true,
+      },
       filmId: {
         type: Number | String,
         required: true

package/src/components/XdRadio/XdRadio.vue

@@ -5,11 +5,13 @@
       v-if="!$isIpad"
     >
       <radio
+        v-if="!disabled"
         :checked="checked"
         :disabled="disabled"
         :color="uiColor"
         :class="'xd-radio__' + size + '-body'"
       ></radio>
+      <view :class="'xd-radio__' + size + '-disabled'" v-else></view>
     </view>
     <view class="xd-radio__ipad" v-else>
       <radio
@@ -100,6 +102,22 @@
           margin-right: 0;
         }
       }
+  
+      &-disabled {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        transform: scale(1);
+        top: 0;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 50%;
+        background: #f8f8f8;
+        border: 1px solid #e5e5e5;
+        box-sizing: border-box;
+      }
     }
 
     &__small {
@@ -123,6 +141,22 @@
           margin-right: 0;
         }
       }
+  
+      &-disabled {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        transform: scale(0.6);
+        top: 0;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 50%;
+        background: #f8f8f8;
+        border: 1px solid #e5e5e5;
+        box-sizing: border-box;
+      }
     }
 
     &__mini {
@@ -146,6 +180,22 @@
           margin-right: 0;
         }
       }
+      
+      &-disabled {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        transform: scale(0.8);
+        top: 0;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 50%;
+        background: #f8f8f8;
+        border: 1px solid #e5e5e5;
+        box-sizing: border-box;
+      }
     }
   }
 </style>

package/src/components/XdUnit/XdUnit.vue

@@ -124,7 +124,7 @@
     },
     data() {
       return {
-        uiColor: '#c00', //金额显示颜色
+        uiColor: '#f00', //金额显示颜色
         uiIcon: null, //金额显示icon
         uiPrice: null, //金额
       }
@@ -135,21 +135,10 @@
       },
     },
     async created() {
-      this.uiColor = this.$mainColor;
       
       //设置显示数字
       this.initPrice();
 
-      //使用配置文件里面的单位颜色
-      if(this.webSetting['unitTextColor']) {
-        this.uiColor = this.webSetting['unitTextColor'];
-      }
-
-      //自定义单位自定义颜色
-      if(this.webSetting['unitTextColor']) {
-        this.uiColor = this.webSetting['unitTextColor'];
-      }
-
       //配置中获取
       let optionsIcon = null;
       if (this.webSetting['unitIcon']) {
@@ -177,9 +166,18 @@
     },
     methods: {
       initPrice(){
+        if(this.price === undefined) return;
+        
         //设置显示数字
         if (this.isOld) this.uiPrice = this.price;
-        else this.uiPrice = this.$xdUniHelper.divisionFloatNumber(this.price, 100);
+        else {
+          let price = this.price;
+          console.log('initPrice',price);
+          if(this.$xdUniHelper.checkVarType(price) === 'string') {
+            price = Number(price);
+          }
+          this.uiPrice = this.$xdUniHelper.divisionFloatNumber(price, 100);
+        }
       }
     }
   }