feat(custom): build

This commit is contained in:
2023-11-28 17:59:45 +08:00
parent 22868fdf2c
commit d5c4651665
39 changed files with 5779 additions and 10624 deletions

View File

@@ -142,11 +142,9 @@ const columns = ref([
]);
const getData = async () => {
const mer_type = Taro.getStorageSync("mer_type");
const user_info = Taro.getStorageSync("userInfo");
const res = await orderStatistics({
bid: user_info.bid,
type: mer_type,
bid: user_info.data.bid,
});
orderInfo.value = res.data;
};

View File

@@ -38,24 +38,26 @@
}}</view> -->
</view>
<view class="line"></view>
<view class="center">
<view class="center" v-for="(itm, idx) in item.OrderGoods" :key="idx">
<view class="top">
<image :src="item.BindGoods.cover" />
<view class="title">{{ item.BindGoods.name }} </view>
<image :src="itm.Goods.cover" />
<view class="title">{{ itm.Goods.name }} </view>
<view class="right">
<view>{{ item.number }}</view>
<view>x{{ item.count }}</view>
<view>{{ itm.pay_price }}</view>
<view>{{ itm.pay_integral }}积分</view>
<view>x{{ itm.number }}</view>
</view>
</view>
<!-- <view
class="bom"
style="text-align: right; font-size: 13px"
>
{{ item.count }}件商品,实付积分:
<text style="color: red">{{ item.number }}</text>
</view> -->
</view>
<view class="line"></view>
<view class="bom" style="text-align: right">
{{ item.count }}件商品,支付方式:{{
item.pay_type === 1 ? "微信" : "积分"
}},实付:
<text style="color: red">{{
item.pay_type === 1 ? item.price : item.exchange
}}</text>
</view>
</view>
</view>
<nut-empty v-else description="暂无订单数据"></nut-empty>
@@ -65,7 +67,7 @@
<script setup lang="ts">
import { ref } from "vue";
import Taro from "@tarojs/taro";
import { getJfOrderList, getActiveOrderList } from "../../../../api/admin";
import { getActiveOrderList } from "../../../../api/admin";
const opt = ref([
{
@@ -101,18 +103,12 @@ Taro.useLoad((options) => {
const getData = async () => {
try {
const mer_type = Taro.getStorageSync("mer_type");
const user_info = Taro.getStorageSync("userInfo");
let res: any = null;
const data = {
bid: user_info.bid,
bid: user_info.data.bid,
status: tabVal.value,
};
if (mer_type === 1) {
res = await getActiveOrderList(data);
} else {
res = await getJfOrderList(data);
}
const res = await getActiveOrderList(data);
dataList.value = res.data.data;
} catch (error) {
Taro.showToast({

View File

@@ -246,11 +246,9 @@ const setChooseValue = (ref: any) => {
const getData = async () => {
try {
const mer_type = Taro.getStorageSync("mer_type");
const user_info = Taro.getStorageSync("userInfo");
const res = await growthRate({
bid: user_info.bid,
type: mer_type,
bid: user_info.data.bid,
status: where.value.status,
StartTime: where.value.start,
EndTime: where.value.end,

View File

@@ -31,9 +31,8 @@ const scanCode = () => {
scanType: ["qrCode"],
success: async (res) => {
try {
const mer_type = JSON.parse(Taro.getStorageSync("mer_type"));
Taro.navigateTo({
url: `/pages/admin/verify/verify_list/index?oid=${res.result}&mer_type=${mer_type}`,
url: `/pages/admin/verify/verify_list/index?oid=${res.result}`,
});
} catch (error) {
Taro.showToast({

View File

@@ -3,17 +3,29 @@
<view class="card">
<view>订单号{{ goodInfo.oid }}</view>
<view class="line"></view>
<view class="container">
<image class="image" :src="goodInfo.cover" mode="widthFix"></image>
<view
class="container"
v-for="(item, index) in goodInfo.OrderGoods"
:key="index"
>
<image class="image" :src="item.Goods.cover" mode="widthFix"></image>
<view class="info">
<view class="title">{{ goodInfo.goods_name }}</view>
<view class="title">商品名称{{ item.Goods.name }}</view>
<view class="num"
>数量: <text style="color: red">{{ goodInfo.count }}</text></view
>数量: <text style="color: red">{{ item.number }}</text></view
>
</view>
<view></view>
</view>
<view class="line"></view>
<text>支付方式{{ goodInfo.pay_type === 1 ? "微信" : "积分" }}</text
>
<text
>总计{{
goodInfo.pay_type === 1 ? goodInfo.price : goodInfo.exchange
}}</text
>
<view class="line"></view>
<view class="cz">
<nut-button size="small" type="primary" @click="subVerify"
>确定核销</nut-button
@@ -25,12 +37,7 @@
<script setup lang="ts">
import Taro from "@tarojs/taro";
import {
getJfVerifyList,
getActiveVerifyList,
activeOrderVerify,
orderVerify,
} from "@/api/admin";
import { getActiveVerifyList, activeOrderVerify } from "@/api/admin";
import { ref } from "vue";
const opt = ref<any>({});
@@ -43,16 +50,9 @@ Taro.useLoad((options) => {
const goodInfo = ref<any>({});
const getData = async (options: any) => {
let res;
if (Number(options.mer_type) === 1) {
res = await getActiveVerifyList({
oid: options.oid,
});
} else {
res = await getJfVerifyList({
oid: options.oid,
});
}
const res = await getActiveVerifyList({
oid: options.oid,
});
if (!res.data.data.oid) {
Taro.showToast({
title: "没有此订单",
@@ -69,16 +69,9 @@ const getData = async (options: any) => {
const subVerify = async () => {
try {
let res;
if (Number(opt.value.mer_type) === 1) {
res = await activeOrderVerify({
oid: goodInfo.value.oid,
});
} else {
res = await orderVerify({
oid: goodInfo.value.oid,
});
}
const res = await activeOrderVerify({
oid: goodInfo.value.oid,
});
Taro.showToast({
title: res.msg,
icon: "none",
@@ -110,8 +103,8 @@ const subVerify = async () => {
display: flex;
image {
width: 200px;
height: 100%;
width: 150rpx;
height: 150rpx;
border-radius: 7px;
display: block;
}