jufubao-base 1.0.297-beta23 → 1.0.298

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -11,32 +11,11 @@
           <image v-if="shopLogo" :src="shopLogo" class="logo"></image>
           <image v-else class="logo" src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
         </view>
-
-        <view @click="handleToShop" class="shop">
-          <view>{{shopName}}</view>
-          <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
-        </view>
-
-        <template v-if="curConsumeType === 'QP'">
-          <view class="justify-center">
-            <image mode="aspectFit" class="bar-code" :src="barcode_url">
-            </image>
-            <view class="bar-code-text">{{barCode}}</view>
-            <view style="position: relative">
-              <image mode="aspectFit" class="qrcode" :src="code_url"></image>
-              <image v-if="qrcode_icon" class="logo-icon" :src="qrcode_icon"></image>
-            </view>
-            <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
-            <view v-if="isShowPaySoft === 'Y'" class="pay_way">
-              <view class="pay_title">此二维码优先使用以下账户进行支付</view>
-              <view class="pay_select" @click="showSortDialog">
-                <view>{{ curPaySelectShow }}</view>
-                <xd-font-icon icon="iconxia_down" size="28" style="margin-left: 24rpx;"></xd-font-icon>
-              </view>
-            </view>
+        <view v-if="isFlow">
+          <view @click="handleToShop" class="shop">
+            <view>{{shopName}}</view>
+            <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
           </view>
-        </template>
-        <view v-else style="padding-bottom: 40rpx;">
           <view class="verification-item">
             <view class="verification-item-label">提货标签</view>
             <view class="verification-item-tags">
@@ -55,79 +34,72 @@
               <view :style="{color:mainColor}" class="tip">*提货点数请咨询店员，提货成功后无法退换</view>
             </view>
           </view>
-          <XdButton v-if="btnDisabled" style="margin-top: 100rpx;display:block" width="260rpx" type="primary" disabled>
+          <XdButton v-if="btnDisabled" style="margin-top: 200rpx;display:block" width="260rpx" type="primary" disabled>
             下一步</XdButton>
-          <XdButton v-else style="margin-top: 100rpx;display:block" width="260rpx" type="primary" @click="toPayOrder">
+          <XdButton v-else style="margin-top: 200rpx;display:block" width="260rpx" type="primary" @click="toPayOrder">
             下一步</XdButton>
-        </view>
-
-        <view v-if="plusDiscount" style="width: 100%;">
-          <view class="vip" v-if="is_vip==='N'">
-            <view class="vip-title">
-              <view class="vip-title-left">PLUS会员专享</view>
-              <view class="vip-title-right">
-                <text>{{plusDiscount/1000}}</text>折
+          <view v-if="plusDiscount" style="margin-top: 40rpx;">
+            <view class="vip" v-if="is_vip==='N'">
+              <view class="vip-title">
+                <view class="vip-title-left">PLUS会员专享</view>
+                <view class="vip-title-right">
+                  <text>{{plusDiscount/1000}}</text>折
+                </view>
+              </view>
+              <view class="vip-open" @click="handleToOpen">
+                <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
+                <text>立即开通</text>
+                <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
               </view>
             </view>
-            <view class="vip-open" @click="handleToOpen">
-              <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
-              <text>立即开通</text>
-              <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
+            <view class="is-vip" v-else>
+              <text>PLUS</text>会员核销最低可享 <text>{{plusDiscount/1000}}</text>折
             </view>
           </view>
-          <view class="is-vip" v-else>
-            <text>PLUS</text>会员核销最低可享 <text>{{plusDiscount/1000}}</text>折
-          </view>
         </view>
-      </view>
-      <view class="consume_list">
-        <template v-for="item in consume_options">
-          <view v-if="item.consume_mode==='WB' && showScan === 'Y'" :key="item.consume_mode"
-            class="consume_item"
-            @click="handleConsumeType(item.consume_mode)"
-          >
-            <view class="consume_title">
-              <view class="consume_icon">
-                <xd-font-icon v-if="scanIconType==='icon'" :size="28" :icon="scanIcon"></xd-font-icon>
-                <view v-else class="_img">
-                  <image :src="scanImg" mode="aspectFill"></image>
-                </view>
-              </view>
-              <view >{{ scanName }}</view>
+        <view v-else>
+          <view>
+            <view @click="handleToShop" class="shop">
+              <view>{{shopName}}</view>
+              <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
             </view>
-            <xd-font-icon :size="28" icon="iconxiangyou_xian"></xd-font-icon>
-          </view>
-          <view v-if="item.consume_mode==='JHD' && showJHD === 'Y'" :key="item.consume_mode"
-            class="consume_item"
-            @click="handleConsumeType(item.consume_mode)"
-          >
-            <view class="consume_title">
-              <view class="consume_icon">
-                <xd-font-icon v-if="JHDIconType==='icon'" :size="28" :icon="JHDIcon"></xd-font-icon>
-                <view v-else class="_img">
-                  <image :src="JHDImg" mode="aspectFill"></image>
-                </view>
+            <image mode="aspectFit" class="bar-code" :src="barcode_url">
+            </image>
+            <view class="bar-code-text">{{barCode}}</view>
+            <view style="position: relative">
+              <image mode="aspectFit" class="qrcode" :src="code_url"></image>
+              <image v-if="qrcode_icon" class="logo-icon" :src="qrcode_icon"></image>
+            </view>
+            
+            <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
+            <view v-if="isShowPaySoft === 'Y'" class="pay_way">
+              <view class="pay_title">此二维码优先使用以下账户进行支付</view>
+              <view class="pay_select" @click="showSortDialog">
+                <view>{{ curPaySelectShow }}</view>
+                <xd-font-icon icon="iconxia_down" size="28" style="margin-left: 24rpx;"></xd-font-icon>
               </view>
-              <view >{{ JHDName }}</view>
             </view>
-            <xd-font-icon :size="28" icon="iconxiangyou_xian"></xd-font-icon>
-          </view>
-          <view v-if="item.consume_mode==='QP' && showQP==='Y'" :key="item.consume_mode"
-            class="consume_item"
-            @click="handleConsumeType(item.consume_mode)"
-          >
-            <view class="consume_title">
-              <view class="consume_icon">
-                <xd-font-icon v-if="QPIconType==='icon'" :size="28" :icon="QPIcon"></xd-font-icon>
-                <view v-else class="_img">
-                  <image :src="QPImg" mode="aspectFill"></image>
+            <view v-if="plusDiscount">
+              <view class="vip" v-if="is_vip==='N'">
+                <view class="vip-title">
+                  <view class="vip-title-left">PLUS会员专享</view>
+                  <view class="vip-title-right">
+                    <text>{{plusDiscount/1000}}</text>折
+                  </view>
+                </view>
+                <view class="vip-open" @click="handleToOpen">
+                  <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
+                  <text>立即开通</text>
+                  <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
                 </view>
               </view>
-              <view >{{ QPName }}</view>
+              <view class="is-vip" v-else>
+                <text>PLUS</text>会员消费最低可享 <text>{{plusDiscount/1000}}</text>折
+              </view>
             </view>
-            <xd-font-icon :size="28" icon="iconxiangyou_xian"></xd-font-icon>
           </view>
-        </template>
+        </view>
+
       </view>
     </view>
     <view :style="{
@@ -208,11 +180,8 @@
   import XdDeductSort from "./XdDeductSort.vue"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseConsumpCodeMixin from "./JfbBaseConsumpCodeMixin";
-  import QPMixin from "./QPMixin";  //展码消费
-  import JHDMixin from "./JHDMixin";  //聚好兑
-  import shopListMixin from "./shopListMixin";
   import getServiceUrl from "@/common/getServiceUrl";
-  import { getContainerPropsValue, isWechat, isWechatTools, gCPVal } from "@/utils/xd.base";
+  import { getContainerPropsValue, isWechat, isWechatTools } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from 'vuex';
@@ -231,15 +200,35 @@
       XdDeductSort
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBaseConsumpCodeMixin, QPMixin, JHDMixin, shopListMixin
+      componentsMixins, extsMixins, JfbBaseConsumpCodeMixin
     ],
     data() {
       return {
+        openPath: "",
+        shopPath: "",
+        successPath: "",
+        cashPayPath: "",
         showDialog: false,
         showMask: true,
         shop_id: '',
+        showShopList: true,
+        secondTimer: null,
+        expiration_sec: '',
+        code_url: '',
+        barcode_url: '',
+        barCode: '',
+        statusTimer: null,
+        validTimer: null,
+        payChannels: [],
+        channel_provider_id: "",
         options: {},
         canEdit: true,
+        settle_tag_list: [],
+        settle_tag_list_status: false,
+        tag_id: "",
+        price: "",
+        total_price: "",
+        num: 1,
         tip: '',
         shopName: '',
         shopLogo: "",
@@ -249,43 +238,18 @@
         userInfo: {},
         is_vip: 'N',
         isPreview: false,
+        jwxSDK: null,
         refresh: true, //onshow是否刷新数据
         showLocationDialog: false,
+        cityPath: '',
         resource_shop_id: '',
-        consume_options: [],  //当前门店支持的核销方式
-        default_consume_type: '',  //默认核销方式
-        baseInfo: {},  //基础接口返回信息 - 展码及门店基本信息
-        curConsumeType: "JHD", //当前选择的核销方式, 默认聚好兑
+        qrcode_icon: '',
+        deductDialog: false,
+        paySortList: [],
+        tempList: [],
 
         bodyBgImg: "",
-        contBgcColor: "#fff",
         isShowPaySoft: "N",
-
-        cityPath: '',
-        openPath: "",
-        shopPath: "",
-        successPath: "",
-        cashPayPath: "",
-        scanPath: "",
-
-        showScan: "",
-        scanName: "",
-        scanIconType: "",
-        scanIcon: "",
-        scanImg: "",
-
-        showJHD: "",
-        JHDName: "",
-        JHDIconType: "",
-        JHDIcon: "",
-        JHDImg: "",
-
-        showQP: "",
-        QPName: "",
-        QPIconType: "",
-        QPIcon: "",
-        QPImg: "",
-
       }
     },
     watch: {
@@ -305,17 +269,43 @@
         brandInfo: state => state.brandInfo,
         jfbAuthorize: (state) => state.jfbAuthorize,
       }),
+      expiration_sec_str() {
+        //秒数转 x分x秒
+        let second = this.expiration_sec;
+        if (second < 60) {
+          return second + "秒";
+        }
+        let min = parseInt(second / 60);
+        let sec = second % 60;
+        return `${min}分${sec}秒`;
+      },
+      curTag() {
+        return this.settle_tag_list.find(item => item.value === this.tag_id) || {}
+      },
+      curTagPrice() {
+        const curTag = this.curTag;
+        if (this.$xdUniHelper.isEmpty(curTag)) return 0;
+        if (curTag.is_static_price) {
+          return curTag.price_yuan;
+        } else {
+          return this.total_price;
+        }
+      },
       btnDisabled() {
         return this.total_price === '' || !this.tag_id;
       },
+      curPaySelectShow(){
+        if(this.paySortList.length === 0) return ''
+        let curPay = this.paySortList[0];
+        return curPay.pay_method_name + (curPay.pay_method !== 'card' ? `: ${this.$xdUniHelper.divisionFloatNumber(curPay.wallet_amount, 100)}` : '')
+      },
       bodyStyleComp(){
         return {
           minHeight: this.layoutInfo.bodyMinHeightRpx + 'rpx',
           backgroundImage: `url(${this.bodyBgImg})`,
-          backgroundColor: this.contBgcColor,
           backgroundSize: '100% 100%'
         }
-      },
+      }
     },
     created() {
       this.isPreview = this.$configProject['isPreview']
@@ -329,10 +319,10 @@
     },
     methods: {
       async onJfbLoad(options) {        
+        // this.xnamespace = this.projectAttr.business_code
         this.setNameSpace(options, false);
         this.getUserInfo()
         this.options = options
-        this.resource_shop_id = options.resource_shop_id;
         if (!this.isPreview) {
           console.log(this.stateLocation, 'this.stateLocation');
 
@@ -346,92 +336,211 @@
             this.showLocationDialog = false
           }
         }
-        if(this.options.shop_id || this.isPreview){
+        if (!this.options.shop_id) {
+          // jfbRootExec("getConsumpShopList", {
+          //   vm: this,
+          //   data: {
+          //     city_code: this.stateCity.city_code,
+          //     consume_mode: 'SELL',
+          //     latitude: this.stateLocation.latitude + '',
+          //     longitude: this.stateLocation.longitude + '',
+          //   },
+          // }).then(res => {
+          //   if (res && res.list.length > 0) {
+          //     this.shop_id = res.list[0].shop_id;
+          //     this.resource_shop_id = res.list[0].resource_shop_id;
+          //     this.shopName = res.list[0].resource_shop_name;
+          //     // this.showMask = true;
+          //     // this.showDialog = true;
+          //   } else {
+          //     this.tip = '您的附近暂时没有支持的店铺'
+          //     this.showDialog = false;
+          //   }
+          // })
+        } else {
           this.shop_id = this.options.shop_id;
           this.resource_shop_id = this.options.resource_shop_id;
-          let isFirst = true;
           this.p_getAsyncStep((err) => {
             if(err === 'error'){
             }else{
               this.showShopList = false;
               this.showMask = false;
             }
-          }, isFirst);
-        }else{
-          //没有门店id，展示门店列表去选择门店
-          this.showShopList = true;
+
+          });
         }
+        this.p_getMyPayOrderConfig();
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.openPath = getContainerPropsValue( container, "content.openPath", { value: "" }).value;
-        this.shopPath = getContainerPropsValue( container, "content.shopPath", { value: "" }).value;
-        this.successPath = getContainerPropsValue( container, "content.successPath", { value: "" }).value;
-        this.cashPayPath = getContainerPropsValue(container, 'content.cash_pay_path', { value: "" }).value;
-        this.successPath = getContainerPropsValue( container, "content.successPath", { value: "" }).value;
-        this.scanPath = getContainerPropsValue(container, 'content.scanPath', { value: "" }).value;
-        this.cityPath = getContainerPropsValue(container, 'content.cityPath', { value: "" }).value;
+        this.openPath = getContainerPropsValue(
+          container,
+          "content.openPath",
+          { value: "" }
+        ).value;
+        this.shopPath = getContainerPropsValue(
+          container,
+          "content.shopPath",
+          { value: "" }
+        ).value;
+        this.successPath = getContainerPropsValue(
+          container,
+          "content.successPath",
+          { value: "" }
+        ).value;
+        this.cashPayPath = getContainerPropsValue(container, 'content.cash_pay_path', { value: "" }
+        ).value;
+        this.successPath = getContainerPropsValue(
+          container,
+          "content.successPath",
+          { value: "" }
+        ).value;
+        this.cityPath = getContainerPropsValue(container, 'content.cityPath', { value: "" }
+        ).value;
         this.bodyBgImg = getServiceUrl(getContainerPropsValue(container, 'content.bodyBgImg', {url: ""}).url);
-        this.contBgcColor = gCPVal(container, 'contBgcColor', '#fff')
         this.isShowPaySoft = getContainerPropsValue(container, 'content.isShowPaySoft', "N");
-
-        this.showScan = gCPVal(container, 'showScan', "Y");
-        this.scanName = gCPVal(container, 'scanName', "扫码提货");
-        this.scanIconType = gCPVal(container, 'scanIconType', "icon");
-        this.scanIcon = gCPVal(container, 'scanIcon', 'iconsaoma1');
-        this.scanImg = getServiceUrl(gCPVal(container, 'scanImg', {url: ""}).url);
-
-        this.showJHD = gCPVal(container, 'showJHD', "Y");
-        this.JHDName = gCPVal(container, 'JHDName', "聚好兑");
-        this.JHDIconType = gCPVal(container, 'JHDIconType', "icon");
-        this.JHDIcon = gCPVal(container, 'JHDIcon', 'iconqianbao-01');
-        this.JHDImg = getServiceUrl(gCPVal(container, 'JHDImg', {url: ""}).url);
-
-        this.showQP = gCPVal(container, 'showQP', "Y");
-        this.QPName = gCPVal(container, 'QPName', "展码提货");
-        this.QPIconType = gCPVal(container, 'QPIconType', "icon");
-        this.QPIcon = gCPVal(container, 'QPIcon', 'iconerweima');
-        this.QPImg = getServiceUrl(gCPVal(container, 'QPImg', {url: ""}).url);
-
-        console.log("this.scanImg", this.scanImg);
-      },
-      handleConsumeType(consumeType){
-        if(this.curConsumeType === consumeType) return;
-        if(consumeType === 'WB'){
-          this.$xdUniHelper.navigateTo({
-            url: this.scanPath,
-          })
-          return;
+      },
+      handleSortClose(){
+        this.deductDialog = false;
+      },
+      handleChoseShop(shop){
+        this.shop_id = shop.shop_id;
+        this.resource_shop_id = shop.resource_shop_id;
+        this.shopName = shop.resource_shop_name;
+        this.p_getAsyncStep((err) => {
+          if(err === 'error'){
+          }else{
+            this.showShopList = false;
+            this.showMask = false;
+          }
+        });
+      },
+      moveHandle(){},
+      handleCityChange(){
+        this.$xdUniHelper.navigateTo({
+          url: this.cityPath
+        })
+      },
+      handleCityDone(city){
+        console.log("handleCityDone", city);
+      },
+      showSortDialog(){
+        this.deductDialog = true;
+      },
+      handleDeductSort(list){
+        console.log("handleDeductSort",list);
+        this.tempList = list;
+      },
+      doConfirmSortPay(){
+        if(this.tempList.length === 0){
+          this.deductDialog = false;
+          return false;
         }
-        //当前为展码，清除定时器
-        if(this.curConsumeType === 'QP') this.clearAllTimer();
-        this.curConsumeType = consumeType;
-        this.p_getAsyncStep();
+        let configs = this.tempList.map(item => {
+          return {
+            pay_method: item.pay_method,
+            priority_rules: item.options.map(ii => ii.value)
+          }
+        })
+        console.log('configs',configs);
+        jfbRootExec("saveMyPayOrderConfig", {
+          vm: this,
+          data: {
+            configs: configs
+          }
+        }).then(res => {
+          this.deductDialog = false;
+          this.paySortList = this.tempList;
+        })
       },
-      async p_getAsyncStep(cb, isFirst) {
+      p_getMyPayOrderConfig(){
+        jfbRootExec("getMyPayOrderConfig", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          this.paySortList = res.configs;
+        })
+      },
+      getUserInfo() {
+        jfbRootExec("getConsumpBaseUserInfo", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          res = res || {};
+          if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
+          this.userInfo = res;
+        })
+      },
+      p_getShopList(params = {}, cb){
+        return new Promise((resolve, reject) => {
+          jfbRootExec("getConsumpShopList", {
+            vm: this,
+            data: {
+              consume_mode: 'SELL',
+              latitude: this.stateLocation.latitude + '',
+              longitude: this.stateLocation.longitude + '',
+              ...params,
+            }
+          }).then(res => {
+            if(cb) cb(res.list);
+            resolve(res.list);
+          }).catch(err => {
+            reject(err);
+          })
+        })
+      },
+      async p_getAsyncStep(cb) {
         try{
-          await this.p_getQuickPayQRCode(isFirst);
+          await this.p_getQuickPayQRCode();
         }catch(e){
           if(cb) cb('error');
           return;
         }
         if(cb) cb();
-        if (this.curConsumeType === 'QP') {
-          this.p_getMyPayOrderConfig();
+        if (!this.isFlow) {
           this.p_getQRCodeStatus();
           this.p_getListUserPayChannel();
         }
       },
-      //获取支付码及门店信息 - 60秒轮询刷新二维码信息
-      p_getQuickPayQRCode(isFirst) {
+      getH5WxAuthorize() {
+        jfbRootExec("getH5WxAuthorize", {
+          vm: this,
+          data: { jsApiList: ["chooseWXPay"], },
+        })
+          .then((res) => {
+            this.jwxSDK = res.jwxSDK;
+            console.log('this.jwxSDK', this.jwxSDK);
+          })
+          .catch(error => {
+            this.$xdAlert({
+              content: error,
+            });
+          });
+      },
+      p_getListUserPayChannel() {
+        const { pay_channels } = this.projectAttr;
+        jfbRootExec("getConsumpListUserPayChannel", {
+          vm: this,
+          data: {
+            providers: pay_channels && pay_channels.join(","),
+          },
+        }).then((res) => {
+          console.log("p_getListUserPayChannel", res);
+          this.payChannels = res.list;
+          this.channel_provider_id = res.list[0].channel_provider_id;
+        });
+      },
+      p_getQuickPayQRCode() {
         return new Promise((resolve, reject) => {
           this.$xdShowLoading({});
           let data = {
             shop_id: this.shop_id,
             temp_order_id: this.temp_order_id,
+            // business_code: this.xnamespace,
+            // resource_shop_id: this.resource_shop_id
           }
           if(data.resource_shop_id) delete data.shop_id
           jfbRootExec("getConsumpCode", {
@@ -439,19 +548,15 @@
             data: data
           }).then(res => {
             this.$xdHideLoading();
-            this.showMask = false;
-            this.baseInfo = res;
-            this.plusDiscount = res.plus_discount;
-            this.consume_options = res.consume_options;
-            this.default_consume_type = res.default_consume_type;
-            this.shopName = res.resource_shop_name;
-            //当前的核销方式
-            if(isFirst){
-              this.curConsumeType = res.default_consume_type;
-            }
-
-            //当期核销方式为消费码(二维码)
-            if(this.curConsumeType === 'QP'){
+            this.plusDiscount = res.plus_discount
+            if (res.is_st_flow === 'Y') {
+              //水牌
+              this.isFlow = true
+              this.showMask = false;
+              this.shopName = res.resource_shop_name;
+              this.getSettleTagList()
+              resolve();
+            } else {
               // 消费码
               this.temp_order_id = res.temp_order_id;
               let code_url = this.brandInfo['api_host'] + res.code_url;
@@ -467,6 +572,8 @@
               this.qrcode_icon = qrcode_icon;
               this.barCode = res.payment_code
               this.expiration_sec = res.expiration_sec;
+              this.showMask = false;
+              this.shopName = res.resource_shop_name;
               this.shopLogo = getServiceUrl(res.shop_icon)
               clearInterval(this.secondTimer);
               this.secondTimer = setInterval(() => {
@@ -476,17 +583,348 @@
                   this.p_getQuickPayQRCode();
                 }
               }, 1000);
-            }else{
-              //扫水牌，核销标签列表
-              this.getSettleTagList();
+              resolve();
             }
-            resolve();
+
           }).catch(err => {
             console.error(err);
             reject(err);
           })
         })
       },
+      p_getQRCodeStatus() {
+        jfbRootExec("getConsumpCodeScanStatus", {
+          vm: this,
+          data: {
+            temp_order_id: this.temp_order_id,
+            shop_id: this.shop_id
+          }
+        }).then(res => {
+          //P处理中 Y成功 E 失败
+          if (res.status === 'P') {
+            if (!this.isPreview) {
+              if (this.statusTimer) clearTimeout(this.statusTimer);
+              this.statusTimer = setTimeout(() => {
+                this.p_getQRCodeStatus();
+              }, 2000);
+            }
+          } else if (res.status === 'Y') {
+            //订单下单有效时间 秒
+            if (this.statusTimer) clearTimeout(this.statusTimer);
+            this.orderSeconds = res.seconds;
+            if (this.orderSeconds > 0) {
+              this.validTimer = setInterval(() => {
+                this.orderSeconds--;
+                if (this.orderSeconds <= 0) {
+                  this.handlerOderFail();
+                }
+
+              }, 1000)
+            }
+            this.p_createOrder();
+          } else if (res.status === 'E') {
+            if (this.statusTimer) clearTimeout(this.statusTimer);
+            this.$xdAlert({
+              content: res.message,
+              time: 1500,
+              isClose: false,
+              zIndex: 5000
+            });
+          }
+        })
+      },
+      p_createOrder() {
+        jfbRootExec("batchConsumpUseCardCreated", {
+          vm: this,
+          data: {
+            temp_order_id: this.temp_order_id,
+            business_code: this.xnamespace,
+          }
+        }).then(res => {
+          this.request_order_id = res.request_order_id;
+          this.p_getOrderStatus();
+        }).catch(err => {
+          this.handlerOderFail();
+        })
+      },
+      p_getOrderStatus() {
+        jfbRootExec("getConsumpAsyncSubmitStatus", {
+          vm: this,
+          data: {
+            request_order_id: this.request_order_id
+          }
+        }).then(res => {
+          let { hand_status, hand_status_msg, order_id, pay_order_id, need_pay_price } = res;
+
+          if (hand_status === 'U') {
+            this.orderTimer = setTimeout(() => {
+              this.p_getOrderStatus();
+            }, 2000)
+          } else if (hand_status === 'S') {  //成功
+            if (parseFloat(need_pay_price) > 0) {//补差
+              this.handleThirdPay(pay_order_id, order_id);
+            } else {//订单成功
+              this.refresh = false
+              this.$xdUniHelper.redirectTo({
+                url: this.successPath + `?order_id=${order_id}`
+              })
+            }
+          } else if (hand_status === 'F') {
+            this.handlerOderFail();
+            this.$xdAlert({
+              content: hand_status_msg || '支付失败',
+              time: 3000,
+              isClose: false,
+              zIndex: 5000
+            });
+          }
+        })
+      },
+      openTemplatePay(paySignData, cb) {
+        console.log('openTemplatePay', paySignData);
+
+        const { timeStamp, ...otherData } = paySignData;
+        otherData["timestamp"] = timeStamp;
+        // #ifdef H5
+        this.jwxSDK.chooseWXPay({
+          ...otherData,
+          success: (res) => {
+            this.refresh = false;
+            this.$xdLog.setARMSInfo({ options: this.options, res }, 'pay_success');
+            uni.showToast({
+              title: "支付成功",
+            });
+            cb(res);
+          },
+          cancel: () => {
+            this.onRefreshPage();
+            this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
+            uni.showToast({
+              title: "取消支付",
+            });
+          },
+          fail: (error) => {
+            this.onRefreshPage();
+            if (typeof error === 'string') error = { error: error }
+            if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
+            this.$xdLog.setARMSError(error)
+            uni.showToast({
+              title: "支付失败",
+            });
+          },
+        });
+        // #endif
+        // #ifdef MP
+        wx.requestPayment({
+          ...paySignData,
+          success: (res) => {
+            this.refresh = false;
+            this.$xdLog.setARMSInfo({ options: this.options, res }, 'pay_success');
+            uni.showToast({
+              title: "支付成功",
+              icon: "none",
+            });
+            cb(res);
+          },
+          fail: (err) => {
+            this.onRefreshPage();
+            this.$xdLog.setARMSError({
+              options: this.options,
+              error: JSON.stringify(err)
+            });
+            uni.showToast({
+              title: "支付失败",
+              icon: "none",
+            });
+          },
+        });
+        // #endif
+      },
+      onRefreshPage() {
+        this.temp_order_id = "";
+        if (this.validTimer) clearInterval(this.validTimer)
+        this.p_getAsyncStep();
+      },
+      getSettleTagList() {
+        this.$xdShowLoading({});
+
+        jfbRootExec("getConsumpSettleMainInfo", {
+          vm: this,
+          data: {
+            shop_id: this.shop_id,
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          const { settle_tag_list } = res;
+          this.settle_tag_list = settle_tag_list;
+          if (settle_tag_list.length > 0) {
+            this.handlerTagRadio(settle_tag_list[0]);
+            this.settle_tag_list_status = false;
+          }
+          else this.settle_tag_list_status = true;
+        }).catch(err => {
+          this.$xdHideLoading();
+          this.$xdLog.catch(error)
+        })
+      },
+      toPayOrder(options = {}) {
+        let { tag_id, total_price, curTag, num = 1, shop_id } = this;
+        let err_tip = "";
+        if (!curTag.is_static_price) this.price = total_price;
+        if (curTag.is_static_price) {
+          if (total_price > 10000) {
+            err_tip = '金额不能超过10000'
+          }
+        }
+        let price = this.price;
+        if (!price) err_tip = "请填写正确的提货金额";
+        if (!tag_id) err_tip = "请选择结算标签";
+        if (err_tip) {
+          uni.showToast({
+            title: err_tip,
+            icon: 'none'
+          });
+          return false;
+        }
+        if (this.total_price == 0) {
+          uni.showToast(
+            {
+              title: '核销金额不能为0',
+              icon: 'none'
+            }
+          )
+          return
+        }
+        jfbRootExec("addConsumpCashierTempOrderData", {
+          vm: this,
+          data: {
+            shop_id: this.shop_id,
+            settle_tag_id: this.tag_id,
+            num: this.num,
+            settle_tag_price: this.curTagPrice,
+            total_price: this.total_price,
+            ...options
+          }
+        })
+          .then(res => {
+            if (res.confirm_notice) {
+              return this.useCardPop(res).then(data => {
+                if (data == 2) {
+                  this.toPayOrder({
+                    is_ignore_unique_check: "Y"
+                  })
+                }
+              })
+            } else {
+              this.price = "";
+              let params = {
+                ...this.options,
+                price: price,
+                num: num,
+                tag: tag_id,
+                shop_id: shop_id,
+                cart_order_id: res.cart_order_id
+              };
+              params = this.$xdUniHelper.jsonToParams(params)
+              this.$xdUniHelper.navigateTo({
+                url: this.cashPayPath + `?${params}`
+              })
+            }
+          })
+          .catch(error => {
+            console.error(error);
+          })
+      },
+      //选卡弹出项
+      useCardPop(data) {
+        return new Promise((resolve, reject) => {
+          uni.showModal({
+            title: '提示',
+            content: data.msg,
+            // confirmText: data.confirm_text,
+            // cancelText: data.cancel_text,
+            success: function (res) {
+              if (res.confirm) {
+                resolve(2);
+              } else if (res.cancel) {
+                resolve();
+              }
+            },
+            fail: function (res) {
+              reject(res);
+            }
+          });
+        })
+      },
+      handlerPrice(e) {
+        this.$nextTick(() => {
+          this.total_price = e.detail.value.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/, '$1');
+          if (this.total_price > 10000) {
+            this.total_price = 10000
+            uni.showToast(
+              {
+                title: '核销金额不能超过10000',
+                icon: 'none'
+              }
+            )
+          }
+        })
+      },
+      handleThirdPay(pay_order_id, main_order_id) {
+        let { login_providers = [] } = this.projectAttr;
+        let data = {
+          order_id: pay_order_id,
+          channel_provider_id: this.channel_provider_id,
+          login_providers: login_providers.join(","),
+        };
+        //设置支付成功页面地址
+        if (!this.$configProject.isPreview) {
+          data['pay_success_url'] = '';
+          // #ifdef H5
+          data['pay_success_url'] = `${window.location.protocol}//${window.location.host}/${this.projectAttr.deploy_dir}`;
+          // #endif
+          data['pay_success_url'] += this.successPath + `?order_id=${main_order_id}`;
+        }
+
+        jfbRootExec("setConsumpThirdPlace", {
+          vm: this,
+          data,
+        })
+          .then((res) => {
+            this.$xdHideLoading();
+            const { channel_data } = res;
+            const paySignData = JSON.parse(Base64.decode(channel_data));
+            this.openTemplatePay(paySignData, (ps) => {
+              jfbRootExec("updateConsumpPay", {
+                vm: this,
+                data: {
+                  main_order_id: main_order_id,
+                },
+              })
+                .then((res) => {
+                  this.$xdUniHelper.redirectTo({
+                    url: this.successPath + `?order_id=${main_order_id}`
+                  });
+                })
+                .catch(error => {
+                  this.$xdLog.setARMSCustomError('update_loading_fail', { options: this.options, error });
+                });
+            })
+          });
+      },
+      //订单失效
+      handlerOderFail() {
+        console.warn("handlerOderFail");
+        this.temp_order_id = "";
+        clearInterval(this.validTimer);
+        clearTimeout(this.orderTimer);
+        clearInterval(this.secondTimer);
+      },
+      handleToShop() {
+        this.$xdUniHelper.navigateTo({
+          url: this.shopPath
+        });
+      },
       handleToOpen() {
         this.$xdUniHelper.navigateTo({
           url: this.openPath
@@ -496,39 +934,41 @@
         this.showDialog = false;
         this.p_getAsyncStep();
       },
+      handlerTagRadio(item) {
+        this.tag_id = item.value;
+        this.canEdit = !item.is_static_price;
+        this.num = 1;
+        if (item.is_static_price) {
+          this.total_price = item.price_yuan
+          this.price = item.price_yuan
+        } else {
+          this.total_price = "";
+          this.price = "";
+        }
+      },
       handleToCity() {
         this.$xdUniHelper.navigateTo({
           url: this.cityPath
         },true);
       },
-      moveHandle(){},
-      getUserInfo() {
-        jfbRootExec("getConsumpBaseUserInfo", {
-          vm: this,
-          data: {},
-        }).then(res => {
-          res = res || {};
-          if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
-          this.userInfo = res;
-        })
+      handleNumberChange(num) {
+        let curTag = this.curTag;
+        this.total_price = this.$xdUniHelper.multiplyFloatNumber(curTag.price_yuan, num);
       },
-      //清除所有定时器
-      clearAllTimer(){
+      onJfbUnload(options) {
+        console.log('event.onJfbUnload', options)
         if (this.secondTimer) clearInterval(this.secondTimer);
         if (this.statusTimer) clearTimeout(this.statusTimer);
         if (this.orderTimer) clearTimeout(this.orderTimer);
       },
-
-      onJfbUnload(options) {
-        console.log('event.onJfbUnload', options)
-        this.clearAllTimer();
-      },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
-        this.clearAllTimer();
+        if (this.secondTimer) clearInterval(this.secondTimer);
+        if (this.statusTimer) clearTimeout(this.statusTimer);
+        if (this.orderTimer) clearTimeout(this.orderTimer);
       },
       onJfbScroll(options) {
-        // console.log('event.onJfbScroll', options)
+        console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -541,7 +981,9 @@
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)
-        this.clearAllTimer();
+        if (this.secondTimer) clearInterval(this.secondTimer);
+        if (this.statusTimer) clearTimeout(this.statusTimer);
+        if (this.orderTimer) clearTimeout(this.orderTimer);
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
@@ -560,21 +1002,16 @@
   .jfb-base-consump-code {
     &__body {
       .content-box {
-        margin: 160rpx 30rpx 0 30rpx;
+        margin: 0 30rpx 0 30rpx;
         background-color: #fff;
         padding: 81rpx 32rpx 32rpx 32rpx;
         border-radius: 24rpx;
+        position: relative;
+        top: 158rpx;
         display: flex;
         flex-direction: column;
         align-items: center;
         justify-content: center;
-        position: relative;
-        .justify-center{
-          display: flex;
-          align-items: center;
-          flex-direction: column;
-          justify-content: center;
-        }
 
         .logo-box {
           width: 154rpx;
@@ -597,43 +1034,6 @@
         }
 
       }
-      .consume_list{
-        margin: 30rpx;
-        background-color: #FFFFFF;
-        border-radius: 24rpx;
-        overflow: hidden;
-        .consume_item{
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          font-size: 28rpx;
-          padding: 32rpx 40rpx;
-          border-bottom: 1px solid #E5E5E5;
-          &:last-child{
-            border-bottom: none;
-          }
-          .consume_title{
-            display: flex;
-            flex: 1;
-            align-items: center;
-            color: #333333;
-            .consume_icon{
-              width: 60rpx;
-              display: flex;
-              justify-content: flex-start;
-              ._img{
-                width: 30rpx;
-                height: 30rpx;
-                background-color: red;
-                image{
-                  width: 100%;
-                  height: 100%;
-                }
-              }
-            }
-          }
-        }
-      }
 
       .shop {
         border: 2rpx solid #E6E6E6;
@@ -684,7 +1084,6 @@
         padding: 40rpx 0;
         align-items: center;
         border-top: 1px dashed  rgba(229, 229, 229, 1);
-        width: 100%;
         .pay_title{
           font-size: 28rpx;
           margin-bottom: 24rpx;