yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改2.0 页面问题

Browse Source
yj-dev
杨杰 2 years ago
parent a141c2a939
commit e4b239b5ee
13 changed files with 606 additions and 479 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 78
      node_modules/vue-jsonp/package.json
  3. 227
      package-lock.json
  4. 7
      package.json
  5. 2
      pages/goods/goods.vue
  6. 74
      pages/tabBar/home/home.vue
  7. 1
      pages/tabBar/user/user.vue
  8. 12
      pages/user/order_details/order_details.vue
  9. 15
      pages/user/order_list/order_list.vue

1
.gitignore vendored
Unescape View File

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

78
node_modules/vue-jsonp/package.json generated vendored
Unescape View File

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

227
package-lock.json generated
Unescape View File

@ -1,16 +1,235 @@
{ {
"name": "视频播放器组件",
"version": "1.0.0",
"lockfileVersion": 2,
"requires": true, "requires": true,
"lockfileVersion": 1, "packages": {
"": {
"name": "视频播放器组件",
"version": "1.0.0",
"dependencies": { "dependencies": {
"jweixin-module": { "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", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", "resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz",
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==" "integrity": "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
}
},
"dependencies": {
"@babel/parser": {
"version": "7.20.0",
"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": { "vue-jsonp": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz", "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
"integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" "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=="
} }
} }
} }

7
package.json
Unescape View File

@ -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"
}
} }

2
pages/goods/goods.vue
Unescape View File

@ -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>
<!-- 服务-规则选择 --> <!-- 服务-规则选择 -->

74
pages/tabBar/home/home.vue
Unescape View File

@ -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">
@ -31,6 +31,10 @@
<!-- #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,13 +160,8 @@
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';
@ -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,
@ -239,6 +200,7 @@
cpStuats: 1, cpStuats: 1,
jumpType: '', jumpType: '',
locationRef: null, // 用于接收定位对象 locationRef: null, // 用于接收定位对象
isdisplay: true //是否展示
}; };
}, },
@ -246,9 +208,6 @@
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();
} }
); );
@ -391,19 +350,12 @@
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() {
let code; let code;
@ -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({

1
pages/tabBar/user/user.vue
Unescape View File

@ -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,

12
pages/user/order_details/order_details.vue
Unescape View File

@ -499,7 +499,6 @@
}, },
onBackPress() { onBackPress() {
//页面后退时候，清除订单信息 //页面后退时候，清除订单信息
this.clearOrder();
}, },
filters: { filters: {
toFixed: function(x) { toFixed: function(x) {
@ -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) {

15
pages/user/order_list/order_list.vue
Unescape View File

@ -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>
@ -234,7 +235,7 @@
} }
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]);
} }
} }
@ -342,20 +343,10 @@
} else { } else {
payTypes = 2; payTypes = 2;
} }
// if (row.highChildOrderList[0].goodsType == 4 || row.highChildOrderList[0].goodsType == 9 || row
// .highChildOrderList[0].goodsType == 10) {
uni.redirectTo({ uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row
.payPrice + '&productType=' + row.productType .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
// })
} }
} }
} }

Write Preview
Loading…
Cancel
Save