jufubao-base 1.0.222-beta1 → 1.0.222-beta2

package/src/components/JfbBaseAfterSales/refundOrderInfo.vue

@@ -0,0 +1,96 @@
+<template>
+  <view class="order_info">
+    <view class="order_number">订单号：{{ orderNumber }}</view>
+    <view class="prod_list">
+      <view class="prod_item" v-for="(item, i) in list" :key="i">
+        <view class="prod_img">
+          <image :src="item.product_thumb" mode="aspectFit"></image>
+        </view>
+        <view class="prod_info">
+          <view class="prod_title">{{ item.product_name }}</view>
+          <view class="prod_number">申请数量：×{{ item.product_num }}</view>
+        </view>
+        <view v-if="showRadio" style="margin-left: 10rpx;">
+          <xd-radio></xd-radio>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdRadio from "@/components/XdRadio/XdRadio"
+  import XdNumber from "@/components/XdNumber/XdNumber";
+  export default {
+    components: {
+      XdRadio,
+      XdNumber
+    },
+    props: {
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      orderNumber: {
+        type: String,
+        default: ""
+      },
+      showRadio: {
+        type: Boolean,
+        default: false
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .order_info{
+    background-color: #FFFFFF;
+    margin-top: 20rpx;
+    border-radius: 16rpx;
+    font-size: 24rpx;
+    padding: 32rpx;
+    .order_number{
+      padding-bottom: 24rpx;
+      border-bottom: 1px solid #F2F2F2;
+      margin-bottom: 32rpx;
+    }
+    .prod_item{
+      display: flex;
+      align-items: center;
+      margin-bottom: 40rpx;
+      &:last-child{
+        margin-bottom: 0;
+      }
+      .prod_img{
+        width: 140rpx;
+        height: 140rpx;
+        border-radius: 16rpx;
+        background-color: #F0F0F0;
+        image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .prod_info{
+        margin-left: 20rpx;
+        flex: 1;
+        align-self: stretch;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        .prod_title{
+          margin-bottom: 10rpx;
+          font-size: 28rpx;
+          color: #333333;
+        }
+        .prod_number{
+          color: #999999;
+          font-size: 24rpx;
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseAfterSalesDetail/Api.js

@@ -6,51 +6,34 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：After
-    mapFnName: 'getAfterByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: "getAfterServiceOrder",
+    path: "/aftersale/v1/service-order/get",
+    title: "服务单详情",
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      service_order_id: ['服务单订单号', 'String', true],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：After
-    mapFnName: 'updateAfterFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "delAfterServiceOrder",
+    path: "/aftersale/v1/service-order/del",
+    title: "删除服务单",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      service_order_id: ['服务单订单号', 'String', true],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：After
-    mapFnName: 'removeAfterFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "cancelAfterServiceOrder",
+    path: "/aftersale/v1/service-order/cancel",
+    title: "服务单取消",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：After
-    mapFnName: 'addAfterFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      service_order_id: ['服务单订单号', 'String', true],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseAfterSalesDetail/Attr.js

@@ -7,41 +7,7 @@ export default {
   style: [],
   content: (data) => {
     return [
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
-      },
-      {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input60',
-      },
-      {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
+      
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseAfterSalesDetail/JfbBaseAfterSalesDetail.vue

@@ -13,31 +13,151 @@
       <view class="jfb-base-after-sales-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-after-sales-detail__body">
-      <view>售后详情</view>
+    <view v-if="loaded" class="jfb-base-after-sales-detail__body" :style="{
+      minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
+      '--main-color': mainColor
+    }">
+      <view class="service_progress">
+        <view class="service_head">
+          <view>服务进度</view>
+          <view class="head_sub">服务单已提交申请，待平台受理</view>
+        </view>
+        <view class="service_step">
+          <template v-for="(step, i) in stepList">
+            <view v-if="step.key==='line'" :key="i" class="step_line"></view>
+            <view v-else class="step_item" :key="'1' + i">
+              <view>
+                <xd-font-icon v-if="step.is_finish" icon="icondui_fill" :size="28" color="#FFFFFF"></xd-font-icon>
+                <view v-else class="step_radio"></view>
+              </view>
+              <view class="step_text">{{ step.name }}</view>
+            </view>
+          </template>
+        </view>
+      </view>
+
+      <view style="margin-top: -100rpx;padding: 20rpx;">
+
+        <!-- 物流信息 -->
+        <view class="refund_section" v-if="logisticsInfo.length">
+          <view class="sec_title">物流信息</view>
+          <view class="sec_body">
+            <view class="sec_item" v-for="(item, i) in logisticsInfo" :key="i">
+              <view class="sec_l">
+                <view>{{item.label}}：</view>
+                <view style="color: #333333;">{{ item.value }}</view>
+              </view>
+              <view class="sec_r">
+                <view v-if="item.copy" class="_copy" @click="handleCopy(item.value)">复制</view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 物流信息、退款明细 -->
+        <view class="refund_section" v-if="refundInfo.length">
+          <view class="sec_title">退款明细</view>
+          <view class="sec_body">
+            <view class="sec_item" v-for="(item, i) in refundInfo" :key="i">
+              <view class="sec_l">
+                <view>{{ item.label }}<text v-if="item.key !== 'price'">：</text></view>
+                <view v-if="item.key !== 'price'" style="color: #333333;">{{item.value}}</view>
+              </view>
+              <view class="sec_r">
+                <view v-if="item.key === 'price'">
+                  <xd-unit
+                    :price="item.value"
+                    :isOld="false"
+                    :fontSize="32"
+                    iconSize="0.4"
+                  ></xd-unit>
+                </view>
+                <view v-if="item.copy" class="_copy" @click="handleCopy(item.value)">复制</view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 新商品  -->
+        <view v-if="newProductList.length" class="refund_section">
+          <view class="sec_title">
+            <view class="sec_tag _new">新商品</view>
+          </view>
+          <view class="sec_body">
+            <SecProd v-for="(item,i) in newProductList" :key="i" :item="item"></SecProd>
+          </view>
+        </view>
+
+        <view class="refund_section">
+          <!-- 换货展示 -->
+          <view v-if="after_sale_method==='exchange'" class="sec_title">
+            <view class="sec_tag _refund">退/换商品</view>
+          </view>
+          <view v-if="refundProductList.length" class="sec_title">
+            <SecProd v-for="(item, i) in refundProductList" :key="i" :item="item"></SecProd>
+          </view>
+          <view class="sec_body">
+            <view class="sec_item" v-for="(item, i) in orderInfoList" :key="i">
+              <view class="sec_l">
+                <view>{{item.label}}：</view>
+                <view v-if="item.key=='img'" class="img_list">
+                  <view class="img_box" v-for="(img, ii) in item.value" :key="ii">
+                    <image :src="img" mode="aspectFit"></image>
+                  </view>
+                </view>
+                <view v-else class="sec_l_text" style="color: #333333;">{{item.value}}</view>
+              </view>
+              <view v-if="item.copy" class="sec_r" >
+                <view class="_copy" @click="handleCopy(item.value)">复制</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="bottom_fixed">
+        <view class="opt_btn primary" @click="handleCancel">撤销</view>
+        <view class="opt_btn" @click="handleDel">删除</view>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdRadio from "@/components/XdRadio/XdRadio"
+  import XdUnit from "@/components/XdUnit/XdUnit"
+  import XdButton from "@/components/XdButton/XdButton"
+  import SecProd from "./secProd.vue"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseAfterSalesDetailMixin from "./JfbBaseAfterSalesDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from "@/common/getServiceUrl";
   export default {
     name: "JfbBaseAfterSalesDetail",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdRadio,
+      XdUnit,
+      XdButton,
+      SecProd
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseAfterSalesDetailMixin
     ],
     data() {
       return {
-
+        stepList: [],
+        orderInfoList: [],
+        refundInfo: [],
+        logisticsInfo: [],
+        refundProductList: [],
+        newProductList: [],
         //todo
+        service_order_id: "",
+        after_sale_method: "",
+        loaded: false,
       }
     },
     watch: {
@@ -53,16 +173,8 @@
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.service_order_id = options.service_order_id;
+        this.p_getAfterServiceOrder();
       },
       /**
        * @description 监听事件变化
@@ -71,11 +183,137 @@
       init(container) {
 
         //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
         //this.height = getContainerPropsValue(container, 'content.height', 10);
       },
+      p_getAfterServiceOrder(){
+        this.$xdShowLoading({});
+        jfbRootExec("getAfterServiceOrder", {
+          vm: this,
+          data: {
+            service_order_id: this.service_order_id,
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          try{
+            var imgList = JSON.parse(res.refund_voucher);
+            imgList = imgList.map(item => {
+              return getServiceUrl(item)
+            })
+          }catch(e){imgList=[]}
+          this.orderInfoList = [
+            { label: "订单编号", value:  res.main_order_id, copy: true },
+            { label: "工单编号", value: res.service_order_id, copy: true },
+            { label: "申请时间", value: this.$xdUniHelper.getDate( res["created_time"] * 1000 ).fullTime },
+            { label: "售后类型", value: res.after_sale_method_name },
+            { label: "申请原因", value: res.after_sale_type_name },
+            { label: "问题描述", value: res.customer_feedback },
+            { label: "凭证内容", value: imgList.length ? imgList : '无', key: imgList.length? "img" : ''}
+          ];
+          this.stepList = [
+            res.progress[0],
+            { key: "line"},
+            res.progress[1],
+            { key: "line"},
+            res.progress[2],
+          ]
+          //物流信息
+          if(res.express_info && res.express_info.express_number){
+            this.logisticsInfo = [
+              { label: "物流单号", value: res.express_info.express_number, copy: true },
+              { label: "快递公司", value: res.express_info.express_name }
+            ]
+          }
+          //退换货商品
+          this.refundProductList = res.product_list.map(item => {
+            item.thumb = getServiceUrl(item.thumb, 'size2');
+            return item;
+          })
+          //新商品
+          this.newProductList = res.new_product_list.map(item => {
+            item.thumb = getServiceUrl(item.thumb, 'size2');
+            return item;
+          })
+          //售后类型
+          this.after_sale_method = res.after_sale_method;
+          //退款明细
+          this.refundInfo = res.refund_settlement.map(item => {
+            item.label = item.pay_info || item.pay_name;
+            item.value = item.pay_price;
+            item.key = 'price';
+            return item;
+          });
+
+          this.loaded = true;
+        })
+      },
+      handleCopy(text){
+        uni.setClipboardData({
+          data: text,
+          success: function () {
+            uni.showToast({
+              title: '复制成功',
+              icon: "none"
+            });
+          }
+        });
+
+      },
+      handleCancel(){
+        this.$xdConfirm({
+          styles: this.styles,
+          title: "提示",
+          width: '90%',
+          content: '确定撤销当前工单吗？',
+          confirmText: '确认',
+          isHtml: true,
+          cancelText: '取消',
+          showClose: false,
+          success: (res) => {
+            if (res.confirm) {
+              jfbRootExec("cancelAfterServiceOrder", {
+                vm: this,
+                data: {
+                  service_order_id: this.service_order_id
+                }
+              }).then(res => {
+
+              })
+            }
+            else{
+              console.log('取消')
+            }
+          }
+        })
+      },
+      handleDel(){
+        this.$xdConfirm({
+          styles: this.styles,
+          title: "提示",
+          width: '90%',
+          content: '确定删除当前工单吗？',
+          confirmText: '确认',
+          isHtml: true,
+          cancelText: '取消',
+          showClose: false,
+          success: (res) => {
+            if (res.confirm) {
+              jfbRootExec("delAfterServiceOrder", {
+                vm: this,
+                data:{
+                  service_order_id: this.service_order_id
+                }
+              }).then(res => {
+
+              })
+            }
+            else{
+              console.log('取消')
+            }
+          }
+        })
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -105,7 +343,176 @@
 
   .jfb-base-after-sales-detail {
     &__body{
+      background: #FAFAFA;
+      padding-bottom: 100rpx;
+      box-sizing: border-box;
+      .service_progress{
+        height: 320rpx;
+        background: linear-gradient(270deg, #FF8469 0%, #FF5252 100%);
+        color: #FFFFFF;
+        padding: 40rpx;
+        box-sizing: border-box;
+        .service_head{
+          display: flex;
+          align-items: center;
+          font-size: 32rpx;
+          font-weight: 500;
+          justify-content: space-between;
+          .head_sub{
+            font-size: 24rpx;
+            font-weight: 400;
+          }
+        }
+        .service_step{
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          font-size: 24rpx;
+          font-weight: 400;
+          margin-top: 48rpx;
+          .step_item{
+            display: flex;
+            flex-direction: column;
+            align-items: center;
 
+            .step_radio{
+              width: 24rpx;
+              height: 24rpx;
+              background: rgba(255, 255, 255, 0.3);
+              border: 2px solid #FFFFFF;
+              border-radius: 24rpx;
+              box-sizing: border-box;
+            }
+            .step_text{
+              margin-top: 8rpx;
+            }
+          }
+          .step_line{
+            width: 146rpx;
+            height: 4rpx;
+            background: #FFFFFF;
+            border-radius: 4rpx;
+          }
+        }
+      }
+      .refund_section{
+        background: #FFFFFF;
+        border-radius: 16rpx;
+        padding: 24rpx 40rpx;
+        box-sizing: border-box;
+        margin-bottom: 20rpx;
+        .sec_tag{
+          border-radius: 8rpx;
+          padding: 4rpx 16rpx;
+          font-size: 24rpx;
+          font-weight: 400;
+          display: inline-block;
+          &._new{
+            background: #FFDEDE;
+            color: #F00000;
+          }
+          &._refund{
+            background: #E6EEFF;
+            color: #0070F0;
+          }
+        }
+        .sec_title{
+          padding-bottom: 24rpx;
+          border-bottom: 1px solid #EEEEEE;
+          font-size: 26rpx;
+          color: #333333;
+          font-weight: 500;
+          margin-bottom: 24rpx;
+        }
+        .sec_body{
+          font-size: 24rpx;
+          font-weight: 400;
+          .sec_item{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin: 24rpx 0;
+            &:last-child{
+              margin-bottom: 0;
+            }
+            .sec_l{
+              color: #999999;
+              display: flex;
+              // align-items: center;
+              align-items: flex-start;
+              flex: 1;
+
+              .sec_l_text{
+                flex: 1;
+                width: 400rpx;
+              }
+
+              .img_list{
+                display: flex;
+                flex-wrap: wrap;
+                flex: 1;
+                .img_box{
+                  width: 150rpx;
+                  height: 150rpx;
+                  border-radius: 8rpx;
+                  border: 1px solid #E0E0E0;
+                  margin-right: 20rpx;
+                  margin-bottom: 20rpx;
+                  &:nth-of-type(3n){
+                    margin-right: 0;
+                  }
+                  image{
+                    width: 100%;
+                    height: 100%;
+                  }
+                }
+              }
+            }
+            .sec_r{
+              width: 100rpx;
+              ._copy{
+                padding: 4rpx 20rpx;
+                border-radius: 24rpx;
+                color: #CCCCCC;
+                border: 1px solid #CCCCCC;
+              }
+            }
+          }
+
+        }
+      }
+      .bottom_fixed{
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        padding: 20rpx;
+        box-sizing: border-box;
+        background: #FFFFFF;
+        box-shadow: 0px 0px 3px  rgba(0, 0, 0, 0.1);
+        text-align: right;
+
+        .opt_btn{
+          width: 120rpx;
+          height: 60rpx;
+          background: #FFFFFF;
+          color: #999999;
+          border: 1px solid #999999;
+          font-size: 24rpx;
+          text-align: center;
+          line-height: 60rpx;
+          border-radius: 60rpx;
+          display: inline-block;
+          & + .opt_btn{
+            margin-left: 20rpx;
+          }
+          &.primary{
+            background: var(--main-color);
+            border-color: var(--main-color);
+            color: #FFFFFF;
+          }
+        }
+      }
     }
   }
 </style>