tangning 4 kuukautta sitten
vanhempi
commit
3119cf362d
7 muutettua tiedostoa jossa 27 lisäystä ja 5 poistoa
  1. 2 0
      src/i18n/en.js
  2. 2 0
      src/i18n/ja.js
  3. 2 0
      src/i18n/kr.js
  4. 2 0
      src/i18n/zh.js
  5. 9 0
      src/views/mobile/index.vue
  6. 8 3
      src/views/pc/index.vue
  7. 2 2
      vite.config.ts

+ 2 - 0
src/i18n/en.js

@@ -55,6 +55,8 @@ export default {
         "countNum": "{num}Product(s) In Total",
         "vip": "Purchase Member",
         "goqy": "Purchase Accessory",
+        "cooperationOrder": 'Add collaboration',
+        "cooperationOrderName": "Add {count} authors",
         'downdesc': 'downloaded',
         "addBuy": "Add to Cart",
         "confirmOrder": "Confirm Order",

+ 2 - 0
src/i18n/ja.js

@@ -80,6 +80,8 @@ export default {
         "nowAccount": "現在のアカウント番号",
         "vip": "購買メンバー",
         'goqy': '部品を購入します',
+        "cooperationOrder": 'コラボレーションを追加',
+        "cooperationOrderName": "{count} 人の著者を追加",
         "downdesc": 'シーンのダウンロード',
         "payType": "支払い方法",
         "aliPay": "アリペイです",

+ 2 - 0
src/i18n/kr.js

@@ -82,6 +82,8 @@ export default {
         "nowAccount": "현재 계정",
         "vip": "구매회원",
         'goqy': '부품 구매',
+        "cooperationOrder": '협업 추가',
+        "cooperationOrderName": "{count}명의 작성자 추가",
         "downdesc": "장면 다운로드",
         "payType": "결제방식",
         "aliPay": "알리페이",

+ 2 - 0
src/i18n/zh.js

@@ -82,6 +82,8 @@ export default {
         "nowAccount": "当前帐号",
         "vip": "购买会员",
         'goqy': '购买配件',
+        "cooperationOrder": '添加协作',
+        "cooperationOrderName": "添加些作者{count}个",
         "downdesc": '场景下载',
         "payType": "支付方式",
         "aliPay": "支付宝",

+ 9 - 0
src/views/mobile/index.vue

@@ -204,6 +204,15 @@ async function handleOpenPay() {
           </span>
         </div>
         </div>
+        <div class="item" v-else-if="orderDetal.orderType == 'cooperationOrder'">
+          <div class="cell" style="border:none">
+            <span style="max-width:85px">{{ $t(`mall.cooperationOrder`) }}</span>
+            <span></span>
+          </div>
+          <div class="cell" v-for="(item,index) in orderDetal.goodsInfo" :key="index" style="border:none">
+          <span style="max-width:230px;line-height: 16px;">{{ $t('mall.cooperationOrderName',{count: item.count }) }}</span>
+        </div>
+        </div>
         <div class="cell" v-else>
           <span style="min-width:85px">{{ $t(`mall.${orderDetal.orderType == 'downOrder'?'downdesc':'goqy'}`) }}</span>
           <span>

+ 8 - 3
src/views/pc/index.vue

@@ -115,13 +115,15 @@ async function getCode() {
             ><span>{{ orderDetal.userName }}</span>
           </div>
           <div class="account">
-            <span class="label"
-              >{{
+            <span class="label">
+              {{
                 $t(
                   `mall.${
                     orderDetal.orderType == 'incrementOrder'
                       ? 'vip'
-                      : orderDetal.orderType == 'downOrder'
+                      : orderDetal.orderType == 'cooperationOrder'
+                      ? 'cooperationOrder'
+                      :  orderDetal.orderType == 'downOrder'
                       ? 'downdesc'
                       : 'goqy'
                   }`
@@ -143,6 +145,9 @@ async function getCode() {
                         : item.nameEn
                     }}
                   </span>
+                  <span style="margin-right: 5px" v-else-if="orderDetal.orderType != 'cooperationOrder'">
+                    {{ $t('payInfo.cooperationOrderName',{count: item.count }) }}
+                  </span>
                   <span style="margin-right: 5px" v-else>
                     {{
                       item.type == 1

+ 2 - 2
vite.config.ts

@@ -44,12 +44,12 @@ export default defineConfig({
   server: {
     proxy: {
       '/service': {
-        target: 'https://test.4dkankan.com/',
+        target: 'https://testeur.4dkankan.com/',
         changeOrigin: true,
         // rewrite: (path) => path.replace(/^\/api/, '')
       },
       '/ucenter': {
-        target: 'https://test.4dkankan.com/',
+        target: 'https://testeur.4dkankan.com/',
         changeOrigin: true,
         // rewrite: (path) => path.replace(/^\/api/, '')
       }