jufubao-base 1.0.237 → 1.0.238-beta67

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -261,22 +261,12 @@
         return this.getNoData();
       },
       menuBoxStyle(){
-        let padding = `${this.checkValue(this.menuPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.menuPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.menuPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.menuPadding.left, 20)}rpx`;
-
         return this.styleObjectToString({
-          // background: this.formBgColor,
-          padding: padding,
+          padding: this.getMarginAndPadding(this.menuPadding,20),
         })
       },
       menuItemBoxPadding(){
-        let padding = `${this.checkValue(this.menuBtnPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.menuBtnPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.menuBtnPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.menuBtnPadding.left, 20)}rpx`;
-        return padding;
+        return this.getMarginAndPadding(this.menuBtnPadding, 20)
       },
       menuItemStyle(){
         let styleObj = {
@@ -308,11 +298,7 @@
         return this.styleObjectToString(styleActiveObj)
       },
       bindCardBtnPadding(){
-        let padding = `${this.checkValue(this.cardBtnPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardBtnPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardBtnPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardBtnPadding.left, 20)}rpx`;
-        return padding;
+        return this.getMarginAndPadding(this.cardBtnPadding,20)
       },
       bindCardBtnOther(){
         return {
@@ -325,7 +311,7 @@
       },
       bindCardBtnStyle(){
         let styleObj = {
-          color: this.cardBtnTextStyle['color'] || '#333',
+          color: this.cardBtnTextStyle['color'] || '#fff',
           background: this.cardBtnTextStyle['bgColor'] || '#fff',
           fontSize: this.cardBtnTextStyle['fontSize'] || '30rpx',
           fontWeight: this.cardBtnTextStyle['fontWeight'] || 'normal',
@@ -334,7 +320,7 @@
         return this.styleObjectToString(styleObj)
       },
       bindCardActiveStyle(){
-        let defaultTextColor = '#ff5a39';
+        let defaultTextColor = '#333';
         let styleActiveObj = {
           color: this.cardBtnTextStyle['actColor'] || defaultTextColor,
           background: this.cardBtnTextStyle['actBgColor'] || '#fff',
@@ -345,11 +331,7 @@
         return this.styleObjectToString(styleActiveObj)
       },
       couponBtnPadding(){
-        let padding = `${this.checkValue(this.couponUseBtnPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.couponUseBtnPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.couponUseBtnPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.couponUseBtnPadding.left, 20)}rpx`;
-        return padding;
+        return this.getMarginAndPadding(this.couponUseBtnPadding,20);
       },
       couponBtnStyle(){
         let styleObj = {
@@ -405,13 +387,9 @@
         }
         if(this.cardImageMode) image['backgroundSize'] = this.cardImageMode;
 
-        let padding = `${this.checkValue(this.cardPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardPadding.left, 20)}rpx`;
         return this.styleObjectToString({
           ...image,
-          padding: padding,
+          padding: this.getMarginAndPadding(this.cardPadding, 20),
           borderRadius: this.cardRadius + 'rpx',
           border: border,
           boxShadow: boxShadow,
@@ -420,13 +398,8 @@
         })
       },
       listBoxStyle(){
-        let padding = `${this.checkValue(this.cardListPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardListPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardListPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.cardListPadding.left, 20)}rpx`;
-
         return this.styleObjectToString({
-          padding: padding,
+          padding: this.getMarginAndPadding(this.cardListPadding, 20),
         })
       },
       getCouponBgImage(){
@@ -455,22 +428,13 @@
         })
       },
       noticeWrapBoxStyle(){
-        let padding = `${this.checkValue(this.noticeMargin.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.noticeMargin.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.noticeMargin.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.noticeMargin.left, 20)}rpx`;
-
         return this.styleObjectToString({
-          padding: padding,
+          padding: this.getMarginAndPadding(this.noticeMargin, 20),
         })
       },
       noticeBoxStyle(){
-        let padding = `${this.checkValue(this.noticePadding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.noticePadding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.noticePadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.noticePadding.left, 20)}rpx`;
         return this.styleObjectToString({
-          padding: padding,
+          padding: this.getMarginAndPadding(this.noticePadding, 20),
           background: this.noticeBgColor
         })
       },
@@ -608,7 +572,7 @@
         }
         if(this.cardBtnTextStyle){
           if(!this.cardBtnTextStyle.actBgColor){
-            this.cardBtnTextStyle.actBgColor = this.mainColor;
+            this.cardBtnTextStyle.actBgColor = this.infoColor;
           }
           if(!this.cardBtnTextStyle.bgColor){
             this.cardBtnTextStyle.bgColor = this.mainColor;

package/src/mixins/cardListMixins.js

@@ -0,0 +1,187 @@
+'use strict';
+import {mapMutations, mapState} from "vuex";
+
+export default {
+  data() {
+    return {
+      ajaxCardList: null, //接口返回原始数据
+
+      //卡券列表
+      cardOrgList:[], //原始数据
+      cardList:null, //计算后的卡列表
+      cardPageNum: 0, //当前页面
+      cardPageLen: 10, //每页获取数据调试
+      cardComputedList:[], //当前获取的数据列表
+      cardLoading: false, //加载状态值设置
+      cardNextTop: 0, //计算到每一个节点的距离顶部Top值
+      contentStatus: false, //内容框是否已经进行过计算距离顶部Top值状态
+      hasContent: true, //是否可以进行继续加载状态
+      cardIndex: 0,
+
+      //转换按钮
+      hasChangeStatus: false,//是否有转换按钮
+
+      cardItemEntry: '//img.jufubao.cn/component/card/card_item_entry.png?v1=11',
+      cardItem: '//img.jufubao.cn/component/card/card_item.png?v1=11',
+
+      showStatus:false,
+
+    }
+  },
+  computed:{
+    ...mapState(['srollPreview'])
+  },
+  created(){
+    this.setSrollPreview({
+      pageWindowPrevStart: 0,
+      pageWindowPrevEnd: uni.getSystemInfoSync().safeArea.height,
+    });
+    this.showStatus = true;
+  },
+
+
+  methods:{
+    ...mapMutations(['setSrollPreview']),
+
+    onJfbHide(){
+      this.showStatus = false;
+    },
+
+    onJfbShow(options){
+      this.showStatus = true;
+      this.clearDefault();
+      this.onJfbLoad(options);
+    },
+
+    setCardItemShow({height , top},index){
+
+      //预览模式只获取10条
+      if(this.$configProject.isPreview) {
+        //console.log(this.cardPageLen, index, this.cardPageLen > index)
+        return this.cardPageLen > index;
+      }
+
+      //打包模式
+      let fiexd = 50;
+      let boxTop = top + height + fiexd;
+      let boxBottom = top - (fiexd);
+      let {pageWindowPrevStart, pageWindowPrevEnd} = this.srollPreview;
+
+      //console.log(height,top,pageWindowPrevStart,pageWindowPrevEnd)
+      return boxTop > pageWindowPrevStart && boxBottom < pageWindowPrevEnd;
+    },
+
+    getBoxTop(){
+      return new Promise((resolve, reject)=>{
+        const query = uni.createSelectorQuery().in(this);
+        query.select('.card-content').boundingClientRect(data=>{
+          this.cardNextTop = data.top;
+          this.contentStatus = true;
+          resolve();
+        }).exec()
+      })
+
+    },
+
+    async handleCardComputed(paddingBottom=30){
+      this.$xdShowLoading({});
+      if(this.contentStatus === false)  await this.getBoxTop();
+      this.$nextTick(()=>{
+        const query = uni.createSelectorQuery().in(this);
+        query.selectAll('.computed-box').boundingClientRect(data => {
+          let arr = data.map(item=>{
+            let card =  this.cardComputedList.filter(it=>{
+              return item.dataset.card === it.card_number;
+            })[0];
+            card['height'] = item.height;
+            card['top'] =  this.cardNextTop;
+            card['index'] = this.cardIndex;
+            this.cardNextTop =  this.cardNextTop + card['height'] +  (paddingBottom * this.$rpxNum);
+            this.cardIndex++;
+            return card
+          });
+          this.cardList = (this.cardList||[]).concat(arr);
+          this.$xdHideLoading();
+        }).exec();
+      })
+    },
+
+    handleCardInit(cardList,type,paddingBottom =30){
+      let newCardList = this.$xdUniHelper.cloneDeep(cardList);
+      let validCardList = this.getCardGroupItem(newCardList.list.filter((item) => {
+        // 判断type是否为'is_valid'
+        if (type === 'is_valid') {
+          // 如果是，则返回item.is_transfering是否不等于'Y'
+          return item[type] === 'Y' && item.is_transfering !== 'Y';
+        } else if(type === 'is_exchange') {
+          // 如果是，则返回item.is_transfering是否不等于'Y'
+          return item[type] === 'Y' && item.is_transfering !== 'Y';
+        } else {
+          // 否则，返回item[type]是否等于'Y'
+          return item[type] === 'Y';
+        }
+      }), newCardList['site_entry_settings']).map((item,index)=>{
+        item['index'] = index;
+        return item
+      });
+      console.log(validCardList,'validCardListvalidCardList');
+
+
+      this.cardOrgList = this.$xdUniHelper.cloneDeep(validCardList);
+      console.warn(`cardOrgList:${this.cardOrgList.length}`)
+      this.cardComputedList = this.$xdUniHelper.cloneDeep(this.cardOrgList).slice(this.cardPageNum,this.cardPageLen);
+      if(this.cardComputedList.length < this.cardPageLen) {
+        this.hasContent = false;
+      }
+      this.handleCardComputed(paddingBottom).then().catch();
+    },
+
+    onJfbScroll({e}){
+      if(this.showStatus) {
+        this.setSrollPreview({
+          pageWindowPrevStart: e.scrollTop,
+          pageWindowPrevEnd:e.scrollTop + uni.getSystemInfoSync().safeArea.height
+        })
+      }
+    },
+
+    onJfbReachBottom(){
+      //加载在不处理,无下一页不处理，当前也为0不处理
+      if(this.cardLoading || !this.hasContent || this.cardPageNum === 0) return;
+      this.cardLoading = true;
+      this.$xdShowLoading({});
+      this.$nextTick(()=>{
+        setTimeout(()=>{
+          this.cardLoading = false;
+          this.$xdHideLoading();
+          this.cardComputedList = this.$xdUniHelper.cloneDeep(this.cardOrgList).slice(
+            this.cardPageNum*this.cardPageLen,
+            this.cardPageNum*this.cardPageLen + this.cardPageLen
+          );
+          this.handleCardComputed().then().catch();
+          if(this.cardComputedList.length < this.cardPageLen) {
+            this.hasContent = false;
+          }
+          this.cardPageNum++;
+        },500)
+      })
+
+    },
+
+    clearDefault(){
+      this.cardOrgList = [];
+      this.cardList = null;
+      this.cardPageNum = 0;
+      this.cardComputedList = [];
+      this.cardLoading = false;
+      this.cardNextTop = 0;
+      this.contentStatus = false;
+      this.hasContent = true;
+      this.cardIndex = 0;
+      this.ajaxCardList = null;
+      //this.hasChangeStatus = false;
+    }
+  }
+}
+
+

package/src/mixins/colorCardMixins.js

@@ -40,7 +40,7 @@ export default {
       let support = [];
       codes.map(bus => {
         allEntry.map(it => {
-          it['image_url'] = getServiceUrl(it['image_url'])
+          it['image_url'] = getServiceUrl(it['image_url'],'size2')
           if (bus === it['business_code']) {
             support.push(it);
           }
@@ -117,6 +117,74 @@ export default {
     },
     getNoData(){
       return this.colorObj.nodata
-    }
+    },
+    /**
+     * @description 单业务自动跳转功能
+     * @param entry {Array} 业务链接信息
+     */
+    handleOneBussClick(entry){
+      debugger
+      if (this.$configProject['isPreview']) return;
+
+      //登陆成功，有回调地址返回回调地址
+      if(this.inCallbackUrlOrg) {
+        this.$xdUniHelper.redirectTo({
+          url:this.inCallback
+        }, false);
+        return;
+      }
+
+      const {dir, path, host, appType} = entry['redirect_data'];
+      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      let regSp = /(-apiuri\/v)/;
+
+      if(!appType) entry.redirect_data.appType = 'h5';
+      let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
+
+      //外站配置地址
+      if(entry.redirect_type === 'URL') {
+        if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          let urlPath = entry.redirect_data['path'];
+          if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
+          else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
+          this.$xdUniHelper.redirectTo({
+            url:urlPath
+          }, false)
+        }
+        else {
+          console.error(`配置错误：${entry.redirect_data['path']}`);
+          throw new Error(`配置错误：${entry.redirect_data['path']}`)
+        }
+        return
+      }
+
+      //站内应用处理
+      let jumpUrl = path;
+      let cardPathStr = '';
+      const {deploy_dir} = this.projectAttr;
+      if(host === this.projectAttr.host && deploy_dir !== dir){
+        jumpUrl = `//${host}/${dir}${path}`;
+        //#ifdef MP-WEIXIN
+        jumpUrl = `https:${jumpUrl}`;
+        //#endif
+      }
+
+      //#ifdef MP-WEIXIN
+      //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+      if(entry.redirect_data.appType === 'h5') {
+        const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['custom_redirect_data']:{};
+        const cardPathObject = this.getCardPath(custom_redirect_data);
+        if(cardPathObject !== null) {
+          const {cardPath, cardSelf} =cardPathObject
+          if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+        }
+      }
+      //#endif
+
+      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      console.warn(`entry.path:${jumpUrl}`);
+      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
+    },
   }
 }

package/src/mixins/componentsMixins.js

@@ -5,6 +5,7 @@ import {mapActions,mapState, mapMutations} from "vuex";
 import helper from "@/utils/helper";
 import store from "@/store/index";
 import getServiceUrl from "@/common/getServiceUrl"
+import {parsePath} from "@/utils/linkUrl";
 
 
 export default {
@@ -735,6 +736,7 @@ export default {
       let showActivityPrice = getContainerPropsValue(container, "content.showActivityPrice", "N");
       let isShowTag = getContainerPropsValue(container, "content.isShowTag", "Y");
       let isAddCart = getContainerPropsValue(container, "content.isAddCart", "N");
+      let showFreeShipping = getContainerPropsValue(container, "content.showFreeShipping", "N");
       return {
         isShowDiscount: isShowDiscount,
         isPrice: isPrice,
@@ -743,6 +745,7 @@ export default {
         showActivityPrice:showActivityPrice,
         isShowTag : isShowTag,
         differ: differ,
+        showFreeShipping: showFreeShipping
       }
     },
 
@@ -907,30 +910,55 @@ export default {
       }
     },
 
-    handleH5ToMP(app_id,url,params){
-      debugger
+    getProductTagsParams(conf=null,data={}){
+      var temp = [];
+      let defaultValue = {
+        isShowTag:"market",
+        showActivityPrice:"flashsale",
+        showTag: "market",
+      }
+      try{
+        if(conf) {
+          conf = JSON.parse(conf).value;
+          conf={
+            ...defaultValue,
+            ...conf,
+          }
+          Object.keys(data).map(key=>{
+            if(data[key] === 'Y') {
+              temp.push(conf[key]);
+            }
+          })
+        }
+        else {
+          temp = [];
+        }
+      }catch(e){
+        temp = []
+      }
+      return temp
+    },
+    getProductTagsKeys(conf=null,container,type='productList'){
+      let defaultValue
+      if(type==='productList' ){
+        defaultValue = ["isShowTag","showActivityPrice"]
+      } else {
+        defaultValue = ["showTag","showActivityPrice"]
+      }
+      try{
+        if(conf) conf = JSON.parse(conf).keys;
+        else conf = []
+      }catch(e){
+        conf = []
+      }
+      conf = conf.concat(defaultValue)
+      let tagList = {}
+      conf.map(item=>{
+        tagList[item] = getContainerPropsValue(container, `content.${item}`, "N");
+      })
+      return tagList
     },
 
-    handleMpToMP(app_id,url,params){
-
-    },
-    /**
-     * @description 处理站点应用内部跳转微信小程序处理
-     * @param code {string} 站点内部微信小程序aopen_app_code
-     * @param type {string} h5|wxmp
-     * @param url {string} 内部链接地址
-     * @param params {string} 自定义参数 例如：id=1&cid=1234
-     */
-    codeForGetAppId(code, type, url,params){
-     this.wxCodeForGetAppId({app_code: code})
-       .then(app_id=>{
-         if(type === 'h5') this.handleH5ToMP(app_id,url, params || '');
-         if(type === 'wxmp') this.handleMpToMP( app_id, url, params || '')
-       })
-       .catch(err=>{
-         console.error(err)
-       })
-    }
   }
 }
 

package/src/mixins/locationMixins.js

@@ -0,0 +1,119 @@
+'use strict';
+import {mapActions, mapMutations} from 'vuex';
+import storage from "@/common/storage";
+
+export default {
+  data() {
+    return {
+      locationStatus: false,
+      currentLocationCity: 'jfb_current_ajax_location_city',
+      useSelectCity: 'xd_user_current_access_city',
+      timeoutLocationTime: null,
+      timeoutLocationStatus: false,
+    }
+  },
+
+  destroyed() {
+    if(this.timeoutLocationTime) {
+      clearTimeout(this.timeoutLocationTime)
+      this.timeoutLocationTime = null;
+    }
+  },
+
+  methods: {
+    ...mapActions(['getAllCityList']),
+    ...mapActions('wxAuthorize', [
+      'getLoadingCityInfoByLocationLv4'
+    ]),
+    ...mapMutations(['setCityInfo']),
+
+    async getCityInfoByLocation(options, cb) {
+      try {
+        this.$xdLog.setProject('Layout.getCity.start.open.in', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...options
+        });
+        let locationInfo = await this.getLoadingCityInfoByLocationLv4(options);
+        storage.set('console_Layout.getCity.done',locationInfo)
+        this.$xdLog.setProject('Layout.getCity.done', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...locationInfo
+        });
+        cb(locationInfo);
+      } catch (e) {
+        storage.set('aaa_Layout.getCity.fail',1)
+        this.$xdLog.setProject('Layout.getCity.fail', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...this.$settings.defaultCity
+        });
+        cb({data: this.$settings.defaultCity})
+      }
+    },
+
+    setDefaultCityData(defaultCity, local){
+      if(!defaultCity.isDefault){
+        storage.set(this.currentLocationCity, defaultCity, .5);
+      }
+      //用户首次定位成功设置系统自动给用户选中一个城市
+      if (!storage.get(this.useSelectCity)) {
+        this.setCityInfo(defaultCity)
+      }
+    },
+
+    timeoutLocation(location){
+      this.timeoutLocationTime = setTimeout(()=>{
+        this.setDefaultCityData(this.$settings.defaultCity);
+        this.$xdLog.setProject('Layout.getCity.timeout.5s', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+          ...this.$settings.defaultCity,
+          ...location
+        });
+        this.locationStatus = true;
+        this.timeoutLocationStatus = true;
+      }, 3000)
+    },
+
+    handleLocationDone(location) {
+      this.$xdLog.setProject('Layout.getCity.start', {
+        time: new Date().getTime(),
+        timeString: new Date().toLocaleString(),
+        statue:this.locationStatus,
+        ...location
+      });
+
+      //从缓存定位到的城市
+      if(storage.get(this.currentLocationCity)) {
+        this.locationStatus = true;
+        return;
+      }
+
+      //通过接口获取定位城市信息
+      this.$xdLog.setProject('Layout.getCity.start.send', {
+        time: new Date().getTime(),
+        timeString: new Date().toLocaleString(),
+      });
+
+      this.getCityInfoByLocation(location, (res)=>{
+        if (this.timeoutLocationStatus) return;
+        this.setDefaultCityData(res.data);
+        this.$xdLog.setProject('Layout.location.done', {
+          time: new Date().getTime(),
+          timeString: new Date().toLocaleString(),
+        });
+        if(this.timeoutLocationTime) {
+          clearTimeout(this.timeoutLocationTime);
+          this.timeoutLocationTime = null;
+          this.timeoutLocationStatus = false;
+        }
+
+        this.locationStatus = true;
+      });
+
+      this.timeoutLocation(location);
+    },
+  }
+}