Selaa lähdekoodia

修改分类背景

zhaogongxue 4 kuukautta sitten
vanhempi
commit
d6af23bfb9

+ 1 - 1
components/kj-express/kj-express.vue

@@ -526,7 +526,7 @@ export default {
       }
       return {
         title: this.i18n.border,
-        path: "/pages/express/express",
+        path: "/pages/index/index?current=0",
       };
     },
     callphone() {

+ 123 - 0
node_modules/.vue-global-types/vue_3.3_false.d.ts

@@ -0,0 +1,123 @@
+// @ts-nocheck
+export {};
+
+; declare module 'vue' {
+	export interface GlobalComponents { }
+	export interface GlobalDirectives { }
+}
+; declare global {
+	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
+	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
+	const __VLS_unref: typeof import('vue').unref;
+
+	const __VLS_nativeElements = {
+		...{} as SVGElementTagNameMap,
+		...{} as HTMLElementTagNameMap,
+	};
+
+	type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements;
+	type __VLS_Element = import('vue/jsx-runtime').JSX.Element;
+	type __VLS_GlobalComponents = import('vue').GlobalComponents & Pick<typeof import('vue'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;
+	type __VLS_GlobalDirectives = import('vue').GlobalDirectives;
+	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
+	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+	type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
+		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
+		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
+		N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
+		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
+		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
+		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
+		{ [K in N0]: unknown }
+	type __VLS_FunctionalComponentProps<T, K> =
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
+		: T extends (props: infer P, ...args: any) => any ? P :
+		{};
+	type __VLS_IsFunction<T, K> = K extends keyof T
+		? __VLS_IsAny<T[K]> extends false
+		? unknown extends T[K]
+		? false
+		: true
+		: false
+		: false;
+	// fix https://github.com/vuejs/language-tools/issues/926
+	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
+	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
+		? U extends T
+		? never
+		: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
+		: never;
+	type __VLS_OverloadUnion<T> = Exclude<
+		__VLS_OverloadUnionInner<(() => never) & T>,
+		T extends () => never ? never : () => never
+	>;
+	type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
+		? F extends (event: infer E, ...args: infer A) => any
+		? { [K in E & string]: (...args: A) => void; }
+		: never
+		: never;
+	type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
+		__VLS_UnionToIntersection<
+			__VLS_ConstructorOverloads<T> & {
+				[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
+			}
+		>
+	>;
+	type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
+	type __VLS_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
+		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	>>;
+	type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
+
+	function __VLS_getVForSourceType(source: number): [number, number, number][];
+	function __VLS_getVForSourceType(source: string): [string, number, number][];
+	function __VLS_getVForSourceType<T extends any[]>(source: T): [
+		item: T[number],
+		key: number,
+		index: number,
+	][];
+	function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
+		key: number,
+		index: undefined,
+	][];
+	// #3845
+	function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
+		key: number,
+		index: undefined,
+	][];
+	function __VLS_getVForSourceType<T>(source: T): [
+		item: T[keyof T],
+		key: keyof T,
+		index: number,
+	][];
+	// @ts-ignore
+	function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
+	// @ts-ignore
+	function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
+	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('vue').ObjectDirective
+		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
+		: T extends (...args: any) => any
+			? T
+			: __VLS_unknownDirective;
+	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
+	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+	function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
+	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
+		T extends new (...args: any) => any
+		? (props: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>, ctx?: any) => __VLS_Element & { __ctx?: {
+			attrs?: any,
+			slots?: K extends { $slots: infer Slots } ? Slots : any,
+			emit?: K extends { $emit: infer Emit } ? Emit : any
+		} & { props?: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>; expose?(exposed: K): void; } }
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
+		: T extends (...args: any) => any ? T
+		: (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
+	function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T & Record<string, unknown>) => void;
+	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
+	function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+	function __VLS_tryAsConstant<const T>(t: T): T;
+}

+ 2 - 2
pageA/payorder.vue

@@ -592,7 +592,7 @@ export default {
                   console.log("success:" + JSON.stringify(res));
                   setTimeout(() => {
                     uni.switchTab({
-                      url: "/pages/express/express",
+                      url: "/pages/index/index?current=0",
                     });
                   }, 800);
                 },
@@ -604,7 +604,7 @@ export default {
               this.$u.toast(this.i18n.Paymentsuccess);
               setTimeout(() => {
                 uni.switchTab({
-                  url: "/pages/express/express",
+                  url: "/pages/index/index?current=0",
                 });
               }, 800);
             }

+ 1 - 1
pageA/shoplist.vue

@@ -337,7 +337,7 @@
 	.box {
 		width: 750rpx;
 		min-height: 1360rpx;
-		background: #FFFFFF;
+		// background: #FFFFFF;
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		padding: 38rpx 20rpx 20rpx;
 		box-sizing: border-box;

+ 2 - 2
pageB/end.vue

@@ -98,13 +98,13 @@
 				</view>
 			</view>
 			<!-- 快递服务 -->
-			<view class="wup u-flex u-row-between">
+<!-- 			<view class="wup u-flex u-row-between">
 				<view>{{i18n.Expressservice}}</view>
 				<view class="u-flex" @click="toexpress">
 					<view class="selection">{{expname||i18n.selection}}</view>
 					<image src="../static/express/next1.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
 				</view>
-			</view>
+			</view> -->
 			<!-- 下一步 -->
 			<view class="next  u-flex-between" style="display: flex;">
 				<!-- 				<view class="" style="flex: 1;">

+ 11 - 2
pageB/orderinfo.vue

@@ -4,7 +4,7 @@
 		</u-navbar>
 		<view class="top u-flex u-row-between">
 			<text class="success">{{i18n.successful}}</text>
-			<text class="sun">{{i18n.pickpackage}}</text>
+			<!-- <text class="sun">{{i18n.pickpackage}}</text> -->
 		</view>
 		<view class="address">
 			<view class="" style="margin-top: 44rpx;">
@@ -51,7 +51,8 @@
 		onLoad(options) {
 			this.orderinfo = JSON.parse(decodeURIComponent(options.orderinfo));
 			console.log(this.orderinfo);
-			this.$u.toast(this.i18n.successful + this.i18n.myPackage + '-' + this.i18n.Vieworder)
+			// this.$u.toast(this.i18n.successful + this.i18n.myPackage + '-' + this.i18n.Vieworder)
+			this.config()
 		},
 		computed: {
 			i18n() {
@@ -63,6 +64,14 @@
 				uni.switchTab({
 					url: '/pages/index/index'
 				})
+			},
+			config(){
+				//获取配置信息
+				  uni.$u.http
+				    .get(`/api/config?module=express`)
+				    .then((res) => {
+				      this.$u.toast(res.prompt)
+				    });
 			}
 		}
 	}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-express/kj-express.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/end.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageB/orderinfo.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/mp-weixin/components/kj-express/kj-express.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/payorder.js


+ 0 - 1
unpackage/dist/dev/mp-weixin/pageA/shoplist.wxss

@@ -27,7 +27,6 @@
 .box.data-v-7765c2ff {
   width: 750rpx;
   min-height: 1360rpx;
-  background: #FFFFFF;
   border-radius: 28rpx 28rpx 0rpx 0rpx;
   padding: 38rpx 20rpx 20rpx;
   box-sizing: border-box;

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/end.wxml


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/orderinfo.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageB/orderinfo.wxml

@@ -1 +1 @@
-<view class="back data-v-4c7c973c"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-4c7c973c" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-4c7c973c"><text class="success data-v-4c7c973c">{{i18n.successful}}</text><text class="sun data-v-4c7c973c">{{i18n.pickpackage}}</text></view><view class="address data-v-4c7c973c"><view style="margin-top:44rpx;" class="data-v-4c7c973c"><view class="u-flex data-v-4c7c973c"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-4c7c973c"></image><text class="name data-v-4c7c973c" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-4c7c973c" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-4c7c973c" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-4c7c973c"><view class="u-flex data-v-4c7c973c"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-4c7c973c"></image><text class="name data-v-4c7c973c" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-4c7c973c" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-4c7c973c" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-4c7c973c"><view class="num data-v-4c7c973c"><text class="num data-v-4c7c973c">{{i18n.OrderNumber+":"}}</text><text class="num data-v-4c7c973c">{{orderinfo.order_no}}</text></view><view class="num data-v-4c7c973c" style="margin-top:50rpx;"><text class="num data-v-4c7c973c">{{i18n.Ordertime+":"}}</text><text class="num data-v-4c7c973c">{{orderinfo.created_at}}</text></view></view></view>
+<view class="back data-v-4c7c973c"><u-navbar vue-id="5e7558e4-1" title="{{i18n.Vieworder}}" autoBack="{{false}}" placeholder="{{true}}" data-event-opts="{{[['^leftClick',[['leftClick']]]]}}" bind:leftClick="__e" class="data-v-4c7c973c" bind:__l="__l"></u-navbar><view class="top u-flex u-row-between data-v-4c7c973c"><text class="success data-v-4c7c973c">{{i18n.successful}}</text></view><view class="address data-v-4c7c973c"><view style="margin-top:44rpx;" class="data-v-4c7c973c"><view class="u-flex data-v-4c7c973c"><image style="width:44rpx;height:44rpx;" src="/static/express/ji.png" mode class="data-v-4c7c973c"></image><text class="name data-v-4c7c973c" style="margin-left:28rpx;">{{orderinfo.from_name}}</text><text class="name data-v-4c7c973c" style="margin-left:12rpx;">{{orderinfo.from_mobile}}</text></view><view class="info data-v-4c7c973c" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.from_full_address+''}}</view></view><view style="margin:44rpx 0;" class="data-v-4c7c973c"><view class="u-flex data-v-4c7c973c"><image style="width:44rpx;height:44rpx;" src="/static/express/shou.png" mode class="data-v-4c7c973c"></image><text class="name data-v-4c7c973c" style="margin-left:28rpx;">{{orderinfo.transit_name}}</text><text class="name data-v-4c7c973c" style="margin-left:12rpx;">{{orderinfo.transit_mobile}}</text></view><view class="info data-v-4c7c973c" style="margin-top:20rpx;margin-left:70rpx;">{{''+orderinfo.transit_full_address+''}}</view></view></view><view class="orderinfo data-v-4c7c973c"><view class="num data-v-4c7c973c"><text class="num data-v-4c7c973c">{{i18n.OrderNumber+":"}}</text><text class="num data-v-4c7c973c">{{orderinfo.order_no}}</text></view><view class="num data-v-4c7c973c" style="margin-top:50rpx;"><text class="num data-v-4c7c973c">{{i18n.Ordertime+":"}}</text><text class="num data-v-4c7c973c">{{orderinfo.created_at}}</text></view></view></view>

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 13 - 3
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,10 +10,15 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.4.3",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
   "condition": {
@@ -32,5 +38,9 @@
       "current": -1,
       "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä