Răsfoiți Sursa

```
feat(api): 添加加油支付码API接口定义

- 新增refueling.getPayCode API接口定义
- 在globals.d.ts中添加对应的类型声明
- 定义接口参数content用于传递二维码内容

feat(refueling): 实现加油支付功能

- 在commonTab页面添加支付二维码生成功能
- 集成滴滴加油小程序跳转功能
- 实现二维码预览和识别功能
- 添加页面mounted钩子自动获取支付码

fix(integral): 修复积分明细显示问题

- 修改积分明细展示逻辑,增加pointsTypeName前缀显示

chore(config): 更新测试环境配置

- 启用正式测试环境URL配置
- 注释掉临时IP地址配置

style(manifest): 修复JSON格式问题

- 修复manifest.json文件格式错误
```

zouzexu 2 săptămâni în urmă
părinte
comite
f90c463966

+ 2 - 1
src/api/apiDefinitions.ts

@@ -118,6 +118,7 @@ export default {
   'djk.welfareClaimInfoDetaile':['GET', '/smqjh-pms/app-api/v1/welfareClaimInfo/{memberId}'],
   'djk.welfareClaimInfoPopup':['GET', '/smqjh-pms/app-api/v1/welfareClaimInfo/popup/{memberId}'],
   'djk.addWelfareOrder':['POST', '/smqjh-oms/api/v1/djkOrder/addWelfareOrder'],
-  'djk.submitRefund':['POST', '/smqjh-oms/api/v1/djkOrder/submitRefund'],
+  'djk.submitRefund': ['POST', '/smqjh-oms/api/v1/djkOrder/submitRefund'],
 
+  'refueling.getPayCode':['POST','/smqjh-pms/api/v1/refueling/generateQrCode']
 };

+ 17 - 0
src/api/globals.d.ts

@@ -1179,6 +1179,23 @@ declare global {
         config: Config
       ): Alova2Method<apiResData<any>, 'djk.submitRefund', Config>;
     }
+    refueling: {
+      /**
+       * 加油支付码
+       */
+      getPayCode<
+        Config extends Alova2MethodConfig<apiResData<string>> & {
+          data: {
+            /**
+             * 二维码内容
+             */
+            content?: string;
+          };
+        }
+      >(
+        config: Config
+      ): Alova2Method<apiResData<string>, 'refueling.getPayCode', Config>;
+    }
   }
 }
 var Apis: Apis;

+ 2 - 2
src/config/index.ts

@@ -19,9 +19,9 @@ const mapEnvVersion = {
    */
   // trial: "http://192.168.1.166:8080/jeecg-boot",
   // trial: 'http://192.168.0.157:8080',
-  trial: 'http://47.109.84.152:8081',
+  // trial: 'http://47.109.84.152:8081',
   // trial: 'http://192.168.1.166:8080',
-  // trial: 'https://smqjh.api.zswlgz.com',
+  trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */

+ 1 - 1
src/subPack-common/integral/index.vue

@@ -80,7 +80,7 @@ function getLabel(val: string) {
             {{ (type[Number(item.pointsType) - 1] == '下单' ? getLabel(item.businessType) : type[Number(item.pointsType) - 1]) || '未知状态' }}
           </view>
           <view class="text-[#FF4A39]">
-            {{ item?.variablePoints || 0 }}
+            {{ item?.pointsTypeName }}{{ item?.variablePoints || 0 }}
           </view>
         </view>
         <view class="mt-20rpx flex items-center justify-between text-28rpx text-[#AAAAAA]">

+ 52 - 7
src/subPack-refueling/commonTab/index.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import router from '@/router'
-
 definePage({
   name: 'refueling-tabbar',
   islogin: false,
@@ -9,14 +7,60 @@ definePage({
   },
 })
 
+onMounted(() => {
+  console.log('触发加载')
+  getPayQrcode()
+})
+
 function refuelingPay() {
   console.log('触发跳转')
-  router.push({ name: 'refueling-webview' })
-  // uni.navigateToMiniProgram({
-  //   appId: 'wx0d252f6ed9755862', // 滴滴加油小程序appId
-  //   path: 'packageA/pages/open-energy-pay/index?orderId=&tradeId=&appId=wx43b5b906cc30ed0b&path=/pages/index/index&envVersion=小程序回跳环境', // 滴滴加油收银台页面地址,需要拼接orderId和tradeId
-  //   envVersion: 'release', // 固定release
+  // router.push({ name: 'refueling-webview' })
+  // wx.openOfficialAccountArticle({
+  //   url: 'https://smqjh.admin.zswlgz.com/test.html', // 此处填写公众号的原始 ID
+  //   success: (res) => {
+  //   },
+  //   fail: (res) => {
+  //     console.log(res, 'err')
+  //   },
   // })
+  uni.navigateToMiniProgram({
+    appId: 'wx0d252f6ed9755862', // 滴滴加油小程序appId
+    path: 'packageA/pages/open-energy-pay/index?orderId=&tradeId=&appId=wx43b5b906cc30ed0b&path=/pages/index/index&envVersion=小程序回跳环境', // 滴滴加油收银台页面地址,需要拼接orderId和tradeId
+    envVersion: 'release', // 固定release
+  })
+}
+
+const payQrCode = ref('')
+async function getPayQrcode() {
+  const res = await Apis.refueling.getPayCode({
+    data: {
+      content: 'https://static.am.xiaojukeji.com/cf-terminal/oil/thanos-fe-oil/pages/open-energy-h5-pay/index.html?orderId=3521815091021431239&tradeId=20260226b3dd729612c482ab35c26879ca59118a10560142',
+    },
+  })
+  payQrCode.value = res.data
+}
+function testClick() {
+  uni.previewImage({
+    // 需要预览的图片链接列表
+    urls: [payQrCode.value],
+    // 当前显示图片的链接
+    current: payQrCode.value,
+    // 图片指示器样式
+    indicator: 'default',
+    // 是否可循环预览
+    loop: false,
+    showmenu: true,
+    // 长按图片显示操作菜单
+    longPressActions: {
+      itemList: ['发送给朋友', '保存到相册', '识别图中二维码'],
+    },
+    success: (res) => {
+      console.log('previewImage res', res)
+    },
+    fail: (err) => {
+      console.log('previewImage err', err)
+    },
+  })
 }
 </script>
 
@@ -25,6 +69,7 @@ function refuelingPay() {
     <wd-button @click="refuelingPay">
       加油充值
     </wd-button>
+    <image :src="payQrCode" @click="testClick" />
   </view>
 </template>
 

+ 1 - 1
src/subPack-refueling/webView/index.vue

@@ -6,7 +6,7 @@ definePage({
     navigationBarTitleText: '支付',
   },
 })
-const url = ref('https://static.am.xiaojukeji.com/cf-terminal/oil/thanos-fe-oil/pages/open-energy-h5-pay/index.html?orderId=3521815090950710849&tradeId=20260130e21328dee081108086896a3c4e630e9926408709&redirectUrl=')
+const url = ref('https://smqjh.admin.zswlgz.com/test.html')
 </script>
 
 <template>