石广澎
2024-07-23 87f34aa6e95d08d1b061bfa201813af34b677a1b
feat(支付): 去除无用api
2个文件已删除
8个文件已修改
421 ■■■■ 已修改文件
App.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
common/api/index.js 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
common/api/shuaka.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
common/http.interceptor.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pay/login.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pay/paySuccess.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pay/register.vue 218 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pay/scanpay.vue 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
App.vue
@@ -2,11 +2,16 @@
import {
  config,
} from 'common/config.js';
import Vconsole from 'vconsole';
import {
  getPlat
} from 'common/util.js';
    export default {
        onLaunch: function(opt) {
      uni.setStorageSync('DEBUG', opt.query?.debug == 'true');
      if (uni.getStorageSync('DEBUG')) {
        new Vconsole();
      }
      /*console.log(opt)
      let platform = 2
      const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${opt.query.cid}`)
common/api/index.js
@@ -8,31 +8,15 @@
export const queryShop = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/queryShopById', params, config)
/* 获取成功页面配置 */
export const getPayCompleteUrl = (params, config = {}) => http.get(URL +
    '/payfour-base/v1/base/pc/global/config/getPayCompleteUrl', params, config)
/* 获取积分价值 */
export const getScoreWorth = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getScoreWorth', params, config)
/* 获取用户银行卡 */
export const myBankCard = (params, config = {}) => http.get(URL +
    '/payfour-shop/v1/shop/wechat/h5/bankCard/myBankCard', params, config)
/* 获取商铺微信配置 */
export const getWechatInfo = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getWechatInfo', params, config = {});
/* 静默授权登录 */
export const getOpenIdBase = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getOpenIdBase', params, config = {});
/* 微信普通授权登录 */
export const getOpenId = (params, config = {}) => http.get(URL + '/payfour-merchant/v1/web/aggregatePayAllin/getOpenId',
    params, config = {});
/* 支付宝普通授权登录 */
export const getUserId = (params, config = {}) => http.get(URL + '/payfour-merchant/v1/web/h5PayAli/getUserIdByCode',
    params, config = {});
export const userLogin = (params, config = {}) => {
    let path = '/payfour-merchant/v1/web/aggregatePayAllin/getOpenId'
    if(params.platform==5){
@@ -41,9 +25,7 @@
    return http.get(URL + path,
        params, config = {})
};
/* 获取用户积分 */
export const queryScore = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/queryScore', params, config = {});
/* 获取用户可用优惠券 面值最大的*/
export const queryMyUseSweepPayMaxCoupon = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/queryMyUseSweepPayMaxCoupon', params, config = {});
@@ -55,9 +37,6 @@
export const getWechatConfigInfo = (params, config = {}) => http.post(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getWechatConfigInfo', params, config = {});
/* 微信支付 */
export const saveWxOrder = (params, config = {}) => http.post(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/saveWxOrder', params, config = {});
/*统一支付*/
export const saveOrder = (params, config = {}) => http.post(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/saveOrder', params, config = {});
@@ -66,31 +45,9 @@
export const closeOrder = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/scanPayOrderClose', params, config = {});
/* 图形验证吗 */
export const getVerify = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getVerify', params, config = {});
/* 短信验证码 */
export const getH5PayCheckVerifyCode = (params, config = {}) => http.post(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getH5PayCheckVerifyCode', params, config = {});
/* 微信支付 */
export const h5PayLogin = (params, config = {}) => http.post(URL + '/payfour-shop/v1/shop/web/wechat/h5PayLogin',
    params, config = {});
/* 通联快捷支付 */
export const tlPay = (params, config = {}) => http.post(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/pay/scanpayagreeconfirm',
    params, config = {});
/* 微信支付结果 */
export const getWxOrderInfo = (params, config = {}) => http.post(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/getWxOrderInfo',
    params, config = {});
/* 判断是否在卡段内 */
export const isContain = (params, config = {}) => http.get(URL +
    '/payfour-base/v1/base/pc/bankCardPeriod/isContain',
    params, config = {});
/* 获取银行卡配置 */
@@ -98,29 +55,3 @@
    '/payfour-base/v1/base/pc/global/config/bankCardStyle',
    params, config = {});
/* 获取用户信息 */
export const getUserInfo = (params, config = {}) => http.post(URL +
    '/payfour-shop/v1/shop/wechat/h5/bankCard/noEnc',
    params, config = {});
/* 获取店铺优惠信息 */
export const queryMyDiscount = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/queryMyDiscount',
    params, config = {});
/* 签约申请绑卡 */
export const signUpToApply = (params, config = {}) => http.post(URL +
    '/payfour-shop/v1/shop/wechat/h5/bankCard/signUpToApply',
    params, config = {});
/* 签约申请确认 */
export const bindCard = (params, config = {}) => http.post(URL +
    '/payfour-shop/v1/shop/wechat/h5/bankCard/bindCard',
    params, config = {});
/* 获取绑卡活动赠送的优惠券 */
export const getMyCoupUseDetail = (params, config = {}) => http.get(URL +
    '/payfour-merchant/v1/web/aggregatePayAllin/headBand/getMyCoupUseDetail',
    params, config = {});
/* 获取首绑有礼 */
export const headBand = (params, config = {}) => http.get(URL +
    '/payfour-shop/v1/shop/wechat/activity/headBand/detail',
    params, config = {});
common/api/shuaka.js
File was deleted
common/http.interceptor.js
@@ -69,7 +69,7 @@
        } else if (res.code == 10002) {
            return Promise.reject(res)
        } else {
            vm.$u.toast(res.description || res.msg ||res.info ||"请求异常!"); //错误提示信息
            // vm.$u.toast(res.description || res.msg ||res.info ||"请求异常!"); //错误提示信息
            return Promise.reject(res)
        }
    }, (response) => {
index.html
@@ -10,7 +10,7 @@
    </title>
    <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css"/>
    <script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>
    <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
<!--    <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>-->
</head>
<body>
<noscript>
pages.json
@@ -15,18 +15,6 @@
            }
        },
        {
            "path": "pay/register",
            "style": {
                "navigationBarTitleText": "注册",
                "enablePullDownRefresh": false
                // #ifdef H5
                ,
                "navigationStyle": "custom"
                // #endif
            }
        },
        {
            "path": "pay/paySuccess",
            "style": {
                "navigationBarTitleText": "支付成功",
@@ -54,8 +42,8 @@
    "globalStyle": {
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "佰惠付",
        "navigationBarBackgroundColor": "#FFFFFF",
        "backgroundColor": "#FFFFFF"
        "navigationBarBackgroundColor": "#EDEDED",
        "backgroundColor": "#EDEDED"
    },
    "uniIdRouter": {}
}
pay/login.vue
@@ -11,15 +11,20 @@
    export default {
        data() {
            return {
        opt: {},
        platform: this.$utils.getPlat()
            };
        },
        onLoad(opt) {
      const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${opt.cid}`)
      if(uni.getStorageSync('UNIONID'+this.platform)){
      this.opt = opt
        },
    onShow() {
      let redirect_uri = `${config.webURL}/pay/scanpay?cid=${this.opt.cid||''}&shopId=${this.opt.shopId||''}&smoney=${this.opt.smoney||''}`
      if(uni.getStorageSync('OPENID'+this.platform)){
        window.location.href = redirect_uri
        return
      }
      redirect_uri = encodeURIComponent(redirect_uri)
            uni.clearStorage()
            if (this.platform == 2) {
                window.location.href =
@@ -29,11 +34,10 @@
                    `https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=${config.ali_appid}&scope=auth_base&redirect_uri=${redirect_uri}&state=STATE`
            } else {
                uni.reLaunch({
                    url: `/pay/scanpay?cid=${opt.cid}`
          url: `/pay/scanpay?cid=${this.opt.cid}`
                })
            }
        }
    },
    }
</script>
pay/paySuccess.vue
@@ -112,7 +112,7 @@
<script>
    import {
        getWxOrderInfo,
    } from '@/common/api/index'
    } from 'common/api/index'
    export default {
        data() {
            return {
pay/register.vue
File was deleted
pay/scanpay.vue
@@ -15,7 +15,13 @@
          <view class="u-font-28 color-666">金额</view>
          <view @click="showRemark=true" class="remark">添加备注</view>
        </view>
        <view class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
                <view v-if="smoney" class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
                    <view class="money-icon color-333 lh-1">¥</view>
                    <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
                        <view class="money-num lh-1">{{ smoney }}</view>
                    </view>
                </view>
                <view v-else class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
          <view class="money-icon color-333 lh-1">¥</view>
          <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
            <view v-if="money" class="money-num lh-1">{{ money }}</view>
@@ -26,10 +32,13 @@
          <view class="mask" @click="showBord"></view>
        </view>
        <!--      <image v-if="isNew&&(this.payWay == 2&&!UNIONID)" @click="toRegister" class="reg-btn" src="/static/register-btn.png" mode=""></image>-->
        <view v-if="shopInfo.userCouponFlag==0" class="u-font-26 u-tips-color u-p-t-24">微信搜索或直接点击打开
                <block v-if="shopInfo.userCouponFlag==0">
          <view class="u-font-26 u-tips-color u-p-t-24">微信搜索或直接点击打开
          <text style="color: #1E8BE0">【冀优邮】</text>
          小程序,享受更多优惠
        </view>
        </block>
      </view>
      <block v-if="shopInfo.userCouponFlag==1">
        <view class="bg-fff u-m-32 u-br-10">
@@ -43,6 +52,19 @@
              <view v-else class="u-font-28 lh-1 u-tips-color">请选择</view>
              <u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
            </view>
                    </view>
          <view>
            <wx-open-launch-weapp
                id="launch-btn"
                appid="wx47b3b5ca64bc7d5d"
                path="pages/index/index"
            >
              <script type="text/wxtag-template">
                <style>.btn { padding: 12px }</style>
                <button class="btn">打开小程序</button>
              </script>
            </wx-open-launch-weapp>
          </view>
          <view class="u-font-26 u-tips-color u-p-24">微信搜索或直接点击打开
            <text style="color: #1E8BE0">【冀优邮】</text>
@@ -71,7 +93,7 @@
        <key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
      </u-popup>
      <!-- 优惠券弹窗 -->
      <u-popup zIndex="800" mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
            <u-popup mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
        <view class="u-font-32 color-333 u-text-center u-p-t-30">优惠券</view>
        <view v-if="checkCoupon.id" class="choose-coupon">
          已选择优惠券1张,共抵扣¥{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
@@ -121,22 +143,26 @@
  queryShop,
  userLogin,
  queryUseSweepPayCoupon,
    getWechatConfigInfo,
  closeOrder,
  saveOrder,
} from 'common/api/index'
  import wx from 'weixin-js-sdk'; // 使用js-sdk
export default {
  data() {
    return {
        smoney: '',
      tips: '该商户暂未开通支付功能',
      loading: true,
                loading: false,
      remark: '',
      buyerNote: '',
      showRemark: false,
      UNIONID: null,
      payWay: this.$utils.getPlat(),
      cid: '',
      bordShow: true, // 显示键盘
                bordShow: false, // 显示键盘
      shopInfo: {
        cusid: '',
        shopName: '',
@@ -178,6 +204,12 @@
  },
  onLoad(opt) {
    this.isNew = uni.getStorageSync('IS_NEW')
            if (opt.smoney) {
                this.smoney = opt.smoney
                this.money = opt.smoney
            }else{
        this.bordShow = true
      }
    if (opt.cid) {
      this.cid = opt.cid
      this.init()
@@ -187,6 +219,11 @@
      if (this.payWay == 5) {
        code = opt.auth_code
      }
        const cd = uni.getStorageSync('cd')
        if(code===cd){
          return
        }
        uni.setStorageSync('cd',code)
      userLogin({
        platform: this.payWay,
        params: {
@@ -262,6 +299,7 @@
      this.bordShow = true;
    },
    init() {
        this.loading = true
      let timer = setTimeout(() => {
        this.shopInfo.scanFlag = 0
        this.tips = '当前用户过多,请稍后重试~_~'
@@ -285,6 +323,25 @@
        this.tips = '当前用户过多,请稍后重试~_~'
        this.loading = false
      })
        if (this.payWay == 2) {
          const uri = encodeURIComponent(window.location)
          getWechatConfigInfo({
            url: uri
          }).then(res => {
            wx.config({
              debug: false, // 开启调试模式
              appId: res.appId, // 必填,公众号的唯一标识
              timestamp: res.timestamp, // 必填,生成签名的时间戳
              nonceStr: res.nonceStr, // 必填,生成签名的随机串
              signature: res.signature, // 必填,签名
              openTagList: ['wx-open-launch-weapp'] //可选,需要使用的开放标签列表
            });
            wx.ready(function () {
              wx.hideAllNonBaseMenuItem();
            })
          })
        }
    },
    // 获取会员相关信息
    showCoupon() {
@@ -407,8 +464,7 @@
    closeOrder() {
      closeOrder({
        id: this.orderId,
      }).then(res => {
      })
                }).then(res => {})
    }
  }
};
@@ -417,6 +473,9 @@
<style scoped lang="scss">
.page {
  height: calc(100vh - 0px);
    background-color: #EDEDED;
    border-top: 1px solid #EDEDED;
    box-sizing: border-box;
}
.shop {