Commit aeac9741 authored by Damon's avatar Damon

Merge branch 'dev-1.5.0' into test

parents 10aa7ea4 b47e2fea
...@@ -11,6 +11,6 @@ const UNI_APP = { ...@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'http://deudn.c.pp.cc/', qn_asset_url: 'http://deudn.c.pp.cc/',
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.5.01' version: 'v1.5.02'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
;(function() { ;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null let ENV_VAR = null
let VERSION_NUMBER = '1.5.01' //版本号 let VERSION_NUMBER = '1.5.02' //版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频 //小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
......
...@@ -10,7 +10,7 @@ const UNI_APP = { ...@@ -10,7 +10,7 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
argoDebugMode: 0, argoDebugMode: 0,
version: 'v1.5.01' version: 'v1.5.02'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -11,6 +11,6 @@ const UNI_APP = { ...@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.5.01' version: 'v1.5.02'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
}, },
partsChange(val, index) { partsChange(val, index) {
this.$set(this.lists[index], 'quantity', val) this.$set(this.lists[index], 'quantity', val)
this.valueChange(JSON.stringify(this.lists)) this.valueChange(this.lists.length > 0 ? JSON.stringify(this.lists) : JSON.stringify([{}]))
}, },
minusValue(val, index) { minusValue(val, index) {
if (val === 0) { if (val === 0) {
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
} else { } else {
this.lists = [] this.lists = []
} }
this.valueChange(val ? JSON.stringify(this.lists) : (this.maintainStep === 'base' ? [{}] : JSON.stringify(this.lists))) this.valueChange(val ? JSON.stringify(this.lists) : (this.maintainStep === 'base' ? JSON.stringify([{}]) : JSON.stringify(this.lists)))
}, },
toParts() { toParts() {
uni.navigateTo({ uni.navigateTo({
......
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
:item="item" :item="item"
:value="form[item.fieldsName] || ''" :value="form[item.fieldsName] || ''"
:disabled="readOnly" :disabled="readOnly"
:maintainStep="maintainStep" :maintainStep="list[tabIndex].panelFieldsName"
@value-change="fieldValueChange" @value-change="fieldValueChange"
> >
</xh-parts> </xh-parts>
...@@ -1160,6 +1160,7 @@ export default { ...@@ -1160,6 +1160,7 @@ export default {
// 申请费用计算 // 申请费用计算
this.calcMoney() this.calcMoney()
} }
console.log("this.form", this.form)
}, },
// 申请费用计算 // 申请费用计算
calcMoney() { calcMoney() {
......
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
.then((res) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
const data = res.data || [] const data = res.data || []
this.lists = data.map((v) => { const lists = data.map((v) => {
const max = v.stock + Number(v.useStock) const max = v.stock + Number(v.useStock)
v.min = 1 v.min = 1
v.checked = false v.checked = false
...@@ -123,6 +123,7 @@ export default { ...@@ -123,6 +123,7 @@ export default {
v.images = images[0] v.images = images[0]
return v return v
}) })
this.lists = lists.filter(v => v.max > 0)
} }
}) })
}, },
......
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 to comment