jufubao-base 1.0.267 → 1.0.269-beta1

package/src/components/JfbBaseConsumpCode/XdDeductSort.vue

@@ -0,0 +1,221 @@
+<template>
+  <view class="xd-deduct-sort">
+    <view class="sort_header">
+      <view class="sort_title">优先支付管理</view>
+      <view @click="handleClose">
+        <xd-font-icon icon="iconguanbi" :size="40"></xd-font-icon>
+      </view>
+    </view>
+    <view class="drag_header">
+      <view>将按以下顺序支付</view>
+      <!-- #ifdef H5  -->
+      <view>长按拖动</view>
+      <!-- #endif -->
+    </view>
+    
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="deduct_item" v-for="(item, i) in uiList" :key="item.pay_method">
+      <view class="deduct_title">
+        <view class="t_l">
+          <view style="padding: 20rpx;" @click.stop="setItemExpand(item)">
+            <xd-font-icon :icon="item.expand ? 'iconzhankai-shang' : 'iconzhankai-xia'" color="#FFFFFF" :size="40"></xd-font-icon>
+          </view>
+          {{ item.pay_method_name }}
+        </view>
+        <view class="mp_arrow">
+          <view style="padding:20rpx;margin-right: 20rpx;" @click="moveParent(i, 'up', item)">
+            <xd-font-icon icon='iconrepository-xialaxuanxiangup' :size="28"
+            ></xd-font-icon>
+          </view>
+          <view style="padding:20rpx;" @click="moveParent(i, 'down', item)">
+            <xd-font-icon icon='iconrepository-xialaxuanxiangdown' :size="28"
+            ></xd-font-icon>
+          </view>
+        </view>
+      </view>
+      <view class="deduct_list" v-show="item.expand">
+        <view class="deduct_in_item" v-for="(sub, ii) in item.options" :key="sub.value">
+          <view class="in_label">
+            {{ sub.label }}
+          </view>
+          <view class="mp_arrow">
+            <view style="padding:20rpx;margin-right: 20rpx;" @click="moveSub(i, ii, 'up', sub)">
+              <xd-font-icon icon='iconrepository-xialaxuanxiangup' :size="28"
+              ></xd-font-icon>
+            </view>
+            <view style="padding:20rpx;" @click="moveSub(i, ii, 'down', sub)">
+              <xd-font-icon icon='iconrepository-xialaxuanxiangdown' :size="28"
+              ></xd-font-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- #endif -->
+
+    <!-- #ifdef H5 -->
+    <draggable
+      v-model="uiList"
+      @input="inputList"
+      v-bind="{
+        handle: '.t_l'
+      }"
+    >
+      <view class="deduct_item" v-for="item in uiList" :key="item.id">
+        <view class="deduct_title">
+          <view class="t_l">
+            <view>{{ item.pay_method_name }}</view>
+            <xd-font-icon icon='iconyidong' style="margin-right: 60rpx;"></xd-font-icon>
+          </view>
+        </view>
+      </view>
+    </draggable>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  // #ifdef H5
+  import draggable from "vuedraggable";
+  // #endif
+  export default {
+    components: {
+      XdFontIcon,
+      // #ifdef H5
+      draggable,
+      // #endif
+    },
+    props: {
+      list: Array,
+    },
+    data() {
+      return {
+        uiList: [],
+      };
+    },
+    created() {
+      this.uiList = this.list;
+    },
+    methods: {
+      handleClose(){
+        this.$emit("onClose")
+      },
+      inputList(val) {
+        this.$emit("onChange", this.uiList);
+      },
+      setItemExpand(item){
+        this.$set(item, 'expand', !item.expand)
+      },
+      moveParent(index, type, item){
+        console.log(item, index, type)
+        if(type === 'up'){
+          if(index === 0){
+            return;
+          }else{
+            let temp = this.uiList[index];
+            this.$set(this.uiList, index, this.uiList[index - 1]);
+            this.$set(this.uiList, index - 1, temp);
+          }
+        }else if(type === 'down'){
+          if(index === this.uiList.length - 1){
+            return;
+          }else{
+            let temp = this.uiList[index];
+            this.$set(this.uiList, index, this.uiList[index + 1]);
+            this.$set(this.uiList, index + 1, temp);
+          }
+        }
+
+        this.inputList();
+      },
+      moveSub(pIndex, sIndex, type, ssssub){
+        console.log(ssssub, sIndex, type, 'sssssub')
+        if(type === 'up'){
+          if(sIndex === 0){
+            return;
+          }else{
+            let temp = this.uiList[pIndex].options[sIndex];
+            this.$set(this.uiList[pIndex].options, sIndex, this.uiList[pIndex].options[sIndex - 1]);
+            this.$set(this.uiList[pIndex].options, sIndex - 1, temp);
+          }
+        }else if(type === 'down'){
+          if(sIndex === this.uiList[pIndex].options.length - 1){
+            return;
+          }else{
+            let temp = this.uiList[pIndex].options[sIndex];
+            this.$set(this.uiList[pIndex].options, sIndex, this.uiList[pIndex].options[sIndex + 1]);
+            this.$set(this.uiList[pIndex].options, sIndex + 1, temp);
+          }
+        }
+        this.inputList();
+      }
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+  .xd-deduct-sort{
+    .sort_header{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 36rpx 40rpx;
+      font-size: 32rpx;
+      color: #333333;
+    }
+    .drag_header{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 24rpx 40rpx;
+      font-size: 24rpx;
+      color: #999999;
+      background-color: #F7F7F7;
+    }
+    .deduct_item{
+      font-size: 28rpx;
+      .deduct_title{
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background-color: #F7F7F7;
+        color: #333333;
+        padding: 0 0rpx 0 60rpx;
+        
+        .t_l{
+          display: flex;
+          align-items: center;
+          flex: 1;
+          // #ifdef H5
+          justify-content: space-between;
+          // #endif
+        }
+        .mp_arrow{
+          display: flex;
+          flex-direction: row;
+          margin-right: 16rpx;
+        }
+      }
+      .deduct_in_item{
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background-color: #FFF1E3;
+        color: #FF8D1A;
+        padding: 0 0 0 80rpx;
+        .in_label{
+          flex: 1;
+        }
+        .mp_arrow{
+          display: flex;
+          flex-direction: row;
+          margin-right: 16rpx;
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseConsumpCode/shopList.vue

@@ -0,0 +1,242 @@
+<template>
+  <view class="chose_shop_list">
+    <view class="chose_location">
+      <view class="title">请确认所在门店</view>
+      <view class="city_name" @click="handleCityChange">
+        <xd-city-show
+          city-location-type="baidu"
+          @done="handleCityDone"
+          color="#FFFFFF">
+        </xd-city-show>
+        <xd-font-icon icon="iconxia_down" :size="26" color="#FFFFFF"></xd-font-icon>
+      </view>
+    </view>
+    <view class="shop_list" v-if="list && list.length">
+      <view
+        class="shop_item"
+        v-for="(item,i) in list"
+        :key="item.shop_id"
+        @click="$emit('onChose', item)"
+      >
+        <view class="shop_image">
+          <image :src="item.shop_icon" />
+        </view>
+        <view class="shop_info">
+          <view class="shop_name">
+            <view class="_name">{{ item.resource_shop_name }}</view>
+            <view class="distance" v-if='item.distance'>{{ item.distance }}</view>
+          </view>
+          <view class='shop_addr'>{{ item.address }}</view>
+        </view>
+      </view>
+      <view class='chose_other' @click='toChoseOther'>
+        选择其他门店 <xd-font-icon icon='iconxiangyou_xian' :size='24' color="#666666" style='margin: 2px 0 0 4px;'></xd-font-icon>
+      </view>
+    </view>
+    <view v-else class="empty_data">
+      <xd-no-data icon-type="shop" height="100%">附近暂无推荐门店</xd-no-data>
+    </view>
+  </view>
+</template>
+<script>
+import XdCityShow from "@/components/XdCityShowApi/XdCityShowApi"
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
+import XdNoData from "@/components/XdNoData/XdNoData"
+import getServiceUrl from "@/common/getServiceUrl";
+import { mapState } from 'vuex';
+export default {
+  // #ifdef MP-WEIXIN
+  options: { styleIsolation: 'shared' },
+  // #endif
+  components: {
+    XdCityShow,
+    XdFontIcon,
+    XdNoData
+  },
+  props: {
+    getCityInfoByLocation: {
+      type: Function
+    },
+    getList: {
+      type: Function
+    }
+  },
+  data(){
+    return {
+      list: [],
+      city: null,
+      keyword: '',
+      timer: null,
+    }
+  },
+  computed: {
+    ...mapState({
+      stateCity: state => state.cityLocation.city,
+      stateLocation: state => state.cityLocation.location || {},
+    }),
+  },
+  created(){
+    this.p_getList();
+  },
+  methods: {
+    p_getList(){
+      let data = {
+        city_code: this.stateCity.city_code,
+        page_token: 1,
+        page_size: 2,
+      }
+      this.getList(data).then(list => {
+        console.log(list, 'this.getList')
+        this.list = list.map(item => {
+          item.shop_icon = getServiceUrl(item.shop_icon);
+          return item;
+        });
+      });
+    },
+    handleInput(e){
+      if(this.timer) clearTimeout(this.timer);
+      this.timer = setTimeout(()=>{
+        this.$emit('on-search', e.detail.value)
+      },500)
+    },
+
+    /***
+     * @description 定位完成事件
+     * @param city
+     */
+    handleCityDone(city) {
+      if((this.city && this.city.city_code) == city.city_code) return false;
+      this.city = city;
+      this.$emit('handleCityDone', city)
+    },
+
+    handleCityChange() {
+      this.$emit("handleCityChange");
+    },
+    toChoseOther(){
+      this.$emit('toChoseOther')
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .chose_shop_list{
+    background: #F7F7F7;
+    position: relative;
+    // height: calc(60vh - 164rpx);
+  }
+
+  .chose_location{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: #999999;
+    background: #FFFFFF;
+    padding: 20rpx 40rpx;
+    border-radius: 16rpx 16rpx 0 0;
+    border-bottom: 1px solid #DDD;
+
+    .title{
+      font-size: 32rpx;
+      color: #333;
+      font-weight: 500;
+    }
+    .city_name{
+      padding-right: 24rpx;
+      display: flex;
+      align-items: center;
+      background-color: #333333;
+      border-radius: 40rpx;
+
+      ::v-deep .xd-city__name-icon{
+        display: none;
+      }
+    }
+  }
+  .switch_city{
+    display: flex;
+    align-items: center;
+    font-size: 28rpx;
+  }
+  .empty_data{
+    height: calc(60vh - 164rpx);
+  }
+  .shop_list{
+    padding: 32rpx;
+    height: calc(60vh - 164rpx);
+    overflow-y: auto;
+    background: #F7F7F7;
+    position: relative;
+    .chose_other{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: #666666;
+      font-size: 24rpx;
+      height: 60rpx;
+      position: absolute;
+      bottom: 40rpx;
+      width: 100%;
+      box-sizing: border-box;
+      left: 0;
+    }
+    .shop_item{
+      display: flex;
+      background: #FFFFFF;
+      padding: 20rpx;
+      margin-bottom: 20rpx;
+    }
+    .shop_image{
+      width: 200rpx;
+      height: 200rpx;
+      background: #fefefe;
+      border-radius: 20rpx;
+      overflow: hidden;
+      image{
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .shop_info{
+      display: flex;
+      flex-direction: column;
+      width: 200rpx;
+      flex: 1;
+      margin-left: 24rpx;
+      .shop_addr{
+        color: #999999;
+        font-size: 24rpx;
+      }
+    }
+    .shop_name{
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      font-size: 32rpx;
+      color: #242424;
+      height: 120rpx;
+      ._name{
+        flex: 1;
+        width: 200rpx;
+        .uni-break-word()
+      }
+      .distance{
+        color: #666666;
+        padding: 4rpx 0;
+        font-size: 24rpx;
+      }
+    }
+    .shop_sub{
+      display: flex;
+      color: #999999;
+      font-size: 24rpx;
+      margin-top: 20rpx;
+      line-height: 1.6;
+      ._icon{
+        width: 40rpx;
+        line-height: 1;
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -605,6 +605,11 @@ export default {
     },
 
     onJfbLoad(options) {
+      // T3634 通过二维码进入体验模式
+      if(options.preview_code || options.experience_code){
+        this.previewAccout = options.preview_code || options.experience_code;
+        this.dialogPreview = true;
+      }
       if(options['x-share']){
         let decodeParams = Base64.decode(options['x-share']);
         try{

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -25,6 +25,7 @@
         <view class="jfb-base-personal-data__body-item-label">名称</view>
         <!--#ifdef MP-->
         <input
+          style="width: 100%;"
           @change="handleWxSetInfo"
           class="jfb-base-personal-data__body-item-value"
           v-model="info.nickname"
@@ -33,6 +34,7 @@
         <!-- #endif -->
         <!--#ifdef H5-->
         <input
+          style="width: 100%;"
           @blur="handleSetInfo"
           @confirm="handleSetInfo"
           class="jfb-base-personal-data__body-item-value"
@@ -51,6 +53,8 @@
           :defaultValue="info.sex"
           v-model="info.sex"
           :list="sexList"
+          width="100%"
+          justifyContent="flex-end"
         >
           <template>
             <view class="jfb-base-personal-data__body-item-value">
@@ -66,7 +70,7 @@
       </view>
       <view class="jfb-base-personal-data__body-item">
         <view class="jfb-base-personal-data__body-item-label">生日</view>
-        <view style="display: flex;align-items: center" @click="showDate=true">
+        <view style="display: flex;align-items: center;width: 100%;justify-content: flex-end;" @click="showDate=true">
           <view class="jfb-base-personal-data__body-item-value">{{info.birthday_date}}</view>
           <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
         </view>
@@ -239,6 +243,7 @@
         &-label {
           color: #333;
           font-size: 28rpx;
+          width: 100rpx;
         }
 
         &-value {

package/src/components/JfbBasePoster/Attr.js

@@ -375,6 +375,17 @@ export default {
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,
       },
+      {
+        label: "广告位前后项露出一部分:",
+        ele: "xd-radio",
+        valueKey: "nearbyMargin",
+        value: params['nearbyMargin'] || "N",
+        list: [
+          { label: "不显示", value: "N"},
+          { label: "显示", value: "Y"}
+        ],
+        groupKey: 'content',
+      },
       (params.poster && params.poster['type'] && params.poster['type'] !== '1') && params['isCarousel'] === 2 && {
         label: '广告位内容显示行数:',
         ele: 'xd-radio',