XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i

Browse Source
This commit is contained in:
YuanHuakk
2023-10-08 22:53:13 +08:00
parent b883b02fb9
commit e36d60d015
83 changed files with 18303 additions and 9590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/pages/users/account/index.vue
View File

@@ -3,22 +3,28 @@ import { ref } from "vue";
import { showToast, useLoad, getStorageSync } from "@tarojs/taro";
import { getIntegralDetail, getBeanDetail } from "@/api/user";
const tabValue = ref(0);
const tabValue = ref(1);
const tabsList = ref([
{
title: "积分明细",
value: 0,
title: "兑换明细",
value: 1,
},
{
title: "赠送明细",
value: 3,
},
{
title: "豆子明细",
value: 1,
value: 2,
},
]);
const tabChange = (index: number) => {
tabValue.value = index;
data.value = [];
getList();
page.value.PageNum = 1;
};
const data = ref([]);
@@ -44,16 +50,16 @@ const pageChange = (e: number) => {
const getList = async () => {
try {
let res: any;
if (tabValue.value === 0) {
res = await getBeanDetail({
PageNum: page.value.PageNum,
PageSize: page.value.PageSize,
});
const newData = {
PageNum: page.value.PageNum,
PageSize: page.value.PageSize,
Type: tabValue.value,
};
if (tabValue.value === 1 || tabValue.value === 3) {
res = await getBeanDetail(newData);
} else {
res = await getIntegralDetail({
PageNum: page.value.PageNum,
PageSize: page.value.PageSize,
});
delete data.Type;
res = await getIntegralDetail(newData);
}
data.value = res.data.data || [];
page.value.ItemCount = res.data.count;
@@ -96,20 +102,24 @@ const getList = async () => {
</view>
</view>
<view v-if="data.length > 0">
<view v-if="tabValue === 0">
<view v-if="tabValue === 1 || tabValue === 3">
<view
class="card-list"
v-for="(item, index) in (data as any[])"
:key="index"
>
<view class="left">
<view>购买商品：{{ item.goods_name }}</view>
<view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
<view>商品：{{ item.goods_name }}</view>
<view>时间：{{ item.add_time.slice(0, 10) }}</view>
</view>
<view class="right">
<view style="color: green"
<view v-if="tabValue === 1" style="color: green"
>-<text>{{ item.number }}积分</text></view
>
<view v-if="tabValue === 3" style="color: red"
>+<text>{{ item.number }}</text
>积分</view
>
</view>
</view>
</view>
@@ -120,9 +130,9 @@ const getList = async () => {
:key="index"
>
<view class="left">
<view>购买商品：{{ item.goods_name }}</view>
<view>支付金额：{{ item.order_number }}元</view>
<view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
<view class="text">商品：{{ item.goods_name }}</view>
<view>金额：{{ item.order_number }}元</view>
<view>时间：{{ item.add_time.slice(0, 10) }}</view>
</view>
<view class="right">
<view style="color: red"
@@ -228,5 +238,25 @@ const getList = async () => {
padding: 20px;
justify-content: space-between;
align-items: center;
.left {
width: 500px;
.text {
text-align: left;
width: 100%;
// 超出一行隐藏
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
word-break: break-word;
}
}
.right {
flex: 1;
text-align: right;
}
}
</style>

3
src/pages/users/bindPhone/index.config.ts
View File

@@ -0,0 +1,3 @@
export default definePageConfig({
navigationBarTitleText: '手机号登录'
})

167
src/pages/users/bindPhone/index.vue
View File

@@ -1,15 +1,166 @@
<script lang="ts">
import {defineComponent} from 'vue'
<script lang="ts" setup>
import Taro from "@tarojs/taro";
import { ref } from "vue";
import { getVerifyCode, phoneLogin } from "@/api/user";
import logoImg from "../../../static/logo.jpg";
export default defineComponent({
name: "index"
})
Taro.useLoad((options) => {
console.log(options);
});
const basicData = ref({
phone: "",
code: "",
});
const smsDisabled = ref(false);
const smsStr = ref("获取验证码");
// 获取验证码
const getSmsCode = async () => {
if (
!/^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(
basicData.value.phone
)
)
return Taro.showToast({
title: "请输入正确的手机号码",
icon: "none",
});
await getVerifyCode({
phone: basicData.value.phone.toString(),
});
smsDisabled.value = true;
let time = 60;
const timer = setInterval(() => {
time--;
smsStr.value = `${time}s`;
if (time === 0) {
clearInterval(timer);
smsDisabled.value = false;
smsStr.value = "获取验证码";
}
}, 1000);
};
const login = async () => {
if (
!/^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(
basicData.value.phone
)
)
return Taro.showToast({
title: "请输入正确的手机号码",
icon: "none",
});
if (!basicData.value.code)
return Taro.showToast({
title: "请输入验证码",
icon: "none",
});
const res = await phoneLogin({
Phone: basicData.value.phone,
Code: basicData.value.code,
Referee: Taro.getStorageSync("bind_id") || "",
});
Taro.showToast({
title: res.msg,
icon: "success",
duration: 2000,
});
Taro.setStorageSync("token", res.data.token);
setTimeout(() => {
Taro.removeStorageSync("bind_id");
Taro.switchTab({
url: "/pages/user/index",
});
}, 2000);
};
</script>
<template>
$END$
<view class="wrapper">
<image src="../../../static/wechat_login.jpg" />
<view class="logo">
<image :src="logoImg" />
<view>捷兑通</view>
</view>
<view class="center">
<nut-form :model-value="basicData" ref="RefForm">
<nut-form-item label="手机号码：">
<nut-input
v-model="basicData.phone"
class="nut-input-text"
placeholder="请输入手机号码"
type="text"
/>
</nut-form-item>
<nut-form-item label="验证码：">
<view style="display: flex">
<nut-input
v-model="basicData.code"
class="nut-input-text"
placeholder="请输入验证码"
type="text"
/>
<nut-button
size="mini"
style="margin-left: 10px"
@click="getSmsCode"
:disabled="smsDisabled"
>{{ smsStr }}</nut-button
>
</view>
</nut-form-item>
<nut-form-item>
<nut-button type="primary" block @click="login"
>登录</nut-button
>
</nut-form-item>
</nut-form>
</view>
</view>
</template>
<style scoped lang="scss">
<style lang="scss">
page {
background: #fff;
}
</style>
.wrapper {
position: relative;
image {
width: 100%;
height: 838px;
}
.logo {
position: absolute;
top: 35%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
font-size: 35px;
line-height: 70px;
image {
width: 200px;
height: 200px;
border-radius: 50%;
}
}
.center {
position: absolute;
top: 55%;
width: 100%;
display: flex;
flex-direction: column;
justify-content: flex-start;
padding: 0px 10px;
}
}
</style>

20
src/pages/users/distribution/index.vue
View File

@@ -12,13 +12,13 @@
<view>{{ item.label }}</view>
</view>
</view>
<view style="width: 45%;"></view>
<view style="width: 45%"></view>
</view>
<!-- 二维码弹窗 -->
<nut-popup :style="{ padding: '30px 50px' }" v-model:visible="show">
<view class="popup">
<view>推荐人二维码绑定</view>
<image :src="urlCode" />
<image style="margin-top: 10px" :src="urlCode" />
</view>
</nut-popup>
</view>
@@ -28,6 +28,7 @@
import { ref } from "vue";
import { IconFont } from "@nutui/icons-vue-taro";
import Taro from "@tarojs/taro";
import { getRefereeCode } from "@/api/user";
const show = ref(false);
@@ -51,12 +52,19 @@ const list = ref([
},
]);
const clickItem = (item: any) => {
const clickItem = async (item: any) => {
if (item.id === 1) {
urlCode.value = `https://api.pwmqr.com/qrcode/create?url=${Taro.getStorageSync(
"token"
)}`;
// urlCode.value = `https://api.pwmqr.com/qrcode/create?url=${Taro.getStorageSync(
// "token"
// )}`;
Taro.showLoading({
title: "加载中",
mask: true,
});
const res = await getRefereeCode();
urlCode.value = `data:image/png;base64,${res.data.data}`;
show.value = true;
Taro.hideLoading();
} else if (item.id === 2) {
Taro.navigateTo({
url: "/pages/users/distribution/integral/index",

7
src/pages/users/distribution/integral/index.vue
View File

@@ -9,7 +9,12 @@
<view class="left">
<view>昵称：{{ item.nick_name }}</view>
<view>购买商品：{{ item.goods_name }}</view>
<view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
<view
>订单价格：<text style="color: red">{{
item.order_number
}}</text></view
>
<view>购买时间：{{ item.add_time.slice(0, 10) }}</view>
</view>
<view class="right">
<view style="color: red"

4
src/pages/users/login/index.config.ts
View File

@@ -0,0 +1,4 @@
export default definePageConfig({
navigationBarTitleText: '登录',
navigationStyle: 'custom'
})

90
src/pages/users/login/index.vue
View File

@@ -1,15 +1,89 @@
<script lang="ts">
import {defineComponent} from 'vue'
<script setup lang="ts">
import Taro from "@tarojs/taro";
import UserModal from "@/components/UserModal.vue";
import { ref } from "vue";
import logoImg from "../../../static/logo.jpg";
export default defineComponent({
name: "index"
})
const isShow = ref(false);
const getCode = () => {
Taro.showLoading({
title: "授权中...",
mask: true,
});
Taro.login({
success: (res) => {
console.log(res);
Taro.setStorageSync("wx_code", res.code);
isShow.value = true;
},
complete: () => {
Taro.hideLoading();
},
});
};
const toPage = () => {
Taro.navigateTo({
url: "/pages/users/bindPhone/index?type=1",
});
};
</script>
<template>
$END$
<view class="wrapper">
<image src="../../../static/wechat_login.jpg" />
<view class="logo">
<image :src="logoImg" />
<view>捷兑通</view>
</view>
<view class="center">
<nut-button type="success" @click="getCode">微信登录</nut-button>
<nut-button style="margin-top: 15px" @click="toPage"
>手机号登录</nut-button
>
</view>
<UserModal v-model:isShow="isShow" @closeEdit="isShow = false" />
</view>
</template>
<style scoped lang="scss">
<style lang="scss">
page {
background: #fff;
}
</style>
.wrapper {
position: relative;
image {
width: 100%;
height: 838px;
}
.logo {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
text-align: center;
font-size: 35px;
line-height: 70px;
image {
width: 200px;
height: 200px;
border-radius: 50%;
}
}
.center {
position: absolute;
top: 80%;
width: 100%;
display: flex;
flex-direction: column;
justify-content: flex-start;
padding: 10px 100px;
}
}
</style>

10
src/pages/users/order_list/index.vue
View File

@@ -6,6 +6,7 @@ import {
showToast,
navigateTo,
setStorageSync,
useDidShow,
} from "@tarojs/taro";
import Pay from "@/components/Pay.vue";
import { getIntegralOrderList } from "@/api/user";
@@ -63,6 +64,9 @@ const orderList = ref<OrderList[]>([]);
useLoad((options) => {
tabValue.value = Number(options.type);
});
useDidShow(() => {
getList();
});
@@ -205,10 +209,10 @@ const getTj = async () => {
<view class="center">
<view class="top">
<image :src="item.BindGoods.cover" />
<view class="title">{{ item.BindGoods.name }} </view>
<view class="title">{{ item.BindGoods?.name }} </view>
<view class="right">
<view>{{ item.number }}</view>
<view>x{{ item.count }}</view>
<view>{{ item.BindGoods?.number }}</view>
<view>x{{ item?.count }}</view>
</view>
</view>
<!-- <view

20
src/pages/users/order_list_detail/index.vue
View File

@@ -16,12 +16,12 @@
<view class="mer-info">
<view class="left">
<view>
<text>{{ goodInfo.BindStore.name }}</text>
<text>{{ goodInfo.BindStore.phone }}</text>
<text>{{ goodInfo.BindStore?.name }}</text>
<text>{{ goodInfo.BindStore?.phone }}</text>
</view>
<nut-ellipsis
:rows="2"
:content="goodInfo.BindStore.address"
:content="goodInfo.BindStore?.address"
direction="end"
></nut-ellipsis>
</view>
@@ -43,12 +43,12 @@
<nut-cell>
<template #default>
<view class="top">
<image :src="goodInfo.BindGoods.cover" />
<image :src="goodInfo.BindGoods?.cover" />
<view class="title"
>{{ goodInfo.BindGoods.name }}
>{{ goodInfo.BindGoods?.name }}
</view>
<view class="right">
<view>{{ goodInfo.number }}</view>
<view>{{ goodInfo.BindGoods?.number }}</view>
<view>x{{ goodInfo.count }}</view>
</view>
</view>
@@ -57,15 +57,13 @@
<nut-cell title="订单号:" :desc="goodInfo.oid"></nut-cell>
<nut-cell
title="下单时间:"
:desc="goodInfo.add_time.slice(0, 19)"
:desc="goodInfo.add_time?.slice(0, 19)"
></nut-cell>
<nut-cell
v-if="goodInfo.expires !== 0"
title="商品过期时间:"
title="订单过期时间:"
:desc="
dayjs
.unix(goodInfo.expires)
.format('YYYY-MM-DD HH:mm:ss')
dayjs.unix(goodInfo.expires).format('YYYY-MM-DD HH:mm:ss')
"
></nut-cell>
<nut-cell

97
src/pages/users/settled_mer/index.vue
View File

@@ -31,6 +31,11 @@ const formValue = ref<any>({
back: [],
head_photo: [],
img: [],
bank: "",
bank_card: "",
bank_name: "",
bank_user: "",
address: "",
});
const merGooList = ref([]);
@@ -78,13 +83,18 @@ const onOk = async () => {
front: formValue.value.front[0]?.url,
back: formValue.value.back[0]?.url,
head_photo: formValue.value.head_photo[0]?.url,
img: formValue.value.img.map((item: any) => item.url),
img: formValue.value.img.map((item: any) => item.url).join(","),
};
const res = await applyMer(data);
Taro.showToast({
title: res.msg,
icon: "none",
});
setTimeout(() => {
Taro.redirectTo({
url: "/pages/index/index",
});
}, 3000);
} catch (e) {
Taro.showToast({
title: e.msg,
@@ -243,6 +253,91 @@ const submit = () => {
</nut-button>
</view>
</nut-form-item>
<nut-form-item
required
label="店铺地址"
prop="address"
:rules="[
{
required: true,
message: '请输入店铺详细地址',
},
]"
>
<input
type="text"
v-model="formValue.address"
placeholder="请输入店铺详细地址"
/>
</nut-form-item>
<nut-form-item
required
label="法人"
prop="bank_user"
:rules="[
{
required: true,
message: '请输入法人',
},
]"
>
<input
type="text"
v-model="formValue.bank_user"
placeholder="请输入法人"
/>
</nut-form-item>
<nut-form-item
required
label="账户名称"
prop="bank_name"
:rules="[
{
required: true,
message: '请输入账户名称',
},
]"
>
<input
type="text"
v-model="formValue.bank_name"
placeholder="请输入账户名称"
/>
</nut-form-item>
<nut-form-item
required
label="开户银行"
prop="bank"
:rules="[
{
required: true,
message: '请输入银行名称',
},
]"
>
<input
type="text"
v-model="formValue.bank"
placeholder="请输入银行名称"
/>
</nut-form-item>
<nut-form-item
required
label="银行卡号"
prop="bank_card"
:rules="[
{
required: true,
message: '请输入银行卡号',
},
]"
>
<input
type="text"
v-model="formValue.bank_card"
placeholder="请输入银行卡号"
/>
</nut-form-item>
<nut-form-item
required
label="商户类型"

3
src/pages/users/user_setting/index.vue
View File

@@ -22,6 +22,7 @@ const logOut = () => {
if (res.confirm) {
Taro.removeStorageSync("token");
Taro.removeStorageSync("userInfo");
Taro.removeStorageSync("mer_type");
Taro.reLaunch({
url: "/pages/index/index",
});
@@ -34,7 +35,7 @@ const logOut = () => {
const chooseavatar = (e: any) => {
Taro.uploadFile({
url: `${BASE_URL}/app/upload`,
url: `${BASE_URL}/upload`,
filePath: e.detail.avatarUrl,
name: "file",
header: {