jufubao-base 1.0.169-beta4 → 1.0.169-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.169-beta4",
+  "version": "1.0.169-beta5",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseMapSearch/MapSearchMp.vue

@@ -46,7 +46,7 @@
 			this.BMap = new bmap.BMapWX({
 				ak: this.ak
 			})
-			uni.getLocation({
+			wx.getFuzzyLocation({
 				type: "gcj08",
 				success: res => {
 					console.log("getLocation", res);

package/src/components/JfbBaseOrderDetail/Api.js

@@ -1,13 +1,7 @@
 'use strict';
 
 /**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
+ * @description 订单详情模块
  * @type {*[]}
  */
 module.exports = [
@@ -45,4 +39,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'deleteBaseOrder', //自定义方法名字（必选）
+    title: '删除订单',
+    path: '/order/v1/order/delete-main-order',
+    isRule: false,
+    data: {
+      main_order_id: ['id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -22,20 +22,6 @@ export default {
         inline: false,
         notice: '前台页面展示会根据返回数据类型进行页面渲染'
       },
-      {
-        label: '是否需要客服电话:',
-        ele: 'xd-radio',
-        valueKey: 'is_hot',
-        value: data['is_hot'] || 'N',
-        groupKey:'content',
-        placeholder: '请选择是否需要客服电话',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
-      },
       {
         label: '自定义内容:',
         ele: 'xd-site-news',
@@ -260,6 +246,20 @@ export default {
           }
         },
       },
+      {
+        label: '是否需要客服电话:',
+        ele: 'xd-radio',
+        valueKey: 'is_hot',
+        value: data['is_hot'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否需要客服电话',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         label: "是否展示可用门店:",
         ele: 'xd-radio',
@@ -274,6 +274,20 @@ export default {
           { label: '否', value: 'N' },
         ]
       },
+      {
+        label: "是否允许删除订单:",
+        ele: 'xd-radio',
+        valueKey: "is_show_delete_order",
+        value: data['is_show_delete_order'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否允许删除订单',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '允许', value: 'Y' },
+          { label: '不允许', value: 'N' },
+        ]
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -683,9 +683,8 @@
           <view v-else>
             <xd-button
               size="small"
-              type="primary"
+              :type="item.type !== undefined ? item.type: 'primary'"
               radius="40rpx"
-              :bg-color="mainColor"
               @click="handleAction(item)"
             >{{ item.text }}</xd-button>
           </view>
@@ -741,6 +740,7 @@ import { mapState } from "vuex";
 import bizMock from "./bizMock";
 import Color from "color";
 
+
 export default {
   name: "JfbBaseOrderDetail",
   components: {
@@ -774,6 +774,7 @@ export default {
       is_not_show_price: "",
       brandTextColor:'',
       is_show_support_shop: "",
+      is_show_delete_order:'N', //删除订单
 
       showPassword: false,
       dialogPassword: "",
@@ -822,6 +823,11 @@ export default {
         this.getOrderDetail();
       }
     },
+    is_show_delete_order(){
+      if (this.isPreview) {
+        this.getOrderDetail();
+      }
+    },
   },
   computed: {
     ...mapState(['siteInfo']),
@@ -857,8 +863,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.main_order_id =
-        options.id || options.order_id || options.main_order_id;
+      this.main_order_id = options.id || options.order_id || options.main_order_id;
       this.getOrderDetail();
     },
 
@@ -993,6 +998,20 @@ export default {
             ).fullTime;
             res.film_show.thumb = getServiceUrl(res.film_show.thumb);
           }
+
+          //增加删除订单按钮
+          if(this.is_show_delete_order  === 'Y') {
+            let pay = (res.buttons||[]).filter(item => item.action === 'pay');
+            let del = [{action:'delete', text:'删除订单', type: 'info'}];
+            if(pay.length === 1) del = []
+            res.buttons = del.concat(res.buttons || []).map(item=>{
+              if(item.action === 'view_logistics' && !item.type) {
+                item.type = 'default';
+              }
+              return item
+            });
+          }
+
           if (res.product) {
             jfbRootExec("getBaseProductDetail", {
               vm: this,
@@ -1011,7 +1030,8 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
-          } else {
+          }
+          else {
             this.info = res;
             if (this.info.status.loading_timeout != "-1") {
               this.timeDown();
@@ -1051,6 +1071,7 @@ export default {
       this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
+      this.is_show_delete_order = 'Y'//getContainerPropsValue(container, "content.is_show_delete_order", "N");
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1135,25 +1156,15 @@ export default {
     },
     handleAction(item) {
       if (item.action === "view_logistics") {
-        // if (
-        //   this.info.extras.first_logistics_package_id &&
-        //   this.info.extras.logistics_count === 1
-        // ) {
-        //   this.$xdUniHelper.navigateTo({
-        //     url: `${this.logisticsPath}?package_id=${this.info.extras.first_logistics_package_id}`,
-        //   });
-        // } else {
-        //   this.$xdUniHelper.navigateTo({
-        //     url: `${this.packageListPath}?order_id=${this.main_order_id}`,
-        //   });
-        // }
         this.$xdUniHelper.navigateTo({
           url: `${this.packageListPath}?order_id=${this.main_order_id}`,
         });
-      } else {
+      }
+      else if(item.action === 'cancel_unpaid') {
         this.$xdConfirm({
           styles: this.styles,
           content: "是否取消订单",
+          zIndex: 3000,
           success: (action) => {
             if (action.confirm) {
               jfbRootExec("cancelBaseOrder", {
@@ -1175,6 +1186,43 @@ export default {
           },
         });
       }
+      else if(item.action === 'delete'){
+        this.$xdConfirm({
+          styles: this.styles,
+          content: "是否要删除当前订单吗？",
+          zIndex: 3000,
+          success: (action) => {
+            if (action.confirm) {
+              this.handleDeleteOrder();
+            }
+          },
+        });
+      }
+      else {
+        console.error(`item.action=${item.action}, 此action不可用`)
+      }
+    },
+
+    handleDeleteOrder(){
+      jfbRootExec("deleteBaseOrder", {
+        vm: this,
+        data: {
+          main_order_id: this.main_order_id,
+        },
+      })
+        .then((res) => {
+          this.$xdAlert({
+            content: "删除成功",
+            time: 2000,
+            zIndex: 3000,
+          });
+          setTimeout(()=>{
+            this.$xdUniHelper.navigateBack()
+          },3000)
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
     },
 
     onJfbShow(options) {

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -95,5 +95,7 @@ module.exports = {
       "shop_address": "北京3北京西夏区城区河北省廊坊市三河市燕郊开发区燕高路西侧实验小学南侧 "
     },
     "request_id": "6178d3499b91f274"
-  }
+  },
+  cancelBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
+  deleteBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
 }

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -1,4 +1,5 @@
 'use strict';
+import CusAttr from "./CusAttr";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -8,50 +9,36 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgcolor',
-        value: data.bgcolor || '',
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80',
+        label: '是否支持聚好兑:',
+        ele: 'xd-radio',
+        valueKey: 'isShowExchange',
+        value: data['isShowExchange'] || "N",
+        groupKey:'content',
         rules: [
-          {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
-          },
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "支持", "value": "Y"},
+          {"label": "不支持", "value": "N"},
         ]
       },
       {
-        label: '选中路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      data.bgcolor && {
-        label: '高度:',
+        label: '外边间距:',
         ele: 'el-input',
         type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80',
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        groupKey:'style',
+        valueKey: 'outSpacing',
+        value: data['outSpacing'] || '',
+        notice: '外边间距设置，单位：像素，默认值：<span style="color:red">20</span> px',
+        inline: false,
+        className: 'input60',
       },
+
+      //todo
+
+
+      //列表相关属性
+      ...CusAttr(data),
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseTfkSearch/ContentCinema.vue

@@ -0,0 +1,147 @@
+<template>
+  <view class="content" @click="handleCinemaDetail">
+    <view class="title">{{item['cinema_name']}}</view>
+    <view class="address">{{item['address']}}</view>
+    <view class="bottom">
+      <view class="distance">
+        <template v-if="item['distance']">
+          <xd-font-icon size="26" icon="icondizhi" :color="color.SEAT"></xd-font-icon>
+          <text :style="{color: color.SEAT}">{{item['distance']}}</text>
+        </template>
+      </view>
+      <view class="btn">
+        <!--不展示核销类型【SELL】-->
+        <view
+          v-for="(name,index) in item['cinema_type_name']"
+          v-if="item['cinema_type'][index] !== 'SELL'"
+          :key="index"
+          @click.stop="handleBtn(item['cinema_type'][index])"
+          :style="{
+            backgroundColor:color[item['cinema_type'][index]],
+            color:'#fff'
+          }">{{name}}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdButton from "@/components/XdButton/XdButton.vue";
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon.vue";
+
+  export default {
+    name:'ContentCinema',
+    components:{
+      XdButton,
+      XdFontIcon
+    },
+    props:{
+      item:Object,
+      color: {
+        type: Object,
+        default: {}
+      },
+
+    },
+    data(){
+      return {
+
+      }
+    },
+    created() {
+
+    },
+    methods:{
+      handleCinemaDetail(){
+        //优先在线选座
+        if(this.item['cinema_type'].includes('SEAT')) {
+          this.handleSchedule();
+          return
+        }
+        if(this.item['cinema_type'].includes('CODE')) {
+          this.handleCodeDetail();
+          return
+        }
+        if(this.item['cinema_type'].includes('SELL')) {
+          this.handleCashierDetail();
+          return
+        }
+        console.error(`${JSON.stringify(this.item['cinema_type'])}`)
+      },
+
+      handleBtn(code){
+        if(code === 'SEAT') this.handleSchedule();
+        else if(code === 'CODE') this.handleCodeDetail();
+        else if(code === 'SELL') this.handleCashierDetail();
+        else console.error(`${JSON.stringify(this.item['cinema_type'])}`)
+      },
+
+      //电子码
+      handleCodeDetail(){
+        console.warn(`handleCodeDetail`)
+        this.$emit('on-code-detail', this.item);
+      },
+      //核销
+      handleCashierDetail(){
+        console.warn(`handleCashierDetail`)
+        this.$emit('on-cashier-detail', this.item);
+      },
+
+      //选座排期
+      handleSchedule(){
+        console.warn(`handleSchedule`)
+        this.$emit('on-schedule', this.item);
+      },
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.content {
+  .title {
+    font-size: 32rpx;
+    line-height: 40rpx;
+    margin-bottom: 20rpx;
+    color: #333;
+    font-weight: 500;
+  }
+  .address {
+    font-size: 24rpx;
+    line-height: 30rpx;
+    color: #999;
+    margin-bottom: 15rpx;
+  }
+
+  .bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 30rpx;
+
+    & > .distance {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      & > text {
+        margin-left: 10rpx;
+        font-size: 24rpx;
+      }
+    }
+
+    & > .btn {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+
+      & > view {
+        margin-left: 10rpx;
+        padding: 0 30rpx;
+        line-height: 60rpx;
+        border-radius: 30rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+}
+</style>

package/src/components/JfbBaseTfkSearch/ContentItem.vue

@@ -0,0 +1,165 @@
+<template>
+  <view class="content" @click="handleDetail(item)">
+    <view
+      class="image"
+      :style="{marginRight: outSpacing + 'rpx',borderRadius:borderRadius+'rpx'}"
+    >
+      <image :src="item['poster']"  :alt="item['show_name']"></image>
+    </view>
+    <view class="middle">
+      <view class="name">{{item['show_name']}}</view>
+      <view class="other">类型：{{item['type']}}</view>
+      <view class="other">导演：{{item['director']}}</view>
+      <view class="other">主演：{{item['leading_role']}}</view>
+    </view>
+    <view class="right">
+      <view class="score">
+        <template v-if="item['remark']">
+          <text>评分：</text><text :style="{color:color}">{{item['remark']}}</text>
+        </template>
+      </view>
+      <view class="btn">
+        <template v-if="type === 'hot'">
+          <xd-button
+            v-if="item['show_button'] === '1'"
+            type="primary"
+            style="display:block;"
+            size="small"
+            @click.stop="handleBuy(item)">购票</xd-button>
+          <xd-button
+            v-else-if="item['show_button'] === '2'"
+            type="subPrimary"
+            style="display:block;"
+            size="small"
+            @click="handleBuy(item)">预售</xd-button>
+        </template>
+        <template v-if="type === 'rightnow'">
+          <xd-button
+            v-if="item['show_button'] === '3'"
+            type="success"
+            style="display:block;"
+            size="small"
+            @click.stop="handleDetail(item)"
+          >想看</xd-button>
+          <xd-button
+            v-else-if="item['show_button'] === '2'"
+            type="subPrimary"
+            style="display:block;"
+            size="small"
+            @click.stop="handleBuy(item)">预售</xd-button>
+        </template>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdButton from "@/components/XdButton/XdButton.vue";
+
+  export default {
+    name:'ContentItem',
+    components:{
+      XdButton
+    },
+    props:{
+      item:Object,
+      outSpacing: {
+        type: Number|String,
+        default: 20
+      },
+      color: {
+        type: String,
+        default: ''
+      },
+      type:{
+        type: String,
+        default: 'hot'
+      },
+      borderRadius:{
+        type: String,
+        default: '10'
+      }
+
+    },
+    created() {
+
+    },
+    methods:{
+      handleDetail(item){
+        console.log('handleDetail.item',item,item.id);
+        this.$emit('on-film-detail',item.id);
+      },
+      handleBuy(item){
+        console.log('handleDetail.item',item,item.id);
+        this.$emit('on-buy',item.id);
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .image {
+    width: 160rpx;
+    height: 240rpx;
+    flex-shrink: 0;
+    overflow: hidden;
+
+    & > image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .middle {
+    flex: 1;
+    & .name {
+      font-size: 36rpx;
+      font-weight: 600;
+      margin-bottom: 20rpx;
+      .uni-max-cut(2, 90);
+      line-height: 45rpx;
+    }
+
+    & .other {
+      font-size: 25rpx;
+      color: #999;
+      .uni-max-cut(1,36);
+      line-height: 36rpx;
+      margin-bottom: 10rpx;
+      &:last-child {
+        margin-bottom: 0!important;
+      }
+    }
+  }
+
+  .right {
+    flex-shrink: 0;
+    display: flex;
+    align-content: space-between;
+    align-items: flex-end;
+    justify-content: flex-end;
+    flex-flow: wrap;
+    height: 100%;
+    box-sizing: border-box;
+    width: 160rpx;
+
+    & .score {
+      height: 40rpx;
+      width:100%;
+      text-align: right;
+      & > text:nth-child(1) {
+        font-size: 20rpx;
+      }
+      & > text:nth-child(2) {
+        font-size: 28rpx;
+      }
+
+    }
+
+  }
+}
+</style>