Merge branch 'dev-1.5.0' into test

.env.dev.js

@@ -11,6 +11,6 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'http://deudn.c.pp.cc/',
 	argoDebugMode: 1,
-	version: 'v1.5.01'
+	version: 'v1.5.02'
 }
 module.exports = UNI_APP;

.env.js

 ;(function() {
-  let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
+  let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
   let ENV_VAR = null
-  let VERSION_NUMBER = '1.5.01' //版本号
+  let VERSION_NUMBER = '1.5.02' //版本号
   //小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
   if (process.env.NODE_ENV === 'development') {
     if (NODE_ENV === 'dev') {

.env.prod.js

@@ -10,7 +10,7 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'https://qn-static.banshouhui.com',
 	argoDebugMode: 0,
-	version: 'v1.5.01'
+	version: 'v1.5.02'
 }
 
 module.exports = UNI_APP;

.env.test.js

@@ -11,6 +11,6 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'https://qn-static.banshouhui.com',
 	argoDebugMode: 1,
-	version: 'v1.5.01'
+	version: 'v1.5.02'
 }
 module.exports = UNI_APP;

src/components/createCom/XhParts.vue

@@ -128,7 +128,7 @@ export default {
     },
     partsChange(val, index) {
       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) {
       if (val === 0) {
@@ -159,7 +159,7 @@ export default {
       } else {
         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() {
       uni.navigateTo({

src/pages/order/complete.vue

@@ -254,7 +254,7 @@
                         :item="item"
                         :value="form[item.fieldsName] || ''"
                         :disabled="readOnly"
-                        :maintainStep="maintainStep"
+                        :maintainStep="list[tabIndex].panelFieldsName"
                         @value-change="fieldValueChange"
                       >
                       </xh-parts>
@@ -1160,6 +1160,7 @@ export default {
         // 申请费用计算
         this.calcMoney()
       }
+      console.log("this.form", this.form)
     },
     // 申请费用计算
     calcMoney() {

src/pages/order/parts.vue

@@ -113,7 +113,7 @@ export default {
         .then((res) => {
           if (res.code === 200) {
             const data = res.data || []
-            this.lists = data.map((v) => {
+            const lists = data.map((v) => {
               const max = v.stock + Number(v.useStock)
               v.min = 1
               v.checked = false
@@ -123,6 +123,7 @@ export default {
               v.images = images[0]
               return v
             })
+            this.lists = lists.filter(v => v.max > 0)
           }
         })
     },