Skip to content

严立 / mini-shimao

Go to a project
Commit 9c015d9e by 严立
Options

LL - 活动价格判断问题修复

parent 749e8459
Inline Side-by-side
Showing with 150 additions and 139 deletions
app.js
......@@ -27,6 +27,8 @@ App({
baseUrl: 'https://sm-web2.meiqicloud.com',//测试
// baseUrl: 'https://smbhyh-web.meiqicloud.com',//生产
debug: true,
isRefreshToken: false,
},
onLaunch: function () {
......@@ -129,6 +131,7 @@ App({
url: '/api/v1/login/getSmallSession?code=' + res.code,
method: 'GET',
success: (response) => {
this.globalData.isRefreshToken = false
let funcResponse = response.data
// 缓存令牌信息
......@@ -253,6 +256,9 @@ App({
* @returns
*/
refreshToken: function (obj) {
if (this.globalData.isRefreshToken) return
this.globalData.isRefreshToken = true
this.wxRequest({
url: '/api/v1/login/refreshToken',
header: {
......@@ -269,6 +275,7 @@ App({
wx.setStorageSync('token', funcResponse.token)
wx.setStorageSync('tokenRefresh', funcResponse.refreshToken)
this.globalData.isRefreshToken = false
this.wxRequest(obj)
break
......
pages/commodity/menu-art/menu-art.js
......@@ -212,7 +212,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
pages/commodity/menu-food/menu-food.js
......@@ -247,7 +247,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
pages/commodity/menu-snacks/menu-snacks.js
......@@ -212,7 +212,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
pages/commodity/project-detail/project-detail.js
......@@ -108,7 +108,7 @@ Page({
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': funcResponse[i].inventorie[0].cardNam, // 失效时间
'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面
'cover': funcResponse[i].ticketsImg, // 商品封面
'price': funcResponse[i].inventorie[0].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].inventorie[0].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].inventorie[0].ownerPrice, // 业主价
......@@ -124,7 +124,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......@@ -152,7 +152,7 @@ Page({
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': App.modular.miment().format('YYYY.MM.DD'), // 失效时间
'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面
'cover': funcResponse[i].ticketsImg, // 商品封面
'price': funcResponse[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].ownerPrice, // 业主价
......@@ -168,7 +168,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......@@ -219,7 +219,7 @@ Page({
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': funcResponse[i].inventorie[0].cardNam, // 失效时间
'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面
'cover': funcResponse[i].ticketsImg, // 商品封面
'price': funcResponse[i].inventorie[0].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].inventorie[0].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].inventorie[0].ownerPrice, // 业主价
......@@ -235,7 +235,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......@@ -263,7 +263,7 @@ Page({
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': App.modular.miment().format('YYYY.MM.DD'), // 失效时间
'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面
'cover': funcResponse[i].ticketsImg, // 商品封面
'price': funcResponse[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].ownerPrice, // 业主价
......@@ -279,7 +279,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
pages/commodity/project-detail/project-detail.wxss
......@@ -17,7 +17,7 @@
.project-cover {
width: 670rpx;
height: 376rpx;
background-color: lightpink;
background: #999999;
}
.project-info {
......
pages/commodity/project/project.js
......@@ -132,7 +132,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......@@ -176,7 +176,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
pages/mine/question/question.js
......@@ -2,6 +2,9 @@ const App = getApp()
Page({
data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
title: '客服中心',
inputHidden: true,
commonProblems: [],
......
pages/mine/question/question.wxml
......@@ -40,15 +40,15 @@
</view>
<view class="footer-nav" style="padding-bottom:{{isIphoneX >=0?68:0}}rpx;">
<view class="nav-item" bindtap="call">
<image class="nav-icon" src="./images/Hotline@2x.png"></image>
<image class="nav-icon" src="{{imageBase + 'icon/service-1.png'}}"></image>
<view class="nav-item-title">客服热线</view>
</view>
<view class="nav-item" bindtap="openMask">
<image class="nav-icon" src="./images/Wechat@2x.png"></image>
<image class="nav-icon" src="{{imageBase + 'icon/wechat-1.png'}}"></image>
<view class="nav-item-title">客服微信</view>
</view>
<view class="nav-item" bindtap="feedback">
<image class="nav-icon" src="./images/Feedback@2x.png"></image>
<image class="nav-icon" src="{{imageBase + 'icon/letter-1.png'}}"></image>
<view class="nav-item-title">填写反馈</view>
</view>
</view>
......
pages/play/activity-detail/activity-detail.js
......@@ -83,7 +83,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
pages/play/service-detail/service-detail.js
......@@ -437,7 +437,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......@@ -539,25 +539,25 @@ Page({
'isMore': false,
}
funcItem = {
'isMore': false,
'star': 4,
'scoreService': 3,
'scoreCommodity': 2,
'scoreEnvironmental': 1,
'userName': '用户名称',
'userAvatar': 'https://gss3.bdstatic.com/84oSdTum2Q5BphGlnYG/timg?wapp&quality=80&size=b150_150&subsize=20480&cut_x=0&cut_w=0&cut_y=0&cut_h=0&sec=1369815402&srctrace&di=6a992d9158ef2273c2e9d0a77fbbbe88&wh_rate=null&src=http%3A%2F%2Ftiebapic.baidu.com%2Fforum%2Fpic%2Fitem%2F4d086e061d950a7be03653981dd162d9f2d3c96f.jpg',
'userType': 0,
'userAlbum': [
'https://dss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=975216563,2695721503&fm=111&gp=0.jpg',
'https://dss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2856846879,389279115&fm=26&gp=0.jpg',
'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
],
'date': '2020.02.09',
'content': '/sd12i301!@(#*)(#Updjs',
}
// funcItem = {
// 'isMore': false,
// 'star': 4,
// 'scoreService': 3,
// 'scoreCommodity': 2,
// 'scoreEnvironmental': 1,
// 'userName': '用户名称',
// 'userAvatar': 'https://gss3.bdstatic.com/84oSdTum2Q5BphGlnYG/timg?wapp&quality=80&size=b150_150&subsize=20480&cut_x=0&cut_w=0&cut_y=0&cut_h=0&sec=1369815402&srctrace&di=6a992d9158ef2273c2e9d0a77fbbbe88&wh_rate=null&src=http%3A%2F%2Ftiebapic.baidu.com%2Fforum%2Fpic%2Fitem%2F4d086e061d950a7be03653981dd162d9f2d3c96f.jpg',
// 'userType': 0,
// 'userAlbum': [
// 'https://dss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=975216563,2695721503&fm=111&gp=0.jpg',
// 'https://dss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2856846879,389279115&fm=26&gp=0.jpg',
// 'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
// 'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
// 'https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2032511182,3555754069&fm=26&gp=0.jpg',
// ],
// 'date': '2020.02.09',
// 'content': '/sd12i301!@(#*)(#Updjs',
// }
funcItem.star = Math.floor((funcItem.scoreService + funcItem.scoreCommodity + funcItem.scoreEnvironmental) / 3)
funcList.push(funcItem)
}
......
pages/play/service-sell/service-sell.js
......@@ -65,7 +65,7 @@ Page({
let funcUserType = wx.getStorageSync('userInfo').userType
// 根据后台判断价格显示类型
// 活动价优先级最高，如果存在活动价，则只显示活动价和普通价
if (funcItem.priceDiscount) {
if (funcItem.priceDiscount || funcItem.priceDiscount === 0) {
funcItem.priceType = 1
} else {
// 活动价不存在，进一步判断普通价与业主价是否一致，如果不一致，则显示两者
......
project.config.json
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": false,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"enableEngineNative": false
},
"compileType": "miniprogram",
"libVersion": "2.10.0",
"appid": "wx37a9b7a3d92029f2",
"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
"debugOptions": {
"hidedInDevtools": []
},
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": [
{
"id": -1,
"name": "pages/commodity/menu-food/menu-food",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/home/home",
"pathName": "pages/play/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/service-detail/service-detail",
"pathName": "pages/play/service-detail/service-detail",
"query": "id=1&type=4",
"scene": null
},
{
"id": -1,
"name": "pages/mine/home/home",
"pathName": "pages/mine/home/home",
"scene": null
}
]
}
}
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": false,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"enableEngineNative": false
},
"compileType": "miniprogram",
"libVersion": "2.10.0",
"appid": "wx37a9b7a3d92029f2",
"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
"debugOptions": {
"hidedInDevtools": []
},
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": [
{
"id": -1,
"name": "pages/commodity/menu-food/menu-food",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/home/home",
"pathName": "pages/play/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/service-detail/service-detail",
"pathName": "pages/play/service-detail/service-detail",
"query": "id=1&type=4",
"scene": null
},
{
"id": -1,
"name": "pages/mine/home/home",
"pathName": "pages/mine/home/home",
"scene": null
}
]
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment