Merge branch 'feature/v3.0' into develop

src/views/Product/Custom.vue

@@ -130,17 +130,17 @@ let allShoppingNum = computed(() => {
   })
   return addNum
 })
-// watch(allShoppingNum, (val) => {
-//   if (val > 100 && paddleShow.value) {
-//     paddleShow.value = false
-//     if (payMethod.value === 'paddle') {
-//       payMethod.value = 'paypal'
-//     }
-//   }
-//   if (val <= 100 && !paddleShow.value) {
-//     paddleShow.value = true
-//   }
-// })
+watch(allShoppingNum, (val) => {
+  if (val > 100 && paddleShow.value) {
+    paddleShow.value = false
+    if (payMethod.value === 'paddle') {
+      payMethod.value = 'paypal'
+    }
+  }
+  if (val <= 100 && !paddleShow.value) {
+    paddleShow.value = true
+  }
+})
 const getShopping = () => {
   get(
     baseUrl + '/api/shopping-cart?vpp_member_id=' + useInfo.value.id
@@ -233,7 +233,7 @@ const payMethod = ref('paypal')
 const countryCode = ref('US')
 const postCode = ref('')
 const paypalLoading = ref(true)
-const paddleShow = ref(false)
+const paddleShow = ref(true)
 
 // 查询支付状态
 const getState = (trade_no, payMethod) => {
@@ -460,6 +460,9 @@ const closeWXpayShow = () => {
   clearTimeout(timer.value)
 }
 
+const privacyUrl = import.meta.env.VITE_PRO_WEB + '/privacy-policy'
+const termUrl = import.meta.env.VITE_PRO_WEB + '/terms_of_service'
+
 updataUserInfo()
 onMounted(() => {
   nextTick(() => {
@@ -711,6 +714,11 @@ onUnmounted(() => {
                 <circle id="loading-inner" cx="75" cy="75" r="50" />
               </svg>
             </div>
+            <div class="text-center mt-12px text-[#808185] text-14px leading-20px">
+              <a :href="privacyUrl" class="hover:text-[#1460F3] underline" target="_blank">Privacy Policy</a>
+              and
+              <a :href="termUrl" class="hover:text-[#1460F3] underline" target="_blank">Terms of Service</a>
+            </div>
           </div>
         </div>
         <div class="card w-500px rounded-8px bg-[#fff] mt-12px">

src/views/Product/ID.vue

@@ -49,8 +49,7 @@ const payMethod = ref('paypal')
 const countryCode = ref('US')
 const postCode = ref('')
 const paypalLoading = ref(true)
-// const paddleShow = ref(true)
-const paddleShow = ref(false)
+const paddleShow = ref(true)
 const paymentID = ref(null)
 
 // 回到上一级
@@ -111,17 +110,17 @@ let useTeamDiscount = computed(() => {
   }
 })
 
-// watch(productNum, () => {
-//   if (productNum.value > 100 && paddleShow.value) {
-//     paddleShow.value = false
-//     if (payMethod.value === 'paddle') {
-//       payMethod.value = 'paypal'
-//     }
-//   }
-//   if (productNum.value <= 100 && !paddleShow.value) {
-//     paddleShow.value = true
-//   }
-// })
+watch(productNum, () => {
+  if (productNum.value > 100 && paddleShow.value) {
+    paddleShow.value = false
+    if (payMethod.value === 'paddle') {
+      payMethod.value = 'paypal'
+    }
+  }
+  if (productNum.value <= 100 && !paddleShow.value) {
+    paddleShow.value = true
+  }
+})
 
 // 查询支付状态
 const getState = (trade_no, payMethod) => {
@@ -350,6 +349,8 @@ const closeWXpayShow = () => {
   clearTimeout(timer.value)
 }
 
+const privacyUrl = import.meta.env.VITE_PRO_WEB + '/privacy-policy'
+const termUrl = import.meta.env.VITE_PRO_WEB + '/terms_of_service'
 updataUserInfo()
 onMounted(() => {
   nextTick(() => {
@@ -494,6 +495,11 @@ onUnmounted(() => {
               <circle id="loading-inner" cx="75" cy="75" r="50" />
             </svg>
           </div>
+          <div class="text-center mt-12px text-[#808185] text-14px leading-20px">
+              <a :href="privacyUrl" class="hover:text-[#1460F3] underline" target="_blank">Privacy Policy</a>
+              and
+              <a :href="termUrl" class="hover:text-[#1460F3] underline" target="_blank">Terms of Service</a>
+            </div>
         </div>
       </div>
     </div>