1.修改2.0 页面问题

yj-dev
杨杰 2 years ago
parent a141c2a939
commit e4b239b5ee
  1. 3
      .gitignore
  2. 42
      node_modules/vue-jsonp/LICENSE
  3. 306
      node_modules/vue-jsonp/README.md
  4. 146
      node_modules/vue-jsonp/dist/index.d.ts
  5. 40
      node_modules/vue-jsonp/dist/utils/index.d.ts
  6. 130
      node_modules/vue-jsonp/package.json
  7. 243
      package-lock.json
  8. 9
      package.json
  9. 2
      pages/goods/goods.vue
  10. 86
      pages/tabBar/home/home.vue
  11. 1
      pages/tabBar/user/user.vue
  12. 40
      pages/user/order_details/order_details.vue
  13. 37
      pages/user/order_list/order_list.vue

3
.gitignore vendored

@ -1,2 +1,3 @@
unpackage/ unpackage/
.hbuilderx/launch.json .hbuilderx/launch.json
node_modules

42
node_modules/vue-jsonp/LICENSE generated vendored

@ -1,21 +1,21 @@
MIT License MIT License
Copyright (c) 2020 LancerComet Copyright (c) 2020 LancerComet
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software. copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.

306
node_modules/vue-jsonp/README.md generated vendored

@ -1,153 +1,153 @@
# Vue-jsonp # Vue-jsonp
[![VueJsonp](https://github.com/LancerComet/vue-jsonp/workflows/Test/badge.svg)](https://github.com/LancerComet/vue-jsonp/actions) [![VueJsonp](https://github.com/LancerComet/vue-jsonp/workflows/Test/badge.svg)](https://github.com/LancerComet/vue-jsonp/actions)
A tiny library for handling JSONP request. A tiny library for handling JSONP request.
## Quick Start ## Quick Start
As Vue plugin: As Vue plugin:
```ts ```ts
import { VueJsonp } from 'vue-jsonp' import { VueJsonp } from 'vue-jsonp'
// Vue Plugin. // Vue Plugin.
Vue.use(VueJsonp) Vue.use(VueJsonp)
// Now you can use this.$jsonp in Vue components. // Now you can use this.$jsonp in Vue components.
const vm = new Vue() const vm = new Vue()
vm.$jsonp('/some-jsonp-url', { vm.$jsonp('/some-jsonp-url', {
myCustomUrlParam: 'veryNice' myCustomUrlParam: 'veryNice'
}) })
``` ```
Use function directly: Use function directly:
```ts ```ts
import { jsonp } from 'vue-jsonp' import { jsonp } from 'vue-jsonp'
jsonp('/some-jsonp-url', { jsonp('/some-jsonp-url', {
myCustomUrlParam: 'veryNice' myCustomUrlParam: 'veryNice'
}) })
``` ```
## Send data and set query & function name ## Send data and set query & function name
### Send data ### Send data
```ts ```ts
// The request url will be "/some-jsonp-url?name=LancerComet&age=100&callback=jsonp_{RANDOM_STR}". // The request url will be "/some-jsonp-url?name=LancerComet&age=100&callback=jsonp_{RANDOM_STR}".
jsonp('/some-jsonp-url', { jsonp('/some-jsonp-url', {
name: 'LancerComet', name: 'LancerComet',
age: 100 age: 100
}) })
``` ```
### Custom query & function name ### Custom query & function name
The url uniform is `/url?{callbackQuery}={callbackName}&...`, the default is `/url?callback=jsonp_{RANDOM_STRING}&...`. The url uniform is `/url?{callbackQuery}={callbackName}&...`, the default is `/url?callback=jsonp_{RANDOM_STRING}&...`.
And you can change it like this: And you can change it like this:
```ts ```ts
// The request url will be "/some-jsonp-url?name=LancerComet&age=100&cb=jsonp_func". // The request url will be "/some-jsonp-url?name=LancerComet&age=100&cb=jsonp_func".
jsonp('/some-jsonp-url', { jsonp('/some-jsonp-url', {
callbackQuery: 'cb', callbackQuery: 'cb',
callbackName: 'jsonp_func', callbackName: 'jsonp_func',
name: 'LancerComet', name: 'LancerComet',
age: 100 age: 100
}) })
``` ```
## Module exports ## Module exports
- `VueJsonp: PluginObject<never>` - `VueJsonp: PluginObject<never>`
- `jsonp<T>: (url: string, param?: IJsonpParam, timeout?: number) => Promise<T>` - `jsonp<T>: (url: string, param?: IJsonpParam, timeout?: number) => Promise<T>`
## API ## API
### IJsonpParam ### IJsonpParam
IJsonpParam is the type of param for jsonp function. IJsonpParam is the type of param for jsonp function.
```ts ```ts
/** /**
* JSONP parameter declaration. * JSONP parameter declaration.
*/ */
interface IJsonpParam { interface IJsonpParam {
/** /**
* Callback query name. * Callback query name.
* This param is used to define the query name of the callback function. * This param is used to define the query name of the callback function.
* *
* @example * @example
* // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
* jsonp('/some-url', { * jsonp('/some-url', {
* callbackQuery: 'myCallback', * callbackQuery: 'myCallback',
* callbackName: 'jsonp_func', * callbackName: 'jsonp_func',
* myCustomUrlParam: 'veryNice' * myCustomUrlParam: 'veryNice'
* }) * })
* *
* @default callback * @default callback
*/ */
callbackQuery?: string callbackQuery?: string
/** /**
* Callback function name. * Callback function name.
* This param is used to define the jsonp function name. * This param is used to define the jsonp function name.
* *
* @example * @example
* // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
* jsonp('/some-url', { * jsonp('/some-url', {
* callbackQuery: 'myCallback', * callbackQuery: 'myCallback',
* callbackName: 'jsonp_func', * callbackName: 'jsonp_func',
* myCustomUrlParam: 'veryNice' * myCustomUrlParam: 'veryNice'
* }) * })
* *
* @default jsonp_ + randomStr() * @default jsonp_ + randomStr()
*/ */
callbackName?: string callbackName?: string
/** /**
* Custom data. * Custom data.
*/ */
[key: string]: any [key: string]: any
} }
``` ```
## Example ## Example
```ts ```ts
import Vue from 'vue' import Vue from 'vue'
import { VueJsonp } from 'vue-jsonp' import { VueJsonp } from 'vue-jsonp'
Vue.use(VueJsonp) Vue.use(VueJsonp)
const vm = new Vue() const vm = new Vue()
const { code, data, message } = await vm.$jsonp<{ const { code, data, message } = await vm.$jsonp<{
code: number, code: number,
message: string, message: string,
data: { data: {
id: number, id: number,
nickname: string nickname: string
} }
}>('/my-awesome-url', { }>('/my-awesome-url', {
name: 'MyName', age: 20 name: 'MyName', age: 20
}) })
assert(code === 0) assert(code === 0)
assert(message === 'ok') assert(message === 'ok')
assert(data.id === 1) assert(data.id === 1)
assert(data.nickname === 'John Smith') assert(data.nickname === 'John Smith')
``` ```
```ts ```ts
import { jsonp } from 'vue-jsonp' import { jsonp } from 'vue-jsonp'
const result = await jsonp<string>('/my-awesome-url') const result = await jsonp<string>('/my-awesome-url')
assert(result === 'such a jsonp') assert(result === 'such a jsonp')
``` ```
## License ## License
MIT MIT

@ -1,73 +1,73 @@
/** /**
* Vue Jsonp. * Vue Jsonp.
* # Carry Your World # * # Carry Your World #
* *
* @author: LancerComet * @author: LancerComet
* @license: MIT * @license: MIT
*/ */
import { PluginObject } from 'vue/types/plugin'; import { PluginObject } from 'vue/types/plugin';
declare module 'vue/types/vue' { declare module 'vue/types/vue' {
interface Vue { interface Vue {
$jsonp: typeof jsonp; $jsonp: typeof jsonp;
} }
} }
/** /**
* Vue JSONP. * Vue JSONP.
*/ */
declare const VueJsonp: PluginObject<never>; declare const VueJsonp: PluginObject<never>;
/** /**
* JSONP function. * JSONP function.
* *
* @param { string } url Target URL address. * @param { string } url Target URL address.
* @param { IJsonpParam } param Querying params object. * @param { IJsonpParam } param Querying params object.
* @param { number } timeout Timeout setting (ms). * @param { number } timeout Timeout setting (ms).
* *
* @example * @example
* jsonp('/url', { * jsonp('/url', {
* callbackQuery: '' * callbackQuery: ''
* callbackName: '', * callbackName: '',
* name: 'LancerComet', * name: 'LancerComet',
* age: 26 * age: 26
* }, 1000) * }, 1000)
*/ */
declare function jsonp<T = any>(url: string, param?: IJsonpParam, timeout?: number): Promise<T>; declare function jsonp<T = any>(url: string, param?: IJsonpParam, timeout?: number): Promise<T>;
export { VueJsonp, jsonp }; export { VueJsonp, jsonp };
/** /**
* JSONP parameter declaration. * JSONP parameter declaration.
*/ */
interface IJsonpParam { interface IJsonpParam {
/** /**
* Callback query name. * Callback query name.
* This param is used to define the query name of the callback function. * This param is used to define the query name of the callback function.
* *
* @example * @example
* // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
* jsonp('/some-url', { * jsonp('/some-url', {
* callbackQuery: 'myCallback', * callbackQuery: 'myCallback',
* callbackName: 'jsonp_func', * callbackName: 'jsonp_func',
* myCustomUrlParam: 'veryNice' * myCustomUrlParam: 'veryNice'
* }) * })
* *
* @default callback * @default callback
*/ */
callbackQuery?: string; callbackQuery?: string;
/** /**
* Callback function name. * Callback function name.
* This param is used to define the jsonp function name. * This param is used to define the jsonp function name.
* *
* @example * @example
* // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice" * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
* jsonp('/some-url', { * jsonp('/some-url', {
* callbackQuery: 'myCallback', * callbackQuery: 'myCallback',
* callbackName: 'jsonp_func', * callbackName: 'jsonp_func',
* myCustomUrlParam: 'veryNice' * myCustomUrlParam: 'veryNice'
* }) * })
* *
* @default jsonp_ + randomStr() * @default jsonp_ + randomStr()
*/ */
callbackName?: string; callbackName?: string;
/** /**
* Custom data. * Custom data.
*/ */
[key: string]: any; [key: string]: any;
} }

@ -1,20 +1,20 @@
/** /**
* Generate random string. * Generate random string.
* *
* @return { string } * @return { string }
*/ */
declare function randomStr(): string; declare function randomStr(): string;
/** /**
* Format params into querying string. * Format params into querying string.
* *
* @return {string[]} * @return {string[]}
*/ */
declare function formatParams(queryKey: string, value: any): string[]; declare function formatParams(queryKey: string, value: any): string[];
/** /**
* Flat querys. * Flat querys.
* *
* @param {string[] | (string[])[]} array * @param {string[] | (string[])[]} array
* @returns * @returns
*/ */
declare function flatten(array: string[] | (string[])[]): string[]; declare function flatten(array: string[] | (string[])[]): string[];
export { formatParams, flatten, randomStr }; export { formatParams, flatten, randomStr };

130
node_modules/vue-jsonp/package.json generated vendored

@ -1,80 +1,50 @@
{ {
"_from": "vue-jsonp", "name": "vue-jsonp",
"_id": "vue-jsonp@2.0.0", "version": "2.0.0",
"_inBundle": false, "description": "A tiny library for handling JSONP request.",
"_integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==", "main": "./dist/index.js",
"_location": "/vue-jsonp", "module": "./dist/index.esm.js",
"_phantomChildren": {}, "keywords": [
"_requested": { "Vue",
"type": "tag", "JSONP"
"registry": true, ],
"raw": "vue-jsonp", "files": [
"name": "vue-jsonp", "dist/",
"escapedName": "vue-jsonp", "index.d.ts",
"rawSpec": "", "README.md"
"saveSpec": null, ],
"fetchSpec": "latest" "scripts": {
}, "build": "rollup -c",
"_requiredBy": [ "test": "jest",
"#USER", "pretest": "npm run build",
"/" "preversion": "npm run test",
], "prepublish": "npm run test"
"_resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", },
"_shasum": "3bfac56bb72941a2511c11e1a123b876f03427f7", "author": {
"_spec": "vue-jsonp", "name": "LancerComet",
"_where": "C:\\Users\\Administrator\\Documents\\high-mini", "email": "chw644@hotmail.com"
"author": { },
"name": "LancerComet", "repository": {
"email": "chw644@hotmail.com" "type": "git",
}, "url": "https://github.com/LancerComet/vue-jsonp.git"
"bugs": { },
"url": "https://github.com/LancerComet/vue-jsonp/issues" "license": "MIT",
}, "devDependencies": {
"bundleDependencies": false, "@types/expect-puppeteer": "^4.4.3",
"deprecated": false, "@types/jest": "^26.0.14",
"description": "A tiny library for handling JSONP request.", "@types/jest-environment-puppeteer": "^4.4.0",
"devDependencies": { "@types/puppeteer": "^3.0.2",
"@types/expect-puppeteer": "^4.4.3", "jest": "^26.4.2",
"@types/jest": "^26.0.14", "jest-puppeteer": "^4.4.0",
"@types/jest-environment-puppeteer": "^4.4.0", "puppeteer": "^5.3.1",
"@types/puppeteer": "^3.0.2", "rollup": "^2.28.2",
"jest": "^26.4.2", "rollup-plugin-cleanup": "^3.2.1",
"jest-puppeteer": "^4.4.0", "rollup-plugin-delete": "^2.0.0",
"puppeteer": "^5.3.1", "rollup-plugin-terser": "^7.0.2",
"rollup": "^2.28.2", "rollup-plugin-typescript2": "^0.27.3",
"rollup-plugin-cleanup": "^3.2.1", "ts-jest": "^26.4.1",
"rollup-plugin-delete": "^2.0.0", "tslint": "^6.1.3",
"rollup-plugin-terser": "^7.0.2", "typescript": "^4.0.3",
"rollup-plugin-typescript2": "^0.27.3", "vue": "^2.6.12"
"ts-jest": "^26.4.1", }
"tslint": "^6.1.3", }
"typescript": "^4.0.3",
"vue": "^2.6.12"
},
"files": [
"dist/",
"index.d.ts",
"README.md"
],
"homepage": "https://github.com/LancerComet/vue-jsonp#readme",
"keywords": [
"Vue",
"JSONP"
],
"license": "MIT",
"main": "./dist/index.js",
"module": "./dist/index.esm.js",
"name": "vue-jsonp",
"repository": {
"type": "git",
"url": "git+https://github.com/LancerComet/vue-jsonp.git"
},
"scripts": {
"build": "rollup -c",
"prepublish": "npm run test",
"pretest": "npm run build",
"preversion": "npm run test",
"test": "jest"
},
"version": "2.0.0"
}

243
package-lock.json generated

@ -1,16 +1,235 @@
{ {
"requires": true, "name": "视频播放器组件",
"lockfileVersion": 1, "version": "1.0.0",
"dependencies": { "lockfileVersion": 2,
"jweixin-module": { "requires": true,
"version": "1.6.0", "packages": {
"resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", "": {
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==" "name": "视频播放器组件",
"version": "1.0.0",
"dependencies": {
"vue-jsonp": "^2.0.0",
"vue-lottie": "^0.2.1",
"weixin-js-sdk": "^1.6.0"
}
},
"node_modules/@babel/parser": {
"version": "7.20.0",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz",
"integrity": "sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==",
"peer": true,
"bin": {
"parser": "bin/babel-parser.js"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@vue/compiler-sfc": {
"version": "2.7.13",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz",
"integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==",
"peer": true,
"dependencies": {
"@babel/parser": "^7.18.4",
"postcss": "^8.4.14",
"source-map": "^0.6.1"
}
},
"node_modules/csstype": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==",
"peer": true
},
"node_modules/lottie-web": {
"version": "5.9.6",
"resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.9.6.tgz",
"integrity": "sha512-JFs7KsHwflugH5qIXBpB4905yC1Sub2MZWtl/elvO/QC6qj1ApqbUZJyjzJseJUtVpgiDaXQLjBlIJGS7UUUXA=="
},
"node_modules/nanoid": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
"peer": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
},
"engines": {
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
}
},
"node_modules/picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"peer": true
},
"node_modules/postcss": {
"version": "8.4.18",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
"integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
"funding": [
{
"type": "opencollective",
"url": "https://opencollective.com/postcss/"
},
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
}
],
"peer": true,
"dependencies": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
"engines": {
"node": "^10 || ^12 || >=14"
}
},
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/vue": {
"version": "2.7.13",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz",
"integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==",
"peer": true,
"dependencies": {
"@vue/compiler-sfc": "2.7.13",
"csstype": "^3.1.0"
}
},
"node_modules/vue-jsonp": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
"integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
},
"node_modules/vue-lottie": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/vue-lottie/-/vue-lottie-0.2.1.tgz",
"integrity": "sha512-zInUX69Ij8MhVR3XArpu4PqqBoufwKxS5UMutWCPm59VUaB5H6GtnaIzf9M+l6aYU+Kr8gF/W9dzWLgRuU6V+Q==",
"dependencies": {
"lottie-web": "^5.1.9"
},
"peerDependencies": {
"vue": "^2.5.16"
}
},
"node_modules/weixin-js-sdk": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz",
"integrity": "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
}
}, },
"vue-jsonp": { "dependencies": {
"version": "2.0.0", "@babel/parser": {
"resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", "version": "7.20.0",
"integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz",
"integrity": "sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==",
"peer": true
},
"@vue/compiler-sfc": {
"version": "2.7.13",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz",
"integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==",
"peer": true,
"requires": {
"@babel/parser": "^7.18.4",
"postcss": "^8.4.14",
"source-map": "^0.6.1"
}
},
"csstype": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==",
"peer": true
},
"lottie-web": {
"version": "5.9.6",
"resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.9.6.tgz",
"integrity": "sha512-JFs7KsHwflugH5qIXBpB4905yC1Sub2MZWtl/elvO/QC6qj1ApqbUZJyjzJseJUtVpgiDaXQLjBlIJGS7UUUXA=="
},
"nanoid": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
"peer": true
},
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"peer": true
},
"postcss": {
"version": "8.4.18",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
"integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
"peer": true,
"requires": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"peer": true
},
"source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"peer": true
},
"vue": {
"version": "2.7.13",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz",
"integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==",
"peer": true,
"requires": {
"@vue/compiler-sfc": "2.7.13",
"csstype": "^3.1.0"
}
},
"vue-jsonp": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
"integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
},
"vue-lottie": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/vue-lottie/-/vue-lottie-0.2.1.tgz",
"integrity": "sha512-zInUX69Ij8MhVR3XArpu4PqqBoufwKxS5UMutWCPm59VUaB5H6GtnaIzf9M+l6aYU+Kr8gF/W9dzWLgRuU6V+Q==",
"requires": {
"lottie-web": "^5.1.9"
}
},
"weixin-js-sdk": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz",
"integrity": "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
}
} }
}
} }

@ -9,5 +9,10 @@
"video", "video",
"player", "player",
"uniapp" "uniapp"
] ],
} "dependencies": {
"vue-jsonp": "^2.0.0",
"vue-lottie": "^0.2.1",
"weixin-js-sdk": "^1.6.0"
}
}

@ -54,7 +54,7 @@
<view class="width96 mart10 alijusstart"> <view class="width96 mart10 alijusstart">
<view class="fcorfff font12 height20" style="background-color: #3da7e7;border-radius: 20px;padding: 0px 5px;">嗨森逛 <view class="fcorfff font12 height20" style="background-color: #3da7e7;border-radius: 20px;padding: 0px 5px;">嗨森逛
</view> </view>
<view class="width70 fotrt font14 fcor666">月销 500</view> <view class="width70 fotrt font14 fcor666">月销 {{goodsData[0].salesCount}}</view>
</view> </view>
</view> </view>
<!-- 服务-规则选择 --> <!-- 服务-规则选择 -->

@ -1,10 +1,10 @@
<template> <template>
<view> <view>
<!-- 状态栏 --> <!-- 状态栏 -->
<view v-if="showHeader" class="status" <view v-if="showHeader && isdisplay" class="status"
:style="{ position: headerPosition,top:statusTop,opacity: afterHeaderOpacity}"></view> :style="{ position: headerPosition,top:statusTop,opacity: afterHeaderOpacity}"></view>
<!-- 顶部导航栏 --> <!-- 顶部导航栏 -->
<view v-if="showHeader" class="header" <view v-if="showHeader && !isdisplay" class="header"
:style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }"> :style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }">
<!-- 定位城市 --> <!-- 定位城市 -->
<view class="addr" @click="goPostion"> <view class="addr" @click="goPostion">
@ -30,7 +30,11 @@
class="h5xfimg" @click="playPhone"></image> class="h5xfimg" @click="playPhone"></image>
<!-- #endif --> <!-- #endif -->
</view> </view>
</view> </view>
<view v-if="isdisplay">
<image :src="imagewxUrl+imgadres5" class="width40w mart90" mode="widthFix"></image>
</view>
<!-- 顶部菜单 --> <!-- 顶部菜单 -->
<view v-for="(item,index) in homeCateList" :key="index" style="margin-top: -2px;"> <view v-for="(item,index) in homeCateList" :key="index" style="margin-top: -2px;">
<view class="height90 backcorltop mart50" v-if="item.type == 1"> <view class="height90 backcorltop mart50" v-if="item.type == 1">
@ -66,7 +70,7 @@
<view class="stus"></view> <view class="stus"></view>
<view class="paddleft10 font14 fcor666 text1 width70"> <view class="paddleft10 font14 fcor666 text1 width70">
{{item.childDate[0].title}}</view> {{item.childDate[0].title}}</view>
<view class="width25 font13 fcor999">40分钟前</view> <view class="width25 font13 fcor999">{{swipers.timeData}}</view>
</view> </view>
<view class="width20 alijus"> <view class="width20 alijus">
<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image> <image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
@ -79,7 +83,7 @@
<view class="stus"></view> <view class="stus"></view>
<view class="paddleft10 font14 fcor666 text1 width70"> <view class="paddleft10 font14 fcor666 text1 width70">
{{swipers.title}}</view> {{swipers.title}}</view>
<view class="width25 font13 fcor999">40分钟前</view> <view class="width25 font13 fcor999">{{swipers.timeData}}</view>
</view> </view>
<view class="width20 alijus"> <view class="width20 alijus">
<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image> <image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
@ -143,33 +147,6 @@
<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31" <image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31"
@click="goGoodsList(item.childCategory[3].jumpUrl)"></image> @click="goGoodsList(item.childCategory[3].jumpUrl)"></image>
</view> </view>
<!-- 天天好券 -->
<!-- <view class="width90 mart20 alijusstart" v-if="item.type == 6">
<view class="width70 font18 fcor333">
{{item.name}}
</view>
<view class="width30 font14 fotrt fcor666">更多</view>
</view>
<view class="width94 alijus mart20" v-if="item.type == 6">
<view class="backcorfff spcarea">
<image mode="widthFix" class="width100" src="../../../static/img/home/home4.png"></image>
<view class="width96 fcor333 font15 fontwig6">加油优惠券包</view>
<view class="width96 fcor999 font11">2020.09.21-2202.10.12</view>
<view class="width94 fcoreb5 font15 fontwig6">¥240</view>
</view>
<view class="backcorfff spcarea">
<image mode="widthFix" class="width100" src="../../../static/img/home/home4.png"></image>
<view class="width96 fcor333 font15 fontwig6">加油优惠券包</view>
<view class="width96 fcor999 font11">2020.09.21-2202.10.12</view>
<view class="width94 fcoreb5 font15 fontwig6">¥240</view>
</view>
<view class="backcorfff spcarea">
<image mode="widthFix" class="width100" src="../../../static/img/home/home4.png"></image>
<view class="width96 fcor333 font15 fontwig6">加油优惠券包</view>
<view class="width96 fcor999 font11">2020.09.21-2202.10.12</view>
<view class="width94 fcoreb5 font15 fontwig6">¥240</view>
</view>
</view> -->
</view> </view>
<!-- 弹窗 --> <!-- 弹窗 -->
<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true">
@ -183,20 +160,15 @@
import { import {
getUserInfo, getUserInfo,
HandleCode, HandleCode,
WXlogin,
getCouponList,
getH5AccessToken, getH5AccessToken,
getTPigKFCToken,
getTPigCinemaToken,
getCmsContent, getCmsContent,
getMembershipLevel,
findByLatAndLng findByLatAndLng
} from "../../../Utils/Api.js"; //api } from "../../../Utils/Api.js"; //api
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp(); let app = getApp();
export default { export default {
components: { components: {
wybPopup wybPopup
}, },
data() { data() {
return { return {
@ -217,19 +189,8 @@
imgadres5: 'unionarea.png', imgadres5: 'unionarea.png',
imgadres3: '', imgadres3: '',
imgadres4: 'cusservice.png', imgadres4: 'cusservice.png',
imgadres5: 'loading.gif',
webUrl: '', webUrl: '',
//
swiperList: [{
id: 1,
src: 'url1',
img: 'banner2.png'
},
{
id: 2,
src: 'url2',
img: 'banner3.png'
}
],
loadingText: '正在加载...', loadingText: '正在加载...',
pageNum: 1, pageNum: 1,
pageSize: 6, pageSize: 6,
@ -238,17 +199,15 @@
// //
cpStuats: 1, cpStuats: 1,
jumpType: '', jumpType: '',
locationRef: null, // locationRef: null, //
isdisplay: true //
}; };
}, },
onShow() { onShow() {
if (app.globalData.cityName != '') { if (app.globalData.cityName != '') {
this.city = app.globalData.qianzhuCityName; this.city = app.globalData.qianzhuCityName;
this.getCmsContentcmsContent(); this.getCmsContentcmsContent();
// if (app.globalData.userInfo.phone) {
// this.getMembershipLevel();
// }
} }
// #ifdef H5 // #ifdef H5
uni.getStorage({ uni.getStorage({
@ -340,7 +299,7 @@
that.city = '重庆市'; that.city = '重庆市';
app.globalData.cityName = '重庆市'; app.globalData.cityName = '重庆市';
app.globalData.cityId = '500000'; app.globalData.cityId = '500000';
// that.getCmsAactibity(); that.getCmsAactibity();
that.getCmsContentcmsContent(); that.getCmsContentcmsContent();
} }
); );
@ -390,19 +349,12 @@
platform: code, platform: code,
categoryCode: 'CMS_HOME' categoryCode: 'CMS_HOME'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
this.isdisplay = false;
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.homeCateList = res.return_data; this.homeCateList = res.return_data;
} }
}); });
},
//
getMembershipLevel() {
let params = {
phone: app.globalData.userInfo.phone,
regionId: app.globalData.cityId
}
getMembershipLevel(params).then(res => {});
}, },
// //
getCmsAactibity() { getCmsAactibity() {
@ -539,7 +491,7 @@
}) })
// app.globalData.cityId = '500103'; // app.globalData.cityId = '500103';
if (res.return_data.regionId) { if (res.return_data.regionId) {
// that.getCmsAactibity(); that.getCmsAactibity();
that.getCmsContentcmsContent(); that.getCmsContentcmsContent();
} }
uni.getStorage({ uni.getStorage({

@ -348,7 +348,6 @@
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
let pagenum = this.pageNum;
let params = { let params = {
status: 1, status: 1,
pageNum: 1, pageNum: 1,

@ -120,9 +120,9 @@
<view class="gooddes width90 backcorfff marb20"> <view class="gooddes width90 backcorfff marb20">
<view class="width90w height20 bordertopleft alijusnostart"> <view class="width90w height20 bordertopleft alijusnostart">
</view> </view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice"> <view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice">
</view> </view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else> <view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else>
加油实付 <text class="font24 fcor333 margle">{{recinfo.payRealPrice}}</text> 加油实付 <text class="font24 fcor333 margle">{{recinfo.payRealPrice}}</text>
@ -460,7 +460,7 @@
int: 1200, // int: 1200, //
deduction: 0, // deduction: 0, //
recinfo: [], recinfo: [],
orderId: '', orderId: '',
timers: null, // timers: null, //
imageUrl: app.globalData.imgUrl, imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
@ -499,7 +499,6 @@
}, },
onBackPress() { onBackPress() {
//退 //退
this.clearOrder();
}, },
filters: { filters: {
toFixed: function(x) { toFixed: function(x) {
@ -539,18 +538,18 @@
let params = { let params = {
orderNo: this.orderId, orderNo: this.orderId,
} }
getDetailByOrderNo(params).then(res => { getDetailByOrderNo(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.recinfo = res.return_data; this.recinfo = res.return_data;
if (res.return_data.productType == 6) { if (res.return_data.productType == 6) {
this.getOrderByOrderNo(); this.getOrderByOrderNo();
} }
if (res.return_data.orderStatus == 1) { if (res.return_data.orderStatus == 1) {
this.timers = setInterval(() => { this.timers = setInterval(() => {
this.showtime() this.showtime()
}) })
} }
} }
}) })
@ -560,11 +559,11 @@
let params = { let params = {
orderNo: this.orderId, orderNo: this.orderId,
} }
getOrderByOrderNo(params).then(res => { getOrderByOrderNo(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.oilList = res.return_data; this.oilList = res.return_data;
} }
}) })
}, },
// //
@ -596,7 +595,7 @@
this.countdowns = lefts // this.countdowns = lefts //
// 00:00:00 // 00:00:00
if (lefttime < 0) { if (lefttime < 0) {
clearInterval(this.timers); clearInterval(this.timers);
// this.getDetailByOrderNo(); // this.getDetailByOrderNo();
this.countdownh = this.countdownm = this.countdowns = "00" this.countdownh = this.countdownm = this.countdowns = "00"
} }
@ -650,7 +649,7 @@
title: '加载中...' title: '加载中...'
}) })
let params = { let params = {
orderNo: this.recinfo.id orderNo: this.recinfo.orderNo
} }
cancel(params).then(res => { cancel(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -679,15 +678,6 @@
} }
}); });
}, },
clearOrder() {
uni.removeStorage({
key: 'buylist',
success: (res) => {
this.buylist = [];
console.log('remove buylist success');
}
});
},
toPay() { toPay() {
let payTypes; let payTypes;
if (this.recinfo.payType == 1 || this.recinfo.payType == null) { if (this.recinfo.payType == 1 || this.recinfo.payType == null) {

@ -31,7 +31,8 @@
<view class="onorder" v-if="orderList.length==0"> <view class="onorder" v-if="orderList.length==0">
<image :src="imagewxUrl+imgadres"></image> <image :src="imagewxUrl+imgadres"></image>
</view> </view>
<view class="row" v-for="(row,index) in orderList" :key="index" @click="jumpDetails(row.orderNo,row.productType)"> <view class="row" v-for="(row,index) in orderList" :key="index"
@click="jumpDetails(row.orderNo,row.productType)">
<view class="width96 mart10 alijusstart"> <view class="width96 mart10 alijusstart">
<view class="width70"> <view class="width70">
<view class="orderlabel">{{orderTyplist | msgFormat(row.productType)}}</view> <view class="orderlabel">{{orderTyplist | msgFormat(row.productType)}}</view>
@ -46,8 +47,8 @@
<view class="width70 flleft fotlt "> <view class="width70 flleft fotlt ">
<view class="font16 fontwig6 fcor333 alijusstart"> <view class="font16 fontwig6 fcor333 alijusstart">
<image src="../../../static/img/order5.png" class="marglerig" <image src="../../../static/img/order5.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
<view class="width100 text1">{{row.title}}</view> <view class="width100 text1">{{row.title}}</view>
</view> </view>
</view> </view>
<view class="width30 flright fotrt fcor666 font15 fotrt"> <view class="width30 flright fotrt fcor666 font15 fotrt">
@ -65,10 +66,10 @@
下单时间 : {{row.createTime | formatDate('-')}} 下单时间 : {{row.createTime | formatDate('-')}}
</view> </view>
</view> </view>
<view class="width40 fotrt fcor666 font15 fotrt alijusend"> <view class="width40 fotrt fcor666 font15 fotrt alijusend">
<view class="font12 width25 fcor999">合计:</view> <view class="font12 width25 fcor999">合计:</view>
<view class="fotlt text1 font18 fcor333 "> <view class="fotlt text1 font18 fcor333 ">
{{row.payPrice}} {{row.payPrice}}
</view> </view>
</view> </view>
</view> </view>
@ -233,15 +234,15 @@
codeType: 'ORDER_PRODUCT_TYPE' codeType: 'ORDER_PRODUCT_TYPE'
} }
getDictionaryByCodeType(datas).then(res => { getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
for(var i = 0 ;i < res.return_data.length;i++){ for (var i = 0; i < res.return_data.length; i++) {
this.orderTyplist.push(res.return_data[i]); this.orderTyplist.push(res.return_data[i]);
} }
} }
}) })
}, },
// //
jumpDetails(e, item) { jumpDetails(e, item) {
this.orderCheck(e); this.orderCheck(e);
if (item == 1 || item == 2 || item == 3) { if (item == 1 || item == 2 || item == 3) {
uni.navigateTo({ uni.navigateTo({
@ -342,20 +343,10 @@
} else { } else {
payTypes = 2; payTypes = 2;
} }
// if (row.highChildOrderList[0].goodsType == 4 || row.highChildOrderList[0].goodsType == 9 || row uni.redirectTo({
// .highChildOrderList[0].goodsType == 10) { url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row
uni.redirectTo({ .payPrice + '&productType=' + row.productType
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row })
.payPrice + '&productType=' + row.productType
})
// return;
// }
// uni.redirectTo({
// url: "/pages/pay/payment/payment?amount=" + row.payPrice +
// '&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
// .highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
// .ext1 + '&goodsType=' + row.highChildOrderList[0].goodsType
// })
} }
} }
} }

Loading…
Cancel
Save