Browse Source

条件编译

template
liruiqiang 4 weeks ago
parent
commit
bcbc1f1d98
  1. 2
      src/pages/goods/goods.vue
  2. 18
      src/pages/login/login.vue
  3. 2
      src/pages/my/my.vue
  4. 2
      src/pagesOrder/detail/detail.vue

2
src/pages/goods/goods.vue

@ -95,9 +95,11 @@
<view class="toolbar" :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }"> <view class="toolbar" :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }">
<view class="icons"> <view class="icons">
<button class="icons-button"><text class="icon-heart"></text>收藏</button> <button class="icons-button"><text class="icon-heart"></text>收藏</button>
<!-- #ifdef MP-WEIXIN -->
<button class="icons-button" open-type="contact"> <button class="icons-button" open-type="contact">
<text class="icon-handset"></text>客服 <text class="icon-handset"></text>客服
</button> </button>
<!-- #endif -->
<navigator class="icons-button" url="/pages/cart/cart2"> <navigator class="icons-button" url="/pages/cart/cart2">
<text class="icon-cart"></text>购物车 <text class="icon-cart"></text>购物车
</navigator> </navigator>

18
src/pages/login/login.vue

@ -7,15 +7,19 @@
</view> </view>
<view class="login"> <view class="login">
<!-- 网页端表单登录 --> <!-- 网页端表单登录 -->
<!-- <input v-model="form.account" class="input" type="text" placeholder="请输入用户名/手机号码" />
<!-- #ifdef H5 -->
<input v-model="form.account" class="input" type="text" placeholder="请输入用户名/手机号码" />
<input v-model="form.password" class="input" type="text" password placeholder="请输入密码" /> <input v-model="form.password" class="input" type="text" password placeholder="请输入密码" />
<button @tap="onSubmit" class="button phone">登录</button> -->
<button @tap="onSubmit" class="button phone">登录</button>
<!-- #endif -->
<!-- 小程序端授权登录 --> <!-- 小程序端授权登录 -->
<!-- #ifdef MP-WEIXIN -->
<button class="button phone" open-type="getPhoneNumber" @getphonenumber="onGetphonenumber"> <button class="button phone" open-type="getPhoneNumber" @getphonenumber="onGetphonenumber">
<text class="icon icon-phone"></text> <text class="icon icon-phone"></text>
手机号快捷登录 手机号快捷登录
</button> </button>
<!-- #endif -->
<view class="extra"> <view class="extra">
<view class="caption"> <view class="caption">
<text>其他登录方式</text> <text>其他登录方式</text>
@ -39,11 +43,12 @@ import { postLoginAPI, postLoginWxMinAPI, postLoginWxMinSimpleAPI } from '@/serv
import { useMemberStore } from '@/stores' import { useMemberStore } from '@/stores'
import type { LoginResult } from '@/types/member' import type { LoginResult } from '@/types/member'
// #ifdef MP-WEIXIN
// code // code
let code = '' let code = ''
onLoad(async () => { onLoad(async () => {
// const res = await wx.login()
// code = res.code
const res = await wx.login()
code = res.code
}) })
// //
@ -56,6 +61,7 @@ const onGetphonenumber: UniHelper.ButtonOnGetphonenumber = async (ev) => {
// //
loginSuccess(res.result) loginSuccess(res.result)
} }
// #endif
// //
const onGetphonenumberSimple = async () => { const onGetphonenumberSimple = async () => {
@ -64,9 +70,10 @@ const onGetphonenumberSimple = async () => {
loginSuccess(res.result) loginSuccess(res.result)
} }
// #ifdef H5
// 13123456789 123456使 // 13123456789 123456使
const form = ref({ const form = ref({
account: '13123456789',
account: '18730880302',
password: '', password: '',
}) })
@ -75,6 +82,7 @@ const onSubmit = async () => {
const res = await postLoginAPI(form.value) const res = await postLoginAPI(form.value)
loginSuccess(res.result) loginSuccess(res.result)
} }
// #endif
const loginSuccess = (profile: LoginResult) => { const loginSuccess = (profile: LoginResult) => {
// //

2
src/pages/my/my.vue

@ -59,7 +59,9 @@
{{ item.text }} {{ item.text }}
</navigator> </navigator>
<!-- 客服 --> <!-- 客服 -->
<!-- #ifdef MP-WEIXIN -->
<button class="contact icon-handset" open-type="contact">售后</button> <button class="contact icon-handset" open-type="contact">售后</button>
<!-- #endif -->
</view> </view>
</view> </view>
<!-- 猜你喜欢 --> <!-- 猜你喜欢 -->

2
src/pagesOrder/detail/detail.vue

@ -318,9 +318,11 @@ const onOrderPay = async () => {
// //
await getPayMockAPI({ orderId: query.id }) await getPayMockAPI({ orderId: query.id })
} else { } else {
// #ifdef MP-WEIXIN
// + // +
const res = await getPayWxPayMiniPayAPI({ orderId: query.id }) const res = await getPayWxPayMiniPayAPI({ orderId: query.id })
await wx.requestPayment(res.result) await wx.requestPayment(res.result)
// #endif
} }
// //
uni.redirectTo({ url: `/pagesOrder/payment/payment?id=${query.id}` }) uni.redirectTo({ url: `/pagesOrder/payment/payment?id=${query.id}` })

Loading…
Cancel
Save