Merge branch 'dev' into test
This commit is contained in:
88
components.d.ts
vendored
88
components.d.ts
vendored
@@ -1,52 +1,52 @@
|
||||
// generated by unplugin-vue-components
|
||||
// We suggest you to commit this file into source control
|
||||
// Read more: https://github.com/vuejs/core/pull/3399
|
||||
import "@vue/runtime-core";
|
||||
import '@vue/runtime-core'
|
||||
|
||||
export {};
|
||||
export {}
|
||||
|
||||
declare module "@vue/runtime-core" {
|
||||
declare module '@vue/runtime-core' {
|
||||
export interface GlobalComponents {
|
||||
Auth: typeof import("./src/components/Auth.vue")["default"];
|
||||
Cart: typeof import("./src/components/Cart.vue")["default"];
|
||||
MerList: typeof import("./src/components/MerList.vue")["default"];
|
||||
NutAvatar: typeof import("@nutui/nutui-taro")["Avatar"];
|
||||
NutBacktop: typeof import("@nutui/nutui-taro")["Backtop"];
|
||||
NutButton: typeof import("@nutui/nutui-taro")["Button"];
|
||||
NutCalendar: typeof import("@nutui/nutui-taro")["Calendar"];
|
||||
NutCell: typeof import("@nutui/nutui-taro")["Cell"];
|
||||
NutCellGroup: typeof import("@nutui/nutui-taro")["CellGroup"];
|
||||
NutCheckbox: typeof import("@nutui/nutui-taro")["Checkbox"];
|
||||
NutCheckboxGroup: typeof import("@nutui/nutui-taro")["CheckboxGroup"];
|
||||
NutDialog: typeof import("@nutui/nutui-taro")["Dialog"];
|
||||
NutEllipsis: typeof import("@nutui/nutui-taro")["Ellipsis"];
|
||||
NutEmpty: typeof import("@nutui/nutui-taro")["Empty"];
|
||||
NutForm: typeof import("@nutui/nutui-taro")["Form"];
|
||||
NutFormItem: typeof import("@nutui/nutui-taro")["FormItem"];
|
||||
NutGrid: typeof import("@nutui/nutui-taro")["Grid"];
|
||||
NutGridItem: typeof import("@nutui/nutui-taro")["GridItem"];
|
||||
NutImagePreview: typeof import("@nutui/nutui-taro")["ImagePreview"];
|
||||
NutInput: typeof import("@nutui/nutui-taro")["Input"];
|
||||
NutInputNumber: typeof import("@nutui/nutui-taro")["InputNumber"];
|
||||
NutOverlay: typeof import("@nutui/nutui-taro")["Overlay"];
|
||||
NutPagination: typeof import("@nutui/nutui-taro")["Pagination"];
|
||||
NutPicker: typeof import("@nutui/nutui-taro")["Picker"];
|
||||
NutPopup: typeof import("@nutui/nutui-taro")["Popup"];
|
||||
NutPrice: typeof import("@nutui/nutui-taro")["Price"];
|
||||
NutSearchbar: typeof import("@nutui/nutui-taro")["Searchbar"];
|
||||
NutSwiper: typeof import("@nutui/nutui-taro")["Swiper"];
|
||||
NutSwiperItem: typeof import("@nutui/nutui-taro")["SwiperItem"];
|
||||
NutSwitch: typeof import("@nutui/nutui-taro")["Switch"];
|
||||
NutTable: typeof import("@nutui/nutui-taro")["Table"];
|
||||
NutTabPane: typeof import("@nutui/nutui-taro")["TabPane"];
|
||||
NutTabs: typeof import("@nutui/nutui-taro")["Tabs"];
|
||||
NutTextarea: typeof import("@nutui/nutui-taro")["Textarea"];
|
||||
NutUploader: typeof import("@nutui/nutui-taro")["Uploader"];
|
||||
Pay: typeof import("./src/components/Pay.vue")["default"];
|
||||
Popup: typeof import("./src/components/Popup.vue")["default"];
|
||||
RichEditor: typeof import("./src/components/RichEditor.vue")["default"];
|
||||
Ucharts: typeof import("./src/components/Ucharts.vue")["default"];
|
||||
Upload: typeof import("./src/components/Upload.vue")["default"];
|
||||
UserModal: typeof import("./src/components/UserModal.vue")["default"];
|
||||
Auth: typeof import('./src/components/Auth.vue')['default']
|
||||
Cart: typeof import('./src/components/Cart.vue')['default']
|
||||
MerList: typeof import('./src/components/MerList.vue')['default']
|
||||
NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
|
||||
NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
|
||||
NutButton: typeof import('@nutui/nutui-taro')['Button']
|
||||
NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
|
||||
NutCell: typeof import('@nutui/nutui-taro')['Cell']
|
||||
NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']
|
||||
NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
|
||||
NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']
|
||||
NutDialog: typeof import('@nutui/nutui-taro')['Dialog']
|
||||
NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']
|
||||
NutEmpty: typeof import('@nutui/nutui-taro')['Empty']
|
||||
NutForm: typeof import('@nutui/nutui-taro')['Form']
|
||||
NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']
|
||||
NutGrid: typeof import('@nutui/nutui-taro')['Grid']
|
||||
NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']
|
||||
NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
|
||||
NutInput: typeof import('@nutui/nutui-taro')['Input']
|
||||
NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
|
||||
NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
|
||||
NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
|
||||
NutPicker: typeof import('@nutui/nutui-taro')['Picker']
|
||||
NutPopup: typeof import('@nutui/nutui-taro')['Popup']
|
||||
NutPrice: typeof import('@nutui/nutui-taro')['Price']
|
||||
NutSearchbar: typeof import('@nutui/nutui-taro')['Searchbar']
|
||||
NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
|
||||
NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
|
||||
NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
|
||||
NutTable: typeof import('@nutui/nutui-taro')['Table']
|
||||
NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
|
||||
NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
|
||||
NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
|
||||
NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
|
||||
Pay: typeof import('./src/components/Pay.vue')['default']
|
||||
Popup: typeof import('./src/components/Popup.vue')['default']
|
||||
RichEditor: typeof import('./src/components/RichEditor.vue')['default']
|
||||
Ucharts: typeof import('./src/components/Ucharts.vue')['default']
|
||||
Upload: typeof import('./src/components/Upload.vue')['default']
|
||||
UserModal: typeof import('./src/components/UserModal.vue')['default']
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "jdt-user",
|
||||
"version": "3.0.10",
|
||||
"version": "3.0.11",
|
||||
"private": true,
|
||||
"description": "",
|
||||
"templateInfo": {
|
||||
@@ -9,7 +9,7 @@
|
||||
"css": "sass"
|
||||
},
|
||||
"taroConfig": {
|
||||
"version": "3.0.10"
|
||||
"version": "3.0.11"
|
||||
},
|
||||
"scripts": {
|
||||
"build:weapp": "taro build --type weapp",
|
||||
|
||||
@@ -51,8 +51,10 @@ Taro.useLoad((options) => {
|
||||
const goodInfo = ref<any>({});
|
||||
|
||||
const getData = async (options: any) => {
|
||||
const merInfo = Taro.getStorageSync("mer_info");
|
||||
const res = await getActiveVerifyList({
|
||||
oid: options.oid,
|
||||
bid: merInfo.bid,
|
||||
});
|
||||
if (!res.data.data.oid) {
|
||||
Taro.showToast({
|
||||
|
||||
Reference in New Issue
Block a user