111

src/i18n/zh.js

@@ -10,6 +10,8 @@ export default {
         userName: '当前账号',
         membership: '购买会员',
         zyhy:'会员权益',
+        gjhy: '高级会员',
+        zyhys: '专业会员',
         expiration:'有效期{num}年',
         payCenter: "支付中心",
         wx:'微信支付',

src/stores/user.ts

@@ -7,7 +7,7 @@ export const useUserStore = defineStore('user', {
     return {
       token: localStorage.getItem('token'),
       openId: localStorage.getItem('openId'),
-      isEur: window.location.hostname.includes('eur'),
+      isEur: !window.location.hostname.includes('eur'),
     }
   },
   getters:{ // 相当于vue里面的计算属性，可以缓存数据

src/views/mobile/index.vue

@@ -51,7 +51,6 @@ async function handelPay() {
     openId:openId.value,
   }
   const res = await openPay(apiData)
-  console.log('apiData', res)
 
   if (is_weixn.value) {
     //微信内支付
@@ -64,7 +63,6 @@ async function handelPay() {
       text: t('payInfo.userName'),
       type: 'err',
       callback: (val) => {
-        console.log('我的测试计划', val)
       }
     })
   }
@@ -159,7 +157,6 @@ async function handleWxlogin(wxAppId: string) {
   } else if (code) {
     //存在code 换取openid
     const res = await wxLogin({ code, orderSn: orderSn.value })
-    console.log('openid',res)
     if (res.openid) {
       userStore.setUserOpenId(res.openid)
     }
@@ -186,8 +183,9 @@ async function handleOpenPay() {
         </div>
         <div class="cell" v-if="orderDetal.orderType == 'incrementOrder'">
           <span>{{$t('payInfo.membership')}}</span>
-          <span>{{$t('payInfo.zyhy')}}
-            <span v-if="orderDetal.goodsInfo && orderDetal.goodsInfo[0]">× {{orderDetal.goodsInfo[0].count}}</span>
+          <span v-if="orderDetal.goodsInfo && orderDetal.goodsInfo[0]">
+            {{ orderDetal.goodsInfo[0].type==1?$t('payInfo.gjhy'):isEur?$t('payInfo.zyhys'):$t('payInfo.zyhy') }}
+            <span>× {{orderDetal.goodsInfo[0].count}}</span>
             <!-- <span v-else>1</span> -->
             <span v-if="orderDetal.orderType == 'incrementOrder'">，{{ $t(`payInfo.expiration`,{num:1}) }}</span>
             </span>

src/views/pc/index.vue

@@ -17,7 +17,6 @@ const { locale: language, t  } = useI18n()
 let t1 = null
 const route = useRoute()
 const { isEur, info } = useUserStore()
-console.log('route', route)
 const orderSn = ref(route.query.id || GetRequest('orderSn'))
 let { $cdn } = getCurrentInstance()?.proxy
 let PAYSID = {
@@ -35,7 +34,6 @@ const response = ref({
   price: 0.01,
   src: ''
 })
-console.log('orderSn', orderSn, route)
 onMounted(() => {
   getDetial()
   getCode()
@@ -51,11 +49,9 @@ function inverRequest() {
 async function handleQueryOrderStatus() {
   if (t1) {
     let response = await getOrderInfo(orderSn.value)
-    console.log('response', response)
     orderDetal.value = response
     if (response.payStatus === 0) {
       //未支付
-      console.log('未支付')
     } else {
       //支付失败
       t1 = null
@@ -117,8 +113,11 @@ async function getCode() {
               <span v-for="(item,index) in orderDetal.goodsInfo" :key="index" style="margin-right:10px">
                 <span v-if="item">
                   <span v-if="index != 0">、</span>
-                  <span style="margin-right:5px">
-                    {{ orderDetal.orderType == 'incrementOrder'?$t('payInfo.zyhy'):orderDetal.orderType == 'downOrder'?`${item.name} (${item.sceneNum})`:item.name }}
+                  <span style="margin-right:5px" v-if="orderDetal.orderType != 'incrementOrder'">
+                    {{ orderDetal.orderType == 'downOrder'?`${item.name} (${item.sceneNum})`:item.name }}
+                  </span>
+                  <span style="margin-right:5px" v-else>
+                    {{ item.type==1?$t('payInfo.gjhy'):isEur?$t('payInfo.zyhys'):$t('payInfo.zyhy') }}
                   </span>
                    <span v-if="orderDetal.orderType != 'downOrder'">× {{item.count}}</span>
                 </span>