Просмотр исходного кода

Merge branch '缺省信息优化' into 测试

xiaohaizhao 2 лет назад
Родитель
Сommit
c4c249228b

+ 1 - 1
components/My_empty/index.wxml

@@ -1,4 +1,4 @@
 <view class="empty" style="margin-top: {{marTop}};">
     <view class="iconfont {{icon}} i-1597"></view>
-    <view style="margin-top: {{sonMarTop}}rpx;">{{text}}</view>
+    <view style="margin-top: {{sonMarTop}}rpx;">{{text||'暂无数据'}}</view>
 </view>

+ 1 - 1
packageA/invoiceforecast/modules/orderForm/index.js

@@ -80,7 +80,7 @@ Component({
                         "condition": ""
                     }
                 }
-            })}`,
+            })}&aitText=暂无数据,请添加订单明细`,
             })
             getApp().globalData.handleSelect = this.handleAdd.bind(this);
         },

+ 2 - 0
packageA/select/orderForm/select.js

@@ -43,6 +43,7 @@ Page({
         this.getList(true);
     },
     onLoad(options) {
+        console.log(options)
         if (options.params) {
             let params = JSON.parse(options.params);
             if (!params.content.pageNumber || !params.content.pageTotal) {
@@ -60,6 +61,7 @@ Page({
             radio: options.radio ? true : false,
             idname: options.idname || this.data.idname,
             showName: options.showName || this.data.showName,
+            aitText: options.aitText || ''
         });
         this.getList()
 

+ 1 - 1
packageA/select/orderForm/select.wxml

@@ -47,7 +47,7 @@
         </view>
     </navigator>
     <view style="height: 150rpx;" />
-    <My_empty wx:if="{{!list.length}}" />
+    <My_empty wx:if="{{!list.length}}" text='{{aitText}}' />
 </Yl_ListBox>
 
 <view style="height: 130rpx;" />