jufubao-base 1.0.168 → 1.0.169-beta10

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 = 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,45 @@ export default {
           },
         });
       }
+      else if(item.action === 'delete'){
+        this.$xdConfirm({
+          styles: this.styles,
+          content: "订单删除后将无法找到订单<br/>您确认删除吗？",
+          cancelText:'我在看看',
+          isHtml: true,
+          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/JfbBaseTfkCardBind/Api.js

@@ -6,53 +6,72 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'getTfkByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'qrcodeCardBind',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+    title: '根据二维码绑定卡',
+    prefix: 'qrcode',
+    path: '/card/v1/card-bind/bind-card-by-qrcode',
+    data: {
+      card_qrcode: ['二维码内容', 'String', '必选'],
     },
-    isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'updateTfkFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getByPwdCardDetail',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+    title: '根据卡号密码获得卡信息',
+    prefix: 'detal',
+    path: '/card/v1/card-bind/get-card-by-password',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+      card_password: ['卡号密码', 'String', '必选']
     },
-    isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'removeTfkFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getByQrCardDetail',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    title: '根据二维码获得卡信息',
+    prefix: 'detal',
+    path: '/card/v1/card-bind/get-card-by-qrcode',
+    data: {
+      card_qrcode: ['二维码', 'String', '必选'],
     },
-    isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'addTfkFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'pwdCardBind',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    title: '根据卡号密码绑定卡',
+    prefix: 'pwd',
+    path: '/card/v1/card-bind/bind-card-by-password',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+      card_password: ['密码', 'String', '可选'],
+    },
+    disabled: true,
+  },
+  {
+    mapFnName: 'qrCardBind',
+    isRule: false,
+    title: '根据二维码绑定卡',
+    prefix: 'qrcode',
+    path: '/card/v1/card-bind/bind-card-by-qrcode',
+    data: {
+      card_qrcode: ['二维码', 'String', '必选'],
     },
-    isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "checkValidCode",
+    title: "图片验证码 - 校验",
+    path: "/common/v1/valid_code/image/check",
+    isRule: false,
+    data: {
+      token: ['随机请求码，前端生成', 'String', '必选'],
+      valid_code: ['验证码', 'String', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];