feat(custom): 新增消息订阅
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-08-27 17:06:59 +08:00
parent f199320de0
commit 1d8532eccf
104 changed files with 2350 additions and 2477 deletions

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "菜单",
navigationBarTitleText: '菜单',
});

View File

@@ -64,4 +64,4 @@ page {
}
}
}
}
}

View File

@@ -9,14 +9,12 @@
direction="vertical"
title-gutter="5"
animated-time="0"
name="tabName"
>
name="tabName">
<nut-tab-pane
v-for="(itm, index) in good_list"
:key="index"
:title="itm.name"
:pane-key="index"
>
:pane-key="index">
<view v-if="itm.Goods.length > 0">
<view class="list" v-for="(item, index) in itm.Goods" :key="index">
<view class="item" @click.stop="toGoodDetails(item.gid, 1)">
@@ -38,8 +36,7 @@
<nut-button
size="mini"
type="primary"
@click.stop="add_cart(item)"
>
@click.stop="add_cart(item)">
<template #icon>
<Cart2 />
</template>
@@ -56,16 +53,20 @@
</view>
<nut-empty v-else description="该商家暂无商品"></nut-empty>
<!-- 购物车 -->
<cart ref="cartRef" :mer-info="mer_info" @update-cart="updateCartNum" :IsPendingOrder="true" />
<cart
ref="cartRef"
:mer-info="mer_info"
@update-cart="updateCartNum"
:IsPendingOrder="true" />
</view>
</template>
<script setup lang="ts">
import { Ref, ref } from "vue";
import Taro from "@tarojs/taro";
import Cart from "../../../../components/Cart.vue";
import { Cart2 } from "@nutui/icons-vue-taro";
import { getGoodList, getMerCategory } from "../../../../api/goods";
import {Ref, ref} from 'vue';
import Taro from '@tarojs/taro';
import Cart from '../../../../components/Cart.vue';
import {Cart2} from '@nutui/icons-vue-taro';
import {getGoodList, getMerCategory} from '../../../../api/goods';
interface goodList {
ID: number;
@@ -94,7 +95,7 @@ interface CartItems {
exchange: number;
}
const value = ref("0");
const value = ref('0');
const good_list = ref<goodList[]>([]);
const class_list = ref<
Array<{
@@ -103,8 +104,8 @@ const class_list = ref<
}>
>([]);
Taro.useLoad(async (e) => {
mer_info.value = e
Taro.useLoad(async e => {
mer_info.value = e;
await get_class_list(e.bid);
await cartRef.value.get_cart_list();
});
@@ -119,7 +120,7 @@ const get_class_list = async (bid: string) => {
const get_good_list = async (id: number, bid: string) => {
Taro.showLoading({
title: "加载中",
title: '加载中',
mask: true,
});
const res = await getGoodList({
@@ -161,7 +162,7 @@ const updateCartNum = (cartItems: CartItems[]) => {
} else {
good_list.value.forEach((category: goodList) => {
category.Goods.forEach((good: GoodsType) => {
Reflect.deleteProperty(good, "cartNum");
Reflect.deleteProperty(good, 'cartNum');
});
});
}
@@ -169,5 +170,5 @@ const updateCartNum = (cartItems: CartItems[]) => {
</script>
<style lang="scss">
@import "./index.scss";
@import './index.scss';
</style>

View File

@@ -1,4 +1,4 @@
export default definePageConfig({
navigationBarTitleText: "填写信息",
navigationStyle: "custom",
navigationBarTitleText: '填写信息',
navigationStyle: 'custom',
});

View File

@@ -3,7 +3,7 @@
justify-content: center;
box-sizing: border-box;
height: 100vh;
background-image: url("https://cdn-we-retail.ym.tencent.com/miniapp/template/user-center-bg-v1.png");
background-image: url('https://cdn-we-retail.ym.tencent.com/miniapp/template/user-center-bg-v1.png');
background-size: auto 40%;
background-repeat: no-repeat;
@@ -43,4 +43,4 @@
.nut-dialog__content {
text-align: left !important;
font-size: 28px;
}
}

View File

@@ -10,8 +10,7 @@
placeholder="请输入台号比如包厢A01"
name="seat"
v-model="formVal.seat"
required
/>
required />
</view>
<view class="form-item">
<text class="label">手机号</text>
@@ -20,8 +19,7 @@
placeholder="请输入客人手机号码"
name="phone"
v-model="formVal.phone"
required
/>
required />
</view>
<view class="form-item">
<text class="label">备注</text>
@@ -29,8 +27,7 @@
type="textarea"
placeholder="备注"
name="notes"
v-model="formVal.notes"
/>
v-model="formVal.notes" />
</view>
<nut-button
style="border-radius: 7px"
@@ -47,52 +44,51 @@
<template #default
>客户手机号:
<text style="color: #fd0100">{{ formVal.phone }}</text>
没有注册捷兑
请通知他登录捷兑通小程序注册</template
没有注册捷兑 请通知他登录捷兑通小程序注册</template
>
</nut-dialog>
</view>
</template>
<script setup lang="ts">
import { ref } from "vue";
import Taro from "@tarojs/taro";
import BackComponent from "../../../../components/Back.vue";
import { checkPhone } from "../../../../api/admin";
import {ref} from 'vue';
import Taro from '@tarojs/taro';
import BackComponent from '../../../../components/Back.vue';
import {checkPhone} from '../../../../api/admin';
const formVal = ref({
seat: "",
phone: "",
notes: "",
seat: '',
phone: '',
notes: '',
});
const visible = ref(false);
const formSubmit = async ({ detail }: any) => {
const formSubmit = async ({detail}: any) => {
if (!detail.value.seat)
return Taro.showToast({
title: "请填写台号",
icon: "none",
title: '请填写台号',
icon: 'none',
});
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(
detail.value.phone
detail.value.phone,
)
)
return Taro.showToast({
title: "请输入正确的手机号码",
icon: "none",
title: '请输入正确的手机号码',
icon: 'none',
});
try {
await checkPhone({ phone: detail.value.phone });
const user_info = await Taro.getStorageSync("userInfo");
await checkPhone({phone: detail.value.phone});
const user_info = await Taro.getStorageSync('userInfo');
Taro.navigateTo({
url: `/pages/admin/add_order/add_menu/index?type=1&bid=${user_info.data.bid}&seat=${formVal.value.seat}&phone=${formVal.value.phone}&notes=${formVal.value.notes}`,
success: () => {
formVal.value = {
seat: "",
phone: "",
notes: "",
seat: '',
phone: '',
notes: '',
};
},
});
@@ -104,5 +100,5 @@ const formSubmit = async ({ detail }: any) => {
</script>
<style lang="scss">
@import "./index.scss";
@import './index.scss';
</style>

View File

@@ -1,4 +1,4 @@
export default definePageConfig({
navigationBarTitleText: "点单",
navigationStyle: "custom",
navigationBarTitleText: '点单',
navigationStyle: 'custom',
});

View File

@@ -3,7 +3,7 @@
justify-content: center;
box-sizing: border-box;
height: 100vh;
background-image: url("./static/WechatIMG10.jpg");
background-image: url('./static/WechatIMG10.jpg');
background-size: 100% 35%;
background-repeat: no-repeat;
@@ -39,7 +39,7 @@
.line {
width: 1px;
height: 188px;
background: #C8C8C8;
background: #c8c8c8;
}
}
}

View File

@@ -5,8 +5,7 @@
<view class="card">
<view
class="comm"
@click="navTo('/pages/admin/add_order/add_table/index')"
>
@click="navTo('/pages/admin/add_order/add_table/index')">
<text class="title">开始点单</text>
<image src="./static/dc.png"></image>
<text class="sub">线上点单后结系统</text>
@@ -14,8 +13,7 @@
<view class="line"></view>
<view
class="comm"
@click="navTo('/pages/admin/add_order/pending_order/index')"
>
@click="navTo('/pages/admin/add_order/pending_order/index')">
<text class="title">我的订单</text>
<image src="./static/ddan.png"></image>
<text class="sub">查看我点餐的订单</text>
@@ -26,8 +24,8 @@
</template>
<script setup lang="ts">
import Taro from "@tarojs/taro";
import BackComponent from "../../../components/Back.vue";
import Taro from '@tarojs/taro';
import BackComponent from '../../../components/Back.vue';
const navTo = (path: string) => {
Taro.navigateTo({
@@ -37,5 +35,5 @@ const navTo = (path: string) => {
</script>
<style lang="scss">
@import "./index.scss";
@import './index.scss';
</style>

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "后结订单",
navigationBarTitleText: '后结订单',
});

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "收款",
navigationBarTitleText: '收款',
});

View File

@@ -18,12 +18,12 @@
}
&::before {
content: "¥";
content: '¥';
color: #666666;
}
&::after {
content: "";
content: '';
position: absolute;
bottom: -1px;
width: 700px;
@@ -38,46 +38,46 @@
border-radius: 12px;
margin: 20px auto;
box-sizing: border-box;
.header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px;
text {
margin-right: 10px;
color: #333333;
font-size: 28px;
}
}
.line {
width: inherit;
height: 1px;
background-color: #e9e9e9;
}
.goods-list {
display: flex;
margin: 20px;
image {
width: 195px;
height: 195px;
border-radius: 12px;
}
.center {
margin-left: 20px;
.title {
font-weight: bold;
text-align: left;
font-size: 30px;
}
}
.num {
flex: 1;
text-align: right;
@@ -85,7 +85,7 @@
font-size: 26px;
}
}
.desc {
padding: 10px 20px;
color: #666666;
@@ -101,7 +101,7 @@
.btn {
width: 709px;
height: 92px;
background: #FD0100;
background: #fd0100;
color: #ffffff;
font-size: 32px;
text-align: center;

View File

@@ -1,4 +1,4 @@
export default definePageConfig({
navigationBarTitleText: "订单详情",
navigationBarTitleText: '订单详情',
// navigationStyle: "custom",
});

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "收款码",
navigationBarTitleText: '收款码',
});

View File

@@ -35,4 +35,4 @@ page {
right: 55px;
}
}
}
}

View File

@@ -11,31 +11,31 @@
</template>
<script setup lang="ts">
import { onUnmounted, ref } from "vue";
import Taro from "@tarojs/taro";
import { getAfterOrder } from "@/api/admin";
import {onUnmounted, ref} from 'vue';
import Taro from '@tarojs/taro';
import {getAfterOrder} from '@/api/admin';
const time_id = ref();
const dataUrl = ref("");
const dataUrl = ref('');
const info = ref<any>({});
Taro.useLoad((e) => {
Taro.useLoad(e => {
info.value = e;
dataUrl.value = Taro.getStorageSync("pay_code");
dataUrl.value = Taro.getStorageSync('pay_code');
time_id.value = setInterval(async () => {
const { data } = await getAfterOrder({
const {data} = await getAfterOrder({
bid: info.value.bid,
oid: info.value.oid,
});
if (data.data.status !== 0 && data.data.status !== 2) {
Taro.showToast({
title: "支付成功",
icon: "success",
title: '支付成功',
icon: 'success',
});
setTimeout(() => {
Taro.removeStorageSync("pay_code");
Taro.removeStorageSync('pay_code');
Taro.navigateTo({
url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${info.value.oid}&bid=${info.value.bid}`,
});
@@ -46,15 +46,15 @@ Taro.useLoad((e) => {
Taro.useDidHide(() => {
clearInterval(time_id.value);
Taro.removeStorageSync("pay_code");
Taro.removeStorageSync('pay_code');
});
onUnmounted(() => {
clearInterval(time_id.value);
Taro.removeStorageSync("pay_code");
Taro.removeStorageSync('pay_code');
});
</script>
<style lang="scss">
@import "./index.scss";
@import './index.scss';
</style>

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "订单详情",
navigationBarTitleText: '订单详情',
});

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "订单管理",
navigationBarTitleText: '订单管理',
});

View File

@@ -62,4 +62,4 @@
color: #999;
}
}
}
}

View File

@@ -34,16 +34,14 @@
<navigator
class="item"
hover-class="none"
:url="`/pages/admin/statistics/index?type=price&time=today`"
>
:url="`/pages/admin/statistics/index?type=price&time=today`">
<view class="title">{{ orderInfo?.total?.TodayNumber || 0 }}</view>
<view class="sub">今日成交额</view>
</navigator>
<navigator
class="item"
hover-class="none"
:url="`/pages/admin/statistics/index?type=price&time=yesterday`"
>
:url="`/pages/admin/statistics/index?type=price&time=yesterday`">
<view class="title">{{
orderInfo?.total?.YesterdayNumber || 0
}}</view>
@@ -52,32 +50,28 @@
<navigator
class="item"
hover-class="none"
:url="`/pages/admin/statistics/index?type=price&time=month`"
>
:url="`/pages/admin/statistics/index?type=price&time=month`">
<view class="title">{{ orderInfo?.total?.MonthNumber || 0 }}</view>
<view class="sub">本月成交额</view>
</navigator>
<navigator
class="item"
hover-class="none"
:url="`/pages/admin/statistics/index?type=order&time=today`"
>
:url="`/pages/admin/statistics/index?type=order&time=today`">
<view class="title">{{ orderInfo?.total?.TodayOrder || 0 }}</view>
<view class="sub">今日订单数</view>
</navigator>
<navigator
class="item"
hover-class="none"
:url="`/pages/admin/statistics/index?type=order&time=yesterday`"
>
:url="`/pages/admin/statistics/index?type=order&time=yesterday`">
<view class="title">{{ orderInfo?.total?.YesterdayOrder || 0 }}</view>
<view class="sub">昨日订单数</view>
</navigator>
<navigator
class="item"
hover-class="none"
:url="`/pages/admin/statistics/index?type=order&time=month`"
>
:url="`/pages/admin/statistics/index?type=order&time=month`">
<view class="title">{{ orderInfo?.total?.MonthOrder || 0 }}</view>
<view class="sub">本月订单数</view>
</navigator>
@@ -93,8 +87,7 @@
:bordered="true"
class="table"
:columns="columns"
:data="orderInfo?.list"
></nut-table>
:data="orderInfo?.list"></nut-table>
</view>
<nut-empty v-else description="暂无订单数据"></nut-empty>
</view>
@@ -102,9 +95,9 @@
</template>
<script lang="ts" setup>
import { h, ref } from "vue";
import Taro from "@tarojs/taro";
import { orderStatistics } from "../../../api/admin";
import {h, ref} from 'vue';
import Taro from '@tarojs/taro';
import {orderStatistics} from '../../../api/admin';
Taro.useLoad(() => {
getData();
@@ -114,35 +107,35 @@ const orderInfo = ref<any>({});
const columns = ref([
{
title: "日期",
key: "Date",
align: "center",
title: '日期',
key: 'Date',
align: 'center',
},
{
title: "订单数",
key: "TotalCount",
align: "center",
title: '订单数',
key: 'TotalCount',
align: 'center',
},
{
title: "交易额",
key: "NumberSum",
align: "center",
render: (row) => {
title: '交易额',
key: 'NumberSum',
align: 'center',
render: row => {
return h(
"view",
'view',
{
style: {
color: "red",
color: 'red',
},
},
row.NumberSum
row.NumberSum,
);
},
},
]);
const getData = async () => {
const user_info = Taro.getStorageSync("userInfo");
const user_info = Taro.getStorageSync('userInfo');
const res = await orderStatistics({
bid: user_info.data.bid,
});

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "订单列表",
navigationBarTitleText: '订单列表',
});

View File

@@ -141,4 +141,4 @@
}
}
}
}
}

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "订单数据统计",
navigationBarTitleText: '订单数据统计',
});

View File

@@ -5,62 +5,55 @@
<view
class="item"
:class="time == 'today' ? 'on' : ''"
@click="setTime('today')"
>
@click="setTime('today')">
今天
</view>
<view
class="item"
:class="time == 'yesterday' ? 'on' : ''"
@click="setTime('yesterday')"
>
@click="setTime('yesterday')">
昨天
</view>
<view
class="item"
:class="time == 'seven' ? 'on' : ''"
@click="setTime('seven')"
>
@click="setTime('seven')">
最近7天
</view>
<view
class="item"
:class="time == 'month' ? 'on' : ''"
@click="setTime('month')"
>
@click="setTime('month')">
本月
</view>
<view
class="item"
:class="time == 'date' ? 'on' : ''"
@click="dateTitle"
>
@click="dateTitle">
自定义
</view>
</view>
</view>
<view class="wrapper">
<view class="title">
{{ title }}{{ where.type == 1 ? "营业额" : "订单量" }}
{{ title }}{{ where.type == 1 ? '营业额' : '订单量' }}
</view>
<view v-if="where.type == 1" class="money">{{ dataObj.all || 0 }}</view>
<view v-else class="money">{{ dataObj.all || 0 }}</view>
<view class="increase">
<view>
{{ time === "date" ? "" : title }}增长率<text
:class="dataObj.growthRate >= 0 ? 'red' : 'green'"
>
{{ time === 'date' ? '' : title }}增长率<text
:class="dataObj.growthRate >= 0 ? 'red' : 'green'">
{{ dataObj.growthRate }}%
<text
class="iconfont"
:class="
dataObj.growthRate >= 0 ? 'icon-xiangshang1' : 'icon-xiangxia2'
"
></text
"></text
></text>
</view>
<view>
{{ time === "date" ? "" : title }}增长<text
{{ time === 'date' ? '' : title }}增长<text
:class="dataObj.growthNumber >= 0 ? 'red' : 'green'"
>{{ dataObj.growthNumber }}
<text
@@ -69,8 +62,7 @@
dataObj.growthNumber >= 0
? 'icon-xiangshang1'
: 'icon-xiangxia2'
"
></text
"></text
></text>
</view>
</view>
@@ -82,8 +74,7 @@
:ontouch="true"
@touchstart="touchStart"
@touchmove="touchMove"
@touchend="touchEnd"
/>
@touchend="touchEnd" />
</view>
<view class="Card">
@@ -96,8 +87,7 @@
:bordered="true"
class="table"
:columns="columns"
:data="dataObj?.list"
></nut-table>
:data="dataObj?.list"></nut-table>
</view>
<nut-empty v-else description="暂无订单数据"></nut-empty>
</view>
@@ -109,20 +99,19 @@
:default-value="pickerVal"
:start-date="date_start"
@close="isVisible = false"
@choose="setChooseValue"
>
@choose="setChooseValue">
</nut-calendar>
</view>
</template>
<script setup lang="ts">
import { ref, computed, h } from "vue";
import Taro from "@tarojs/taro";
import { growthRate } from "../../../api/admin";
import dayjs from "dayjs";
import uCharts from "../../../utils/js_sdk/u-charts.min.js";
import {ref, computed, h} from 'vue';
import Taro from '@tarojs/taro';
import {growthRate} from '../../../api/admin';
import dayjs from 'dayjs';
import uCharts from '../../../utils/js_sdk/u-charts.min.js';
const time = ref("");
const time = ref('');
const isVisible = ref(false);
@@ -138,44 +127,44 @@ const chartWH = ref({
const columns = ref([
{
title: "日期",
key: "Date",
align: "center",
title: '日期',
key: 'Date',
align: 'center',
},
{
title: "订单数",
key: "TotalCount",
align: "center",
title: '订单数',
key: 'TotalCount',
align: 'center',
},
{
title: "交易额",
key: "NumberSum",
align: "center",
render: (row) => {
title: '交易额',
key: 'NumberSum',
align: 'center',
render: row => {
return h(
"view",
'view',
{
style: {
color: "red",
color: 'red',
},
},
row.NumberSum
row.NumberSum,
);
},
},
]);
const date_start = computed(() => {
return dayjs().startOf("year").format("YYYY-MM-DD");
return dayjs().startOf('year').format('YYYY-MM-DD');
});
const title = ref("");
const title = ref('');
const where = ref({
type: 1,
status: 2,
start: "",
end: "",
start: '',
end: '',
});
const dataObj = ref<any>({});
@@ -184,20 +173,20 @@ const opts = ref<any>({
categories: [],
series: [
{
name: "营业额",
name: '营业额',
data: [],
},
{
name: "订单量",
name: '订单量',
data: [],
},
],
});
const pickerVal = ref<any>([])
const pickerVal = ref<any>([]);
Taro.useLoad((options) => {
where.value.type = options.type === "price" ? 1 : 2;
Taro.useLoad(options => {
where.value.type = options.type === 'price' ? 1 : 2;
time.value = options.time;
setTime(options.time);
// getData();
@@ -210,29 +199,29 @@ Taro.useLoad((options) => {
const setTime = (type: string) => {
time.value = type;
switch (type) {
case "today":
title.value = "今日";
case 'today':
title.value = '今日';
where.value.status = 2;
where.value.start = dayjs().format("YYYY-MM-DD");
where.value.end = dayjs().format("YYYY-MM-DD");
where.value.start = dayjs().format('YYYY-MM-DD');
where.value.end = dayjs().format('YYYY-MM-DD');
break;
case "yesterday":
title.value = "昨日";
case 'yesterday':
title.value = '昨日';
where.value.status = 2;
where.value.start = dayjs().add(-1, "day").format("YYYY-MM-DD");
where.value.end = dayjs().add(-1, "day").format("YYYY-MM-DD");
where.value.start = dayjs().add(-1, 'day').format('YYYY-MM-DD');
where.value.end = dayjs().add(-1, 'day').format('YYYY-MM-DD');
break;
case "seven":
title.value = "7天";
case 'seven':
title.value = '7天';
where.value.status = 2;
where.value.start = dayjs().add(-6, "day").format("YYYY-MM-DD");
where.value.end = dayjs().format("YYYY-MM-DD");
where.value.start = dayjs().add(-6, 'day').format('YYYY-MM-DD');
where.value.end = dayjs().format('YYYY-MM-DD');
break;
case "month":
title.value = "本月";
case 'month':
title.value = '本月';
where.value.status = 1;
where.value.start = dayjs().startOf("month").format("YYYY-MM-DD");
where.value.end = dayjs().format("YYYY-MM-DD");
where.value.start = dayjs().startOf('month').format('YYYY-MM-DD');
where.value.end = dayjs().format('YYYY-MM-DD');
break;
}
getData();
@@ -240,7 +229,7 @@ const setTime = (type: string) => {
const dateTitle = () => {
where.value.status = 1;
time.value = "date";
time.value = 'date';
isVisible.value = true;
};
@@ -253,7 +242,7 @@ const setChooseValue = (ref: any) => {
const getData = async () => {
try {
const user_info = Taro.getStorageSync("userInfo");
const user_info = Taro.getStorageSync('userInfo');
const res = await growthRate({
bid: user_info.data.bid,
status: where.value.status,
@@ -273,16 +262,16 @@ const getData = async () => {
} catch (error) {
Taro.showToast({
title: error.msg,
icon: "none",
icon: 'none',
});
throw error;
}
};
const create_canvas = () => {
const ctx = Taro.createCanvasContext("myChart");
const ctx = Taro.createCanvasContext('myChart');
canvas_obj = new uCharts({
type: "column",
type: 'column',
context: ctx,
width: chartWH.value.width,
height: chartWH.value.height,
@@ -290,17 +279,17 @@ const create_canvas = () => {
series: opts.value.series,
pixelRatio: chartWH.value.pixelRatio,
animation: true,
background: "#FFFFFF",
background: '#FFFFFF',
color: [
"#1890FF",
"#91CB74",
"#FAC858",
"#EE6666",
"#73C0DE",
"#3CA272",
"#FC8452",
"#9A60B4",
"#ea7ccc",
'#1890FF',
'#91CB74',
'#FAC858',
'#EE6666',
'#73C0DE',
'#3CA272',
'#FC8452',
'#9A60B4',
'#ea7ccc',
],
padding: [15, 15, 0, 15],
enableScroll: true,
@@ -319,9 +308,9 @@ const create_canvas = () => {
},
extra: {
column: {
type: "group",
type: 'group',
width: 20,
activeBgColor: "#000000",
activeBgColor: '#000000',
activeBgOpacity: 0.08,
},
},
@@ -331,7 +320,7 @@ const create_canvas = () => {
const touchStart = (e: any) => {
canvas_obj.showToolTip(e, {
format: function (item: any, category: any) {
return category + " " + item.name + ":" + item.data;
return category + ' ' + item.name + ':' + item.data;
},
});
canvas_obj.scrollStart(e);

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "订单核销",
navigationBarTitleText: '订单核销',
});

View File

@@ -1,3 +1,3 @@
export default definePageConfig({
navigationBarTitleText: "核销列表",
navigationBarTitleText: '核销列表',
});

View File

@@ -73,7 +73,7 @@ Taro.useLoad(options => {
const goodInfo = ref<any>({});
const getData = async (options: any) => {
const merInfo = Taro.getStorageSync("userInfo");
const merInfo = Taro.getStorageSync('userInfo');
const res = await getActiveVerifyList({
oid: options.oid,
bid: merInfo.data.bid,